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

1369 commits

Author SHA1 Message Date
Sabe Jones
237bc062ea [API v3] Maintenance Mode (#7367) 
* WIP(maintenance): maintenance

* WIP(maintenance): working locale features

* fix(maintenance): don't translate info page target

* WIP(maintenance): start adding info page

* fix(maintenance): linting

* feat: Add container to maintenance info page

* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages

* fix(maintenance): linting

* refactor(maintenance): further slim down variables

* refactor: Remove unnecessary variables

* fix: Correct string interpolation in maintenace view

* feat: Dynamically add time to maintenance pages

* maintenance mode: do not connect to mongodb

* fix(maintenance): clean up timezones etc.

* fix(maintenance): remove unneeded sprite
 2016-05-21 12:24:13 +02:00
Keith Holliday
f4ca97ffc3 Fixed quest drop modal (#7377) 
* Fixed quest drop modal

* Fixed broken party test
 2016-05-21 12:21:39 +02:00
Alys
d36c514c06 add plumilla to artists for Tangle Tree in Bailey message 2016-05-20 22:07:03 -04:00
Alys
bce5b44cb6 add plumilla to artists for the Tangle Tree quest - fixes https://github.com/HabitRPG/habitrpg/issues/7385 2016-05-21 06:52:23 +10:00
Sabe Jones
18822854f7 fix(static-page): remove timezone handling 2016-05-20 16:53:40 +00:00
Blade Barringer
5bd436f3c8 fix: Change all instances of spookDust -> spookySparkles 2016-05-20 09:17:44 -05:00
Alys
207ed39f36 fix for maintenance window dates properly 2016-05-20 03:42:51 -04:00
Alys
6b31f2845f replace time code with fixed time text 2016-05-20 17:33:21 +10:00
Sabe Jones
d221bcc84c Maintenance announcement (#7372) 
* chore(news): announce downtime

* fix(news): tweaks and corrections

* fix: Update maintenance page to use dynamic date
 2016-05-19 22:28:13 -05:00
Keith Holliday
425172daae Removed v2 calls from views (#7351) 2016-05-18 17:48:32 +02:00
Matteo Pagliazzi
d1f9e9e7ca v3: update footer with links to developer resources 2016-05-18 16:06:05 +02:00
Matteo Pagliazzi
4b81c97bfc v3: info about API v3 2016-05-18 15:49:58 +02:00
Matteo Pagliazzi
210ac57165 v3: misc fixes 2016-05-18 12:16:31 +02:00
Keith Holliday
1a87619bac Api v3 party quest fixes (#7341) 
* Fix display of add challenge message when group challenges are empty

* Fixed forced quest start to update quest without reload

* Fixed needing to reload when accepting party invite

* Fix group leave and join reload

* Fixed leave current party and join another

* Updated party tests
 2016-05-18 11:22:32 +02:00
Blade Barringer
7ac67315e6 Merge branch 'develop' into api-v3 2016-05-17 15:50:31 -05:00
Blade Barringer
485c4599cd Merge pull request #7316 from Alys/v3-debug-menu 
[API v3] Debug menu jade file only - small adjustments
 2016-05-17 15:20:41 -05:00
Sabe Jones
0d69a504d2 chore(news): Challenge Spotlight 2016-05-17 18:53:58 +00:00
Matteo Pagliazzi
30c9458493 v3 client: fix misc challenge issues 2016-05-17 18:19:45 +02:00
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
Alys
daf899374d adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons 2016-05-16 23:01:23 -04:00
Sabe Jones
beb4a0d8bb feat(content): May 2016 pet quest (#7310) 2016-05-16 15:18:51 -05: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
Sabe Jones
6ceea9346f chore(news): misc announcements 2016-05-14 20:56:22 +00: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
Sabe Jones
0eb7bc537d fix(contact): add clear subscription trouble email 2016-05-11 18:43:59 +00: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
Sabe Jones
c608ac9ecc fix(news): Erratum 2016-04-15 11:53:58 -05:00
Blade Barringer
1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Sabe Jones
ffb3ed0aa4 chore(news): annouce Android update 2016-04-14 23:48:45 +00:00
Ubuntu
13edca4588 chore(news): add skill icon announcement 2016-04-13 21:25:31 +00:00
Matteo Pagliazzi
925881b2a0 misc fixes and enable dev endpoints for easier live testing 2016-04-13 22:55:39 +02:00
Sabe Jones
7bb6f968b4 feat(content): Pet Quest 2016-04 (#7071) 
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
 2016-04-13 12:15:38 -05:00
Nick Bunn
55f0398928 moved broadcast to task page. changed up key press binding 2016-04-13 01:16:50 -05:00
Husman
11de1015ea Fixes: cursor as pointer on hero-box class in level up dialog that is not clickable by the user. 
Updates the style of the herobox to use the default cursor on this page instead of the pointer cursor that is defaulted by the hero-box class.
This is in relation to: https://github.com/HabitRPG/habitrpg/issues/7066
 2016-04-12 16:41:00 -07:00
Matteo Pagliazzi
a29dd1a1c7 fix(build) temporarily use habitrpg-shared from habitica.com in v3 client 2016-04-12 09:46:01 +02:00
Blade Barringer
ecb9e09ad8 fix: Add missing sprite class for skills icon in rewards column 
closes #4276
closes #6950
 2016-04-11 08:00:42 -05:00
Blade Barringer
b4eb386047 chore: Change spells file name to skills 2016-04-11 08:00:10 -05:00
Blade Barringer
8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -05:00
Sabe Jones
b7d801a603 fix(news): typo 2016-04-08 16:17:51 -05:00
Ubuntu
7118e68cf0 chore(news): Beguilement Strike Bailey 2016-04-08 19:06:09 +00:00
Blade Barringer
74dace9b5a chore: Re-enable New Relic 
closes #7011
 2016-04-05 20:08:31 -05:00
Sabe Jones
1f6eef0082 Sabrecat/armoire 201604 
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
 2016-04-05 15:30:01 -05:00
Matteo Pagliazzi
c5f17b4011 Merge branch 'develop' into api-v3 2016-04-01 11:50:41 +02:00
Sabe Jones
3281894d83 chore(news): World Boss Bailey 2016-03-31 19:54:13 -04:00
Sabe Jones
a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones
f51653b7a5 WIP(world-boss): partial build 2016-03-31 17:29:21 -04:00
Matteo Pagliazzi
3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02:00
Sabe Jones
4fa8c6dfbd chore(news): Bailey 2016-03-30 2016-03-30 15:39:12 -04:00
Blade Barringer
a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Matteo Pagliazzi
d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Blade Barringer
cd6adf2421 fix: correct wheelchair spelling 2016-03-24 21:31:20 -05:00
Blade Barringer
c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -05:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Sabe Jones
17b02f2867 fix(news): missing promo 2016-03-23 15:47:22 -04:00