Blade Barringer
|
71c65c7a73
|
change coupon route in angular router to promo
|
2015-05-08 21:24:57 -05:00 |
|
Kevin Gisi
|
da81241ebe
|
Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814
|
2015-04-06 02:18:29 -04:00 |
|
Alys
|
5405dbe085
|
revert b0bf033c54 to see if Travis build then stops failing
|
2015-04-06 00:43:27 +10:00 |
|
kholliday
|
c54794fd2a
|
Added previous state tracker and a filter for challenges by a guild if the user has clicked that guild's challenge link.
|
2015-03-15 12:29:45 -05: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
|
d2eafdd021
|
Started moving public folder stuff back to website
|
2015-02-03 14:02:34 -06:00 |
|