Commit Graph

844 Commits

Author SHA1 Message Date
Daniel Saewitz 7591846937 Remove req.task 2013-03-22 16:57:34 -04:00
Daniel Saewitz 355dde07f4 Array to /user/tasks 2013-03-22 16:52:33 -04:00
Daniel Saewitz b56bc6b1d9 Mark todos and dailies as completed via api 2013-03-22 16:01:40 -04:00
Tyler Renelle 7529601dcc add general "new stuff" notification, linking to changelog 2013-03-21 10:31:23 -06:00
Daniel Saewitz 4d3db53bef Remove extra newline 2013-03-21 11:56:06 -04:00
Daniel Saewitz 81b14cfac6 Add alternate scoreTask 2013-03-20 16:52:32 -04:00
Tyler Renelle 5580fd6802 remove hashed_password & salt from /user 2013-03-19 18:32:18 -06:00
Tyler Renelle 49db610602 fix to "editing profile" bug. move {#with _user.preferences as :p}
into minimum allowable depth in HTML hierachy at which it's required.
Still trying to put my finger on it, but I'm getting close
2013-03-18 15:43:02 -04:00
Tyler Renelle 5799a155af set timeout interval on undo (disappear after 10s) 2013-03-17 23:16:05 -04:00
Tyler Renelle de1eca084e bugfix to "can't delete task" 2013-03-17 22:09:33 -04:00
Tyler Renelle 07a3a3c3b6 fix to reward issue in undo 2013-03-17 22:02:06 -04:00
Tyler Renelle 903745f7c9 pass in whole task object to taskClasses 2013-03-17 21:50:02 -04:00
Tyler Renelle 10e9d3eb40 fixed undo on checkboxed items 2013-03-17 21:43:03 -04:00
Tyler Renelle 2f3d0fa86a start adding undo functionality 2013-03-17 21:30:24 -04:00
Tyler Renelle 2be827f484 Merge branch 'cdn-scripts' into develop 2013-03-17 09:33:19 -04:00
Tyler Renelle 0bcea534ae better "reroll" comment 2013-03-17 09:13:25 -04:00
Tyler Renelle 0c1151b123 don't add bootstrap css files in when instantiating derby-ui-boostrap,
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
Tyler Renelle ee9e6064b2 add a ton of static page, beef up the footer, make this website look
official! @zakkain, I hope I didn't break anything!
2013-03-16 23:03:59 -04:00
Tyler Renelle dbc3906eb3 possible fix to dom losing functions after model.resetDom() 2013-03-16 20:02:01 -04:00
Tyler Renelle 903479af5a add view functions and(), or(), notEqual() 2013-03-16 19:10:40 -04:00
Tyler Renelle 14a892043a add some api comments (just so i can visually separate the functions
for now)
2013-03-16 11:50:02 -04:00
Tyler Renelle 48cbe7c383 Merge branch 'master' into develop
Conflicts:
	views/app/settings.html
2013-03-15 18:40:21 -04:00
Tyler Renelle 545e5fc2a4 allow manually unlocking party system 2013-03-15 18:39:39 -04:00
Tyler Renelle 368748b67a add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:59:15 -04:00
Tyler Renelle 6c61c0f7db add delete account functionality (*sigh*, y'all asked for it) 2013-03-15 17:58:37 -04:00
Tyler Renelle 325d906708 begin adding toggle-header 2013-03-15 17:30:59 -04:00
Tyler Renelle 174a0d2362 cleaner view.fn "tnl" 2013-03-15 17:30:46 -04:00
Tyler Renelle 7f93b525c0 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 17:30:42 -04:00
Tyler Renelle 3fa6aaceed add 'show helm' option 2013-03-15 17:20:15 -04:00
Tyler Renelle f2faf8c968 add 'show helm' option 2013-03-15 17:20:01 -04:00
Tyler Renelle 823f524d57 begin adding toggle-header 2013-03-15 16:47:48 -04:00
Tyler Renelle b76b1a33f5 cleaner view.fn "tnl" 2013-03-15 12:06:38 -04:00
Tyler Renelle d2837afbd4 move tnl to a view function instead of model function, beging adding
party stats visuals (hp & exp presently)
2013-03-15 12:00:47 -04:00
Tyler Renelle 2f372124b3 start moving javascript loading functionality back to <Scripts:> so we
can utilize CDNs
2013-03-15 11:15:35 -04:00
Tyler Renelle 3f251c4b32 Merge pull request #624 from zakkain/ui-tweaks
Time to update the dev preview again!
2013-03-14 11:38:06 -07:00
Tyler Renelle bb57eddec1 divide exp gain by 2, temporary hack since people are leveling way too
fast.
2013-03-12 10:05:18 -04:00
Tyler Renelle 4d5110c9d3 Merge pull request #627 from toebu/high-level-algo-fix
Changing expModifier and hpModifier algo to be less influenced by level....
2013-03-10 08:46:42 -07:00
Tyler Renelle 72e81b8891 #315 fixes: newValue not accessible at scope, only remove duff history
entries, not all
2013-03-10 11:40:58 -04:00
Tyler Renelle 0332ee7b48 Merge pull request #616 from MrConcept/fix
Fixed Daily History graphs
2013-03-10 08:22:43 -07:00
Tobias Leugger cbbfdaa542 Changing expModifier and hpModifier algo to be less influenced by level. For high lvls (~50), you actually get HP instead of losing them with the current formula. This now doesn't happen anymore (at least for levels up to 100, which is the current max). 2013-03-09 20:14:42 +01:00
Tobias Leugger 9aac271b60 Improving readability of the statements for setting the colour of a task 2013-03-09 20:06:53 +01:00
Tyler Renelle 795aac8fcb Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-09 11:03:57 -05:00
Tyler Renelle 155747bfd0 fix to 401 user not found (can't use @byId) 2013-03-09 10:26:08 -05:00
Daniel Saewitz 188e4ff271 Remove one id from array of typeIds instead of rewriting whole array 2013-03-09 09:14:07 -05:00
Rob Scanlon 2b8f2f48c1 Delete task for the API 2013-03-09 02:08:20 -05:00
Zachary Kain f89037da53 new drag animation, tiny outline & shadow tweaks 2013-03-08 22:26:01 -05:00
Zachary Kain 17dcb70e04 Merge remote-tracking branch 'upstream/develop' into ui-tweaks 2013-03-08 19:01:25 -05:00
Tyler Renelle 3407565d37 remove console.log(req.headers.origin) 2013-03-08 18:10:26 -05:00
Tyler Renelle 1ef32c771b remove console.log(req.headers.origin) 2013-03-08 18:10:12 -05:00
Tyler Renelle 399e4b9dda strange fix to CORS issue - move CORS middleware to top, respond with
200 if OPTIONS request
2013-03-08 18:04:57 -05:00