Commit graph

  • c156aaadee add compiled file Alice Harris 2014-10-27 18:39:33 +1000
  • 59fd7e92ba improve labels for Habit tags Alice Harris 2014-10-26 11:15:35 +1000
  • 44ee614427 add text for tabs for Habits and Rewards columns on task page Alice Harris 2014-10-20 05:18:41 +1000
  • 5a4aee90ed removed broken img tag and added quotes to malformed a tags Tyler Mace 2014-10-26 06:14:31 -0600
  • f8a975d4ea Merge pull request #4180 from jklein/fixing_alignment Matteo Pagliazzi 2014-10-26 12:44:53 +0100
  • b552a6762d Merge pull request #345 from Omnomnobot/patch-3 Matteo Pagliazzi 2014-10-26 12:44:24 +0100
  • f63d2bf309 chore(i18n): update locales Matteo Pagliazzi 2014-10-26 13:42:16 +0100
  • 85aef2dd27 fix(communityGuidelines): modify script query to use collection indexes first for better perf Tyler Renelle 2014-10-25 16:26:57 -0600
  • 5c1b7d245d Merge branch 'Alys-communityGuidelines' into develop Tyler Renelle 2014-10-25 16:19:22 -0600
  • d6b41fd63f fix(mystery): typo Tyler Renelle 2014-10-24 20:37:50 -0600
  • fd18232187 bailey(): mystery, costume challenge Tyler Renelle 2014-10-24 20:33:51 -0600
  • 3c249725af feat(mystery): mystery items 2014-10 Tyler Renelle 2014-10-24 20:32:10 -0600
  • 3a3066cf08 Merge branch 'Alys-gemsIncrease' into develop Tyler Renelle 2014-10-24 18:56:49 -0600
  • 35308853a5 feat(contributors): small update to alys's script Tyler Renelle 2014-10-24 18:56:11 -0600
  • 623175c312 tmp(memleak): try working with apdex score to restart, rather than response time Tyler Renelle 2014-10-23 16:40:48 -0600
  • 2f8a8d4874 Merge pull request #346 from taldin/develop Tyler Renelle 2014-10-24 17:09:24 -0600
  • bffce00a24 Fix possible bug when losing Jean Chalard's tunic Taldin 2014-10-24 13:24:09 -0700
  • 87273ec680 bailey(quests): moonstone chain quest Tyler Renelle 2014-10-23 10:57:09 -0600
  • 1e441d6fcd feat(gear): add broad & slim for armor_special_2 Tyler Renelle 2014-10-23 10:53:55 -0600
  • d3ca101dd8 feat(quests): add moonstone chain, lvl drop at 60 Tyler Renelle 2014-10-23 10:33:20 -0600
  • f95f85b380 Fixed a typo (youself -> yourself) Omnomnobot 2014-10-23 17:19:51 +0200
  • c790e2bf5b Fixing alignment for invited party members Jonathan Klein 2014-10-23 09:54:23 -0400
  • 76de909683 Minor bug: In challenges area, Join button has a yellow background hospect 2014-10-22 01:44:52 +0300
  • d0aafcd8af Merge pull request #344 from crookedneighbor/add-at-to-arcosine Alice Harris 2014-10-22 04:07:31 +1000
  • 4b0805c393 Merge pull request #341 from crookedneighbor/fixPopoverGlitch Alice Harris 2014-10-22 04:06:10 +1000
  • a4c4b73997 Removed completion completion text Blade Barringer 2014-10-21 11:11:00 -0500
  • 899afd9958 Added @ symbol to arcosine Blade Barringer 2014-10-21 11:08:12 -0500
  • 5e89d07e07 add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills) Alice Harris 2014-10-19 18:04:28 +1000
  • 3dc6d6385c Merge pull request #4166 from Alys/task-column-tabs-to-top Alice Harris 2014-10-21 15:37:21 +1000
  • 58c031fba4 Merge pull request #4169 from Alys/option Alice Harris 2014-10-21 07:44:11 +1000
  • 8d87ce6c1b moved new Dailies default setting to bottom of list to keep together the three settings about task edit mode Alice Harris 2014-10-20 05:49:50 +1000
  • 739e7d3d76 Merge pull request #4157 from crookedneighbor/add-setting-for-due-view Alice Harris 2014-10-20 05:34:40 +1000
  • 633b7f3e29 Merge pull request #340 from crookedneighbor/due-setting Alice Harris 2014-10-20 05:33:55 +1000
  • 7f8bec57d3 Merge pull request #4164 from Alys/questOwnerFix-2014-10-16 Alice Harris 2014-10-20 05:17:19 +1000
  • b1fc435c9a feat(emails): add new images Matteo Pagliazzi 2014-10-19 17:02:25 +0200
  • 3edd4e970e chore(i18n): update locales Matteo Pagliazzi 2014-10-19 12:45:50 +0200
  • d8ff2b6181 Merge pull request #4155 from crookedneighbor/fix-bootstrap-width-errors Alice Harris 2014-10-19 18:44:39 +1000
  • 9c6e303fe4 move Daily and To-Do tabs to mixin and put at top and bottom Alice Harris 2014-10-19 15:03:24 +1000
  • c75b272eb1 comment-out code that handles the cases where the quest owner has left the quest or left the party, at least until we can work out why it fails sometimes Alice Harris 2014-10-18 06:15:46 +1000
  • edb005f2ae Merge pull request #4161 from crookedneighbor/fix-padding-on-party Matteo Pagliazzi 2014-10-17 21:32:24 +0200
  • 6a561fbf3f Merge pull request #4162 from crookedneighbor/html-in-boss-quest-modal Matteo Pagliazzi 2014-10-17 21:23:38 +0200
  • 1ca6d7a55b Removed second binding Blade Barringer 2014-10-17 13:02:26 -0500
  • 8f6dc64b10 Corrected html not showing up correctly in quest modal Blade Barringer 2014-10-17 12:45:16 -0500
  • cc71e493c6 Fixed classes so padding would be correct on party tab Blade Barringer 2014-10-17 12:05:48 -0500
  • 7c2329e156 Shortened title so popover glitch would be fixed Blade Barringer 2014-10-17 11:23:39 -0500
  • d6e8d669b1 tmp(memleak): combine mem usage with avg request time Tyler Renelle 2014-10-16 01:00:18 -0400
  • 31d0c970fe Merge pull request #4159 from crookedneighbor/update-landing-page-img Matteo Pagliazzi 2014-10-17 17:17:12 +0200
  • 40585bf977 Set tags to default tags Blade Barringer 2014-10-17 09:46:11 -0500
  • cac4c53d3d Merge pull request #4151 from Alys/challengeFix-2014-10-16 negue 2014-10-17 12:50:54 +0200
  • 817e7b8686 replace original challenge fix with negue's suggestion Alice Harris 2014-10-17 19:37:35 +1000
  • 8cecabcc4c allow challenge tasks to be displayed on challenge page - fixes https://github.com/HabitRPG/habitrpg/issues/4150 Alice Harris 2014-10-16 09:55:16 +1000
  • 741b61d61e Corrected casing to match the site Blade Barringer 2014-10-16 21:06:22 -0500
  • ed15d0b1c7 Added setting for making the due tab default on dailies Blade Barringer 2014-10-16 21:04:23 -0500
  • 6d268cd697 Added missing comma Blade Barringer 2014-10-16 20:24:47 -0500
  • ab0cdce119 Added key value pairs for making due a default Blade Barringer 2014-10-16 19:46:22 -0500
  • a93f7a0394 Merge branch 'fix-bootstrap-width-errors' of github.com:crookedneighbor/habitrpg into fix-bootstrap-width-errors Blade Barringer 2014-10-16 16:13:58 -0500
  • ee0e8efa9d Changed margin .row under .container-fluid to match padding Since the default is padding: 0 15px, changing it to 0 5px also requires a change to the row right after it Blade Barringer 2014-10-16 15:23:18 -0500
  • 8899463160 Changed margin .row under .container-fluid to match padding Since the default is padding: 0 15px, changing it to 0 5px also requires a change to the row right after it Blade Barringer 2014-10-16 15:23:18 -0500
  • e0e9a87214 Merge pull request #4153 from crookedneighbor/update-landing-page-img deilann 2014-10-16 13:12:25 -0700
  • 9b67c4a78e Removed extra layer mistakenly left on Blade Barringer 2014-10-16 15:08:52 -0500
  • c8efc166ba Corrected mobile view stats Blade Barringer 2014-10-16 15:07:57 -0500
  • e584d7caf9 Updated look of landing page image Blade Barringer 2014-10-16 14:57:48 -0500
  • 1460a7e9c2 For spider quest changed "lay webs" to "lacy webs" Alice Harris 2014-10-16 14:02:56 +1000
  • 4698ab81a1 highlight the current username Negue 2014-10-15 20:12:54 +0200
  • 56af84bfdf Merge pull request #4146 from ebiagogo/3477 Matteo Pagliazzi 2014-10-15 19:08:20 +0200
  • fb68f70adf feat(halloween): updated bailey @lemoness Tyler Renelle 2014-10-14 20:30:05 -0600
  • 3f92fb4b64 Fixed admin email address display text from admin@gmail.com to admin@habitrpg.com. Michael P. Looby 2014-10-14 22:17:20 -0400
  • d0caf5f69b tmp(halloween): revert d5610ba , didn't work. Assign pumpkin on user.save() Tyler Renelle 2014-10-14 17:40:20 -0600
  • d5610ba01f tmp(halloween): grant pumpkin pet to all users through october, REMEMBER revert on 11/1 Tyler Renelle 2014-10-14 17:29:27 -0600
  • 3b769a1407 Merge branch 'spider' into develop Tyler Renelle 2014-10-14 16:54:56 -0600
  • 1ffb640833 tmp(memleak): temporary memleak measure to check avg response-time every 3mins. If >650ms (high mem) or ==0 (blackout), restart Tyler Renelle 2014-10-14 15:10:13 -0600
  • b983ef5a35 The language file for the Forgot Password fix gjoyner 2014-10-14 01:33:14 -0700
  • 5e87b42af3 Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json gjoyner 2014-10-13 23:47:34 -0700
  • 4ab19ac225 Popovers now disappear when clicking Save and Close gjoyner 2014-10-13 14:10:59 -0700
  • feb55324ba Tags (filters) saves when pressing Enter instead of deleting the current tag gjoyner 2014-10-13 01:57:59 -0700
  • 32cab260a2 bailey(spider) Tyler Renelle 2014-10-12 20:04:18 -0600
  • 39ab41549a feat(quests): spider quest Tyler Renelle 2014-10-12 19:29:51 -0600
  • 11761f9ee2 feat(quests): spider quest Tyler Renelle 2014-10-12 19:15:15 -0600
  • 56e2ec1bc4 Merge pull request #4140 from gjoyner/checklists Tyler Renelle 2014-10-12 18:27:06 -0600
  • 67b341760e stop spell casting on rewards Negue 2014-10-12 22:01:12 +0200
  • cd4626ec06 fix(moment): use new syntax, remove deprecation warning Matteo Pagliazzi 2014-10-12 20:40:58 +0200
  • 9afbe42dbf Fixing indentions in taskCtrl.js gjoyner 2014-10-12 03:15:28 -0700
  • 36bf09d984 Adding checklist item drag and drop feature gjoyner 2014-10-12 01:48:51 -0700
  • ab86241e14 chore(i18n): update locales Matteo Pagliazzi 2014-10-11 14:55:46 +0200
  • cb696d319d Merge pull request #337 from gjoyner/develop Alice Harris 2014-10-11 15:15:52 +1000
  • 19f05d6b99 Changed the incorrect Remaining test for exportation from "Options > Settings > Data Export" to "Settings > Export" gjoyner 2014-10-10 22:05:41 -0700
  • 6b0701cd26 Merge pull request #315 from sbreiler/develop Alice Harris 2014-10-11 10:16:25 +1000
  • c176b711ff change Pickpocket description - fixes https://github.com/HabitRPG/habitrpg/issues/4095 Alice Harris 2014-10-11 06:04:29 +1000
  • 8da33857e4 fix(payments): revert unwanted change Matteo Pagliazzi 2014-10-10 21:33:32 +0200
  • 1a15043cdd feat(emails): add backoff to delay failed jobs Matteo Pagliazzi 2014-10-10 21:31:32 +0200
  • 9a8cbbce4f Merge pull request #4136 from Alys/hide_completed_dailies-with-edit-fix Alice Harris 2014-10-10 22:19:01 +1000
  • 13b12b830c allow a task to stay visible while being edited, regardless of other parameters Alice Harris 2014-10-10 22:14:43 +1000
  • d7c8d48078 Merge pull request #4129 from Alys/Gaelan-hide_completed_dailies Alice Harris 2014-10-10 22:07:30 +1000
  • e4ce22fb81 Merge pull request #335 from mgnrsb/patch-1 Alice Harris 2014-10-10 11:44:12 +1000
  • dded3d50a6 Merge pull request #334 from beckie42/develop Alice Harris 2014-10-10 11:43:43 +1000
  • ef98f2ecfd Edited capitalization for consistency beckie42 2014-10-09 20:39:35 -0500
  • 40bcf979d5 Updated capitalization for consistency mgnrsb 2014-10-09 20:37:15 -0500
  • 69b1c3b07e Edited capitalization for consistency beckie42 2014-10-09 20:32:37 -0500
  • a41ed44cca Edited capitalization for consistency beckie42 2014-10-09 20:18:35 -0500
  • d843ff1ae4 feat(item-store): unlock item-store earlier (lvl 1), see #4134 Tyler Renelle 2014-10-09 17:23:54 -0600