b5bb73347a
Merge pull request #6631 from anowlcalledjosh/icon_zoom
...
Make task help icons consistent across browsers
2016-02-04 15:51:49 -06:00
2d6a8e4b6a
renumber armoire Jester Set - fixes https://github.com/HabitRPG/habitrpg/issues/6658
2016-02-05 06:55:29 +10:00
963b4849d2
Merge pull request #6647 from HabitRPG/sabrecat/armoire-201602
...
BGs and Armoire 201602
2016-02-03 13:56:28 -06:00
d8e9b781c8
feat(content): BGs and Armoire 201602
2016-02-02 16:02:50 -05:00
a05f6c46d6
add name for mysterySet201601 (Champion of Resolution Set) - fixes https://github.com/HabitRPG/habitrpg/issues/6642
2016-02-02 15:48:28 +10:00
8ee535b4fa
Merge pull request #6636 from HabitRPG/sabrecat/end-wonderland
...
End Winter Wonderland 2015-16
2016-02-01 16:14:32 -06:00
0fcdc49adb
chore(event): end Winter Wonderland
2016-02-01 17:01:17 -05:00
d9dd031e7f
tests for deleting old todos
2016-01-31 21:24:59 +01:00
0a9391ea75
delete completed todos 30/90 days after completion
2016-01-31 19:45:30 +01:00
f7163519c1
Make task help icons consistent across browsers
...
The zoom CSS property isn't supported by Firefox, and nor is
vertical-align: -webkit-baseline-middle. font-size: 1.5em has the same
effect, and vertical-align: middle ensures that the tooltip doesn't
overlap with the icon.
2016-01-31 15:41:00 +00:00
ea57808176
remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed)
2016-01-31 18:25:37 +10:00
9b9072be45
removed mention of cookies from message about clearing local storage (cookies are not removed)
2016-01-31 18:16:26 +10:00
9b09848655
revert change to static files testing
2016-01-30 19:42:09 +01:00
6851a39dec
test no-cache instead of max-age=0
2016-01-30 19:24:56 +01:00
376e1b7491
Merge pull request #6617 from murraybd/develop
...
Add in missing word your to passMan phrase.
2016-01-30 08:49:08 +10:00
4b5e3cd4fb
Update front.json
2016-01-29 14:24:14 -08:00
e48c47fbec
Revert change to en_GB since the locales files don't get updated through
...
GitHub.
2016-01-29 14:20:06 -08:00
b7ee6f7da0
fix(event): award old Robes to new users, not 2016
2016-01-29 15:12:07 -05:00
2799905169
Add in missing word your to passMan phrase.
2016-01-29 11:37:51 -08:00
5512be01cd
fix(subscription): clarify credits wording
2016-01-29 13:09:40 -05:00
9c809ce2e3
Merge pull request #6612 from HabitRPG/sabrecat/birthday-2016
...
Habit Birthday 2016
2016-01-29 11:57:48 -06:00
91c6ce27c5
feat(event): Habit Birthday 2016
...
Also adds AWS Elastic Beanstalk local config file to .gitignore.
2016-01-28 17:16:01 -05:00
d7782584db
chore(news): Bailey 20160126
2016-01-26 20:31:43 -05:00
f6468a1520
Merge pull request #6587 from HabitRPG/sabrecat/mystery-201601
...
January 2016 mystery items
2016-01-26 14:47:08 -06:00
e7ee38758f
feat(subscription): update migration
2016-01-26 15:30:36 -05:00
953c504867
feat(subscription): mystery gear strings
2016-01-26 15:26:11 -05:00
c6d6e73ae6
feat(subscription): January 2016 mystery items
2016-01-26 15:20:55 -05:00
6c106ad644
fix name of Base Hatching Potion quest reward - https://github.com/HabitRPG/habitrpg/pull/6583
2016-01-26 18:42:22 +10:00
8e8c28725a
Add avatar customizations to content API
2016-01-25 21:59:13 -06:00
0d06d765f2
Merge pull request #6569 from shellbot/quest-accept-highlight
...
Color code quest accepted/rejected text
2016-01-25 08:13:59 +10:00
7d0ad86c43
Color code quest accepted/rejected text
2016-01-22 21:56:39 +00:00
71c4a0de32
Merge pull request #6564 from KristianTashkov/fix-vagrant
...
Return enable symlinks in vagrant and use npm@3
2016-01-22 09:06:43 -06:00
2fec986006
Return enable symlinks in vagrant and use npm@3
2016-01-21 23:28:28 +02:00
f872547264
chore(news): Bailey 2016-01-20
2016-01-20 16:32:12 -05:00
274157d21d
Merge branch 'tylerxo/menu-error-fix' into develop
2016-01-20 14:34:55 -05:00
016b080836
Merge branch 'anowlcalledjosh/add-task-fix' into develop
2016-01-20 14:27:21 -05:00
af53285e01
Merge branch 'proarunas/fix-css-bugs' into develop
2016-01-20 14:17:39 -05:00
f3d6c62484
More closely matching coding style within the file
2016-01-19 19:57:11 -08:00
b5b3a1545b
Adding conditional to prevent undefined object error
2016-01-19 19:53:20 -08:00
77342e5790
Fix 'add task' button jumping around
2016-01-19 20:56:06 +00:00
023ee44ddc
Merge pull request #6553 from dbarnett/develop
...
Open links from task notes into new browser window/context (Fixes #5622 )
2016-01-19 14:54:59 -06:00
c4acd262eb
Merge pull request #6476 from Sighne/sighne/upgrade-amount-users
...
#6460 : upgrade amount of users
2016-01-19 13:41:03 -06:00
7a29542815
Open links from task notes into new browser window/context ( Fixes #5622 )
2016-01-19 11:01:41 -08:00
2848f5d709
Merge branch 'NathanMaton/fix-homepage-text' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:59:49 -05:00
95ee19b4ca
Merge branch 'taldin/faq-wiki-links' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:50:35 -05:00
3a300cb93e
add new emails images
2016-01-19 18:30:57 +01:00
92657fa8af
refactor: Remove unused code in test
2016-01-18 22:40:11 -06:00
2989057dd3
Fix for issue #5182 : Allow cancel editing group infobox
2016-01-18 22:39:06 -06:00
0b5a8bf76d
chore(i18n): update locales
2016-01-18 18:24:44 -06:00
5b740b1a11
Fix setting of environment variables in gulp test tasks in Windows
...
See this stackoverflow link for why this is necessary
http://stackoverflow.com/questions/27084392/code-coverage-for-mocha-in-windows-7/27193866#27193866
2016-01-18 16:55:15 -06:00
Sabe Jones