981e1f553f
Merge pull request #5468 from HabitRPG/sabrecat/analytics-service
...
Analytics service
2015-06-23 12:36:22 -07:00
fcd278c2f6
fix(analytics): Pass tests
...
Restores the "UUID" property so that tests no longer fail. Corrects various typos in analytics service test. Moves landing page tracking to the Jade file to avoid duplicate tracking.
2015-06-23 10:11:03 -05:00
a7e1c30dca
remove http from link to fonts.googleapis.com to prevent Mixed Content Warnings - partial fix for #5464
2015-06-23 16:47:18 +10:00
f8e3120b3a
fix(analytics): Move landing page tracking
...
...to AuthCtrl
2015-06-22 18:49:15 -05:00
2ce1daffb8
feat(analytics): call service from app
2015-06-22 16:35:17 -05:00
56a461c513
Revert "feat(analytics): Analytics service"
...
This reverts commit 9a0e31db40
2015-06-22 14:14:33 -05:00
8579bb86df
Merge branch 'develop' into sabrecat/analytics-service
2015-06-22 12:37:17 -05:00
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
5ab3a80b57
Closes #5360
2015-06-21 17:49:59 -05:00
3641bea441
feat(event): Summer Splash 2015
...
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
2015-06-20 23:07:14 -05:00
f6fafc5b6d
WIP(event): Summer Splash 2015
2015-06-19 10:42:20 -05:00
07b41d16b6
Revert "Revert "new GSalvadi audio theme, created by NomindTR""
...
This reverts commit 30a091e14e
2015-06-18 22:19:35 +10:00
bcc99791dd
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
2015-06-17 19:13:13 -05:00
c1b429c8bf
Adjust spacing; remove comment
2015-06-17 19:12:49 -05:00
4042c1ce7a
Merge branch 'GitHubSphinx-Sphinx-entry1' into develop
2015-06-17 19:06:56 -05:00
3ff310294b
Hide row if not part of reward; add one-time bindings
2015-06-17 18:57:15 -05:00
e150a4d4f6
Merge branch 'develop' into hairlessbear-add_quest_rewards_to_pending_quest
2015-06-17 18:51:30 -05:00
685c09aa0d
Merge branch 'task_service_refactoring_v2' into develop
2015-06-17 18:46:13 -05:00
ad7e5a6dc9
feat(pets): Cuttlefishies
2015-06-17 17:26:36 -05:00
30a091e14e
Revert "new GSalvadi audio theme, created by NomindTR"
2015-06-18 07:39:38 +10:00
3046bbb0d7
Added quest rewards to pending quest display
2015-06-17 13:21:17 -04:00
910fc2f213
Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15
...
new GSalvadi audio theme, created by NomindTR
2015-06-17 21:39:39 +10:00
3ab27f32d2
Refactored editTask into TaskService
2015-06-16 23:11:04 -05:00
1801ad0bce
Add authors to bailey and correct refresh text
2015-06-16 17:59:59 -05:00
7152bea4fe
chore(news): 6/16 misc Bailey
2015-06-16 16:59:27 -05:00
0cd1ffb794
Fixing button caption for selling Eggs and Potions in the Market
2015-06-16 19:06:53 +05:00
14983cb996
replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet
2015-06-16 13:10:49 +10:00
071f2796db
Adjusting challenges view translation
...
- Make "Back to all challenges" button translatable
- Allow some flexibility for the line "#_of_gems gem_icon Prize" - this
is made following the practices with linkstart/linkend implementation
- prize "string" is left as is because used as a placeholder
- code comment "prize" had to be moved 1 line up - before the p (as no
room for it is left inside the p) which however seems OK to me, because
the comments above and below has been made the same way before
2015-06-16 02:37:18 +05:00
ecb2544cdc
Merge pull request #5396 from hairlessbear/remove_freeRebirth
...
Removed 'freeRebirth' from user model and everywhere else in codebase
2015-06-15 08:00:18 -05:00
b6b2873faf
add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015
2015-06-15 20:33:14 +10:00
92e2393114
Merge branch 'hairlessbear-pending_quest_display' into develop
2015-06-14 16:20:20 -05:00
109acb0d97
Correct ng-style syntax
2015-06-14 16:15:31 -05:00
4b3d82613e
Allow leader to be shown in member list; do not allow leader to kick out self from group
2015-06-14 12:54:21 -05:00
795710ce63
Rename boss folder to quests
2015-06-14 11:05:53 -05:00
35f2a36215
Split out pieces of boss jade files
2015-06-14 10:48:46 -05:00
178e7b1c8c
Move participants to partial
2015-06-14 10:14:05 -05:00
44a556f4fe
Refactor to use tabset
2015-06-14 09:01:28 -05:00
a6e0d5f2de
Merge branch 'develop' into hairlessbear-pending_quest_display
2015-06-14 08:44:25 -05:00
b4f4db9c1d
Create jade variabel for ultimate gear check
2015-06-14 01:56:32 -05:00
c44ca785aa
Merge branch 'develop' into SabreCat-develop
2015-06-14 01:50:16 -05:00
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
41b1abba3a
Checkout help button changes
2015-06-13 23:16:12 -05:00
0eb8caec23
Various task ui improvements
...
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
2015-06-13 22:29:06 -05:00
703a2511da
Merge branch 'TheHollidayInn-challenges-owner-filter' into develop
2015-06-13 19:42:54 -05:00
6513527d8b
Refactor challenges filter
2015-06-13 19:41:41 -05:00
ddb28c0305
Merge branch 'develop' into TheHollidayInn-challenges-owner-filter
2015-06-13 18:23:51 -05:00
9d4713bdf3
Merge pull request #5392 from GitHubSphinx/Sphinx-entry1
...
Still addressing #5202 - making Click for help button translatable
2015-06-13 18:01:57 -05:00
31e7b052a1
Removed 'freeRebirth' modal and its associated strings
2015-06-13 14:18:03 -04:00
8faf96f5b9
Refactored filters
2015-06-13 12:39:11 -05:00
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
Sabe Jones