Граф коммитов

542 Коммитов

Автор SHA1 Сообщение Дата
Joe Curlee 8ccd7ad96b added /claim to navigation. fixes #343 2013-06-01 17:52:33 -05:00
Joe Curlee 199e5c99b8 renamed /learn to /explore. fixes #344 2013-06-01 17:44:36 -05:00
Joe Curlee ffa99db872 removed remaining "add to your favorites" buttons 2013-06-01 17:38:55 -05:00
Joe Curlee df4d0e3a03 changed organisation to organization. fixes #345 2013-06-01 17:32:45 -05:00
Joe Curlee af501f44c1 removed add to favorites button from program detail page. fixes #347 2013-06-01 17:29:55 -05:00
Joe Curlee 62df6bb94c removed favorite button from program detail page 2013-06-01 17:28:12 -05:00
Joe Curlee b35346e7d7 converted tabs to spaces and fixed indentation 2013-06-01 17:14:36 -05:00
Joe Curlee 192d050223 Replaced VPAT with FAQ on homepage and changed page title, header and filename. closes #348 2013-06-01 17:08:06 -05:00
Joe Curlee 57b4846322 renamed vpat.html to faq.html 2013-06-01 17:06:55 -05:00
Chris McAvoy e10d6b1f3c Merge pull request #350 from andrewhayward/applications
Fixing evidence upload in Firefox
2013-06-01 13:56:21 -07:00
Andrew Hayward fc17740740 Merge branch 'master' into applications 2013-06-01 21:36:19 +01:00
Andrew Hayward 24297f4d43 Adding a bit of whitespace 2013-06-01 21:35:45 +01:00
Andrew Hayward 24db1b37f7 Labels don't work on file inputs in Firefox *
Resolves #349

* https://bugzilla.mozilla.org/show_bug.cgi?id=701353
2013-06-01 21:35:35 +01:00
Andrew Hayward 46d5dbe1a8 Bailing early if no filters set 2013-06-01 21:16:08 +01:00
Chris McAvoy 717622dd63 Update README.md 2013-06-01 13:23:09 -05:00
Chris McAvoy 3a8cb0855b updating readme with better onboarding instructions 2013-06-01 13:21:21 -05:00
Chris McAvoy b3c68d6e8e Merge pull request #337 from andrewhayward/applications
Applications
2013-05-31 18:39:23 -07:00
Mike Larsson 0211f9eac3 Merge pull request #336 from andrewhayward/error-handling
Fixing stupid `error` errors
2013-05-31 18:20:06 -07:00
Andrew Hayward 65a5620ebe Merge branch 'master' into applications 2013-06-01 01:29:23 +01:00
Andrew Hayward c59c3530ef Playing it safe 2013-06-01 01:29:07 +01:00
Andrew Hayward ce494e89a6 Fixing stupid `error` errors 2013-06-01 01:20:58 +01:00
Chris McAvoy 90f1cd86b9 Merge pull request #335 from mgballard/master
Prettify!
2013-05-31 14:18:58 -07:00
Chris McAvoy 2232b6886d fixed typo errors from merge 2013-05-31 15:55:00 -05:00
Chris McAvoy 7df03b7b02 merging andrews aestimia branch 2013-05-31 15:39:39 -05:00
Michael Ballard a0ee58004b Merge branch 'master' of https://github.com/mozilla/CSOL-site 2013-05-31 14:50:13 -04:00
Michael Ballard 4fc1953f78 added a sprite and css for default badge image(s) 2013-05-31 14:48:41 -04:00
Chris McAvoy c1d54044bd Merge remote-tracking branch 'origin/master' 2013-05-31 13:42:56 -05:00
Chris McAvoy 413a21d428 resolving conflict 2013-05-31 13:42:28 -05:00
Michael Ballard 79ad3dd635 default badge icon 2013-05-31 14:21:37 -04:00
Michael Ballard e02c577a42 added close button to video modal 2013-05-31 14:11:39 -04:00
Michael Ballard d1084082d7 Merge branch 'master' of https://github.com/mgballard/CSOL-site 2013-05-31 13:57:15 -04:00
Michael Ballard 4059231213 added pager gradient 2013-05-31 13:25:42 -04:00
Michael Ballard 962d6944e4 add box-shadow to landing page header/nav 2013-05-31 13:12:20 -04:00
Atul Varma c3718b81fa Merge pull request #334 from andrewhayward/readme
Adding DB scripts to README
2013-05-31 09:54:12 -07:00
Michael Ballard 1fdbb76adc add padding to landing page footer logos and push left to line up with banner 2013-05-31 12:52:21 -04:00
Andrew Hayward 18f9a7340f Adding DB scripts to README 2013-05-31 17:36:33 +01:00
Andrew Hayward d7034726e2 Merge branch 'master' into aestimia
Conflicts:
	README.md
2013-05-31 17:27:58 +01:00
Chris McAvoy 4e3fd2b8c7 Merge branch 'my-badges' of https://github.com/stenington/CSOL-site 2013-05-31 11:26:48 -05:00
Mike Larsson cfbbeba59e Add basic, ugly mybadges details page 2013-05-31 12:21:00 -04:00
Andrew Hayward 42ec6ccc96 Adding `reopen` action 2013-05-31 17:15:40 +01:00
Andrew Hayward ad1e8d401f Really fixing models 2013-05-31 17:15:29 +01:00
Andrew Hayward 63a18e5d97 Template updates 2013-05-31 17:15:21 +01:00
Erik Christensen daa6b16641 Added migration for signupToken's lastReminder. 2013-05-31 09:06:37 -07:00
Atul Varma 97891532d5 added docs on CSOL_AWS_FAKE_S3_DIR to readme. 2013-05-31 12:06:03 -04:00
Andrew Hayward 23cb55eafd Adding styling for (not-)satisfied rubric 2013-05-31 17:00:55 +01:00
Andrew Hayward aedef8a887 Fixing reviews 2013-05-31 17:00:32 +01:00
Andrew Hayward 4d2a3c7c89 Fixing `application` model definition 2013-05-31 16:59:34 +01:00
Atul Varma 6e5f31d1c8 Merge branch 'master' into s3-fake-storage 2013-05-31 11:52:45 -04:00
Mike Larsson 9d7b65d500 Change /backpack/badges to /mybadges
Remove /backpack
Require login for /mybadges
Add openbadger method to fetch user badges
Add session to query object passed to api methods
Basic /mybadges display (doesn't really work until openbadger changes are made)
2013-05-31 11:52:41 -04:00
Mike Larsson a5a92918c2 Adding basic claim code confirmation screen 2013-05-31 11:50:27 -04:00