Commit graph

8904 commits

Author SHA1 Message Date
Alys
0e581444b7 Merge pull request #4887 from TheHollidayInn/focus-textarea-on-pm
Added focus directive to focus textarea for a private message model box
2015-04-04 01:45:30 +10:00
Alys
ab6d8d0821 Merge pull request #4950 from gisikw/force-latest-bailey
Ensure Bailey always displays the most recent message.
2015-04-04 01:29:32 +10:00
Alys
5f3e57274d Merge pull request #4938 from ExperimentMonty/clear-after-add-task
New tag field correctly clears when new tag added.
2015-04-04 01:16:21 +10:00
Alys
f432bc1f17 Merge pull request #4919 from TheHollidayInn/spells-level-with-exp
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
2015-04-04 00:29:41 +10:00
Matteo Pagliazzi
61db64e963 chore(i18n): update locales 2015-04-03 13:28:45 +02:00
Alys
ec66bfb0cd Specify which API routes need no authentication. Specify task types for full scoring route. For simple scoring, state that it's only Habits and explain that other tasks can use full scoring. 2015-04-03 21:24:48 +10:00
Tyler Renelle
26f1d6bb39 feat(static): secondary statics reflect front. merge front.old into features 2015-04-02 17:41:38 -06:00
Tyler Renelle
cdaa776978 feat(static): remove pipes, replace static footer with shared/footer 2015-04-02 17:22:36 -06:00
Tyler Renelle
47157a1b52 feat(static): convert front to jade, hack to make work basically 2015-04-02 15:29:38 -06:00
Kevin Gisi
7740f1969b Fix broken meters in IE
Health, XP, and Mana bars were broken in IE, due to the use of {{ }} within
style attributes. Using Angular's string interpolation within style attributes
doesn't work in IE, as IE will actually strip the property immediately upon DOM
render. Using ng-style allows properties to be preserved, and renders
cross-browser correctly.
2015-04-02 15:41:01 -04:00
Matteo Pagliazzi
06ffd4db44 fix(i18n): when no lanaguage is passed in the request 2015-04-02 20:06:17 +02:00
TheHollidayInn
0e2867cce1 Marked group messages as seen when user syncs new messages 2015-04-02 10:58:24 -05: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
Tyler Renelle
e64499658b Add 'website/public/front/' from commit 'fb87f009292bfb08bd308dbf7f63bc5ef094838f'
git-subtree-dir: website/public/front
git-subtree-mainline: 507c1dd69a
git-subtree-split: fb87f00929
2015-04-01 20:12:32 -06: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
John Montgomery
5163ee466b Fixes more bad git-fu. New tag creation works now. 2015-03-31 23:23:24 -04: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
Kevin Gisi
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
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
AnitaYCheng
fb87f00929 Finalize mobile view for carousels 2015-03-31 15:40:05 -07:00
AnitaYCheng
2aaac47815 Added static versino, responsive, optnsive, optimized images 2015-03-31 13:40:09 -07:00
John Montgomery
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
John Montgomery
c2e2122efd Forgot to change part of the new tag test. 2015-03-30 22:37:26 -04:00
John Montgomery
c22acb81a8 Updates new tag code and test spec for new tags. 2015-03-30 22:07:02 -04: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
TheHollidayInn
0ed3937d8f Added exp sync for Backstab 2015-03-30 11:43:06 -05:00
John Montgomery
f95f892491 Changed new tag code to be more angular-idiomatic. 2015-03-30 08:32:45 -04: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
John Montgomery
99aad96688 New tag field correctly clears when new tag added. 2015-03-29 15:10:24 -04:00
Sabe Jones
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Daniel Hammond
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
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