Commit Graph

5381 Commits

Author SHA1 Message Date
Alice Harris 13b12b830c allow a task to stay visible while being edited, regardless of other parameters 2014-10-10 22:14:43 +10:00
Alice Harris d7c8d48078 Merge pull request #4129 from Alys/Gaelan-hide_completed_dailies
Add ability to hide completed dailies (Gaelan's changes with fixes for merge conflicts etc)
2014-10-10 22:07:30 +10:00
Tyler Renelle 1fbf3a7eba fix(static): fix static/api page, fixes #3636 2014-10-09 13:28:37 -06:00
Matteo Pagliazzi 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
Alice Harris 9669fbcbf9 make All the default tab for Dailies (instead of Due) 2014-10-09 21:20:19 +10:00
Alice Harris 264b16f76b move Dailies "All" tab to the first position, to make it the default (I hope) 2014-10-09 21:08:46 +10:00
Alice Harris 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
Alice Harris 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
Bob Example 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
Tyler Renelle 2a8128872d fix(moment): fix deprecated warnings, use updated moment syntax 2014-10-08 17:37:30 -06:00
Matteo Pagliazzi 96b41448cd Merge pull request #4112 from betaveros/unallocated-notification
Notification for Unallocated Attribute Points (fixes #4109)
2014-10-08 19:53:50 +02:00
Matteo Pagliazzi 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
Tyler Renelle 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
Matteo Pagliazzi 95e71c68de fix(jade): update api page to new doctype 2014-10-07 21:30:01 +02:00
Matteo Pagliazzi 2fdb1973eb upgrade winston-mail 2014-10-07 21:30:01 +02:00
Matteo Pagliazzi 37971ffceb upgrade code to support moment 2.8.x 2014-10-07 21:30:01 +02:00
Matteo Pagliazzi 6467fe4b54 Revert "update angulae version"
This reverts commit a08eb9a4ada38e9de590fd54ecd042561075e89f.
2014-10-07 21:30:01 +02:00
Matteo Pagliazzi 8674a0cede update angulae version 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi 80042a7a64 update jade 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi fab04d5e19 fix .nodemonignore, reduce cpu usage 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi e49402a1ec remove unused packages 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi 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
Matteo Pagliazzi 81308f700d stick nconf to specific version 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi f0deb2bf90 upgrade some other package 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi 9ccf2c8d11 upgrade moment 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi 3aa450f8d4 upgrade a few other packages 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi ebcce81baa chore(npm): upgrade paypal-express-checkout -> manual fix now in module 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi d71f126ac4 chore(npm): upgrade express to ~3.17.5 2014-10-07 21:30:00 +02:00
Jonathan Klein 41de8014a0 Putting the boot icon on the same line as the member name in group members 2014-10-07 14:10:15 -04:00
Tyler Renelle 57a5a62d7c fix(memleak): possible improvements to leaked vars #4079 2014-10-06 17:59:07 -06:00
Tyler Renelle 0a630d7d9b feat(halloween): jackolantern pet 2014-10-06 16:14:48 -06:00
Tyler Renelle 4fdcbb22c0 migration(subscriptions): cancel subs small script 2014-10-06 15:23:57 -06:00
Matteo Pagliazzi fda93773c7 feat(emails): add subscription cancelled email 2014-10-06 20:03:55 +02:00
Brian Chen 5809e52fe9 Make attribute referencing in notification logic more robust 2014-10-04 20:56:13 +08:00
Brian Chen 9ecbe9d48f Add unallocated attribute points notification
* Uses i18n "haveUnallocated" string, to come in another commit
2014-10-04 19:57:30 +08:00
Brian Chen 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
Tyler Renelle ef83c9999b fix(tests): snowball 2014-10-03 15:51:30 -06:00
Tyler Renelle 2b08e550e0 Merge pull request #4108 from HabitRPG/paglias/tags
Paglias/tags
2014-10-03 14:49:58 -06:00
Tyler Renelle 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
Tyler Renelle 8e85581679 fix(spookDust): rename to spooky sparkles 2014-10-03 13:24:55 -06:00
Matteo Pagliazzi 704a8658f3 require moment where necessary 2014-10-03 19:38:18 +02:00
Matteo Pagliazzi 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
Matteo Pagliazzi 0f2c773bcb Merge pull request #4058 from Feriority/codeclimate_improvements
small payments refactor for better codeclimate
2014-10-03 17:44:15 +02:00
Matteo Pagliazzi 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
Tyler Renelle e666d2f837 fix(spookDust): user serverside method for spookdust as it's path-protected 2014-10-03 00:33:39 -06:00
Tyler Renelle 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
Tyler Renelle 27d6514629 chore(mongoose): finally, mongoose 3.8.17! 2014-10-02 23:29:23 -06:00
Tyler Renelle 6ab1e70440 Revert "Revert "perf(challenges): WIP" (see #4085)"
This reverts commit efbf151c11.
2014-10-02 23:23:39 -06:00
Tyler Renelle 81c98f7630 bailey(): spookDust, october backgrounds, memleak 2014-10-02 23:18:13 -06:00
Tyler Renelle 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