5809e52fe9
Make attribute referencing in notification logic more robust
2014-10-04 20:56:13 +08:00
3a6a61e5ca
Add haveUnallocated string
2014-10-04 20:29:58 +08:00
9ecbe9d48f
Add unallocated attribute points notification
...
* Uses i18n "haveUnallocated" string, to come in another commit
2014-10-04 19:57:30 +08:00
34fd824b1a
chore(i18n): update locales
2014-10-04 13:53:35 +02:00
74be4b211b
DRY-refactor notification display conditions
...
* Condense the different notification icons into one span with a
dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
helper function.
2014-10-04 17:56:56 +08:00
ef83c9999b
fix(tests): snowball
2014-10-03 15:51:30 -06:00
2b08e550e0
Merge pull request #4108 from HabitRPG/paglias/tags
...
Paglias/tags
2014-10-03 14:49:58 -06:00
0bb1de680c
fix(challenges): since we're setting {minimize:false} on tasks, don't
...
overwrite user tasks.*.challenges in the _.merge()
2014-10-03 14:34:58 -06:00
8e85581679
fix(spookDust): rename to spooky sparkles
2014-10-03 13:24:55 -06:00
3d638e4182
fix(spookDust): rename to spooky sparkles
2014-10-03 13:22:06 -06:00
704a8658f3
require moment where necessary
2014-10-03 19:38:18 +02:00
8fa8e39eca
Revert "Revert "fix(tasks): tmp fix for #4066 , minimize:false on tasks so they have""
...
This reverts commit 0fa7277cf0
2014-10-03 19:05:37 +02:00
0f2c773bcb
Merge pull request #4058 from Feriority/codeclimate_improvements
...
small payments refactor for better codeclimate
2014-10-03 17:44:15 +02:00
64b19ed090
Merge pull request #4101 from betaveros/betaveros/meter-text-nowrap
...
Make .meter-text nowrap to prevent truncation
2014-10-03 17:12:36 +02:00
e666d2f837
fix(spookDust): user serverside method for spookdust as it's path-protected
2014-10-03 00:33:39 -06:00
8cef966713
fix(spookDust): user serverside method for spookdust as it's path-protected
2014-10-03 00:31:49 -06:00
4925882804
Merge pull request #4028 from Verabird/challengecvsalt
...
Make export to csv button on challenges export all tasks (issue #2947 )
2014-10-02 23:40:41 -06:00
27d6514629
chore(mongoose): finally, mongoose 3.8.17!
2014-10-02 23:29:23 -06:00
6ab1e70440
Revert "Revert "perf(challenges): WIP" (see #4085 )"
...
This reverts commit efbf151c11
2014-10-02 23:23:39 -06:00
81c98f7630
bailey(): spookDust, october backgrounds, memleak
2014-10-02 23:18:13 -06:00
0841cafd1f
feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP
2014-10-02 23:18:13 -06:00
5718fb183a
feat(backgrounds): replace spookyForest with pumpkinPatch
2014-10-02 23:06:34 -06:00
786f9a92df
feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP
2014-10-02 23:05:28 -06:00
29262826e2
feat(backgrounds): october backgrounds
2014-10-02 18:47:11 -06:00
e759dbe951
Merge pull request #4045 from Verabird/guildreject
...
fixing guild reject error (issue #2886 )-correcting syntax
2014-10-02 17:22:36 -06:00
e754ed48f7
fix(memleak): add a "nullify" function to user wrapper. This is stupid,
...
find a better way. See HabitRPG/habitrpg#4079
2014-10-02 16:44:33 -06:00
ead42e7cef
fix(memleak): temp, wonky fix to #4079 . Sets closure vars user to
...
null in api.batchUpdate(). More will be needed
2014-10-02 16:38:01 -06:00
42c4096be7
Make .meter-text nowrap to prevent truncation
...
* Add white-space: nowrap to .meter-text to prevent the meter text from
being cut off when the meter is very short and its content is long
(mainly an issue with the experience bar, which can easily have a bar
graph symbol plus one four-digit number over another e.g. 1,234 /
5,678)
2014-10-02 19:47:48 +08:00
65b3561fb0
Changed calculateDelta() so when unchecking a task it removes the right amount of gold and exp
2014-10-01 17:13:51 -06:00
bf662ff119
fix rootCtrl.js ; forgot a comma while merging...
2014-10-01 20:53:29 +02:00
b1a34a25a8
- add popoverHtml to enable Markdown in Popovers
...
- add markdown filter to get Task Notes as Markdown
2014-10-01 20:30:13 +02:00
93f59936c4
Merge pull request #318 from negue/markdown_notes
...
add markdown as angular filter
2014-10-01 20:15:11 +02:00
a595880568
Merge pull request #4044 from negue/apiUrlService
...
Use ApiUrlService in all services
2014-10-01 19:58:26 +02:00
57ef833aea
Merge pull request #288 from negue/apiUrlService
...
ApiUrlService as preparation for custom endpoints
2014-10-01 19:57:33 +02:00
ab3c238d11
fix(avatar): put missing ng-click=buy-set back in
2014-09-30 22:06:05 -06:00
5c56b0b7c9
bailey(halloween):
2014-09-30 21:53:34 -06:00
c6b56706fa
feat(mystery): oct present art
2014-09-30 21:46:28 -06:00
e21230f8c2
Revert "small fix"
...
This reverts commit f3401e72c2
2014-09-30 21:42:48 -06:00
0fa7277cf0
Revert "fix(tasks): tmp fix for #4066 , minimize:false on tasks so they have"
...
This reverts commit a6631f5d36
2014-09-30 21:28:47 -06:00
8cce88a5ad
feat(halloween): add seasonal i18n strings
2014-09-30 21:25:19 -06:00
3605b51748
feat(halloween): refactoring skin & hair to use the same mixins, add new
...
halloween seasonal set
2014-09-30 21:25:06 -06:00
c635fef960
grunt()
2014-09-30 20:29:16 -06:00
2f937b6340
Merge pull request #325 from lemoness/develop
...
Fall Festival 2014 Skins and Hair Colors
2014-09-30 19:28:27 -06:00
7d22fb0944
Merge pull request #322 from deilann/release_pets_shared
...
feat(pets): release pets
2014-10-01 06:35:47 +10:00
ee325ce27f
Merge pull request #4093 from deilann/release_pets
...
feat(pets): release pets
2014-10-01 06:35:36 +10:00
23a57ac9ad
Fall Festival 2014 Skins and Hair Colors
...
Skins and Hair Colors for the Fall Festival Event
2014-09-30 11:50:42 -07:00
2054d10de2
release pets feature
2014-09-29 15:11:24 -07:00
8427c53d90
release pets feature
2014-09-29 13:35:38 -07:00
2445ff33ca
Merge pull request #321 from Alys/readmes-Sep28-2
...
add extra README files to help translators realise they should not edit directly
2014-09-28 20:51:07 +02:00
e15e041797
do not edit any files in this directory
2014-09-28 08:57:26 +10:00
Brian Chen