87dddb178f
Merge branch 'duckspeaker-issue-5570-hall-of-heroes-table-resize' into develop
2015-07-11 16:53:09 -05:00
18ebbdac67
Remove extra class
2015-07-11 16:52:55 -05:00
c9ac32231d
Remove inventory again
2015-07-11 16:37:26 -05:00
4a9ea83d6b
Added whale quest back in, refactor
2015-07-11 16:35:16 -05:00
4acc0c03a8
Add in changes to equipment and seasonalshop
2015-07-11 16:16:29 -05:00
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
74dee2727e
Remove out of date todo
2015-07-11 15:54:09 -05:00
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
ba13f2d9aa
Add locale strings
2015-07-11 15:05:32 -05:00
eeae12b002
Refactore inventory pages
2015-07-11 13:50:30 -05:00
066206f41c
Refactored inventory into separate files
2015-07-11 13:13:00 -05:00
c33a22ceb3
Put locale key creation into private function
2015-07-11 12:07:20 -05:00
94cd0bb852
Use user variable
2015-07-11 11:18:19 -05:00
d2e61bf5ef
Change string to str
2015-07-11 11:15:04 -05:00
cb4b2e43bf
Change variable name to itemList
2015-07-11 11:14:50 -05:00
ef496525a1
change white "Report" button to red "Report Violation" button in chat message flag modal
2015-07-11 21:23:39 +10:00
aabc50e992
surround tables in table-responsive class
2015-07-11 01:19:47 -04:00
22f92e5388
Merge pull request #2 from SabreCat/crookedneighbor/analytics-service-server-side
...
feat(analytics): Server tweaks
2015-07-11 00:19:41 -05:00
305414e152
Merge pull request #5553 from Lokeh/Lokeh/maxHealth
...
maxHealth refactor
2015-07-11 00:18:15 -05:00
48b520509c
fixes https://github.com/HabitRPG/habitrpg/issues/5555
2015-07-11 00:15:55 -05:00
c941511d11
Merge branch 'barbourkd-develop' into develop
2015-07-11 00:11:23 -05:00
50a924e470
Add space
2015-07-11 00:11:02 -05:00
09d85f39fc
Merge pull request #5586 from GitHubSphinx/Sphinx-entry2
...
Introducing a class for buttons allowing wrapping
2015-07-11 00:07:26 -05:00
ddf2489664
Merge pull request #5581 from barbourkd/bugfix/5552
...
Show Extra Notes icon regardless of task ownership.
2015-07-11 00:05:04 -05:00
2722651cc8
Merge branch 'GitHubSphinx-Sphinx-entry3' into develop
2015-07-10 23:47:42 -05:00
3644d43f0a
Remove unnecessary duplication
2015-07-10 23:47:23 -05:00
ab1870c1aa
Merge branch 'TheHollidayInn-groups-remove-message-when-kick' into develop
2015-07-10 23:24:20 -05:00
cdcc085530
Adjust test
2015-07-10 23:21:23 -05:00
acb82f99ce
Remove user's group msg notification when they are kicked from the group
2015-07-10 22:39:17 -05:00
3bbde2a548
fix(analytics): Include GA label for quest actions
2015-07-10 13:57:46 -05:00
175b4fa6e0
fix(analytics): Correct quest key
2015-07-10 13:51:27 -05:00
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
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
9367ff80b6
Use bootstrap table-responsive class instead of inline css.
2015-07-10 11:23:33 -04:00
8d1231a1ee
Remove erroneous var
2015-07-10 09:14:22 -05:00
5e8baf6c92
chore(i18n): update locales
2015-07-10 15:45:58 +02:00
acb0793baf
Correct indentation
2015-07-10 07:49:22 -05:00
2f1d3400bc
Added additional analytics info
2015-07-10 07:47:52 -05:00
d9f8e54d1a
Remove gogle analytics from export
2015-07-10 07:41:07 -05:00
2e6725997d
Swap out ga for analytis service in auth controller
2015-07-10 07:40:01 -05:00
ac02ad3aa2
Update amplitude version
2015-07-10 07:35:45 -05:00
b708095472
make sure hall of heroes table contents fit as table is resized
2015-07-10 00:23:07 -04:00
52620bb69d
Impliment analytics in user actions; remove mixpanel
2015-07-09 22:18:37 -05:00
a6d162bfc0
Update how info is sent to google
2015-07-09 22:17:27 -05:00
d6444f922b
Remove double instantiation
2015-07-09 22:16:50 -05:00
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
44bcb1c233
Merge pull request #5584 from HabitRPG/sabrecat/derby-day
...
Derby Day
2015-07-09 12:32:40 -07:00
d5f97b2781
chore(news): Derby Day Bailey
2015-07-09 14:24:22 -05:00
353dcff908
fix(Market): Sell whale eggs
2015-07-09 13:27:16 -05:00
6cc0a08dc2
feat(event): Derby Day pet quest
2015-07-09 12:57:43 -05:00
Blade Barringer