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

748 Commits

Author SHA1 Message Date
negue 0f3070e334 Allow send messages to yourself - see #4295 2014-11-30 01:52:46 +01:00
Blade Barringer e4b2351b42 Removed extraneous space 2014-11-29 12:53:19 -06:00
Blade Barringer 223cac838e Added one time binding to ng-if 2014-11-29 12:52:34 -06:00
Blade Barringer 3a29eef799 Removed pm symbol if sent by own user 2014-11-29 12:30:15 -06:00
Blade Barringer e0f09cd468 Removed option to send private message if it would go to system. Closes 2014-11-29 12:26:28 -06:00
Tyler Renelle 3204418af1 Revert #4291 
This reverts commit a1ea6869b7.
 2014-11-29 09:16:44 -07:00
Steffen Breiler 28b25c6b89 Fix #4259 (always 100% long bars in IE11) 
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
 2014-11-27 22:55:01 +01:00
Steffen Breiler 64a76566a0 Fix #4259 (always 100% long bars in IE11) 
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
 2014-11-27 22:52:03 +01:00
Tyler Renelle 1e5b7e6f2d fix(#4282): refactor for DRY unlock/hide paths 2014-11-26 10:49:49 -07:00
Tyler Renelle 0278caca76 fix(#4282): fix $parse errors in avatar customize screens 2014-11-26 10:49:49 -07:00
Matteo Pagliazzi c0a3fc887a fix(costume): better fix for #4274 2014-11-26 12:26:41 +01:00
Matteo Pagliazzi 43fa461a67 fix(costume): fixes #4274 2014-11-26 12:19:33 +01:00
Tyler Renelle d24ece973b fix(food): popover-placement='top' in foodtray, fixes #4278 2014-11-25 15:26:42 -07:00
Alice Harris f0b3da295c re-enable +1 button, add spaces before delete button, add "quick reply" to Tavern/guilds/party chat 2014-11-25 14:50:01 +10:00
Tyler Renelle 36ffd8a8b2 fix(quick-reply): only show quick-reply in inbox (cc @crookedneighbor) 2014-11-24 18:14:17 -07:00
Tyler Renelle c309cb2342 Merge pull request #4267 from crookedneighbor/quick-reply 
Quick reply
 2014-11-24 18:11:43 -07:00
Blade Barringer bf586cbc17 Added env.t declarations for translations 2014-11-23 21:16:32 -06:00
Blade Barringer f16d9d609e Added quick reply button (doesn't load in the correct parameters for 
sending a msg)
 2014-11-23 20:29:27 -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