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
5582 commits 3 branches 0 tags 1.6 GiB
Commit graph

2257 commits

Author SHA1 Message Date
deilann
8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle
351e220b83 feat(mystery): 201409 2014-09-24 23:15:46 -06:00
Alice Harris
73f7f6605e remove track by to fix https://github.com/HabitRPG/habitrpg/issues/4060 2014-09-22 20:23:37 +10:00
Tyler Renelle
f38db7b964 feat(fall): bailey + free candy script 2014-09-20 14:13:07 -06:00
Negue
c501652194 - add popoverHtml to enable Markdown in Popovers 
- add markdown filter to get Task Notes as Markdown
 2014-09-20 12:13:36 +02: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
c32cd57c92 bailey: Rooster Pets, Party Sorting, And Back-To-School Challenge 2014-09-16 16:13:29 -06: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
Tyler Renelle
dc359e7f75 fix(pushTo): only pushToBottom on todos 2014-09-12 14:44:03 -06:00
Tyler Renelle
78624c0bc7 bailey: new official challenge, help menu, MD in checklists 2014-09-12 14:13:06 -06:00
Alice Harris
b5ee56b079 Merge pull request #4007 from Alys/pushToBottom-sortOrder-Sep03 
add support for pushTaskToBottom to help with To-Do sort order bug
 2014-09-12 14:05:52 +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
Tyler Renelle
29d1cf460c bailey() 2014-09-09 23:10:05 -06:00
Alice Harris
dc65bd7f45 comment out the button for allowing manual pushToBottom 2014-09-09 17:13:19 +10:00
Alice Harris
6cc1d1146e refactor User.user.ops.sortTask into $scope.pushTask 2014-09-09 17:04:13 +10:00
Alice Harris
52efad41a2 make pushTaskToBottom work, but it is messy 2014-09-09 16:20:02 +10:00
Alice Harris
e1d10a9af4 introduce some hideous temporary test code 2014-09-09 13:53:15 +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
f520b8ae66 add extra Debug tools useful for quests 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
Tyler Renelle
1dc141b1ec Merge pull request #3993 from negue/performance_trackBy 
ngRepeat with track by
 2014-09-05 16:04:14 -06:00
Negue
397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02:00
Alice Harris
b41ce1f6f3 add intro image and Bailey as a moderator to Community Guidelines 2014-09-05 21:20:42 +10:00
Alice Harris
ee0794343b add Intro image by Luciferian to Community Guidelines 2014-09-05 21:20:41 +10:00
Alice Harris
c0d0dcbcf6 move community-guidelines styles from static.style to community-guidelines.jade (new extraHead block in layout.jade); improve clearing of floats for pulled images 2014-09-05 21:20:41 +10:00
Alice Harris
82eb6bff3c adjust community guidelines modal for new static location and comment it out because not currently needed 2014-09-05 21:20:41 +10:00
Alice Harris
89fcd4e658 use localisation strings for Wiki Administrators Emeritus and month names 2014-09-05 21:20:41 +10: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
683f8e1233 adjust layout of images in Community Guidelines 
Alys TODO: replace paddedImage style and in-page clear:both style attributes  with styles that already exist elsewhere
 2014-09-05 21:20:40 +10:00
Alice Harris
fe785d0190 fix community guidelines title tag 2014-09-05 21:19:59 +10:00
Alice Harris
e86b1a27a4 complete the first draft of the Community Guidelines static page, with images renamed 2014-09-05 21:19:59 +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
Alice Harris
9cf76f0deb fix whitespace 2014-09-05 21:07:57 +10:00
Alice Harris
c731753e33 add Help menu 2014-09-05 20:57:44 +10:00
Negue
042dabcae9 Markdown for Checklist Items 2014-09-04 22:32:54 +02:00
Alice Harris
371bae31b1 Merge pull request #3952 from negue/tooltip_fix_part2 
2nd Try to fix Avatar tooltips
 2014-09-03 12:03: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
Tyler Renelle
772ea500a3 feat(auth): allow logging in with either username or email address 2014-09-02 12:23:29 -06:00
Tyler Renelle
2fc0f24c19 bailey(backgrounds): september 2014 backgrounds 2014-09-02 12:03:03 -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
72c6fd720a bailey(mystery): september mystery reminder 2014-09-01 12:25:01 -06:00
Tyler Renelle
ff0b8ad88b bailey(subscriptions): last day reminder @lemoness 2014-08-31 12:09:30 -06:00
Negue
f7d0c91471 fix tooltip .. again 2014-08-29 20:51:12 +02:00
Tyler Renelle
f981223153 fix(sortable): revert back to jqueryUI, fixes #3946 2014-08-28 16:32:05 -06:00
Nathaniel E Skiba
b9321807ca Completed tasks no longer display past dates in red 2014-08-28 11:21:58 -04:00
Tyler Renelle
76206e32d6 Merge pull request #3930 from ebiagogo/3477 
Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the n...
 2014-08-26 13:48:26 -06:00
