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

606 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward fc782afa3b Not sure what this is doing 2013-06-03 08:54:28 +01:00
Ian Dees e31b767d1f Add the item state as a CSS class for future styling. 2013-06-03 03:38:43 +00:00
Ian Dees b4bf0e7a69 Merge the application and badge together so we can show more data. 2013-06-03 03:33:03 +00:00
Ian Dees f26c496c71 Include the badge id when normalizing the badge representation. 2013-06-03 02:28:56 +00:00
Andrew Hayward 5c5af600f5 Adding better description to 'delete' button 2013-06-03 02:57:13 +01:00
Paul Smith f5ade92d58 Minor 2013-06-02 21:53:19 -04:00
Paul Smith 8c0531b70c Remove stubbed out delete buttons for now 2013-06-02 21:47:12 -04:00
Paul Smith d24d38aaa1 Converting back to tabs per IRC comment 2013-06-02 21:43:40 -04:00
Andrew Hayward 3a47b8f3e1 Dashboard bits and pieces 2013-06-03 02:43:34 +01:00
Andrew Hayward 1bc961396d Preventing initial application creation
Applications were being created when first visiting the page, rather than on first submission, potentially leading to a lot of orphan applications.
2013-06-03 02:18:24 +01:00
Andrew Hayward 478ba31336 Merge branch 'master' into guardians
Conflicts:
	controllers/backpack.js
	middleware.js
	openbadger.js
	views/layout.html
2013-06-03 01:05:11 +01:00
Ian Dees 0aa6352489 Customize the item for the applications list.
Thanks to https://github.com/stenington/CSOL-site/compare/my-applications
2013-06-02 23:28:19 +00:00
Andrew Hayward 8e99417e4e Fixing upload form accessibility 2013-06-02 23:40:27 +01:00
Michael Ballard f03c0fef5f active menu item border fix 2013-06-02 17:49:27 -04:00
Michael Ballard 90652e590a landing page adjustments for new menu items 2013-06-02 17:35:17 -04:00
Paul Smith f18eaca319 Add rough display of similar badges in detail view 2013-06-02 17:08:54 -04:00
Paul Smith b7b5baabe6 Moved badge thumbnail into an include for reuse 2013-06-02 17:02:00 -04:00
Andrew Hayward 40ba66409d Removing pointless logging 2013-06-02 21:34:49 +01:00
Paul Smith 93f423cbaf Add delete button to badge detail page
Not wired up to any action yet
2013-06-02 16:33:53 -04:00
Andrew Hayward f52fa2408a Fixing `pageNum` not being `null` problem 2013-06-02 21:24:46 +01:00
Paul Smith 0c92894529 Add issued by and issued to on badge detail view 2013-06-02 16:24:21 -04:00
Andrew Hayward 272e53a7c0 Merge branch 'master' into pagination 2013-06-02 21:19:39 +01:00
Chris McAvoy 6da830ffe1 Merge pull request #360 from paulsmith/mybadges
[WIP] Implement /mybadges
2013-06-02 13:17:36 -07:00
Andrew Hayward cfd23e03ac Merge branch 'master' into filtering 2013-06-02 21:12:32 +01:00
Andrew Hayward 4a25343684 Updating filtering template 2013-06-02 21:00:15 +01:00
Andrew Hayward 3150d8d41f Fixing filter styling 2013-06-02 20:59:47 +01:00
Paul Smith 6aae2d8303 Add placeholder for badge description
Awaiting the 'description' field in the openbadger API call, see
https://github.com/mozilla/openbadger/issues/175
2013-06-02 15:42:51 -04:00
Paul Smith e931605bb3 Add badge delete icon
Not wired up to any action yet though
2013-06-02 15:38:43 -04:00
Chris McAvoy d8126ed360 Merge pull request #362 from mozilla/newrelic
Add newrelic to app
2013-06-02 12:30:13 -07:00
Ian Dees b0715d5e87 Point to a different template for applications. 2013-06-02 19:25:02 +00:00
Ian Dees d1ecbe6edc Initial impl of myapplications. 2013-06-02 19:14:03 +00:00
JP Schneider 705808fc28 Add newrelic to app 2013-06-02 14:05:23 -05:00
Paul Smith 9a2a5b505f Fix image URL 2013-06-02 14:13:09 -04:00
Chris McAvoy 894fb41760 Update README.md
adding link to copy doc
2013-06-02 13:00:45 -05:00
Chris McAvoy f683afb791 Merge pull request #359 from paulsmith/master
Getting started docs in README
2013-06-02 10:54:27 -07:00
Andrew Hayward dbaad38eaa Fixing `openbadger` filtering 2013-06-02 18:42:33 +01:00
Joe Curlee 5cffe9e77e program detail page now displays real data 2013-06-02 12:03:24 -05:00
Paul Smith aad9d9e0fb Trivial indentation cleanup 2013-06-02 13:00:21 -04:00
Atul Varma abc6ffcd84 Merge pull request #357 from toolness/issue-356
Fix failing api middleware test.
2013-06-02 09:09:40 -07:00
Paul Smith e20a11ba79 Docs: starting the app server 2013-06-02 12:08:38 -04:00
Paul Smith 439aaf5ae9 Docs: add getting started section 2013-06-02 11:57:02 -04:00
Andrew Hayward 4e99005ad6 Merge branch 'master' into filtering 2013-06-02 15:51:40 +01:00
Andrew Hayward c0460b5dad Fixing API query generation bug
`DEFAULT_QUERY` was remembering previous query
2013-06-02 14:55:36 +01:00
Andrew Hayward f172ece0d2 Fixing pagination 2013-06-02 14:43:11 +01:00
Atul Varma 460933d499 Added better test output and docs from mozilla/openbadger project.
Also removed an empty test file.
2013-06-02 09:39:35 -04:00
Atul Varma 8ff6528051 Fix failing api middleware test.
Not sure if it's right to throw a "bad gateway" error if the server is
returning 404, though, so I'd like this reviewed. This should fix #356.
2013-06-02 08:59:54 -04:00
Atul Varma 0a65f9cab4 add travis badge to readme. 2013-06-02 08:51:19 -04:00
Atul Varma e051d341c3 Added .travis.yml. 2013-06-02 08:47:17 -04:00
Atul Varma beba59045e allow openbadger.test.js to pass if required env vars aren't defined. 2013-06-02 08:42:50 -04:00
Chris McAvoy 60b8faad27 updated copy on /claim page 2013-06-01 19:11:14 -05:00