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

731 Commits

Author SHA1 Message Date
Blade Barringer bf586cbc17 Added env.t declarations for translations 2014-11-23 21:16:32 -06:00
Tyler Renelle 743df194c7 feat(private-messages): add a "clear all" button 2014-11-21 08:42:24 -07:00
Tyler Renelle f5415ac6c5 feat(private-messages): start implementing private messaging (includes blocking). Start experimenting with reflists for PMs, instead of arrays 2014-11-20 19:03:01 -07:00
Tyler Renelle ebebcea34b fix(webhooks): sort webhooks by created, use angular-filter for sorting object 2014-11-19 15:42:14 -08:00
Sabe Jones bf8882e8f5 feat(quest): Add owl to purchasable quest eggs 2014-11-18 19:37:57 -06:00
Tyler Renelle f7f4473590 fix(payments): allow resubscription after unsubscribe 2014-11-17 19:51:03 -08:00
Tyler Renelle 6ef838cf1a feat(webhooks): move webhooks from array to object (everything should 
really be stored as objects). Add to API routes (see
HabitRPG/habitrpg-shared#83a22b8). Note, sorting doesn't work. Meh.
 2014-11-16 20:03:56 -08:00
Tyler Renelle 21d6b71d37 Merge branch 'webhooks' into develop 
Conflicts:
	src/controllers/user.js
 2014-11-16 15:24:15 -08:00
Tyler Renelle 64fd6c02f7 fix(mods): restricted projected fields for mods-listing. Also, 
static-bind for perf
 2014-11-13 23:00:22 -07:00
Tyler Renelle 2166321572 feat(invite-friends): add inviting friends via email. URL parsed, session holds invitation. If user joins party (new user or existing), the inviter is rewarded 2014-11-12 19:24:47 -07:00
Alice Harris f80da293ce fix bug that was causing empty pet paws to appear for rare mounts 2014-11-10 06:00:01 +10:00
Alice Harris 00b9e0d6ac Merge pull request #4205 from Alys/commGuide-accept-before-post-2014-11-01 
block chat until user agrees to Community Guidelines
 2014-11-08 12:02:59 +10:00
Alice Harris 7ebc4763d3 Merge pull request #4206 from Alys/fetch-recent-messages-2014-11-01 
change Fetch Recent Messages from tooltip to button text
 2014-11-08 07:20:46 +10:00
Tyler Renelle 89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Matteo Pagliazzi b858aece51 Merge pull request #4201 from crookedneighbor/href-to-nghref 
Updated href with angular expression to ng-href
 2014-11-01 10:19:38 +01:00
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
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
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
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
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 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
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
Blade Barringer cc71e493c6 Fixed classes so padding would be correct on party tab 2014-10-17 12:05:48 -05:00
Blade Barringer ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Tyler Renelle 39ab41549a feat(quests): spider quest 2014-10-12 19:29:51 -06:00
Alice Harris f0c3b3db4c add pipes in front of plain text to prevent "Warning: missing space before text for line nn of jade file ..." 2014-10-09 15:56:06 +10:00
Jonathan Klein 41de8014a0 Putting the boot icon on the same line as the member name in group members 2014-10-07 14:10:15 -04:00
Alice Harris 8a1973ae2f fix bug where quest Pets were being used instead of quest Mounts 2014-10-06 13:20:01 +10:00
Alice Harris 0c377343d5 fix bug where dropEggs were used for both types of mounts (instead of 'source') 2014-10-06 13:18:39 +10:00
Alice Harris d24b4ad141 add fix for hiding Plain Eggs on mounts page 2014-10-06 11:37:40 +10:00
Alice Harris ecd61ee602 Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop 
Conflicts:
	views/options/inventory/stable.jade
 2014-10-06 11:36:32 +10:00
Tyler Renelle 0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Tyler Renelle ab3c238d11 fix(avatar): put missing ng-click=buy-set back in 2014-09-30 22:06:05 -06:00
Tyler Renelle 3605b51748 feat(halloween): refactoring skin & hair to use the same mixins, add new 
halloween seasonal set
 2014-09-30 21:25:06 -06:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets 
feat(pets): release pets
 2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Negue b3c8acef10 fix guild list 2014-09-18 19:47:30 +02:00
Matteo Pagliazzi 7e53eaf1ae Revert "Revert "ngRepeat with track by"" 
This reverts commit c90c8f9a5f.
 2014-09-18 18:37:02 +02:00
Tyler Renelle 94e1d48588 feat(quests): add rooster rampage quest 2014-09-16 16:08:35 -06:00
Alice Harris 6e33c237d3 Merge pull request #4022 from Alys/partyAvatarSortOrder 
improve and clarify party avatar sort options for header - fixes https://github.com/HabitRPG/habitrpg/issues/2239
 2014-09-16 14:15:01 +10:00
Alice Harris 9cd323294a disable feature to block chat until use agreed to guidelines; remove unneeded code; adjust last-updated date to today 2014-09-14 12:39:25 +10:00
Alice Harris e6a29f80fa Merge pull request #4002 from Alys/questAbortFix 
add Cancel button for quests, allow party to cancel/abort if quest owner missing, add Debug tools for quest testing
 2014-09-12 14:01:09 +10:00
Alice Harris 5afb258aa9 add sort by name and background for party avatars in header, remove sort option from guilds pages 2014-09-12 09:47:02 +10:00