 Blade Barringer
|
a5ce3f58b1
|
Removed original user text from veteran achievement
|
2015-02-17 08:42:43 -06:00 |
|
|
remmz0r
|
7a08ff360f
|
possibly fixed - can't test it as I can't figure out how to make a user an 'originalUser' on mongodb
|
2015-02-17 13:36:12 +08:00 |
|
|
remmz0r
|
feb1e01c4d
|
Fixed original user code in achievements.jade
|
2015-02-17 10:48:27 +08:00 |
|
|
Sabe Jones
|
130261dacf
|
feat(event): End Valentine's
|
2015-02-16 18:15:09 -06:00 |
|
|
Blade Barringer
|
477d3d6085
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
|
2015-02-12 13:32:23 -06:00 |
|
|
Blade Barringer
|
8ac9dc3ced
|
Merge branch 'develop' into common-convert
|
2015-02-10 16:27:46 -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 |
|