5163ee466b
Fixes more bad git-fu. New tag creation works now.
2015-03-31 23:23:24 -04:00
9f6f5ed3e6
Update Gruntfile.js
...
Changed number of spritesheets from 6 to 7
2015-03-31 22:12:58 -05:00
bc606d7bd7
Merge pull request #4949 from SabreCat/april-flowers
...
April flowers...
2015-03-31 20:21:11 -05:00
6e1024d8ed
fix(flowers): FLOWERS ON FLOWERS
2015-03-31 20:17:01 -05:00
79606736a1
Ensure Bailey always displays the most recent message.
...
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
static html file.
* Updated the new-stuff.jade modal template to use a $rootScope property.
* Added a special case to openModal for the newStuff template, by which it
fetches the flat file, marks it as trusted HTML, and sets it to the
$rootScope property before rendering the modal.
2015-03-31 20:38:15 -04:00
bed404cf47
chore(flowers): COMPILE FLOWERS
...
Required root access.
2015-03-31 19:01:04 -05:00
740ddefd76
fix(flowers): AND FIXES
2015-03-31 18:55:07 -05:00
1cc3c5539f
feat(flowers): AND SLIMES
...
AND BACKGROUNDS
2015-03-31 18:41:50 -05:00
2acef4d42b
feat(flowers): FLOWERS
2015-03-31 18:30:22 -05:00
fb87f00929
Finalize mobile view for carousels
2015-03-31 15:40:05 -07:00
2aaac47815
Added static versino, responsive, optnsive, optimized images
2015-03-31 13:40:09 -07:00
e35c753bdc
Fixed errors caused by poor git-fu.
...
Forgot I was on a detached head, made a commit, and failed hard at
cherry-picking the commit back to the correct branch.
2015-03-31 08:55:16 -04:00
5506d5a39e
make Tools of the Trade weaker
2015-03-31 20:52:11 +10:00
c2e2122efd
Forgot to change part of the new tag test.
2015-03-30 22:37:26 -04:00
c22acb81a8
Updates new tag code and test spec for new tags.
2015-03-30 22:07:02 -04:00
edb50f7081
feat(analytics): a/b on tour (counter, finish button)
2015-03-30 16:57:17 -06:00
e0dae01dda
fix(analytics): remove a/b on play button, fixes #4947
2015-03-30 16:43:49 -06:00
605300fdbb
make skills that buff their own stat be calculated from the unbuffed stat - affects earth, defensiveStance, valorousPresence, intimidate, toolsOfTrade, protectAura
2015-03-31 03:13:33 +10:00
0ed3937d8f
Added exp sync for Backstab
2015-03-30 11:43:06 -05:00
f95f892491
Changed new tag code to be more angular-idiomatic.
2015-03-30 08:32:45 -04:00
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
7d9728f2ff
Merge pull request #4939 from SabreCat/spring-customize
...
Spring customizations
2015-03-29 16:52:09 -05:00
15c72b2ea8
chore(grunt): compile sprites
2015-03-29 16:44:50 -05:00
6cefe5c9e4
fix(customize): More hair
2015-03-29 16:39:48 -05:00
40bd38af53
add spring 2015 emails images
2015-03-29 22:32:52 +02:00
2937c13f6b
chore(i18n): update locales
2015-03-29 22:30:53 +02:00
99aad96688
New tag field correctly clears when new tag added.
2015-03-29 15:10:24 -04:00
9722af679d
feat(customize): Spring Colors
2015-03-28 16:22:52 -05:00
cea97e4da8
Documenting the (Bootstrap recommended!) wrapper workaround for tooltips
...
on disabled elements. Added code to prevent user from posting blank
messages by using meta-enter as a workaround.
2015-03-28 01:21:39 -04:00
1432d2a61a
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
common/script/content.coffee
common/script/index.coffee
2015-03-28 12:40:46 +10:00
61e8b65f14
fix drop notification images for hatching potions
2015-03-28 11:24:58 +10:00
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
ed0caee149
remove test code
2015-03-28 05:42:00 +10:00
7a220bee47
update Egg Hunt quest completion message with new content from Leslie
2015-03-28 05:37:42 +10:00
d9193ad424
issue #3852 change Mongodb installion
...
to correct version
2015-03-27 14:25:41 -05:00
0638e36492
feat(analytics): new "play" variants
2015-03-27 12:52:38 -06:00
23f7d96fa7
Updated compiled habitrpg-shared.js
2015-03-27 08:45:00 -04:00
5c7c986a1f
Merge branch 'todo-tests-start' into blade_todo_and_chat_tests
2015-03-27 08:42:47 -04:00
80778cbd7c
Added additional deletion test
2015-03-27 08:38:05 -04:00
4707ba793e
Added some basic tests for todo creating, updating and deleting
2015-03-27 08:38:05 -04:00
a9232156ef
Checks to see if user id and username match chat
2015-03-27 08:33:15 -04:00
c5de07d33e
Removed deeply eql check for number comparison
2015-03-27 08:33:15 -04:00
3c741f431a
Deleted extraneous line breaks
2015-03-27 08:33:14 -04:00
9be08ad143
Added additional tests for chat functions in api
2015-03-27 08:33:14 -04:00
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
1202c624f1
Revert "Added hide and error message when a user tries to create a challenge for..."
2015-03-27 20:11:12 +10:00
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
10a3c0094b
Merge pull request #4925 from gisikw/improve_tests
...
Improve tests
2015-03-27 18:35:51 +10:00
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
ca87a46b04
Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement
2015-03-26 18:30:56 -04:00
John Montgomery