Matteo Pagliazzi
|
397a293ca8
|
change text for recapture emails settings
|
2015-02-20 18:15:47 +01:00 |
|
Bill Parrott
|
7042c97d5d
|
removing export functionality to move to its own branch
|
2015-02-17 14:23:55 -06:00 |
|
Bill Parrott
|
b1b478bc74
|
add task export functionality
|
2015-02-16 21:21:49 -06:00 |
|
Blade Barringer
|
75c9b5a978
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/groups.js
src/controllers/payments/index.js
src/controllers/user.js
src/models/user.js
|
2015-02-09 22:21:27 -06:00 |
|
Blade Barringer
|
cc767efa20
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
src/controllers/auth.js
src/controllers/challenges.js
src/controllers/groups.js
src/controllers/members.js
src/controllers/payments/index.js
src/controllers/user.js
src/middleware.js
src/models/user.js
|
2015-02-03 21:13:55 -06:00 |
|
Blade Barringer
|
8a8ce8d80d
|
Moved folders to website directory
|
2015-02-03 14:10:55 -06:00 |
|