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

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 741b61d61e Corrected casing to match the site 2014-10-16 21:06:22 -05:00
Blade Barringer ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Blade Barringer 6d268cd697 Added missing comma 2014-10-16 20:24:47 -05:00
Blade Barringer ab0cdce119 Added key value pairs for making due a default 2014-10-16 19:46:22 -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
Alice Harris 1460a7e9c2 For spider quest changed "lay webs" to "lacy webs" 2014-10-16 14:02:56 +10:00
Negue 4698ab81a1 highlight the current username 2014-10-15 20:12:54 +02: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 b983ef5a35 The language file for the Forgot Password fix 2014-10-14 01:33:14 -07: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 11761f9ee2 feat(quests): spider quest 2014-10-12 19:29:18 -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 ab86241e14 chore(i18n): update locales 2014-10-11 14:55:46 +02:00
Alice Harris cb696d319d Merge pull request #337 from gjoyner/develop 
Changed the incorrect Remaining test for exportation from "Options > Settings > Data Export" to "Settings > Export"
 2014-10-11 15:15:52 +10:00
gjoyner 19f05d6b99 Changed the incorrect Remaining test for exportation from "Options > Settings > Data Export" to "Settings > Export" 2014-10-10 22:05:41 -07:00
Alice Harris 6b0701cd26 Merge pull request #315 from sbreiler/develop 
Fix percent function to return minimum zero
 2014-10-11 10:16:25 +10:00
Alice Harris c176b711ff change Pickpocket description - fixes https://github.com/HabitRPG/habitrpg/issues/4095 2014-10-11 06:04:29 +10: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
Alice Harris e4ce22fb81 Merge pull request #335 from mgnrsb/patch-1 
Updated capitalization for consistency
 2014-10-10 11:44:12 +10:00
Alice Harris dded3d50a6 Merge pull request #334 from beckie42/develop 
Edited capitalization for consistency
 2014-10-10 11:43:43 +10:00
beckie42 ef98f2ecfd Edited capitalization for consistency 
e.g. "daily" -> "Daily"
 2014-10-09 20:39:35 -05:00
mgnrsb 40bcf979d5 Updated capitalization for consistency 
e.g. dailies --> Dailies
 2014-10-09 20:37:15 -05:00
beckie42 69b1c3b07e Edited capitalization for consistency 
"to-do" -> "To-Do"
 2014-10-09 20:32:37 -05:00
beckie42 a41ed44cca Edited capitalization for consistency 
Changed capitalization of "Dailies" to be consistent
 2014-10-09 20:18:35 -05:00
Tyler Renelle d843ff1ae4 feat(item-store): unlock item-store earlier (lvl 1), see #4134 2014-10-09 17:23:54 -06:00
Tyler Renelle 1fbf3a7eba fix(static): fix static/api page, fixes #3636 2014-10-09 13:28:37 -06:00