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

785 commits

Author SHA1 Message Date
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
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
Alice Harris
d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +10:00
Alice Harris
367ce13ce3 improve formatting and text in chat area before use has agreed to accept guidelines 2014-09-11 17:28:54 +10:00
Alice Harris
9dcc2576c3 remove dev comment 2014-09-09 06:00:23 +10:00
Alice Harris
b5ac0c635a improve new code for cancelling quests in invitation stage and for handling the cases where the quest owner is no longer in the quest or in the party 2014-09-09 06:00:23 +10:00
Alice Harris
0e163034cf semi-random tentative crappy code for improving quest aborting, especially when the quest owner has left the party 2014-09-09 06:00:23 +10:00
Matteo Pagliazzi
c90c8f9a5f Revert "ngRepeat with track by" 
This reverts commit 397ef5e72c.
 2014-09-08 12:30:30 +02:00
Alice Harris
c68a061c0d experimental changes for indicating acceptance of guidelines 2014-09-07 15:14:58 +10:00
Negue
397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02:00
Alice Harris
f7ed881002 add comment to explain the invisible username label (it confused the heck out of me until I realised) 2014-09-05 21:20:40 +10:00
Alice Harris
0f0eb055fb do proper fix for problem in chat of usernames hiding first part of message 2014-09-05 21:20:40 +10:00
Alice Harris
3ac9c4f13b Revert "fix problem in chat of usernames hiding first part of message" 
This reverts commit 910e4ac0f9e9886a8d3439e197eae3b5c30848ad.
 2014-09-05 21:20:40 +10:00
Alice Harris
9457c844cc move Community Guidelines from an included html page in a modal to a static page with no modal 2014-09-05 21:17:57 +10:00
Alice Harris
08c37a07a9 fix problem in chat of usernames hiding first part of message 2014-09-05 21:17:57 +10:00
Alice Harris
38ea43b7f1 remove admin checkbox from Hall - not needed now that level/tier 8 and 9 automatically turn on hero.contributor.admin 2014-09-05 21:17:57 +10:00
Alice Harris
d6ce6f8986 remove unnecessary style; fix spacing in tavern message 2014-09-05 21:17:56 +10:00
Alice Harris
8343a728c0 delete unnecessary views/static/community-guidelines.jade 2014-09-05 21:17:56 +10:00
Alice Harris
3b9b6b78bc add Community Guidelines document and its images; add jade modal for displaying it 2014-09-05 21:17:56 +10:00
Alice Harris
cd7f87bbfe add glyphicons to admin names, refactor code to reduce duplication of contrib.level style assignments, sort moderator name list sensibly 2014-09-05 21:17:56 +10:00
Alice Harris
73cd71d74b add star/tower glyphicons for mods/staff in Hall; in Hall, change admin's description of levels; create migration script for increasing admin tiers 2014-09-05 21:17:55 +10:00
Alice Harris
0f5ef3a1ea finish applying new colours for tier 9 (staff) and tier 8 (mods) 2014-09-05 21:17:55 +10:00
Tyler Renelle
5cc4bf8aca Merge pull request #3966 from Alys/questLeaderAndNotifications 
mark Quest Owner in quest participants box on party page
 2014-09-02 15:50:58 -06:00
Alice Harris
fa96717175 mark quest owner in quest participants box on party page (in invitation stage and after quest started) 2014-09-02 17:33:26 +10:00
Alice Harris
679a120053 add Enable Class System button to User -> Stats ("Stats and Achievements") page when user has opted out 2014-09-02 14:56:14 +10:00
Tyler Renelle
592ffd9818 feat(registration): show some basic registration information on Settings 
> Site (if facebook, then "Registered with Facebook". If local, then
username & email)
 2014-08-25 18:01:57 -06:00
Tyler Renelle
184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop 
Conflicts:
	views/options/settings.jade
 2014-08-23 16:05:17 -06:00
lynnyliz
9886d2c177 added paw prints under Rare Pets (currently there are none on the site) 2014-08-22 21:31:53 -04:00
lynnyliz
a351745a86 added mounts page organization to reflect pets page organization 2014-08-22 21:26:05 -04:00
Alice Harris
fdf8aa696e add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892 2014-08-21 06:27:01 +10:00
Tyler Renelle
3ca84d8ef1 Merge pull request #3139 from mapleoin/partygems 
fix Guild Gems strings on the party tab
 2014-08-19 12:55:11 -06:00
Tyler Renelle
a88fde9862 feat(quests): parrot quest 2014-08-18 19:04:31 -06:00
Matteo Pagliazzi
6d251aeb91 feat(mobile): adapt boss box to mobile 2014-08-17 15:39:12 +02:00
Matteo Pagliazzi
4c8309c8cc fix(jade): fix warings 2014-08-17 13:32:09 +02:00
Matteo Pagliazzi
0837f2c39b fix(mobile): start adapting boss to mobile 2014-08-17 13:29:40 +02:00
Alice Harris
e500407466 change Request Feature link in footer, Tavern link box, CONTRIBUTING.md 2014-08-07 09:59:31 +10:00
Alice Harris
34a2e4c07a Merge pull request #3841 from Alys/defaultAvatar 
split hairstyles into Base (free) and Set 1 (gems) fixes https://github.com/HabitRPG/habitrpg/issues/1529
 2014-08-05 08:14:09 +10:00
Matteo Pagliazzi
50d888e7f8 feat(backgrounds): move backgrounds to mixin 2014-08-04 14:41:59 +02:00
Alice Harris
e340d584cd split hairstyles into Base (free) and Set 1 (gems) https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 15:56:44 +10:00
Jeremy Lee
26741773c9 split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users) 2014-08-02 10:46:16 +10:00
Alice Harris
a7502e10ea display backgrounds in reverse chronological order (most recent at top) 2014-07-27 14:54:17 +10:00
Tyler Renelle
6e29facb98 feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness 2014-07-25 12:14:48 -06:00
Tyler Renelle
a1f2375b9d feat(subscription): disable "update card" for paypal subscribers 2014-07-21 14:55:36 -06:00
Tyler Renelle
dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop 2014-07-21 14:48:17 -06:00
David Marshall
5cc4c60329 Edit stripe cc subscriptions 2014-07-21 01:08:56 -07:00
Skyrunner
3ed977dad6 Fixed #3756? 
It seems to be fixed, but I don't know the good development habits for
jade/whatever technology it is. Please comment & close if the fix is not
acceptable.
 2014-07-20 16:54:18 +09:00
Tyler Renelle
acc874c60d Merge pull request #3597 from 3onyc/feature/username-change 
Implement "Change username" feature
 2014-07-19 16:48:20 -06:00
Tyler Renelle
34236536df feat(admin): allow admins to update user's items (restoring lost items, 
granting quest scrolls, etc). @deilann :)
 2014-07-17 14:09:39 -06:00