95e71c68de
fix(jade): update api page to new doctype
2014-10-07 21:30:01 +02:00
2fdb1973eb
upgrade winston-mail
2014-10-07 21:30:01 +02:00
37971ffceb
upgrade code to support moment 2.8.x
2014-10-07 21:30:01 +02:00
6467fe4b54
Revert "update angulae version"
...
This reverts commit a08eb9a4ada38e9de590fd54ecd042561075e89f.
2014-10-07 21:30:01 +02:00
8674a0cede
update angulae version
2014-10-07 21:30:00 +02:00
80042a7a64
update jade
2014-10-07 21:30:00 +02:00
fab04d5e19
fix .nodemonignore, reduce cpu usage
2014-10-07 21:30:00 +02:00
e49402a1ec
remove unused packages
2014-10-07 21:30:00 +02:00
fc580595e0
Revert "chore(npm): upgrade paypal-express-checkout -> manual fix now in module"
...
This reverts commit 07691885bc50937b251be6d364a21c748b0722cd.
2014-10-07 21:30:00 +02:00
81308f700d
stick nconf to specific version
2014-10-07 21:30:00 +02:00
f0deb2bf90
upgrade some other package
2014-10-07 21:30:00 +02:00
9ccf2c8d11
upgrade moment
2014-10-07 21:30:00 +02:00
3aa450f8d4
upgrade a few other packages
2014-10-07 21:30:00 +02:00
ebcce81baa
chore(npm): upgrade paypal-express-checkout -> manual fix now in module
2014-10-07 21:30:00 +02:00
d71f126ac4
chore(npm): upgrade express to ~3.17.5
2014-10-07 21:30:00 +02:00
41de8014a0
Putting the boot icon on the same line as the member name in group members
2014-10-07 14:10:15 -04:00
57a5a62d7c
fix(memleak): possible improvements to leaked vars #4079
2014-10-06 17:59:07 -06:00
0a630d7d9b
feat(halloween): jackolantern pet
2014-10-06 16:14:48 -06:00
4fdcbb22c0
migration(subscriptions): cancel subs small script
2014-10-06 15:23:57 -06:00
fda93773c7
feat(emails): add subscription cancelled email
2014-10-06 20:03:55 +02:00
8a1973ae2f
fix bug where quest Pets were being used instead of quest Mounts
2014-10-06 13:20:01 +10:00
0c377343d5
fix bug where dropEggs were used for both types of mounts (instead of 'source')
2014-10-06 13:18:39 +10:00
e5700a35e2
make whitespace consistent (tabs changed to spaces) - yes this IS pedantic, sorry :)
2014-10-06 11:53:24 +10:00
7e0022817f
remove unused menu.mounts style (probably best anyway to keep using menu.pets in both pets and mounts pages for consistency of appearance)
2014-10-06 11:52:15 +10:00
e53dd0da20
add padding-top: -30px --> vertical-align: top fix from a previous PR
2014-10-06 11:44:53 +10:00
d24b4ad141
add fix for hiding Plain Eggs on mounts page
2014-10-06 11:37:40 +10:00
ecd61ee602
Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop
...
Conflicts:
views/options/inventory/stable.jade
2014-10-06 11:36:32 +10:00
5809e52fe9
Make attribute referencing in notification logic more robust
2014-10-04 20:56:13 +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
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
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
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
e759dbe951
Merge pull request #4045 from Verabird/guildreject
...
fixing guild reject error (issue #2886 )-correcting syntax
2014-10-02 17:22:36 -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
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
a595880568
Merge pull request #4044 from negue/apiUrlService
...
Use ApiUrlService in all services
2014-10-01 19:58:26 +02:00
Matteo Pagliazzi