Paul Rich
|
56a00efb19
|
Fix for Issue #3517 Display Current Page Name
Revision for Fix for issue #3517
lint: Remove extraneous white space in app.js file
fix: Correct attribute from pageTitle to title in $state interface
|
2015-12-28 07:53:51 -06:00 |
|
Sabe Jones
|
ad347090c3
|
Merge remote-tracking branch 'origin/pr/5968' into develop
Conflicts:
website/views/options/social/challenge-box.jade
|
2015-11-26 13:33:33 -05:00 |
|
Blade Barringer
|
431bbd762f
|
Move header assignment to app level
|
2015-11-12 12:23:42 -06:00 |
|
TheHollidayInn
|
43c9683a8b
|
Added param to filter challenges by guild when a challenge is first clicked from guild
|
2015-09-21 19:35:14 -05:00 |
|
Sabe Jones
|
78d4989544
|
WIP(event): Summer Splash cont'd
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
|
2015-07-08 16:13:23 -05:00 |
|
Blade Barringer
|
b72b14fe6c
|
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
|
2015-06-28 21:07:32 -05:00 |
|
Sabe Jones
|
83e0eb374f
|
fix(analytics): Load scripts in factory
|
2015-06-22 16:32:44 -05:00 |
|
Sabe Jones
|
196490ecb1
|
WIP(analytics): Enable service
|
2015-06-22 15:44:33 -05:00 |
|
Sabe Jones
|
56a461c513
|
Revert "feat(analytics): Analytics service"
This reverts commit 9a0e31db40.
|
2015-06-22 14:14:33 -05:00 |
|
Sabe Jones
|
9a0e31db40
|
feat(analytics): Analytics service
Inject Analytics service into controllers where needed. Call Analytics service instead of GA or Mixpanel for tracking within the app.
|
2015-06-22 11:21:02 -05:00 |
|
Blade Barringer
|
14fe29dd4a
|
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
|
2015-06-14 16:33:38 -05:00 |
|
Kevin Gisi
|
23f62a9c40
|
Change idle refresh to every six hours
|
2015-06-09 04:24:58 -04:00 |
|
Kevin Gisi
|
ab968a4744
|
Refresh if idle > 60min
|
2015-06-09 03:09:31 -04:00 |
|
Blade Barringer
|
c1501db292
|
Refactor chat related things into own service
|
2015-05-30 12:08:32 -05:00 |
|
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 |
|