mozilla
/
CSOL-site
зеркало из https://github.com/mozilla/CSOL-site.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
130 коммитов 6 Ветки 101 Тег 14 MiB
Граф коммитов

130 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward ddee192ede Merge branch 'master' into api 2013-05-10 10:16:02 +01:00
Mike Larsson ecd113b3e4 Merge pull request #178 from stenington/api-test 
api.js tests
 2013-05-09 11:21:51 -07:00
Mike Larsson 0da5bd8990 Adding getBadge tests 2013-05-09 14:16:02 -04:00
Mike Larsson cd027b602d Adding tests for api.js 2013-05-09 14:16:02 -04:00
Mike Larsson 743a7d3169 Merge pull request #173 from andrewhayward/api 
[WIP] Pull data from remote data source
 2013-05-09 11:15:19 -07:00
Andrew Hayward 6752704157 More sensible naming of badges 2013-05-09 18:28:41 +01:00
Andrew Hayward 3637cb45c0 Reducing redundant redundancy 2013-05-09 18:27:55 +01:00
Andrew Hayward e9aa537530 Passing through error code 2013-05-09 14:31:17 +01:00
Andrew Hayward 9e7281d3e9 Default badge ID 2013-05-09 14:26:15 +01:00
Andrew Hayward 054b3e7067 Adding some method functionality to `remote` 2013-05-09 14:26:04 +01:00
Andrew Hayward 8cac79ee5c Removing redundant setting of content type 2013-05-09 14:24:51 +01:00
Andrew Hayward 607249807d Adding `default_query` parameter to API middleware 2013-05-09 14:24:16 +01:00
Andrew Hayward 6ed8ec038c Moving page size to default query 2013-05-09 14:23:29 +01:00
Andrew Hayward e633ea302f Bailing out - this is a programmer error 2013-05-08 17:52:21 +01:00
Andrew Hayward 3a7c3cc8d8 Changing my mind about data availability 2013-05-08 15:55:23 +01:00
Andrew Hayward fa1b8d7baa Making use of new API 2013-05-08 15:14:31 +01:00
Andrew Hayward 7df4174cc6 Tidying up templates for proper badge data 2013-05-08 15:14:03 +01:00
Andrew Hayward 58cfc14657 Sorting, and adding `request` 2013-05-08 15:13:40 +01:00
Andrew Hayward aa6bdec4e2 Beginnings of an API 2013-05-08 15:13:14 +01:00
Chris McAvoy ca80a354a3 adding cookie secret to readme 2013-04-29 17:03:38 -05: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 6d4466d5ca Getting this right too might also help 2013-04-23 12:33:49 +01:00
Andrew Hayward 0dd545e5ed Getting it right might help 2013-04-23 12:33:29 +01:00
Andrew Hayward f1b66701fb Tidying up a bit 2013-04-23 11:55:46 +01:00
Andrew Hayward 6a697a5dfc Discarding `find` in favour of single `create` 
Relying on `create` failing based on duplicate keys where appropriate
 2013-04-22 18:11:25 +01:00
Andrew Hayward 3bb978183c Making duplicate email errors more obvious 2013-04-22 18:10:31 +01:00
Andrew Hayward 2e5fedd4f3 Adding value to email field 2013-04-22 18:08:22 +01:00
Andrew Hayward 87b4b26f1b Oops again 2013-04-22 18:04:29 +01:00
Andrew Hayward 99b8286616 Oops. 2013-04-22 17:57:49 +01:00
Andrew Hayward 4c45bc0892 `username` will never be in `signup` at this point 2013-04-22 17:30:22 +01:00
Andrew Hayward 5bea387971 Removing magic numbers from crypt hashing 2013-04-22 16:27:46 +01:00
Andrew Hayward b8b7e683d5 Merge pull request #148 from andrewhayward/challenges 
Template fixes
 2013-04-22 05:43:54 -07:00
Andrew Hayward 54f79d2f74 Template fixes 2013-04-22 13:43:08 +01:00
Andrew Hayward 5f37c15363 Merge pull request #147 from andrewhayward/learn 
That really shouldn't be there.
 2013-04-22 05:40:15 -07:00
Andrew Hayward 40b848b2a9 That really shouldn't be there. 2013-04-22 13:38:48 +01:00
Andrew Hayward 3d4e40f3e0 Merge pull request #146 from andrewhayward/challenges 
Basic 'challenge' layout
 2013-04-22 05:38:04 -07: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 2c6eb61454 Removing challenges, adding activities 2013-04-22 13:13:31 +01: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 23e4498215 Adding the challenge thumbnail 2013-04-22 12:08:32 +01: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 715d1a6248 Putting `program`s back for now 2013-04-22 12:07:43 +01:00
Andrew Hayward cbda6e6c1d Simplifying `learn` controller 
Removing all references to models, etc.
 2013-04-22 12:07:08 +01:00
Andrew Hayward 7acc557827 Merge pull request #138 from andrewhayward/homepage 
Merging homepage layout
 2013-04-19 07:05:23 -07: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 b4bf4d38c3 Test files 2013-04-19 14:31:31 +01:00
Andrew Hayward 2ac12ed6a7 Minor fix 2013-04-19 13:54:42 +01:00