sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13599 commits 3 branches 0 tags 1.6 GiB
Commit graph

1295 commits

Author SHA1 Message Date
Matteo Pagliazzi
bb6809fd6b v3 client: do not show start quest button when quest is active 2016-05-17 17:06:28 +02:00
Matteo Pagliazzi
d2e9c45c0a v3: fix authenticating with apiUrl 2016-05-17 16:37:48 +02:00
Keith Holliday
bc44fa062e Api v3 challenge fixes (#7287) 
* Fixed join/leave button updates

* Queried only user groups to be available when creating challenges

* Fixed bulk add tasks to challenge

* Synced challenge tasks after leave and join.

* Fixed default selected group

* Fixed challenge member info. Fixed challenge winner selection

* Fixed deleting challenge tasks

* Fixed particiapting filter

* Fixed viewing user progress on challenge

* Updated tests

* Added delete for saved challenge task
 2016-05-16 21:49:22 +02:00
Blade Barringer
6bbfbbf613 fix: Fix quest progress button 2016-05-15 21:17:11 -05:00
Blade Barringer
21203c3f2e feat: Add modify inventory debug menu 2016-05-15 16:07:30 -05:00
Matteo Pagliazzi
3fbc156811 v3: misc fixes 2016-05-15 14:20:20 +02:00
Blade Barringer
2851af1a29 chore: Disable make admin debug route for v3 prod testing 2016-05-15 07:01:09 -05:00
Matteo Pagliazzi
23a9a3e0e4 v3 client: support unlinking not found challenges tasks 2016-05-15 13:00:42 +02:00
Matteo Pagliazzi
4c056426e8 v3: fix tasks chart 2016-05-15 12:00:50 +02:00
Blade Barringer
50d7345832 feat: Add make admin button to debug menu 2016-05-14 22:37:26 -05:00
Keith Holliday
72c1729d54 Loaded completed todos when done is clicked 2016-05-14 11:05:31 -05:00
Keith Holliday
0537ff3552 Fixed battle monsters with friends button 2016-05-14 11:05:31 -05:00
Keith Holliday
409dfbb2b0 Fixed adding and removing tags on tasks 2016-05-14 11:05:31 -05:00
Blade Barringer
25f0819f1e chore: Remove unusued variable 2016-05-14 06:59:11 -05:00
Keith Holliday
1fd7df7521 Api v3 fixes continued (#7205) 
* Added timzeone offset back

* Added APIToken back to settings page

* Fixed fetch recent messages for party

* Fixed returning group description

* Fixed check if user is member of challenge

* Fixed party members appearing in header

* Updated get myGroups param to include public groups. Fixed isMemberOf group

* Fixed hourglass purchase

* Fixed challenge addding tasks on first creating

* Updated tests to accomidate new changes
 2016-05-13 23:36:25 +02:00
Matteo Pagliazzi
cc20812674 [API v3] Fix calls to user.ops and deleting tags (#7204) 
* v3: fixes calls to user.ops from views and deleting tags

* v3: fix tests that use user._statsComputed
 2016-05-13 19:45:16 +02:00
Matteo Pagliazzi
199732539f chore(): rename website/src -> website/server and website/public -> website/client (#7199) 2016-05-13 15:35:12 +02:00
Matteo Pagliazzi
f1f18859de v3: fix todo scoring and try to fix production testing problem 2016-05-12 21:29:53 +02:00
Keith Holliday
781f0bf1ab Api v3 task fixes (#7193) 
* Update task view to use _id

* Added try catch to user service ops calls
 2016-05-12 18:07:17 +02:00
Matteo Pagliazzi
998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00
Matteo Pagliazzi
a947afa5c6 Merge branch 'develop' into api-v3 2016-05-11 14:36:58 +02:00
Sabe Jones
7f11e766c3 Sabrecat/glasses chairs (#7182) 
* feat(customization): new chairs, eyeglass sprites

* feat(avatar): finish glasses implementation

* fix(test): include glasses in base equipment
 2016-05-10 16:07:46 -05:00
Keith Holliday
632a1ebbf3 Fixed linting and some tests 2016-05-10 15:15:55 -05:00
Keith Holliday
a0939155c9 Updated login headers save. Added task service to user service. Sync user tasks 2016-05-10 15:15:55 -05:00
Keith Holliday
b037ddd14c Ported User Serivce to client side and to api v3 2016-05-10 15:15:55 -05:00
Keith Holliday
e747bba669 Updated add and remove tests for challenges (#7155) 2016-05-08 18:35:38 +02:00
Keith Holliday
4c37417bd4 Updated task service to use api v3 (#7136) 
* Updated task service to use api v3

* Add user.ops functions back

* Removed extra parameter
 2016-05-08 16:52:43 +02:00
Sabe Jones
d5b3bbfaad Sabrecat/armoire 201605 (#7142) 
* feat(content): May BGs and Armoire

* chore(news): Bailey 20160503
 2016-05-03 15:20:00 -05:00
Keith Holliday
78a8eea79a Updated quest service to use new api-v3 (#7126) 
* Updated quest service to use new api-v3

* Updated inviteToQuest function name. Used quest return rather than syncing party
 2016-05-03 17:16:30 +02:00
Sabe Jones
166a37d53f chore(event): end Spring Fling 2016 2016-05-02 01:36:03 +00:00
Matteo Pagliazzi
3437744f62 Merge branch 'api-v3' into api-v3-client 2016-04-30 16:51:15 +02:00
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Sabe Jones
1787342951 chore(news): Last Chance Bailey 201604 2016-04-29 22:16:36 +00:00
Blade Barringer
2aa3a3175f Merge branch 'develop' into kelsin-develop 2016-04-27 19:11:56 -05:00
Sabe Jones
bf7ce46ea4 chore(news): Be-Wilder conclusion 2016-04-27 04:16:35 +00:00
Sabe Jones
d96b13ed43 chore(news): Floral Potions Bailey 2016-04-25 21:20:21 +00:00
Keith Holliday
ea490c9a1f Ported groups service to user new api v3 and ported dependent controllers (#7108) 
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
 2016-04-25 23:11:23 +02:00
Sabe Jones
974896ce7b feat(events): April Mystery and Floral Potions (#7107) 
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
 2016-04-25 14:17:31 -05:00
Matteo Pagliazzi
f2d5c921ed Merge branch 'api-v3' into api-v3-client 2016-04-24 15:09:10 +02:00
Matteo Pagliazzi
6197fcea3b Merge branch 'develop' into api-v3 2016-04-24 15:08:13 +02:00
Sabe Jones
8355dbe63f chore(news): Bewildered Bailey 2016-04-23 04:00:30 +00:00
Matteo Pagliazzi
4cda56e3eb Merge branch 'api-v3' into api-v3-client 2016-04-23 03:08:37 +02:00
Matteo Pagliazzi
2d87cb0d87 Merge branch 'develop' into api-v3 2016-04-22 17:43:48 +02:00
Sabe Jones
867146dc19 fix(xss): Update site to use remarkable instead of marked 
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
 2016-04-21 13:23:53 -05:00
Matteo Pagliazzi
4138eab155 v3: undo changes to client that were necessary to test v2 2016-04-19 12:16:39 +02:00
Matteo Pagliazzi
f44dbbbd71 Merge branch 'develop' into api-v3 2016-04-19 12:16:22 +02:00
MathWhiz
ed49a377e1 add community guidelines info to profile editing (#7086) 
* add community guidelines info to profile editing

* Update profile.jade
 2016-04-19 10:15:21 +10:00
MathWhiz
f1788080da Add list of Featured third-party Apps (#7046) 
* add list of featured third-party apps

* Add comma

* add descriptions

* add description to other

* add table

* add description to other

Conflicts:
	common/locales/en/settings.json
	website/views/options/settings.jade

* Update settings.json

* Sort extensions by name
 2016-04-19 08:21:07 +10:00
Matteo Pagliazzi
c2b8cad886 v3: fix v3 proxied ops in v2, logout 2016-04-16 19:56:33 +02:00
Sabe Jones
881cf0292d chore(news): mobile and Beguilement Bailey 2016-04-15 18:46:02 +00:00