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
Alice Harris 59fd7e92ba improve labels for Habit tags 2014-10-27 18:32:51 +10:00
Alice Harris 44ee614427 add text for tabs for Habits and Rewards columns on task page 2014-10-27 18:32:14 +10:00
Tyler Mace 5a4aee90ed removed broken img tag and added quotes to malformed a tags 2014-10-26 06:14:31 -06:00
Matteo Pagliazzi f8a975d4ea Merge pull request #4180 from jklein/fixing_alignment 
Fixing alignment for invited party members
 2014-10-26 12:44:53 +01:00
Matteo Pagliazzi b552a6762d Merge pull request #345 from Omnomnobot/patch-3 
Fixed a typo (youself -> yourself)
 2014-10-26 12:44:24 +01:00
Matteo Pagliazzi f63d2bf309 chore(i18n): update locales 2014-10-26 13:42:16 +01:00
Tyler Renelle 85aef2dd27 fix(communityGuidelines): modify script query to use collection indexes 
first for better perf
 2014-10-25 16:26:57 -06:00
Tyler Renelle 5c1b7d245d Merge branch 'Alys-communityGuidelines' into develop 
Conflicts:
	dist/habitrpg-shared.js
	locales/en/generic.json
 2014-10-25 16:19:22 -06:00
Tyler Renelle d6b41fd63f fix(mystery): typo 2014-10-24 20:37:50 -06:00
Tyler Renelle fd18232187 bailey(): mystery, costume challenge 2014-10-24 20:33:51 -06:00
Tyler Renelle 3c249725af feat(mystery): mystery items 2014-10 2014-10-24 20:32:40 -06:00
Tyler Renelle 3a3066cf08 Merge branch 'Alys-gemsIncrease' into develop 2014-10-24 18:56:49 -06:00
Tyler Renelle 35308853a5 feat(contributors): small update to alys's script 2014-10-24 18:56:11 -06:00
Tyler Renelle 623175c312 tmp(memleak): try working with apdex score to restart, rather than 
response time
 2014-10-24 18:42:07 -06:00
Tyler Renelle 2f8a8d4874 Merge pull request #346 from taldin/develop 
Fix possible bug when losing Jean Chalard's tunic
 2014-10-24 17:09:24 -06:00
Taldin bffce00a24 Fix possible bug when losing Jean Chalard's tunic 
Can't buy back armor_special_2 without being a backer.   Other legendary
quest items have this extra code.
 2014-10-24 13:24:09 -07:00
Tyler Renelle 87273ec680 bailey(quests): moonstone chain quest 2014-10-23 10:57:09 -06:00
Tyler Renelle 1e441d6fcd feat(gear): add broad & slim for armor_special_2 2014-10-23 10:53:55 -06:00
Tyler Renelle d3ca101dd8 feat(quests): add moonstone chain, lvl drop at 60 2014-10-23 10:33:20 -06:00
Omnomnobot f95f85b380 Fixed a typo (youself -> yourself) 2014-10-23 17:19:51 +02:00
Jonathan Klein c790e2bf5b Fixing alignment for invited party members 2014-10-23 10:03:29 -04:00
hospect 76de909683 Minor bug: In challenges area, Join button has a yellow background 2014-10-22 01:45:37 +03:00
Alice Harris d0aafcd8af Merge pull request #344 from crookedneighbor/add-at-to-arcosine 
Added @ symbol to arcosine
 2014-10-22 04:07:31 +10:00
Alice Harris 4b0805c393 Merge pull request #341 from crookedneighbor/fixPopoverGlitch 
Shortened title so popover glitch would be fixed
 2014-10-22 04:06:10 +10:00
Blade Barringer a4c4b73997 Removed completion completion text 2014-10-21 11:11:00 -05:00
Blade Barringer 899afd9958 Added @ symbol to arcosine 2014-10-21 11:08:43 -05:00
Alice Harris 5e89d07e07 add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills) 2014-10-21 15:39:46 +10:00
Alice Harris 3dc6d6385c Merge pull request #4166 from Alys/task-column-tabs-to-top 
put Daily and To-Do tabs at top and bottom - fixes https://github.com/HabitRPG/habitrpg/issues/3827
 2014-10-21 15:37:21 +10:00
Alice Harris 58c031fba4 Merge pull request #4169 from Alys/option 
move Dailies default setting to bottom to keep together the three settings about task edit mode
 2014-10-21 07:44:11 +10:00
Alice Harris 8d87ce6c1b moved new Dailies default setting to bottom of list to keep together the three settings about task edit mode 2014-10-20 05:49:50 +10:00
Alice Harris 739e7d3d76 Merge pull request #4157 from crookedneighbor/add-setting-for-due-view 
Added setting for making the due tab default on dailies
 2014-10-20 05:34:40 +10:00
Alice Harris 633b7f3e29 Merge pull request #340 from crookedneighbor/due-setting 
Add option in settings to make due tab the default view
 2014-10-20 05:33:55 +10:00
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
Matteo Pagliazzi 3edd4e970e chore(i18n): update locales 2014-10-19 12:45:50 +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
Blade Barringer 7c2329e156 Shortened title so popover glitch would be fixed 2014-10-17 11:23:39 -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