Nicholas Thomson
|
075b3e5b4e
|
Denser task edit style
|
2015-03-08 15:14:21 -04:00 |
|
Alice Harris
|
044930b7d3
|
add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it
|
2015-03-07 18:39:43 +10:00 |
|
Sabe Jones
|
21fd8061cf
|
feat(backgrounds): March BGs
|
2015-03-03 21:42:15 -06:00 |
|
Sabe Jones
|
d4f8acd0ef
|
feat(mystery): February 2015
|
2015-02-24 20:15:31 -06:00 |
|
Matteo Pagliazzi
|
6d637e89a2
|
new bailey
|
2015-02-24 19:29:00 +01:00 |
|
Bryce Wojtowicz
|
44478d3792
|
Fixes #4645
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
|
2015-02-22 13:35:50 +08:00 |
|
Bill Parrott
|
98c6526cf7
|
add auto-focus when single/multiple is toggled
|
2015-02-19 08:46:45 -06:00 |
|
Bill Parrott
|
3599eaefaf
|
Merge branch 'develop' into bulk-add-tasks
|
2015-02-17 22:32:28 -06:00 |
|
Sabe Jones
|
47f3122c2d
|
chore(news): Pet rocks Bailey
Also fixes incorrectly named golden rocks.
|
2015-02-17 20:39:04 -06:00 |
|
Bill Parrott
|
4563d22bf0
|
minor updates from code review
|
2015-02-17 14:05:09 -06:00 |
|
Blade Barringer
|
a5ce3f58b1
|
Removed original user text from veteran achievement
|
2015-02-17 08:42:43 -06:00 |
|
Blade Barringer
|
48e688d815
|
Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add
|
2015-02-17 08:05:36 -06:00 |
|
Bill Parrott
|
2de3a5dd55
|
first draft of bulk add
|
2015-02-17 00:25:56 -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 |
|