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
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
998c679e96
Merge branch 'api-v3' into api-v3-client
2016-05-11 16:01:54 +02:00
a947afa5c6
Merge branch 'develop' into api-v3
2016-05-11 14:36:58 +02:00
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
b037ddd14c
Ported User Serivce to client side and to api v3
2016-05-10 15:15:55 -05:00
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
166a37d53f
chore(event): end Spring Fling 2016
2016-05-02 01:36:03 +00:00
3437744f62
Merge branch 'api-v3' into api-v3-client
2016-04-30 16:51:15 +02:00
f69a566178
Merge branch 'develop' into api-v3
2016-04-30 16:49:44 +02:00
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
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
f44dbbbd71
Merge branch 'develop' into api-v3
2016-04-19 12:16:22 +02:00
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
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
8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
1f6eef0082
Sabrecat/armoire 201604
...
* WIP(content): add sprites
* feat(content): Armoire and Backgrounds 2016-04
2016-04-05 15:30:01 -05:00
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
d89d1e50dd
Merge branch 'develop' into api-v3
2016-03-25 15:58:04 +01:00
cd6adf2421
fix: correct wheelchair spelling
2016-03-24 21:31:20 -05:00
c88f2ce580
refactor: Use resized version of wheelchair for selection
2016-03-24 07:57:57 -05:00
0f9cf57613
feat: Add wheelchair to avatar customization
2016-03-24 07:57:13 -05:00
f7027b5cf3
feat(event): subscriber items 2016-03
2016-03-23 15:36:24 -04:00
0bde9e2df2
Merge branch 'develop' into api-v3
2016-03-21 23:03:28 +01:00
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
b5f91a657f
feat(event): Spring Fling complete
2016-03-18 16:56:16 -04:00
10a8476aaf
WIP(event): Spring Fling cont'd
2016-03-17 13:10:05 -04:00
4effa79e17
WIP(event): Spring Fling partial
2016-03-17 13:04:12 -04:00
ced0b44b2f
fix: Remove name from sortable inventory
2016-03-17 08:47:56 -05:00
d4d668a7aa
fix: Correct typo in equipment click
2016-03-17 08:09:37 -05:00
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
9d50201180
Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues.
...
This reverts commits 1c811dbc82146810a3e99508ed45dfa6fb945120
2016-03-17 21:47:29 +10:00
a639038a41
Move stat allocation to a mixin to avoid code duplication
2016-03-16 22:07:00 -05:00
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -05:00
9508ed45df
refactor: Move order by equipmentment button to top of view
2016-03-15 19:41:11 -05:00
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
3fa9d17ad4
Merge branch 'develop' into api-v3
2016-03-08 19:25:50 -06:00
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
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
9114d74357
Merge branch 'develop' into api-v3
2016-03-01 09:44:57 +01:00
251dd3cb8e
Changed submenu from Hall of Heroes to Hall of Contributors
2016-02-29 20:23:05 -06:00
0c700cc36d
Merge branch 'develop' into api-v3
2016-02-29 16:39:31 +01:00
6cd861dcdc
Merge pull request #6742 from murraybd/develop
...
Display attribute info in Character Build
2016-02-28 19:39:20 +10:00
9ef4b6409e
Merge branch 'develop' into api-v3 and move new relic to new location
2016-02-22 11:43:35 +01:00
45a938c12d
put the atrribute allocation td building in a loop to clean up the code per Alys
2016-02-19 21:46:23 -08:00
04d0bcadb7
in profile.jade in the character build section display detailed info about the attribute
2016-02-19 19:22:05 -08:00
00473dded7
fixed partially hidden button
...
added clearfix class to prevent floating for the next elements.
2016-02-19 22:17:39 +01:00
cc31d266e4
port locals middleware, add some tests and a lot of fixes
2016-02-19 18:42:03 +01:00
f7c9769aab
chore(event): revert Valentine's
2016-02-15 14:48:39 -05:00
Keith Holliday