Commit graph

8759 commits

Author SHA1 Message Date
Alys
43fdf939cc add text to the Market for eggs, hatching potions, and food to explain to new users that the items will also drop 2015-04-03 23:00:15 +10:00
Matteo Pagliazzi
06ffd4db44 fix(i18n): when no lanaguage is passed in the request 2015-04-02 20:06:17 +02:00
Sabe Jones
ad15351ce0 chore(grunt): compile sprites 2015-04-01 23:48:09 -05:00
Sabe Jones
eddade48a4 Merge pull request #4956 from SabreCat/shiny-seed
Shiny seed
2015-04-01 23:40:41 -05:00
Sabe Jones
d4329c7a5a fix(news): Corrections 2015-04-01 23:37:24 -05:00
Sabe Jones
b263ba3099 fix(seasonal): Sneaky floral
Srsly, just don't say it.
2015-04-01 23:19:54 -05:00
Sabe Jones
f0e7f0464c fix(seasonal): NO FLOWERS
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
Sabe Jones
b6a4d65d8c feat(seasonal): Shiny Seed 2015-04-01 22:36:07 -05:00
Matteo Pagliazzi
507c1dd69a feat(i18n): add support for different chinese versions 2015-04-01 18:43:21 +02:00
Matteo Pagliazzi
6aea352309 chore(i18n): update locales 2015-04-01 18:07:14 +02:00
Blade Barringer
9f6f5ed3e6 Update Gruntfile.js
Changed number of spritesheets from 6 to 7
2015-03-31 22:12:58 -05:00
Sabe Jones
bc606d7bd7 Merge pull request #4949 from SabreCat/april-flowers
April flowers...
2015-03-31 20:21:11 -05:00
Sabe Jones
6e1024d8ed fix(flowers): FLOWERS ON FLOWERS 2015-03-31 20:17:01 -05:00
Sabe Jones
bed404cf47 chore(flowers): COMPILE FLOWERS
Required root access.
2015-03-31 19:01:04 -05:00
Sabe Jones
740ddefd76 fix(flowers): AND FIXES 2015-03-31 18:55:07 -05:00
Sabe Jones
1cc3c5539f feat(flowers): AND SLIMES
AND BACKGROUNDS
2015-03-31 18:41:50 -05:00
Sabe Jones
2acef4d42b feat(flowers): FLOWERS 2015-03-31 18:30:22 -05:00
Tyler Renelle
edb50f7081 feat(analytics): a/b on tour (counter, finish button) 2015-03-30 16:57:17 -06:00
Tyler Renelle
e0dae01dda fix(analytics): remove a/b on play button, fixes #4947 2015-03-30 16:43:49 -06:00
Alys
b30a45ace5 Merge pull request #3936 from Alys/notifHiding
updated migration script to allow notifications icons to go grey
2015-03-30 12:22:55 +10:00
Sabe Jones
7d9728f2ff Merge pull request #4939 from SabreCat/spring-customize
Spring customizations
2015-03-29 16:52:09 -05:00
Sabe Jones
15c72b2ea8 chore(grunt): compile sprites 2015-03-29 16:44:50 -05:00
Sabe Jones
6cefe5c9e4 fix(customize): More hair 2015-03-29 16:39:48 -05:00
Matteo Pagliazzi
40bd38af53 add spring 2015 emails images 2015-03-29 22:32:52 +02:00
Matteo Pagliazzi
2937c13f6b chore(i18n): update locales 2015-03-29 22:30:53 +02:00
Sabe Jones
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Alice Harris
61e8b65f14 fix drop notification images for hatching potions 2015-03-28 11:24:58 +10:00
Alys
f1c5b43468 Merge pull request #4931 from gisikw/blade_todo_and_chat_tests
Blade todo and chat tests
2015-03-28 10:04:56 +10:00
Alice Harris
ed0caee149 remove test code 2015-03-28 05:42:00 +10:00
Alice Harris
7a220bee47 update Egg Hunt quest completion message with new content from Leslie 2015-03-28 05:37:42 +10:00
Tyler Renelle
0638e36492 feat(analytics): new "play" variants 2015-03-27 12:52:38 -06:00
Kevin Gisi
23f7d96fa7 Updated compiled habitrpg-shared.js 2015-03-27 08:45:00 -04:00
Kevin Gisi
5c7c986a1f Merge branch 'todo-tests-start' into blade_todo_and_chat_tests 2015-03-27 08:42:47 -04:00
Blade Barringer
80778cbd7c Added additional deletion test 2015-03-27 08:38:05 -04:00
Blade Barringer
4707ba793e Added some basic tests for todo creating, updating and deleting 2015-03-27 08:38:05 -04:00
Blade Barringer
a9232156ef Checks to see if user id and username match chat 2015-03-27 08:33:15 -04:00
Blade Barringer
c5de07d33e Removed deeply eql check for number comparison 2015-03-27 08:33:15 -04:00
Blade Barringer
3c741f431a Deleted extraneous line breaks 2015-03-27 08:33:14 -04:00
Blade Barringer
9be08ad143 Added additional tests for chat functions in api 2015-03-27 08:33:14 -04:00
Alys
fc00fb7103 Merge pull request #4930 from HabitRPG/revert-4836-fix-max-value-0-challenges
Revert "Added hide and error message when a user tries to create a chall...
2015-03-27 20:50:11 +10:00
Alys
1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
Alys
f16ef869a3 Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges
Added hide and error message when a user tries to create a challenge for...
2015-03-27 19:21:51 +10:00
Alys
10a3c0094b Merge pull request #4925 from gisikw/improve_tests
Improve tests
2015-03-27 18:35:51 +10:00
Alys
a3a1a92388 Merge pull request #4849 from TheHollidayInn/add-link-to-challenge-creator
Added link to challenge creator on challenges.
2015-03-27 18:13:33 +10:00
Kevin Gisi
c7e55ef53d Merge branch 'travis_mongodb2_6' into improve_tests 2015-03-26 17:58:09 -04:00
Kevin Gisi
b894ae8af0 Remove comments about broken user registering in API tests 2015-03-26 17:57:58 -04:00
Kevin Gisi
97323eaf23 Marked some tests as pending, after rebase 2015-03-26 17:57:58 -04:00
Kevin Gisi
17c7e199bd Fix some of the formatting changes - was accidentally testing against a newer version of coffeescript 2015-03-26 17:57:58 -04:00
Kevin Gisi
63fea58d08 Repair most Mocha API specs 2015-03-26 17:57:57 -04:00
Kevin Gisi
bcd3d9a0b7 Add Mocha specs for common back into the test suite 2015-03-26 17:57:57 -04:00