Commit graph

  • 43bb1bf485 Minor edits Bob Steffes 2013-11-08 17:01:24 -0800
  • f35df8a47f [#1726] remove updateTasks() batch api route. That's not how we're using batch (we'll create a proper batch route & document later), and we shouldn't support this route Tyler Renelle 2013-11-08 14:01:29 -0800
  • 317f1a9319 5482a83 add minHistLen as a parameter to preenUserHistory (with a default value of 7) Tyler Renelle 2013-11-08 13:57:28 -0800
  • 5f9d3991ac [#1766] remove "trigger next day" option Tyler Renelle 2013-11-08 13:54:09 -0800
  • daf33f9174 remove console.log Matteo Pagliazzi 2013-11-08 22:37:40 +0100
  • 9f326e7433 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop Matteo Pagliazzi 2013-11-08 22:34:28 +0100
  • 3a332c4c45 port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting Matteo Pagliazzi 2013-11-08 22:33:48 +0100
  • 8e8d88376c Merge pull request #1765 from Shaners/patch-4 Tyler Renelle 2013-11-08 12:40:45 -0800
  • 64ed414ae6 Update inventory.jade Shane Lister 2013-11-08 10:53:28 -0800
  • 30e4dbcb98 Update Hatching Instructions Shane Lister 2013-11-08 10:43:22 -0800
  • 4b35551afc confirm "trigger new day" Tyler Renelle 2013-11-08 09:18:03 -0800
  • 4e668a7de4 contrib: heroic at (8) Tyler Renelle 2013-11-07 23:16:50 -0800
  • 4a1ed7006e remove comment Matteo Pagliazzi 2013-11-08 17:49:30 +0100
  • daac0a4b04 show but disable challenge daily days, fix #1758 Matteo Pagliazzi 2013-11-08 17:42:45 +0100
  • d419db68f2 typo, fix #1761 Matteo Pagliazzi 2013-11-08 17:23:17 +0100
  • 03905ef90b solve conflicts 3 Matteo Pagliazzi 2013-11-08 17:09:06 +0100
  • e1b86c64a6 solve conflicts 2 Matteo Pagliazzi 2013-11-08 17:08:23 +0100
  • 02651d52a4 solve conflict Matteo Pagliazzi 2013-11-08 17:05:03 +0100
  • a78297f129 update chat if necessary after new message posted or deleted Matteo Pagliazzi 2013-11-08 17:03:10 +0100
  • 344a5302c0 Resizes some assets where possible to fit into 90 avatar box and adjusts CSS accordingly. Fixes some positioning in shop sprite img and css. Shaners 2013-11-08 00:06:09 -0800
  • 5922725e6d Update images for Flying Pig, Lion, and Fox egg. Revised art. Shaners 2013-11-08 00:02:35 -0800
  • e51d3effda Archives unused sprite sheets to keep things cleaner and less confusing. Shaners 2013-11-08 00:01:05 -0800
  • e8a87716bf Rename wolf to wolf-base, add tiger hatching animations at 6x. Note: missing albino tiger. Shaners 2013-11-07 23:56:10 -0800
  • c3886d1770 Merge pull request #1 from HabitRPG/contrib Shane Lister 2013-11-07 22:16:49 -0800
  • 06d1f77ce5 contribu: cleanup tavern, add legend for contrib tiers Tyler Renelle 2013-11-07 17:24:49 -0800
  • 4454cc502b contrib: only show contrib alert if they've gained, not lost Tyler Renelle 2013-11-07 14:22:56 -0800
  • ade25c47c1 Merge branch 'contrib' into develop Tyler Renelle 2013-11-07 13:52:04 -0800
  • 7c94b4b6d3 contrib: add contributor achievement modal Tyler Renelle 2013-11-07 13:42:29 -0800
  • 761887da18 contrib: move equipped() helper to items.coffee, use a more robust method of determining which item is available in the store, and which items i can legally equip. It's a bit wild, I think we should find a different approach Tyler Renelle 2013-11-07 13:11:35 -0800
  • 54229ee406 contrib: update css to accomodate new contributor only store & equipment (@Shaners could you take a peek at the css positioning issues in backer.css?) Tyler Renelle 2013-11-07 13:10:11 -0800
  • 7fe4f31a16 contrib: show profile._id in modal so admins can assign contrib status Tyler Renelle 2013-11-07 13:05:34 -0800
  • a886c178b2 contrib: add migration to help me start porting existing contribs Tyler Renelle 2013-11-07 12:47:33 -0800
  • 962cf9a3be contrib: add name-tag colors based on contributor level Tyler Renelle 2013-11-07 11:24:38 -0800
  • a5999a7be3 fix tests Matteo Pagliazzi 2013-11-07 20:27:21 +0100
  • f61c35975a contrib: award profile Dragon-Hydra if admin sets level >= 6 Tyler Renelle 2013-11-06 17:47:00 -0800
  • e387ee9d13 Merge remote-tracking branch 'Shaners/patch-3' into contrib Tyler Renelle 2013-11-06 17:40:02 -0800
  • 8646783aa1 contrib: equipped functions to use habitrpg-shared@959024d Tyler Renelle 2013-11-06 17:16:17 -0800
  • d679fa1e62 contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor Tyler Renelle 2013-11-06 15:49:41 -0800
  • 3b18c322bc return whole group.chat after chat message is sent Matteo Pagliazzi 2013-11-06 21:27:24 +0100
  • 5ebab59780 return 204 on group.update Matteo Pagliazzi 2013-11-06 21:19:23 +0100
  • 36e45a36a2 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop Matteo Pagliazzi 2013-11-06 20:33:10 +0100
  • a4951e151c use $resource class methods to avoid sending whole model to server & reduce some responses Matteo Pagliazzi 2013-11-06 20:31:39 +0100
  • ffd119b16d invited consistent with members Matteo Pagliazzi 2013-11-06 20:31:00 +0100
  • 0e48cb483a put route for group.update Matteo Pagliazzi 2013-11-06 20:30:29 +0100
  • abbf09eaaa remove console.log Matteo Pagliazzi 2013-11-06 20:18:59 +0100
  • 21509047bb ops, jquery.cookie is used by bootstrap-tour! Matteo Pagliazzi 2013-11-06 20:12:58 +0100
  • 22b70b9a0a add message about clearing completed todos if length>100 Tyler Renelle 2013-11-05 18:40:23 -0800
  • 3dde30076c [#1726] fix PUT /api/v1/user/tasks/:tid . Something was really strange when fully overriding an embedded mongoose doc, still don't know what the issue was... Tyler Renelle 2013-11-05 17:43:20 -0800
  • 188db745fc allow users to trigger "missed day" manually from Restore modal Tyler Renelle 2013-11-05 17:11:06 -0800
  • 5482a83a00 add preen_history to user cron (see https://github.com/HabitRPG/habitrpg/issues/1492), to cut back on user object sizes (and hopefully angular performance) dramatically. Start writing tests, but they're not complete. @djuretic could you take a peak at this? My brain is melting Tyler Renelle 2013-11-05 17:10:31 -0800
  • f0cc17bfaf Merge remote-tracking branch 'djuretic/rewrite' Tyler Renelle 2013-11-05 14:54:48 -0800
  • 1d5296880b Merge pull request #1750 from HabitRPG/paglias/build-manifest Tyler Renelle 2013-11-05 10:29:12 -0800
  • fbf57bde66 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop Matteo Pagliazzi 2013-11-05 19:24:36 +0100
  • 5b9002820f replace express.bodyParser with express.json & express.urlencoded since it is deprecated in connect 3.0 Matteo Pagliazzi 2013-11-05 19:24:11 +0100
  • 2c2613ce42 allow editing tag & task.tag even if in challenge Tyler Renelle 2013-11-05 09:49:01 -0800
  • ee35d16f4d temporary log-suppressing so i can diagnose live a bit better Tyler Renelle 2013-11-05 09:34:09 -0800
  • cde3bb4c69 user._v & group._v fixes Tyler Renelle 2013-11-04 13:43:24 -0800
  • d0c29eba78 move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build Matteo Pagliazzi 2013-11-04 22:11:45 +0100
  • c6634b5539 temp migration to remove invalid due dates since npmjs is down Tyler Renelle 2013-11-04 12:19:56 -0800
  • 3e6eaf6f2f sanitize challenge update Tyler Renelle 2013-11-04 12:19:40 -0800
  • 54225d38f1 re-add angular-resource Matteo Pagliazzi 2013-11-04 20:29:30 +0100
  • fadce5b3be remove sticky that is not used it seems Matteo Pagliazzi 2013-11-04 19:45:03 +0100
  • c16fa8ccf2 add restangular Matteo Pagliazzi 2013-11-04 19:36:45 +0100
  • 2fb83c5b6f bower remove jquery cookie & reorganize Matteo Pagliazzi 2013-11-04 19:32:16 +0100
  • 15d9e33252 [#1745] task.date as string instead of date Tyler Renelle 2013-11-04 09:12:32 -0800
  • 7161ddf70e bug fix on saving chal Tyler Renelle 2013-11-04 09:02:22 -0800
  • 63b4e5152e better fix #1740 Matteo Pagliazzi 2013-11-04 15:21:05 +0100
  • 774ded9fb2 fix #1740 Matteo Pagliazzi 2013-11-04 15:17:09 +0100
  • f467dcb3c9 [#1712] restore streaks, values, dates, tags that got lost in the challenges migration Tyler Renelle 2013-11-04 01:41:23 -0800
  • 4f52c7e15d [#1722] have to click twice for options.profile.profile Tyler Renelle 2013-11-04 00:41:16 -0800
  • b7479e7839 use $elemMatch for better performance on fetching challenge participants Tyler Renelle 2013-11-04 00:27:44 -0800
  • 0d6d20b939 [#1740] temp workaround to chat duplication Tyler Renelle 2013-11-03 23:39:09 -0800
  • c9776b8857 fix to deleting chat message Tyler Renelle 2013-11-03 23:30:09 -0800
  • aa8cdfb198 bug fix to challenge.tasks._id out of sync Tyler Renelle 2013-11-03 22:47:20 -0800
  • 452c4e1ece [#1729] move most chal-user syncing logic to their models rather than controllers. don't sync task.value or task.history over to user on challenge.join()! some work-arounds for the task._id/id mismatch (still not perfect, need to work on some more) Tyler Renelle 2013-11-03 22:33:53 -0800
  • 7060f75c83 [#1741] remove _id from TaskSchema (we're too deep in our legacy task.id requirement, we can revisit later) Tyler Renelle 2013-11-03 21:16:58 -0800
  • d589c24371 Merge pull request #1700 from djuretic/develop Tyler Renelle 2013-11-03 18:59:56 -0800
  • 427a70e76d [#1731] update guild gems wording Tyler Renelle 2013-11-03 18:30:50 -0800
  • de05d7dfda [#1735] fix to 6f6df94 Tyler Renelle 2013-11-03 18:00:26 -0800
  • 14fac02a52 [#1738] add due date to taskSchema Tyler Renelle 2013-11-03 17:53:51 -0800
  • 6f6df94ce7 [#1735] save timezone to userobj in browser as well as sending to server, so we don't hit an infinite loop Tyler Renelle 2013-11-03 17:47:38 -0800
  • 557ce59c71 back to non-halloween NPCs Tyler Renelle 2013-11-03 17:44:17 -0800
  • 33c78c7168 more fixes for guild leaving Matteo Pagliazzi 2013-11-03 12:12:43 +0100
  • 126fd55ec6 update guild member count Matteo Pagliazzi 2013-11-03 12:00:57 +0100
  • 06f6dc0a43 better guild join/leave Matteo Pagliazzi 2013-11-03 11:58:42 +0100
  • 7e811b9998 safety-check task removal Tyler Renelle 2013-11-02 18:29:53 -0700
  • 62012a1052 fix adding challenges as subdoc to groups. write migration to restore those that have been created. Also in migration fix missing task.ids (taskSchema issue) Tyler Renelle 2013-11-02 18:01:29 -0700
  • c5d3d142d9 [#1711] taskSchema back to doc so we can use .id(). The performacne hit isn't drastic, it was the history entries that was hurting us Tyler Renelle 2013-11-02 17:09:24 -0700
  • e84aa13d62 fix reroll Tyler Renelle 2013-11-02 16:58:24 -0700
  • ba8a8d2494 add .id back to task schema Tyler Renelle 2013-11-02 16:40:00 -0700
  • 8a9059aabf [#1723] send down pets array for clicked members for now (we'll eventually want to just send count(items.pets) for better performance) Tyler Renelle 2013-11-02 16:22:42 -0700
  • 646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't scroll to top of page. We'll want to test that this doesn't break anything else in the app, @paglias looks like the guys on that thread felt pretty dirty about this workaround for some reason Tyler Renelle 2013-11-02 16:07:12 -0700
  • 989bdc245b challenges: fix adding new tasks on update Tyler Renelle 2013-11-02 15:19:56 -0700
  • 838108d579 [#1711] got it! task.*.history & user.history as defined schemas was the problem, since they're arrays of >100 each Tyler Renelle 2013-11-02 12:49:08 -0700
  • 01536a2e29 Revert "[#1711] back to Schema.Types.Mixed for user.tasks, this makes me sad :(" Tyler Renelle 2013-11-02 12:24:05 -0700
  • c0292d0842 [#1711] back to Schema.Types.Mixed for user.tasks, this makes me sad :( Tyler Renelle 2013-11-02 11:41:34 -0700
  • 8e38aa1332 better task defaults, since we may not be able to use Mongoose TaskSchema (see http://goo.gl/a5irq4) Tyler Renelle 2013-11-02 11:01:40 -0700
  • f784e2a0d2 remove blank line Matteo Pagliazzi 2013-11-02 15:55:28 +0100
  • 567b69a0f1 fix #1669 Matteo Pagliazzi 2013-11-02 15:54:10 +0100
  • 9454a3a629 should help performances, it inserted the whole group leader object into the profile attr Matteo Pagliazzi 2013-11-02 12:40:36 +0100