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

113 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward 6b3c8374d8 Making sure `readme` is up-to-date 2013-05-01 10:40:27 +01:00
Andrew Hayward f94aec9397 Allowing for further database configuration 2013-05-01 10:40:06 +01:00
Andrew Hayward 39e2bde885 Procfiles, at @jdotpz's behest 2013-05-01 10:39:42 +01: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
Andrew Hayward 57d999527b Centralising user clearance 2013-04-19 13:54:26 +01:00
Andrew Hayward 1c330925c0 Nothing was using that anyway 2013-04-19 13:53:36 +01:00
Andrew Hayward bdcc794617 Making `extractUserData` a bit more flexible 2013-04-19 13:53:23 +01:00
Andrew Hayward 5658c66711 Clarifying doc comment 2013-04-19 13:31:55 +01:00
Andrew Hayward ceb08e92ef Reverting relationship type 2013-04-19 13:17:19 +01:00
Andrew Hayward a22c54cf2c Conforming a little more to the node style guide
http://nodeguide.com/style.html
2013-04-19 11:38:00 +01:00
Andrew Hayward ce41e98b12 Various bits of tidying and refactoring 2013-04-19 11:11:18 +01:00
Andrew Hayward 69c4ba39e9 Complying with expressjs 3.0
http://expressjs.com/api.html#res.redirect
2013-04-19 10:18:17 +01:00
Andrew Hayward 7d923f5fa5 Turning on autoescape
Nunjucks 0.1.8 doesn't support it, but the next release should do, so doing this now before I forget
2013-04-19 10:12:22 +01:00
Andrew Hayward 79e26523f2 Removing debugging logging 2013-04-19 09:08:05 +01:00
Andrew Hayward 8c1d1e6f97 Removing magic number for max age 2013-04-19 09:02:40 +01:00
Andrew Hayward f92910725d Missing semi-colon 2013-04-19 09:02:06 +01:00
Andrew Hayward ace3798b47 Fixing relationship type for learners 2013-04-19 08:58:43 +01:00
Andrew Hayward 173ea1242d Adding a few comments 2013-04-19 08:58:27 +01:00
Andrew Hayward 0083d1f13e Adding an explanation of why this is necessary 2013-04-19 08:56:36 +01:00
Andrew Hayward 1127c4ab0a Dropping `switch` for ternary format 2013-04-18 17:43:04 +01:00
Andrew Hayward c5e8c91653 Switching function declaration styles 2013-04-18 17:37:40 +01:00