Michael Looby
fd1cb82716 Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the new link and used the existing env.t('contactUs') string so all the translations are correct. Also added the link to layout.jade because that was stubbed out there in comments. Both links go to a new page with other links as described in the issue. 2014-08-26 14:59:54 -04:00
Alice Harris
581b921ae1 revert https://github.com/HabitRPG/habitrpg/pull/3920 because it causes level tooltip to hide Buffed and Rebirth tooltips 2014-08-26 15:49:59 +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
2cc251149c feat(mystery): august mystery 2014-08-25 17:16:41 -06:00
Tyler Renelle
13f6c5fddd Merge pull request #3913 from negue/pushToTopTooltip 
Tooltip: Push to top
 2014-08-25 12:22:52 -06:00
Negue
0ddcea95f1 fix level tooltip 2014-08-25 19:04:03 +02:00
Negue
c74f983c03 Tooltip: Push to top 2014-08-25 00:35:22 +02:00
Tyler Renelle
ef548ec9ed Merge pull request #3588 from negue/feat_pushToTop 
feat(todolist): Push To Top Button
 2014-08-23 17:05:32 -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
50a34eb6c7 fix(tags): fix sortable tags by separating edit & !edit into diff 
<ul>s (cc @Fandekasp)
 2014-08-19 15:21:39 -06:00
Tyler Renelle
88d27e2153 Merge branch 'Fandekasp-sortable_tags' into develop 
Conflicts:
	public/js/directives/directives.js
 2014-08-19 15:00:36 -06:00
Tyler Renelle
750135b673 feat(sortable): use angular-ui-sortable instead of jqueryui directly 2014-08-19 14:35:10 -06: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
faed77f186 bailey(mobile): 2014-08-18 19:58:47 -06:00
Tyler Renelle
ab9393b694 bailey(audio): add bailey for audio 2014-08-18 19:12:05 -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
Tyler Renelle
39911ef8e0 feat(audio): refactor user.preferences.{sound,soundTheme} into just 
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
 2014-08-15 18:13:59 -06:00
Tyler Renelle
06b6b4cde0 Merge pull request #3856 from Fandekasp/add_audio 
Add audio
 2014-08-15 17:30:12 -06:00
Tyler Renelle
fb16458efd bailey(quests): lvl 15 ATOM drop 2014-08-12 16:18:26 -07:00
Adrien Lemaire
e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09:00
Adrien Lemaire
d7aaec2262 fix bug switch audio wasn't working 2014-08-09 18:57:17 +09:00
Adrien Lemaire
a5f1e30880 fix bug music not playing if music menu not open + integrate daily/todo/reward sounds 2014-08-09 17:29:56 +09:00
Adrien Lemaire
dcbd460331 fix audio menu style 2014-08-09 16:58:49 +09:00
Adrien Lemaire
2cf8083693 improving music menu 2014-08-08 23:37:04 +09:00
Adrien Lemaire
3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Alice Harris
e500407466 change Request Feature link in footer, Tavern link box, CONTRIBUTING.md 2014-08-07 09:59:31 +10:00
Tyler Renelle
f3707dfe15 bailey(backgrounds): august backgrounds 2014-08-05 15:16:49 -06:00
deilann
0871dd074c Merge pull request #3837 from vIiRuS/patch-4 
display avatar with closed eyes when sleeping
 2014-08-04 16:41:25 -07: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
benmanley
a6d101202c fix(avatar.jade): change .notBackground to .noBackgroundImage 
avatar.jade was applying a class of .notBackground, but the css in
avatar.styl used .noBackgroundImage.

* Changed .notBackground to .noBackgroundImage in avatar.jade and
avatar.styl
* Consolidated css and added more comments
* Amended spacing as Stylus wasn’t compiling correctly
* Removed #profileStable and .pet css as couldn’t find reference to
them anywhere else.
* Commented out styles indicating who is party leader for now. Need a
solution that doesn’t involve background color.
 2014-08-04 22:45:10 +01:00
Tyler Renelle
b8b76d6ce9 fix(bailey): tweak 2014-08-04 13:46:25 -06:00
Tyler Renelle
2b2dd97f80 bailey(mobile): update on mobile fix 2014-08-04 13:43:41 -06:00
Matteo Pagliazzi
50d888e7f8 feat(backgrounds): move backgrounds to mixin 2014-08-04 14:41:59 +02:00
Phillip Thelen
49d056fe14 display avatar with closed eyes when sleeping 
Display the sleeping version, when users are in the inn.

CAUTION: For this to work, this pull request will have to be merged first: https://github.com/HabitRPG/habitrpg-shared/pull/269
Otherwise the _sleep images are missing. ;)
 2014-08-03 20:39:09 +02:00
Matteo Pagliazzi
1d92ddd645 feat(i18n): add change language button on front page, fix #3530 2014-08-03 18:23:13 +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
Alice Harris
46dbb0b78a Merge pull request #3799 from Alys/avatarNameContribColour 
apply contributor tier color to avatar name - fixes https://github.com/HabitRPG/habitrpg/issues/3735
 2014-08-02 13:08:20 +10:00
