Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,101 Commits 64 Branches 1,256 Tags
ff4c2ade96d8aab851f8dfd1bb87008b892fd910
Commit Graph

6101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alice Harris 7f8bec57d3 Merge pull request #4164 from Alys/questOwnerFix-2014-10-16 
remove fix for case where quest owner has abandoned the party - fixes https://github.com/HabitRPG/habitrpg/issues/4074
 2014-10-20 05:17:19 +10:00
Matteo Pagliazzi b1fc435c9a feat(emails): add new images 2014-10-19 17:02:25 +02:00
Alice Harris d8ff2b6181 Merge pull request #4155 from crookedneighbor/fix-bootstrap-width-errors 
Changed margin .row under .container-fluid to match padding
 2014-10-19 18:44:39 +10:00
Alice Harris 9c6e303fe4 move Daily and To-Do tabs to mixin and put at top and bottom 2014-10-19 15:03:24 +10:00
Alice Harris 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 2014-10-18 06:15:46 +10:00
Matteo Pagliazzi edb005f2ae Merge pull request #4161 from crookedneighbor/fix-padding-on-party 
Fixed classes so padding would be correct on party tab
 2014-10-17 21:32:24 +02:00
Matteo Pagliazzi 6a561fbf3f Merge pull request #4162 from crookedneighbor/html-in-boss-quest-modal 
Corrected html not showing up correctly in quest modal
 2014-10-17 21:23:38 +02:00
Blade Barringer 1ca6d7a55b Removed second binding 2014-10-17 13:02:26 -05:00
Blade Barringer 8f6dc64b10 Corrected html not showing up correctly in quest modal 2014-10-17 12:45:16 -05:00
Blade Barringer cc71e493c6 Fixed classes so padding would be correct on party tab 2014-10-17 12:05:48 -05:00
Tyler Renelle d6e8d669b1 tmp(memleak): combine mem usage with avg request time 2014-10-17 11:59:39 -04:00
Matteo Pagliazzi 31d0c970fe Merge pull request #4159 from crookedneighbor/update-landing-page-img 
Set tags to default tags
 2014-10-17 17:17:12 +02:00
Blade Barringer 40585bf977 Set tags to default tags 2014-10-17 09:46:11 -05:00
negue cac4c53d3d Merge pull request #4151 from Alys/challengeFix-2014-10-16 
allow challenge tasks to be displayed on challenge page - fixes https://github.com/HabitRPG/habitrpg/issues/4150
 2014-10-17 12:50:54 +02:00
Alice Harris 817e7b8686 replace original challenge fix with negue's suggestion 2014-10-17 19:37:35 +10:00
Alice Harris 8cecabcc4c allow challenge tasks to be displayed on challenge page - fixes https://github.com/HabitRPG/habitrpg/issues/4150 2014-10-17 19:12:14 +10:00
Blade Barringer ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Blade Barringer a93f7a0394 Merge branch 'fix-bootstrap-width-errors' of github.com:crookedneighbor/habitrpg into fix-bootstrap-width-errors 2014-10-16 16:13:58 -05:00
Blade Barringer 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
 2014-10-16 16:13:33 -05:00
Blade Barringer 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
 2014-10-16 15:23:18 -05:00
deilann e0e9a87214 Merge pull request #4153 from crookedneighbor/update-landing-page-img 
Update landing page img
 2014-10-16 13:12:25 -07:00
Blade Barringer 9b67c4a78e Removed extra layer mistakenly left on 2014-10-16 15:08:52 -05:00
Blade Barringer c8efc166ba Corrected mobile view stats 2014-10-16 15:07:57 -05:00
Blade Barringer e584d7caf9 Updated look of landing page image 2014-10-16 14:57:48 -05:00
Matteo Pagliazzi 56af84bfdf Merge pull request #4146 from ebiagogo/3477 
Issue #3477 (again) - Fixed admin email address display text from admin@gmail.com
 2014-10-15 19:08:20 +02:00
Tyler Renelle fb68f70adf feat(halloween): updated bailey @lemoness 2014-10-14 20:30:05 -06:00
Michael P. Looby 3f92fb4b64 Fixed admin email address display text from admin@gmail.com to admin@habitrpg.com. 2014-10-14 22:17:20 -04:00
Tyler Renelle d0caf5f69b tmp(halloween): revert d5610ba , didn't work. Assign pumpkin on user.save() 2014-10-14 17:40:20 -06:00
Tyler Renelle d5610ba01f tmp(halloween): grant pumpkin pet to all users through october, 
REMEMBER revert on 11/1
 2014-10-14 17:29:27 -06:00
Tyler Renelle 3b769a1407 Merge branch 'spider' into develop 2014-10-14 16:54:56 -06:00
Tyler Renelle 1ffb640833 tmp(memleak): temporary memleak measure to check avg response-time every 3mins. If >650ms (high mem) or ==0 (blackout), restart 2014-10-14 15:21:29 -06:00
gjoyner 5e87b42af3 Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json 2014-10-13 23:47:34 -07:00
gjoyner 4ab19ac225 Popovers now disappear when clicking Save and Close 2014-10-13 14:10:59 -07:00
gjoyner feb55324ba Tags (filters) saves when pressing Enter instead of deleting the current tag 2014-10-13 01:57:59 -07:00
Tyler Renelle 32cab260a2 bailey(spider) 2014-10-12 20:04:18 -06:00
Tyler Renelle 39ab41549a feat(quests): spider quest 2014-10-12 19:29:51 -06:00
Tyler Renelle 56e2ec1bc4 Merge pull request #4140 from gjoyner/checklists 
Adding checklist item drag and drop feature
 2014-10-12 18:27:06 -06:00
Negue 67b341760e stop spell casting on rewards 2014-10-12 22:01:12 +02:00
Matteo Pagliazzi cd4626ec06 fix(moment): use new syntax, remove deprecation warning 2014-10-12 20:40:58 +02:00
gjoyner 9afbe42dbf Fixing indentions in taskCtrl.js 2014-10-12 03:15:28 -07:00
gjoyner 36bf09d984 Adding checklist item drag and drop feature 2014-10-12 01:48:51 -07:00
Matteo Pagliazzi 8da33857e4 fix(payments): revert unwanted change 2014-10-10 21:33:32 +02:00
Matteo Pagliazzi 1a15043cdd feat(emails): add backoff to delay failed jobs 2014-10-10 21:31:32 +02:00
Alice Harris 9a8cbbce4f Merge pull request #4136 from Alys/hide_completed_dailies-with-edit-fix 
allow Daily to stay visible while being edited
 2014-10-10 22:19:01 +10:00
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