Commit Graph

519 Commits

Author SHA1 Message Date
Keith Holliday 425172daae Removed v2 calls from views (#7351) 2016-05-18 17:48:32 +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
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
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
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 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 b037ddd14c Ported User Serivce to client side and to api v3 2016-05-10 15:15:55 -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
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 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
Blade Barringer 8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -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 3089658cc7 Merge branch 'develop' into api-v3 2016-03-30 23:40:00 +02: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 f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Matteo Pagliazzi 0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Sabe Jones 8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
Spring Fling 2016
2016-03-18 16:08:46 -05:00
Sabe Jones b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Sabe Jones 10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones 4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer ced0b44b2f fix: Remove name from sortable inventory 2016-03-17 08:47:56 -05:00
Blade Barringer d4d668a7aa fix: Correct typo in equipment click 2016-03-17 08:09:37 -05:00
Blade Barringer c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."
This reverts commit 9d50201180.
2016-03-17 08:09:18 -05:00
Alys 9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues.
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
2016-03-17 21:47:29 +10:00
Josh Holland a639038a41 Move stat allocation to a mixin to avoid code duplication 2016-03-16 22:07:00 -05:00
Blade Barringer 1c811dbc82 refactor: Extract orderBy equipment button into mixin 2016-03-15 19:41:24 -05:00
Blade Barringer 9508ed45df refactor: Move order by equipmentment button to top of view 2016-03-15 19:41:11 -05:00
Matt Harrington a6fb945120 inventory sorting
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
2016-03-15 19:41:11 -05:00
Blade Barringer 3fa9d17ad4 Merge branch 'develop' into api-v3 2016-03-08 19:25:50 -06:00
Lucas Torroba d502db71e5 Changed tavern tier 1 text icon
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
2016-03-08 03:05:46 -03:00
Alys 9cac8dd95e Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740
Fixed partially hidden button in chat box
2016-03-06 18:18:02 +10:00
Matteo Pagliazzi 9114d74357 Merge branch 'develop' into api-v3 2016-03-01 09:44:57 +01:00
Nick Bunn 251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06:00
Matteo Pagliazzi 0c700cc36d Merge branch 'develop' into api-v3 2016-02-29 16:39:31 +01:00
Alys 6cd861dcdc Merge pull request #6742 from murraybd/develop
Display attribute info in Character Build
2016-02-28 19:39:20 +10:00