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
7cc618b32c
Add alt attributes for images on front page
...
Some images have an empty alt attribute (alt=""); this isn't a mistake,
it's part of the HTML spec for images that don't add any information.
Debatably, some images marked up as such with this commit do add
information, but that information (e.g. what the Habitica UI looks
like from the intro image) isn't likely to be useful to someone not
able to see.
It's also difficult to convey purely visual concepts like the arrows
with alt-text, especially as the arrows themselves are not images and
therefore cannot have an alt attribute.
Fixes #6560 .
2016-01-26 17:35:35 +00:00
ff2ebe46b8
Fixing jade and angular syntax miscues
2016-01-26 07:59:31 -08:00
588fdc6cad
Properly chaining classes in jade
2016-01-26 07:52:35 -08: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
fd157785f4
Adding text-center to container rather than individual elements
2016-01-25 17:42:50 -08:00
77cfc99b59
Adding user details to the removal modal
2016-01-25 17:37:18 -08: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
fc8c377eab
Merge pull request #6455 from querry43/docker-changes
...
Docker changes
2016-01-18 16:13:18 -06:00
d44ff94acb
Merge pull request #6547 from vIiRuS/guidelinespage
...
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 15:37:58 -06:00
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
9b008f71a0
fix(CSS): remove redundant style
2016-01-18 16:13:24 -05:00
fe58129cd3
remove Completion from Octopus quest text - ref https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-172600908
2016-01-19 06:18:49 +10:00
d0de12abac
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 20:52:27 +01:00
fd62e39f20
fix spelling mistake: crystaline -> crystalline
2016-01-19 04:47:50 +10:00
79f2dc6b1a
tests: Update gulp task to use npm scripts
2016-01-18 11:10:22 -06:00
Matteo Pagliazzi