Alice Harris
2c70c25028 Merge pull request #3792 from Alys/showMoreBackground 
show more avatar background (remove Lvl, hide avatar name)
 2014-08-02 13:06:07 +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
Tyler Renelle
04f1459cca bailey(dilatory): forgot announcement on drag'on defeat 2014-08-01 13:44:43 -06:00
Tyler Renelle
38f64c71c2 bailey(august): 2014-07-31 17:37:18 -06:00
Tyler Renelle
072881f986 Merge pull request #3793 from Alys/backgroundOrder 
display backgrounds in reverse chronological order (most recent at top)
 2014-07-30 23:08:12 -06:00
Tyler Renelle
9efda1d955 fix(bailey): small tweaks to 7/31 (spacing, remove project files) 2014-07-30 17:17:51 -06:00
Lemoness
983aaf9682 7/31 Bailey Announcement 2014-07-30 16:08:55 -07:00
Lemoness
4f5b450b38 Bailey reminder - 7/31 2014-07-30 15:55:17 -07:00
Alice Harris
a87b651caf apply contributor tier color to avatar name 2014-07-29 08:53:23 +10:00
Blade Barringer
d7351932aa Merge branch 'develop' of git://github.com/HabitRPG/habitrpg into develop 2014-07-27 19:56:09 -05:00
Alice Harris
a7502e10ea display backgrounds in reverse chronological order (most recent at top) 2014-07-27 14:54:17 +10:00
Alice Harris
1e797a0b05 show more avatar background (remove Lvl, hide avatar name) 2014-07-27 08:41:33 +10:00
Tyler Renelle
a4ae9332bb feat(block-user): show "blocked" status in an alert, log the user out 2014-07-25 12:14:48 -06: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
1808dea9ec bailey(mystery): july mystery item 2014-07-24 19:33:11 -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
Phillip Thelen
a4b4063b8d remove beta from api call examples 
The API documentation examples used beta.habitrpg.com as url. Additionally, the base URL was specified including "/user/". removed both to avoid confusion and make copy-paste easier
 2014-07-18 11:58:25 +02:00
Tyler Renelle
b946338184 feat(dilatory): add dilatory achievement 2014-07-17 18:37:09 -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
Blade Barringer
7c51910835 Fixed over width issue caused by the filters div 2014-07-16 19:54:01 -05:00
Tyler Renelle
17c6df4f6a fix(bailey): add links to recent update 2014-07-16 13:56:26 -06:00
Tyler Renelle
0e3e199acf bailey(dilatory): mobile update, dilatory changes 2014-07-16 13:25:00 -06:00
benmanley
4cf1030c85 refactor(game-pane.styl): tweak layout and colors 
– Improve positioning and size of chat-box buttons
– Replace some px values with ems
– Replace contributor colors with variables (set in global-colors.styl)
 2014-07-14 21:52:56 +01:00
Tyler Renelle
f83f2acc1b Merge pull request #3724 from Alys/optOut 
make it clearer that you can choose a class later
 2014-07-13 11:45:06 -06:00
Matteo Pagliazzi
f2a10f8fc1 feat(i18n): add notices 2014-07-13 18:00:35 +02:00
Alice Harris
8cfcf8db10 make it really obvious that you can choose a class later 2014-07-13 16:09:43 +10:00
Tyler Renelle
bc8aed5897 bailey(dilatory): update on dilatory bug #3712 2014-07-12 16:18:31 -06:00
Tyler Renelle
d848faee8e fix(quests): show completion dialog 2014-07-12 14:32:13 -06:00
Matteo Pagliazzi
45ab28269a feat(jade): split file to be used on mobile 2014-07-12 15:50:15 +02:00
Tyler Renelle
95193f550d fix(bailey): updated wording to save vicky 2014-07-11 10:29:25 -06:00
Tyler Renelle
acf6d30b1f chore(bailey): gaymerx meetup 2014-07-10 13:08:06 -06:00
Tyler Renelle
c66c5ec83b feat(quests): seahorse quest 2014-07-07 15:02:19 -06:00
Matteo Pagliazzi
e8779f2121 fix(jade): fix jade warning about "missing space before text for line..." 2014-07-04 12:09:18 +02:00
James Hsiao
ce4271f738 Updated Tavern Boss -> World Boss nomenclature 
As discussed in the petting zoo.
 2014-07-03 12:48:13 -04:00
benmanley
967c46be87 refactor(boss): restyle boss stats meters 
Update to reflect redesigned stats meters
 2014-07-03 17:14:25 +01:00
benmanley
190ef0402c refactor(avatar): restyle level label 2014-07-03 16:22:51 +01:00
benmanley
15a63d6e66 refactor(.hero-stats): re-restyle status meters 
Improved status meter design based on user feedback
 2014-07-03 16:10:18 +01:00