Commit graph

  • 3df4724999 Merge branch 'develop' into sabe/attributes Sabe Jones 2014-01-01 12:42:37 -0600
  • 2f4112e2f1 Merge pull request #2112 from djuretic/e2e djuretic 2014-01-01 09:10:16 -0800
  • 803a45b47f Test server port changed to 3001 Dušan Juretić 2014-01-01 13:36:02 -0300
  • 431622ce14 E2e tests: launch Selenium and node server and kill them after finishing the tests, using a test database Dušan Juretić 2013-12-31 12:55:23 -0300
  • 69c4977511 Fix again e2e test Dušan Juretić 2013-12-29 16:56:51 -0300
  • c572a195aa Take screenshot of failed e2e tests Dušan Juretić 2013-12-28 23:44:41 -0300
  • 3c5f9d7f8b Mute Selenium on Travis Dušan Juretić 2013-12-28 23:16:02 -0300
  • 87e7b2ead6 Fix build by giving more time to Protractor Dušan Juretić 2013-12-27 23:41:22 -0300
  • a6443bceb8 Fix build Dušan Juretić 2013-12-27 23:03:16 -0300
  • 91b0f3fb96 E2e testing: added tests for failed login and register new user Dušan Juretić 2013-12-25 20:09:18 -0300
  • 462bc416de Starting e2e testing Dušan Juretić 2013-12-25 16:17:05 -0300
  • 0f3202f964 #2200 change-password is showing for facebook-registered users for some reason Tyler Renelle 2013-12-31 20:00:15 -0700
  • 0ecc013a00 Allow lastpass users to autofill their credentials Daniel Heath 2014-01-01 13:52:09 +1100
  • dfe6d9ff88 tasks: dbl-click saves a task when previously in edit-mode. @sabrecat @wc8 it used to be it just closes the edit dialog, but I find myself wanting to dblclick to save each time. Let me know if you think this is a bad idea Tyler Renelle 2013-12-31 18:11:20 -0700
  • 56613910f0 prevent popover shadows from being clipped/overlapped Ben Blank 2013-12-31 14:58:47 -0800
  • 32d1ff68b4 fix apparent misalignment of paws on pets/mounts grids Ben Blank 2013-12-31 14:34:24 -0800
  • 962d509405 checklists #2198 don't collapse when in edit mode (that what you mean @sabrecat?) Tyler Renelle 2013-12-31 14:05:39 -0700
  • 09eddd3eb2 checklists #2198 click badge to collapse checklist @sabrecat Tyler Renelle 2013-12-31 14:03:16 -0700
  • 77c6777506 checklists: collapse individually Tyler Renelle 2013-12-31 13:48:53 -0700
  • f6dec231f5 fix #2064 - user.stats.buffs.int in UserSchema (woops, @sabrecat we were looking in the wrong place!) Tyler Renelle 2013-12-31 13:36:28 -0700
  • d75d96fc4a Merge pull request #2203 from HabitRPG/sabe/tweak Tyler Renelle 2013-12-31 08:54:58 -0800
  • 3aa2470b33 Merge pull request #2201 from aughr/seed_working Tyler Renelle 2013-12-31 08:53:03 -0800
  • be38029015 Extend notification time, fix MP alerts Sabe Jones 2013-12-31 10:29:13 -0600
  • bde22636cf checklsits: package & bower use habitrpg-shared#develop Tyler Renelle 2013-12-31 09:15:25 -0700
  • 1dda9254f3 bailey: notif on task icons & markdown Tyler Renelle 2013-12-31 09:15:06 -0700
  • b76b275a7c winter: party hat fix, big snowball in inventory (@lemoness). Still small one in spells list, those are 32x22. I say we just leave it Tyler Renelle 2013-12-31 08:54:26 -0700
  • 0285de5098 winter: use npc_ian from holiday-event pngs, disable gif for now (revert this later) Tyler Renelle 2013-12-31 08:45:13 -0700
  • 549fd7bac0 new year's eve event: party hat, new NPCs Tyler Renelle 2013-12-31 08:44:01 -0700
  • 80e593d49f new years eve: bailey Tyler Renelle 2013-12-31 08:43:29 -0700
  • 4662fe151b Implement "training" over the course of a level, for task-based attribute allocation Sabe Jones 2013-12-31 09:05:03 -0600
  • 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop Tyler Renelle 2013-12-31 08:04:51 -0700
  • 8de5206f1b Add attribute training to user model Sabe Jones 2013-12-31 09:04:02 -0600
  • 8cc55b1ee5 rebirth fix tests Tyler Renelle 2013-12-31 08:02:58 -0700
  • 640da7aa54 rebirth: return user in response Tyler Renelle 2013-12-31 08:00:47 -0700
  • 19f53c3675 Merge remote-tracking branch 'origin/sabe/rebirth' into develop Tyler Renelle 2013-12-31 07:56:35 -0700
  • 01ecc616f6 Merge branch 'checklists' into develop Tyler Renelle 2013-12-31 07:53:34 -0700
  • dc77360d66 Fix seed file Andrew Bloomgarden 2013-12-30 23:44:24 -0800
  • c4a82d4edd Daily derp! Don't return PER when STR is suggested Sabe Jones 2013-12-30 23:09:47 -0600
  • 9c5f1c2150 Add debug button to hand out levels one at a time Sabe Jones 2013-12-30 22:56:01 -0600
  • cc02d3f042 Edit comma before } Marcelo Sizer 2013-12-31 00:19:13 -0200
  • eb71a2341f Merge branch 'develop' of https://github.com/Sinza-/habitrpg into develop Marcelo Sizer 2013-12-31 00:17:30 -0200
  • ff5a42e3df Replace hard coded strings for env.t on views/shared/ folder. Marcelo Sizer 2013-12-31 00:15:53 -0200
  • 3aa64a2923 Merge pull request #2194 from katfang/develop Tyler Renelle 2013-12-30 15:48:03 -0800
  • 85657f40d3 Fix placement of "Restore Streak" caption on Firefox Sabe Jones 2013-12-30 17:25:13 -0600
  • 7205221b86 Minor Text Update to Class Tour katfang 2013-12-30 17:26:44 -0500
  • eb016649e1 checklists: grant GP bonus for CLIs on To-Dos Tyler Renelle 2013-12-30 14:51:49 -0700
  • 4fcee66c3b checklists: inline by default, add help popover Tyler Renelle 2013-12-30 14:40:07 -0700
  • c7dde3cde1 checklists: add CL up/down keyboard nav Tyler Renelle 2013-12-30 13:42:19 -0700
  • 26b83b4d40 Update main.json Marcelo Sizer 2013-12-30 18:33:47 -0200
  • 85c96886a3 checklists: point-match TDs for each CL-item. Bug fix on resetting CLs on cron Tyler Renelle 2013-12-30 13:23:48 -0700
  • 1110338b9b checklists: handle backspacing an empty CL item Tyler Renelle 2013-12-30 13:19:42 -0700
  • ebc7cf6bcb checklists: better handling of saveTask, keypress:13, and remove-blur Tyler Renelle 2013-12-30 12:56:26 -0700
  • 0fe2804c3c fix #2184 put dbl-click for task._editing on the correct element Tyler Renelle 2013-12-30 11:17:19 -0700
  • 9f4efc31ed Break out autoAllocate to its own function Sabe Jones 2013-12-30 11:39:53 -0600
  • a854109fcd Get attributes layout up-to-date with develop changes Sabe Jones 2013-12-30 07:33:17 -0600
  • 63541ad268 checklists: add inline-checklists user preference, and hide inlines when editing Tyler Renelle 2013-12-30 09:10:15 -0700
  • bb3bec520e checklists: tmp commit to showcase how inline checklists look on tasks (only for todos for comparison) Tyler Renelle 2013-12-30 00:18:19 -0700
  • 968b091ccd checklists: checklist as <li> instead of <label>, so that inline-editing doesn't trigger checkmark. Unfortunately means we need to replicate some bootstrap css Tyler Renelle 2013-12-30 00:17:15 -0700
  • 1ace999cb7 Tasks: add double-click to edit, and date-picker-popup for due-dates. Show red dates when overdue (basic) Tyler Renelle 2013-12-29 23:49:19 -0700
  • 74c905f1e1 checklists WIP Tyler Renelle 2013-12-29 21:10:27 -0700
  • ea31cc6926 Merge branch 'task-li-notes' into develop Tyler Renelle 2013-12-30 10:28:45 -0700
  • 6f0046dffc Revert b4ff7d4 b20a3b7 . Temporarily remove todo-filter. This brings back the big performance issue of always displaying completed-todos, but fixes #2180 #2189. See #2180 for discussion. Tyler Renelle 2013-12-30 10:19:57 -0700
  • 39396afba8 Merge pull request #2177 from HabitRPG/sabe/tweak Tyler Renelle 2013-12-30 08:42:19 -0800
  • 96b3c2b7f5 Merge pull request #2185 from HabitRPG/sabe/tweak2 Tyler Renelle 2013-12-30 08:32:58 -0800
  • 958ec99f1a Merge branch 'develop' into sabe/attributes Sabe Jones 2013-12-30 10:27:58 -0600
  • d3a6191a5e Merge branch 'develop' into sabe/attributes Sabe Jones 2013-12-30 10:25:08 -0600
  • 5538bcc6a9 Advanced Options default to being shown Sabe Jones 2013-12-30 08:57:41 -0600
  • 9a32cfd7e1 Remove extraneous techy characters from boss fight and spellcasting chat notifications Sabe Jones 2013-12-30 08:46:40 -0600
  • 2aa1e91b8a Merge pull request #2175 from HabitRPG/sabe/tweak2 Sabe Jones 2013-12-30 05:40:06 -0800
  • 199a74d8a9 Fix #2181 (allocated points showing up in Class Equip Bonus) Sabe Jones 2013-12-30 07:33:17 -0600
  • 6f4f04a5af Delete locales/en/secondary.json Marcelo Sizer 2013-12-30 10:39:28 -0200
  • 55fbd7d439 Merge remote-tracking branch 'upstream/develop' into develop Marcelo Sizer 2013-12-30 10:33:08 -0200
  • c7e93f7793 remove console.log Matteo Pagliazzi 2013-12-30 12:28:30 +0100
  • 34319bdcd3 improved multiple files translations Matteo Pagliazzi 2013-12-30 12:23:23 +0100
  • cb07bc9229 allow multiple files for translations Matteo Pagliazzi 2013-12-30 12:16:42 +0100
  • bb80176920 checklists WIP Tyler Renelle 2013-12-29 21:10:45 -0700
  • c3aed6fb28 RPG demystification, cont'd Sabe Jones 2013-12-29 20:58:35 -0600
  • 57ac0239c5 Replaced hard-coded strings with env.t on views/static folder and en/app.json contains it all. Marcelo Sizer 2013-12-30 00:14:55 -0200
  • 9cdf567872 Put ignores in .nodemonignore as well Sabe Jones 2013-12-29 19:22:37 -0600
  • 6299415d6e Merge pull request #2173 from HabitRPG/sabe/tweak2 Tyler Renelle 2013-12-29 17:19:50 -0800
  • 1036f0549e Add .idea and .git to nodemon ignore list, to reduce unnecessary server bounces during dev Sabe Jones 2013-12-29 19:11:32 -0600
  • 50d241e2c8 #2083 add list-item notes at top-level element Tyler Renelle 2013-12-29 17:34:21 -0700
  • 61dfb8d129 Merge pull request #2086 from HabitRPG/sabe/tweak2 Tyler Renelle 2013-12-29 16:19:09 -0800
  • 2f4fd2faca fix #2163 add stats.maxMP in GET /api/v2/user. @russtaylor let me know if you need it in other locations Tyler Renelle 2013-12-29 17:13:39 -0700
  • bb5fe9c6e5 classes: temporary stopgap for https://github.com/HabitRPG/habitrpg/issues/2150 , burst-of-flames being too powerful. This isn't the real solution we need something better Tyler Renelle 2013-12-29 16:58:45 -0700
  • af499a0663 fix https://github.com/HabitRPG/habitrpg/issues/2172 save task.tags Tyler Renelle 2013-12-29 16:46:25 -0700
  • fd324fc220 classes: fix class-modal heads. Also, little class title display trick @sabrecat (tiny perf bonus) Tyler Renelle 2013-12-29 12:18:29 -0700
  • be4e29faba Merge pull request #2162 from HabitRPG/sabe/tweak3 Tyler Renelle 2013-12-29 11:12:52 -0800
  • 2f79472439 Some work on demystification of RPG elements Sabe Jones 2013-12-29 11:04:31 -0600
  • e9cb9b8a9f task-icons: larger emoji in task text than chat Tyler Renelle 2013-12-29 01:24:02 -0700
  • c14e4c8fec display profile.stats.class in modal Tyler Renelle 2013-12-29 00:47:39 -0700
  • 585f736305 add markdown support for task.text so we can use icons in task titles. @wc8 does this satisfy https://trello.com/c/FCVdjdUd/102-task-reward-icons sufficiently? @lemoness Tyler Renelle 2013-12-29 00:46:08 -0700
  • b4ff7d4be4 #1499 check that task[0] exists first Tyler Renelle 2013-12-29 00:33:58 -0700
  • d966833782 #1499 ng-if to hide/show task editing (fewer watchers) Tyler Renelle 2013-12-28 23:31:28 -0700
  • b20a3b7381 #1499 add list filter on tasks to not display completed todos at all until "completed" tab clicked Tyler Renelle 2013-12-29 00:12:15 -0700
  • 34a955665c Merge pull request #1986 from Magnilucent/develop Tyler Renelle 2013-12-28 21:15:32 -0800
  • 46f772581d Merge pull request #2153 from HabitRPG/sabe/tweak3 Tyler Renelle 2013-12-28 21:14:48 -0800
  • 8ed891db83 Merge pull request #1984 from SyntaxPickax/patch-2 Tyler Renelle 2013-12-28 21:09:48 -0800
  • dfa25c6f3a fix https://github.com/HabitRPG/habitrpg/issues/2156 stack stealth Tyler Renelle 2013-12-28 22:01:44 -0700
  • 57cd53cfc9 fix #2155 . Since quest.leader is new, doesn't apply to quests started before today. Show abort/begin for all quest members if quest.leader doesn't exist, otherwise only show those options to the leader Tyler Renelle 2013-12-28 21:54:25 -0700