Commit Graph

10379 Commits

Author SHA1 Message Date
Blade Barringer 2722651cc8 Merge branch 'GitHubSphinx-Sphinx-entry3' into develop 2015-07-10 23:47:42 -05:00
Blade Barringer 3644d43f0a Remove unnecessary duplication 2015-07-10 23:47:23 -05:00
Blade Barringer ab1870c1aa Merge branch 'TheHollidayInn-groups-remove-message-when-kick' into develop 2015-07-10 23:24:20 -05:00
Blade Barringer cdcc085530 Adjust test 2015-07-10 23:21:23 -05:00
TheHollidayInn acb82f99ce Remove user's group msg notification when they are kicked from the group 2015-07-10 22:39:17 -05:00
Sabe Jones 3bbde2a548 fix(analytics): Include GA label for quest actions 2015-07-10 13:57:46 -05:00
Sabe Jones 175b4fa6e0 fix(analytics): Correct quest key 2015-07-10 13:51:27 -05:00
Sabe Jones 5e89ae200d feat(analytics): Server tweaks
Remove duplicate browser-side tracking for new user registration. Move quest tracking to server side and expand to include all quest accept/reject actions.
2015-07-10 13:47:03 -05:00
GihHubSphinx cc00bd17b3 Don't show unneeded spaces between buttons in chat
Don't show spaces in front of a button in a chat message if button
itself is not shown
2015-07-10 20:47:24 +05:00
Joe Gallo 9367ff80b6 Use bootstrap table-responsive class instead of inline css. 2015-07-10 11:23:33 -04:00
Blade Barringer 8d1231a1ee Remove erroneous var 2015-07-10 09:14:22 -05:00
Matteo Pagliazzi 5e8baf6c92 chore(i18n): update locales 2015-07-10 15:45:58 +02:00
Blade Barringer acb0793baf Correct indentation 2015-07-10 07:49:22 -05:00
Blade Barringer 2f1d3400bc Added additional analytics info 2015-07-10 07:47:52 -05:00
Blade Barringer d9f8e54d1a Remove gogle analytics from export 2015-07-10 07:41:07 -05:00
Blade Barringer 2e6725997d Swap out ga for analytis service in auth controller 2015-07-10 07:40:01 -05:00
Blade Barringer ac02ad3aa2 Update amplitude version 2015-07-10 07:35:45 -05:00
Joe Gallo b708095472 make sure hall of heroes table contents fit as table is resized 2015-07-10 00:23:07 -04:00
Blade Barringer 52620bb69d Impliment analytics in user actions; remove mixpanel 2015-07-09 22:18:37 -05:00
Blade Barringer a6d162bfc0 Update how info is sent to google 2015-07-09 22:17:27 -05:00
Blade Barringer d6444f922b Remove double instantiation 2015-07-09 22:16:50 -05:00
GihHubSphinx 00f7af7807 Introducing a class for buttons allowing wrapping
New .btn-wrap class for buttons with long text allowing wrapping
2015-07-10 02:33:09 +05:00
Sabe Jones 44bcb1c233 Merge pull request #5584 from HabitRPG/sabrecat/derby-day
Derby Day
2015-07-09 12:32:40 -07:00
Sabe Jones d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -05:00
Sabe Jones 353dcff908 fix(Market): Sell whale eggs 2015-07-09 13:27:16 -05:00
Sabe Jones 6cc0a08dc2 feat(event): Derby Day pet quest 2015-07-09 12:57:43 -05:00
Blade Barringer 7bc74f2c11 Track unsubscription 2015-07-08 21:47:57 -05:00
Kevin Barbour 5a57895077 Show Extra Notes icon regardless of task ownership.
fixes #5552
2015-07-08 20:48:42 -04:00
Kevin Barbour d6aef8ee24 Prevent "Resting in the Inn" message when viewing challenges.
fixes #5559
2015-07-08 20:22:23 -04:00
Sabe Jones c0d35dc472 WIP(quests): Quests page cont'd
Test fixes and addition of function for buying Quests with Gold
2015-07-08 17:43:08 -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
Sabe Jones 46543f9072 feat(event): Derby Day mount 2015-07-08 16:07:37 -05:00
TheHollidayInn 6e7d94a317 Added keyboard selection for rewards and habits 2015-07-08 08:36:00 -05:00
Blade Barringer c92cf58acb Track purchases with analytics service 2015-07-08 08:11:27 -05:00
Blade Barringer f58dbb2a68 Send only analytics for use in cron 2015-07-08 08:10:48 -05:00
Blade Barringer 1c2ec66c93 Add format user data function to analytics server 2015-07-08 08:09:43 -05:00
Blade Barringer 73b2d816d1 Track cron with analytics service 2015-07-08 08:08:45 -05:00
Blade Barringer c4c4f4a3a5 Add analytics to utils 2015-07-08 07:47:52 -05:00
Blade Barringer 7dc64f8448 Update iOS link to point to new app in footer 2015-07-07 21:30:08 -05:00
Blade Barringer d2b74f11dd Create analytics.track 2015-07-07 18:00:41 -05:00
Sabe Jones 3dd2493fed chore(news): iOS release Bailey 2015-07-07 13:27:19 -05:00
TheHollidayInn 0089a260c7 Added opacity to hide input field. Added enter to submit input fields. Added background color change when user focuses task with keyboard 2015-07-06 23:22:35 -05:00
Matteo Pagliazzi fa8e2785bd chore(i18n): update locales 2015-07-06 22:11:26 +02:00
Blade Barringer e6ee4d303c Set up purchase tracking 2015-07-06 08:11:31 -05:00
Matteo Pagliazzi 3a2422086f fix(french): use env.t client side 2015-07-06 13:39:18 +02:00
Blade Barringer fb5ad3830c Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-07-05 22:06:04 -05:00
Blade Barringer 6553c9b346 Merge branch 'duckspeaker-issue-5563-pin-or-replace-unregistered-packages' into develop 2015-07-05 22:04:07 -05:00
Blade Barringer ed5afb85a5 Alphabetize dependencies in bower.json 2015-07-05 22:01:16 -05:00
Blade Barringer 1ae505eabd Adjust tags for bower; Set github link to main habitrpg org 2015-07-05 21:58:48 -05:00
Blade Barringer fca4ef8d3f Remove changelog; pin to lefnire's version of icalendar 2015-07-05 21:57:39 -05:00