e310fb37b6
Merge pull request #4127 from Alys/jade-plain-text-fixes
...
prevent "Warning: missing space before text for line [nn] of jade file ..."
2014-10-09 17:13:56 +02:00
9669fbcbf9
make All the default tab for Dailies (instead of Due)
2014-10-09 21:20:19 +10:00
264b16f76b
move Dailies "All" tab to the first position, to make it the default (I hope)
2014-10-09 21:08:46 +10:00
4e3b0e1dfe
Merge pull request #332 from Alys/Gaelan-hide_completed_dailies-modified
...
add strings for Dailies tabs (Due and Grey)
2014-10-09 20:18:26 +10:00
1d8906dd3b
remove irrelevant changes to dist/habitrpg-shared.js
2014-10-09 20:14:42 +10:00
571b8afc86
add strings for Dailies tabs (Due and Grey)
2014-10-09 20:07:15 +10:00
43d2d1355e
renamed Daily tabs to save space, removed To-Dos from new code because compled/all tabs were blank, decoupled To-Do code from Dailes code to allow future changes (e.g., "Dated" tab for To-Dos)
2014-10-09 20:04:03 +10:00
3d8d103a02
Merge pull request #328 from betaveros/have-unallocated
...
Add haveUnallocated string
2014-10-09 17:54:55 +10:00
f0c3b3db4c
add pipes in front of plain text to prevent "Warning: missing space before text for line nn of jade file ..."
2014-10-09 15:56:06 +10:00
c4a2e720fd
Add ability to hide completed dailies.
...
While I was at it, I also did a bit of refactoring in general around the hiding
of completed todos/dailies.
2014-10-09 14:49:04 +10:00
a699c2924e
chore(moment): upgrade moment, run grunt
2014-10-08 17:44:47 -06:00
1e9c1295e5
fix(moment): fix deprecated warnings, use updated moment syntax
2014-10-08 17:38:37 -06:00
2a8128872d
fix(moment): fix deprecated warnings, use updated moment syntax
2014-10-08 17:37:30 -06:00
96b41448cd
Merge pull request #4112 from betaveros/unallocated-notification
...
Notification for Unallocated Attribute Points (fixes #4109 )
2014-10-08 19:53:50 +02:00
6248d056d1
Merge pull request #330 from AnnaPhilips/develop
...
Fix misspelled artist's name in Rooster quest
2014-10-08 19:45:25 +02:00
f4977cd1ed
Merge pull request #4122 from jklein/develop
...
Putting the boot icon on the same line as the member name in group members
2014-10-08 15:04:21 +02:00
0def172bfc
Fix misspelled artist's name in Rooster quest
...
"extrajordinary" is changed to "extrajordanary"
Issue: #4089
2014-10-08 17:04:25 +05:30
3c14278c81
Merge pull request #4097 from HabitRPG/paglias/modules
...
Update modules where possible and remove unused modules from package.json
2014-10-07 13:49:59 -06:00
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
a0072b88f3
chore(i18n): update locales
2014-10-07 17:35:21 +02:00
d94a36fb10
Merge branch 'brandonjreid-uncheck' into develop
2014-10-07 17:01:24 +02:00
166d53ac1b
chore(github): merge pr #327
2014-10-07 17:01:06 +02: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
76d4f684cf
feat(halloween): add jackolantern pet
2014-10-06 15:39:38 -06:00
4fdcbb22c0
migration(subscriptions): cancel subs small script
2014-10-06 15:23:57 -06:00
d0cebce605
Fixed bug when calculating the reverse delta.
...
Added in a case for a todo with checklists
so the gp and exp for those are reversed correctly.
Added a couple test cases for checking then unchecking tasks.
2014-10-06 13:33:43 -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
Matteo Pagliazzi