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

42 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward f0bcc6c657 Merging 2013-05-17 16:42:35 +01:00
Mike Larsson ba23cd2751 Adds issuers endpoint to Open Badger API client, and passes
the data along to the About page. About page renders org list
in three columns.
2013-05-17 11:14:05 -04:00
Andrew Hayward 2f708fd84f Doing (error) messages somewhat more centrally 2013-05-17 14:15:09 +01:00
Andrew Hayward 410793d240 Merge pull request #250 from coryshaw/master
Template Updates
2013-05-16 09:02:18 -07:00
Andrew Hayward b9eb3d95df A start at standardising error handling 2013-05-16 14:16:33 +01:00
Cory Shaw 936d9d0761 Template and styles for single activity 2013-05-15 16:40:31 -06:00
Cory Shaw 15b8f44eb3 updated filter menu and icons 2013-05-15 14:41:17 -06:00
Mike Larsson cdace7d48a Merge pull request #246 from stenington/api-v2
[WIP] Talking to OpenBadger v2 API
2013-05-15 12:39:33 -07:00
Cory Shaw 74d48c6347 updates to homepage
https://github.com/mozilla/CSOL-site/issues/116#ref-pullrequest-13402271
2013-05-15 11:06:10 -06:00
Andrew Hayward 039659e521 Merge pull request #170 from coryshaw/master
Updates to header/footer styles
2013-05-15 05:12:24 -07:00
Mike Larsson bf5ce3393e Incorporating /v2/program and /v2/programs endpoints, and
refining badge endpoints. The program endpoints currently
do not return enough data from the OpenBadger side to fully
build out their pages. I'm also not sure about the controllers
organizational strategy, and whether I'm breaking it. Changing
site main navigation and major endpoints to "Earn, Learn, Level Up".
2013-05-14 16:18:25 -04:00
Andrew Hayward 57e1745781 Minor copy changes to sign-up flow 2013-05-10 16:15:23 +01:00
Andrew Hayward 7df4174cc6 Tidying up templates for proper badge data 2013-05-08 15:14:03 +01:00
Cory Shaw 340231f895 Tweaks to Header/Footer per https://github.com/mozilla/CSOL-site/issues/60#issuecomment-16535791 2013-05-01 16:56:28 -10:00
Brian J Brennan afdbd2a2d6 Merge pull request #115 from andrewhayward/auth
Sign-up process
2013-04-23 12:35:45 -07:00
Andrew Hayward 2e5fedd4f3 Adding value to email field 2013-04-22 18:08:22 +01:00
Andrew Hayward 54f79d2f74 Template fixes 2013-04-22 13:43:08 +01:00
Andrew Hayward 7c8e3d0428 Basic 'challenge' layout 2013-04-22 13:36:50 +01:00
Andrew Hayward 276c5ed9b2 Merge pull request #145 from andrewhayward/learn
Nothing to see here.
2013-04-22 05:14:30 -07:00
Andrew Hayward 9f8da68938 Basic page layout 2013-04-22 13:13:07 +01:00
Andrew Hayward 8273e5152c Merge pull request #100 from andrewhayward/learn
Simplified this pull request greatly, so pushing it through to get more wireframes up.
2013-04-22 04:10:39 -07:00
Andrew Hayward 98527f840f Setting a default page title in 'Learn' 2013-04-22 12:08:16 +01:00
Andrew Hayward 11f04bd940 Fixing filter logic 2013-04-22 12:08:04 +01:00
Andrew Hayward 6f6dfa025d Getting homepage in line with wireframes
https://github.com/mozilla/CSOL-site/issues/116
2013-04-19 15:03:47 +01:00
Andrew Hayward 1c330925c0 Nothing was using that anyway 2013-04-19 13:53:36 +01:00
Andrew Hayward ab4adb1a60 New range function means this needs to be -1
Parsing priority error in nunjucks means the -1 has to be wrapped, otherwise you get a template error - should probably file a bug for that
2013-04-18 17:33:25 +01:00
Andrew Hayward d52912bf9c Form updates 2013-04-18 15:32:49 +01:00
Andrew Hayward 57db6356f1 Adding CSRF protection before we forget 2013-04-18 12:11:06 +01:00
Andrew Hayward fc3acd5850 Fixing ID 2013-04-18 11:48:38 +01:00
Andrew Hayward f6f9669812 Displaying messages at a global level 2013-04-17 17:39:52 +01:00
Andrew Hayward 4352798909 Signup-form alterations
* Labels
* Removing second password field
2013-04-17 17:38:30 +01:00
Andrew Hayward d08d25a412 Parent sign-up changes 2013-04-16 12:11:52 +01:00
Andrew Hayward ec26883e5c Somewhat modified sign-up flow
See https://github.com/mozilla/CSOL-site/issues/59
2013-04-12 13:27:30 +01:00
Andrew Hayward 1fe3b5dbd9 A rough start on the 'learn' subsection 2013-04-11 12:53:36 +01:00
Andrew Hayward 4da03793e4 Updating nab menu as per latest IA 2013-04-10 22:51:28 +01:00
Cory Shaw 40a7716209 updated footer dom and styles 2013-04-07 12:22:07 -06:00
Cory Shaw bc11956b70 Design tweaks, polish, a few responsive styles 2013-04-04 16:53:17 -06:00
Cory Shaw 6db74393b2 Added Bootstrap Less Files, Incorporated Bootswatch Theme and variables.less, added responsive styles 2013-04-01 12:21:12 -06:00
Andrew Hayward b0698907fe A load more changes 2013-03-28 16:42:32 +00:00
Andrew Hayward 3a1a2bcb15 Ch-ch-ch-ch-changes 2013-03-28 13:14:16 +00:00
Andrew Hayward 96ee29bd00 Lots of templates! 2013-03-27 17:59:51 +00:00
Brian J Brennan daa4bb8bac Skeleton 2013-03-24 16:52:09 -04:00