sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5737 commits 3 branches 0 tags 1.6 GiB
Commit graph

5737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alice Harris
876d1d435d change Fetch Recent Messages from tooltip to button text 2014-11-01 11:42:48 +10:00
Alice Harris
372869d709 enable feature to block chat until user agrees to guidelines 2014-11-01 11:03:01 +10:00
Alice Harris
0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop 
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
 2014-11-01 10:25:38 +10:00
Alice Harris
48cfd1c2a1 convert JackOLantern-Base pumpkin pet code to commented-out example code for future use 2014-11-01 07:30:40 +10:00
Tyler Renelle
d9cfe3c370 bailey(halloween) 2014-10-31 13:05:33 -06:00
Blade Barringer
416058ffcf Updated href with angular expression to ng-href 2014-10-31 14:03:57 -05:00
Tyler Renelle
9efaf39b2b feat(webhooks): add webhooks to user.preferences (API settings) so we can post to external services (eg, Beeminder) 2014-10-29 15:27:39 -06:00
Tyler Renelle
d45f40ca1f refactor(tags): simplify with ui-keyup, see #4141 2014-10-29 14:28:09 -06:00
Tyler Renelle
c3a62096ad Merge pull request #4141 from gjoyner/tags 
Tags (filters) saves when pressing Enter instead of deleting
 2014-10-29 14:27:21 -06:00
Tyler Renelle
8423de287e Merge pull request #4142 from gjoyner/tasks 
Popovers now disappear when clicking Save & Close
 2014-10-29 14:22:21 -06:00
Tyler Renelle
d11dd852c5 Merge pull request #4144 from gjoyner/front 
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-29 14:19:38 -06:00
Alice Harris
7b2b287826 Merge pull request #4192 from Alys/quickfix1 
change Heroic to Guardian for non-staff moderators
 2014-10-28 11:37:51 +10:00
Alice Harris
7d817f1298 change Heroic to Guardian for non-staff moderators 2014-10-28 11:33:50 +10:00
Alice Harris
2d392be772 Merge pull request #4191 from Alys/quickfix 
Community Guidelines date; wrapping in staff/mod names in Tavern
 2014-10-28 11:17:21 +10:00
Alice Harris
0da873308d adjust last-updated date in Community Guidelines; add quick-and-dirty fix to allow staff/moderator names to wrap in message above Tavern chat 2014-10-28 11:05:18 +10:00
Alice Harris
354e8a8167 change mods@habitrpg.com to leslie@habitrpg.com 2014-10-27 18:07:15 -06:00
Tyler Renelle
edc9382e99 bailey(communityGuidelines): -breadstrings x1 2014-10-27 17:43:36 -06:00
Tyler Renelle
a394a1bc42 baily(communityGuidelines) 2014-10-27 16:51:42 -06:00
Tyler Renelle
b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Tyler Renelle
5d67995458 Merge pull request #4177 from holyspecter/challenge-action-bacground-bug 
Minor bug: In challenges area, Join button has a yellow background
 2014-10-27 13:58:26 -06:00
Tyler Renelle
b5fe46155b Merge pull request #4188 from tylerdmace/develop 
removed broken img tag and added quotes to malformed a tags
 2014-10-27 13:57:49 -06:00
Alice Harris
3d0f9c09bd Merge pull request #4167 from Alys/task-column-Habits-Rewards-tabs 
new tabs for Habits and Rewards columns on task page
 2014-10-27 18:46:08 +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
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
fd18232187 bailey(): mystery, costume challenge 2014-10-24 20:33:51 -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
87273ec680 bailey(quests): moonstone chain quest 2014-10-23 10:57:09 -06: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
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
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