Commit graph

8741 commits

Author SHA1 Message Date
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
Kevin Gisi
d4a92f58c9 Set Travis to update Mongo 2015-03-26 17:37:25 -04:00
Matteo Pagliazzi
695b00b6bb chore(i18n): update locales 2015-03-26 17:14:28 -04:00
Matteo Pagliazzi
bfebf5d917 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-03-26 17:13:43 -04:00
Tyler Renelle
f3e48093fb feat(analytics): track tour step 2015-03-26 17:11:46 -04:00
Tyler Renelle
e46789c303 feat(analytics): track cron count 2015-03-26 17:11:33 -04:00
Kevin Gisi
2f19907293 Remove comments about broken user registering in API tests 2015-03-26 16:30:15 -04:00
Kevin Gisi
0676da184e Marked some tests as pending, after rebase 2015-03-26 16:24:40 -04:00
Kevin Gisi
e2d956d338 Fix some of the formatting changes - was accidentally testing against a newer version of coffeescript 2015-03-26 16:18:02 -04:00
Kevin Gisi
13f3c4aa2b Repair most Mocha API specs 2015-03-26 16:18:02 -04:00
Kevin Gisi
22c78b8ffa Add Mocha specs for common back into the test suite 2015-03-26 16:18:01 -04:00
Kevin Gisi
78642ac0b8 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-03-26 16:17:35 -04:00
Matteo Pagliazzi
47846606eb chore(i18n): update locales 2015-03-26 19:44:28 +01:00
Matteo Pagliazzi
c591154665 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2015-03-26 19:37:22 +01:00
Tyler Renelle
34f7fe801d feat(analytics): track tour step 2015-03-26 11:50:55 -06:00
Tyler Renelle
e7ca2ab9f3 feat(analytics): track cron count 2015-03-26 11:15:23 -06:00
Alys
e9baafcbc8 Revert "Added Conditional Semantics to group member query to always include the user." 2015-03-26 19:54:51 +10:00
Alys
ecaa1d31ac Merge pull request #4908 from TheHollidayInn/join-button-fix
Added Conditional Semantics to group member query to always include the user.
2015-03-26 18:53:01 +10:00
Alys
cb88862f6f Merge pull request #4911 from TheHollidayInn/drops-add-item-icons
Added icons to Notification for the item that is dropped.
2015-03-26 18:06:55 +10:00