krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,937 Commits 63 Branches 1,225 Tags
27b7173f6cf1cbedfe9a02e33bffc7cf68001750
Commit Graph

3063 Commits

Author SHA1 Message Date
Travis
1de2c839c8 Adding ticks back into gifted gems receive message #7540 (#7671) 
* Adding ticks back into gifted gems receive message #7540

* Removing raw string concatenation and fixing tests
 2016-06-15 22:29:04 -05:00
Alys
a03b1fc6cb prevents damage to quest participants with false or null values - partial fix for #7653 (#7665) 2016-06-16 09:36:58 +10:00
Sabe Jones
28e45aea4d June Pet: Axolotl (#7663) 
* feat(quests): Axolotl pet

* feat(pets): finish axolotl build
 2016-06-15 12:14:25 -05:00
Husman
9b12d46741 feat: Add group by button to equipment page 
Closes #7636
Closes #7651

This commit creates a new button on the equipment page that allows the user to group their equipment type (body location) instead of simply by class.
 2016-06-12 09:40:25 -05:00
Shervin Sarain
539547b39e prevent sync from clearing selected tags (#7631) 
* prevent sync from clearing selected tags

* improved tag selection bugfix
 2016-06-11 19:57:20 +02:00
Alys
0bf7858d53 Fix apidocs error for /api/v3/challenges/group/:groupId. Change various descriptions to imperative mood 
e.g., change "Sets lastCron" to "Set lastCron"
 2016-06-11 08:15:07 +10:00
Blade Barringer
441fba2ad0 Merge pull request #7639 from eshapard/patch-1 
Closes #7637
 2016-06-10 07:51:46 -05:00
MathWhiz
57bb4d8c10 Fix webhooks (#7622) 
* fix userServices.js

* comply with eslint

* Remove conversion to string
 2016-06-10 12:42:48 +02:00
Matteo Pagliazzi
efeb2c1c8e implement tips for loading screen (#7632) 
* implement tips for loading screen

* fix typo in tip 22
 2016-06-10 12:25:09 +02:00
eshapard
ee581a1ab2 Update tasks.js 
Typo in code: url for getting a single task is  * @api {get} /api/v3/tasks/:taskId Get a task; not /api/v3/task/:taskId
 2016-06-09 21:16:05 -07:00
Sabe Jones
e3c0d7d214 chore(news): blog announcements 2016-06-10 00:59:50 +00:00
Blade Barringer
b97d7cc9f9 feat: Disable spells on client when they cannot be cast 
Closes #7110
Closes #6867
 2016-06-09 08:58:57 -05:00
Alys
a941ee8b84 allow "Your password" to be translated in account deletion confirmation (#7624) 
* allow "Your password" to be translated in account deletion confirmation

* rename string for deleting local account confirmation step
 2016-06-09 07:28:41 -05:00
Shervin Sarain
8490b481f6 send email when admin unflags post (#7580) 
* send email when admin unflags post

* Improved email acquisition code, minor changes to sent email

* Refactor getGoupUrl into its own method

* added unit test for getGroupUrl

* improved test and getGroupUrl
 2016-06-07 22:22:33 -05:00
Blade Barringer
17b6999c81 Merge pull request #7621 from crookedneighbor/party_page 
Fetch Party when going to party page
 2016-06-07 21:43:38 -05:00
Sabe Jones
9df3e88842 fix(coupons): POST apply, not GET 2016-06-08 01:52:21 +00:00
Matteo Pagliazzi
5e01b3d129 fix sticky header not working 2016-06-07 21:12:31 +02:00
Blade Barringer
5beb6106c9 fix: Go to loaded party page when inviting friends to party 2016-06-07 12:36:07 -05:00
Matteo Pagliazzi
f7be7205e7 Remove localstorage and add notifications (#7588) 
* move remaining files frm /common/script/public to website/public

* remove localstorage

* add back noscript template and put all javascript in the footer

* fixes client side tests

* remove double quotes where possible

* simplify jade code and add tests for buildManifest

* loading page with logo and spinner

* better loading screen in landscape mode

* icon on top of text logo

* wip: user.notifications

* notifications: simpler and working code

* finish implementing notifications

* correct loading screen css and re-inline images

* add tests for user notifications

* split User model in multiple files

* remove old comment about missing .catch()

* correctly setup hooks and methods for User model. Cleanup localstorage

* include UserNotificationsService in static page js and split loading-screen css in its own file

* add cron notification and misc fixes

* remove console.log

* fix tests

* fix multiple notifications
 2016-06-07 16:14:19 +02:00
Blade Barringer
48957369f3 fix: Prevent group not found message when reloading party page 2016-06-07 08:52:28 -05:00
Blade Barringer
3f8ab017ce fix: Prevent tavern from syncing every time a user goes to the tavern page 2016-06-07 08:52:01 -05:00
Blade Barringer
006b074ac2 Merge branch 'develop' into party_page 2016-06-07 07:59:59 -05:00
Blade Barringer
453540e85d fix: Display flower when not buffed 
closes #7613
 2016-06-05 22:06:09 -05:00
Alys
0a10b2bd28 change user quest.progress.collect to quest.progress.collectedItems (#7612) 2016-06-05 20:47:45 -05:00
Blade Barringer
ac24fb31fb chore: Remove temporary code 2016-06-05 08:56:57 -05:00
Blade Barringer
39aa0b489f refactor: Reduce duplication of stat setting 2016-06-05 07:23:54 -05:00
MathWhiz
0e5f748c9a Change attribute names and popups 
Closes #2044
Closes #7606
 2016-06-05 07:23:26 -05:00
Blade Barringer
1915f8665c Merge pull request #7570 from crookedneighbor/WIP_7567_dont_rely_on_quest_key_on_user 
Use party's quest key in cron
 2016-06-05 06:18:08 -05:00
MathWhiz
a973db29f4 Show flower when using visual buffs 
Fixes #7133
Closes #7604
 2016-06-05 06:10:59 -05:00
Alys
5ee28eabb5 fix user.party.quest.progress.up mistakes in skills/spells; make an unrelated typo in apidoc comment 2016-06-05 20:03:14 +10:00
Blade Barringer
840a90bbdf refactor: Make quest methods private instance methods 2016-06-04 22:11:54 -05:00
Blade Barringer
25cc01e7cd fix: Supply random value as seed so quest collection is random 2016-06-04 22:11:52 -05:00
Blade Barringer
b3b437e593 chore: Add quest collection migration and temporary code to catch data inconsistencies 2016-06-04 22:11:52 -05:00
Blade Barringer
58cd634255 fix: Change quest collection to calculate items on the server only 2016-06-04 22:11:51 -05:00
Blade Barringer
c04bac44e7 feat: Use party's quest key in cron 2016-06-04 22:11:50 -05:00
Blade Barringer
3113e1a1e8 fix: Correct text color in not due tasks 
Closes #7605
 2016-06-04 17:59:57 -05:00
Blade Barringer
f53c2706d1 Merge branch 'Hus274-develop7019' into develop 2016-06-04 07:54:59 -05:00
Blade Barringer
95340da5e2 fix(css): Correct css where due tasks could not be editted 2016-06-04 07:52:35 -05:00
Sabe Jones
7f722269bd fix(subscription): correctly award 3mo bennies (#7596) 2016-06-03 22:40:04 -05:00
Blade Barringer
96e9b83ca3 Merge pull request #7583 from crookedneighbor/fix_quest_modal_not_being_cleaned_up 
fix: Cleanup quest progress for non-members when quest starts
 2016-06-03 21:52:14 -05:00
Blade Barringer
434cac944c fix: Cleanup quest progress for non-members when quest starts 2016-06-03 21:51:18 -05:00
Blade Barringer
8c81e02a87 refactor: Use stateChange hook for releasing keybinding 2016-06-03 21:33:15 -05:00
Blade Barringer
7536ba7aa2 Merge branch 'develop' into Sinble-bug/slow_chat 2016-06-03 17:24:52 -05:00
MathWhiz
3589757763 fix: formatting issues in death modal 
Closes #7156
 2016-06-03 12:47:11 -05:00
MathWhiz
1fbd864a7f feat: Style fix character values modal for mobile 
Closes #7157
 2016-06-03 12:43:42 -05:00
MathWhiz
d072da3345 feat: change opacity of emoji in completed tasks 
Closes #7184
 2016-06-03 12:39:12 -05:00
Shervin Sarain
8c92ee6876 fix: correct param in tag sorting 
Fixes #7593
 2016-06-03 12:29:44 -05:00
Sabe Jones
7108b02f4d fix(profiles): public chairs 
(cherry picked from commit 83366fa3a6)
 2016-06-03 08:18:12 -05:00
Sabe Jones
21f3814368 feat(content): June Armoire and BGs (#7592) 2016-06-02 16:51:05 -05:00
Sabe Jones
4ea52728ee fix(links): Report a Bug Guild 2016-06-01 22:12:02 +00:00