SabreCat
365daba6fc
4.7.1
2017-10-31 00:49:58 +00:00
SabreCat
70692752c7
fix(sprites): bad shirt centering
2017-10-31 00:48:37 +00:00
Sabe Jones
061457b268
4.7.0
2017-10-30 20:50:11 +00:00
Sabe Jones
e7ec9a6d65
chore(i18n): update locales
2017-10-30 20:49:09 +00:00
SabreCat
d1396e7bc6
chore(sprites): compile
2017-10-30 20:41:32 +00:00
SabreCat
d5cedaa925
feat(event): Habitoween
2017-10-30 20:40:29 +00:00
Sabe Jones
b31268fbc2
4.6.3
2017-10-26 22:46:51 +00:00
thehollidayinn
35727228f0
Removed autorefresh
2017-10-26 17:20:52 -05:00
SabreCat
f4422b8d6c
4.6.2
2017-10-26 21:14:13 +00:00
SabreCat
2d4dc9e23c
chore(news): blog Bailey
2017-10-26 21:13:04 +00:00
Keith Holliday
c39505d41c
Hotfix/add autoreload ( #9269 )
...
* Added auto refresh on server update back
* Fixed lint
* Updated copy
2017-10-25 15:22:26 -05:00
Sabe Jones
c24545cae5
4.6.1
2017-10-24 22:41:58 +00:00
Keith Holliday
6bc70ca471
Hotfix/oct 24 fixes ( #9261 )
...
* Removed max height from text section
* Added items to mystery sets
* Group manager fixes
* Fixed promo code apply
2017-10-24 17:41:36 -05:00
Sabe Jones
b445bc8261
4.6.0
2017-10-24 20:35:17 +00:00
Sabe Jones
31281b43d3
chore(i18n): update locales
2017-10-24 20:34:47 +00:00
SabreCat
a8a915ea8e
chore(sprites): compile
2017-10-24 20:23:42 +00:00
SabreCat
dc3ee25e65
feat(content): subscriber items
...
Also fix(sprites): resize and recanvas gift boxes
2017-10-24 20:21:30 +00:00
Sabe Jones
54f57445da
4.5.0
2017-10-23 22:40:41 +00:00
Sabe Jones
95ef2b1789
Merge branch 'develop' into release
2017-10-23 22:40:30 +00:00
Keith Holliday
4d32977e5c
Quick fix ( #9257 )
...
* Removed hard refresh
* Changed sorting to happen during compute
2017-10-23 17:27:26 -05:00
Keith Holliday
7fe2504906
Bulk purchasing ( #9196 )
...
* Moved buy tests
* Added mystery buy to buy.js
* Added quest purchasing to buy
* Added buy special
* Moved integration tests to buy folder
* Removed buyGear dependency
* Removed buyArmoire dependency
* Removed buyHealthPotion dependency
* Removed myster, quest and special dependency
* Replaced functions with factory
* Added bulk purchasing to common
* Added bulk purchasing to the api
* Added bulk purchasing to client
* Refactored purchasing function to reduce long method
* Added bulk purchase to gem purchases
* Added bulk purchasing to api
* Added bulk purchasing to gem items on client
* Removed bulk from equipment
* Removed recentlyPurchased
* Fixed style issues and prevented puchasing more gems than are left
* Fixed lint
* Fixed missing keys
* Fixed gem amount notice
* Added quest modal to pinned item
* Added bulk purchase to gem modal
* Fixed styles
* Fixed bulk purchase for spells
* Fixed modal size
* Hid autofill
2017-10-23 16:05:35 -05:00
Matteo Pagliazzi
b74cee3d21
API Token Changes ( #9202 )
...
* hide API token by default
* wip
* add route to reset the api token
* remove dead code
2017-10-23 22:58:33 +02:00
Keith Holliday
5af7733150
Task order fixes ( #9255 )
...
* Reset todo task order
* Disabled sorting on todo due
* Revert to task order
* Fixed task sorting sync with server
2017-10-23 12:59:52 -05:00
Keith Holliday
824bf62e0a
Force refresh is server version is updated ( #9239 )
...
* Force refresh is server version is updated
* Added reload true
* Added confirmation of update
* Forced refresh on cron
* Updated response tests
2017-10-23 12:58:11 -05:00
Keith Holliday
ac24a5dddd
Moved ponytails to styles ( #9254 )
2017-10-22 15:48:50 -05:00
Alys
9111f59da4
change price for backgrounds set from 5 to 15
2017-10-22 09:24:32 +10:00
Sabe Jones
6a550b34df
4.4.5
2017-10-21 03:35:51 +00:00
SabreCat
0c973b1cf0
chore(news): Bailey
2017-10-21 03:33:42 +00:00
SabreCat
4170ef5e79
Merge branch 'release' into develop
2017-10-21 03:23:13 +00:00
Keith Holliday
506275c30e
Oct 19 fixes ( #9234 )
...
* Add more checks for user achievements
* Began to add ajax request for bailey
* Prevented purchase of locked item
* Refactored notifications to have unique id and use actions
* Added feature banner when gear is bought
* Removed debug code
* Mark group notifications as read
* Fixed lint issues
* Added gem icon to purchase all
2017-10-20 15:22:13 +02:00
Alys
6838b7d0a6
remove duplicated word "caused" from Masterclassers quest text
2017-10-20 23:12:26 +10:00
Sabe Jones
e987cd52a6
4.4.4
2017-10-18 21:06:05 +00:00
Sabe Jones
1df8668d38
chore(i18n): update locales
2017-10-18 20:57:03 +00:00
Stephy
1af42aa7fe
Set a max-width for Markdown images ( #9230 )
...
Prevents images from overflowing in tavern chat, guild sidebars, tasks,
and anywhere else using Markdown
Closes https://github.com/HabitRPG/habitica/issues/9171
2017-10-18 15:47:16 -05:00
maurnoc
9dc9faa70d
fixes bug #9173 notification menu having unneeded scroll bars ( #9229 )
2017-10-18 15:44:50 -05:00
Cezary Piątek
7fbcc0a263
Replace raw HTML internal hyperlinks with router links #9209 ( #9212 )
...
* Replace raw HTML internal hyperlinks with router links #9209
* Fix improper route-link
2017-10-18 15:40:53 -05:00
borisabramovich86
0450e9c3ae
Added empty state values for photo and description in user profile ( #9201 )
2017-10-18 15:36:26 -05:00
borisabramovich86
15626b8ae1
Prevent user from blocking himself - fixes #9097 ( #9194 )
...
* Added check - user can't block himself
* removed exclusive test
2017-10-18 15:26:01 -05:00
borisabramovich86
444f393f3a
stops Orb of Rebirth being visible after rebirth - fixes #8593 ( #9172 )
...
* remove link between rebirth and beastmaster, and fix tests
* add test checking rebirth is reset when beastmaster is enabled
* remove exclusive test
2017-10-18 15:23:27 -05:00
q--
d711bf4085
Enable browser spell-checking for task titles ( #9100 )
...
This is disabled by default in Firefox for <input> elements.
It can also be enabled document-wide by adding spellcheck=true to the <html> tag, but I haven't done so because I don't know if there might be elements on the page where spell checking is not warranted.
See also: https://developer.mozilla.org/docs/Web/HTML/Global_attributes/spellcheck
2017-10-18 15:13:57 -05:00
John Montgomery
7b93e326fc
Re-add the relevant attribute to the Stealth tooltip ( #9198 )
2017-10-18 23:39:39 +10:00
maurnoc
c62ea522c0
duplicate readme ( #9219 )
2017-10-18 09:41:45 +10:00
Alys
810362a404
fix typo in apidocs comment and my screwup in the previous commit - so sorry :(
2017-10-18 08:13:16 +10:00
Alys
2e429513da
fix typo in apidocs comment
2017-10-18 08:04:53 +10:00
Matteo Pagliazzi
c8625cb23f
Misc fixes ( #9215 )
...
* quick add assign tags
* fix columns descriptions
* fix changing language not taking effect immediately
2017-10-17 23:38:42 +02:00
tim1234ltp
ad50f90ba0
Bug fixes on Merchandise Page [Fixes Issues #9144 ] ( #9195 )
...
* Moved pictures of merch items from assets/images/merch/ to /website/static/merch
Image src in merch.vue is linked to the new path.
* Rebased and fixed.
* Reverted changes of package-lock.json
2017-10-17 10:48:23 -05:00
Sabe Jones
d5305f74e3
4.4.3
2017-10-17 00:01:54 +00:00
Sabe Jones
5ea20e4c8c
fix(news): add links
2017-10-17 00:01:39 +00:00
Sabe Jones
9e4e2d0b34
4.4.2
2017-10-16 23:12:41 +00:00
Sabe Jones
6456e6b8e3
Merge branch 'develop' into release
2017-10-16 23:12:30 +00:00
Sabe Jones
af961ff16c
chore(i18n): update locales
2017-10-16 23:11:52 +00:00
Sabe Jones
eb2a6095c2
Fixes 2017/10/16 ( #9203 )
...
* fix(various): small issues
* Rename "Gold-Purchasable Quests" to "Masterclasser Quest Lines"
* Use "getting_organized" instead of "organization" as task category
* Use pixel gem instead of SVG gem for Market
* Recanvas shop sprites for Fall 2017 seasonal items
* chore(news): update Bailey
2017-10-16 18:04:49 -05:00
Matteo Pagliazzi
ee82f5a774
Client: Tasks and Header v2 ( #9168 )
...
* wip: footer
* pin bootstrap-vue
* compact footer and fixes
* compact header
* fix member details in other views
* fix first party member in header
* fix unread notifications badge color
* sync + menu fixes
* loading bar styles
* new filter button
* create button
* create fixes
* quick add
* fix quick add inputs
* tooltips for create buttons
* fix create task moda
* fix class badge
* fixed footer links
* revert change that caused problems with tests and old browsers
* misc
2017-10-16 22:04:16 +02:00
Alys
f1c8c4c54b
add 'declined' string, needed for quest participants list
2017-10-16 21:41:37 +10:00
Sabe Jones
79b15d7ddf
4.4.1
2017-10-15 17:31:13 +00:00
Trevor Ford
f2fed7ea39
fix Stable component to correctly count pets ( #9182 )
2017-10-15 12:20:40 -05:00
Aivan Monceller
ca81ff5af6
#9184 case insensitive search ( #9190 )
2017-10-15 12:12:30 -05:00
Sabe Jones
e28c214696
chore(i18n): update locales
2017-10-15 17:07:09 +00:00
SabreCat
792f45e9bd
fix(tasks): incorrect string for text field
2017-10-15 02:37:11 +00:00
Sabe Jones
a69c0999d3
Fixes 2017/10/14 ( #9191 )
...
* fix(shops): event date range for mobile
* fix(profile): clean up equipment grids
* fix(strings): remove unused string
* fix(sprites): recanvas Lost Masterclasser scrolls
2017-10-14 19:59:28 -05:00
Sabe Jones
37ff35306c
4.4.0
2017-10-14 01:45:57 +00:00
Sabe Jones
fd430e95b2
chore(i18n): update locales
2017-10-14 01:45:08 +00:00
Sabe Jones
0ea472b3af
Merge branch 'develop' into release
2017-10-14 01:34:12 +00:00
Sabe Jones
6d0496fbd0
Lost Masterclasser Quest Line ( #9183 )
...
* fix(sprites): serve animated GIFs
Also add new GIF for upcoming quest line
* feat(content): Masterclasser capstone quest
Also fixes Quests page for clearer lock/unlock display
* chore(sprites): compile
* feat(achievements): award quest completionist cheevo
* feat(quests): Siphoning Void
fix Achievements page styling and text spacing
fix display of Rage bar on party page
* test(quests): Lost Masterclasser
* chore(news): Bailey
* fix(test): only use Masterclasser in relevant scenario
2017-10-13 20:32:55 -05:00
Keith Holliday
fac1889776
Oct 11 fxes ( #9181 )
...
* Added unqequip for hair styles
* Added quest rewards to quest completed modal
* Fixed display of task approvals
* Ensured the user is welcomed before showing login notification
* Added new message modal
* fixed manager functions
* Fixed group edit on group plan
2017-10-13 06:40:53 +02:00
SabreCat
9ca6da0f75
fix(sprites): include sprite CSS in new client build
2017-10-12 18:57:23 +00:00
Matteo Pagliazzi
99f50f825a
Old Client Cleanup ( #9141 )
...
* move emails images to website/static/emails and remove old files
* remove old client tests
* remove more files
* add sprites back
* cleanup gulp
* cleanup gulp
* remove old files
* more fixes
* pin bootstrap-vue
* disable old test
* remove old tasks
* fix apidoc
2017-10-12 16:44:28 +02:00
Sabe Jones
2308f2397e
4.3.0
2017-10-10 22:55:47 +00:00
Sabe Jones
f10d5110e5
Merge branch 'develop' into release
2017-10-10 22:55:39 +00:00
Sabe Jones
5ced47f590
Content 2017/10/10 ( #9177 )
...
* feat(content): bundle, customizations
* chore(sprites): update
2017-10-10 17:30:44 -05:00
Sabe Jones
24b2bc9aa1
4.2.3
2017-10-10 17:12:43 +00:00
Sabe Jones
aea08a971a
Merge branch 'develop' into release
2017-10-10 17:12:35 +00:00
Sabe Jones
e3452b3ba7
chore(i18n): update locales
2017-10-10 17:11:48 +00:00
Michael Hibbs
3db666eb9e
Show error message in empty market inventory drawer ( #9041 )
...
* client/tasks/user: (create dropdown) change icon color on menuitem hover
Previously the color was only changing when you hovered over the
text or icon.
This change changes the icon color when you hover anywhere over
the `menuitem`
* client/shops/market: fix search field in market
* Hide drawer sliders if number of items for type is empty
* Move drawer-help-text icon down to line up vertically with text
* Add TODO for error thrown when trying to sell special item types
* client/tasks/taskModal: display all selected tags for task
* i18n/groups: religous to religious
* client/shops/market: Add error message to empty drawer slider
* Create new locale file to hold inventory locales
* client/tasks/user: Revert change to create dropdown
* Revert tag changes
This will be picked up in a separate PR.
* Fix missing space before function paren
2017-10-10 11:18:50 -05:00
negue
cf5985e38c
oct 9 fixes ( #9175 )
...
* hide hatching modal before opening the hatched modal
* fix Options not sticking: Costume, Auto Equip
* Hall of Heroes - Collapse Items & Auth
* prevent wrapping currency icon+text
* fix spacing of remaining gems (if two digits)
* fix logo in safari (removed <mask />)
* update seasonal shop items on purchase
2017-10-09 22:40:39 -05:00
Sabe Jones
d88a8247d1
Fixes 2017/10/09 ( #9176 )
...
* fix(quests): correctly divide owner-only/all
* fix(equipment): clarify locked items
2017-10-09 22:15:52 -05:00
Keith Holliday
7e1ae6a571
Oct 9 fixes ( #9174 )
...
* Prevented purchasing of locked quest
* Fixed category filters for challenges
* Added armoire equipment directly to user
* Halfed the time notifications display
* Added quest accept/reject to party page
2017-10-09 14:40:45 -05:00
Sabe Jones
d117117885
4.2.2
2017-10-09 19:17:49 +00:00
Sabe Jones
5dd168eee4
chore(i18n): update locales
2017-10-09 19:14:21 +00:00
Keith Holliday
a7c9355dd5
Fixed breaking api change ( #9170 )
2017-10-06 16:06:48 -05:00
Matteo Pagliazzi
81d3e8a68f
add extra logging for ios/verify
2017-10-06 18:07:26 +02:00
Sabe Jones
e0fbfffbf2
4.2.1
2017-10-06 00:49:02 +00:00
Sabe Jones
36b968a74a
fix(news): remove Last Chance blurb
2017-10-06 00:48:34 +00:00
Sabe Jones
fff249fb00
4.2.0
2017-10-06 00:39:47 +00:00
Sabe Jones
ce5c6b9517
Merge branch 'develop' into release
2017-10-06 00:39:40 +00:00
Sabe Jones
702013f9ed
chore(i18n): update locales
2017-10-06 00:38:10 +00:00
Sabe Jones
3503b307b2
Content and fixes 2017-10-05 ( #9165 )
...
* fix(market): display classless equipment
* fix(challenges): more missing Markdown
* feat(content): backgrounds and Enchanted Armoire 2017-10
* chore(sprites): compile
2017-10-05 19:00:39 -05:00
Keith Holliday
f1ec8bbf2c
Added styles to selecting challenge winner ( #9164 )
2017-10-05 18:02:26 -05:00
Keith Holliday
58b033db9e
Oct 5 fixes ( #9163 )
...
* Added removing invites
* Addeed messages for empty gems to icon
* Added member for challenge members
* Fixed task cloning ending
* Fixed group task assignment
* Added small hack to prevent scrolling issues
* Fixed lint
2017-10-05 14:41:03 -05:00
thehollidayinn
b0dcc2f6ef
4.1.4
2017-10-04 18:35:50 -05:00
SabreCat
3377f8a916
Merge branch 'develop' into release
2017-10-04 23:30:39 +00:00
Keith Holliday
22f83d09c4
Release with develop ( #9162 )
...
* Client: fix Apidoc and move email files (#9139 )
* fix apidoc
* move emails files
* quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140 )
* enable link to markdown info on group and challenge edit screen
* allow admin (moderators and staff) to edit challenges
* allow admin (moderators and staff) to edit guilds
Also add some unrelated TODO comments.
* allow any party member (not just leader) to start quest from party page
* allow quest owner to cancel, begin, abort quest
Previously only the party leader could see those buttons. The leader still can.
This also hides those buttons from all other party members.
* enable reverse chat in guilds and party
* remove outdated videos from press kit
* adjust various wordings
* Be consistent with capitalization of Check-In. (#9118 )
* limit for inlined svg images and make home leaner by not bundling it with the rest of static pages
* sep 27 fixes (#9088 )
* fix item paddings / drawer width
* expand the width of item-rows by the margin of an item
* fix hatchedPet-dialog
* fix hatching-modal
* remove min-height
* Oct 3 fixes (#9148 )
* Only show level after yesterdailies modal
* Fixed zindex
* Added spcial spells to rewards column
* Added single click buy for health and armoire
* Prevented task scoring when casting a spell
* Renamed generic purchase method
* Updated nav for small screen
* Hide checklist while casting
* fix some text describing menu items (#9145 )
* 4.1.3
* use `selectGearToPin` instead of updateStore in migration-script (#9102 )
* Tags redesign in edit-task modal (#9122 )
* Truncate tags list to maximum number of tasks
This commit truncates the list of tags in the edit task modal and
displays the remaining selected tasks as a number.
* Align tags-select dropdown with "Tags" label
* Add tags popup component
* Use solid purple for tags-select dropdown
* Remove shadow when tags-select is active
* Add border-radius to tags-select
* Re-add previously disabled transitions
* Remove unused template element
* Add Clear Tags button to footer of tags popup
* Decrease column size for tags to better match design
* Truncate tag name to avoid overflows
* Add tag name as title to show full name on hover
* Grow inline tags select from left to right
* Style none button
* Add spacing to streak reset button to line up with tags select
* Add top offset to tags dropdown toggle to line up with label
* Ability to collapse checklists (#9158 )
* ability to collapse checklists
* typo
* show warning to use the mobile apps (#9152 )
* Oct 4 fixes (#9159 )
* Added gem purchase note
* Added notification count
* Added party reload
* Added description when user can no longer purchase gems this month
* Prevent modal from showing when pruchasing recently purchased items
* Added progress bar
* Prevented non leader from loading approvals
* Added group billing
* Release fix (#9161 )
* Merge Develop onto Release (#9123 )
* Some random quick (#9111 )
* Switch group button directions
* Allowed admins to export challenges
* Added scoping to some stable styles
* Fixed challenge cloning
* Tasks tags (#9112 )
* Added auto apply and exit
* Add challenge tag editing
* Fixed lint
* Skill fixes (#9113 )
* Added local storage setting for spell drawer
* Added new spell styles
* Fixed typo
* Reset local creds if access is denied (#9114 )
* various fixes: group leader's name at top of edit drop-down; Members List; etc (#9117 )
* fix text describing location of subscription/gem gift box
* disable Copy As To-Do in Tavern, guilds, party because it's not working
* change members label on group pages to Member List
* remove outdated info about seeing number of Gems available to buy
* allow Danger Zone to be seen by players without local authentication
Also add an hr because the Danger Zone heading was crammed up against the button above it.
* put current group leader's name at top of Leader change drop-down
* Client Fixes (#9120 )
* unduplicate logout code
* re-enable debug menu
* fix pets badge and equipping mounts
* close gift modal after sending gems
* armoire notifications
* Oct 1 fixes (#9121 )
* Added default tags to task
* Added seasonal gear check and show spooky
* Disabled spooky sparkles
* Fixed challenge remove tasks modal
* Hid checklist
* Added group gems modal
* Purchase with amazon
* Added check for user health
* Added missing notification file
* 4.1.1
* 4.1.2
* Merge develop into release (#9154 )
* Client: fix Apidoc and move email files (#9139 )
* fix apidoc
* move emails files
* quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140 )
* enable link to markdown info on group and challenge edit screen
* allow admin (moderators and staff) to edit challenges
* allow admin (moderators and staff) to edit guilds
Also add some unrelated TODO comments.
* allow any party member (not just leader) to start quest from party page
* allow quest owner to cancel, begin, abort quest
Previously only the party leader could see those buttons. The leader still can.
This also hides those buttons from all other party members.
* enable reverse chat in guilds and party
* remove outdated videos from press kit
* adjust various wordings
* Be consistent with capitalization of Check-In. (#9118 )
* limit for inlined svg images and make home leaner by not bundling it with the rest of static pages
* sep 27 fixes (#9088 )
* fix item paddings / drawer width
* expand the width of item-rows by the margin of an item
* fix hatchedPet-dialog
* fix hatching-modal
* remove min-height
* Oct 3 fixes (#9148 )
* Only show level after yesterdailies modal
* Fixed zindex
* Added spcial spells to rewards column
* Added single click buy for health and armoire
* Prevented task scoring when casting a spell
* Renamed generic purchase method
* Updated nav for small screen
* Hide checklist while casting
* fix some text describing menu items (#9145 )
2017-10-04 18:26:05 -05:00
Keith Holliday
496534ab4b
Release fix ( #9161 )
...
* Merge Develop onto Release (#9123 )
* Some random quick (#9111 )
* Switch group button directions
* Allowed admins to export challenges
* Added scoping to some stable styles
* Fixed challenge cloning
* Tasks tags (#9112 )
* Added auto apply and exit
* Add challenge tag editing
* Fixed lint
* Skill fixes (#9113 )
* Added local storage setting for spell drawer
* Added new spell styles
* Fixed typo
* Reset local creds if access is denied (#9114 )
* various fixes: group leader's name at top of edit drop-down; Members List; etc (#9117 )
* fix text describing location of subscription/gem gift box
* disable Copy As To-Do in Tavern, guilds, party because it's not working
* change members label on group pages to Member List
* remove outdated info about seeing number of Gems available to buy
* allow Danger Zone to be seen by players without local authentication
Also add an hr because the Danger Zone heading was crammed up against the button above it.
* put current group leader's name at top of Leader change drop-down
* Client Fixes (#9120 )
* unduplicate logout code
* re-enable debug menu
* fix pets badge and equipping mounts
* close gift modal after sending gems
* armoire notifications
* Oct 1 fixes (#9121 )
* Added default tags to task
* Added seasonal gear check and show spooky
* Disabled spooky sparkles
* Fixed challenge remove tasks modal
* Hid checklist
* Added group gems modal
* Purchase with amazon
* Added check for user health
* Added missing notification file
* 4.1.1
* 4.1.2
* Merge develop into release (#9154 )
* Client: fix Apidoc and move email files (#9139 )
* fix apidoc
* move emails files
* quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140 )
* enable link to markdown info on group and challenge edit screen
* allow admin (moderators and staff) to edit challenges
* allow admin (moderators and staff) to edit guilds
Also add some unrelated TODO comments.
* allow any party member (not just leader) to start quest from party page
* allow quest owner to cancel, begin, abort quest
Previously only the party leader could see those buttons. The leader still can.
This also hides those buttons from all other party members.
* enable reverse chat in guilds and party
* remove outdated videos from press kit
* adjust various wordings
* Be consistent with capitalization of Check-In. (#9118 )
* limit for inlined svg images and make home leaner by not bundling it with the rest of static pages
* sep 27 fixes (#9088 )
* fix item paddings / drawer width
* expand the width of item-rows by the margin of an item
* fix hatchedPet-dialog
* fix hatching-modal
* remove min-height
* Oct 3 fixes (#9148 )
* Only show level after yesterdailies modal
* Fixed zindex
* Added spcial spells to rewards column
* Added single click buy for health and armoire
* Prevented task scoring when casting a spell
* Renamed generic purchase method
* Updated nav for small screen
* Hide checklist while casting
* fix some text describing menu items (#9145 )
2017-10-04 17:39:34 -05:00
Keith Holliday
7325d2020e
Oct 4 fixes ( #9159 )
...
* Added gem purchase note
* Added notification count
* Added party reload
* Added description when user can no longer purchase gems this month
* Prevent modal from showing when pruchasing recently purchased items
* Added progress bar
* Prevented non leader from loading approvals
* Added group billing
2017-10-04 16:47:19 -05:00
negue
1a0d39e566
show warning to use the mobile apps ( #9152 )
2017-10-04 21:19:10 +02:00
Matteo Pagliazzi
dc62ab7577
Ability to collapse checklists ( #9158 )
...
* ability to collapse checklists
* typo
2017-10-04 20:35:59 +02:00
Michael Hibbs
c4e5633e48
Tags redesign in edit-task modal ( #9122 )
...
* Truncate tags list to maximum number of tasks
This commit truncates the list of tags in the edit task modal and
displays the remaining selected tasks as a number.
* Align tags-select dropdown with "Tags" label
* Add tags popup component
* Use solid purple for tags-select dropdown
* Remove shadow when tags-select is active
* Add border-radius to tags-select
* Re-add previously disabled transitions
* Remove unused template element
* Add Clear Tags button to footer of tags popup
* Decrease column size for tags to better match design
* Truncate tag name to avoid overflows
* Add tag name as title to show full name on hover
* Grow inline tags select from left to right
* Style none button
* Add spacing to streak reset button to line up with tags select
* Add top offset to tags dropdown toggle to line up with label
2017-10-04 12:33:35 -05:00
negue
d977656e96
use selectGearToPin instead of updateStore in migration-script ( #9102 )
2017-10-04 10:59:44 -05:00
Keith Holliday
b0a980d56e
Merge develop into release ( #9154 )
...
* Client: fix Apidoc and move email files (#9139 )
* fix apidoc
* move emails files
* quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140 )
* enable link to markdown info on group and challenge edit screen
* allow admin (moderators and staff) to edit challenges
* allow admin (moderators and staff) to edit guilds
Also add some unrelated TODO comments.
* allow any party member (not just leader) to start quest from party page
* allow quest owner to cancel, begin, abort quest
Previously only the party leader could see those buttons. The leader still can.
This also hides those buttons from all other party members.
* enable reverse chat in guilds and party
* remove outdated videos from press kit
* adjust various wordings
* Be consistent with capitalization of Check-In. (#9118 )
* limit for inlined svg images and make home leaner by not bundling it with the rest of static pages
* sep 27 fixes (#9088 )
* fix item paddings / drawer width
* expand the width of item-rows by the margin of an item
* fix hatchedPet-dialog
* fix hatching-modal
* remove min-height
* Oct 3 fixes (#9148 )
* Only show level after yesterdailies modal
* Fixed zindex
* Added spcial spells to rewards column
* Added single click buy for health and armoire
* Prevented task scoring when casting a spell
* Renamed generic purchase method
* Updated nav for small screen
* Hide checklist while casting
* fix some text describing menu items (#9145 )
2017-10-03 21:15:00 -05:00
Alys
3d75c99f8d
fix some text describing menu items ( #9145 )
2017-10-04 09:24:44 +10:00
Keith Holliday
0aa16d7021
Oct 3 fixes ( #9148 )
...
* Only show level after yesterdailies modal
* Fixed zindex
* Added spcial spells to rewards column
* Added single click buy for health and armoire
* Prevented task scoring when casting a spell
* Renamed generic purchase method
* Updated nav for small screen
* Hide checklist while casting
2017-10-03 16:33:01 -05:00
negue
4fa3046104
sep 27 fixes ( #9088 )
...
* fix item paddings / drawer width
* expand the width of item-rows by the margin of an item
* fix hatchedPet-dialog
* fix hatching-modal
* remove min-height
2017-10-03 21:44:45 +02:00
Matteo Pagliazzi
fda4be01b8
limit for inlined svg images and make home leaner by not bundling it with the rest of static pages
2017-10-03 17:31:53 +02:00
Brian Murray
67436fbef1
Be consistent with capitalization of Check-In. ( #9118 )
2017-10-04 00:25:58 +10:00
Alys
ffb92a5faa
quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc ( #9140 )
...
* enable link to markdown info on group and challenge edit screen
* allow admin (moderators and staff) to edit challenges
* allow admin (moderators and staff) to edit guilds
Also add some unrelated TODO comments.
* allow any party member (not just leader) to start quest from party page
* allow quest owner to cancel, begin, abort quest
Previously only the party leader could see those buttons. The leader still can.
This also hides those buttons from all other party members.
* enable reverse chat in guilds and party
* remove outdated videos from press kit
* adjust various wordings
2017-10-04 00:19:49 +10:00
Matteo Pagliazzi
4a44d60fac
Client: fix Apidoc and move email files ( #9139 )
...
* fix apidoc
* move emails files
2017-10-03 15:34:12 +02:00
Sabe Jones
122cc510d3
4.1.2
2017-10-03 01:44:30 +00:00
Sabe Jones
29a7a07d14
Merge branch 'develop' into release
2017-10-03 01:39:53 +00:00
Sabe Jones
18783aefe3
chore(i18n): update locales
2017-10-03 01:38:52 +00:00
Sabe Jones
a5e242759c
chore(news): Bailey 20171002 ( #9131 )
...
Extend subscriber item and Farm Friends duration
Parse Markdown in achievement challenges list
2017-10-02 20:32:13 -05:00
Keith Holliday
e01c6cc9a6
Added buy special support to buy route ( #9130 )
2017-10-02 20:31:06 -05:00
Keith Holliday
8a75383c43
Added spooky sparkles to features ( #9129 )
2017-10-02 19:46:21 -05:00
Matteo Pagliazzi
47ebee9ae8
Client Fixes Oct 1 ( #9126 )
...
* fix exp notifications for armoire
* open the profile modal only if data is available
2017-10-02 23:01:27 +02:00
Keith Holliday
4e97355110
Oct 2 fixes ( #9124 )
...
* Prevented filters from closing when editing tags
* Fixed group plan upgrade
* Add check for class change
* Fixed scrolling stopping on bailey
* Added server side results for armoire
* Added persistend equipment drawer toggle
* Updated reactivity in amazon payments
2017-10-02 12:51:17 -05:00
Matteo Pagliazzi
7045b5c214
update notifications lib
2017-10-02 09:26:41 +02:00
Sabe Jones
e41dccf6d5
4.1.1
2017-10-02 02:01:31 +00:00
Sabe Jones
d0815ea9ee
Merge branch 'develop' into release
2017-10-02 01:51:08 +00:00
Sabe Jones
d0bd62bf02
chore(i18n): update locales
2017-10-02 01:49:12 +00:00
Keith Holliday
39d7581c6c
Merge Develop onto Release ( #9123 )
...
* Some random quick (#9111 )
* Switch group button directions
* Allowed admins to export challenges
* Added scoping to some stable styles
* Fixed challenge cloning
* Tasks tags (#9112 )
* Added auto apply and exit
* Add challenge tag editing
* Fixed lint
* Skill fixes (#9113 )
* Added local storage setting for spell drawer
* Added new spell styles
* Fixed typo
* Reset local creds if access is denied (#9114 )
* various fixes: group leader's name at top of edit drop-down; Members List; etc (#9117 )
* fix text describing location of subscription/gem gift box
* disable Copy As To-Do in Tavern, guilds, party because it's not working
* change members label on group pages to Member List
* remove outdated info about seeing number of Gems available to buy
* allow Danger Zone to be seen by players without local authentication
Also add an hr because the Danger Zone heading was crammed up against the button above it.
* put current group leader's name at top of Leader change drop-down
* Client Fixes (#9120 )
* unduplicate logout code
* re-enable debug menu
* fix pets badge and equipping mounts
* close gift modal after sending gems
* armoire notifications
* Oct 1 fixes (#9121 )
* Added default tags to task
* Added seasonal gear check and show spooky
* Disabled spooky sparkles
* Fixed challenge remove tasks modal
* Hid checklist
* Added group gems modal
* Purchase with amazon
* Added check for user health
* Added missing notification file
2017-10-01 20:42:02 -05:00
Keith Holliday
fdf146dd01
Merge branch 'release' into develop
2017-10-01 19:46:57 -05:00
thehollidayinn
023b3ffd88
Added missing notification file
2017-10-01 19:45:21 -05:00
Keith Holliday
f01e552637
Oct 1 fixes ( #9121 )
...
* Added default tags to task
* Added seasonal gear check and show spooky
* Disabled spooky sparkles
* Fixed challenge remove tasks modal
* Hid checklist
* Added group gems modal
* Purchase with amazon
* Added check for user health
2017-10-01 19:17:02 -05:00
Matteo Pagliazzi
9f11820a02
Client Fixes ( #9120 )
...
* unduplicate logout code
* re-enable debug menu
* fix pets badge and equipping mounts
* close gift modal after sending gems
* armoire notifications
2017-10-01 23:25:32 +02:00
Alys
ca6c7b8e5f
various fixes: group leader's name at top of edit drop-down; Members List; etc ( #9117 )
...
* fix text describing location of subscription/gem gift box
* disable Copy As To-Do in Tavern, guilds, party because it's not working
* change members label on group pages to Member List
* remove outdated info about seeing number of Gems available to buy
* allow Danger Zone to be seen by players without local authentication
Also add an hr because the Danger Zone heading was crammed up against the button above it.
* put current group leader's name at top of Leader change drop-down
2017-10-01 22:15:44 +10:00
Keith Holliday
02f8ba1638
4.1.0 ( #9116 )
2017-09-30 23:59:52 -05:00
Keith Holliday
8eb7c67f12
Merge develop to release ( #9115 )
...
* Some random quick (#9111 )
* Switch group button directions
* Allowed admins to export challenges
* Added scoping to some stable styles
* Fixed challenge cloning
* Tasks tags (#9112 )
* Added auto apply and exit
* Add challenge tag editing
* Fixed lint
* Skill fixes (#9113 )
* Added local storage setting for spell drawer
* Added new spell styles
* Fixed typo
* Reset local creds if access is denied (#9114 )
2017-09-30 23:54:12 -05:00
Keith Holliday
1f895fda44
Reset local creds if access is denied ( #9114 )
2017-09-30 23:15:24 -05:00
Keith Holliday
e87c180e9b
Skill fixes ( #9113 )
...
* Added local storage setting for spell drawer
* Added new spell styles
* Fixed typo
2017-09-30 23:04:18 -05:00
Keith Holliday
dbf9fd54be
Tasks tags ( #9112 )
...
* Added auto apply and exit
* Add challenge tag editing
* Fixed lint
2017-09-30 21:49:00 -05:00
Keith Holliday
c9b99d1ecf
Some random quick ( #9111 )
...
* Switch group button directions
* Allowed admins to export challenges
* Added scoping to some stable styles
* Fixed challenge cloning
2017-09-30 17:54:27 -05:00
Sabe Jones
fd8120c80d
4.0.9
2017-09-30 17:38:49 +00:00
Sabe Jones
053e75562f
Merge branch 'develop' into release
2017-09-30 17:38:34 +00:00
Sabe Jones
1d50027f51
fix(challenges): Markdown titles
2017-09-30 17:10:57 +00:00
Sabe Jones
7fe74fd06a
Serve static news page for mobile ( #9109 )
...
* fix(news): serve static page for mobile
* fix(news): commit new component
* refactor(news): computed prop DRY
2017-09-30 10:48:24 -05:00
Sabe Jones
173a8561b6
4.0.8
2017-09-30 13:37:29 +00:00
Sabe Jones
f21bef707b
Merge branch 'develop' into release
2017-09-30 13:36:40 +00:00
Keith Holliday
9cf2ccf7c4
Style fixes ( #9108 )
...
* fixed some columns on smaller screens
* changed mystic hourglass check
* Checked for bad data
* Groupped pets and mounts
* Added show more
* Fixed lint
* Fixed lint
2017-09-30 08:34:25 -05:00
Keith Holliday
77d75c4669
Pending quest styles ( #9106 )
...
* Added pending quest modal
* Added quest completed modal
* Removed duplicate string
2017-09-30 08:28:39 -05:00
thehollidayinn
1c17b95146
4.0.7
2017-09-29 20:18:00 -05:00
Trevor Ford
d89fc209d1
fix allocate() function in ( #9105 )
...
website/client/components/userMenu/profile.vue
2017-09-29 18:48:24 -05:00
Sabe Jones
844c8bb3e6
4.0.6
2017-09-29 22:08:23 +00:00
Sabe Jones
569fb11db8
Merge branch 'develop' into release
2017-09-29 22:08:11 +00:00
Keith Holliday
7671347d3a
Chat avatar fixes ( #9103 )
...
* Ensured rejection doesn't hurt performance
* Added debounce and scroll removal
* Added debounce for keydown
* Fixed linting
2017-09-29 16:03:43 -05:00
Alys
dc3a02bc2e
clarify change class code and remove incorrect confirmation step ( #9099 )
...
- prevent the user seeing a confirmation about paying 3 gems when enabling the class system (which is free)
- rename changeClass function to changeClassForUser to avoid confusion with changeClass function
- make change class confirmation translatable
- changed "gems" to "Gems" in locales string
2017-09-29 15:57:05 -05:00
Alys
1d8c126687
hide the Block button in the user's own profile screen ( #9098 )
...
This prevents a user from accidentally blocking themself from sending PMs.
2017-09-29 15:56:54 -05:00
Alys
7ee49a43f2
Various fixes: mods can delete any message; no Report / CopyAsTodo button in inbox; etc ( #9091 )
...
* fix link to Data Display Tool
* prevent the Copy As To-Do button appearing in the inbox because it isn't working
* allow mods/staff to delete any chat message
* prevent the Flag/Report button appearing in the inbox because it isn't working
2017-09-29 15:56:44 -05:00
Sabe Jones
900bc8dfc1
Merge branch 'develop' into release
2017-09-29 20:34:52 +00:00
Keith Holliday
ec260016d3
Task sort payment fixes ( #9104 )
...
* Added sorting to dated filter
* Validated payment data type
2017-09-29 15:30:28 -05:00
Sabe Jones
ec770fb29e
4.0.5
2017-09-29 16:19:02 +00:00
Matteo Pagliazzi
c1079e4eae
Client Tasks Length ( #9101 )
...
* change tasks column height
* stack columns on smaller screens
2017-09-29 18:17:58 +02:00
Sabe Jones
3cb5637fd5
Merge branch 'release' into develop
2017-09-29 15:21:10 +00:00
Matteo Pagliazzi
cf3a0118c9
fix typo
2017-09-29 12:39:18 +02:00
Matteo Pagliazzi
895a383089
cache what is cacheable (because hashed) in the new client, should fix the broken navigation while using the site before and after a deploy
2017-09-29 12:37:03 +02:00
Matteo Pagliazzi
f730e7b345
fix password reset (setting a new one)
2017-09-29 12:15:31 +02:00
Alys
d8f3d99d59
fix footer link to Report a Bug guild
2017-09-29 18:57:33 +10:00
Sabe Jones
99fb1f6116
4.0.4
2017-09-29 01:56:18 +00:00
Alys
7c6dce2124
change link in Bailey from G docs to wiki
2017-09-29 11:51:50 +10:00
Sabe Jones
c757a3f52d
4.0.3
2017-09-28 23:50:44 +00:00
Sabe Jones
ffb318fe8d
fix(news): sprite path
2017-09-28 23:50:29 +00:00
Sabe Jones
19cd15ed62
4.0.2
2017-09-28 23:37:16 +00:00
Sabe Jones
3495662196
fix(redesign): Bailey and debug
2017-09-28 23:37:00 +00:00
SabreCat
908a1340a4
4.0.1
2017-09-28 22:59:07 +00:00
Keith Holliday
31f4610b20
Sabrecat/redesign launch bailey ( #9094 )
...
* chore(news): Bailey
* chore(news): Bailey on old client
* Fixed seasonal images
* Fixed footer and images for bailey
2017-09-28 15:36:48 -05:00
Sabe Jones
5eac2a6697
4.0.0
2017-09-28 17:50:11 +00:00
Sabe Jones
4495539e8c
Merge branch 'develop' into release
2017-09-28 17:39:35 +00:00
Alys
42e6f10b08
remove non-working difficulty tooltip ( #9092 )
2017-09-28 12:19:29 -05:00
Matteo Pagliazzi
66750e77d1
Client 404 Page ( #9093 )
...
* fix z-index of footer
* 404 page
* fixes
2017-09-28 12:19:15 -05:00
SabreCat
1eb31a4fec
Merge branch 'develop' into release
2017-09-28 16:02:47 +00:00
SabreCat
fdf2dd1f1a
chore(guilds): migration to rearrange fields
2017-09-28 15:24:59 +00:00
SabreCat
f098fbcc80
chore(sprites): compile
2017-09-28 14:40:53 +00:00
Sabe Jones
5c429d0328
chore(i18n): update locales
2017-09-28 01:07:43 +00:00
Sabe Jones
08a84ce13d
Redesign: Veteran Pet migration ( #9090 )
...
* feat(migration): add Veteran pets
Also refactor pinned items query to fetch less data
* refactor(migration): rename/move, not duplicate
2017-09-27 19:47:04 -05:00
negue
f4bf2df4a9
fortify potion + fix pinning check ( #9089 )
2017-09-27 18:06:07 -05:00
negue
ee6ceecc35
check pinning for unknow item type and path ( #9087 )
2017-09-27 23:25:34 +02:00
negue
76c3e51660
sep 25 fixes ( #9075 )
...
* on class change: remove owned gear from pinned items
* move dragging item-info closer to the cursor (food / hatching potion)
* remove v-once at attributesPopover (if the parent component is recycled the old data stays active)
* prevent popover to show data of an item that was removed - but the popover stays opened
2017-09-27 21:07:42 +02:00
Matteo Pagliazzi
d40543f4ca
Paglias Client Fixes ( #9086 )
...
* fix login background on bigger screens
* redirect to correct page after login / signup
* fix mountains in background
2017-09-27 20:59:49 +02:00
Matteo Pagliazzi
e1ad19c216
Client: Port Reset Password Page ( #9057 )
...
* start work on porting the reset password page
* add new api route for setting a new password after a reset
* wip client page
* port tests
* wip
* fix linting
* skip tests
2017-09-27 18:57:52 +02:00
Alys
a03c6184b3
fix link to Data Display Tool ( #9085 )
2017-09-27 22:24:57 +10:00
Keith Holliday
526d0b1a23
Cloned correctly ( #9084 )
...
Fixed cloning values during fix custom values
2017-09-26 23:02:58 -05:00
Sabe Jones
f523bd424f
3.116.1
2017-09-27 00:18:34 +00:00
Sabe Jones
eda76efd28
fix(hooks): remove default tasks from content instead
2017-09-26 23:29:39 +00:00
Sabe Jones
08323f307c
fix(new-client): display tweaks ( #9080 )
2017-09-26 18:24:57 -05:00
Sabe Jones
1c301f8328
fix(test): update expectations on mobile tasks
2017-09-26 22:45:20 +00:00
Sabe Jones
a515168766
fix(mobile): let mobile reg handle default tasks and tags
2017-09-26 21:40:06 +00:00
Keith Holliday
927a08defd
Small payment fixes ( #9082 )
...
* Fixed some parameter passing and computed placements
* reset edit when user change
* Lint fix
2017-09-26 16:05:54 -05:00
Sabe Jones
c8d5eb9689
3.116.0
2017-09-26 20:58:49 +00:00
SabreCat
ec298291d4
feat(event): Fall Hatching Potions
...
and important announcements
2017-09-26 20:55:12 +00:00
Keith Holliday
356f2c7b7f
Sept 26 fixes ( #9081 )
...
* Fixed layering of avatar
* Fixed navbar padding on small screens
* Dropdowns go left
* Adjusted member details styles
* Fixed task tag display
* Added toggle to buy gems
* Began moving presskit
* Fixed easing and validating immediately
* Added hover state to login and fixed transitions for social buttons
* Fixed more style issues
* Fixed overflow
* Added email warning
* Show login button on mobile
* Some column adjustments for mobile
* Fixed email/username confusion
2017-09-26 15:04:29 -05:00
Matteo Pagliazzi
b12bf773f1
Payments Fixes ( #9079 )
...
* fix stripe checkout
* fix amazon pay on firefox
* add comment
2017-09-26 19:30:04 +02:00
Alys
d70ff4e5a3
new client various fixes: all users now see challenge progress, changes to create strings, etc ( #9078 )
...
* adjust how User > Profile is referred to
* change "Create" to "Add Task" in a Challenge's page
* remove commented-out code for making a Group Plan cost Gems (there should be no Gem cost)
* split 'create' locales string into multiple strings for different purposes
- Allows text to be changed individually for each purpose.
- Assists translators in determining the best translation.
- Makes it easier to find locations in code for each string.
* remove "public" option for Group Plan creation modal
* allow all users to see challenge participant progress
2017-09-26 22:44:49 +10:00
Alys
a68b02d403
new client various fixes: flagging; non-Public Challenges can have 0 gem prize; etc ( #9072 )
...
* allow a user (admin or non-admin) to flag their own message
Initially implemented in https://github.com/HabitRPG/habitica/issues/8005
Use case for a non-admin needing to flag their own message:
- a new user posts a question
- a socialite answers
- the user posts again and reveals that they're under 13
- the socialite flags all of the user's messages and all replies to the user including the socialite's own reply (it's a requirement that all messages to and from under-aged users be hidden and some socialites know this)
* change NPC message for Tavern: "Rest in the Inn" > "Pause Damage"
* prevent a chat message being hidden until it's been flagged more than once
* allow non-Tavern (non-"Public") challenges to have zero gem prize
Also changes message about gem prize to say "Public Challenges" instead of "Tavern Challenges"
* finish committing merge conflict
2017-09-26 09:33:46 +10:00
Keith Holliday
2db5ab2352
Sept 25 fixes ( #9076 )
...
* Fixed amazon config
* Added breakpoint for fixed footer
* Fixed some minor sorting bugs
2017-09-25 17:26:23 -05:00
negue
2a43df34c0
multiple fixes sep 24 ( #9073 )
...
* pin purchase-gems + orb of rebirth
* show questInfo in items inventory and reward column
* un-equip gear using the star / clicking on the drawer
2017-09-25 20:12:49 +02:00
Keith Holliday
a317b351be
Sept 23 fixes ( #9074 )
...
* Discover challenges
* Fixed hero loading
* Moved add task button
* Fixed bailey showing
* Added logs for bad sub data
* Fixed blurb editing
* Added confirmation for deleteing message
* Reset invite modals on invite
* fixed group member sorting
* Fixed chat time styles
* Fixed hover on liked
* Fixed like count
* Added reverse
* Fixed editing party
* Added leader conditions
* Added search
* Added loading
* Reset members when leaving party
* Rounded pending
* Fixed overflow on collecting quests
* Added to invite friends
* Hid summary from party
* Fixed button styles
* Fixed button class
* Removed okay button
* Fixed renav for profile modal
* Added subscription back to menu
* Fixed static link
* Added daily due setting
* Added local auth adding
* Fixed centering of text
* Removed message locally
* Added count for new message
* Added style fix for profile pet
* Fixed achievement popovers
* Fixed white boxes
* Added plain color backgrounds
* fixed challenge mutability
* Fixed challenge editing
* Added notation for large numbers
* Add color text to guild sizes
* Removed membership filters from discover challenges
* Added invites to group
* Cmd + enter send message
* Made leader clickable
* Updated group validation
* Added cancelling autocomplete
* Added mention icon
* Added removing member
* Removed extra string
2017-09-25 13:02:12 -05:00
negue
4759764e61
NPC Flavors ( #9066 )
...
* use scss variables to chose the seasonal images instead of replacing them + added fall festival npc images
* hide spooky sparkles until needed
2017-09-24 22:10:54 +02:00
Alys
5aea8def3b
new client various fixes: Hall of Heroes is visible, Sort gear by Perception, etc ( #9070 )
...
* adjust wording and time format for Custom Day Start time confirmation
- explains that this is the EARLIEST possible time for cron
- allows user to see the exact earliest time
* remove unnecessary hyphen from login date in Profile; added whitespace after colons
* allow Hall of Heroes to be seen by non-admin users (except for admin interface)
Also removes a level of code indentation that seemed to be incorrect.
* clarify that Orb of Rebirth costs 0 gems after level 100
Previously, the modal showed just a gem icon with no number, which was misleading.
Now it shows explicitly 0 gems.
* fix spelling mistake (Challeges > Challenges)
* allow equipment to be sorted by Perception
Also change Con > CON, Per > PER, etc for consistency with abbreviations used in other locations.
2017-09-24 20:06:17 +10:00
Sabe Jones
dde63b619f
Redesign: Fixes 09/21 ( #9062 )
...
* fix(notifications): click to clear
* fix(chat): no italic/gray typing in Tavern
* fix(tutorial): tighter Justin modal
* fix(modal): revert changes to avatar editing
* fix(avatar): let edit modal be big
2017-09-22 22:27:00 -05:00
Keith Holliday
cbdb0bc3e3
Sept 22 2 ( #9067 )
...
* Added show member modal when hero is clicked
* Added drag for checklist and fixed display system messages
* Fixed party modal showing from group page
* Delete new message key
* Adjusted column sizes for chat
* Fixed key
2017-09-22 19:30:37 -05:00
Keith Holliday
6edd1a1fa5
Sept 22 fixes ( #9065 )
...
* Removed lingering checklist
* Added another party data check
* Added move cursor on hover
* Removed task locally
* Prevented user from being able to delete an active challenge task
* Reset tasks when viewing member progress
* Prevented challenge owners from adding checklists
* Hide challenges columns with no tasks
* Add error translations
* Added markdown to challenge description
* Allowed leader to rejoin challenge
* Replaced description with summary
* Fixed delete logic
* Added author
* Added loading message
* Added load more
* Added default sub
* Fixed remove all
* Added lint
2017-09-22 16:47:16 -05:00
negue
6fcf739c89
sep 21 fixes ( #9060 )
...
* remove `classSelected` on adding new pinned gear
* use show::modal on buyModal / selectMembersModal instead of v-if=item
* show::modal for buyQuestModal - fix bundles class
* fix buy potion
* fix open selectMembersModal (after changing to shop::modal)
2017-09-22 13:34:00 +02:00
Matteo Pagliazzi
f128f3d3cd
Client Fixes ( #9064 )
...
* fix loading of payments scripts
* improve loading times
2017-09-22 13:29:08 +02:00
Keith Holliday
744090e652
Sept 21 fixes ( #9061 )
...
* Fixed analytics when party is not defined:
* Waited to set Stripe
* Added popovers to danger zone
* Added date format to next cron
* Redirect user back to home for static
* Removed old settings
* Fixed show bailey
* Fixed close button on inbox
* Fixed sending blank message
* Changed input to text area in inbox
* Fixed deleting messages in inbox
* Allowed user to delete other user message in inbox
* Fixed joined date
* Fixed count styling
* Fixed display of pet and mount
* Removed white box when using base_0 items
* Fixed your profile to show when clicking from menu
* Prevented user from pinning already purchased backgroud
* Added user last log in
* Added date refresh for yesterdailies modal
* Updatd eyewear
* Fixed start a quest button
* Fixed styles on home page footer
* Added checklist sorting
* Added support for if card type is missing computed field
* Fixed linting
2017-09-21 18:53:45 -05:00
Sabe Jones
9c3b367b29
3.115.0
2017-09-21 18:44:14 +00:00
Sabe Jones
90451fbec8
chore(i18n): update locales
2017-09-21 18:42:09 +00:00
SabreCat
64addcf847
fix(news): add'l art credit
2017-09-21 18:34:17 +00:00
Sabe Jones
5263b5e42f
Fall Festival 2017 ( #9058 )
...
* feat(event): Fall Festival 2017
* chore(sprites): compile
* fix(sanity): remove duplicate locale file
2017-09-21 13:33:43 -05:00
Matteo Pagliazzi
81fc727d41
Client Fixes ( #9056 )
...
* remove console.log calls used for debugging
* open member modal when clicking on user name or avatar in chat
* misc fixes to strings, payments, ...
* simplify code
* secure statsComputed
2017-09-21 19:49:27 +02:00
Matteo Pagliazzi
7a74d4c296
Client: update urls ( #9025 )
...
* start to update urls
* ability to unsubscribe from emails
2017-09-21 16:00:52 +02:00
Matteo Pagliazzi
b6a5efc524
client: add logging around bug
2017-09-21 15:43:35 +02:00
Keith Holliday
1e1220d0f9
Sept 20 fixes 2 ( #9055 )
...
* Added cards reading
* Updated nav items
* Replaced logos with svgs
* Updated mobile preview image
2017-09-20 19:35:03 -05:00
negue
0a691ffb4f
[WIP] new client - seasonal-shop ( #9018 )
...
* extract seasonal-shop config - use summer season items (to work on)
* add suggested border to shopItems
* refactor getOfficialPinnedItems (now includes the seasonal gear)
* refactor shops.getSeasonalShop - add featured items to result - add the set to special equipment items
* feat(content): Fall 2017 seasonal gear
Also adds set keys for all prior seasonal gear.
* show item limited time (buyModal & shopItem)
* select seasonal fall sets
* WIP(seasonal-shop): placeholder Fall 2017 items
* fix lint
* sprites
* styling + fix purchase of seasonal spells
* compile sprites
* fixes: check isPinned with officialItems
* enable purchase of seasonal items for testing
* fix shop apis
* add featuredItems to market
* quest shop: add featuredItems to api
* tiem travelers shop: add featuredItems to api
* fix gear types filter
* feat(content): Fall 2017 compleat
* chore(sprites): compile
* show opened shop state (npc+background)
* add opened seasonal npc
* current seasonal users class set = purchase by gold - lock other sets of the current season
* hide event badge in seasonal shop - dot only for suggested items - cursor: pointer on shopItems
* refresh rewards column list (seasonal gear won't refresh it on purchase)
* fix duplicate seasonal gear -> remove special items from the old reward gear (which is used to reset the pinned gears)
* every current season gear is purchased by gold - prevent buyModal on locked items
* use the current event date range
* list seasonal sets by event date
* use custom method instead of updateStore to list the pinnable gear
* change daterange to 10-31
* fix start quest modal from items - disable invite quest button if a quest is already active
* toggle pin in buy-dialogs
* check if the item is not undefined/null - renamed the watch function
2017-09-20 19:28:11 -05:00
Sabe Jones
746fb982a7
3.114.1
2017-09-20 21:28:13 +00:00
Sabe Jones
5cd467d5b0
chore(news): subscription reminder
2017-09-20 21:27:59 +00:00
Sabe Jones
6df91e35c8
chore(i18n): update locales
2017-09-20 21:23:53 +00:00
SabreCat
837713f2b7
chore(news): bolg Baliey
2017-09-20 21:09:22 +00:00
Matteo Pagliazzi
cd0222e208
fix: client: allow tags selection for user tasks
2017-09-20 21:47:19 +02:00
Keith Holliday
7812e14898
Sept 20 fixes ( #9054 )
...
* Fixed start quest from items
* More style fixes
* Changed gem modal to 20
* Removed unused image
* Added initial header styles for home page
2017-09-20 09:56:26 -05:00
Matteo Pagliazzi
c0f159a8a5
Client Fixes ( #9050 )
...
* reset yesterdailies array after cron has run
* start to fix gifting
* remove unused code, move encodegift
* wip
* fix styles and bugs
* fix error if amazon is slow to load its script
* fix error notifications not showing up
2017-09-20 15:04:35 +02:00
Keith Holliday
dd0c95f051
Fixed selecting and sending messages ( #9052 )
2017-09-19 18:05:30 -05:00
Sabe Jones
6d93bcf4ff
3.114.0
2017-09-19 21:22:17 +00:00
Sabe Jones
05e9f9693a
chore(i18n): update locales
2017-09-19 21:16:58 +00:00
SabreCat
136947169b
chore(sprites): redesign updates
2017-09-19 21:06:58 +00:00
SabreCat
1379140cf6
Merge branch 'release' into develop
2017-09-19 21:00:19 +00:00
negue
2cb9228a7c
misc fixes - sep 17 ( #9045 )
...
* not locking pre-owned gear - pin removed gear on revive
* fix createAnimal (check for function) - hide pet-popover while dragging food
* fix dragging popover text color
* fix drop toasts
* selectMembersModal: load members on item change
2017-09-19 22:45:28 +02:00
Keith Holliday
b1652ddd97
Sept 18 fixes ( #9051 )
...
* Added hover state to buy buttons
* Translated profile
* Fixed sending private message from member modal
* Added payment functions
* Added translation to home page
* Fixed translation
* Some front page styles
* Fixed inbox sorting and searching
* Added seasonals
* Fixed buy gem modal conflict
* Fixed paypal link
* Fixed footer style crossover
* Fixed quest update
* Fixed sanity
2017-09-19 15:35:32 -05:00
SabreCat
c9f68e2466
chore(sprites): compile
2017-09-19 20:24:23 +00:00
SabreCat
70aabd8b11
feat(content): Subscriber Items September 2017
2017-09-19 20:23:27 +00:00
Alys
0a69c7a08d
allow customised text and translations for notifications for gaining/losing gold/xp/mana/health ( #9049 )
2017-09-19 21:44:45 +10:00
Alys
e784ae21ea
new client 2017 09 19 various fixes: subscriptions, streaks, etc ( #9047 )
...
* remove excess brace on settings > subscription screen
* prevent User icon > Settings > Subscription page from crashing when subscription has termination date
* stop subscription modal from pitching subscription to a subscriber
* change placeholder text from Username to Login Name for consistency with other login/register forms
* fix test for POST-tasks_user -- streak and dateCompleted weren't being tested correctly
* prevent tag selector from appearing in edit screen for a challenge's own tasks
* restore Restore Streak when editing a user's Dailies (including their own copies of Challenge and Group Plan Dailies)
* remove failing streak test
2017-09-19 16:39:39 +10:00
Sabe Jones
68a438f3d4
3.113.2
2017-09-18 23:08:55 +00:00
Sabe Jones
32fa49191e
fix(sprites): put back pixel paw ( #9046 )
2017-09-18 18:05:13 -05:00
Sabe Jones
ce5372647a
chore(i18n): update locales
2017-09-18 23:04:56 +00:00
Sabe Jones
36b4190f23
chore(strings): mobile-related NPC updates
2017-09-18 22:57:40 +00:00
Keith Holliday
ccc862f82a
Sept 15 fixes ( #9044 )
...
* Adjusted styles and added loading for private messages
* Allowed for assigning during group task creation
* Fixed white logos and start overflow
* Added state styles to home
* Fixed position
* Updated avatar purchasing
2017-09-18 11:54:25 -05:00
Matteo Pagliazzi
ff92f14a5b
remove old console.logs
2017-09-17 22:08:30 +02:00
negue
0b0baf2195
new client misc fixes ( #9033 )
...
* show quests and open quest dialog on click
* extract questDialogContent/Drops to separate components & use those in startQuestModal & buyQuestModal
* fix market search
* remove & readd pinned gear on revive
* remove listener once destroyed
2017-09-16 23:09:31 +02:00
Alys
8ccec0ed9d
New client 2017 09 16 - Fox_town, adjust URLs in links, etc ( #9042 )
...
New client 2017 09 16 - Fox_town, adjust URLs in links, etc
2017-09-16 22:19:07 +10:00
Sabe Jones
46b42c8441
Redesign: More Sprites ( #9040 )
...
* fix(sprites): various cleanup
* chore(sprites): compile
* fix(sprites): more resizing
2017-09-15 18:04:50 -05:00
Sabe Jones
381f652c08
Redesign: Static Pages Wrapper ( #9027 )
...
* refactor(static-pages): wrapper
* refactor(statics): use router-view
2017-09-15 13:59:15 -05:00
Sabe Jones
5c5e117da0
Redesign: Subscribe/Buy Gems modal style ( #9038 )
...
* feat(gems): User menu Gems prompt
* feat(purchases): Gems modal
* feat(purchasing): Subscription side of modal
* fix(modals): analytics and dropdown styling
2017-09-15 13:11:58 -05:00
Michael Hibbs
79b3b26ab2
[client fix] Level-100 stats message ( #9039 )
...
* Fix formatting for level 100 cap message
* Fix position for attribute points counter
* Fix text overflow in points box by increasing column width from 8 to 12
* Fix tests: Add userV to expected response in response middleware
2017-09-15 15:33:05 +02:00
Matteo Pagliazzi
89f8f047ae
fix api unit tests
2017-09-15 12:33:36 +02:00
Sabe Jones
a23d44347e
3.113.1
2017-09-15 00:22:34 +00:00
Sabe Jones
fb872a5b59
chore(i18n): update locales
2017-09-15 00:21:06 +00:00
SabreCat
04d3f084e2
chore(news): Bailey
2017-09-15 00:15:04 +00:00
Keith Holliday
a5dfb499b3
Sept 14 2017 ( #9037 )
...
* Added new message count
* Added route change for group plan
* Added fix for quest value of 0
* Fixed guild summary limit, guild and challenge height
* Added task sorting
* Added api buy armoire
* Fixed linting
2017-09-14 14:53:27 -05:00
Matteo Pagliazzi
5b1530b216
remove console .log
2017-09-14 18:57:31 +02:00
Matteo Pagliazzi
c6881c5e30
More Client Fixes ( #9036 )
...
* add automatic user syncing when user._v does not match with server
* fix google signup
* fixes to user sync
* check for next cron on activity
* add comment
2017-09-14 18:55:17 +02:00
Keith Holliday
2f913666cd
Sept 13 fixes ( #9035 )
...
* Fixed tavern message sending
* Added markdown to sumary
* Added color to inputs
* Added new breakpoint
* Added canown
* Added styles for tutorial popups
* Added background image to home page header
2017-09-13 13:31:23 -05:00
Sabe Jones
5ba3e3ce5b
Merge branch 'release' into develop
2017-09-12 20:34:03 +00:00
Sabe Jones
cb825106af
3.113.0
2017-09-12 20:29:52 +00:00
Sabe Jones
39bc25b0b7
chore(i18n): update locales
2017-09-12 20:26:41 +00:00
SabreCat
9e38cec769
chore(sprites): compile
2017-09-12 20:19:08 +00:00
SabreCat
099eadeafc
feat(content): Farm Friends bundle
...
Also tweaks some gear text to avoid multiple items being referred to as "battle-axes".
2017-09-12 20:17:49 +00:00
Keith Holliday
e29c393629
Client sept 12 ( #9032 )
...
* Removed load all members from challengs
* Fixed chalenge member modal loading
* Fixed party setting
* Fixed chat showing
* Fixed armoire drops
* Ignored lint issue
* Fixed buying old armoir items
* Fixed hatching
* Fixed pending damage
2017-09-12 12:56:06 -05:00
SabreCat
0c6540e6d8
Merge branch 'release' into develop
2017-09-12 16:57:30 +00:00
Matteo Pagliazzi
3c2cad43d0
fix linting
2017-09-12 18:53:49 +02:00
Matteo Pagliazzi
de67c130fa
Client Fixes Sept 11th ( #9030 )
...
* fix issues with loading screen on static pages
* another try at timezone issue
* interval -> timeout
* remove references to user.fns
2017-09-12 18:39:33 +02:00
Keith Holliday
55e62cdc79
Sept 8 fixes ( #9028 )
...
* Added task sync after joining challenge
* Added gem purchasing
* Updated member modal style
* Added community guidelines to all groups
* Added group plans redirect
* Began add new front page design
* Fixed challenge loading on mount
* Fixed upgrade
* Added default summary
* Fixed small nav bar styles
* Added more unlock options to avatar editor
* Added more home page finishes
2017-09-11 23:00:34 -05:00
Matteo Pagliazzi
eee41142b1
Client Fixes ( #9026 )
...
* loading screen
* debug yesterdailies modal
2017-09-12 01:06:14 +02:00
Sabe Jones
176a4a0962
3.112.2
2017-09-11 20:59:49 +00:00
Sabe Jones
32ca3d5dfe
chore(i18n): update locales
2017-09-11 20:59:24 +00:00
SabreCat
e87a10513d
chore(news): T-Shirt Bailey
2017-09-11 20:52:48 +00:00
Matteo Pagliazzi
d2832b7169
fix typo in chat component
2017-09-10 23:55:35 +02:00
Matteo Pagliazzi
daca2c7fff
fix store tests (analytics created store before it existed)
2017-09-09 15:05:26 +02:00
Sabe Jones
eb52f73cac
3.112.1
2017-09-08 19:30:58 +00:00
Sabe Jones
5c4d08336c
chore(i18n): update locales
2017-09-08 19:30:29 +00:00
Matteo Pagliazzi
861b78ce8a
remove old code
2017-09-08 21:26:01 +02:00
Matteo Pagliazzi
1dc1923d7b
Client Analytics ( #9023 )
...
* start to refactor analytics and some mixins
* wip
* wip
* wip
* more analytics
* more analytics
* more anlytics
* fix analytics module
* finish analytics
* fix env
* vue casing
2017-09-08 21:23:58 +02:00
SabreCat
7872336820
chore(news): Use Case Bailey
2017-09-08 19:20:48 +00:00
Keith Holliday
6e70f27bc6
Removed guidelines testing ( #9024 )
2017-09-07 15:51:02 -06:00
Matteo Pagliazzi
ad5decc285
fix unit tests
2017-09-07 21:35:09 +02:00
Keith Holliday
3e1c128600
Sept 7 fixes ( #9022 )
...
* Fixed login incentives header
* Added achievement hover
* Removed grassy background from editing modal
* Fixed loading of other user equipment
* Prevented non admins from using habitica official
* Fixed challenge loading and leader changing on group reload
* Added community guidlines link
* Added challenge cloning
* Fixed heroes editing
2017-09-07 13:26:53 -06:00
Matteo Pagliazzi
d9817be8f3
remove unused param
2017-09-07 14:35:47 +02:00
Matteo Pagliazzi
e54dcd2859
sync before showing yesterdailies modal
2017-09-07 14:21:05 +02:00
Matteo Pagliazzi
5ec7815cfe
Client Fixes ( #9021 )
...
* pass the timezoneoffset to the server
* implement yesterdaily modal timer
* fix typos
* todo
* task editing: checklist should not overlay the tags box
* make tags selector use two columns
* show all tags
* do not allow users to go to /login and /register if logged in
2017-09-07 14:16:39 +02:00
Keith Holliday
adeee244e3
New client sept 6 ( #9020 )
...
* Added flagging to show to admins
* Fixed filters in my guilds
* Fixed login incentives style
* Added inital rage bar
* Added categoires to get group
* Updated profile stats page
* Added stat allocation
* Updated tests to include categoires
* Fixed lint issue
* Added another lint fix
2017-09-06 17:28:52 -06:00
Sabe Jones
fe8a44b8c4
Merge branch 'release' into develop
2017-09-05 19:50:08 +00:00
Sabe Jones
80ae9c3e82
3.112.0
2017-09-05 19:45:39 +00:00
Sabe Jones
88fbcd5f8c
chore(i18n): update locales
2017-09-05 19:44:54 +00:00
Matteo Pagliazzi
2b912b354d
disable adding local auth until code is fixed
2017-09-05 21:42:28 +02:00
SabreCat
52eb2deb62
chore(sprites): compile
2017-09-05 19:35:47 +00:00
SabreCat
1812d1ba61
feat(content): BGs and Armoire 201709
2017-09-05 19:34:48 +00:00
Matteo Pagliazzi
5f65be98df
remove metatag
2017-09-05 21:27:27 +02:00
Matteo Pagliazzi
56c32d9691
client: add meta tag for webmaster tools
2017-09-05 21:23:14 +02:00
Keith Holliday
36a933d0c4
Client fixed sept 4 ( #9019 )
...
* Fixed background purchasing
* Added challenge export
* Fixed is leader filter
* Fixed staff icon
* Add block to profile modal
* Added initial send gems modal
* Added modal stack
* Fixed lint issues
* Updated notification styles
* Updated level up styles
* Fixed many achievement styles
* Fixed notification navigate to same route with different param
* Added mark chat seen and remove new messages
* Added scroll to notifications
* Updated hall loading
2017-09-05 12:34:00 -06:00
negue
d051bdf2c9
[WIP] Play Sounds in the new Client ( #9012 )
...
* move audioThemes to content - add audio settings
* copy audioFiles to website/static/audio - playSounds on $emit()
* Play Sounds for Rewards, Purchasing Items / Quests
* remove shop http-api calls
* play reward sound when buying gem
* fix lint / always show mysterybox
2017-09-02 20:24:53 +02:00
Matteo Pagliazzi
0424d214c5
Client Fixed ( #9017 )
...
* fix spacing between rewards and items
* fix rewards description
* rewards cost in bold
* fix gp notifications
* fix dailies gray text
* fix cancel in task edit modal
* tags: use AND not OR for filtering
* fix tasksDefaults so that monthlies can be created correctly
* tags: usable if no task selected, saving checklist and tags saved the one being added without requiting to press enter
* remove tags from tasks when they are deleted
* fix tags removal when multiple tags are deleted and fix tags editing
2017-09-02 18:08:32 +02:00
Keith Holliday
c2aaa9b592
Fixes sept 1 ( #9016 )
...
* Added avatars to inbox
* Added ordering of inbox messages
* Fixed blurb not converting to string
* Added message to member modal
* Added quest invites
* Moved filters to server
2017-09-01 15:26:10 -06:00
SabreCat
e450e52836
chore(news): Bailey announcement
2017-09-01 20:31:34 +00:00
SabreCat
e2ecec03e8
Merge branch 'release' into develop
2017-09-01 20:25:05 +00:00
Sabe Jones
5a92ced288
3.111.6
2017-09-01 20:14:35 +00:00
Sabe Jones
658b96c5ac
chore(i18n): update locales
2017-09-01 20:11:54 +00:00
Sabe Jones
76b6806db1
chore(news): Take This Bailey
...
Also disables Ember Hatching Potions for purchase.
2017-09-01 20:05:14 +00:00
Matteo Pagliazzi
318482d3ff
docker: fix npm5 installation
2017-09-01 20:22:55 +02:00
Matteo Pagliazzi
2e4f665fa5
NPM@5 (2nd try) ( #9013 )
...
* second try at using npm5
* use npm 5 in travis
* build client only in production
2017-09-01 20:21:40 +02:00
Matteo Pagliazzi
3d9738ac2f
client: remove extra code
2017-09-01 15:27:53 +02:00
Matteo Pagliazzi
666cc855c1
Client: fix popovers and tooltips ( #9014 )
...
* rebuild shrinkwrap
* upgrade tooltips and popovers
2017-09-01 15:15:54 +02:00
Sabe Jones
3a059f6aca
Redesign: Sabe fixes 08/31 ( #9011 )
...
* fix(modules): datepicker dist
* fix(strings): Tumblr typo
* fix(default-tasks): remove "ADD Notes"
* fix(homepage): working header
2017-08-31 18:37:09 -05:00
Keith Holliday
cdd3bc3cd6
Client fixes aug 31 ( #9010 )
...
* Separated private message model
* Added markdown to profile
* Add color backgrounds
* Added broken challenge flow
* Added summary field to getgroups
* Fixed group form information loading
* Updated autocomplete to use chat
* Fixed npc styles
* Fixed onload mentions
2017-08-31 16:14:09 -06:00
negue
87d57dab13
Backgrounds / BuyModal / misc ( #9009 )
...
* remove buyModal from all views / move to app.vue - show party member selection if card was bought
* add .btn style to 'show more' / 'show less'
* prevent adding duplicate pinned items - reset pinned gear on rebirth
* remove hourglass in items
* fix unequip gear from drawer
* fix bought item notification
* fix background in avatar - avatar position in buyModal
2017-08-31 22:56:53 +02:00
Matteo Pagliazzi
19789eb7ab
Client Fixes ( #9003 )
...
* fix strings on login and register pages
* back to older styles for placeholder
* scope->scoped
* remove old css
2017-08-31 15:15:17 +02:00
Sabe Jones
395385f3e2
Redesign: Static and Modal Fixes ( #9007 )
...
* fix(static-page): Community Manager links
* feat(modals): Bailey news
* feat(footer): link to Hall of Heroes
Also makes a number of strings translatable instead of hardcoded.
* fix(notifications): simplify drop messages
2017-08-30 17:59:31 -05:00
Keith Holliday
65aabc8333
More fixes ( #9006 )
...
* Reset user when clicking profile nav
* Added editprofile
* Add scroll to conversations and scroll to bottom on messages
* Fixed profile click
* Added notification mixin
* Fixed challenge edit assignment
* Guild list item now returns summary
* Fixed tier icons
* Fixed quest invitaion check
* Fixed extra loading of party members in modals
* Removed background from avatar in tutorial
* Changed port back
* Fixed task adding
2017-08-30 15:19:17 -06:00
Sabe Jones
5c16600b25
Merge branch 'release' into develop
2017-08-30 17:44:19 +00:00
Sabe Jones
809960b3c0
3.111.5
2017-08-30 17:43:51 +00:00
Sabe Jones
e8841d275d
chore(i18n): update locales
2017-08-30 17:43:36 +00:00
SabreCat
6ba42332f9
chore(news): Last Chance Bailey
2017-08-30 17:36:37 +00:00
Sabe Jones
32fd4e33c8
feat(dates): Clear and Today buttons ( #9005 )
2017-08-30 12:15:24 -05:00
Keith Holliday
560d247c9b
Miscing groups ( #9004 )
...
* Fixed party invite accepting
* Fixed message sending and scrolling
* Fixed profile clicking
* Hids needs work
* Added group plan page images
* Added category to editing groups
* Added quest box fix
* Added tier styles
* Changed port back to 8080
* Fixed npc style
2017-08-29 14:23:09 -06:00
Matteo Pagliazzi
40567fc8d0
More Client Fixes ( #9002 )
...
* logout should entirely clear localstorage
* fix logout, fix social login, remove duplicate home page
2017-08-29 16:18:26 +02:00
Keith Holliday
9fc7bae13e
Quick group fixes ( #9001 )
...
* Added tavern background and fixed notification key
* Fixed notification on error response
* Fixed group plans header
* Updated images/icons in tavern
2017-08-28 18:39:32 -06:00
negue
515fd62dd8
Client/negue multiplefixes6 ( #9000 )
...
* use store action to purchase gem by gold
* only show party members in header if enough width available / use overflow hidden
* fix featuredItems buyModals
* fix special items listing - open modal on special spells
* don't open the buymodal on locked items
* fix lint
2017-08-28 18:17:45 -06:00
Sabe Jones
d0d319316b
3.111.4
2017-08-28 22:36:13 +00:00
Keith Holliday
5ce80c71b9
Changed var to let ( #8999 )
...
* Changed var to let
* fixed karma test
2017-08-28 15:45:51 -06:00
Sabe Jones
0e2e8616d1
chore(abuse): flag phishing link as slur
2017-08-28 19:46:46 +00:00
Matteo Pagliazzi
170f901d86
fix avatar positions in the header
2017-08-28 20:58:00 +02:00
Matteo Pagliazzi
d1fbe98379
client: fix rewards top margin
2017-08-28 20:00:06 +02:00
Matteo Pagliazzi
fb1808d85a
misc client fixes ( #8998 )
...
* color selected difficulty icon
* misc fixes
2017-08-28 19:37:22 +02:00
Sabe Jones
4094ca99dd
Merge branch 'release' into develop
2017-08-28 17:22:03 +00:00
Sabe Jones
10d4b8b7c7
3.111.3
2017-08-28 17:15:52 +00:00
Sabe Jones
e221983bdb
chore(i18n): update locales
2017-08-28 17:13:24 +00:00
Keith Holliday
d2e7485dba
Added loadmore and limited challenge members ( #8997 )
...
* Added loadmore and limited challenge members
* Added load more to translatables
2017-08-28 10:45:55 -06:00
Alys
fd05286e1a
add header, footer, etc to various static pages for the new client ( #8996 )
2017-08-28 08:05:37 +10:00
Alys
9436c83919
prevent skills/spells being cast on rewards and group plan tasks ( #8995 )
2017-08-28 07:39:18 +10:00
Alys
4f636d3d2c
new client static Overview and FAQ: wording and formatting changes ( #8993 )
...
* improve formatting for Help > Overview page
* change wording on Help > Overview page
* change FAQ text for new client
2017-08-27 14:45:30 +10:00
Sabe Jones
1a056be637
Merge branch 'release' into develop
2017-08-26 23:23:16 +00:00
Sabe Jones
c75d47c71a
3.111.2
2017-08-26 23:22:12 +00:00
Sabe Jones
693ba5a426
chore(i18n): update locales
2017-08-26 23:21:47 +00:00
Sabe Jones
ad50aeb096
chore(news): misc Bailey
2017-08-26 23:13:51 +00:00
Alys
f38e184434
new client: move translatable strings to appropriate locales files ( #8992 )
...
* move translatable strings from newClient.json to appropriate locales files
* whitespace changes
* whitespace changes
2017-08-26 18:53:10 +02:00
Sabe Jones
d24eb67fa2
Redesign: Static Pages ( #8989 )
...
* feat(pages): static Features
* feat(static-pages): add header
* feat(static-pages): Community Guidelines
* fix(strings): tweaks
2017-08-26 16:03:43 +02:00
negue
c35e4f5750
Items/Market/Quests/misc fixes ( #8987 )
...
* use countBadge instead of class
* generic purchase action from buyModal to handle all kind of purchases - able to purchase backgrounds - return backgrounds as flat array
* List MysteryItem & Hourglass in Inventory/Items
* add Subscribers Gem Item (purchase by gold)
* fix mysterybox
* sort unlocked gear first
* add orb of rebirth to market
* remove old quest scroll + class of the quest items
* more padding on countBadge
* use the generic purchase on quests
2017-08-26 12:18:55 +02:00
Keith Holliday
0233f7b486
More fixes ( #8988 )
...
* Links stay white on hover
* Fixed task icon color
* Disabled plus button when needed
* Fixed difficulty color
* Fixed task reward color
* Updated create styles
* Fixed group plan link
* Fixed second group test modal
* Added login incentives
* Fixed group notification clear
* Show baily correctly
* Styled armoire notification
* Fixed contributor achievement styles
* Fixed death
* Fixed drop styles
* Fixed invited friend modal
* Fixed joined challenge achievement style
* Fixed joined guild style
* Fixed level up styles
* Updated low health styles
* Fixed bailey styles
* Updated quest completed
* Added soem conditionals to hide modals
* Added rebirth styles
* Fixed rebirth enable styles
* Fixed streak styles
* Fixed testing modals
* Fixed ultimate gear achievement
* Fixed won challenge
* Set user to welcomed if created on mobile
* Removed old default tasks
* Began adding more options to avatar
* Added change class
* Inbox to messages
* Moved profile to menu
* Added user modal for viewing a user and send message
* Fixed conversations
* Fixed lint
* Fixed challenges sending to server
* Added challenge progress view
* Fixed group sync after pay
* Fixed some group accepting features
* Fixed initial chat loading
* Fixed some exitence errors
* Added user names to assigned
* Added upgrade link
* Began adding new payment flow
* Added default tasks
* Updated avatar styles
* Updated tutorial styles
* Rebuilt notifications and styles
* Updated upload script
* Fixed lint
* Added default tasks back to mobile and added updated tests
* More test fixes
2017-08-25 20:56:21 -06:00
Matteo Pagliazzi
c129c38631
Paglias/client fixes ( #8990 )
...
* correct buttons for reset modal
* correct buttons for delete account modal
* fix first party member not showing up
2017-08-25 23:54:50 +02:00
negue
748ce8a23f
fix isPinned : check if pinnedItems-array exists
2017-08-24 18:49:14 +02:00
Matteo Pagliazzi
a86166742f
docs(client): add a note to specify how the new client is served
2017-08-24 18:24:47 +02:00
Matteo Pagliazzi
82c912237b
fix hard links for new client ( #8986 )
2017-08-24 18:19:31 +02:00
Matteo Pagliazzi
5c89451985
Client Fixes ( #8985 )
...
* fix typos
* tasks created immediately
* fix page scroll when cancelling task edit
* fix cheklist editing + misc fixes to tasks modal
* remove console.log
2017-08-24 16:48:52 +02:00
negue
2624b06729
[WIP] shops + market gear api ( #8980 )
...
* lock other classes gear
* fix avatar in equip-gear-modal
* fix seasonal shop
* seasonal : new gear type order
* fix pin gear (and get new gear on buying)
* API: /shops/market-gear - refactoring pinnedGearUtils - move _isPinned to common/libs
* use shops.getMarketGearCategories to list the marketGear
* use shops.getMarketCategories instead of API-call
* mark gear reward items as locked
* purchase time-travelers stuff + update view + use method instead of http-api + add missing mammoth shop image
* Time Travelers Shop: open/closed state
* time travelers: show gear preview + hide sidebar if closed
* update resized images
* fix lint
2017-08-24 07:16:18 +02:00
Sabe Jones
7b7f5c09fd
Merge branch 'release' into develop
2017-08-23 22:16:47 +00:00
Sabe Jones
ae02b8ef5a
3.111.1
2017-08-23 22:16:03 +00:00
Sabe Jones
b1ecd265e4
chore(news): Bailey
2017-08-23 22:15:51 +00:00
Sabe Jones
ad621e7208
Redesign: Misc fixes ( #8984 )
...
* fix(checklists): parse Markdown
* fix(Guilds): Markdown in descriptions
2017-08-23 14:36:43 -05:00
Matteo Pagliazzi
034f18c419
Client Misc Fixes ( #8983 )
...
* fixes party header button
* fix some svg icons
2017-08-23 17:32:20 +02:00
Alys
7a6bf8b870
new client - various fixes: Earnable Quests removed, equipment type names and sort order changed ( #8977 )
...
* remove Earnable Quests from quests shop
Earnable Quests could be put back later but with an explanation
for how you can earn them. The Quest Shop isn't well set up for
that at the moment.
* change names of some equipment items
NOTE: The `...Capitalized` strings all have lower-case versions
(e.g., "weapon" and "weaponCapitalized"). I suspect we should
change or (perhaps better) get rid of the uncapitalized version
but I'm not sure what other effects that might have (e.g., haven't
searched for exactly where it's used; don't know what it would do
to the mobile apps). Suggest looking into that after launch. If
the old, uncapitalized strings appear elsewhere during our site
testing, we should probably change them to the Capitalized version
then, or if lowercase is essential, create new strings (e.g.,
"weaponUncapitalized" - that will be much easier later than just
"weapon" for searching for where it's used!)
* change order of Equipment types on the inventory page
http://i.imgur.com/64D5jEk.png
2017-08-23 15:17:11 +10:00
Keith Holliday
f529a5c64c
New client many fixes ( #8981 )
...
* Footer style fixes
* Limited string display
* Fixed background reload
* Began adding more avatar items
* Fixed challenge updated cats and official to be seen by admins
* Fixed min prize
* Fixed required fields
* Added my challenges and find challenges to menu
* Removed nav to party page when have no party
* Updated user and notifications icon
* Added accept, reject and messages
* Added selfcare
* Underline links
* Added forgot password
* Fixed task adding
* Disabled habit options that should be
* Added markdown to tags
* Added confirm to delete
* Fixed cancel/delete style
* Fixed rounding
* Added gold icon
* Fixed task icon styles
* Fixed margin botton
* Fixed some repeat styles
* Fixed custom reward style
* Hide like count 0
* Added new tavern images
* Redirect to party page after create
* Hid leader options from non leaders
* Removed manager options from non group plan
* Fixed some nav styles
* Fixed overlay color
* Prevented edit data from being transfered to create
* Added hover state for spells
* Add performance fixes for chat avatars
* Fixed merge conflicts
* Updated fron navigation
* Fixed reg gryphon logo
* Began adding gem modal functionality
* Added purchase gems with gold
* Fixed restore
* Replaced description with summary
* Spells that target tasks fix
* Added initial challenge task load
* Fixed lint issue
2017-08-22 21:58:13 -06:00
Sabe Jones
69662f84df
Choose Class modal ( #8976 )
...
* feat(modals): near-complete Choose Class modal
Also fixes avatar alignment in the Equip modal.
* feat(classes): send API requests from choose modal
* feat(classes): full functionality on choose modal
* WIP(classes): refactor class functions
* refactor(avatar): more intelligible sprites margin
* fix(imports): correct import syntax
2017-08-22 17:59:18 -05:00
Alys
7d0ab1ba25
add summary field to challenges and guilds ( #8960 )
...
* create new summary field for challenges
* finish implementating summary for challenges, add some support for guilds
* make small improvements to challenges code
* fix lint errors
* add more code to support summaries for guilds (still more needed)
* fix existing tests by adding summary field
* make existing tests pass
* WIP make "Public Challenges" text translatable
* change "leader" locale key to "guildOrPartyLeader" to make searches for it easier
* remove v-once from h2 headings
* remove failed attempt to localise text in <script>
* add quick-and-dirty error checking for guild not having categories
* make "Public Challenges" text translatable
* rename final ...PlaceHolder strings to ...Placeholder (lower-case "h") for consistency with existing Placeholder strings
2017-08-23 06:39:45 +10:00
Matteo Pagliazzi
bd46e3e195
Client: i18n ( #8972 )
...
* wip: client: i18n
* remove maxAge from cookies to get same expiration ad localStorage
* set cookies expiration to 10 years
* moment: load translations in browser, moment: only load necessary data, remove jquery, remove bluebird
* ability to change language
* fix logout
* add some requiresLogin: false to static pages
* fix tests
2017-08-22 18:26:53 +02:00
Alys
e5a92f64c0
adjust wording on new client's register and login screens ( #8958 )
2017-08-22 23:56:56 +10:00
Keith Holliday
798d0ab82b
New client spell fixes ( #8974 )
...
* Prevented spells menu from apearing below lvl 11
* Expanding clickable casting area
* Persisted spell drawer close
* Added edit form modal to party
* Added spell toggle
* Added markdown notification
* Prevented casting on challenge and group tasks locally
* Quick fix for self cast
* Fixed lint issue
2017-08-21 23:04:56 -06:00
SabreCat
acaed1ef0e
chore(sprites): compile
2017-08-21 22:59:12 +00:00
Sabe Jones
78f94e365c
Redesign: Bulk Image Edits ( #8975 )
...
* refactor(sprites): recanvas quest scrolls
* refactor(sprites): recanvas gear icons
* refactor(sprites): resize reward items to 2/3 and recanvas
* feat(sprites): add icons for backgrounds
2017-08-21 17:54:07 -05:00
Alys
11379f150c
new and old client: change text for skills, avatar transformation buffs, and antidotes ( #8969 )
...
* change text for skills, avatar transformation buffs, and antidotes
* minor fixes
2017-08-22 08:26:50 +10:00
Alys
41da55921c
new client various fixes: Equipment shop empty; Skills not Spells; no Saddles message ( #8959 )
...
* shows message in Equipment shop when you've bought all class gear
* change Spells to Skills in visible text
* show correct message in stable when you don't have any Saddles
2017-08-21 23:45:25 +02:00
Keith Holliday
e9141ff5c9
New client flurry of fixes ( #8973 )
...
* Fixed login/reg styles and on submit
* Fixed duedate display in yesterdailiy modal
* Prevented tutorial from showing after logged in has past created
* Hide premium shirts from creating
* Fixed level up notification
* Updated categoires
* Updated justin message
* Fixed notification changes
* Fixed guild nav in join guild modal
* Added buygems modal
* Removed avatar page click
* Fixed group plan nav
* Fixed death issue
* Fixed party header styles
2017-08-21 13:28:27 -06:00
Matteo Pagliazzi
2760de7951
try to disable possible cause of too many redirects
2017-08-21 19:48:08 +02:00
Keith Holliday
203d6d3ac2
New client party tutorial ( #8968 )
...
* Adjusted intro tutorial
* Added images to create party modal
* Fixed shared button styles
* Added method to start a party
* various style fixes
2017-08-21 09:36:31 -06:00
Alys
2a2192e196
new client router changes: rename guild.vue to group.vue and GuildPage to GroupPage ( #8957 )
...
* change challenge creation button to "Add Challenge Tasks"
* router changes: rename guild.vue to group.vue and GuildPage to GroupPage
2017-08-21 08:49:47 +10:00
negue
876552b922
multiplefixes quest ( #8964 )
...
* add hourglass to header
* multiple quest fixes - show quest info in popover/modal
* pin backgrounds
* unpin gem-purchable items / change pinType of quest to quests
* check if hatching potion is allowed on egg - wide hatching info
* fix (perf): items - request text()/notes() only once
* change items margin to 23px
* list cards + open modal to choose a target + add space between market items
* buy card from task-list
* fix tests - unpin items on purchasing eggs / hatchingPotions
2017-08-21 00:32:32 +02:00
Alys
24cc88400f
remove Mead from banned words because it's a legit surname. TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2017-08-19 21:12:08 +10:00
Keith Holliday
2b922508c5
New client group fixes ( #8965 )
...
* Fixed gem styles
* Fixed party challenge logic
* Fixed category sending
* Filtered habitrpg
* Fixed updating group
* Added new empty state badge
* Added information to create group
* Fixed large icons
* Fixed name collision
2017-08-18 14:29:49 -06:00
Keith Holliday
cbee0542ad
New client tavern fixes ( #8967 )
...
* Load chat on sent
* Removed report own message
* Fixed some minor styles
* Removed extra mods
* Hide class badge
* Fixed chat alignment
* Fixed taven autocomplete
2017-08-18 12:30:39 -06:00
Sabe Jones
bc499bcfbf
Merge branch 'release' into develop
2017-08-18 17:26:42 +00:00
Sabe Jones
161eb8a03d
fix(strings): subscriber set typo
2017-08-18 17:25:52 +00:00
Sabe Jones
861c85f099
Merge branch 'release' into develop
2017-08-17 20:40:36 +00:00
Sabe Jones
ecd55b6f5c
3.111.0
2017-08-17 20:39:31 +00:00
Sabe Jones
31e7882c51
chore(i18n): update locales
2017-08-17 20:37:05 +00:00
SabreCat
c831a05b9b
feat(content): Mystery Items August 2017
2017-08-17 20:27:48 +00:00
Keith Holliday
4929a2dd79
Remove catch from cron ( #8963 )
...
* Removed extra logging
* Removed second extra logger
* Removed extra import
2017-08-17 13:42:41 -06:00
Keith Holliday
de63622cdd
Challenges plus misc fixes ( #8961 )
...
* Forced full refresh after deletE
* Fixed styles on firefox
* Removed instagram link
* Added information to modal
* Fixed deleteing and task keeping
* Added redirect to challenge detail after created
* Updated challenge item styles
* Added new limit option to challenges
2017-08-17 11:03:32 -06:00
negue
f5cf27a79e
[WIP] Client/multiple fixes shops ( #8956 )
...
* reposition FlyingPigs and Hydra
* hide count-badge if 0
* fix sortBy hatchable (ignore already hatched pets)
* always show animal name
* featuredItems, use shopItem objects
* fix egg / potion names in market
* buyModals: check for price, mark it if not enough available / change buy-button opacity / show purchaseGems button
* save itemRows open/collapsed state during session, refactor itemRows for some more performance
* pin featured items
* show bordered items in market buyModal
* fix popover margins / paddings
* position pinned items popovers to the left
2017-08-16 16:34:25 -06:00
SabreCat
88e6cf7d8a
feat(RYA): style Yesterdailies MODAL
2017-08-16 21:56:10 +00:00
Keith Holliday
0d28e663e4
New client edit avatar ( #8955 )
...
* Fixed some purchasing issues with backgrounds
* Added more background styles
* Fixed some menu styles
* Initial old client removal
* Added cross-env
* removed bower and fixed lint
* Made interceptor errors use notify
* Removed old client tests and fixed lint
2017-08-16 15:51:48 -06:00
Alys
716695e11e
Various fixes for new client (WIP) ( #8953 )
...
* sort equipment by stats: highest first
* spelling fix: excercise > exercise
* change wording for login link on register screen
* remove incorrect Items heading from Quests Shop
* fix missing "Recovery + Support Groups" guild category text and remove whitespace from keys
* fix text for guildInformationPlaceHolder
2017-08-16 22:03:07 +02:00
Alys
2770650340
add an Earnable Quests group for Basi-List and Dust Bunnnies (new client fix) ( #8952 )
...
* add an Earnable Quests group for Basi-List and Dust Bunnnies
This allows Basi-List and Dust Bunnies to be automatically placed
in their own group on the Quests Shop page in the new client.
* adjust name of Vice and Recidivate quest groups
2017-08-16 22:02:20 +02:00
Keith Holliday
0bff37b600
New client footer ( #8954 )
...
* Minor footer style fixes
* Added initial gem modal
* Fixed some heroe stuff.
* Preventing system member loading
* Added social delete
2017-08-16 10:05:33 -06:00
Pavel Pletenev
8614f11a31
Refactor api description with @apiParam groups to make it more explicit ( #8919 )
...
* Refactor api description for auth.js with @apiParam groups
* Refactor apiDoc toward better consistency
* Fix missing groups for get requests
* Fix missing groups for other request methods
2017-08-15 18:06:19 -05:00
Brian Murray
b27319313d
Fix spelling of received. ( #8937 )
2017-08-15 18:02:49 -05:00
John Montgomery
1f1c7826a4
Add the relevant attribute to the Stealth tooltip ( #8941 )
2017-08-15 17:59:30 -05:00
Sabe Jones
d8736c17e6
Merge branch 'release' into develop
2017-08-15 22:42:35 +00:00
Sabe Jones
1a99380a53
3.110.3
2017-08-15 22:41:34 +00:00
Sabe Jones
3a28aba986
chore(i18n): update locales
2017-08-15 22:41:17 +00:00
SabreCat
42f86ff62b
chore(news): Bailey
2017-08-15 22:33:54 +00:00
SabreCat
00d72fe555
fix(dropdowns): fewer bottom borders
2017-08-15 22:25:22 +00:00
SabreCat
9943a94108
fix(Stable): weird Matt wording
2017-08-15 21:18:41 +00:00
SabreCat
7a1b7b3291
fix(tags): only show trashcan on hover
2017-08-15 21:09:03 +00:00
SabreCat
832106dc86
fix(stats): show decimals between 0-1
2017-08-15 18:42:29 +00:00
Keith Holliday
24b9bd6ccc
New client spells ( #8950 )
...
* Added initial spell casting
* added casting
* Added spells style
* Fixed linting issues
* Added escape
* Added casting
* Added task drag style
2017-08-15 12:28:30 -06:00
Keith Holliday
bd19b83db4
Added avatars to chat ( #8949 )
2017-08-14 15:44:09 -06:00
Keith Holliday
eb43f83c71
New client group plan ( #8948 )
...
* Added stripe payment for group plan
* Began adding amazon
* Added amazon payments for group
* Added get group plans route
* Added group plan nav
* Added initial task page
* Added create and edit group plans
* Added initial approval header and footer
* Added assignment and approved requirement
* Added minor text fixes
* Added inital approval flow
* Added approval modal
* Removed always true
* Added more styles for filters
* Added search
* Added env vars
* Fixed router issues
* Added env to social login
* Fixed merge conflict
2017-08-14 13:19:41 -06:00
Sabe Jones
6e89197b3f
fix(stats): floor HP/MP/XP values ( #8947 )
2017-08-14 12:20:21 -05:00
Sabe Jones
51739a4dfe
Redesign: Display weekdays in correct order ( #8945 )
...
* fix(dailies): display weekdays in correct order
* fix(style): display weekday checkboxes inline
2017-08-14 12:20:03 -05:00
negue
87f39b4273
item pinning ( #8918 )
...
* toggle pinned state of items server + client
* pin quests / add pin src
* add officially pinned items and api to get in app rewards
* update schema and get items deatils
* update pin actions to the new logic
* show countBadge only with a number
* extract getPinKey - pin seasonal items
* togglePinned in buy-dialogs
* add pinKey to shop items
* wip
* wip
* fix path
* togglePinnedItem as common.op / use in client
* fix linting
* pinning: getItemInfo and save in db path and type
* make api more consistent, fix bugs
* updates
* fix bugs
* update actions to current api
* marketGear
* change to pinType
* add mystery_set to getItemInfo
* fix isPinned
* ignore animals
* list shopItems (initial)
* shopItem now has default popoverconent, itemclass and price / currency - list pinned items as rewards - attributes to gear
* show buyModal for the rewards
* show mystery_set icon
* add info whether item is suggested
* write migration, fix style issues
* pin potion and armoire
* make potion, armoire not unpinnable
* show notes for armoire and potion, add default items for new users
* show unpin notification
* add/remove pinned gear on class-change
* remove pinned & add new gear on purchase - refactoring pinning methods - fixes
* always allow to purchase armoire
* highlight item if suggested
2017-08-14 19:15:32 +02:00
negue
fcea1ecbc2
[WIP] multiplefixes for items / equipment / stable ( #8938 )
...
* highlight egg on dragging a potion - hide popover while dragging - flat show more button
* Show EquipGearModal on Item-Click - misc fixes
* disable dragging
* hide egg notes while dragging
* rename headgear to helm
* sort equipment by name & attributes
* set welcome-dialog flag
* show feeding notification
* select animals on click
* add hatchable popover back
* fix stable sortby A-Z
* remove property brackets
2017-08-13 18:18:46 +02:00
SabreCat
7b9ebc3465
fix(avatars): line up correctly
2017-08-12 16:14:46 +00:00
SabreCat
40ebaefac9
fix(lists): remove borky gradient
...
Left the SCSS for it in, for ease of playing with to get it to work in v2.
2017-08-12 15:29:20 +00:00
Sabe Jones
4ba97755a5
3.110.2
2017-08-11 20:03:14 +00:00
Sabe Jones
779ac3d4ab
chore(i18n): update locales
2017-08-11 20:00:00 +00:00
Sabe Jones
32c3a3886f
Merge branch 'develop' into release
2017-08-11 19:53:40 +00:00
SabreCat
99465d5995
chore(sprites): compile
2017-08-11 16:09:11 +00:00
Sabe Jones
df0dbaba63
feat(sprites): icons for backgrounds ( #8939 )
2017-08-11 10:07:17 -05:00
Sabe Jones
d1e9a6a74a
fix(style): background different from color ( #8942 )
2017-08-11 15:08:24 +02:00
Sabe Jones
60a5599db4
fix(pets): better adjectives
2017-08-10 23:20:01 +00:00
Sabe Jones
68b19c931b
3.110.1
2017-08-10 23:18:37 +00:00
Sabe Jones
07d2699898
fix(quest): correct hippo egg unlock condition
2017-08-10 23:18:19 +00:00
Sabe Jones
f5ea24b4e6
fix(subscriptions): Wording change for Gold:Gems
2017-08-10 22:59:25 +00:00
Sabe Jones
9507f0758d
Merge branch 'release' into develop
2017-08-10 19:59:24 +00:00
Sabe Jones
58694f46e0
3.110.0
2017-08-10 19:56:00 +00:00
Sabe Jones
a7351b0082
fix(Bailey): missing credits
2017-08-10 19:55:44 +00:00
Sabe Jones
2881566aed
chore(i18n): update locales
2017-08-10 19:54:04 +00:00
SabreCat
6d350d5974
chore(sprites): compile
2017-08-10 19:46:17 +00:00
SabreCat
2e8da50b3e
feat(content): Hippo Pet Quest
2017-08-10 19:45:30 +00:00
SabreCat
1985d04bcf
fix(stable): missing label on standard pets
2017-08-09 21:12:08 +00:00
Sabe Jones
8d040873a1
fix(columns): task heading grammer ( #8932 )
2017-08-09 13:58:59 -07:00
Keith Holliday
5995dd235d
New client more updates ( #8934 )
...
* Added api token to page
* Fixed wiki link
* Added categoires
* Removed extra create challenge button. Add prize model and user balance deduction
* Added pending filter
* Added member sort
* Added confirmation for leaving
* Filtered tavern
* Added redirect to newly created guild
* Made guild links routerlinks
* Fixed wiki link and added fetch recent messages
* Show backgrounds only on edit. Fixed glasses equip
* Added link to register page
* Added yesterdailies
* Added achievement footer
* Update guild badges
* Added avatar to achievement avatar component
* More guild crests updates
* Achievement footer and avatar added
* Added notification read
* Removed duplicate string
2017-08-09 10:56:48 -06:00
Matteo Pagliazzi
f57c647e21
Client Tasks v3 ( #8926 )
...
* tasks hover state
* hide column background if task too close
* wip edit tasks
* wip: replace tags
* upgrade bootstrap-vue and fix creare btn for tasks
* difficulty options colors and active label fixes
* fix tags
2017-08-09 17:13:40 +02:00
Sabe Jones
8d82566654
Merge branch 'release' into develop
2017-08-08 20:59:11 +00:00
Sabe Jones
7ff4a72d77
3.109.0
2017-08-08 20:58:38 +00:00
Sabe Jones
41d04b0f18
chore(i18n): update locales
2017-08-08 20:58:18 +00:00
SabreCat
c7c1ff816c
chore(sprites): compile
2017-08-08 20:49:57 +00:00
SabreCat
b018f9cf90
feat(content): Ember Hatching Potions
2017-08-08 20:48:59 +00:00
negue
a380090013
[WIP] multiple fixes ( #8916 )
...
* change quest banner backgrond
* itemRows in inventory
* use itemRows in inventory/items - showLess/showMore as default labels - extend white space if theres no button available
* hide popover if dragging is active - show dragging info on first click (without to move)
* use itemRows in inventory/stable
* fix some strings
* highlight currently dragging item in inventory/items - auto attach info on click - z-index
* fix shopItem label color
* fix floating npcs in banner
* hatched-pet-dialog in items / stable
* change all ctx to context
2017-08-07 19:04:46 -06:00
Keith Holliday
0b076311df
New client misc with some more misc ( #8929 )
...
* Added markdown
* Added styles and option for debug menu
* Added sm icons
* Began styling autocomplete
* Added autocomplete styles
* Added more challenge categories
* Updated challenge participants modal
* Fixed challenge list updating without reload
* Added close and delete challenge
* Fixed form placeholder, adjusted desc style and fixed create button style
* Fixed faq collapsing and style
* Fixed repeating ending
* Fixed delete account
* Fixed party fetch issue
* Fixed scope issue
* Added member count filters
* Fixed create button style
* Fixed badge color display
* Updated tavern styles
* Fixed some party styles
* Updated login styles
* Fixed login redirect
* Fixed initial login process
* Added done local
2017-08-07 14:26:17 -06:00
Alys
1896984777
adjust banned words. TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2017-08-05 17:19:15 +10:00
Matteo Pagliazzi
c3ba70f5d6
Tasks scoring and misc fixes ( #8925 )
...
* wip: add task scoring and persist checklist items
* remove unused files, fix checklist scoring and start adding support for groups tasks
* amke group and challenge tasks not scoreable
2017-08-04 23:27:11 +02:00
Sabe Jones
ac800a94f9
Merge branch 'release' into develop
2017-08-03 21:46:41 +00:00
Sabe Jones
9b2b9ef54d
3.108.0
2017-08-03 21:46:15 +00:00
Sabe Jones
3785a87221
chore(i18n): update locales
2017-08-03 21:43:16 +00:00
SabreCat
8c5d4ca190
chore(sprites): compile
2017-08-03 21:22:24 +00:00
SabreCat
ab6e77dd9a
feat(content): Armoire and BGs 2017-08
...
Also ends the Summer Splash event.
2017-08-03 21:21:12 +00:00
Keith Holliday
75913842bc
New client misc for days ( #8924 )
...
* Removed sticky header
* Fixed group desc and information
* Add flag modal
* Fixed chat sync errors
* Fixed balance display
* Fixed key and close issue
* Updated tavern placeholder
* Added and fixed links
* Removed open user modal from clicking menu
* Added better app loading check
* Removed banner from party
* Allowed for nav when clicking the card
* Fixed member display
* Updated create challenge modal to populate list and to create party/public
* Display members modal
* Added fetch recent messages
2017-08-03 14:04:03 -06:00
Keith Holliday
e61884ed08
New client tour ( #8921 )
...
* Linted tour. Added intro tour
* Added initial tours
* Fixed page number for intro
* Lint fix
* Updated shrinkwrap
* Removed bootstrap tour
* Lint fix
2017-08-02 20:15:00 -06:00
borisabramovich86
026014b8d6
lists banned words in the chat error message - fixes https://github.com/HabitRPG/habitica/issues/8812 ( #8858 )
...
* issue 8812 - added the list of bad words matched to the postChat error message.
* issue 8812 - added the list of bad words matched to the postChat error message.
* issue 8812 - some refactoring, fixed relevant tests, and lint rules refactor
* small fix for unnecessary empty array
* added test and did some small refactoring
* lint error fix
* issue 8812 - added the list of bad words matched to the postChat error message.
* issue 8812 - some refactoring, fixed relevant tests, and lint rules refactor
* small fix for unnecessary empty array
* added test and did some small refactoring
* lint error fix
* add test to check the error message contains the banned words used
* improve banned words test
* issue 8812 - added the list of bad words matched to the postChat error message.
* issue 8812 - some refactoring, fixed relevant tests, and lint rules refactor
* small fix for unnecessary empty array
* added test and did some small refactoring
* lint error fix
* issue 8812 - added the list of bad words matched to the postChat error message.
* issue 8812 - some refactoring, fixed relevant tests, and lint rules refactor
* add test to check the error message contains the banned words used
* improve banned words test
* merge with develop - aligned banned slurs check with banned words check
2017-08-02 12:43:22 -07:00
MathWhiz
014a7197f0
Update Website's Task Page image ( #8791 )
...
* Update Website's Task Page image
* update zip
2017-08-02 12:27:21 -07:00
Andrew Levenson
1ad3292f18
Cleaned up variable test/initialization ( #8904 )
2017-08-02 12:22:35 -07:00
Ben Harvill
add2743772
fix dockerfiles to not require entering container to run app ( #8911 )
2017-08-02 12:11:25 -07:00
Keith Holliday
cf0ce90968
New client challenge tasks ( #8915 )
...
* Added get and create challenge tasks
* Added challenge task edit
2017-08-02 10:57:57 -06:00
Imtiaz Ahmed
e3b10cdc2a
Updated tip #27 ( #8895 )
...
* Updated tip #27
* fix(locales): leave non-base locales for Transifex
2017-08-02 08:41:10 -07:00
Sabe Jones
3ab4c4114b
fix(groups): bail if group not passed to canEdit ( #8897 )
2017-08-02 08:38:30 -07:00
Sabe Jones
576285c004
fix(habits): reset counters when sleeping ( #8898 )
2017-08-02 08:35:20 -07:00
Keith Holliday
d3967d6567
Removed unneeded tests ( #8912 )
2017-08-01 20:19:51 -06:00
Keith Holliday
ea25a4bf04
Updated shrinkwrap ( #8908 )
...
* Updated shrinkwrap
* Updated shrinkwrap
2017-08-01 18:10:33 -06:00
Sabe Jones
4f26ac66ac
Merge branch 'release' into develop
2017-08-01 22:06:57 +00:00
Sabe Jones
f01ca1f9be
3.107.1
2017-08-01 22:02:46 +00:00
Sabe Jones
b51f622c52
chore(event): end Aquatic Potions
2017-08-01 22:02:31 +00:00
Keith Holliday
0dba37008f
New client popups profile andmore ( #8907 )
...
* Added more styles to user profile modal and replaced memberDetail
* Added notify library
* Added edit avator
* Added notification menu updates
* Fixed lint issues
* Added group invite functionality
* Added many achievement modals
* Added initial quest modals
* Added guild, drops, and rebirth modals
* Added the reset of the achievement modals and fixed lint
2017-08-01 12:52:49 -06:00
Matteo Pagliazzi
bca52cb6fa
Client Tasks ( #8894 )
...
* fix filter button style
* display completed todos
* fix reward control position
* begin to add edit modal
* start adding settings to edit modal
* add task saving, creating and deleting
* fixes
* add tags and repeat frequency for habits
* clicking on links should not open the edit modal
* checklist editing
* repeatables and checklists
* delete checklist items
* add rewards price
* update shrinkwrap
* pin cwait
2017-08-01 14:30:17 +02:00
negue
ade6d9689f
new client - quest / seasonal / time travelers shops ( #8903 )
...
* initial quests.vue - refactorings - add group to quests
* shows quests by quest-group
* buyQuestModal with rewards sidebar
* store / actions to load seasonal/time-travelers shop data
* buyModal buyPressed instead of buyAction - seasonal shop categories now with specialClass property - seasonal shop
* time travelers vue - show hourglass in shopItem / buyDialog - fix banners
* cleanup
* show amount of already owned quests
* show html notes in popovers / dialog
* extract purchase-api to common.ops.purchaseWithSpell to call the same in the store / update the UI on purchases
* add time-travelers sprites
* fix lint
* add last mystery set images
* remove unused Page
* remove equipment from newClient.json
2017-07-31 17:04:40 -06:00
Sabe Jones
90f7390f84
Merge branch 'release' into develop
2017-07-31 20:35:25 +00:00
Sabe Jones
5d6e8c8729
3.107.0
2017-07-31 20:34:57 +00:00
Sabe Jones
4659b1cc5c
chore(i18n): update locales
2017-07-31 20:33:55 +00:00
SabreCat
06c58bfae2
chore(sprites): compile
2017-07-31 20:23:19 +00:00
SabreCat
568e8840ed
feat(event): Naming Day 2017
2017-07-31 20:22:09 +00:00
Keith Holliday
ffe46c0f07
Many updates on our large list ( #8905 )
...
* Many updates on our large list
* Added footer debug functions
2017-07-31 13:54:52 -06:00
Sabe Jones
aad6130b21
3.106.1
2017-07-30 20:37:17 +00:00
Alys
88d48f1e5d
adjust slurs / banned words. TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2017-07-31 06:26:16 +10:00
Sabe Jones
413626a971
3.106.0
2017-07-30 16:15:45 +00:00
Sabe Jones
26f39c9db6
chore(news): Last Chance Bailey
2017-07-30 16:13:58 +00:00
Keith Holliday
c5e0bcfb0e
New client more misc ( #8902 )
...
* View party now opens member modal
* Clicking member in header opens member detail modal
* Began sticky header
* Added sleep
* Removed extra inbox and added name styles
* Lint fixes
* Added member filter
* Added task counts
* Updated quest start modal
* Updated members modal style
* Fixed editing party
* Updated tavern
* Updated my guilds
* More guild styles
* Many challenge styles and fixes
* Fixed notification menu display
* Added initial styles to groupplans
* Added syncing with inbox
* Fixed lint
* Added new edit profile layout
* Added initial achievement layout
* Began adding new stats layout
* Removed duplicate:
* fix(CI): attempt to address Travis Mongo connection issue
* fix(CI): don't strand us in Mongo shell
* Travis updates
* Try percise
2017-07-29 16:08:36 -06:00
Sabe Jones
c6c0e3660b
Merge branch 'release' into develop
2017-07-27 21:13:43 +00:00
Sabe Jones
d00131fc4a
3.105.2
2017-07-27 21:12:40 +00:00
Sabe Jones
f7220e7e8c
feat(locales): add Turkish language
2017-07-27 21:12:20 +00:00
Sabe Jones
bf6dde6e63
3.105.1
2017-07-27 21:08:46 +00:00
Sabe Jones
c3024e5e58
chore(i18n): update locales
2017-07-27 21:06:15 +00:00
SabreCat
ca8b7f6b67
fix(sprites): jellyfish arms
...
Also adds a Bailey announcement.
2017-07-27 20:58:49 +00:00
Sabe Jones
521077ed4f
Explicitly configure HTTP request for PayPal ( #8896 )
...
* fix(payments): explicitly configure HTTP request
* refactor(req): return $http call
* fix(payments): inject and open $window
2017-07-27 11:31:58 -07:00
negue
f72f71fd32
[WIP] New Client - Shops/Market ( #8884 )
...
* initial market - routing - store - load market data
* move drawer/drawerSlider / count/star badge to components/ui
* filter market categories
* shopItem with gem / gold
* show count of purchable items
* show count of purchable itemsshow drawer with currently owned items + DrawerHeaderTabs-Component
* show featured gear
* show Gear - filter by class - sort by (type, price, stats) - sort market items
* Component: ItemRows - shows only the max items in one row (depending on the available width)
* Sell Dialog + Balance Component
* generic buy-dialog / attributes grid with highlight
* buyItem - hide already owned gear
* filter: hide locked/pinned - lock items if not enough gold
* API: Sell multiple items
* show avatar in buy-equipment-dialog with changed gear
* market banner
* misc fixes
* filter by text
* pin/unpin gear store actions
* Sell API: amount as query-parameter
* Update user.js
* fixes
* fix sell api amount test
* add back stroke/fill currentColor
* use scss variables
2017-07-27 19:41:23 +02:00
Matteo Pagliazzi
18b04e713e
Revert "chore(i18n): update locales"
...
This reverts commit 6754c43317 .
2017-07-27 17:41:23 +02:00
Matteo Pagliazzi
6754c43317
chore(i18n): update locales
2017-07-27 17:35:14 +02:00
Keith Holliday
0b13ba822e
New client group finishes ( #8899 )
...
* Added challenges section
* Added public fields to guilds
* Added suggestion for habitica help guild
* Added categoires to group
* Added guild category filters
* Added guild filter by member count
* Removed console.log
* Updated group count in tests to account for newly created groups
2017-07-26 09:05:13 -06:00
Sabe Jones
9071fa0073
Merge branch 'release' into develop
2017-07-25 23:25:11 +00:00
Sabe Jones
7a5f01d516
3.105.0
2017-07-25 23:24:48 +00:00
Sabe Jones
0f3f54548d
chore(i18n): update locales
2017-07-25 23:22:54 +00:00
SabreCat
c84dc40c7d
feat(content): Subscriber items 2017-07
2017-07-25 23:15:06 +00:00
Keith Holliday
16b244d5c6
New client random catchup ( #8891 )
...
* Added initial challenge pages
* Added challenge item and find guilds page
* Added challenge detail
* Added challenge modals
* Ported over challenge service code
* Ported over challenge ctrl code
* Added styles and column
* Minor modal updates
* Removed duplicate keys
* Fixed casing
* Added initial chat component
* Added copy as todo modal
* Added sync
* Added chat to groups
* Fixed lint
* Added notification service
* Added tag services
* Added notifications
* Added hall
* Added analytics
* Added http interceptor
* Added initial autocomplete
* Added initial footer component
* Began coding and designing footer
* Added inital hall
* Ported over inital group plan ctrl code
* Added initial invite modal
* Added initial member detail modal
* Added initial notification menu
* Ported over inital notification code
* Fixed import line
* Fixed autocomplete import casing
2017-07-25 08:24:40 -06:00
Matteo Pagliazzi
86a07a4949
fix missing comma in json
2017-07-22 20:38:55 +02:00
Matteo Pagliazzi
31bbac1751
Client Tasks ( #8889 )
...
* tasks: markdown style, checkboxes. Misc fixes
* add filtering to tasks
* client tasks: complete filtering
2017-07-22 20:30:08 +02:00
Sabe Jones
e6dd0d5e82
Delete Account with Social Auth ( #8796 )
...
* feat(accounts): delete social accts
* test(integration): social auth delete
2017-07-21 10:55:53 -07:00
Alys
88fece1422
change Contact Us page to specify the Report a Bug guild instead of GitHub ( #8877 )
2017-07-21 10:49:00 -07:00
Keith Holliday
ecc18fc093
New client chat ( #8890 )
...
* Added initial challenge pages
* Added challenge item and find guilds page
* Added challenge detail
* Added challenge modals
* Ported over challenge service code
* Ported over challenge ctrl code
* Added styles and column
* Minor modal updates
* Removed duplicate keys
* Fixed casing
* Added initial chat component
* Added copy as todo modal
* Added sync
* Added chat to groups
* Fixed lint
2017-07-21 11:00:36 -06:00
Keith Holliday
0a59b8e85b
[WIP] New client challenges ( #8842 )
...
* Added initial challenge pages
* Added challenge item and find guilds page
* Added challenge detail
* Added challenge modals
* Ported over challenge service code
* Ported over challenge ctrl code
* Added styles and column
* Minor modal updates
* Removed duplicate keys
* Fixed casing
2017-07-20 14:52:46 -06:00
Keith Holliday
d677f5cfc7
New client statics ( #8885 )
...
* Moved static files over to new client
* Added statics, fixed translations and update styles
* More style and vue fixes
* Fixed line endings
* Fixed new stuff converasion and help links
2017-07-20 12:20:53 -06:00
Keith Holliday
88f872ed50
New client settings ( #8886 )
...
* Added initial settings page
* Initial cleanup and translations
* Ported api settings
* Ported promocode settings
* POrted notifications code
* Fixed styles and translatins for site page
* Ported over rest of settings functions
* Ported payments over
* Initial lint clean up
* Added amazon modal
* Added stripe
* Added site settings
2017-07-20 12:01:00 -06:00
CJ
605391e4e7
Fixes #7958 - do not remove Battle Gear equipment when changing class ( #8064 )
...
* Changed files to fix Bug 7958:
- website/client-old/.../userCtrl.js#38: removed to keep inventory constant
- website/common/.../changeClass.js#33: removed to stop 'classes' introduction
* Adjustments following Bug Review
- Removed remaining 'foundKey' logic
- Adjusted test logic to reflect feature change
* Reverting userCtrl.js to development version
- Reintroduces "classes" Guide tour
* New version of Fixes #7958
- Changed logic to only notify user the first time they choose a class
- Changed message to represent this change in logic
- #LINT: Cleaned interface for changing class
- New method: enableClasses() -- because, really, should we be calling User.changeClass({}) from the UX?
- New method: payForNewClass() -- handles prompting the user to confirm that they want to change class
* Remove new User Flag, use flags.tour.classes
* Whoopsie. Fix PR conflict.
* Changed files to fix Bug 7958:
- website/client-old/.../userCtrl.js#38: removed to keep inventory constant
- website/common/.../changeClass.js#33: removed to stop 'classes' introduction
* Adjustments following Bug Review
- Removed remaining 'foundKey' logic
- Adjusted test logic to reflect feature change
* Reverting userCtrl.js to development version
- Reintroduces "classes" Guide tour
* New version of Fixes #7958
- Changed logic to only notify user the first time they choose a class
- Changed message to represent this change in logic
- #LINT: Cleaned interface for changing class
- New method: enableClasses() -- because, really, should we be calling User.changeClass({}) from the UX?
- New method: payForNewClass() -- handles prompting the user to confirm that they want to change class
* Remove new User Flag, use flags.tour.classes
* Whoopsie. Fix PR conflict.
* Removed Extraneous Flag
* Removed Extraneous Flag
* Changed files to fix Bug 7958:
- website/client-old/.../userCtrl.js#38: removed to keep inventory constant
- website/common/.../changeClass.js#33: removed to stop 'classes' introduction
* New version of Fixes #7958
- Changed logic to only notify user the first time they choose a class
- Changed message to represent this change in logic
- #LINT: Cleaned interface for changing class
- New method: enableClasses() -- because, really, should we be calling User.changeClass({}) from the UX?
- New method: payForNewClass() -- handles prompting the user to confirm that they want to change class
Remove new User Flag, use flags.tour.classes
Whoopsie. Fix PR conflict.
Removed Extraneous Flag
* Fixes handling architecture change
* Updates following Review 20170418-0602
* Remove cause of mocha/no-exclusive-tests lint failure
2017-07-20 10:28:53 -07:00
Sabe Jones
ca90d88289
Merge branch 'release' into develop
2017-07-20 16:10:12 +00:00
Sabe Jones
a4951c6478
3.104.1
2017-07-20 16:08:27 +00:00
Matteo Pagliazzi
95285cd85a
do not send password to loggly ( #8887 )
2017-07-20 15:07:38 +02:00
Andrew Schultz
1a03f8d7ae
3 typos plus a question ( #8866 )
2017-07-19 18:51:39 -07:00
Andrew Schultz
5d0cbd2456
Stoikalm was missing umlaut in 2 game text places ( #8867 )
2017-07-19 18:50:31 -07:00
Mateus Etto
cdc8473f60
Allow Multiple Invites to Party ( #8683 )
...
* (server) Add parties array to store invites
* (server) Lint files
* Update joinGroup, rejectGroupInvite, _inviteByUUID, and remove clearPartyInvitation.js
* Update user schema: detailed 'invitations.parties' attributes
* Code improvement and do not let invite twice
* Check if the user is already invited earlier in the code
* Added message to invitation page, and show all invitations
* Added join party confirmation alert
* Small fixes
* Created test: allow inviting a user to 2 different parties
* Updated tests
* Update invitations.parties on more places
* Small adjustments
* Updates on invitations.party references
* Show all invitations when user is already in a party
* Fixed notifications counter
* Update both 'party' and 'parties' at _handleGroupInvitation
* Updated a test
* Fixed small mistake at _handleGroupInvitation
* More test update
* Update invitation.party when removing single invite and small adjust at view
2017-07-19 18:45:28 -07:00
Kevin Smith
11a4c1c95d
Implemented new Achievement and Badge: Invited a Friend ( Fixes #8615 ) ( #8819 )
...
* Added text to locale
* Added achievement to content and libs
* Added achievement modal
* Added achievement to notification model and controller
* Added achievement to user schema
* Grant achievement to inviter when user registers using emailed link
* Fix icon name
* Added integration test
* Fix linting
* Added sprite
2017-07-19 18:39:39 -07:00
SabreCat
625b159880
Merge branch 'sabrecat/travis-mongodb' into develop
2017-07-19 23:14:00 +00:00
SabreCat
bf8b2db6b3
fix(Travis): explicitly start Mongo
2017-07-19 22:50:57 +00:00
SabreCat
83a1b9c34e
chore(words): reclassify some words as slurs
...
Also moves bannedSlurs.js to the same directory as bannedWords.js.
2017-07-19 21:41:08 +00:00
Alyssa Batula
c350665076
Automatically mute users who attempt to post a slur, fixes #8062 ( #8177 )
...
* Initial psuedo-code for checking for slurs in messages
* Initial working prototype for blocking posting of slurs. Moved check from group.js to the chat api. Still needs: to permanently revoke chat privileges, to notify the moderators, a better method for checking for the blacklisted words, and a way to get the real list of words to check.
* Permanently revoke chat privileges when attempting to post a slur.
* Removed console logs
* Fixing rebase
* Do not moderate private groups
* Moved slur check to a generic check for banned words function
* Moved list of slurs to a separate file, fixed misplacement of return in ContainsBannedWords() function
* Slurs are blocked in both public and private groups
* Added code to send a slack message for slurs
* Fixed formatting issues
* Incorporated tectContainsBannedWords() function from PR 8197, added an argument to specify the list of banned words to check
* Added initial tests for blocking slurs and revoking chat priviliges
* Uncommented line to save revoked privileges
* Check that privileges are revoked in private groups
* Moved code to email/slack mods to chat api file
* Switched to BadRequest instead of NotFound error
* Restore chat privileges after test
* Using official placeholder slur
* Fixed line to export sendSubscriptionNotification function for slack
* Replaced muteUser function in user methods with a single line in the chat controller file
* Reset chatRevoked flag to false in a single line
* Switched method of setting chatRevoked flag so that it is updated locally and in the database
* First attempt at the muteUser function: revokes user's chat privileges and notifies moderators
* Manual merge for cherry-pick
* Initial working prototype for blocking posting of slurs. Moved check from group.js to the chat api. Still needs: to permanently revoke chat privileges, to notify the moderators, a better method for checking for the blacklisted words, and a way to get the real list of words to check.
* Permanently revoke chat privileges when attempting to post a slur.
* Removed console logs
* Created report to be sent to moderators via email
* Do not moderate private groups
* Moved slur check to a generic check for banned words function
* Moved list of slurs to a separate file, fixed misplacement of return in ContainsBannedWords() function
* Slurs are blocked in both public and private groups
* Added code to send a slack message for slurs
* Fixed formatting issues
* Incorporated tectContainsBannedWords() function from PR 8197, added an argument to specify the list of banned words to check
* Added initial tests for blocking slurs and revoking chat priviliges
* Uncommented line to save revoked privileges
* Check that privileges are revoked in private groups
* Moved code to email/slack mods to chat api file
* Switched to BadRequest instead of NotFound error
* Restore chat privileges after test
* Using official placeholder slur
* Fixed line to export sendSubscriptionNotification function for slack
* Replaced muteUser function in user methods with a single line in the chat controller file
* Reset chatRevoked flag to false in a single line
* Switched method of setting chatRevoked flag so that it is updated locally and in the database
* Removed some code that got re-added after rebase
* Tests for automatic slur muting pass but are incomplete (do not check that chatRevoked flag is true)
* Moved list of banned slurs to server side
* Added warning to bannedSlurs file
* Test chat privileges revoked when posting slur in public chat
* Fix issues left over after rebase (I hope)
* Added code to test for revoked chat privileges after posting a slur in a private group
* Moved banned slur message into locales message
* Added new code to check for banned slurs (parallels banned words code)
* Fixed AUTHOR_MOTAL_URL in sendTxn for slur blocking
* Added tests that email sent on attempted slur in chat post
* Created context for slur-related-tests, fixed sandboxing of email. Successfully tests that email.sendTxn is called, but the email content test fails
* commented out slack (for now) and cleaned up tests of sending email
* Successfully tests that slur-report-to-mods email is sent
* Slack message is sent, and testing works, but some user variables seem to only work when found in chat.js and passed to slack
* Made some fixes for lint, but not sure what to do about the camel case requirement fail, since that's how they're defined in other slack calls
* Slack tests pass, skipped camelcase check around those code blocks
* Fixed InternalServerError caused by slack messaging
* Updated chat privileges revoked error
* fix(locale): typo correction
2017-07-19 14:06:15 -07:00
Matteo Pagliazzi
89ee8b1648
Client Tasks ( #8883 )
...
* client tasks: fix styles and add markdown rendering
* more style fixes
* client: tasks fixes
2017-07-19 21:02:40 +02:00
Sabe Jones
75680ab6aa
Merge branch 'release' into develop
2017-07-19 18:41:13 +00:00
Sabe Jones
116ec0f9d9
3.104.0
2017-07-19 18:38:43 +00:00
Sabe Jones
a89633d17b
chore(i18n): update locales
2017-07-19 18:37:11 +00:00
SabreCat
2e3dd27414
chore(sprites): compile
2017-07-19 18:25:14 +00:00
SabreCat
3af756a90d
feat(cards): Good Luck card and achievement
2017-07-19 18:24:10 +00:00
jerellmendoodoo
a9195f0d96
Fixed release pets mounts ( #8545 )
...
* Fixed release pets/mounts achievements when fully earned and added unit tests for these changes
* Fixed release pets/mounts achievements to award only when fully earned and added unit tests for these changes, also fixed linting issues
* Updated variable assignments to make more readable
* Revised releaseBoth/Pets/Mounts to include null or undefined checks, also updated unit tests
* fixed integration tests
2017-07-18 13:34:54 -07:00
Oscar Rendón
ab777f7006
Restrict users from getting back from death ( #8808 )
...
* Add test to prevent death users recovering health
* Add check for buying potions with zero health
* Validate hp <= 0 to take boss damage into account
2017-07-18 13:26:10 -07:00
Grayson Gilmore
d918bc9f56
Add tests to increase coverage on /website/server/controllers/api-v3/auth.js ( #8809 )
...
* Add tests covering branches in _handleGroupInvitation
* Remove .only from latest test
2017-07-18 13:21:34 -07:00
Sabe Jones
4a89ca3e11
Merge branch 'develop' into fix-leave-challenges
2017-07-18 20:14:47 +00:00
joe-salomon
cdbbf93b74
Weekly/Monthly Habit reset counters resetting early - fixes #8570 ( #8749 )
...
* For habit reset logic, changed day check calculation to use user’s timezone instead of server time.
Added unit tests to check following cases:
- Weekly habit reset: Server tz is Sunday, User tz is Monday
- Weekly habit reset: Server tz is Monday, User tz is Sunday
- Monthly habit reset: Server tz is 1st of month, User tz is 2nd of month
- Monthly habit reset: Server tz is end of prev month, User tz is 1st of month
* use moment().zone() instead of utcOffset()
* typo
* Fixed check for daysMissed, added logic for CDS
Added test for CDS, fixed previous tests
2017-07-18 12:53:39 -07:00
Keith Holliday
d822843bbf
[WIP] New client userpages ( #8868 )
...
* Added background page
* Added stats
* Added achievements
* Added profile
2017-07-17 22:18:17 -06:00
negue
ea3ed26f42
Stable minor fixes ( #8861 )
...
* fix dialog text + close after hatching
* Update newClient.json
2017-07-18 01:04:34 +02:00
Pavel Pletenev
0da1144635
Make responce codes uniform ( #8865 )
...
* Fix 201 responce wrong documentation
* Fix 201 in challenges
* Fix 201 in groups.js
* Fix 201 in tags.js
* Fix 201 in webhooks.js
2017-07-17 14:28:25 -07:00
Alys
5f3539da19
make Bailey correctly explain about Aquatic Friends achievement badge ( #8853 )
...
* make Bailey correctly explain about Aquatic Friends achievement badge
It's this error again: https://github.com/HabitRPG/habitica/issues/8658
From katzalina in the Report a Bug guild:
"not a priority: Re:Bailey's news 07/05/ it says: both you and you
friend get the aquatic friends badge - I splashed a party member
and did not get the badge (didn't expect to either, until reviewing
the news). Am I experiencing a bug or has there been a systematic
change and the news text doesn't reflect it, yet? Thanks"
* the incorrect message was in an earlier Bailey as well
2017-07-17 14:16:31 -07:00
Sabe Jones
e4d006e5cd
3.103.0
2017-07-16 16:25:07 +00:00
Sabe Jones
801b53857f
fix(payments): short circuit for non-gift txns ( #8881 )
2017-07-16 09:24:17 -07:00
Keith Holliday
f8571ec5d5
Moved notifications to be read after yesterdailies ( #8872 )
...
* Moved notifications to be read after yesterdailies
* Prevent when user needs cron
* Updated tests
2017-07-16 09:24:09 -07:00
Matteo Pagliazzi
78ba596504
Groups can prevent members from getting gems ( #8870 )
...
* add possibility for group to block members from getting gems
* fixes
* fix tests
* adds some tests
* unit tests
* finish unit tests
* remove old code
2017-07-16 09:23:57 -07:00
Sabe Jones
fe9521a63f
3.102.3
2017-07-14 12:11:08 +00:00
Sabe Jones
c4348d8e47
Merge branch 'release' into develop
2017-07-13 22:29:35 +00:00
Sabe Jones
9b0ee6a726
3.102.2
2017-07-13 22:29:03 +00:00
Sabe Jones
c23fad3077
chore(i18n): update locales
2017-07-13 22:28:23 +00:00
Sabe Jones
6850a1fcb4
chore(news): Blog Bailey
2017-07-13 22:23:35 +00:00
Keith Holliday
bc477455bb
Tasks cron ryamodal fixes ( #8871 )
...
* Changed assumption of timezone location
* Added checks for RYA and moved cron check
* Fixed modal scope issue
2017-07-13 15:11:27 -07:00
Sabe Jones
88c56c9877
Merge branch 'release' into develop
2017-07-12 20:42:23 +00:00
Sabe Jones
4cd272f99c
3.102.1
2017-07-12 20:41:58 +00:00
Sabe Jones
0292501387
chore(i18n): update locales
2017-07-12 20:40:13 +00:00
Keith Holliday
28b56256d2
Added catch for cron error ( #8864 )
...
* Added catch for cron error
* Updated logger usage
2017-07-12 13:35:08 -07:00
Sabe Jones
a4ee3aaa7e
Merge branch 'release' into develop
2017-07-11 21:48:18 +00:00
Sabe Jones
7a2432a1a0
3.102.0
2017-07-11 21:42:06 +00:00
Sabe Jones
0bf515d0f9
chore(i18n): update locales
2017-07-11 21:40:44 +00:00
SabreCat
cbed198f02
chore(sprites): compile
2017-07-11 21:32:53 +00:00
SabreCat
90d77cee81
feat(content): Orca Pets and Splashy Pals
2017-07-11 21:31:26 +00:00
SabreCat
3668a9d3ac
fix(sprites): correct canvases
...
Also adds sprites for Trapper Santa collection quest.
2017-07-11 21:29:48 +00:00
Keith Holliday
052c653cd3
Added initial inbox ( #8852 )
...
* Added initial inbox
* Minor styles
* Added more styles, selected conversations, sending messages
* Added translations and colors
2017-07-10 21:09:31 -06:00
Keith Holliday
3aa7b4b631
Fixed or logic break ( #8857 )
2017-07-10 21:08:35 -06:00
Sabe Jones
045378b820
Merge branch 'release' into develop
2017-07-10 20:20:24 +00:00
Sabe Jones
a256b6df03
3.101.2
2017-07-10 20:07:46 +00:00
Keith Holliday
92fdc13adf
Added assumption that the date passed is in the users timezone ( #8859 )
2017-07-10 13:07:14 -07:00
negue
dd29c60d87
[WIP] drag/drop fixes ( #8851 )
...
* Stable: Highlight pet on dragging food / add drag* events
* Stable: hatch dialog instead of popover / .btn-flat / update bootstrap-vie
* Layout: change sidebar width to fixed 236px - removed .col-2/.col-10
* Stable: Drag&Drop Food Image + Text - refactor directive to use custom event names
* Stable: fixes
* Stable: click to select food + attached food info box
* fix lint issues
* Drag&Drop&Click: Potions on Eggs - fix click on item + attached infobox-position in click mode
2017-07-10 10:07:23 +02:00
Sabe Jones
78fd79931e
Merge branch 'release' into develop
2017-07-08 01:49:25 +00:00
Sabe Jones
5055a57ae9
3.101.1
2017-07-08 01:48:50 +00:00
Keith Holliday
3fa0b72ffe
Added assumption when no time is supplied ( #8855 )
...
* Added assumption when no time is supplied
* Changed format of date
* Set now options when date is specified
2017-07-07 18:46:54 -07:00
Keith Holliday
b3f9fd09c6
Check for app loading instead of daily count ( #8856 )
2017-07-07 12:35:26 -07:00
Keith Holliday
30437e158e
Added check to prevent double cron ( #8854 )
...
* Added check to prevent double cron
* Added then and fix style issues
2017-07-07 11:14:36 -07:00
Keith Holliday
19ba1290f6
Added new web profile for checkout ( #8699 )
...
* Added new web profile for checkout
* Fixed es6 syntax
* Fixed config path
2017-07-06 15:16:54 -07:00
Grayson Gilmore
c509c8e04f
Test /api/v3/tasks/unlink-all and unlink-one ( #8810 )
...
* Add tests for POST /tasks/unlink-all/:challengeId
* Add test for keep=keep-all query
* Cleanup
* Setup
* Cleanup
* Add tests for unlink-one
2017-07-06 14:25:31 -07:00
Todd Medema
00d4393024
reduce top margins on task filter bar to reduce dead space below 'add multiple' link / make UI more space efficient ( #8806 )
2017-07-06 14:13:35 -07:00
yugensoft
c502b1997b
Updated new-groups / group-plans static page #8674 ( #8729 )
...
* dummy
* Renamed internationalized strings to more meaningful names
* moved the new group creation state out to its own URL, so it can also be linked to by the static/plans page
* Added redirect-through-login functionality from the static/plans page new-group button
This includes a static non-modal login page (similar to how other sites have both a login page and login modal)
The login body has been abstracted out from its modal-specific view into mixins to accomplish this
* deleted bak files added by mistake
* deleted scripts added by mistake
* changed static/plans Create Group button text
* Added form link (https://github.com/HabitRPG/habitica/issues/8674#issuecomment-303518039 )
Removed changes to non-EN locale files (https://github.com/HabitRPG/habitica/pull/8729#issuecomment-303555211 )
* reverted key name changes as per https://github.com/HabitRPG/habitica/pull/8729#issuecomment-304515534
* changed $rootScope to $scope
https://github.com/HabitRPG/habitica/pull/8729#discussion_r120695874
2017-07-06 14:08:02 -07:00
madpink
4435862ff2
Updating User API Doc (part 4) ( #8792 )
...
* Updating User API Doc (part 4)
* Fixed trailing space
2017-07-06 13:48:00 -07:00
Keith Holliday
e901850a6f
continuation of PR #8161 Display error notification when attempting to purchase invalid amount of gems - fixes #8145 ( #8688 )
...
* Translation string for error notification
* Use function instead of a link for paypal
* Inject notification service, function to check the amount of gems to purchase, function to handle payments with paypal
* Throw error if amount of gems is zero or negative
* Add condition to raise error if amount is negative
* Added gem errors for gifts 0 or less
* Fixed linting and broken test
* Fixed test syntax
* Added back needed strings
* Fixed group locales
2017-07-06 13:43:43 -07:00
LlamaLad
48bbc22fb4
Dailies new subheading and summary change ( #8799 )
...
* Dailies new subheading and summary change
* summary change
2017-07-06 13:31:13 -07:00
Alys
c1e5d8b573
add missing string for mountNowOwned error message ( #8843 )
2017-07-06 13:23:20 -07:00
Andrew Schultz
6951b79b95
two typos in questsContent ( #8837 )
2017-07-06 13:20:34 -07:00
Keith Holliday
1c3a12f37d
[WIP] Added initial tavern updates ( #8845 )
...
* Added initial tavern updates
* Translations and styles
* Fixed locales and lint
2017-07-06 09:38:52 -06:00
Keith Holliday
3c71748a1b
Renamed production docker file ( #8850 )
2017-07-05 13:29:25 -07:00
Sabe Jones
8e56222fc7
Merge branch 'release' into develop
2017-07-05 20:11:13 +00:00
Sabe Jones
ac3ac73737
3.101.0
2017-07-05 20:10:53 +00:00
Sabe Jones
8004c1e759
chore(i18n): update locales
2017-07-05 20:10:13 +00:00
SabreCat
d9e50e7632
Merge remote-tracking branch 'TheHollidayInn/yesterdailies-2' into release
2017-07-05 20:04:26 +00:00
SabreCat
4cd742c19a
feat(event): Summer Splashy Foam
2017-07-05 20:03:23 +00:00
Keith Holliday
6bc6c09c75
New client creator ( #8841 )
...
* Added initial creator
* Added initial styles and functionality for creator
* More style changes
* Translations and styles
* More active classes
* Removed extra locales
2017-07-04 13:11:08 -05:00
Sabe Jones
0cbf9354cc
Merge branch 'release' into develop
2017-07-03 23:05:52 +00:00
Sabe Jones
03ca65f2b8
3.100.0
2017-07-03 23:05:28 +00:00
Sabe Jones
ea74271484
chore(i18n): update locales
2017-07-03 23:04:47 +00:00
SabreCat
0897367538
chore(sprites): compile
2017-07-03 22:56:48 +00:00
SabreCat
2566fcecb7
feat(content): Backgrounds and Armoire 2017-07
2017-07-03 22:54:58 +00:00
Keith Holliday
c99863f339
Added yesterdaily field ( #8847 )
...
* Added yesterdaily field
* Added yesterdaily migration
* Added description
2017-07-03 13:55:53 -05:00
Keith Holliday
71d632f6f0
Merge remote-tracking branch 'upstream/release' into yesterdailies-3
2017-07-03 09:46:34 -05:00
Joe P
06c53677f6
Group Approvals Formatting - Fix #8677 ( #8784 )
...
* Add task indication to Group Plans Tasks Awaiting Approval page
* Render markdown tasks on Group Plans Tasks Awaiting Approval page
* Fix panel code- fixes formatting issue of Approve button on Group Plans Tasks Awaiting Approval page
2017-07-01 09:33:24 -07:00
Sabe Jones
aa91c5dbae
Kubernetes support for dev environments ( #8753 )
...
* Run Habitica in Kubernetes
* fix(docs): Address PR comments
2017-07-01 09:30:08 -07:00
Keith Holliday
5b7c7b77c8
Added docker production file ( #8846 )
...
* Added docker production file
* Added tag clone
* Removed docker prod
2017-07-01 09:28:51 -07:00
Vicente
d3d221dccb
Repeat monthly fix https://github.com/HabitRPG/habitica/issues/8831 ( #8835 )
...
* checking nexDueDate if it's an array before applying .map
* used array created
* change let for 'strict mode'
* Used ajax when canceling from the website (#8697 )
* Used ajax when canceling from the website
* Fixed grammar issue
* Payments gem reset (#8712 )
* Added gem reset if user does not have date last updated set
* Fixed login of adding updated date
* fix bug that prevented sending of emails to admin addresses (#8832 )
* feat(content): June 2017 subscriber items
* chore(sprites): compile
* chore(i18n): update locales
* 3.98.0
* [WIP] client/inventory/stable (#8737 )
* Stable: basic layout (based on equipment)
* extract item popover-content as component
# Conflicts:
# website/client/components/inventory/item.vue
* extract item-content as slot - list standard pets with image
* dynamic list petGroups in sidebar / content - with selected / open filter
* itemContentClass for pets
* fix filter - extract filter labels
* Filter: Hide Missing
* fix position of pets
* sort by: A-Z, Color, Hatchable
* refactor animalList - created the list once per type and cache it - sort now works before viewing one or all pets
* custom petItem to show the progress
* list specialPets - rename petGroup to animalGroup (more generic)
* equip a pet
* filter animals by input
* count pets
* list mounts
* hatchable pet popover
* hatchable pet popover #2
* PixelPaw Opacity for not owned and not hatchable pets - change item background for unowned pets
* Hold to hatch the pet - cleanup
* add food drawer + countBadge - special mounts - hide un-owned special animals - fixes
* Sliding Drawer: Buttons to scroll left/right
* Drag&Drop: food on pets
* fix hold to hatch - use mouseleave event
* 'Show All' / 'Show Less' - Animals
* Matts Image + Popover + use image width as sidebar width (removed col-2 / col-10)
* fixes: colors, v-once, drawer-errorMessage, strings
* drawerSlider - split items to pages / add divider / add first item of the next page - ResizeDirective
* ResizeDirective - throttle emits by `v-resize="value"` - fix drawer left padding
* show animals by available content width
* change sortBy button / label
* fix pet colors / backgrounds
* DragDropDirective - grabbing cursor
* remove browser specific prefixes
* fix lint issues
* show welcome dialog
* change translationkey (noFood, already exists)
* used array created
* change let for 'strict mode'
2017-07-01 09:25:04 -07:00
negue
53c610236b
Client/stable fixes - part 1 ( #8840 )
...
* fixes: show ten pets in a row - show pet / no feeding progress if mount already owned
* fixes: disabled filter instead of hiding them
* fixes: don't hide special pets - same item style for mounts
* fixes: avatar changes of pet / mount
* fixes: unfocus first dropdown-item by css
* fixes: unfocus first dropdown-item by css (remove :focus style)- added "What does my pet like to eat?" popover
2017-07-01 17:46:24 +02:00
Sabe Jones
548cc2ceb0
3.99.1
2017-06-30 21:05:16 +00:00
Sabe Jones
bf03ac8e44
chore(i18n): update locales
2017-06-30 20:59:13 +00:00
SabreCat
1853113aed
Merge branch 'develop' into release
2017-06-30 20:50:18 +00:00
SabreCat
1ce1ed7c6b
fix(test): allow for long months
2017-06-30 20:47:18 +00:00
Sabe Jones
c9f870a929
3.99.0
2017-06-29 21:34:53 +00:00
Sabe Jones
135df1dc48
chore(build): update Dockerfile
2017-06-29 21:34:39 +00:00
Sabe Jones
a240d9581f
chore(i18n): update locales
2017-06-29 21:30:15 +00:00
SabreCat
3cd591ed4f
chore(sprites): compile
2017-06-29 21:22:11 +00:00
SabreCat
87076ed07c
feat(content): Aqua Potions
2017-06-29 21:21:20 +00:00
Matteo Pagliazzi
33a39d3683
Client fixes ( #8844 )
...
* client: fix router when not authenticated, small fixes for tasks
* load the user only when necessary
* fix tests
2017-06-29 20:49:05 +02:00
Keith Holliday
e4f5950ffc
Added required field
2017-06-29 08:11:02 -06:00
Keith Holliday
f2d81a8d9c
Merge remote-tracking branch 'upstream/develop' into yesterdailies-3
2017-06-28 15:25:59 -06:00
Keith Holliday
43b6f71044
Fixed lint issue
2017-06-28 15:25:47 -06:00
Matteo Pagliazzi
06de1670b4
client: fix build and gradient
2017-06-28 10:53:35 +02:00
Keith Holliday
7fd2522e93
Merged in develop
2017-06-27 22:23:13 -06:00
Keith Holliday
acb4b79078
Added option for getting isDue field for specified date
2017-06-27 22:22:20 -06:00
Keith Holliday
8299982484
Ensured damage was only done for dailies that were due yesterday
2017-06-27 22:01:01 -06:00
Keith Holliday
207b1e91ca
Added regsiter page and styles ( #8836 )
...
* Added regsiter page and styles
* Added style updates
* Added login server connection and logout
* Added login
* Added social auth
* Moved image assests
* Added trasnlations
* Added social icons
* Removed duplicate
* Updated shrinkwrap
2017-06-27 21:53:59 -06:00
Keith Holliday
aee21edd5f
[WIP] Began adding tavern and party ( #8814 )
...
* Began adding tavern and party
* Fixed routing conflicts and tavern constant
* Updated button styles
* Added not on quest block
* Added no challenge block
* Began adding quest details
* Began updating group create modal to have party info
* Added create party modal
* Added share userid menu
* Began adding toggle
* Finished toggle styles
* Added start quest modal
* Ported over party ctrl code
* Finished porting over party ctrl code
* Added more quest actions
* Added own quests modal and quest modal details
* Fixed member modal styles and icons
* Added many random style updates
* Small text align fix
* Removed extra update
* Removed config and extra key
* Removed client string extras
2017-06-27 14:02:55 -06:00
Sabe Jones
6e1bbd05bc
Merge branch 'release' into develop
2017-06-27 17:43:13 +00:00
Sabe Jones
763c2c28ea
3.98.1
2017-06-27 17:42:52 +00:00
Sabe Jones
7aa9ba45f6
chore(i18n): update locales
2017-06-27 17:39:08 +00:00
Sabe Jones
d67398fba6
chore(news): Guild Spotlight Bailey
2017-06-27 17:33:54 +00:00
Matteo Pagliazzi
6fb4c1b576
Client Tasks v1 ( #8823 )
...
* remove unused elements from tasks page
* remove components
* client: tasks: wip
* tasks: order, start styling them
* more tasks works
* habits controls
* more work
* tasks icons
* split columns in their own component
* implement tags for tasks
* wip
* add columns description
2017-06-26 23:55:14 +02:00
Alys
7c5bd526b1
minor text fixes: accurate flavour text for Golden Knight testimonies collection quest, etc ( #8826 )
...
* make comment more accurate: members are removed, not banned
They can rejoin with an invitation in a private group or at any time in a public group.
* change windows line breaks to unix line breaks
* change flavour text of Golden Knight collection quest to reduce number of testimonies
* fix grammatical error noticed by mandyzhou
* improve message about not being able to send PMs because we often see people report it as a bug
* update instructions for cancelling Google subscriptions (thanks to Scea for noticing)
* change Delete Completed on-hover message - fixes #8598
* correct the Orb of Rebirth's text about pets and mounts (they are not locked)
2017-06-26 22:35:29 +01:00
negue
187a9f5f19
[WIP] client/inventory/stable ( #8737 )
...
* Stable: basic layout (based on equipment)
* extract item popover-content as component
# Conflicts:
# website/client/components/inventory/item.vue
* extract item-content as slot - list standard pets with image
* dynamic list petGroups in sidebar / content - with selected / open filter
* itemContentClass for pets
* fix filter - extract filter labels
* Filter: Hide Missing
* fix position of pets
* sort by: A-Z, Color, Hatchable
* refactor animalList - created the list once per type and cache it - sort now works before viewing one or all pets
* custom petItem to show the progress
* list specialPets - rename petGroup to animalGroup (more generic)
* equip a pet
* filter animals by input
* count pets
* list mounts
* hatchable pet popover
* hatchable pet popover #2
* PixelPaw Opacity for not owned and not hatchable pets - change item background for unowned pets
* Hold to hatch the pet - cleanup
* add food drawer + countBadge - special mounts - hide un-owned special animals - fixes
* Sliding Drawer: Buttons to scroll left/right
* Drag&Drop: food on pets
* fix hold to hatch - use mouseleave event
* 'Show All' / 'Show Less' - Animals
* Matts Image + Popover + use image width as sidebar width (removed col-2 / col-10)
* fixes: colors, v-once, drawer-errorMessage, strings
* drawerSlider - split items to pages / add divider / add first item of the next page - ResizeDirective
* ResizeDirective - throttle emits by `v-resize="value"` - fix drawer left padding
* show animals by available content width
* change sortBy button / label
* fix pet colors / backgrounds
* DragDropDirective - grabbing cursor
* remove browser specific prefixes
* fix lint issues
* show welcome dialog
* change translationkey (noFood, already exists)
2017-06-23 13:24:10 +02:00
Sabe Jones
7954763738
Merge branch 'release' into develop
2017-06-22 23:05:23 +00:00
Sabe Jones
d062fd8507
3.98.0
2017-06-22 23:04:42 +00:00
Sabe Jones
ceb10137a2
chore(i18n): update locales
2017-06-22 23:04:09 +00:00
SabreCat
58330a4d01
chore(sprites): compile
2017-06-22 22:55:36 +00:00
SabreCat
678f48fde9
feat(content): June 2017 subscriber items
2017-06-22 22:54:17 +00:00
Alys
a642d94443
fix bug that prevented sending of emails to admin addresses ( #8832 )
2017-06-22 14:33:27 -07:00
Keith Holliday
39a112b605
Payments gem reset ( #8712 )
...
* Added gem reset if user does not have date last updated set
* Fixed login of adding updated date
2017-06-22 14:21:09 -07:00
Keith Holliday
8c8f0ea201
Used ajax when canceling from the website ( #8697 )
...
* Used ajax when canceling from the website
* Fixed grammar issue
2017-06-22 14:13:53 -07:00
Keith Holliday
ca8541e8c4
Added needsCron field
2017-06-21 13:28:12 -06:00
Sabe Jones
773d546e4f
Merge branch 'release' into develop
2017-06-21 04:01:33 +00:00
Sabe Jones
f269d381da
3.97.2
2017-06-21 04:00:53 +00:00
Sabe Jones
3483f69559
fix(sprites): realign healer fins
2017-06-21 03:59:51 +00:00
Sabe Jones
9ada0c9b02
Merge branch 'release' into develop
2017-06-21 01:52:36 +00:00
Sabe Jones
8bbe9ac36e
3.97.1
2017-06-21 01:52:08 +00:00
Sabe Jones
75b93e6ec4
fix(sprites): unbleach Matt
2017-06-21 01:51:50 +00:00
Sabe Jones
bd9bebe591
Merge branch 'release' into develop
2017-06-21 01:26:18 +00:00
Sabe Jones
f7b298d506
3.97.0
2017-06-21 01:25:54 +00:00
Sabe Jones
4bd2932955
chore(i18n): update locales
2017-06-20 22:18:38 +00:00
SabreCat
7060f5941d
chore(sprites): compile
2017-06-20 22:10:04 +00:00
SabreCat
21379ee357
feat(event): Summer Splash 2017
2017-06-20 22:08:38 +00:00
Keith Holliday
fe62713809
Added migration to go from prod to test db ( #8816 )
2017-06-20 06:17:10 -06:00
Sabe Jones
ca7272a987
Merge branch 'release' into develop
2017-06-19 22:44:02 +00:00
Sabe Jones
cb46cd8eeb
3.96.2
2017-06-19 22:43:34 +00:00
Sabe Jones
d9d02ca81d
chore(i18n): update locales
2017-06-19 22:43:18 +00:00
Sabe Jones
50c216eb41
chore(news): Bailey announcement
2017-06-19 22:38:06 +00:00
SabreCat
2c60fade01
Merge branch 'release' into develop
2017-06-17 20:20:52 +00:00
SabreCat
6bdf8fdabc
3.96.1
2017-06-17 20:19:35 +00:00
SabreCat
3db304b6bf
fix(potions): disable Florals
...
Also add sprite for Bars of Soap in Attack of the Mundane 1
2017-06-17 20:18:36 +00:00
Matteo Pagliazzi
ea2788ab2f
fix gulp in production
2017-06-17 19:02:03 +02:00
Sabe Jones
5e111f6f6c
Merge branch 'release' into develop
2017-06-16 20:42:52 +00:00
Sabe Jones
ea85a8a3a8
3.96.0
2017-06-16 20:42:15 +00:00
Sabe Jones
e811a2700e
feat(migration): update achievements ( #8825 )
2017-06-16 13:41:25 -07:00
Keith Holliday
136dcd27a9
Prevented modal close and showed correct due class in modal
2017-06-16 12:28:42 -06:00
Sabe Jones
bf76f823d5
chore(i18n): update locales
2017-06-16 17:43:26 +00:00
Sabe Jones
83b573dcfc
chore(i18n): update locales
2017-06-16 17:42:28 +00:00
Matteo Pagliazzi
c4fa9426b3
Client Tasks v1 / Bootstrap configurable ( #8822 )
...
* make bs4 configurable, change gutters to match zeplin\s
* correctly customize gutters
2017-06-16 18:58:34 +02:00
Matteo Pagliazzi
042e5a8d63
Client Fixes ( #8821 )
...
* new client: fix animation flickering
* fix transitions
* update copy
2017-06-16 18:07:24 +02:00
Keith Holliday
7a8857010e
Resized tasks, filter completed, add cron for non yesterdailies
2017-06-16 09:01:23 -06:00
Keith Holliday
a52bd66871
Fixed strings, yesterdaily filtering and cron check
2017-06-15 10:13:33 -06:00
Keith Holliday
f7ce269f3c
Add false return when repeats are empty ( #8777 )
...
* Add false return when repeats are empty
* Added front end check for repeats on monthly-daysOfWeek
* Fixed tests with static date
2017-06-14 11:27:50 -07:00
Sabe Jones
c084f8a2b9
Merge branch 'release' into develop
2017-06-13 21:25:41 +00:00
Sabe Jones
c1c42e17b8
3.95.0
2017-06-13 21:21:55 +00:00
Sabe Jones
306a782e7a
chore(i18n): update locales
2017-06-13 21:20:48 +00:00
SabreCat
20178c0722
chore(sprites): compile
2017-06-13 21:10:02 +00:00
SabreCat
256e2e809c
feat(content): Nudibranch Pets
2017-06-13 21:09:13 +00:00
Matteo Pagliazzi
592345e22c
Party members in header v2 ( #8815 )
...
* update comemnt
* flyout on hover
* fix hasClass and isBuffed
* polish members in party header
2017-06-13 20:55:45 +02:00
Keith Holliday
f738f550e7
Updated copy
2017-06-12 07:01:14 -06:00
Keith Holliday
495bc9aa50
Removed let from angular
2017-06-11 22:55:35 -06:00
Matteo Pagliazzi
292b2acb1e
client: fix production path for chunks
2017-06-08 19:17:35 -07:00
Matteo Pagliazzi
977f9d5174
Client: party members in header ( #8804 )
...
* wip party members in header
* wip
* add inbox routes back
* polishing
2017-06-08 18:24:40 -07:00
Keith Holliday
36fa3ab06f
Added cron check
2017-06-08 17:10:22 -07:00
Keith Holliday
7422d020b1
Ported over UI code
2017-06-08 16:03:20 -07:00
Keith Holliday
5d0fe0aac3
Added yesterdailiy to model
2017-06-08 15:37:36 -07:00
Matteo Pagliazzi
85644fdc1b
client: user -list-detail -> member-details
2017-06-08 14:36:56 -07:00
Matteo Pagliazzi
138b5c4bdb
wip client/header-party-members ( #8803 )
2017-06-08 14:33:23 -07:00
Keith Holliday
52edb8a8da
New client members ( #8795 )
...
* Began styling member modal
* Added store and updated modal styles
* Began converting angular
* Ported over angular routes
* Fixed lint issues
2017-06-08 14:27:22 -07:00
Keith Holliday
60de7c8f21
Added cron route
2017-06-08 14:07:33 -07:00
Keith Holliday
137636cb40
Removed cron from every route
2017-06-08 14:03:30 -07:00
Keith Holliday
1999e1098e
Allow guilds edit ( #8800 )
...
* test: test that admin users can update guilds
* test: test admin removeMember privileges
* fix: allow admins to edit guilds
* fix: add edit guild options for admins
* test: test that admin can't remove current leader
* Add error msg for removing current leader
* Taskwoods Quest Line (#8156 )
* feat(content): Gold Quest 2016-10
* chore(news): Bailey
* chore(i18n): update locales
* chore(sprites): compile
* 3.49.0
* chore: update express
* Fix for the ReDOS vulnerability
habitica is currently affected by the high-severity [ReDOS vulnerability](https://snyk.io/vuln/npm:tough-cookie:20160722 ).
Vulnerable module: `tough-cookie`
Introduced through: ` request`
This PR fixes the ReDOS vulnerability by upgrading ` request` to version 2.74.0
Check out the [Snyk test report](https://snyk.io/test/github/HabitRPG/habitica ) to review other vulnerabilities that affect this repo.
[Watch the repo](https://snyk.io/add ) to
* get alerts if newly disclosed vulnerabilities affect this repo in the future.
* generate pull requests with the fixes you want, or let us do the work: when a newly disclosed vulnerability affects you, we'll submit a fix to you right away.
Stay secure,
The Snyk team
* Documentation - coupon
closes #8109
* fix(client): Allow member hp to be clickable
fixes #8016
closes #8155
* chore(npm): shrinkwrap
* test: test isAbleToEditGroup
* Add isAbleToEditGroup to groupsCtrl
* Remove unnecessary ternary
* Fix linting
* Move edit permission logic out to groupsCtrl
* fix: change ternary to boolean
* Fix linting
* Fixed merge issues
2017-06-08 13:45:24 -07:00
Keith Holliday
4d3a0c0571
Fixed issue with repeat settings turning false ( #8773 )
2017-06-08 12:18:49 -07:00
Matteo Pagliazzi
706de95458
Client: Header & Menu & Icons ( #8770 )
...
* header revamp - wip
* fix webpack fonts
* wip icons
* fix compilation errors
* implement icons loading without iconmoo
* new svg implementation
* wip
* fix issues with svgs
* fix issues with svgs
* fix bits svg
* fix displaying of pet in avatar
* avatar class icon
* no party header
* update navigation
* split code by route
* round gems and gp
* add string for faqs
* fix icons in css
2017-06-08 12:04:19 -07:00
Vince Campanale
e3c1eaa9d2
Preventing cardRead from notifying user. ( #8473 )
...
* added condition to prevent readCard operations from sending a notification
* created constant array to contain opNames for notifications we want to suppress and adjusted condition to accordingly
* replaced const with var to past karma test
2017-06-08 11:59:37 -07:00
Keith Holliday
17c0f795cc
Began styling member modal
2017-06-08 11:03:06 -07:00
Sabe Jones
cb5ac9014e
Include apidoc in test script ( #8797 )
...
* test(docs): include apidoc in script
* fix(test): also run apidoc on Travis
2017-06-08 10:40:10 -07:00
joe-salomon
0be681b7a2
Dailies performance fix - fixes #8756 ( #8767 )
...
* Changed recurring logic to not use moment-recur plugin for performance reasons
* change only nextDue calculations
add tests to make sure proper nextDue values are calculated
revert schedule.matches logic to original
revert shouldDo.test.js to original
* fix monthly nextDue logic
move tests to shouldDo.test.js
* typos
* revert to original logic. change not needed
* add failure cases
2017-06-08 10:34:05 -07:00
Sabe Jones
5360f9e587
Align doubled achievement popovers ( #8798 )
...
* bug(profile): align both achievement popups (hover vs. click)
* refactor(style): move to CSS/Stylus
2017-06-07 21:05:24 -07:00
Keith Holliday
4553a411f6
Paypal ipn options ( #8713 )
...
* Added more acceptable ipn cancelation options
* Fixed lint issue
* Fixed spelling issue
2017-06-07 10:31:44 -07:00
Alys
613f51b08d
use new email template when joining a group plan for customisation of subscription cancellation information ( #8637 )
...
* use new email template when subscription is cancelled from joining a group plan
* use new email template when subscription is cancelled from joining a group plan - needs more code, tests
* change from sending new email as a cancel-subscription option to sending as a group plan join email
Uses a new group-member-join email template instead of old group-member-joining because new template includes mandril conditional merge tags.
Also adds tests and comments. Edits some comments for accuracy and typo fixes.
* adapt group-member-join email template for manual cancel message for iOS and Android subscriptions
* save test user so its profile name can be read by calls to sendTxn
* add documentation for the user model cancelSubscription function
* add constants for strings passed to mandrill email templates
2017-06-07 10:25:37 -07:00
joe-salomon
2292ba2694
Fix subscriptions ending early - fixes #8600 ( #8746 )
...
* Use “now” for calculation of the subscription end date instead of plan.dateUpdated
* add test to show previously incorrect logic does not affect sub end date.
2017-06-07 10:16:55 -07:00
joe-salomon
befacca457
Keep existing Mystery Items and Hourglasses when adding to group - fixes 8643 ( #8745 )
...
* Modified addSubToGroupUser to save existing mysteryItems and trinkets from an expired subscription
Added unit test
* fix eslint error
2017-06-07 09:59:09 -07:00
Airu
5cd30b430d
Added Arashi's theme as a new audio theme ( #8707 )
...
* Add existing file
* Update menu.jade
2017-06-07 09:53:11 -07:00
Kevin Smith
c5d9ee1e0a
Implemented new Achievement and Badge: Joined a Challenge ( Fixes #8613 ) ( #8761 )
...
* Added image
* Added new achievement to user schema
* Added new achievement to content
* Added new achievement to libs
* Added achievement text to locale
* Added achievement to notification model and controller
* Grant achievement on joining or creating first challenge
* Added achievement to modal template
* Compiled new sprites
* Added integration tests
* Fix linting error
2017-06-07 09:43:16 -07:00
Sabe Jones
234328f2ba
Reduce difficulty of collection quests ( #8754 )
...
* create script to insert message into party chat because collection quest is now easier
See https://github.com/HabitRPG/habitrpg/pull/7987 for more details.
* fix(quests): make collection less burdensome
* refactor(migration): return groups directly
2017-06-06 20:14:26 -07:00
SabreCat
029afa197e
fix(achievements): move year-round cards out of seasonal
2017-06-07 02:41:13 +00:00
SabreCat
05b35c5147
fix(manifest): remove deleted files from manifest
2017-06-07 02:11:47 +00:00
MathWhiz
c9427ad34c
New cards — Congratulations, Get Well ( #8655 )
...
* Add card and achievement sprite for Congrats card
* Add data regarding Congrats card
* Add Get Well card
* Add Get Well images
* Add schema
* Remove `if (!target.flags) target.flags = {};` code from cards
* Remove white backgrounds for congrats sprites
* add inital tests for cards
* Fix card tests
* Fix invalid urls in tests
* Update POST-user_class_cast_spellId.test.js
* Update POST-user_class_cast_spellId.test.js
* Update POST-user_class_cast_spellId.test.js
* Update congrats card sprite
* Fix card logic
* Fix user schema
* Change achievement values for new cards to Number
* Resize congrats and getwell cards
This will make them be sized properly
* Separate Market from Drops
* Extract cards to new section
* fix(sprites): revert spritesheet changes
* Add flags if target does not have them
2017-06-06 19:04:54 -07:00
madpink
d6c62262f1
Updating User API Doc (part 3) ( #8720 )
...
* Updating User API Doc (part 3)
* Updating User API Doc (part 3)
Fixed trailing spaces
* Updating User API Doc (part 3)
Made changes to @apiParamExample to make multi-line (which may have been cause of apiDoc failing)
* Updated quests to add questKey
2017-06-06 18:57:17 -07:00
MathWhiz
ec1d378504
Flagged chat messages are visible to the users that posted them ( #8726 )
...
* Allow users to see their chat messages that are hidden to others
* Fix lint
* Fix failing api test
* Add test
2017-06-06 18:55:12 -07:00
beatscribe
3bb88f450a
New Beatscribe 8-bit sound theme ( #8727 )
2017-06-06 18:53:10 -07:00
Rick Kasten
97a38e68c5
Clean up references to repo as HabitRPG/habitrpg ( #8742 )
...
* Confirmed changes
* Removed bad link
This was apparantly missed in #8051
* Confirmed changes
* Fixed links to milestones
2017-06-06 18:51:54 -07:00
Alys
be948a1bf2
adjust postinstall command so that it works in Windows as well as *nix ( #8744 )
...
Semicolons in postinstall commands don't work in Windows.
'&&' works in *nix and in at least some versions of Windows.
This changes the meaning of the postinstall line slightly because
now the later commands won't run if the earlier ones failed but I
don't see that being a problem.
2017-06-06 18:49:31 -07:00
Sabe Jones
018976a723
Disallow interactions by blocked users; new "get objections" Members API route ( #8755 )
...
* Make flags.chatRevoked prevent sending private messages (issue #7971 )
* Disallow sending gems when messages aren't allowed.
* Created function to check for objections to an interaction to user model and wired it into the API (issue #7971 )
* Fixes for issues raised by reviewers.
* Added allowed values to apidoc for api.getObjectionsToInteraction.
* Refactoring of getObjectionsToInteraction and minor API changes.
* fix(objections): address PR comments
* fix(strings): use US English for base edits
* refactor(test): typos and phrasing
2017-06-06 18:49:05 -07:00
Grayson Gilmore
00e5896ac6
Add test for GET /shops/backgrounds ( #8771 )
2017-06-06 18:45:41 -07:00
Kevin Smith
36bc693545
Turtleheads ( Fixes #8560 ) ( #8776 )
...
* Added new turtle head icons
* Recompiled spritesheets
2017-06-06 18:43:19 -07:00
Atte Kortesmaa
f27706cb4b
Improved API documentation for hall #8087 ( #8536 )
...
* Improved API documentation for hall
* Fixes typos, removes apiHeader definitions and curl example
* Fixes @apiParam and capitalization errors. Moves @apiDefines to website/server/api-doc.js
2017-06-06 11:48:11 -07:00
MathWhiz
f6f99ec57e
Require Dailies to have a Start Date ( #8649 )
...
* Require Dailies to have a Start Date
* Add preliminary test
* Fix lint errors
2017-06-06 10:05:17 -07:00
MathWhiz
c852d9d581
Add new favicon ( #8732 )
...
* Add new favicon
* Update 192x192 favicon image
2017-06-05 22:55:44 -07:00
Sabe Jones
4a78514308
3.94.1
2017-06-04 23:41:14 +00:00
Sabe Jones
265b48752d
Merge branch 'develop' into release
2017-06-04 23:40:26 +00:00
Sabe Jones
db0b0d6b6d
fix(migrations): return to generic state
2017-06-04 02:59:49 +00:00
Sabe Jones
20f1087552
fix(migrations): return to generic state
2017-06-04 02:58:42 +00:00
Keith Holliday
2e9bc2c31c
New client guilds ( #8736 )
...
* add colors palette
* add secondary menu component and style it
* add box shadow to secondary menu
* misc css, fixes for secondary menu
* client: add equipment page with grouping, css: add some styles
* add typography
* more equipment
* stable: fix linting
* equipment: add styles (lots of general styles too)
* remove duplicate google fonts loading
* add dropdowns
* design: white search input background, remove gray from items
* start adding drawer and selected indicator
* wip equipment
* fix equipment
* equipment: correctly bind new properties on items.gear.equipped
* equipment: fix vue binding. version 2
* equipment: fix vue binding. version 3
* back to first fix for equip op, fix for sourcemaps, send http request when an item is equipped, load bootstrap-vue components where needed
* checkboxes and radio buttons
* correctly renders selected items in first postion during the first render
* add search
* general changes, constants part of app state, add popovers
* add toggle switch, rename css
* correct offset
* upgrade deps
* upgrade deps
* drawer and lot of other work
* update equipping mechanism
* finish equipment
* fix compilation and upgrade deps
* use v-show in place of v-if to fix ui issues
* v-show -> v-if
* Start of guild syyles
* fix linting in test/client
* fix es6 compilation in test/client
* fix babel compilation for tests
* fix groupsUtilities mixin tests
* More designs
* Added public guild state
* Added my guilds store
* client: buttons
* client: buttons: fix colors
* Added join and leave
* Began adding new guild form
* Create form updates
* Added search to local data
* Added filtering
* Added initial code for group create
* Added more create checks
* Added more guild routes
* Added styles to guild page
* Added more chat styles
* Began porting over angular functions
* Moved over group service functions
* Added paging
* Updated sidebar
* Updated join/leave and minor text
* Added new sidebar functions
* Updated paging
* Added some form updates
* Added more translations and styles
* Updated shrinkwrap
* Removed features config
* Lint cleanup
* Added member modal
* Added more member actions
* Updated nav
* Fixed filter toggling
* Updated create guild
* Added no guild page
* Added sort select
* Added more styles
* Added update guild form
* Removed extra css and other minor changes
* Many css and syntax fixes
* Fixed color and merge conflic
* Removed paging from my guilds
* Removed extra strings
* Many requests updates
* Small style fixes
2017-06-02 14:55:02 -06:00
SabreCat
b606dd1c40
fix(strings): remove extraneous title text
2017-06-02 16:19:42 +00:00
SabreCat
db1c2fd5a2
fix(shops): don't push if empty
...
Also corrects text on hatching potions
2017-06-02 15:28:28 +00:00
Sabe Jones
de1e477ce2
Merge branch 'release' into develop
2017-06-02 00:49:00 +00:00
Sabe Jones
67318177a2
3.94.0
2017-06-01 23:18:07 +00:00
Sabe Jones
cd1be828ca
chore(i18n): update locales
2017-06-01 23:17:32 +00:00
SabreCat
9ffebc10a7
chore(sprites): compile
2017-06-01 23:09:05 +00:00
SabreCat
5cd11ed343
feat(content): Armoire and BGs
2017-06-01 23:08:00 +00:00
SabreCat
9de118f0d9
Merge branch 'release' into develop
2017-05-30 21:00:53 +00:00
SabreCat
5fbec4069e
3.93.2
2017-05-30 20:59:24 +00:00
SabreCat
a0f10cbf4b
Merge branch 'THI/sleep-dailies-fix' into release
2017-05-30 20:58:33 +00:00
Keith Holliday
0e069e78d5
Set isDue and NextDue during sleep ( #8769 )
2017-05-30 15:57:38 -05:00
SabreCat
dea847ba1a
chore(news): Bailey
2017-05-30 20:11:21 +00:00
Sabe Jones
46ed1813c6
Optional feedback on account deletion ( #8750 )
...
* Fixed rebase.
* Removed commented out mail sending to pass linting. Styles from settings.styl still not propagating to app.css
* fix(feedback): address PR comments
* fix(style): linting errors
2017-05-30 11:54:42 -05:00
Keith Holliday
e9750353a7
Set isDue and NextDue during sleep
2017-05-30 09:12:09 -06:00
Sabe Jones
05ea2c1ce6
Merge branch 'release' into develop
2017-05-29 01:11:00 +00:00
Sabe Jones
74d1c7763e
3.93.1
2017-05-29 01:08:31 +00:00
Keith Holliday
6f034bb5dd
Fixed issue when repeat object is malformed ( #8765 )
...
* Fixed issue when repeat object is malformed
* Removed only
* Changed numeric check to lodash isFinite
* Removed newer lodash function
2017-05-28 20:07:29 -05:00
Alys
aeb8d4f500
fix typo in mageText: Habit > Habitica (thanks to Janmetdepet for finding it) ( #8748 )
2017-05-27 18:56:10 +10:00
Keith Holliday
58d910fe62
Added fix for double click on amazon pay ( #8708 )
2017-05-25 16:10:59 -05:00
SabreCat
71f2f31606
Merge branch 'release' into develop
2017-05-25 02:51:10 +00:00
SabreCat
feae40cf0a
3.93.0
2017-05-25 01:00:21 +00:00
SabreCat
0d3fe53155
chore(news): Bailey
2017-05-25 00:59:37 +00:00
SabreCat
c3a3c1514a
Merge branch 'monthlies' into release
2017-05-25 00:50:19 +00:00
Keith Holliday
cc532fa993
Enabled repeatables ( #8572 )
...
* Enabled repeatables
* Added every x to weekly
* Updated new recur logic to work with tests
* Added repeatable tests back
* Added custom day start support
* Moved back to zone function
* Added zone back
* Added nextDue field
* Abstracted set next due logic, set offset, and mapped to ISO
* Removed extra codes
* Removed clone deep
* Added summary local
* Fixed every x weekly
* Prevented edit of repeats on
* Added next due date
* Fixed display of next due dates
* Fixed broken tests
* added next due date as today for weekly
* Fixed integration tests
* Updated common test
* Use user's format
* Allow user to deselect all days during week
* Removed let from front end
2017-05-24 19:49:33 -05:00
Kevin Smith
ba66a1c098
Removed cancel sub button and added info for apple/google subs ( Fixes #8642 ) ( #8666 )
...
* Removed cancel sub button and added info for apple/google subs
* Refactored logic and constants from subscriptions view
2017-05-24 10:13:44 -06:00
Josh Holland
b4d5c634b3
Close dropdowns when user clicks outside of them ( fixes #5490 ) ( #8657 )
...
* Close dropdowns when user clicks outside of them
Fixes #5490
* Remove expandMenu and closeMenu directives and tests
* Remove unnecessary HTML attributes
2017-05-24 10:12:38 -06:00
Sabe Jones
216006beab
Merge branch 'release' into develop
2017-05-23 22:16:32 +00:00
Sabe Jones
7c236e7e0e
3.92.0
2017-05-23 22:15:40 +00:00
Sabe Jones
0221d2d7f9
chore(i18n): update locales
2017-05-23 22:12:33 +00:00
SabreCat
567eb1d98b
chore(sprites): compile
2017-05-23 22:04:26 +00:00
SabreCat
3cf533f261
feat(content): new Mystery Items
...
and reenable Floral Potions
2017-05-23 22:03:31 +00:00
taldin
c30c51f386
Fixes apidoc error with Cast Skill ( #8709 )
...
* Fixes apidoc error with Cast Skill
Changes Body to Query, changed example from POST body
* Updated to remove trailing space
* Wording fix per Lady Alys
* Update user.js
Kicking off another test.
* Update user.js
2017-05-23 14:06:58 -06:00
Céline O'Neil
2de794c32b
Show task alias advanced option for Rewards ( #8705 )
2017-05-23 13:58:38 -06:00
Keith Holliday
7d000d2cf6
Removed let from front end
2017-05-23 08:56:36 -06:00
Keith Holliday
280b720c13
Allow user to deselect all days during week
2017-05-22 08:37:45 -06:00
Matteo Pagliazzi
9e1f7f3811
Client/Inventory/Items ( #8734 )
...
* client: start working on Inventory/Items
* i18n changes and fixes
* initial displaying of eggs, food and potions + sorting
* add missing files
* remove comment
* show food, eggs and potions
* add label to dropdowns acting as select menus
* popovers
* move badge to slot and component if necessary, general refactor
* fix quantity ordering
* some special items, reorganize
2017-05-22 16:30:52 +02:00
Keith Holliday
fefaed368a
Use user's format
2017-05-22 08:16:12 -06:00
Keith Holliday
6f370395ea
Updated common test
2017-05-22 08:06:14 -06:00
Keith Holliday
65566f7607
Fixed integration tests
2017-05-22 07:54:07 -06:00
Keith Holliday
c0117706e4
Merge remote-tracking branch 'upstream/develop' into enable-repeatables
2017-05-22 07:49:01 -06:00
Matteo Pagliazzi
f267456a30
client: fix drawer
2017-05-21 15:38:33 +02:00
Matteo Pagliazzi
228b724d52
fix missing trailing comma
2017-05-21 14:43:25 +02:00
Keith Holliday
19b09b4894
Merged in develop
2017-05-20 19:24:25 -06:00
Keith Holliday
f49d21d7b4
added next due date as today for weekly
2017-05-20 18:38:53 -06:00
Keith Holliday
c08c0685f3
Fixed broken tests
2017-05-20 17:19:35 -06:00
negue
59bfe66c94
Client/item content ( #8738 )
...
* extract item popover-content as component
# Conflicts:
# website/client/components/inventory/item.vue
* extract item-content as slot
* scoped context to pass the item
* itemContentClass instead of itemContent-slot
2017-05-20 19:59:45 +02:00
SabreCat
023fd6e6b0
3.91.2
2017-05-19 20:51:10 +00:00
SabreCat
7ee2f90f37
fix(docs): move apiParamExamples to newlines
2017-05-19 20:49:59 +00:00
SabreCat
46709ddadd
3.91.1
2017-05-19 20:22:06 +00:00
SabreCat
a3ee09e764
chore(event): disable Fairy Potions
2017-05-19 20:17:51 +00:00
Sabe Jones
4127f36c02
chore(i18n): update locales
2017-05-19 20:16:18 +00:00
SabreCat
dad924ac7d
chore(sprites): compile
2017-05-19 20:05:55 +00:00
Sabe Jones
547c87dee7
Guild A/B test and Achievement ( #8740 )
...
* WIP(guilds): AB test pester modal
* WIP(AB-test): guild pester cont'd
* fix(style): linting error
* fix(AB-test): markModified and notif enum
* fix(tests): update AB expectations
* fix(modal): remove extra includes
* feat(achievements): add Joined Guild cheevo
Also removes unused achievement sprites, and properly saves counter used in A/B testing
* fix(style): linting error from conflict
2017-05-19 14:45:11 -05:00
Keith Holliday
99a2013767
Fixed display of next due dates
2017-05-18 14:12:36 -06:00
Keith Holliday
a5e0e171cc
Added next due date
2017-05-18 10:42:11 -06:00
Keith Holliday
1d93943458
Prevented edit of repeats on
2017-05-18 10:26:57 -06:00
Keith Holliday
7f2719a75c
Fixed every x weekly
2017-05-18 10:11:29 -06:00
Sabe Jones
8a9ed04f5e
Merge branch 'release' into develop
2017-05-18 02:13:14 +00:00
Sabe Jones
4e66c038a6
3.91.0
2017-05-18 02:11:56 +00:00
Sabe Jones
bd9618e1c6
chore(i18n): update locales
2017-05-18 02:08:40 +00:00
SabreCat
342034a80d
chore(sprites): compile
2017-05-18 01:59:44 +00:00
SabreCat
f2aed3cb27
chore(news): Bailey
...
Also rolls back a leftover bit of the Spring Fling.
2017-05-18 01:58:37 +00:00
SabreCat
4f5f15d162
fix(test): account for cumulative balance
2017-05-18 01:44:07 +00:00
SabreCat
b5c1b78789
docs(content): comment bundle structure
2017-05-18 01:44:07 +00:00
SabreCat
f2ace5bb63
test(bundles): check balance deduction
2017-05-18 01:44:07 +00:00
SabreCat
72b8ba2d5c
fix(test): remove only
2017-05-18 01:44:07 +00:00
SabreCat
8555e4bea8
test(bundles): shop and purchase tests
2017-05-18 01:44:07 +00:00
SabreCat
4de5b4253b
fix(style): address linting errors
2017-05-18 01:44:07 +00:00
SabreCat
410004f8c6
feat(purchases): sell bundled quests
2017-05-18 01:44:07 +00:00
SabreCat
76c7e15497
refactor(content): split quests file
2017-05-18 01:44:06 +00:00
Sabe Jones
e6f605f23a
Discount Bundled Quests ( #8731 )
...
* refactor(content): split quests file
* feat(purchases): sell bundled quests
* fix(style): address linting errors
* test(bundles): shop and purchase tests
* fix(test): remove only
* test(bundles): check balance deduction
* docs(content): comment bundle structure
* fix(test): account for cumulative balance
2017-05-17 20:36:34 -05:00
Matteo Pagliazzi
0af1203832
Client Redesign: Inventory pages, secondary menu, misc css and design items ( #8631 )
...
* add colors palette
* add secondary menu component and style it
* add box shadow to secondary menu
* misc css, fixes for secondary menu
* client: add equipment page with grouping, css: add some styles
* add typography
* more equipment
* stable: fix linting
* equipment: add styles (lots of general styles too)
* remove duplicate google fonts loading
* add dropdowns
* design: white search input background, remove gray from items
* start adding drawer and selected indicator
* wip equipment
* fix equipment
* equipment: correctly bind new properties on items.gear.equipped
* equipment: fix vue binding. version 2
* equipment: fix vue binding. version 3
* back to first fix for equip op, fix for sourcemaps, send http request when an item is equipped, load bootstrap-vue components where needed
* checkboxes and radio buttons
* correctly renders selected items in first postion during the first render
* add search
* general changes, constants part of app state, add popovers
* add toggle switch, rename css
* correct offset
* upgrade deps
* upgrade deps
* drawer and lot of other work
* update equipping mechanism
* finish equipment
* fix compilation and upgrade deps
* use v-show in place of v-if to fix ui issues
* v-show -> v-if
* fix linting in test/client
* fix es6 compilation in test/client
* fix babel compilation for tests
* fix groupsUtilities mixin tests
* client: buttons
* client: buttons: fix colors
* client: finish buttons and dropdowns
* upgrade bootstrap-vue, finish buttons and dropdowns
* fix tasks page layout
* misc fixes for buttons
* add textareas
* fix app menu
* add inputs
* fixes for toggleSwitch
* typography
* checkboxes and radio buttons
* add checkbox icon
* fix equip.js
* extract strings to newClient.json
* add Popover above 'Use Costume' / 'Auto Equip' slider - disable item select if costume-mode and 'useCostume' isn't active
* show "you have disabled your costume" error above the drawer items
* check errorMessage for null
* hide star if costume not enabled
* fix errorMessage (!errorMessage seems not to work for string)
* show minimize / expand icon - always centered by css
* drawer test
* drawer: fix centering on large screens
* fix show more button
* add margin when two dropdowns are next to each other
* adjust the page padding based on the drawer, misc fixes
* drawer fixes
2017-05-16 21:09:55 +02:00
Alys
1de379a2c3
adjust banned words. TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2017-05-16 13:08:09 +10:00
Keith Holliday
388861b503
Added summary local
2017-05-15 09:15:14 -06:00
Alys
f52806ed69
minor text changes: Shield-Hand Item; space in quest completion modal; Rebirth clarification ( #8681 )
...
* replace Shield with Shield-Hand Item where appropriate for consistency and clarity
* add space in quest completion modal heading between name of quest and "Completed!"
* clarify Rebirth text - restart your current character, not create a new one
* correct the instructions for editing a group (edit button not pencil icon)
* correct typo in questVice3Completion: breath > breathe
* fix type: Starststemic > Starsystemic
2017-05-14 20:53:15 +10:00
Alys
d89b9e08af
update / delete outdated README.md files ( #8719 )
...
Information from test/api/README.md and test/api/v3/README.md has been moved to http://habitica.wikia.com/wiki/Using_Your_Local_Install_to_Modify_Habitica's_Website_and_API for consistency with other Blacksmith documentation.
2017-05-14 14:40:13 +10:00
Keith Holliday
f8a99bd127
Removed clone deep
2017-05-12 11:15:09 -06:00
Keith Holliday
a82b60f144
Removed extra codes
2017-05-12 09:21:29 -06:00
Alys
65e71140ee
adjust banned words list -- TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2017-05-13 00:48:35 +10:00
Keith Holliday
f192ca4c6f
Abstracted set next due logic, set offset, and mapped to ISO
2017-05-12 07:39:32 -06:00
SabreCat
36b09d40b9
Merge branch 'release' into develop
2017-05-11 22:30:23 +00:00
Sabe Jones
4fdd754b31
3.90.2
2017-05-11 20:16:28 +00:00
Sabe Jones
36ff063991
chore(i18n): update locales
2017-05-11 20:14:21 +00:00
SabreCat
20dcb1cb8a
chore(sprites): compile
2017-05-11 20:08:33 +00:00
SabreCat
3a1527073f
chore(news): Bailey
2017-05-11 20:08:12 +00:00
Keith Holliday
1292f9a3d5
Added nextDue field
2017-05-11 13:11:16 -06:00
Keith Holliday
e7418472f6
Added zone back
2017-05-10 22:06:31 -06:00
Keith Holliday
850f332ddc
MErged in develop
2017-05-10 15:51:50 -06:00
Keith Holliday
59fb32ea2e
Moved back to zone function
2017-05-10 15:47:32 -06:00
Keith Holliday
727cdc9402
Tasks is due ( #8711 )
...
* Added isDue field and isDue set on create
* Added isDue update on update task
* Add isdue calc to score task
* Added isdue calc to cron
* Fixed lint issue
* Added isDue to no set and updated grammar
2017-05-10 07:40:45 -06:00
SabreCat
638c9dee89
Merge branch 'release' into develop
2017-05-09 19:36:42 +00:00
SabreCat
168ed02226
3.90.1
2017-05-09 19:30:31 +00:00
Sabe Jones
aa253cf72e
chore(i18n): update locales
2017-05-09 19:25:30 +00:00
SabreCat
247742c60d
chore(news): Bailey
...
also adds Managers info to Group Plans page
2017-05-09 19:18:29 +00:00
yugensoft
7d89deb094
Continuation of PR #8675 , fix internationalization ( #8698 )
...
* Made uneditable habits show counter reset frequency
Added counter reset frequency to counter tooltip
Solves issue https://github.com/HabitRPG/habitica/issues/8571
* Internationalization fix, pursuant to https://github.com/HabitRPG/habitica/pull/8675#discussion_r112982947
(cherry picked from commit 2adac35e31 )
2017-05-09 18:54:38 +00:00
Sabe Jones
c128b701fa
chore(i18n): update locales
2017-05-09 18:52:38 +00:00
yugensoft
2adac35e31
Continuation of PR #8675 , fix internationalization ( #8698 )
...
* Made uneditable habits show counter reset frequency
Added counter reset frequency to counter tooltip
Solves issue https://github.com/HabitRPG/habitica/issues/8571
* Internationalization fix, pursuant to https://github.com/HabitRPG/habitica/pull/8675#discussion_r112982947
2017-05-09 13:22:09 -05:00
SabreCat
f01e13ffc0
3.90.0
2017-05-09 17:53:03 +00:00
Alys
4e9d631b71
adjust banned words list -- TRIGGER / CONTENT WARNING: words about assault, slurs, etc
2017-05-09 09:21:06 +10:00
SabreCat
f1de7c02e9
Merge branch 'develop' into release
2017-05-08 23:14:45 +00:00
SabreCat
15d4f7d6ab
Revert "Add tests for shouldDo - fixes #8585 ( #8660 )"
...
This reverts commit 4bbebdd237 . The change to moment.utcOffset() from moment.zone() broke cron code for determining today's date.
2017-05-08 22:08:24 +00:00
Keith Holliday
76222ac344
Added custom day start support
2017-05-08 10:20:47 -06:00
Keith Holliday
2659a4117b
Added repeatable tests back
2017-05-08 09:52:15 -06:00
Keith Holliday
a0ee73e944
Updated new recur logic to work with tests
2017-05-08 09:39:50 -06:00
Keith Holliday
6174624b89
Merged develop
2017-05-08 08:32:03 -06:00
Keith Holliday
c8b6e8ea7c
Updated docker file to use Node ( #8704 )
2017-05-08 07:40:55 -06:00
madpink
409b5d5965
Updating User API Doc (part 2) ( #8602 )
...
* Updating APIDOC for issue 8087
* Updating User API Doc (round 2)
cleaned up trailing sapces
* Updating User API Doc (round 2)
Changed mpHeal to mpheal
2017-05-08 07:37:01 -06:00
MathWhiz
e7209511ca
Challenge API Doc Updates ( #8626 )
...
* Improve API Documentation for Challenges API
* Fix previously raised issues
* Change suggestions by @Alys
2017-05-08 07:36:02 -06:00
Mateus Etto
8c76ccd39b
Fix bugs with approved tasks in a Group Plan ( #8629 )
...
* Store all approved tasks in an array
* Created bulkScore using score callback
* Removed unnecessary code
* Added verification to run the code only for Approved Tasks
* Created scoreTasks on server and necessary code on client
* Revert "Created scoreTasks on server and necessary code on client"
This reverts commit b786c0e71a .
* Fixed gold/xp earn-lose-earnAgain problem
* Do not read already read notifications
* Removed unnecessary variable
2017-05-08 07:35:08 -06:00
Jaka Kranjc
399c91ccab
travis: don't pollute the log with npm output ( #8706 )
...
unless it fails; saves ~7k lines
2017-05-08 07:33:49 -06:00
Grace Chen
4bbebdd237
Add tests for shouldDo - fixes #8585 ( #8660 )
...
* Fix #8585 - Add shouldDo CDS and timezone variation test suite
* Fix #8585 - resolve feedback
2017-05-08 07:32:38 -06:00
yugensoft
4f305bd505
Updated vagrant script to fix bcrypt missing error ( #8670 )
...
* Updated npm version to match http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally ; added npm-pre-gyp dependency necessary for bcrypt to install
* changed npm version as per request https://github.com/HabitRPG/habitica/pull/8670#discussion_r112010106
2017-05-07 07:57:50 +10:00
Alys
024feaa2f4
add banned words to be blocked in Tavern Chat -- CONTENT WARNING: this commit contains slurs, swear words, etc
2017-05-06 07:37:17 +10:00
Sabe Jones
d2dc8f1856
Release Mergeback 2017/05/03 ( #8716 )
...
* Content 2017/05 (#8714 )
* feat(content): May 2017
Add Armoire, add BGs, end Spring Fling
* chore(sprites): compile
* chore(i18n): update locales
* 3.89.0
2017-05-03 15:02:54 -05:00
SabreCat
364ed8dbab
3.89.0
2017-05-03 18:22:12 +00:00
Sabe Jones
73328b6dab
Content 2017/05 ( #8714 )
...
* feat(content): May 2017
Add Armoire, add BGs, end Spring Fling
* chore(sprites): compile
* chore(i18n): update locales
2017-05-03 13:21:25 -05:00
Keith Holliday
e3a08c1905
Added loggly integration ( #8690 )
...
* Added loggly integration
* Added back console logger
* Updated shrinkwrap
2017-05-02 09:17:23 -06:00
Céline O'Neil
b1a4c1b4ff
Update instructions for running select API tests, in line with wiki instructions
2017-05-01 10:04:37 -04:00
Céline O'Neil
fb80dd7c57
Allow leaving a challenge without having access to the challenge (e.g. after leaving a party or guild)
2017-05-01 10:04:37 -04:00
Sabe Jones
dad0eea9e0
Merge branch 'release' into develop
2017-04-28 19:31:22 +00:00
Sabe Jones
76849cdcaa
3.88.1
2017-04-28 19:30:33 +00:00
Sabe Jones
eb6ac42717
chore(i18n): update locales
2017-04-28 19:29:56 +00:00
SabreCat
d44a298e2d
chore(news): Bailey
2017-04-28 19:24:32 +00:00
Alys
864ca91144
modify Market intro for eggs to clarify that quest eggs don't drop ( #8680 )
...
Ref: https://habitica.slack.com/archives/C02RK7DKF/p1491847171061587?thread_ts=1491779437.902223&cid=C02RK7DKF
2017-04-27 21:10:43 +10:00
Cai Lu
78816dd4cb
Fix character values ( #8541 )
...
* Display an error when invalid values are given
* Add character values tests for settingsCtrl
* Only check for invalid level values
* Remove unnecessary validation function
* Min level of 1 on user model
* (tests) Removed stubbing on restore
2017-04-26 15:10:56 -06:00
Keith Holliday
6a99daebac
continuation of PR #8074 Adding spam prevention - fixes #8060 ( #8687 )
...
* Adding code to look over the most recent messages to look for spam from a user
* Adding in translatable error message
* Adding 2 tests for spam detection
* Fixing changes requested for pull request
* Adding unit tests for group and fixing requested changes
* Fixing message and tests
* Forgot to remove this import
* Fixing lint errors
* Cleaning up the code and tests to be more readable
* Fixing lint errors
* Fixed linting issues
* Syntax fixes
* Updated grammar
2017-04-26 13:37:18 -06:00
SabreCat
c9ee6c7f73
Merge branch 'release' into develop
2017-04-26 17:40:51 +00:00
SabreCat
ffc4618657
3.88.0
2017-04-26 02:07:17 +00:00
Sabe Jones
30fde273b8
chore(i18n): update locales
2017-04-26 02:05:38 +00:00
SabreCat
38573ad357
chore(sprites): compile
2017-04-26 01:57:19 +00:00
SabreCat
c23180e6eb
chore(news): Bailey
2017-04-26 01:56:59 +00:00
SabreCat
f7e2a0464f
fix(incentives): backfill
...
Also adds various missing data from prior commit
2017-04-26 01:04:02 +00:00
SabreCat
6994c6769a
feat(content): More Check-in Incentives
2017-04-25 22:13:07 +00:00
SabreCat
984e7f8005
feat(content): Subscriber Items 2017-04
2017-04-25 22:11:20 +00:00
Keith Holliday
e2f4b0e3dc
Group managers ( #8591 )
...
* Added abiltiy to add group managers
* Added ability to remove managers
* Added ability for managers to add group tasks
* Allower managers to assign tasks
* Allowed managers to unassign tasks
* Allow managers to delete group tasks
* Allowed managers to approve
* Added initial ui
* Added approval view for managers
* Allowed managers to edit
* Fixed lint issues
* Added spacing to buttons
* Removed leader from selection of group managers
* Code review updates
* Ensured approvals are only done once
* Added ability for parties to add managers
* Add notifications to all managers when approval is requests
* Removed tasks need approval notifications from all managers when task is approve
* Fixed linting issues
* Hid add managers UI from groups that are not subscribed
* Removed let from front end
* Fixed issues with post task url params
* Fixed string locales
* Removed extra limited strings
* Added cannotedit tasks function
* Added limit fields and notification check by taskId
* Localized string and other minor issues
* Added manager and leader indicator
* Added group notifications refresh on sync
* Added close button for group notifications
* Removed group approval notifications when manager is removed
* Moved leader/manager indicators to after hp
* Added manager fields to groups
* Spelling and syntax fixes
2017-04-25 08:28:56 -06:00
Keith Holliday
369702884a
Prevented ios and android subs from being upgrade to group plans ( #8646 )
...
* Prevented ios and android subs from being upgrade to group plans
* Add admin email sender
* Updated admin email
* Updated get user email
* Fixed grammar issue
2017-04-24 08:01:27 -06:00
Keith Holliday
d438990d18
Added block when user types a swear word listed in banned words ( #8197 )
...
* Added block when user types a swear word listed in banned words
* Moved banned words check to server
* Removed unused code
* Moved banned words to separate file and fixed grammar.
* Updated chat test
* Changed error to BadRequest
* Fixed regex matching
* Updated test banned word
* Moved banned words and cached regex
* Updated banned word message
* Add ban filter only for tavern
* Added tavern id constant
* Added more tests for banned words
* Added warning to banned words
* Added alert
* Added new regex to capture markdown
* Fixed lint, spelling and importing
2017-04-24 07:55:42 -06:00
yugensoft
7d3213fd66
Made uneditable habits show counter reset frequency ( #8675 )
...
Added counter reset frequency to counter tooltip
Solves issue https://github.com/HabitRPG/habitica/issues/8571
2017-04-22 14:01:06 -05:00
Alys
bde4eafc05
add mountText for all drop eggs and quest eggs ( #8678 )
...
I've checked that all these added strings do exist in locales/en/content.json
2017-04-22 14:00:18 -05:00
Travis
5a2ba27808
Creating api for gifting Hall Of Heroes Item Reference ( #8118 )
...
* Creating specific api to vend item reference for gifting items to a user through the hall of heroes. closes #8100
* removed 'When in doubt, ask Tyler' from the hall of heroes line
* Moving hall of heroes item path call from server side to client side
* updating let to var
* Addressing PR comments
2017-04-22 13:57:41 -05:00
Keith Holliday
024268a51e
Added wintery skins to content ( #8645 )
...
* Added wintery skins to content
* Removed features json
* Fixed some name issues
2017-04-22 13:54:57 -05:00
MathWhiz
f7281e71e8
Change icon for NPC achievement ( #8628 )
...
* Change icon for NPC achievement
* Add npc icon
2017-04-22 13:52:45 -05:00
SabreCat
f3712c0641
3.87.1
2017-04-21 20:40:03 +00:00
Sabe Jones
7df10d51b0
PRs 2017/04/07 - 2017/04/14 ( #8691 )
...
* Issue 8432: Pre-test for initial fix
* Add failing test, seeking help/advice
* Fixes achievements injection. Now trying with Guide
* Fixes tests
* Remoed logging
* Mock ENV function
* Removes test focus
* Remove Beat Master unlock for Rebirth
* Special message when complete all check-in prizes
* Updated comment
* fix(test): unpend party cap test
* remove wrong subscriptions from gift modal
* edit the new issue template to emphasise that the Report a Bug guild should be used first (#8659 )
* fix(translation): resolve merge conflict
* fix(news): merge conflict
* Added email invite limit (#8664 )
* Added email invite limit
* change error message for sending too many invitations to instruct them to email us
* fix test error message to use variable in locales string
* add comment to warn about keeping INVITES_LIMIT low
If INVITES_LIMIT is allowed to be greater than MAX_EMAIL_INVITES_BY_USER
then the inviter can send more than MAX_EMAIL_INVITES_BY_USER invitations
at once.
* Fix for automatic allocation not persisting #8641 (#8661 )
* Fixed text of check-in prize when it is a set of backgrounds (#8599 )
* Fixed text of check-in prize when it is a set of backgrounds
* Use existing i18n string for BGs name
* Added user.preferences.language as second parameter
* fix Shiny Seeds info about achievement (not given to caster) (#8679 )
Ref: https://habitica.slack.com/archives/C02RK7DKF/p1492032261365388
* Release mergeback v3.86.0 (#8685 )
* 3.85.0
* New User Tasks for Mobile (#8682 )
* feat(mobile): different default tasks
* fix(linting): missing space
* fix(user): correct client type logic
* test(integration): tasks by platform
* fix(test): remove only
* test(user): deeper checks on tasks
* refactor(test): whitespace for readability
* feat(subs): Jackalope Pets (#8684 )
* chore(sprites): compile
* chore(i18n): update locales
* 3.86.0
2017-04-21 15:38:24 -05:00
SabreCat
91438aff90
Merge branch 'release' into develop
2017-04-20 22:21:33 +00:00
Sabe Jones
0c3f40716b
3.87.0
2017-04-20 21:29:01 +00:00
Sabe Jones
ec306b614a
chore(news): Bailey
2017-04-20 20:02:37 +00:00
Sabe Jones
a6d8beff9d
chore(i18n): update locales
2017-04-20 19:48:09 +00:00
SabreCat
bebf03ee91
chore(sprites): compile
2017-04-20 19:39:19 +00:00
SabreCat
2ea35c673a
fix(quest): strings and fetch items
2017-04-20 19:35:16 +00:00
SabreCat
90d15b18f8
feat(content): Fairy Potions, Mistiflying Quests
2017-04-20 19:01:51 +00:00
Sabe Jones
91ed55cf66
Release mergeback v3.86.0 ( #8685 )
...
* 3.85.0
* New User Tasks for Mobile (#8682 )
* feat(mobile): different default tasks
* fix(linting): missing space
* fix(user): correct client type logic
* test(integration): tasks by platform
* fix(test): remove only
* test(user): deeper checks on tasks
* refactor(test): whitespace for readability
* feat(subs): Jackalope Pets (#8684 )
* chore(sprites): compile
* chore(i18n): update locales
* 3.86.0
2017-04-18 19:23:24 -05:00
Sabe Jones
93aa37a164
3.86.0
2017-04-18 22:57:50 +00:00
Alys
4275da0a2e
fix Shiny Seeds info about achievement (not given to caster) ( #8679 )
...
Ref: https://habitica.slack.com/archives/C02RK7DKF/p1492032261365388
2017-04-19 08:56:15 +10:00
Sabe Jones
f782687609
chore(i18n): update locales
2017-04-18 22:50:18 +00:00
Sabe Jones
164fb69108
chore(sprites): compile
2017-04-18 22:43:33 +00:00
Sabe Jones
b1678e1769
feat(subs): Jackalope Pets ( #8684 )
2017-04-18 17:38:53 -05:00
Sabe Jones
7f8851c72b
New User Tasks for Mobile ( #8682 )
...
* feat(mobile): different default tasks
* fix(linting): missing space
* fix(user): correct client type logic
* test(integration): tasks by platform
* fix(test): remove only
* test(user): deeper checks on tasks
* refactor(test): whitespace for readability
2017-04-18 15:50:50 -05:00
Mateus Etto
d9f48dcbb0
Fixed text of check-in prize when it is a set of backgrounds ( #8599 )
...
* Fixed text of check-in prize when it is a set of backgrounds
* Use existing i18n string for BGs name
* Added user.preferences.language as second parameter
2017-04-17 14:39:05 +10:00
Tyler Nychka
bd6f901ccf
Fix for automatic allocation not persisting #8641 ( #8661 )
2017-04-17 06:49:16 +10:00
SabreCat
884bf02961
Merge branch 'sabrecat/butterflies' into develop
2017-04-13 20:31:19 +00:00
SabreCat
4aad44e29e
3.85.0
2017-04-13 20:29:51 +00:00
Sabe Jones
b40ee88165
chore(i18n): update locales
2017-04-13 20:28:14 +00:00
SabreCat
5d90aff51b
chore(sprites): compile
...
Also add promo images to Bailey
2017-04-13 20:19:57 +00:00
SabreCat
9e36a531ea
feat(content): Butterfly Pet Quest
2017-04-13 20:11:36 +00:00
Sabe Jones
f9b40a699a
3.84.3
2017-04-12 21:09:05 +00:00
Alys
33380f63f6
add comment to warn about keeping INVITES_LIMIT low
...
If INVITES_LIMIT is allowed to be greater than MAX_EMAIL_INVITES_BY_USER
then the inviter can send more than MAX_EMAIL_INVITES_BY_USER invitations
at once.
2017-04-12 21:07:46 +00:00
Alys
2f010e4689
fix test error message to use variable in locales string
2017-04-12 21:07:35 +00:00
Alys
fbda3a87ef
change error message for sending too many invitations to instruct them to email us
2017-04-12 21:07:25 +00:00
TheHollidayInn
8a2e6a98c2
Added email invite limit
2017-04-12 21:03:10 +00:00
Keith Holliday
7d42e8fc71
Added email invite limit ( #8664 )
...
* Added email invite limit
* change error message for sending too many invitations to instruct them to email us
* fix test error message to use variable in locales string
* add comment to warn about keeping INVITES_LIMIT low
If INVITES_LIMIT is allowed to be greater than MAX_EMAIL_INVITES_BY_USER
then the inviter can send more than MAX_EMAIL_INVITES_BY_USER invitations
at once.
2017-04-12 15:54:35 -05:00
SabreCat
0442b87608
fix(news): merge conflict
2017-04-11 22:23:27 +00:00
SabreCat
c1d1a3e14e
fix(translation): resolve merge conflict
2017-04-11 22:04:55 +00:00
SabreCat
dd5a9aa6cc
Merge branch 'sabrecat/egg-quest' into develop
2017-04-11 20:10:49 +00:00
Alys
0bb6e5f3fc
edit the new issue template to emphasise that the Report a Bug guild should be used first ( #8659 )
2017-04-11 14:52:19 -05:00
SabreCat
ad0a51167d
3.84.2
2017-04-11 19:23:42 +00:00
SabreCat
b7f1001b1a
chore(news): Bailey
2017-04-11 19:23:28 +00:00
Sabe Jones
81ea1a0f9e
chore(i18n): update locales
2017-04-11 19:02:17 +00:00
SabreCat
a466d20935
Revert "Unlimit parties ( #8653 )"
...
This reverts commit a4feae4dbb .
2017-04-11 18:54:30 +00:00
SabreCat
635c0cf3d1
feat(event): enable Egg Hunt
2017-04-11 18:54:07 +00:00
Matteo Pagliazzi
69347df050
Merge branch 'Yutsuten-orb-rebirth' into develop
2017-04-11 17:10:50 +02:00
Matteo Pagliazzi
9cad5525e6
Merge branch 'orb-rebirth' of https://github.com/Yutsuten/habitica into Yutsuten-orb-rebirth
2017-04-11 17:10:42 +02:00
Matteo Pagliazzi
b1e6aceffe
Merge branch 'Yutsuten-checkin-complete-msg' into develop
2017-04-11 17:08:51 +02:00
Matteo Pagliazzi
17068875f4
Merge branch 'checkin-complete-msg' of https://github.com/Yutsuten/habitica into Yutsuten-checkin-complete-msg
2017-04-11 17:08:43 +02:00
Matteo Pagliazzi
342fc2e344
Merge branch 'paglias/fix-wrong-subs' into develop
2017-04-11 17:07:15 +02:00
Matteo Pagliazzi
b8b1557e49
Merge branch 'develop' into paglias/fix-wrong-subs
2017-04-11 17:07:05 +02:00
Matteo Pagliazzi
f90ef04e83
Merge branch 'eastwood-develop' into develop
2017-04-11 17:03:20 +02:00
Matteo Pagliazzi
d0561512de
Merge branch 'develop' of https://github.com/eastwood/habitica into eastwood-develop
2017-04-11 17:03:09 +02:00
Matteo Pagliazzi
b84c672f33
remove wrong subscriptions from gift modal
2017-04-11 10:15:54 +02:00
Mateus Etto
aafbb889be
Merge branch 'develop' into checkin-complete-msg
2017-04-09 19:58:53 -03:00
SabreCat
8bfafa6df0
Merge branch 'viirus/androidFixes' into release
2017-04-06 22:15:14 +00:00
SabreCat
13865bcf49
Merge branch 'viirus/androidFixes' into develop
2017-04-06 22:10:02 +00:00
Phillip Thelen
78a99bf314
add assertion for newUser field on registration
2017-04-06 22:03:50 +02:00
Phillip Thelen
38edc5b416
fix linter error
2017-04-06 22:03:33 +02:00
SabreCat
f9ca69196a
fix(test): unpend party cap test
2017-04-06 19:58:33 +00:00
SabreCat
0e77df6e7b
Merge branch 'sabrecat/shiny-seeds' into develop
2017-04-06 19:56:20 +00:00
SabreCat
91b6d3db02
3.84.1
2017-04-06 19:42:01 +00:00
Sabe Jones
d16ce1ce48
chore(i18n): update locales
2017-04-06 19:41:13 +00:00
SabreCat
564c366bfb
chore(sprites): compile
2017-04-06 19:35:16 +00:00
SabreCat
c8c65a4f4f
feat(event): Shiny Seeds
2017-04-06 19:35:05 +00:00
Phillip Thelen
8d168a0318
return newUser as true for new local accounts
2017-04-05 22:20:08 +02:00
Phillip Thelen
a3dd2f497e
fix setup process for new android users
2017-04-05 22:19:49 +02:00
Sabe Jones
a4feae4dbb
Unlimit parties ( #8653 )
...
* fix(party): unlimit parties
to address premature feature release
* fix(test): pend irrelevant test
2017-04-04 21:51:17 -05:00
Sabe Jones
d8620e1636
v3.84.0 - Backgrounds and Armoire 2017/04 ( #8652 )
...
* Release Mergeback (#8644 )
* Remove email addresses from translatable strings (#8448 )
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
* 1st iteration of issue #8385 - more pending
* #8385 config and jade fixes, tests pending
* #8385 fixing lint errors
* Fix faqs string and test
* Fix faq.jade and add workaround for faq.js
* Fixing accidental checking for faq.js
* fix emails in faq.js
* fetch emails once in auth.js
* Fixing community manager email in auth.js
(cherry picked from commit 842fbe42a8 )
* chore(i18n): update locales
(cherry picked from commit b2225f05e5 )
* Merge branch 'stripe-webhook' into develop
(cherry picked from commit 30f514e46f )
* add recent Grand Gala seasonal special equipment names (#8606 )
This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop.
(cherry picked from commit 4846bc5769 )
* stripe webhook for unpaid subs: add 3 days of remaining time
(cherry picked from commit 1d7b733759 )
* New default background (#8597 )
* feat(bgs): new default background
* feat(bgs): backfill migration
* fix(migration): extraneous imports, bad paths
* fix(bgs): address comments
* fix(test): assert equality
(cherry picked from commit 03088f1d9f )
* chore(sprites): compile
(cherry picked from commit 831b122ce2 )
* chore(i18n): update locales
(cherry picked from commit be1754ab07 )
* chore(public-docs): Community Guidelines update
Also Bailey announcement
(cherry picked from commit 565d50dd99 )
* chore(i18n): update locales
(cherry picked from commit d4198f8913 )
* 3.83.0
(cherry picked from commit ea18489991 )
* chore(news): Bailey
* rebuild shrinkwrap
(cherry picked from commit 96ce948e1a )
* stripe webhook: fix handling of automatic requests
(cherry picked from commit c4463f991b )
* 3.83.1
* v3.83.2 - April Fools 2017 (#8632 )
* feat(event): April Fools 2017
* feat(event): NPCs and Bailey
* fix(event): tweak NPCs, add challenge link
* chore(sprites): compile
* 3.83.2
* v3.83.3 Fooling Fix (#8633 )
* fix(fooling): add logic to party and member modals
* 3.83.3
* v3.83.4 Export fooling (#8634 )
* fix(fooling): allow export
* 3.83.4
* v3.83.5 End Fooling (#8638 )
* chore(event): no more foolin
* chore(sprites): compile
* 3.83.5
* fix(merge-conflict): prefer develop
for config.json.example
* fix(merge-conflict): fewer istanbul deps
* Replace golden rock mount body sprite
* feat(content): BGs and Armoire 2017-04
Also fixes a positioning issue on Spring Healer headgear.
* chore(sprites): compile
* chore(i18n): update locales
* 3.84.0
2017-04-04 15:49:05 -05:00
Sabe Jones
8e6f4a15a7
v3.84.0 - Backgrounds and Armoire 2017/04 ( #8651 )
...
* Remove email addresses from translatable strings (#8448 )
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
* 1st iteration of issue #8385 - more pending
* #8385 config and jade fixes, tests pending
* #8385 fixing lint errors
* Fix faqs string and test
* Fix faq.jade and add workaround for faq.js
* Fixing accidental checking for faq.js
* fix emails in faq.js
* fetch emails once in auth.js
* Fixing community manager email in auth.js
(cherry picked from commit 842fbe42a8 )
* chore(i18n): update locales
(cherry picked from commit b2225f05e5 )
* Merge branch 'stripe-webhook' into develop
(cherry picked from commit 30f514e46f )
* add recent Grand Gala seasonal special equipment names (#8606 )
This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop.
(cherry picked from commit 4846bc5769 )
* stripe webhook for unpaid subs: add 3 days of remaining time
(cherry picked from commit 1d7b733759 )
* New default background (#8597 )
* feat(bgs): new default background
* feat(bgs): backfill migration
* fix(migration): extraneous imports, bad paths
* fix(bgs): address comments
* fix(test): assert equality
(cherry picked from commit 03088f1d9f )
* chore(sprites): compile
(cherry picked from commit 831b122ce2 )
* chore(i18n): update locales
(cherry picked from commit be1754ab07 )
* chore(public-docs): Community Guidelines update
Also Bailey announcement
(cherry picked from commit 565d50dd99 )
* chore(i18n): update locales
(cherry picked from commit d4198f8913 )
* 3.83.0
(cherry picked from commit ea18489991 )
* chore(news): Bailey
* rebuild shrinkwrap
(cherry picked from commit 96ce948e1a )
* stripe webhook: fix handling of automatic requests
(cherry picked from commit c4463f991b )
* 3.83.1
* v3.83.2 - April Fools 2017 (#8632 )
* feat(event): April Fools 2017
* feat(event): NPCs and Bailey
* fix(event): tweak NPCs, add challenge link
* chore(sprites): compile
* 3.83.2
* v3.83.3 Fooling Fix (#8633 )
* fix(fooling): add logic to party and member modals
* 3.83.3
* v3.83.4 Export fooling (#8634 )
* fix(fooling): allow export
* 3.83.4
* v3.83.5 End Fooling (#8638 )
* chore(event): no more foolin
* chore(sprites): compile
* 3.83.5
* fix(merge-conflict): prefer develop
for config.json.example
* fix(merge-conflict): fewer istanbul deps
* Replace golden rock mount body sprite
* feat(content): BGs and Armoire 2017-04
Also fixes a positioning issue on Spring Healer headgear.
* chore(sprites): compile
* chore(i18n): update locales
* 3.84.0
2017-04-04 15:48:41 -05:00
Sabe Jones
7c516b7cbb
Release Mergeback ( #8644 )
...
* Remove email addresses from translatable strings (#8448 )
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
* 1st iteration of issue #8385 - more pending
* #8385 config and jade fixes, tests pending
* #8385 fixing lint errors
* Fix faqs string and test
* Fix faq.jade and add workaround for faq.js
* Fixing accidental checking for faq.js
* fix emails in faq.js
* fetch emails once in auth.js
* Fixing community manager email in auth.js
(cherry picked from commit 842fbe42a8 )
* chore(i18n): update locales
(cherry picked from commit b2225f05e5 )
* Merge branch 'stripe-webhook' into develop
(cherry picked from commit 30f514e46f )
* add recent Grand Gala seasonal special equipment names (#8606 )
This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop.
(cherry picked from commit 4846bc5769 )
* stripe webhook for unpaid subs: add 3 days of remaining time
(cherry picked from commit 1d7b733759 )
* New default background (#8597 )
* feat(bgs): new default background
* feat(bgs): backfill migration
* fix(migration): extraneous imports, bad paths
* fix(bgs): address comments
* fix(test): assert equality
(cherry picked from commit 03088f1d9f )
* chore(sprites): compile
(cherry picked from commit 831b122ce2 )
* chore(i18n): update locales
(cherry picked from commit be1754ab07 )
* chore(public-docs): Community Guidelines update
Also Bailey announcement
(cherry picked from commit 565d50dd99 )
* chore(i18n): update locales
(cherry picked from commit d4198f8913 )
* 3.83.0
(cherry picked from commit ea18489991 )
* chore(news): Bailey
* rebuild shrinkwrap
(cherry picked from commit 96ce948e1a )
* stripe webhook: fix handling of automatic requests
(cherry picked from commit c4463f991b )
* 3.83.1
* v3.83.2 - April Fools 2017 (#8632 )
* feat(event): April Fools 2017
* feat(event): NPCs and Bailey
* fix(event): tweak NPCs, add challenge link
* chore(sprites): compile
* 3.83.2
* v3.83.3 Fooling Fix (#8633 )
* fix(fooling): add logic to party and member modals
* 3.83.3
* v3.83.4 Export fooling (#8634 )
* fix(fooling): allow export
* 3.83.4
* v3.83.5 End Fooling (#8638 )
* chore(event): no more foolin
* chore(sprites): compile
* 3.83.5
* fix(merge-conflict): prefer develop
for config.json.example
* fix(merge-conflict): fewer istanbul deps
2017-04-03 16:34:37 -05:00
Sabe Jones
46d96b444b
fix(merge-conflict): fewer istanbul deps
2017-04-03 12:51:07 -05:00
Sabe Jones
60c9434b14
fix(merge-conflict): prefer develop
...
for config.json.example
2017-04-03 12:49:37 -05:00
Sabe Jones
c3901e8615
Merge branch 'develop' into release
2017-04-03 12:20:25 -05:00
Sabe Jones
d166de8ad0
v3.83.5 End Fooling ( #8638 )
...
* chore(event): no more foolin
* chore(sprites): compile
* 3.83.5
2017-04-02 09:02:15 -05:00
Sabe Jones
82e9afe9ce
v3.83.4 Export fooling ( #8634 )
...
* fix(fooling): allow export
* 3.83.4
2017-03-31 22:23:02 -05:00
Sabe Jones
999202a8a5
v3.83.3 Fooling Fix ( #8633 )
...
* fix(fooling): add logic to party and member modals
* 3.83.3
2017-03-31 20:26:40 -05:00
Sabe Jones
8b53adfcb1
v3.83.2 - April Fools 2017 ( #8632 )
...
* feat(event): April Fools 2017
* feat(event): NPCs and Bailey
* fix(event): tweak NPCs, add challenge link
* chore(sprites): compile
* 3.83.2
2017-03-31 19:52:32 -05:00
SabreCat
c23062f87e
chore(npm): update shrinkwrap
2017-03-31 16:44:10 +00:00
Alys
ec98541df6
fix text problems in Community Guidelines and broken email links; also add press kit link ( #8623 )
2017-03-31 18:07:18 +02:00
Alys
4fed13afdd
add note to encourage reporting of begging for gems ( #8605 )
...
Also changes the email addresses in config.json.example to the real addresses so that we can use local install screenshots to tell if the correct address variable has been used.
2017-03-31 18:06:22 +02:00
SabreCat
866b28ec15
chore(news): Bailey
...
(cherry picked from commit ea7c07e21d )
2017-03-30 19:04:41 +00:00
SabreCat
bdf4a69eaf
3.83.1
2017-03-30 19:04:07 +00:00
Matteo Pagliazzi
4c121fba19
stripe webhook: fix handling of automatic requests
...
(cherry picked from commit c4463f991b )
2017-03-30 19:03:58 +00:00
Matteo Pagliazzi
0ecb95a294
rebuild shrinkwrap
...
(cherry picked from commit 96ce948e1a )
2017-03-30 19:03:26 +00:00
SabreCat
ea7c07e21d
chore(news): Bailey
2017-03-30 19:01:31 +00:00
Matteo Pagliazzi
c4463f991b
stripe webhook: fix handling of automatic requests
2017-03-30 00:14:51 +02:00
Matteo Pagliazzi
96ce948e1a
rebuild shrinkwrap
2017-03-29 16:10:32 +02:00
Sabe Jones
6d06685dfa
3.83.0
...
(cherry picked from commit ea18489991 )
2017-03-29 03:58:14 +00:00
Sabe Jones
32b6566e37
chore(i18n): update locales
...
(cherry picked from commit d4198f8913 )
2017-03-29 03:57:44 +00:00
SabreCat
ca3b4cd8ae
chore(public-docs): Community Guidelines update
...
Also Bailey announcement
(cherry picked from commit 565d50dd99 )
2017-03-29 03:57:27 +00:00
Sabe Jones
c90b4b488e
chore(i18n): update locales
...
(cherry picked from commit be1754ab07 )
2017-03-29 03:57:15 +00:00
SabreCat
8c203637d7
chore(sprites): compile
...
(cherry picked from commit 831b122ce2 )
2017-03-29 03:57:06 +00:00
Sabe Jones
58f72b7eaa
New default background ( #8597 )
...
* feat(bgs): new default background
* feat(bgs): backfill migration
* fix(migration): extraneous imports, bad paths
* fix(bgs): address comments
* fix(test): assert equality
(cherry picked from commit 03088f1d9f )
2017-03-29 03:56:55 +00:00
Matteo Pagliazzi
f0bbe84bd1
stripe webhook for unpaid subs: add 3 days of remaining time
...
(cherry picked from commit 1d7b733759 )
2017-03-29 03:56:45 +00:00
Alys
038e3f3235
add recent Grand Gala seasonal special equipment names ( #8606 )
...
This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop.
(cherry picked from commit 4846bc5769 )
2017-03-29 03:56:26 +00:00
Sabe Jones
1a7c8c1f87
Merge branch 'stripe-webhook' into develop
...
(cherry picked from commit 30f514e46f )
2017-03-29 03:55:47 +00:00
Matteo Pagliazzi
c73d6154a8
chore(i18n): update locales
...
(cherry picked from commit b2225f05e5 )
2017-03-29 03:55:28 +00:00
Gerardo Saca
e8b77ad2b2
Remove email addresses from translatable strings ( #8448 )
...
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
* 1st iteration of issue #8385 - more pending
* #8385 config and jade fixes, tests pending
* #8385 fixing lint errors
* Fix faqs string and test
* Fix faq.jade and add workaround for faq.js
* Fixing accidental checking for faq.js
* fix emails in faq.js
* fetch emails once in auth.js
* Fixing community manager email in auth.js
(cherry picked from commit 842fbe42a8 )
2017-03-29 03:55:11 +00:00
Sabe Jones
ea18489991
3.83.0
2017-03-29 03:33:13 +00:00
Sabe Jones
5eb1b6684e
3.82.0
2017-03-29 03:33:09 +00:00
Sabe Jones
a2f77eeba2
3.81.0
2017-03-29 03:32:29 +00:00
Sabe Jones
d4198f8913
chore(i18n): update locales
2017-03-29 03:28:07 +00:00
SabreCat
565d50dd99
chore(public-docs): Community Guidelines update
...
Also Bailey announcement
2017-03-29 03:21:44 +00:00
Sabe Jones
be1754ab07
chore(i18n): update locales
2017-03-28 22:05:20 +00:00
SabreCat
831b122ce2
chore(sprites): compile
2017-03-28 21:53:12 +00:00
Sabe Jones
03088f1d9f
New default background ( #8597 )
...
* feat(bgs): new default background
* feat(bgs): backfill migration
* fix(migration): extraneous imports, bad paths
* fix(bgs): address comments
* fix(test): assert equality
2017-03-28 16:49:24 -05:00
Matteo Pagliazzi
1d7b733759
stripe webhook for unpaid subs: add 3 days of remaining time
2017-03-28 21:51:55 +02:00
Keith Holliday
d170f0b1bd
Fixed injection minification issue ( #8608 )
2017-03-28 13:12:51 -06:00
Alys
4846bc5769
add recent Grand Gala seasonal special equipment names ( #8606 )
...
This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website's seasonal shop.
2017-03-28 11:32:42 -05:00
Sabe Jones
30f514e46f
Merge branch 'stripe-webhook' into develop
2017-03-28 16:11:13 +00:00
Matteo Pagliazzi
6aad018eb2
Mocha 3 and Coverage ( #8601 )
...
* upgrade mocha to v3
* shrinkwrap
* import changes from PR #8487
* fix bin
* upgrade istanbul
* use correct mocha bin
2017-03-28 13:50:34 +02:00
Mateus Etto
f2d9bdf7ae
Updated comment
2017-03-28 06:57:20 -03:00
Matteo Pagliazzi
daf9421f4f
old client: guilds: show invite button and completely hide box for party info
2017-03-28 11:24:01 +02:00
Mateus Etto
2d7e280598
Special message when complete all check-in prizes
2017-03-27 22:24:47 -03:00
Mateus Etto
d1de41290d
Remove Beat Master unlock for Rebirth
2017-03-27 19:59:24 -03:00
Matteo Pagliazzi
b2225f05e5
chore(i18n): update locales
2017-03-27 18:19:45 +02:00
Gerardo Saca
842fbe42a8
Remove email addresses from translatable strings ( #8448 )
...
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
* 1st iteration of issue #8385 - more pending
* #8385 config and jade fixes, tests pending
* #8385 fixing lint errors
* Fix faqs string and test
* Fix faq.jade and add workaround for faq.js
* Fixing accidental checking for faq.js
* fix emails in faq.js
* fetch emails once in auth.js
* Fixing community manager email in auth.js
2017-03-27 18:03:31 +02:00
Mateus Etto
5eadf9e486
Fixed subscription popup too narrow in Japanese ( #8581 ) ( #8583 )
2017-03-27 09:57:49 -06:00
TheHollidayInn
0fd85c0d60
Added every x to weekly
2017-03-27 09:52:32 -06:00
Keith Holliday
68ad3e2d4a
Task notes modals ( #8521 )
...
* Merged in develop
* Show task notes modal on click
* Began adding tests
* Removed extra characters
* Fixed lingering popup
* Added markdown
* Fixed line endings
2017-03-27 09:10:21 -06:00
madpink
de947f8069
Updating User API Doc (part 1) ( #8476 )
...
* Update API Doc #8087
Includes: GET /api/v3/user – POST /api/v3/user/buy/:key
* User API Doc update 1
Changed "GET user" description to a URL to the user model
* Update API DOC User 1
Cleaned up stray spaces
* Updated API Doc for User (part 1)
for GET user:
restored apiDescription from first PR
put link to model into "apiSuccessExample"
* Remove notifications from example responses
* Fixed trailing spaces
2017-03-26 21:42:21 +02:00
Mateus Etto
d541e3aa31
Fixed collection quest progress not being updated ( #8584 )
2017-03-26 21:27:44 +02:00
Mateus Etto
b0eda344f1
Limit party size to 30 members ( #8589 )
...
* Added a field in Party page with members count and maximum members in party
* Added information of invitations counter
* Limited party to 2 members on server (API)
* Fixed english text
* Consider current number of invitations in the party
* Moved PARTY_LIMIT_MEMBERS to common folder
* Access the PARTY_LIMIT_MEMBERS through groupsCtrl
* Some corrections
* Hide invite button when invite limit is reached
* Added missing trailing comma
* Do not test 'returns only first 30 invites' in a party anymore, but in a guild: party is limited to 30 members, so it would always fail
* Test: allow 30 members in a party
* Test: do not allow 30+ members in a party
* Improved 'allow 30 members in a party' test
* Test: 'allow 30+ members in a guild'
* Added missing trailing comma
* Code style corrections
* Fixed new line position
* Party limit check done inside Group.validateInvitations function
* Improved members count query
* Fixed tests
* Rewrite tests
* Removed import of BadRequest: value became unused
* Added 'await' to remaining 'Group.validateInvitations' functions
* Fixed tests that would always success
2017-03-26 21:23:19 +02:00
Alys
02708a7b10
remove "Habitica - Gamify Your Life" video from Press Kit ( #8595 )
...
- removes embedded youtube video from press kit page
- removes "Habitica - Gamify Your Life.mp4" from presskit.zip
2017-03-26 21:12:09 +02:00
Matteo Pagliazzi
fd9f3a32c4
fix linting
2017-03-25 17:48:51 +01:00
Matteo Pagliazzi
6e0341a4ff
add more logging
2017-03-25 17:33:35 +01:00
Matteo Pagliazzi
625077fc1a
add tests and fix bugs
2017-03-25 17:22:28 +01:00
Matteo Pagliazzi
9d456e934c
remove un-necessary JSON.parse
2017-03-25 11:46:40 +01:00
Matteo Pagliazzi
771d8f492a
update stripe webhooks url
2017-03-25 11:46:40 +01:00
Matteo Pagliazzi
f3fab88f0b
add console.log statements for debugging
2017-03-25 11:46:40 +01:00
Matteo Pagliazzi
207e3476e6
add stripe webhook to handle cancelled subscriptions
2017-03-25 11:46:40 +01:00
Clint Ryan
6956f5345e
Removes test focus
2017-03-24 23:45:56 +11:00
Sabe Jones
0ec293bd15
chore(news): Bailey
2017-03-23 21:00:48 +00:00
Sabe Jones
cb00ecc0be
chore(i18n): update locales
2017-03-23 19:53:14 +00:00
SabreCat
94ef4f80cc
chore(sprites): compile
2017-03-23 19:45:05 +00:00
Sabe Jones
814b163e1a
March 2017 Content ( #8594 )
...
* feat(content): Mystery 032017, Shimmer Potions
* fix(date): end 4/19 not 30
* fix(dates): Floral after Shimmer
2017-03-23 14:41:41 -05:00
Sabe Jones
421bdce38b
fix(sprites): don't get blocked ( #8576 )
2017-03-23 12:23:29 -05:00
Keith Holliday
624566ecec
Added end date option to group plan migration ( #8588 )
2017-03-23 10:40:15 -06:00
Sabe Jones
77ff91868e
Redirection fixes ( #8592 )
...
* fix(redirects): logic update
* test(middlewares): redirects tests
* fix(nconf): IS_PROD is boolean
* fix(test): treat IS_PROD as Boolean here too
* fix(test): apiUrl test copypasta
2017-03-23 10:25:58 -05:00
Clint Ryan
cc68abb67e
Mock ENV function
2017-03-24 00:36:05 +11:00
Clint Ryan
b48be4e619
Remoed logging
2017-03-23 00:43:59 +11:00
Clint Ryan
7a543d07a4
Fixes tests
2017-03-23 00:41:28 +11:00
SabreCat
59f490d178
fix(sprites): accidental project_file deletion
2017-03-21 19:42:02 +00:00
SabreCat
ae64ef94ae
fix(event): update Justin sprite
2017-03-21 19:06:43 +00:00
Sabe Jones
2335e22a0c
chore(i18n): update locales
2017-03-21 18:58:46 +00:00
SabreCat
910154b3ed
chore(news): Bailey
2017-03-21 18:46:17 +00:00
SabreCat
31e36339c4
fix(event): update Daniel sprite
2017-03-20 19:12:43 +00:00
SabreCat
07fe1df024
chore(sprites): compile
2017-03-20 18:36:37 +00:00
Matteo Pagliazzi
258742f6b7
Optional HTTP Basic Auth ( #8586 )
...
* add ability to add http basic auth to the website
* debug
* remove console.log
2017-03-20 15:02:48 +01:00
Clint Ryan
9115be68b2
Fixes achievements injection. Now trying with Guide
2017-03-19 10:11:11 +11:00
Matteo Pagliazzi
d9d7c69432
Client: async resources, make store reusable, move plugins and add getTaskFor getter ( #8575 )
...
Add library to manage async resource
Make Store reusable for easier testing
Move plugin to libs
Add getTaskFor getter with tests
2017-03-18 18:33:08 +01:00
Sabe Jones
03d6c459bf
chore(i18n): update locales
2017-03-18 17:09:34 +00:00
Sabe Jones
12cefe4e9f
Spring Fling 2017 ( #8579 )
...
* feat(event): Spring Fling 2017
* fix(sprites): adjustments
Also enables pastel hair/skin purchases
2017-03-18 12:01:41 -05:00
Keith Holliday
21ad808cc1
Aded challenge migration sync ( #8492 )
...
* Aded challenge migration sync
* Fixed async grouping
* Mapped promises and added error catching
* Added placholders for syncing specific challenges
* Prvented overriding of attribute and createdAt
2017-03-17 16:58:55 -05:00
SabreCat
db9befde17
Merge branch 'release' into develop
2017-03-16 19:45:11 +00:00
SabreCat
01af658c2d
3.80.1
2017-03-16 19:43:18 +00:00
SabreCat
52738575fa
chore(news): Bailey
2017-03-16 19:43:08 +00:00
Lulock
cc9bca5f63
invalid class change throws error ( #8496 ) ( #8531 )
...
* invalid class-change throws error
minor fixes
indentation fixes
indentation fixes
indentation fixes
* minor fixes
2017-03-16 13:38:24 -05:00
Matteo Pagliazzi
05d75a4d5c
chore(i18n): update locales
2017-03-16 15:56:01 +01:00
Keith Holliday
8c68f450c6
Enabled repeatables
2017-03-15 14:13:15 -06:00
Blade Barringer
164177f010
Enable shouldDo tests
2017-03-14 20:59:27 -05:00
SabreCat
fc69a3a960
3.80.0
2017-03-15 00:49:36 +00:00
SabreCat
797adbb1dc
chore(news): Bailey
2017-03-15 00:17:10 +00:00
Keith Holliday
3dc20a9832
Ensured upgraded groups are charge correctly ( #8567 )
...
* Ensured upgraded groups are charge correctly
* Added names to magic numbers
* Limited group fields query
2017-03-14 18:09:12 -05:00
Sabe Jones
cfa433aa75
chore(i18n): update locales
2017-03-14 21:03:46 +00:00
SabreCat
9bc2d22d30
chore(sprites): compile
2017-03-14 20:54:27 +00:00
Sabe Jones
4909f67ded
feat(content): Pet Quest and Future Mystery Sets ( #8569 )
2017-03-14 14:31:10 -05:00
Matteo Pagliazzi
8bc6534ff5
Merge pull request #8558 from HabitRPG/fix-achievements
...
Attempt to fix achievements awarding
2017-03-14 13:11:04 +01:00
Clint Ryan
83bd4dcf60
Add failing test, seeking help/advice
2017-03-14 12:35:48 +11:00
Matteo Pagliazzi
a8ebd04ac8
fix typo in if condition and write test
2017-03-13 21:43:40 +01:00
Matteo Pagliazzi
e0d499abab
expand explanation
2017-03-13 21:18:22 +01:00
Matteo Pagliazzi
f67e065de2
attempt to fix achievements awarding
2017-03-13 21:18:22 +01:00
Matteo Pagliazzi
283403d6c8
Merge pull request #8563 from Alys/20170312-canceled-group-plan
...
use correct wording and date format for cancelled Group Plan in Payment Details screen
2017-03-13 21:16:13 +01:00
Matteo Pagliazzi
55c7d6a191
Merge pull request #8542 from HabitRPG/client/guilds-infinite-loading
...
Client: Guilds: infinite loading
2017-03-13 21:15:06 +01:00
Alys
a5011f000e
add new feature descriptions to Social > Group Plans page ( #8564 )
...
* add new features to Social > Group Plans page and remove windows line breaks
* add price to Social > Group Plans page and remove windows line breaks
2017-03-13 21:14:14 +01:00
Matteo Pagliazzi
c5633e2074
client redesign: add infinite loading for guilds + misc fixes
2017-03-13 19:47:09 +01:00
Matteo Pagliazzi
939712ad1f
api: add pagination for guilds
...
start adding apiMessages
add apiMessages lib with tests
use apiMessage and fix tests
fix content tests
guilds pagination: add api docs
guilds pagination: improve api docs
2017-03-13 19:46:53 +01:00
Alys
09490551d4
correct wording and date format for cancelled Group Plan in Payment Details screen
2017-03-12 18:42:34 +10:00
Clint Ryan
92b02295b5
Issue 8432: Pre-test for initial fix
2017-03-11 23:29:51 +11:00
Matteo Pagliazzi
767763fbf6
upgrade hello.js to use Facebook API v2.7
2017-03-11 12:25:38 +01:00
SabreCat
237e0df611
3.79.2
2017-03-11 00:20:04 +00:00
Sabe Jones
ca903f0dc3
Group migration fixes ( #8555 )
...
* fix(migration): better subs handling
* feat(migration): award jackalopes
* fix(lint): no console logs
2017-03-10 18:18:02 -06:00
Keith Holliday
bde41699ee
Reverted should do file ( #8556 )
2017-03-10 17:37:52 -06:00
Keith Holliday
d0d4b47c47
Fixed purchased check ( #8552 )
2017-03-10 17:27:30 -06:00
Sabe Jones
c616346233
3.79.1
2017-03-10 17:05:21 +00:00
Sabe Jones
311d3a256a
Moment-recur fix ( #8553 )
...
* fix(npm): no pre/post for moment-recur
* chore(npm): update shrinkwrap
2017-03-10 11:01:51 -06:00
SabreCat
af6f3f9656
chore(npm): update shrinkwrap
2017-03-10 15:38:01 +00:00
Sabe Jones
15681fedcc
Merge branch 'release' into develop
2017-03-10 04:30:45 +00:00
Sabe Jones
bf12f8aa71
v3.79.0 Release ( #8551 )
...
* Habits v2: adding counter to habits (cleaned up branch) - fixes #8113 (#8198 )
* Clean version of PR 8175
The original PR for this was here:
https://github.com/HabitRPG/habitica/pull/8175
Unfortunately while fixing a conflict in tasks.json, I messed up the rebase and wound up pulling in too many commits and making a giant mess. Sorry. :P
* Fixing test failure
This test seems to occasionally start failing (another coder reported the same thing happening to them in the blacksmiths’ guild) because the order in which the tasks are created can sometimes not match the order in the array. So I have sorted the tasks array after creation by the task name to ensure a consistent ordering, and slightly reordered the expect statements to match.
* Debounce `$scope` updates when typing in chat. (#8485 )
Fixes #6462 , by saving a bunch of time per frame. See the issue for evidence of
the win.
* fix(nextRewardUnlocksIn): Check-in prize message was always plural --… (#8458 )
* fix(nextRewardUnlocksIn): Check-in prize message was always plural -- moving to a non-sentence like structure to fix incorrect grammar.
* fix(countLeft): Check-in prize message was always plural -- moving to a non-sentence like structure to fix incorrect grammar.
* Added support for grouping tasks by challenge (#8469 )
* Added support for grouping tasks by chllenge
* Fixed tests and updated default challenge model name
* Fixed broken member test
* Updated setting string
* Changed to shortName
* Began abstracting task grouping
* Added initial task directive code
* Added new directives to help with grouping of tasks
* Removed random console.log
* Leaving a group (#8517 )
* Leaving a group or a guild no longer removes the user from the challenges of that group or guild.
* Updating api docs for leaving group to take into account the default path no longer leaving challenges when leaving a group.
* Updating api docs for leaving group to take into account the default path no longer leaving challenges when leaving a group.
* refactored according to blade's comments to not be a breaking change. The api now accepts a body parameter to specify wether the user
should remain in the groups challenges or leave them. The change also adds more tests around this behavior to confirm that it works
as expected.
* Tasks score notes (#8507 )
* Added setting and modal for score notes
* Added persistent score notes
* Fixed linting issues and documented new field
* Added max length to task score notes
* Added check for score notes existence
* Combined tasks perferences
* Repeatables (#8444 )
* Added initial should do weekly tests
* Added support back in for days of the week and every x day
* Added better week day mapper
* Added initial monthly
* Added every x months
* Added yearlies
* Fixed every nth weekdy of month
* Fixed tests to check every x week on weekday
* Began combining x month with nth weekday
* Added every x month combined with date and weekday
* Fixed lint issues
* Saved moment-recurr to package.json
* Added new repeat fields
* Added UI for repeatables
* Ensured only dalies are affected by summary
* Added local strings
* Updated npm shrinkwrap
* Shared day map constant
* Updated shrinkwrap
* Added ui back
* Updated copy of test cases
* Added new translation strings
* Updated shrinkwrap
* Fixed broken test
* Made should do tests static for better consitency
* Fixed issue with no repeat
* Fixed line endings
* Added frequency enum values
* Fixed spacing
* Upgrade lodash to v4 and lint more files (#8495 )
* common: import lodash modules separately
* remove test/content from .eslintignore, fix with eslint --fix content/index
* lint test/content
* lint content/index except for lodash methods
* upgrade server/models
* upgrade server/middlewares and server/libs
* port server/controllers/top-level
* port server/controllers/api-v3
* port views and tests
* client old port lodash and _(, missing _.
* upgrade client-old
* port common/script (root level files only)
* port common/script/fns
* port common/libs
* port common/script/ops
* port common/script/content and common/script/libs/shops.js
* misc fixes
* misc fixes
* misc fixes
* more tests fixes
* fix payments test stubbing, down to 2 failing tests
* remove more instances of lodash wrapping
* fix bug where toObject does not clone object
* fix tests
* upgrade migration or add lodash 4 note
* update shrinkwrap
* fix linting
* upgrade eslint-config-habitrpg
* update shrinkwrap
* recompile shrinkwrap
* chore(i18n): update locales
* Fixed lint issues with model in task services (#8523 )
* ApiDoc Group (#8522 )
* ApiDoc Group
* Remove space
* Add tags to default tasks (#8419 )
* Add ability to add tags to default tasks
* fix missing semicolon
* fix nesting callbacks error
* Add tags to default tasks
* fix default tags
* Start test
* Finish test
* Fix tests
* Move test
* Fix padded-bock
* Fix test
* Fix request
* fix requests
* fix test
* fix lint
* Refine test
* Fix test
* Fix Test
* Fix tests
* Please work :(
* Fix stupid mistake
* Fix lint
* Fixes
* fix function
* fix lint
* fix lint
* Client/inventory WIP (#8527 )
* some stable work and faster less recompilation
* user with zero tasks can use the app
* wip work to show loading status of resources
* revert changes to sync
* Client: Guilds Discovery (#8529 )
* wip: add guilds discovery page
* add public guilds page
* fix and add tests for the groups utilities mixin
* Properly format a subscription end date according to user preference (#8514 )
* Client: Guild page and mix changes (#8533 )
* update deps
* add guilds page
* improve karma conf, add tests for actions
* Client: semantic ui -> bootstrap 4 and less -> scss (#8535 )
* client: semantic ui -> bootstrap 4 and less -> scss
* start porting components to boostrap
* port header, start porting menu
* port loading screen
* port most of the menu
* port secondary menus
* port guilds and stable
* disable tavern for now, port inbox
* typo
* put back old tavern code
* fix: remove semanticui from gulpfile
* client: add some margin to the avatar
* Group plans subs to all (#8394 )
* Added subscriptions to all members when group subs
* Added unsub when group cancels
* Give user a subscription when they join a subbed group
* Removed subscription when user leaves or is removed from group
* Fixed linting issues:
* Added tests for users with a subscription being upgraded to group plan
* Added tests for checking if existing recurring user sub gets updated during group plan. Added better merging for plans
* Added test for existing gift subscriptions
* Added additional months to user when they have an existing recurring subscription and get upgraded to group sub
* Adds test for user who has cancelled with date termined in the future
* Added test to ensure date termined is reset
* Added tests for extra months carrying over
* Added test for gems bought field
* Add tests to for fields that should remain when upgrading
* Added test for all payment methods
* Added prevention for when a user joins a second group plan
* Fixed subscribing tests
* Separated group plan payment tests
* Added prevention of editing a user with a unlimited sub
* Add tests to ensure group keeps plan if they are in two and leave one
* Ensured users with two group plans do not get cancelled when on group plan is cancelled
* Ensured users without group sub are untouched when group cancels
* Fixed lint issues
* Added new emails
* Added fix for cron tests
* Add restore to stubbed methods
* Ensured cancelled group subscriptions are updated
* Changed group plan exist check to check for date terminated
* Updated you cannont delete active group message
* Removed description requirement
* Added upgrade group plan for Amazon payments
* Fixed lint issues
* Fixed broken tests
* Fixed user delete tests
* Fixed function calls
* Hid cancel button if user has group plan
* Hide difficulty from rewards
* Prevented add user functions to be called when group plan is cancelled
* Fixed merge issue
* Correctly displayed group price
* Added message when you are about to join canclled group plan
* Fixed linting issues
* Updated tests to have no redirect to homes
* Allowed leaving a group with a canceld subscription
* Fixed spelling issues
* Prevented user from changing leader with active sub
* Added payment details title to replace subscription title
* Ensured we do not count leader when displaying upcoming cost
* Prevented party tasks from being displayed twice
* Prevented cancelling and already cancelled sub
* Fixed styles of subscriptions
* Added more specific mystery item tests
* Fixed test to refer to leader
* Extended test range to account for short months
* Fixed merge conflicts
* Updated yarn file
* Added missing locales
* Trigger notification
* Removed yarn
* Fixed locales
* Fixed scope mispelling
* Fixed line endings
* Removed extra advanced options from rewards
* Prevent group leader from leaving an active group plan
* Fixed issue with extra months applied to cancelled group plan
* Ensured member count is calculated when updatedGroupPlan
* Updated amazon payment method constant name
* Added comment to cancel sub user method
* Fixed smantic issues
* Added unite test for user isSubscribed and hasNotCancelled
* Add tests for isSubscribed and hasNotCanceled
* Changed default days remaining to 2 days for group plans
* Fixed logic with adding canceled notice to group invite
* mongoose: upgrade to 4.8.6 and remove un-necessary _.clone calls now that toObject clones correctly
* config.json: do not enable APN by default
* Moved show counters to directive (#8537 )
* Moved show counters to directive
- hide counters on challenge page
- hide counters on group page
* Changed let to var
* Tasks sort delete fix (#8526 )
* Fixed task sorting
* Add sync when group task is deleted
* Added sync when user tasks reorder
* Abstracted show logic and removed task grouping from group page
* Fixed scope typo
* Localized the default challenge short name
* Removed default shortName
* Fixed test for challenge shortName
* client: router: always scroll to the top
* fix(sprites): adjust eggs (#8543 )
* adjust apidocs comment to remove unnecessary id parameter with incorrect syntax
* Repeatables fixes (#8538 )
* Prevented watch functions from being called when task._edit is removed
* Added start date support on the UI task summary
* Fixed setting of monthly and calculations
* Fixed linting issues
* Added check for existence
* Added existence check
* Ensured correct start date is used on update
* Hid repeat options from anything not a daily
* Added missing locales
* Moved repeatables out of advance options
* Minification fix hide features (#8544 )
* Added minification fix
* Hid settings for features we will not release yet
* Hid repeatables UI
* Removed extra file
* Removed repeats every from weekly
* Added start date back
* Hid counter reset when advance is collpased
* Group migrations (#8528 )
* Added create group migration
* Add migration for unlimited group subscription
* Add migration to update group members with group plans
* Added error catch
* Added comments
* Group plans copy changes (#8546 )
* Added new message for when user has group plan
* Changed subscription wording to group plan
* Updated copy
* Jackalopes (#8547 )
* feat(content): add Jackalope rare mount
* chore(news): Bailey for Group Plans
* fix(sprites): correct inconsistent file perms
* Group plans add mount (#8548 )
* Added jakcalop mount to group plan members
* Changed pet assignment to mount
* Updated migration to not update canceled group plans (#8550 )
* Send group plans subscription message to Slack (#8549 )
* feat(Slack): send group plans sub message
* fix(Slack): grab more relevant user data
* 3.79.0
* chore(i18n): update locales
* chore(sprites): compile
2017-03-09 21:50:22 -06:00
SabreCat
41ee72d407
chore(sprites): compile
2017-03-10 02:06:18 +00:00
Sabe Jones
9a5f6d4ad6
chore(i18n): update locales
2017-03-10 01:58:16 +00:00
SabreCat
d19237cdbe
3.79.0
2017-03-10 01:47:32 +00:00
Sabe Jones
18bd3f8c54
Send group plans subscription message to Slack ( #8549 )
...
* feat(Slack): send group plans sub message
* fix(Slack): grab more relevant user data
2017-03-09 19:11:21 -06:00
Keith Holliday
8b65ce3053
Updated migration to not update canceled group plans ( #8550 )
2017-03-09 17:50:42 -06:00
Keith Holliday
38b894db56
Group plans add mount ( #8548 )
...
* Added jakcalop mount to group plan members
* Changed pet assignment to mount
2017-03-09 16:15:00 -07:00
Sabe Jones
61db283473
Jackalopes ( #8547 )
...
* feat(content): add Jackalope rare mount
* chore(news): Bailey for Group Plans
* fix(sprites): correct inconsistent file perms
2017-03-09 14:50:28 -07:00
Keith Holliday
d70d39cc49
Group plans copy changes ( #8546 )
...
* Added new message for when user has group plan
* Changed subscription wording to group plan
* Updated copy
2017-03-09 14:27:52 -07:00
Keith Holliday
c26b884bc7
Group migrations ( #8528 )
...
* Added create group migration
* Add migration for unlimited group subscription
* Add migration to update group members with group plans
* Added error catch
* Added comments
2017-03-09 14:26:31 -07:00
Keith Holliday
11c8f2a775
Minification fix hide features ( #8544 )
...
* Added minification fix
* Hid settings for features we will not release yet
* Hid repeatables UI
* Removed extra file
* Removed repeats every from weekly
* Added start date back
* Hid counter reset when advance is collpased
2017-03-08 18:50:57 -07:00
Keith Holliday
1082359f2c
Repeatables fixes ( #8538 )
...
* Prevented watch functions from being called when task._edit is removed
* Added start date support on the UI task summary
* Fixed setting of monthly and calculations
* Fixed linting issues
* Added check for existence
* Added existence check
* Ensured correct start date is used on update
* Hid repeat options from anything not a daily
* Added missing locales
* Moved repeatables out of advance options
2017-03-08 16:48:30 -07:00
Alys
6486862242
adjust apidocs comment to remove unnecessary id parameter with incorrect syntax
2017-03-09 08:06:15 +10:00
Sabe Jones
f68cc569d6
fix(sprites): adjust eggs ( #8543 )
2017-03-08 11:12:49 -06:00
Matteo Pagliazzi
b10751e874
client: router: always scroll to the top
2017-03-08 09:25:36 +01:00
Keith Holliday
b75c57f130
Tasks sort delete fix ( #8526 )
...
* Fixed task sorting
* Add sync when group task is deleted
* Added sync when user tasks reorder
* Abstracted show logic and removed task grouping from group page
* Fixed scope typo
* Localized the default challenge short name
* Removed default shortName
* Fixed test for challenge shortName
2017-03-07 14:28:49 -07:00
Keith Holliday
28c93ea869
Moved show counters to directive ( #8537 )
...
* Moved show counters to directive
- hide counters on challenge page
- hide counters on group page
* Changed let to var
2017-03-07 13:58:39 -07:00
Matteo Pagliazzi
7f630f2b86
config.json: do not enable APN by default
2017-03-07 14:19:27 +01:00
Matteo Pagliazzi
1a8f591251
mongoose: upgrade to 4.8.6 and remove un-necessary _.clone calls now that toObject clones correctly
2017-03-07 14:16:14 +01:00
Keith Holliday
be60fb0635
Group plans subs to all ( #8394 )
...
* Added subscriptions to all members when group subs
* Added unsub when group cancels
* Give user a subscription when they join a subbed group
* Removed subscription when user leaves or is removed from group
* Fixed linting issues:
* Added tests for users with a subscription being upgraded to group plan
* Added tests for checking if existing recurring user sub gets updated during group plan. Added better merging for plans
* Added test for existing gift subscriptions
* Added additional months to user when they have an existing recurring subscription and get upgraded to group sub
* Adds test for user who has cancelled with date termined in the future
* Added test to ensure date termined is reset
* Added tests for extra months carrying over
* Added test for gems bought field
* Add tests to for fields that should remain when upgrading
* Added test for all payment methods
* Added prevention for when a user joins a second group plan
* Fixed subscribing tests
* Separated group plan payment tests
* Added prevention of editing a user with a unlimited sub
* Add tests to ensure group keeps plan if they are in two and leave one
* Ensured users with two group plans do not get cancelled when on group plan is cancelled
* Ensured users without group sub are untouched when group cancels
* Fixed lint issues
* Added new emails
* Added fix for cron tests
* Add restore to stubbed methods
* Ensured cancelled group subscriptions are updated
* Changed group plan exist check to check for date terminated
* Updated you cannont delete active group message
* Removed description requirement
* Added upgrade group plan for Amazon payments
* Fixed lint issues
* Fixed broken tests
* Fixed user delete tests
* Fixed function calls
* Hid cancel button if user has group plan
* Hide difficulty from rewards
* Prevented add user functions to be called when group plan is cancelled
* Fixed merge issue
* Correctly displayed group price
* Added message when you are about to join canclled group plan
* Fixed linting issues
* Updated tests to have no redirect to homes
* Allowed leaving a group with a canceld subscription
* Fixed spelling issues
* Prevented user from changing leader with active sub
* Added payment details title to replace subscription title
* Ensured we do not count leader when displaying upcoming cost
* Prevented party tasks from being displayed twice
* Prevented cancelling and already cancelled sub
* Fixed styles of subscriptions
* Added more specific mystery item tests
* Fixed test to refer to leader
* Extended test range to account for short months
* Fixed merge conflicts
* Updated yarn file
* Added missing locales
* Trigger notification
* Removed yarn
* Fixed locales
* Fixed scope mispelling
* Fixed line endings
* Removed extra advanced options from rewards
* Prevent group leader from leaving an active group plan
* Fixed issue with extra months applied to cancelled group plan
* Ensured member count is calculated when updatedGroupPlan
* Updated amazon payment method constant name
* Added comment to cancel sub user method
* Fixed smantic issues
* Added unite test for user isSubscribed and hasNotCancelled
* Add tests for isSubscribed and hasNotCanceled
* Changed default days remaining to 2 days for group plans
* Fixed logic with adding canceled notice to group invite
2017-03-06 15:09:50 -07:00
Matteo Pagliazzi
03a1d61c08
client: add some margin to the avatar
2017-03-06 21:09:19 +01:00
Matteo Pagliazzi
0767dc97b7
fix: remove semanticui from gulpfile
2017-03-06 20:58:41 +01:00
Matteo Pagliazzi
4978a62829
Client: semantic ui -> bootstrap 4 and less -> scss ( #8535 )
...
* client: semantic ui -> bootstrap 4 and less -> scss
* start porting components to boostrap
* port header, start porting menu
* port loading screen
* port most of the menu
* port secondary menus
* port guilds and stable
* disable tavern for now, port inbox
* typo
* put back old tavern code
2017-03-06 20:09:34 +01:00
Matteo Pagliazzi
0a35e63897
Client: Guild page and mix changes ( #8533 )
...
* update deps
* add guilds page
* improve karma conf, add tests for actions
2017-03-05 19:07:48 +01:00
Megan Tiu
03b3e79ea0
Properly format a subscription end date according to user preference ( #8514 )
2017-03-03 11:52:57 -07:00
Matteo Pagliazzi
dc8598ae81
Client: Guilds Discovery ( #8529 )
...
* wip: add guilds discovery page
* add public guilds page
* fix and add tests for the groups utilities mixin
2017-03-03 19:38:17 +01:00
Sabe Jones
3629f7f8a5
Merge branch 'release' into develop
2017-03-03 17:36:25 +00:00
Matteo Pagliazzi
8805f81b96
Client/inventory WIP ( #8527 )
...
* some stable work and faster less recompilation
* user with zero tasks can use the app
* wip work to show loading status of resources
* revert changes to sync
2017-03-03 15:40:21 +01:00
MathWhiz
207dbf35d6
Add tags to default tasks ( #8419 )
...
* Add ability to add tags to default tasks
* fix missing semicolon
* fix nesting callbacks error
* Add tags to default tasks
* fix default tags
* Start test
* Finish test
* Fix tests
* Move test
* Fix padded-bock
* Fix test
* Fix request
* fix requests
* fix test
* fix lint
* Refine test
* Fix test
* Fix Test
* Fix tests
* Please work :(
* Fix stupid mistake
* Fix lint
* Fixes
* fix function
* fix lint
* fix lint
2017-03-03 14:57:57 +01:00
Sabe Jones
448a953147
Backgrounds and Armoire 2017/03 ( #8525 )
...
* feat(content): add Armoire and BGs 2017-03
* chore(sprites): compile
* chore(event): disable Cupid Potions
* fix(sprites): correct shop canvas
* chore(news): Bailey 2017-03-02
* 3.78.0
2017-03-02 15:49:07 -06:00
MathWhiz
4fb1ff2baa
ApiDoc Group ( #8522 )
...
* ApiDoc Group
* Remove space
2017-03-02 18:11:50 +01:00
Keith Holliday
be64274be4
Fixed lint issues with model in task services ( #8523 )
2017-03-02 08:16:28 -07:00
Sabe Jones
390970a73a
chore(news): Bailey 2017-03-01 ( #8524 )
2017-03-01 18:54:14 -06:00
Matteo Pagliazzi
0cb254d5fc
chore(i18n): update locales
2017-03-01 18:33:35 +01:00
Matteo Pagliazzi
98c019a0b6
Upgrade lodash to v4 and lint more files ( #8495 )
...
* common: import lodash modules separately
* remove test/content from .eslintignore, fix with eslint --fix content/index
* lint test/content
* lint content/index except for lodash methods
* upgrade server/models
* upgrade server/middlewares and server/libs
* port server/controllers/top-level
* port server/controllers/api-v3
* port views and tests
* client old port lodash and _(, missing _.
* upgrade client-old
* port common/script (root level files only)
* port common/script/fns
* port common/libs
* port common/script/ops
* port common/script/content and common/script/libs/shops.js
* misc fixes
* misc fixes
* misc fixes
* more tests fixes
* fix payments test stubbing, down to 2 failing tests
* remove more instances of lodash wrapping
* fix bug where toObject does not clone object
* fix tests
* upgrade migration or add lodash 4 note
* update shrinkwrap
* fix linting
* upgrade eslint-config-habitrpg
* update shrinkwrap
* recompile shrinkwrap
2017-03-01 17:10:48 +01:00
Keith Holliday
ef02e59590
Repeatables ( #8444 )
...
* Added initial should do weekly tests
* Added support back in for days of the week and every x day
* Added better week day mapper
* Added initial monthly
* Added every x months
* Added yearlies
* Fixed every nth weekdy of month
* Fixed tests to check every x week on weekday
* Began combining x month with nth weekday
* Added every x month combined with date and weekday
* Fixed lint issues
* Saved moment-recurr to package.json
* Added new repeat fields
* Added UI for repeatables
* Ensured only dalies are affected by summary
* Added local strings
* Updated npm shrinkwrap
* Shared day map constant
* Updated shrinkwrap
* Added ui back
* Updated copy of test cases
* Added new translation strings
* Updated shrinkwrap
* Fixed broken test
* Made should do tests static for better consitency
* Fixed issue with no repeat
* Fixed line endings
* Added frequency enum values
* Fixed spacing
2017-02-27 15:41:21 -07:00
Keith Holliday
93befcebcc
Tasks score notes ( #8507 )
...
* Added setting and modal for score notes
* Added persistent score notes
* Fixed linting issues and documented new field
* Added max length to task score notes
* Added check for score notes existence
* Combined tasks perferences
2017-02-27 14:56:34 -07:00
Keith Holliday
68a042cdb9
Leaving a group ( #8517 )
...
* Leaving a group or a guild no longer removes the user from the challenges of that group or guild.
* Updating api docs for leaving group to take into account the default path no longer leaving challenges when leaving a group.
* Updating api docs for leaving group to take into account the default path no longer leaving challenges when leaving a group.
* refactored according to blade's comments to not be a breaking change. The api now accepts a body parameter to specify wether the user
should remain in the groups challenges or leave them. The change also adds more tests around this behavior to confirm that it works
as expected.
2017-02-27 13:58:30 -07:00
Keith Holliday
30954fe7c5
Added support for grouping tasks by challenge ( #8469 )
...
* Added support for grouping tasks by chllenge
* Fixed tests and updated default challenge model name
* Fixed broken member test
* Updated setting string
* Changed to shortName
* Began abstracting task grouping
* Added initial task directive code
* Added new directives to help with grouping of tasks
* Removed random console.log
2017-02-27 11:34:03 -07:00
deonna
44f23a7675
fix(nextRewardUnlocksIn): Check-in prize message was always plural --… ( #8458 )
...
* fix(nextRewardUnlocksIn): Check-in prize message was always plural -- moving to a non-sentence like structure to fix incorrect grammar.
* fix(countLeft): Check-in prize message was always plural -- moving to a non-sentence like structure to fix incorrect grammar.
2017-02-27 11:20:57 -07:00
Matt Handley
705a78e835
Debounce $scope updates when typing in chat. ( #8485 )
...
Fixes #6462 , by saving a bunch of time per frame. See the issue for evidence of
the win.
2017-02-27 11:19:42 -07:00
astolat
6d0df78441
Habits v2: adding counter to habits (cleaned up branch) - fixes #8113 ( #8198 )
...
* Clean version of PR 8175
The original PR for this was here:
https://github.com/HabitRPG/habitica/pull/8175
Unfortunately while fixing a conflict in tasks.json, I messed up the rebase and wound up pulling in too many commits and making a giant mess. Sorry. :P
* Fixing test failure
This test seems to occasionally start failing (another coder reported the same thing happening to them in the blacksmiths’ guild) because the order in which the tasks are created can sometimes not match the order in the array. So I have sorted the tasks array after creation by the task name to ensure a consistent ordering, and slightly reordered the expect statements to match.
2017-02-27 11:15:45 -07:00
Megan Tiu
6f0d0b1fb3
Use backticks in 'quest started' system message ( #8503 )
...
Fixes #8445
2017-02-26 16:03:58 +10:00
Sabe Jones
dfcd32d54a
chore(i18n): update locales
2017-02-23 18:04:06 +00:00
Sabe Jones
c24cbdc987
feat(content): strings for Armoire and BGs 2017-03
2017-02-23 17:55:50 +00:00
Sabe Jones
68d8c0de51
3.77.0
2017-02-23 05:22:59 +00:00
Sabe Jones
a7b0fa195f
chore(news): Bailey
2017-02-23 02:57:09 +00:00
Sabe Jones
ab65aa692f
fix(sprites): NYE 2x pixelfixes
...
and move a promo to subfolder
2017-02-23 02:56:33 +00:00
Sabe Jones
198d4df02a
fix(analytics): consistent partyID label
2017-02-22 20:47:52 +00:00
Sabe Jones
6fa2f643fd
fix(event): stop giving out party stuff
2017-02-21 22:21:13 +00:00
Sabe Jones
4d39861b51
fix(event): disable buying Santa quests
2017-02-21 22:16:32 +00:00
Sabe Jones
d4c99b6db6
fix(avatar): disable wintery customizations
2017-02-21 21:59:43 +00:00
Sabe Jones
a79dc90a45
chore(sprites): compile
2017-02-21 21:21:53 +00:00
Sabe Jones
daa6bd0315
chore(event): end Valentine's
2017-02-21 21:21:25 +00:00
Sabe Jones
99f2373214
feat(content): Mystery items 2017/02
2017-02-21 21:20:24 +00:00
Phillip Thelen
374d528647
Implement iOS subscriptions ( #8493 )
...
* implement iOS subscriptions
* add additional tests to request body
* Improve subscription cancelling
* change string to constant
2017-02-21 19:22:13 +01:00
Alys
8550ca4d29
change heading on forgot-password form to "Email a Password Reset Link"
...
Previously it was "Email New Password"
2017-02-19 09:45:58 +10:00
Keith Holliday
79f6b59f6e
Options view cleanup ( #8484 )
...
* Split the settings into their own files
* Refactor profile jade items to have separate files
2017-02-17 03:55:59 -07:00
Keith Holliday
e37ad420ce
Updated tests to have no redirect to homes ( #8494 )
2017-02-16 16:33:49 -07:00
Sabe Jones
2f9ff92cbd
3.76.0
2017-02-16 23:12:55 +00:00
Sabe Jones
56479e7fbd
chore(i18n): update locales
2017-02-16 21:07:51 +00:00
Sabe Jones
66e4849553
feat(content): subscriber item strings
2017-02-16 20:56:16 +00:00
Sabe Jones
9e29b44ad9
chore(sprites): compile
2017-02-16 20:51:35 +00:00
Sabe Jones
605488dd47
feat(content): Guinea Pig quest
2017-02-16 20:51:12 +00:00
MathWhiz
6c16b4b77e
ApiDoc - Development ( #8480 )
...
* Add api info
* Remove extra spaces
2017-02-16 08:53:21 -07:00
Matteo Pagliazzi
80205dcc67
recompile shrinkwrap
2017-02-15 17:25:49 +01:00
Matteo Pagliazzi
65d5bf69f6
Upgrade webpack to v2 and other deps ( #8491 )
...
* update to webpack2 and other deps
* fix linting
2017-02-15 17:24:37 +01:00
Matteo Pagliazzi
20792f5455
New Client: stable ( #8426 )
...
* try to freeze content object
* deep freeze the content object, start to implement stable
* freeze at the /common level
* go back to freezing content only on the client
* use deep-frezze-strict to support phantomjs
* use own version of deepFreeze
* update comment about deepFreeze
2017-02-15 12:49:57 +01:00
Sabe Jones
6fd509df13
fix(news): missing blog info
2017-02-14 21:00:38 +00:00
Sabe Jones
d7df18a97a
3.75.3
2017-02-14 18:29:11 +00:00
Sabe Jones
ff5c44c5a8
feat(event): Valentine's
2017-02-14 17:32:23 +00:00
Matteo Pagliazzi
c929fa1351
chore(i18n): update locales
2017-02-14 18:19:14 +01:00
Matteo Pagliazzi
d30e7b9251
Don't send plaintext reset passwords via email ( #8457 )
...
* start work to avoid sending reset password in plaintext via email
* start checking parameters
* fix new password reset email
* render error if password reset code is missing or invalid
* implement POST route, conversion to bcrypt and messages
* add auth.local.passwordResetCode field
* add failing tests, move reset code validation func to lib, fixes, remove old tests
* fix unit tests
* fix page rendering and add integration tests
* fix password reset page
* add integration test
* fix string
* fix tests url
2017-02-14 18:08:31 +01:00
Matteo Pagliazzi
c6c6632405
fix(tests): correctly append query string
2017-02-13 12:54:45 +01:00
Matteo Pagliazzi
e0d9ecca52
fix(tests): do not redirect to home page when cancelling a subscription
2017-02-13 12:21:34 +01:00
Marcel O'Neil
78f187f87a
Task edit screen changes [ fixes #8474 ]
...
move Dailies repeats out of Advanced Options; enlarge Notes; reduce spacings
2017-02-13 20:02:27 +10:00
Alys
af047d3c82
revert commits accidentally added from "Added support for grouping tasks by challenge"
...
So sorry, but I accidentally pushed some commits I'd been testing. :( This reverts them.
Reverts c496f94c79 ad6073220d d669db0f9a c244fe488d
2017-02-12 12:17:23 +10:00
Alys
20e8f47def
adjust links to wiki's page for Extensions, Add-Ons, and Customizations
...
- remove redundant link from footer's Company column (still exists in Community)
- change link to point directly to wiki page instead of to a wiki redirect for:
- static/features page ("3rd Party Tools" section)
- static/extensions redirection
2017-02-11 23:14:47 +10:00
Keith Holliday
c496f94c79
Updated setting string
2017-02-11 17:39:53 +10:00
Keith Holliday
ad6073220d
Fixed broken member test
2017-02-11 17:39:53 +10:00
Keith Holliday
d669db0f9a
Fixed tests and updated default challenge model name
2017-02-11 17:39:53 +10:00
Keith Holliday
c244fe488d
Added support for grouping tasks by chllenge
2017-02-11 17:39:53 +10:00
Monica Williams
aef71db0f5
removes changes to all local files except for en file ( #8463 )
2017-02-11 17:06:57 +10:00
Sabe Jones
ac566882fe
3.75.2
2017-02-08 22:02:59 +00:00
Sabe Jones
1ad662a090
chore(news): blog Bailey
2017-02-08 20:38:40 +00:00
Rachel Williams
1db52de45d
Reordered Magic Hatching Potions, fixes issue 8465 ( #8467 )
...
* Moved Royal Purple to top of list, ordered other mounts from Spring to Winter
* Issue 8465, moved Royal Purple to top and arranged other pets/mounts from Spring-Winter
* Fixed whitespacing mistake from previous commit
* Magic Hatching Potions reordered by season
2017-02-08 13:14:30 -06:00
Travis
f8cfdfa37d
Updating attribute calculation to look at all equipment #8188 ( #8202 )
...
* Taking all equipped items into account when calculating attributes instead of just head, weapon, sheild, and armor. closes #8185
* Refactored the stat calculations a bit so that all stat calculations are handled in the same location in the same way to try and reduce duplicate logic.
This commit also adds a number of tests to test this new behavior.
* spelling fixes
2017-02-07 12:04:12 -07:00
Sabe Jones
ffd36465c9
chore(packages): update passport
2017-02-07 00:25:41 +00:00
Myles Louis Dakan
dbb1e3aa18
Mods blocking ( #8364 )
...
* updated logic for blocking/unblocking
* updated 1 test and added 2
2017-02-05 22:32:10 -07:00
Matteo Pagliazzi
07ce68c596
remove newrelic
2017-02-05 18:43:00 +01:00
Keith Holliday
4c5d72c96f
Fixed group plan checkout with stripe ( #8475 )
2017-02-04 09:01:53 -07:00
Matteo Pagliazzi
7121653515
3.75.1
2017-02-03 11:38:55 +01:00
Matteo Pagliazzi
ce2b66a2be
update deps
2017-02-03 11:15:30 +01:00
Matteo Pagliazzi
43e381cfc1
Revert "Fix Gem purchase validation" ( #8471 )
2017-02-03 11:08:06 +01:00
Phillip Thelen
ca5161b48a
fix gem purchase validation ( #8470 )
2017-02-03 10:58:48 +01:00
Sabe Jones
44dec6dc4b
fix(news): Android URL
2017-02-02 22:13:31 +00:00
Sabe Jones
fb8f0bed43
3.75.0
2017-02-02 22:08:17 +00:00
Sabe Jones
c391de9e86
chore(news): Bailey
...
and tweak today's migrations for new format
2017-02-02 21:04:36 +00:00
Sabe Jones
7a534ab81d
fix(payments): customerId query
2017-02-02 19:51:52 +00:00
Sabe Jones
32c7f40c4b
chore(sprites): compile
2017-02-02 17:31:43 +00:00
Sabe Jones
569fbff244
feat(content): backgrounds and Armoire Feb 2017
2017-02-02 17:30:46 +00:00
Sabe Jones
3fe847f329
feat(content): Cupid Hatching Potions
2017-02-02 17:29:33 +00:00
Sabe Jones
d52d759733
3.74.1
2017-02-02 15:45:23 +00:00
Sabe Jones
5e5a755022
chore(sprites): compile
2017-02-02 15:18:12 +00:00
Sabe Jones
8d148b4d69
End Winter Wonderland ( #8466 )
...
* chore(event): end Winter Wonderland
* fix(test): update constant
2017-02-02 09:08:51 -06:00
Sabe Jones
248b64a43f
3.74.0
2017-02-02 00:59:44 +00:00
Sabe Jones
57ed0f0a10
chore(i18n): update locales
2017-02-02 00:55:58 +00:00
Sabe Jones
3455adaef5
chore(news): Bailey
2017-02-02 00:48:24 +00:00
Phillip Thelen
4d0295a60d
Support subscription payment through Google Play Store ( #8437 )
...
* Support subscription payment through Google Play Store
* minor fixes to iap subscriptions
* Support subscription payment through Google Play Store
* minor fixes to iap subscriptions
* revert change to test
* add unit tests for google payments
* add integration tests for google payments
* change config formatting for play api
* fix typo in file name
* fix typo in example config
* Improve google payment tests
* fix linter errors
2017-02-01 18:39:37 -06:00
Sabe Jones
a002bc5e20
fix(migration): curly typo
2017-02-01 21:00:48 +00:00
Sabe Jones
b9d1086e24
chore(migration): update Take This format
2017-02-01 20:52:26 +00:00
madpink
412a0ecc8c
Updating Tasks and Tags API Doc ( #8447 )
...
* Updating Tasks and Tags API Doc
* Update Tasks and Tag API Doc
added back * @apiUse ChallengeNotFound
* Update Tasks and Tag API Doc #8447
Corrected NotAuthorized errors to 401
2017-02-01 19:37:27 +01:00
Sabe Jones
d44c9ea853
3.73.1
2017-01-31 21:11:21 +00:00
Sabe Jones
c44c581265
fix(shops): correct event boolean
2017-01-31 21:10:51 +00:00
Sabe Jones
f666f3cd04
3.73.0
2017-01-31 19:22:22 +00:00
Sabe Jones
236bd6cec4
fix(test): linting and constant
2017-01-31 19:21:13 +00:00
Keith Holliday
e124c36274
Added double columns to edit modal ( #8456 )
...
* Added double columns to edit modal
* Fixed task notes z index and border styles
* Moved tags to right column and updated min width
2017-01-31 12:05:49 -07:00
Sabe Jones
d5511a0047
chore(i18n): update locales
2017-01-31 18:38:23 +00:00
Sabe Jones
87f003f392
chore(sprites): compile
2017-01-31 18:32:03 +00:00
Sabe Jones
930a869365
feat(event): Habit Birthday 2017
2017-01-31 18:30:39 +00:00
Alys
809da8add0
update landing page's number of user accounts to 2 million
...
YES! TWO MILLION!
2017-01-31 20:54:33 +10:00
Sabe Jones
1dad176320
3.72.1
2017-01-26 18:52:39 +00:00
Sabe Jones
1596c6218f
chore(news): Bailey 2017-01-26
2017-01-26 18:10:13 +00:00
Sabe Jones
0d3aba950a
fix(config): remove deprecated env var
2017-01-25 23:27:34 +00:00
Sabe Jones
f1110e0f89
chore(i18n): update locales
2017-01-25 22:31:54 +00:00
Sabe Jones
7273f8f6d9
feat(content): strings for upcoming items
2017-01-25 22:25:32 +00:00
Keith Holliday
a0ae200a54
Removed extra async ( #8455 )
2017-01-25 09:47:21 -07:00
Sabe Jones
ca448f081d
3.72.0
2017-01-25 00:35:36 +00:00
Keith Holliday
cd27afa9f0
Used profile name in inviter message ( #8453 )
2017-01-24 17:44:45 -06:00
Sabe Jones
8bc8183895
chore(i18n): update locales
2017-01-24 21:44:48 +00:00
Sabe Jones
c26c52f1fe
chore(sprites): compile
2017-01-24 21:37:57 +00:00
Sabe Jones
8d5becc9ce
feat(content): subscriber items 2017-01
2017-01-24 21:30:16 +00:00
Matteo Pagliazzi
cf7f6e2a67
chore(i18n): update locales
2017-01-24 20:23:20 +01:00
Matteo Pagliazzi
acad3b8873
Migrate to bcrypt ( #8446 )
...
* start migrating to bcrypt
* added method to convert the password to bcrypt when logging in, added method to compare password without knowing the hashing algorhytm, remove default
* travis: try to upgrade to container based infrastructure
* travis: add deps to build bcrypt.js
* travis: add deps to build bcrypt.js
* travis: add deps to build bcrypt.js
* travis: add deps to build bcrypt.js
* use bcryptjs until bcrypt can be installed on travis, see https://github.com/kelektiv/node.bcrypt.js/issues/476
* correct sha1 unit tests
* try different mongodb repo
* try without mognodb services
* try again with bcrypt
* disable request logging in travis
* migrate missing routes
* simplify code
* remove bcryptjs
* fix typo
* fix typo
* fix typo in comment
* add unit tests for new passwords utility emthods
* travis: back to old infrastructure, containers often have timeouts
* add integration test for passwordHashMethod
* update shrinkwrap
* clarify code and add comments
* add integration tests
* fix linting
* fix integration tests
2017-01-24 12:28:42 +01:00
Jaka Kranjc
04f4eb8490
added test case for #8423 ( #8434 )
2017-01-24 11:15:08 +01:00
Jaka Kranjc
8c8af83dfc
spells: searing brightness should not affect challenge tasks ( #8427 )
...
* spells: searing brightness should not affect challenge tasks
* fixed other incorrect group vs challenge task exclusions
* fixed /tasks/clearCompletedTodos test
didn't account for the new group task
* fixed comment omission in tasks/clearCompletedTodos
2017-01-24 11:14:25 +01:00
Valeriy
86d65956d9
fixed recoverCron tests failure when using mocha v3+ ( #8407 )
...
* fixed recoverCron tests
* type'o fix
* grammar nazi fix
* lint fix
* reverted to async/await (but done call removed)
* fixed Tasks tests failure on Mocha 3+
2017-01-24 10:14:27 +01:00
MathWhiz
42c5e6c22b
Facebook pixel Revert (3rd time's a charm?) ( #8450 )
...
* attempt revert
* Add back unrelated stuff
2017-01-23 14:42:57 -06:00
Cai Lu
79b51a40ce
Validate coupon code for subscriptions fixes #8398 ( #8440 )
...
* (fix) If coupon is not valid, display an error
* (test) Add valid and invalid coupon tests for applyCoupon
* Add test descriptions
2017-01-23 12:01:30 -07:00
Matteo Pagliazzi
79c3efaf9c
3.71.0
2017-01-23 19:05:39 +01:00
Matteo Pagliazzi
74c6a891fc
Revert "Revert Facebook Pixel" ( #8449 )
2017-01-23 16:38:56 +01:00
MathWhiz
9a5d17f538
attempt revert ( #8406 )
2017-01-23 16:03:23 +01:00
Matteo Pagliazzi
070c4a8fbd
add auth.local.passwordHashMethod field
2017-01-23 10:38:41 +01:00
Keith Holliday
2bbc4f4f4d
Paypal refactor lib ( #8420 )
...
* Abstracted paypal logic from controller. Added intial tests
* Added checkout tests
* Added checkout success test
* Added subscribe test
* Added subscribeSuccess tests
* Added subscribeCancel tests
* Added ipn tests
* Fixed broken test
* Added integration tests and fixed linting issues
* Added errors for paypal checkout success integration test
* Removed extra test
* Removed pending status from subscribe cancel test
* Added more error checking and tests
* Fixed lint issues
2017-01-22 09:59:47 -07:00
Alys
39c00ea433
change HTML <title> on static/old-news from "Old News" to "News"
...
That page now contains the most recent news as well as the old news.
2017-01-22 13:32:54 +10:00
Alys
dd6c1c764a
change footer's "Add-ons & Extensions" link
...
The new link is a better wiki page and is already in use in the Settings > API screen.
2017-01-22 13:15:12 +10:00
Sabe Jones
9b456d1760
3.70.0
2017-01-21 03:13:36 +00:00
Sabe Jones
acf1031317
chore(i18n): update locales
2017-01-21 02:50:49 +00:00
Sabe Jones
5d45204d8b
chore(sprites): compile
2017-01-21 02:41:31 +00:00
Sabe Jones
37a71924fe
Incentives, Batch 2 ( #8435 )
...
* feat(content): Incentives batch 2 gear
* feat(incentives): incentives 55-100
* chore(migration): hand out missed incentive
* refactor(constant): export MAX_INCENTIVES
* fix(incentives): correct const import
and say "Royal Purple Potion" not "Royal Purple"
2017-01-20 20:36:38 -06:00
Alys
9cf2408988
change name of Newbies Guild to Habitica Help: Ask a Question guild ( #8424 )
...
* change name of Newbies Guild to Habitica Help: Ask a Question guild
* remove ": Ask a Question" from "Habitica Help: Ask a Question" in locations where we are linking to the guild or its wiki page
2017-01-21 09:20:39 +10:00
Keith Holliday
638525f8d8
Stripe refactor to lib ( #8417 )
...
* Moved stripe tests to folder
* Abstracted stripe payments logic to lib
* Added initial unit test for stripe payment
* Added subscription tests
* Added tests for regulare purchases
* Added tests for edit subscription
* Added cancel tests
* Added integration tests
* Fixed lint issues
* Fixed lint issue
2017-01-20 16:08:52 -07:00
Keith Holliday
2c37ba3cee
Added migration runner that allows for migrations to use server code ( #8436 )
...
* Added migration runner that allows for migrations to use server code
* Replaced example script in migration runner
2017-01-20 16:08:01 -06:00
Sabe Jones
ad5b2fe540
3.69.1
2017-01-19 23:02:41 +00:00
Sabe Jones
bfb6daad51
fix(docs): separate def blocks
2017-01-19 23:02:22 +00:00
Sabe Jones
281b8e2b7c
3.69.0
2017-01-19 22:09:56 +00:00
Sabe Jones
3f88ea2378
fix(typo): extra brackets
2017-01-19 22:04:36 +00:00
Sabe Jones
9c6275d4ab
chore(i18n): update locales
2017-01-19 20:31:23 +00:00
Sabe Jones
fd3c8ddc8b
chore(sprites): compile
2017-01-19 20:22:32 +00:00
Sabe Jones
72f47ad4e6
chore(news): misc Bailey
2017-01-19 20:19:15 +00:00
ean
74c9a1b02d
Add missing text to buttons on the party / guild invite modal - Fixes #8391 ( #8402 )
...
* Fix missing text in party / guild invite modal
* add tests and abstract logic
* use translation lib for test
2017-01-19 12:17:38 -07:00
Keith Holliday
ffa561473c
[WIP] Amazon refactor to lib ( #8403 )
...
* Moved amazon tests to folder
* Abstracted amazon payment code and added initial test
* Abstracted cancel and subscribe logic to amazon payment lib
* Added arg checks to checkout
* Added constants. Added more subscription test
* Added with arg checks to cancel
* Fixed linting issues
* Added integration tests for amazon subscribe cancel
* Added integration test for amazon checkout
* Added integration test for amazon subscribe
* Added coupon unit test
* Fixed lint
* Fixed minor test issue and changed header expectations
* Fixed line endings
2017-01-19 08:30:30 -07:00
MathWhiz
080ffae4e1
apiDoc /chat Documentation ( #8277 )
...
* apiDoc /chat Documentation
* Add {NotFound} to FlagOwnMessage error
* Quick changes
* Update chat.js
2017-01-18 22:28:00 -07:00
Gerardo Saca
e395182c95
Fix User > Profile showing {getProgressDisplay()} - fixes #8412 ( #8421 )
...
* Fix User > Profile showing {getProgressDisplay()}
* Remove bad nextRewardAt check
2017-01-18 22:25:37 -07:00
Matteo Pagliazzi
68f4275c44
fix tests failures ( #8422 )
...
* fix tests failures
* make sure _meta is not public
* fix typo
* fix typo
2017-01-18 20:17:56 +01:00
Alys
4bf4c3a6c2
remove Windows line breaks
2017-01-19 05:00:54 +10:00
Sabe Jones
f00bb29192
fix(quest): correct pt 2 label
2017-01-18 16:25:52 +00:00
Alyssa Batula
016447ec77
Critical Hits now affect boss damage fixes #5429 ( #8092 )
...
* Moved critical hit calculation from _addPoints() to _calculateDelta(). Added user as an input argument to _calculateDelta() so for critical hit calculation
* Changed test to expect task value of 1.5 after critical hit
* Revert "Moved critical hit calculation from _addPoints() to _calculateDelta(). Added user as an input argument to _calculateDelta() so for critical hit calculation"
This reverts commit 51b8ab6498 .
* Moved critical hit calculation to _changeTaskValue(). Use value stored in user._tmp.crit in _addPoints()
* Test is no longer affected by critical hits
* Removed unneeded comment
* Added WIP test of critical hits
* Want the crit function to return 2 to test critical hits
* Changed crit function to export as a function within an object so that it can be stubbed for testing. References to the crit() function were updated to call crit.crit() instead
* Added test for increased experience on critical hits
2017-01-18 08:11:39 -07:00
Dumindu Buddhika
fa024e071b
added message saying quest is started ( #8107 )
...
* added chat message saying quest has started
* added info to message
* added information as meta data
* fixed failing test case
* added new tests
2017-01-18 08:08:47 -07:00
Keith Holliday
28fec237fe
Group plans misc fixes ( #8388 )
...
* Added notification for approval request in the group leaders language
* Added test for group task meta actions. Added sync when user claims
* Added tests for group task actions. Ensured assigned members are synce when added or removed
* Fixed approval required toggle
* Added support for users with comma in their name
* Fixed sync issue when user is approved and reloads the website
* Added advance options for group rewards
* Added back ticks to group claim message
* Fixed disappearing tasks that need approval
* Up chat limit to 400 for subbed groups
* Fixed line endings
* Updated activie subscription check
* Added group isSubscribed function
* Changed to isAfter
2017-01-18 07:54:49 -07:00
Sabe Jones
e4bb82768c
fix(sprites): add large-1 to repo
2017-01-18 01:52:14 +00:00
Sabe Jones
65eca22407
3.68.0
2017-01-18 01:26:58 +00:00
Sabe Jones
cea1597ee1
chore(i18n): update locales
2017-01-18 00:27:01 +00:00
Sabe Jones
3906952154
chore(sprites): compile
2017-01-18 00:16:01 +00:00
Sabe Jones
6169b9d0ae
feat(content): new Gold quests ( #8418 )
...
and Wintery Skins, and fixes #8412
2017-01-17 16:03:10 -08:00
Declan Ramsay
69cac7e504
Add markdown formatting to task-edit title text ( #8416 )
2017-01-17 14:49:16 -07:00
mleah
febf3f0024
Adding "How to gift subscription" copy to Settings > Subscription Page: Fixes Issue 8341 ( #8386 )
...
* Issue 8341 updating subscriber json and subscription settings page with gifting a subscription directions
* Issue-8341 updating the layout of the settings - subscription page
* Issue-8341 removing extra comma from gift subscription copy
* Issue-8341 removing extra spans in subscription jade file
2017-01-17 14:48:21 -07:00
Matteo Pagliazzi
563f40e4b7
client: reorganize files, router and add inventory skeleton
2017-01-17 19:45:27 +01:00
Matteo Pagliazzi
e2b06161e1
client: add task component
2017-01-17 18:07:02 +01:00
Alys
e7de8b8e2f
clarify two Notifications descriptions (onboarding, inactive account)
...
New words were supplied by Lemoness.
2017-01-17 07:32:35 +10:00
Matteo Pagliazzi
a0624d9507
fix build by not requiring optional package in prod
2017-01-16 18:31:29 +01:00
Matteo Pagliazzi
cddd0df4f2
chore(i18n) add overview and login incentives
2017-01-16 17:59:04 +01:00
Matteo Pagliazzi
220bfb3517
chore(i18n): update locales
2017-01-16 17:58:30 +01:00
Matteo Pagliazzi
2106a5ebd3
correct deps loading and shrinkwrap
2017-01-15 23:45:22 +01:00
Matteo Pagliazzi
bbffa9830b
client: replace deprecated vue-resource with axios, lint more file
2017-01-15 20:49:15 +01:00
Matteo Pagliazzi
caa546eb62
client: add missing test files and use v-once
2017-01-15 20:08:36 +01:00
Alys
4e83059652
remove outdated information about changing your email address
...
This is being done to remove a redundant string that
contains an email address, in preparation for actioning
https://github.com/HabitRPG/habitica/issues/8385 ("Email addresses
should not probably be translatable")
2017-01-15 22:50:32 +10:00
Matteo Pagliazzi
903cdb36ef
client: remove old code
2017-01-14 21:46:28 +01:00
Matteo Pagliazzi
d8128cc3db
New Client: english translations and misc fixes ( #8410 )
...
* misc fixes and add english translations
* add tests
2017-01-14 21:12:11 +01:00
MathWhiz
f888e80b01
apiDoc: meta ( #8167 )
...
* apiDoc: meta
* Update modelsPaths.js
* Update error
* fix test
* Update GET-model_paths.test.js
* Fixed test
2017-01-13 14:06:46 -07:00
Matteo Pagliazzi
fd7aedbff2
chore(locales): add merch file
2017-01-13 19:09:47 +01:00
Matteo Pagliazzi
6c5234313d
chore(i18n): update locales
2017-01-13 19:01:26 +01:00
Sabe Jones
08aa5758b4
3.67.1
2017-01-13 00:05:39 +00:00
Sabe Jones
1415e344c0
chore(i18n): update locales
2017-01-12 23:24:04 +00:00
Sabe Jones
2ce7915f06
fix(incentives): return 0 for upcoming at end of list
...
Also adds some new strings for upcoming content, adds a news announcement, and compiles a recent sprites fix.
2017-01-12 23:15:37 +00:00
MathWhiz
838c8b4e08
Update Royal Purple Flying PIg ( #8401 )
2017-01-12 15:06:25 -08:00
Keith Holliday
1590d955cd
Group plans reorder tasks ( #8358 )
...
* Added move route for group tasks
* Added group task reorder to front end
* Added syncing with group task order
* Fixed linting issues
* Added missing exec and abstracted move code
* Added unit test for moveTask
2017-01-11 19:16:20 +01:00
MathWhiz
2690caed35
News translation link ( #8393 )
...
* Add translation link to news
* Add newsArchive string
* Translate news archive link
* Fix link?
* Add link to wiki
2017-01-11 09:16:10 -07:00
Sabe Jones
dc2d4fa10b
fix(coveralls): update badge for /habitica
2017-01-10 22:25:40 -06:00
Sabe Jones
1540ec89ee
3.67.0
2017-01-10 20:49:54 +00:00
Sabe Jones
f304d4fe52
chore(migration): update Bailey to use monk
2017-01-10 20:47:58 +00:00
Sabe Jones
023e433a5c
feat(content): Triceratops pet quest
2017-01-10 20:32:21 +00:00
Declan Ramsay
ef4aeb29ab
Fixes task left in odd setting when cancelling editing with ESC / Escape Key; add click outside to close modal #8308 #8321 ( #8382 )
...
* Remove backdrop property from open modal call to allow click-outside to close, call cancelTaskEdit function on dismissal of edit modal via ESC or click-outside
* Remove commented out code, change catch function to normal (non-arrow)
* Modify task services test mock openModal function, to handle new use of subsequent promise resolution functionality
* Tidy old edit controls away
2017-01-10 12:04:34 -07:00
Jan Jorgensen
2b80931202
Fix home column style on medium screen widths fixes #8372 ( #8387 )
...
* handle medium screen width on home columns
* rename new-row helper used on home screen for todo column flow
2017-01-10 12:03:21 -07:00
myoshuGO
2950713712
Fixes #8227 ( #8380 )
...
* Fixes #8227
* Fixes #8227
* Fixes #8227
2017-01-10 12:00:53 -07:00
Jaka Kranjc
118f3bd1bb
gulp/gulp-transifex-test.js: fixed variable name typo ( #8389 )
2017-01-10 10:07:35 +00:00
Alys
69f1343ea8
correct apidocs: /api/v3/user/... not /user/...
2017-01-09 19:57:26 +00:00
Keith Holliday
918ee02d64
Added hp back to party member query ( #8378 )
2017-01-07 20:59:17 -06:00
Sabe Jones
0cac34dd26
3.66.3
2017-01-07 22:42:50 +00:00
Sabe Jones
1c859fc91f
chore(promo): end gift subs promo
2017-01-07 15:42:03 +00:00
Keith Holliday
857aa5827b
Ensured group tasks are removed from places that challegnes tasks are ( #8359 )
...
* Ensured group tasks are removed from places that challegnes tasks are
* Added tests for user reset and class cast
2017-01-07 12:01:12 +01:00
Matteo Pagliazzi
28e8ec2d2c
add BOSS_DAMAGE to valid notifications
2017-01-07 11:47:19 +01:00
Matteo Pagliazzi
856f13d213
chore(i18n): update locales
2017-01-07 11:43:53 +01:00
Sabe Jones
121fd38bd1
3.66.2
2017-01-06 21:28:35 +00:00
Keith Holliday
36d72f5f7a
Claim task messages are now system messages ( #8375 )
2017-01-06 13:00:23 -08:00
Keith Holliday
f1b8bd80e7
Added fix to correctly check if object is sub group for all users ( #8377 )
2017-01-06 14:09:57 -06:00
Brian David
84d2ce6a3f
Fixes issue #8315 ( https://github.com/HabitRPG/habitica/issues/8315 ) ( #8367 )
2017-01-06 11:45:13 -06:00
Keith Holliday
76010e6c8f
Added migration for profile restoration ( #8355 )
...
* Added migration for restoring profile data
* Updated migrations to use monk
* Fixed line endings
* Moved monk to dev dependencies
2017-01-06 11:07:21 -06:00
Keith Holliday
c707b6c99b
Add check to ensure obj is not user ( #8373 )
2017-01-06 10:23:39 -06:00
Sabe Jones
e4bd466cc7
3.66.1
2017-01-06 02:37:50 +00:00
Sabe Jones
001b8eb894
chore(news): Bailey 2017-01-05
2017-01-06 02:09:59 +00:00
Keith Holliday
9abcfe8614
Added fixes for party group plans ( #8366 )
2017-01-05 16:52:05 -06:00
Matteo Pagliazzi
bc6102551d
chore(i18n): update locales
2017-01-05 16:42:43 +01:00
Sabe Jones
959a3ff85b
fix(menus): keep icon after group ack
...
Also corrects a TypeError in the menu closing function.
2017-01-04 22:19:57 +00:00
Matteo Pagliazzi
518b874f64
Always use .exec() for .find*() and .update() ( #8361 )
...
* add exec where missing in /models
* ix taskManager query
* fix top-level controllers
* fix api-v3 controllers
2017-01-04 16:49:43 +01:00
Travis
6cc359a935
Adding new user.addNotification method with Mongodb Update ( #8272 )
...
* Adding new method to user schema that pushes a new notification to the database with an update operation instead of a save. fixes #8264
* fixing test text
* changing the addUserNotificationUpdate method to a static method as requested.
* Renaming to push notification
* fixing comment documentation based on pr comments.
* Changed the update statement to do a multi update and added a validation step. Added tests for both these cases.
* Updating pushNotification method to allow a query to be passed instead of an array of userIds to make it more flexible.
* Removing createdAt field from tests as it's no longer used.
* Removing only from test suite
2017-01-04 15:27:54 +01:00
Sabe Jones
514d35c0be
3.66.0
2017-01-03 22:03:09 +00:00
Sabe Jones
13da92ea68
feat(content): Armoire and BGs 2017-01
2017-01-03 21:35:23 +00:00
Travis
03c4d82b7d
fix: prevents blank messages from being posted to chat ( #8257 )
...
* fix: throws an error when the server receives a post chat request with a message containing only whitespace.
* Adding a test confirming behavior around messages that only contain newlines.
* Removing accidental only that was left on a test
2017-01-03 07:15:31 -07:00
Sabe Jones
d905ab7f86
3.65.2
2017-01-03 00:50:46 +00:00
Sabe Jones
c6560b6b1b
chore(event): end New Year's bennies
2017-01-03 00:19:20 +00:00
Keith Holliday
c61f660255
Added field existence checks ( #8356 )
2017-01-02 16:31:04 -07:00
Matteo Pagliazzi
2f1b683ec9
Avoid setting profile name to not found ( #8357 )
...
* avoid setting profile name to not found
* only set profile name when empty
* profile.name is required
* set profile name before validation
* fix and add tests
2017-01-03 00:00:01 +01:00
chan_gami
47bb217068
Fixes pressing enter to confirm character choice in IME creates new checklist line ( #8326 ) ( #8334 )
2017-01-02 10:03:03 -07:00
Declan Ramsay
f49fd05da1
Fixes on-hover notes on tasks do not update after you edit the notes, until a sync occurs ( #8353 )
...
* Shift taskPopover from one-time-binding to regular binding, allowing task note display to be updated
* Re-add Markdown filter to task popover
2017-01-02 10:00:35 -07:00
Matteo Pagliazzi
b0341aa06f
chore(i18n): update locales
2017-01-02 15:54:04 +01:00
Kaitlin Hipkin
b07ec18e33
Correct party up/on achievement string names ( #8313 )
...
* Revert party up/on achievement string names
* fix missed references to party up/on strings
2017-01-01 10:54:49 -07:00
Alys
12930a2bac
3.65.1
2016-12-31 07:47:49 +00:00
Alys
91f5c47d9d
Revert "feature: adding hp notification for boss damage" ( #8340 )
2016-12-31 17:31:25 +10:00
Sabe Jones
fe7850d10f
3.65.0
2016-12-30 23:30:42 +00:00
Sabe Jones
c5c2da75bf
fix(shops): hardcode NYE card
2016-12-30 23:08:01 +00:00
Sabe Jones
969607cd3b
feat(event): New Year's 2016
2016-12-30 22:19:29 +00:00
Travis
2a1f52a359
feature: adding hp notification for boss damage ( #8249 )
...
* feature: adding hp notification for boss damage. fixes #7749
* Updating boss damage text to 'Damage from Boss' to make it more clear
2016-12-30 13:29:20 -06:00
Keith Holliday
47d9594679
Group plans remove unlinked tasks ( #8332 )
...
* Added ability to delete tasks that are broken
* Added ability to delete group tasks after leaving group
2016-12-30 13:17:39 -06:00
Keith Holliday
97e40c81f3
Added error when nonleader attempts to invite to group plan ( #8331 )
2016-12-30 13:17:22 -06:00
Sabe Jones
c8b61a2f7d
feat(content): Armoire and BG strings 2017-01
2016-12-29 20:43:15 +00:00
Cai Lu
e9543f0d28
Add 'balanceGemAmount' to Amplitude #8057 ( #8323 )
...
* Add balanceGemAmount property
* Add check for balanceGemAmount property
* Fix balanceGemAmount to be 4 times balance
2016-12-29 14:31:30 -06:00
Keith Holliday
77b88490e4
(WIP) Thehollidayin/front end updates ( #8278 )
...
* Added read me and Inbox Page
* Fixed inbox linting
* Added converstaion route
* Added temp data and style
* Added social page and nav
* Fixed Inbox routes
* Added basic layout for Tavern Page
2016-12-29 13:24:08 -06:00
Keith Holliday
7fc2500bfd
Removed group plan option from gift modal ( #8327 )
2016-12-29 08:57:00 -06:00
Keith Holliday
fb229acb58
Added per user cost message if group has subscription ( #8328 )
...
* Added per user cost message if group has subscription
* Added user specification to cost
2016-12-29 08:56:40 -06:00
Sabe Jones
6ce83d1fa4
3.64.1
2016-12-28 22:03:35 +00:00
Sabe Jones
2be4815aea
chore(news): misc Bailey
2016-12-28 21:59:20 +00:00
Khwunchai Jaengsawang
1dbc42f48a
Fixes character appears too high in avatar on profile when no pet or mount is equipped ( #7916 ) ( #8318 )
2016-12-28 09:36:56 -06:00
Matteo Pagliazzi
89279c8aed
chore(i18n): update locales
2016-12-28 09:53:20 +01:00
Matteo Pagliazzi
faedb13598
add schema field to keep track of onboarding emails
2016-12-28 09:47:14 +01:00
Rick Kasten
c0c74659c5
Docker improvements ( #8297 )
...
* Improved docker, bower
* npm install missing mocha
* Fix for 'npm install -g npm@4' not resulting in a functional npm
* Improve speed of 'docker start' by withholding directories not used by image environment
* Reverting changes to bower.json
2016-12-28 09:33:24 +01:00
Travis
bf5ad2db1f
Fixing Exponential Quest Reward Scrolls ( #7800 )
...
* adding quest owner specific rewards. closes #2715
* Updating model to prevent this from being a breaking change.
* Removing duplicate translatable string and readding accidentally deleted portion
* capitalizing according to pr.
* fixing according to comments on pr
* removing final mistakes
* fixing whitespace
* re-adding the onlyOwner field that got deleted when the index.js file was moved and fixed console errors.
* moving cleaning of empty obejct for quest owner updates into quest owner updates method
* Fixing so tests pass by updating variable name and removing unnecessary parameter definition.
* adding a new test and refactoring client side code to use controller method.
2016-12-28 01:38:52 -06:00
Megan Tiu
7d99873960
Add inline save-close buttons to top of task modal ( #8319 )
2016-12-28 01:24:58 -06:00
Keith Holliday
e02ef00397
Add leader check for challenge tasks on delete icon ( #8325 )
2016-12-28 01:08:37 -06:00
Alys
23c5c4211c
decapitalise "A" in a title; Windows character removal; spacing fixes
...
- decapitaliseed "A" in "Create A Group"
- converted non-ascii apostrophes to single-quote for consistency with other strings
- removed a double space within a string
- removed Windows line endings on every line
- converted all leading four spaces to two spaces (normally wouldn't do that but since every line was already touched by the line ending change, why not)
2016-12-28 05:07:21 +00:00
Matteo Pagliazzi
69cc134fff
3.64.0
2016-12-27 17:18:59 +01:00
Matteo Pagliazzi
ffd9400cb7
fix: eslint: re-order packages
2016-12-26 16:04:36 +01:00
Matteo Pagliazzi
5be91ef842
fix test that was not passing because languages are not loaded in tests
2016-12-26 15:31:31 +01:00
Matteo Pagliazzi
3123183e46
chore(i18n): update locales
2016-12-26 11:59:44 +01:00
Matteo Pagliazzi
49cca7a601
WIP - Onboarding emails ( #8309 )
...
* add onboarding emails
* fix typo
2016-12-26 11:49:45 +01:00
Keith Holliday
7fbd38d18c
Checked to ensure tasks has checklists before attempting to sync last checklist item ( #8314 )
2016-12-25 15:00:41 -06:00
padm0
1f95376d39
added missing pixels to robe fixes #8289 ( #8296 )
2016-12-26 03:06:34 +10:00
Keith Holliday
2da0a1e88c
Task interaction fixes ( #8306 )
...
* Fixed interacting with a broken challenge
* Added fix for users using open tasks in edit mode
2016-12-22 11:40:00 -06:00
Keith Holliday
afacd3e1cf
Replaced array deconstruction with object ( #8300 )
2016-12-21 18:09:45 -06:00
Sabe Jones
a69b9e6705
3.63.0
2016-12-21 23:41:41 +00:00
Sabe Jones
e4e5d10316
Mixed type field for A/B testing ( #8302 )
...
* feat(AB-testing): mixed type field
* fix(AB-testing): lint errors
* fix(AB-testing): allow client access to _ABtests
* Revert "fix(AB-testing): allow client access to _ABtests"
This reverts commit 25832365ba .
* fix(AB-testing): preview check on server
* refactor(AB-testing): add comments
2016-12-21 15:19:00 -08:00
Sabe Jones
27c38bdf45
feat(content): subscriber items 2016-12
2016-12-21 20:34:45 +00:00
Keith Holliday
ea24eeb019
Thehollidayinn/group plans part 2 ( #8262 )
...
* Added all ui components back
* Added group ui items back and initial group approval directive
* Added approval list view with approving functionality
* Added notification display for group approvals
* Fixed linting issues
* Removed expectation from beforeEach
* Moved string to locale
* Added per use group plan for stripe
* Added tests for stripe group plan upgrade
* Removed paypal option
* Abstract sub blocks. Hit group sub block from user settings page. Added group subscriptin beneifts display
* Fixed lint issue
* Added pricing and adjusted styles
* Moved text to translations
* Added group email types
* Fixed typo
* Fixed group plan abstraction and other style issues
* Fixed email unit test
* Added type to group plan to filter our group plans
* Removed dev protection from routes
* Removed hard coding and fixed upgrade plan
* Added error when group has subscription and tries to remove
* Fixed payment unit tests
* Added custom string and moved subscription check up in the logic
* Added ability for old leader to delete subscription the created
* Allowed old guild leader to edit their group subscription
* Fixed linting and tests
* Added group sub page to user sub settings
* Added approval and group tasks requests back. Hid user group sub on profile
* Added group tasks sync after adding to allow for editing
* Fixed promise chain when resolving group
* Added approvals to group promise chain
* Ensured compelted group todos are not delted at cron
* Updated copy and other minor styles
* Added group field to tags and recolored group tag.
* Added chat message when task is claimed
* Preventing task scoring when approval is needed
* Added approval requested indicator
* Updated column with for tasks on group page
* Added checklist sync on assign
* Added sync for checklist items
* Added checkilist sync when task is updated
* Added checklist sync remove
* Sanatized group tasks when updated
* Fixed lint issues
* Added instant scoring of approved task
* Added task modal
* Fixed editing of challenge and group tasks
* Added cancel button
* Added add new checklist option to update sync
* Added remove for checklist
* Added checklist update
* Added difference check and sync for checklist if there is a diff
* Fixed task syncing
* Fixed linting issues
* Fixed styles and karma tests
* Fixed minor style issues
* Fixed obj transfer on scope
* Fixed broken tests
* Added new benefits page
* Updated group page styles
* Updated benefits page style
* Added translations
* Prevented sync with empty trask list
* Added task title to edit modal
* Added new group plans page and upgrade redirect
* Added group plans redirect to upgrade
* Fixed party home page being hidden and home button click
* Fixed dynamic changing of task status and grey popup
* Fixed tag editing
* Hid benifites information if group has subscription
* Added quotes to task name
* Fixed issue with assigning multiple users
* Added new group plans ctrl
* Hid menu from public guilds
* Fixed task sync issue
* Updated placeholder for assign field
* Added correct cost to subscribe details
* Hid create, edit, delete task options from non group leaders
* Prevented some front end modifications to group tasks
* Hid tags option from group original task
* Added refresh for approvals and group tasks
* Prepend new group tasks
* Fix last checklist item sync
* Fixed casing issue with tags
* Added claimed by message on hover
* Prevent user from deleting assigned task
* Added single route for group plan sign up and payments
* Abstracted stripe payments and added initial tests
* Abstracted amazon and added initial tests
* Fixed create group message
* Update group id check and return group
* Updated to use the new returned group
* Fixed linting and promise issues
* Fixed broken leave test after merge issue
* Fixed undefined approval error and editing/deleting challenge tasks
* Add pricing to group plans, removed confirmation, and fixed redirect after payment
* Updated group plan cost text
2016-12-21 13:45:45 -06:00
Travis
55a8eef3e1
Fixing Duplicate tasks showing up after joining a challenge ( #7787 )
...
* fix: prevents double joining challenge by quickly hitting join button on challenge twice. fixes #7730
* Fixing client side parameter updates.
2016-12-20 19:52:18 -06:00
Matteo Pagliazzi
92cbb4a07d
Upgrade ESLint to v3 ( #8299 )
...
* upgraded habitrpg-eslint-config to v2 and eslint to v3
* adapt to eslint3 rules
* update shrinkwrap
* update shrinkwrap again
2016-12-20 22:31:36 +01:00
Vince Campanale
3f96d05365
Fix gemgift spacing ( #8294 )
...
* included privateMessageGiftIntro in privateMessageGiftGemsMessage to take care of spacing error and make it easier for translators
* fixed spacing error in gems gift message and adjusted relevant tests
* removed privateMessageGiftIntro and privateMessageGiftSubscriptionMessage since they are no longer in use
2016-12-20 15:32:59 +01:00
Matteo Pagliazzi
0b72f6a613
chore(i18n): update locales
2016-12-19 21:44:04 +01:00
Matteo Pagliazzi
5e1e6be518
models: add required: true to id fields where missing
2016-12-18 17:16:49 +01:00
Matteo Pagliazzi
472ec99291
chore(i18n): update locales
2016-12-17 15:17:53 +01:00
Sabe Jones
0284e9a4e3
fix(event): sell Santa scrolls
2016-12-17 02:54:29 +00:00
Sabe Jones
1a0721c078
3.62.0
2016-12-17 02:17:50 +00:00
Sabe Jones
6b6b548ac5
chore(sprites): compile
2016-12-17 02:16:01 +00:00
Sabe Jones
30f3d786bb
feat(event): Winter Wonderland 2016-2017 ( #8290 )
2016-12-16 17:49:22 -08:00
padm0
07bbba6789
newly designed peppermint panda mount. Original images were incorrect drawings. fixes #7982 ( #8286 )
2016-12-16 16:53:09 -08:00
padm0
6afb2bd0d4
adjust positioning on mounts fixes #7982 ( #8285 )
...
* adjust positioning on mounts fixes #7982
* fixing background on peppermint flying pig
2016-12-16 16:46:37 -08:00
Jaka Kranjc
f1a3bd5001
transferGems: use receiver language translation for PM strings #7722 ( #8173 )
...
* transferGems: use receiver language translation for PM strings #7722
* chore(test): DRY up transfer gems test
* chore(test): Allow check for language in translation assertion
* chore(test): Add test that member locales are used in transfer gems msg
* sendMessage: optionally take also the message in sender's language
when present, it is stored in the sender's inbox instead of the version
in the target language.
* transferGems: prepare pm in both languages #7722
* sendMessage: take an object for the second parameter instead
* payments: made two more gift strings translatable
* buyGems: send both translations for gifted gems
* buyGems: send push notifications in target user's locale
* createSubscription: send both translations for gifted subs
* createSubscription: send push notifications in target user's locale
* transferGems: send push notifications in target user's locale
* tests: adjust payment tests for translation changes
* added function doc for sendMessage
* tests: added bilingual test for buyGems
2016-12-15 18:36:54 -06:00
Sabe Jones
3f6a13d209
fix(achievements): don't show unobtainable boss quests
2016-12-16 00:04:46 +00:00
Sabe Jones
3658e41fec
fix(jade): eliminate space warning, for real
2016-12-15 21:42:00 +00:00
Sabe Jones
c69d5c7ae6
fix(achievements): don't return undefined
2016-12-15 21:35:21 +00:00
Sabe Jones
747f9e6a99
fix(achievements): show boolean pet cheevos
...
Also fixes a spacing issue that threw Jade warnings.
2016-12-15 21:03:55 +00:00
Matteo Pagliazzi
7755ab090b
chore(i18n): update locales
2016-12-15 21:57:45 +01:00
Travis
9ed17df1e3
Updating group.removeMember api to send an email for rescinded party invite ( #8280 )
...
* feature: updating group.removeMember api to send an email to a user when an invite was rescinded or when no message was provided by the performing user.
* Adding validation that the email is being sent to the right user.
* fixing linting error
2016-12-15 20:47:18 +01:00
Sabe Jones
faeb040a83
fix(achievements): show Rebirths count
2016-12-15 17:49:15 +00:00
Sabe Jones
0a1ae1375e
fix(achievements): camelcase altPath
2016-12-15 17:43:54 +00:00
Sabe Jones
9756030fa2
3.61.0
2016-12-15 17:35:51 +00:00
Sabe Jones
c66172b74b
chore(sprites): compile
...
and update Bailey date
2016-12-15 16:50:09 +00:00
Sabe Jones
281f6d1806
Holly Potions ( #8281 )
...
* feat(content): Wonderland 2016 gear strings
* feat(content): Holly Potions
and string data for Winter Wonderland and December subscriber gear
* fix(event): correct winter availability
* refactor(canBuy): concise return logic
* chore(news): Bailey
2016-12-15 08:36:28 -08:00
Matteo Pagliazzi
237095d109
Notifications: remove timestamps ( #8287 )
...
* user notifications: make updatedAt public
* notifications: disable timestamps
2016-12-15 17:33:24 +01:00
Travis
fa788f49fc
Preventing users from buying already gifted subscriber items ( #7734 )
...
* Adding the unopened mystery items to the call to get not obtained subscriber items. closes #7712
* refactoring according to pr
* Refactoring according to pr. moved time-travelers to it's own file and added new tests.
2016-12-15 10:00:49 -06:00
Kaitlin Hipkin
0817cf96e1
Achievement list renovation & Achievements API ( #7904 )
...
* pull apart achievements into different subcategories
* achievs previously hidden to others if unachieved are now always shown
* achievs previously always hidden if unachieved are now always shown
* pull apart ultimate gear achievs
* add achiev wrapper mixin
* add achiev mixin for simple counts
* add achiev mixin for singular/plural achievs
* add simpleAchiev mixin and support attributes
* always hide potentially unearnable achievs if unearned
* contributor achiev now uses string interpolation for readMore link
* transition to basic achiev grid layout
* fix npc achievement img bug introduced in c90f7e2
* move surveys and contributor achievs into special section so it is never empty
* double size of achievs in achievs grid
* achievs in grid are muted if unachieved (includes recompiled sprites)
* fix streak notification strings
* add counts to achievement badges for applicable achieved achievs
* list achievements by api
* fix achievement strings in new api
* unearned achievs now use dedicated (WIP) 'unearned' badge instead of muted versions of the normal badges
* fix & cleanup achievements api
* extract generation of the achievements result to a class
* clean up achievement counter css using existing classes
* simplify exports of new achievementBuilder lib
* remove class logic from achievementBuilder lib
* move achievs to common, add rebirth achiev logic, misc fixes
* replace achievs jade logic with results of api call
* fix linting errors
* achievs lib now returns achievs object subdivided by type (basic/seasonal/special
* add tests for new achievs lib
* fix linting errors
* update controllers and views for updated achievs lib
* add indices to achievements to preserve intended order
* move achiev popovers to left
* rename achievs lib to achievements
* adjust positioning of achieve popovers now that stats and achievs pages
are separate
* fix: achievements api correctly decides whether to append extra string for master and triadBingo achievs
* revert compiled sprites so they don't bog down the PR
* pull out achievs api integration tests
* parameterize ultimate gear achievements' text string
* break out static achievement data from user-specific data
* reorg content.achievements to add achiev data in related chunks
* cleanup, respond to feedback
* improve api documentation
* fix merge issues
* Helped Habit Grow --> Helped Habitica Grow
* achievement popovers are muted if the achiev is unearned
* fix singular achievement labels / achievement popover on click
* update apidoc for achievements (description, param-type, successExample, error-types)
* fix whitespace issues in members.js
* move html to a variable
* updated json example
* fix syntax after merge
2016-12-13 12:48:18 -06:00
Matteo Pagliazzi
97e1d75dce
3.60.0
2016-12-12 22:04:34 +01:00
Matteo Pagliazzi
52bf20c27d
upgrade shrinkwrap
2016-12-12 22:01:39 +01:00
Matteo Pagliazzi
5dbaf39aba
Node 6 and NPM 4 ( #8081 )
...
* upgrade node to version 6
* upgrade npm to v4
* update shrinkwrap
* use npm 4 in travis
* use mongoose 4.6.4
* update shrinkwrap
* fix async test and upgrade mongoose
* fix amazon test
* remove debugging code
* working tests with separate server
* update coupon code
* mupdate mongoose
* nvm: relax node version in .nvmrc
2016-12-12 21:51:53 +01:00
Sabe Jones
66d402c985
3.59.1
2016-12-12 20:33:12 +00:00
Sabe Jones
8048146223
chore(news): Bailey
2016-12-12 20:17:58 +00:00
Matteo Pagliazzi
e2c07e458d
client: fix action name
2016-12-12 21:05:51 +01:00
padm0
90a9e8e192
Fixing 112016 mystery set. ( #8276 )
2016-12-12 09:13:59 -08:00
Keith Holliday
f8039f48a6
Styled merch button to have highlight ( #8273 )
2016-12-10 22:09:06 -06:00
PowerlinxJetfire
04337f8e83
Fix filter buttons when windows resizes fixes (partially) #7772 ( #8258 )
...
* Reloads the quest panel solving issue #7697
* Revert "Reloads the quest panel solving issue #7697 "
This reverts commit 0d58fb0fd3 .
* fix overlapping filter buttons when windows resizes
This fixes one of the two causes of issue #7772 .
https://github.com/HabitRPG/habitica/issues/7772
2016-12-10 22:08:26 -06:00
Keith Holliday
45297f8bf9
Merge pull request #8256 from a2lin/equipment_search
...
Adds a free-text filter (search) to the equipment page.
2016-12-10 16:28:11 -06:00
Keith Holliday
6f112c29f2
Merge pull request #8268 from Tallestthomas/develop
...
Show link leading to the Food Preferences Wiki page.
2016-12-10 14:41:17 -06:00
Keith Holliday
4d1edb363c
Merge pull request #8243 from 15313-platypi/develop
...
Quest Panel Reload (Issue #7697 )
2016-12-10 14:34:43 -06:00
Alexander Lin
4e303cc592
Clean up code
2016-12-10 02:15:30 -08:00
Travis
798a975185
fix: confirm no user objects reference a group before deleting it when the member count reaches 0 ( #8267 )
...
* fix: confirm no user objects reference a group before deleting it when the member count reaches 0
* Updating mongo queries to return promises and use the select statement.
2016-12-09 12:14:25 -08:00
Keith Holliday
eb2b46fc5d
Merge pull request #8269 from Hus274/8265
...
Adding a merchandise link to the marketplace selector
2016-12-09 11:57:36 -08:00
Keith Holliday
29854d3bdb
Merge pull request #8271 from Hus274/8266
...
Adding habitica mugs to the static merchandise page
2016-12-09 11:54:45 -08:00
Sabe Jones
f8751b002c
fix(subs): record creation for gifts
2016-12-09 19:52:17 +00:00
Travis
cd545e08d5
Implementing retries on failed user updates when finishing a quest ( #8251 )
...
* Implementing retries on failed user updates when finishing a quest. fixes #8035
* Refactoring mongo db retries to use the same as code path as original call and moving retries to count based over time based.
* Adding tests for retry logic and updating retries to happen recursively
* Moving callbacks to promises and other tweaks according to pr.
* Chaging mongoose promise to use .catch() functionality
* If all retries fail, the system will now throw an error instead of returning an error message.
2016-12-09 11:30:17 -08:00
Travis Husman
f69bb4f023
Adding habitica mugs to the static/merch page. fixes #8266
2016-12-09 10:35:00 -08:00
Tom Rasmussen
847081d2b2
Removed extra newlines
2016-12-09 12:01:05 -05:00
Travis Husman
8112d46ea4
Removing line break
2016-12-09 07:32:40 -08:00
Travis Husman
d13bded647
Updating the merchandise link to look like a list item.
2016-12-09 07:31:48 -08:00
Matteo Pagliazzi
1de4ab3612
client: namespaces for actions and getteters
2016-12-08 23:01:59 -08:00
Keith Holliday
f9f22f313f
Merge pull request #8261 from b9chris/develop
...
Fix a bug where 1005-768 the avatars and health bar get covered up.
2016-12-08 18:50:18 -08:00
Sabe Jones
f57eed85a8
3.59.0
2016-12-09 02:42:13 +00:00
Sabe Jones
10dd3318ab
fix(subs): append Gift for troubleshooting clarity
2016-12-09 02:35:51 +00:00
tallestthomas
cbef83c14a
Removed yarn.lock and added it to the .gitignore
2016-12-08 21:31:14 -05:00
Sabe Jones
59709a8590
chore(sprites): compile
...
and Bailey
2016-12-09 02:30:39 +00:00
Sabe Jones
f85f2a0c6d
Gift Subscriptions Promo ( #8270 )
...
* WIP(promo): buy-1-get-1 subs
* WIP(subscriptions): Slack integration
* feat(Slack): notify on sub buy
2016-12-08 18:08:56 -08:00
Travis Husman
605a5a1d5c
Adding a merchandise link to the marketplace selector. fixes #8265
2016-12-08 08:19:13 -08:00
tallestthomas
2d5d786c8e
Added pet food link to pets.json and jade template (issue #8023 )
2016-12-08 11:05:22 -05:00
Travis
5efe5b7b10
updating dragon mount images to all align. fixes #8253 ( #8259 )
2016-12-08 19:52:12 +10:00
Alexander Lin
3e92bb22fa
Refactor, add spec tests for equipment search
2016-12-08 00:08:18 -08:00
Sabe Jones
1249b9d410
feat(content): Dec 2016 pets
2016-12-07 20:57:25 +00:00
Keith Holliday
197aafe092
Updated the button stlyes to make them closer ( #8260 )
2016-12-07 11:47:24 -08:00
tallestthomas
79829ca128
Added link to pet food wiki ( #8023 )
2016-12-07 10:30:29 -05:00
Chris Moschini
adaa1d9a3e
Fix a bug where 1005-768 the avatars and health bar get covered up.
2016-12-07 08:55:36 -05:00
Matteo Pagliazzi
3e6691dbbb
client: test: getters
2016-12-06 18:53:03 -08:00
Matteo Pagliazzi
046761b9aa
client: reorganize filters and add tests
2016-12-06 18:27:49 -08:00
Matteo Pagliazzi
0b0466b960
client: reorganize actions
2016-12-06 17:11:40 -08:00
Matteo Pagliazzi
f8d4a2bd6b
client: update blue and yellow colors
2016-12-06 14:05:01 -08:00
Matteo Pagliazzi
1af59a3770
client: move files again to fix tests
2016-12-06 13:17:23 -08:00
Matteo Pagliazzi
bbcb13c91b
client: reorganize store files
2016-12-06 12:47:47 -08:00
Matteo Pagliazzi
d27dc46c50
chore(i18n): update locales
2016-12-05 16:13:45 -08:00
Alexander Lin
679459b83b
Adds free-text filter to equipment page
...
Closes #8241
2016-12-05 01:06:56 -08:00
Blade Barringer
5a619773d5
chore(i18n): update locales
2016-12-05 01:12:42 -06:00
Marcel Oyuela-Bonzani
ad76ab1315
Triple Equals sign
2016-12-04 13:40:46 -05:00
Marcel Oyuela-Bonzani
15eb8db925
Fix for issue noted.
2016-12-04 04:31:04 -05:00
MathWhiz
a0e92c5605
change stable text ( #8247 )
2016-12-04 17:37:23 +10:00
Chris
eac3e36c07
changed favicon - fixes #7720 ( #8252 )
...
* changed favicon
* Revert "changed favicon"
This reverts commit f28b9eb738 .
* Changed Favicon
fixes #7720
2016-12-04 17:30:35 +10:00
Alys
0b8def555b
make default profile name more descriptive (ref dca958f2e2)
2016-12-04 13:43:49 +10:00
Alys
5f5fa5c2eb
rename Library of Shared Lists guild to Library of Tasks and Challenges
2016-12-04 12:49:43 +10:00
Sabe Jones
1eac8bbbbe
fix(migration): correct comments
2016-12-02 09:48:26 -06:00
Alys
49c7580cd4
3.58.1
2016-12-02 19:41:31 +10:00
Matteo Pagliazzi
dca958f2e2
make sure entire user is loaded when saved
2016-12-02 10:20:54 +01:00
Sabe Jones
eae5f0d605
fix(sprites): staff position
2016-12-02 00:08:44 +00:00
Sabe Jones
6ab091645c
3.58.0
2016-12-01 21:44:23 +00:00
Sabe Jones
d66041c280
chore(sprites): compile
2016-12-01 21:43:46 +00:00
Sabe Jones
de070a450a
feat(content): BGs and Armoire 2016-12
2016-12-01 21:22:22 +00:00
Sabe Jones
eaaab35f31
fix(stats): back & body works
...
Also adds December Take This migration
2016-12-01 18:49:40 +00:00
Travis
6a63f080ad
New feature that notifies a user when their group invite is accepted. ( #8244 )
...
* New notification feature that notifies a user when their group invite is accepted. fixes #7788
* Updating to a modal instead of a popup notification
* Making a generic modal template and using it for notifications of group invitation acceptance.
* Working with paglias's comments for doing translation server side.
* Final changes based on pr comments.
2016-12-01 19:04:57 +01:00
Myles Louis Dakan
c42f81b629
changed quest images for egg and knight1 ( #8245 )
2016-12-01 10:58:38 -06:00
Sabe Jones
9a78a7b896
fix(npcs): remove foamy Daniel
2016-12-01 15:44:08 +00:00
Alys
8b70721137
change date for latest Bailey from 11/24 to 11/30
2016-12-01 20:51:36 +10:00
Alys
44ffbd716d
make gem cap reset message more accurate for when you're reading it at the start of a month
2016-12-01 20:15:13 +10:00
Sabe Jones
5bfc3a5ff4
3.57.2
2016-11-30 21:07:17 +00:00
Sabe Jones
0ba5df4164
chore(news): Last Chance Bailey
2016-11-30 20:43:55 +00:00
Sabe Jones
52a59c8192
Revert "Display first login incentive reward when bailey is dismissed ( #8234 )"
...
This reverts commit ac732b2c85 .
2016-11-30 20:42:39 +00:00
Matteo Pagliazzi
c1a860494d
chore(i18n): update locales
2016-11-30 14:08:34 +01:00
Keith Holliday
395dafa127
Merge pull request #8242 from TheHollidayInn/login-incentives-remove-multiple-notifications
...
Login incentives remove multiple notifications
2016-11-29 09:51:34 -06:00
Keith Holliday
bab41647f5
Fixed lint issues
2016-11-29 09:18:07 -06:00
Keith Holliday
8582a67308
Fixed broken tests and style changes
2016-11-29 08:53:36 -06:00
Marcel Oyuela-Bonzani
0d58fb0fd3
Reloads the quest panel solving issue #7697
2016-11-28 22:29:20 -05:00
Keith Holliday
1d2482f8bc
Fixed linting issues
2016-11-28 21:24:25 -06:00
Keith Holliday
f4cf906127
Added remove when previous login incentive notifications exist
2016-11-28 21:19:53 -06:00
Sabe Jones
559f9b1825
3.57.1
2016-11-28 21:40:34 +00:00
Sabe Jones
c7039bc9ea
fix(incentives): pixel paws, purple background
...
Also turns off automatic Base Turkey pet award for new users.
2016-11-28 20:57:35 +00:00
Matteo Pagliazzi
f929d36e1a
chore(i18n): update locales
2016-11-28 19:43:06 +01:00
Keith Holliday
254d1a3465
Merge pull request #8237 from TheHollidayInn/login-progress-counter-fix
...
Fixed login counter on the first day
2016-11-26 17:36:01 -06:00
Alys
442aae8a35
fix spelling mistake in Check-In Incentives social media messages (consitent > consistent)
2016-11-27 07:29:47 +10:00
Keith Holliday
bcb0ed0a5c
Fixed login counter on the first day
2016-11-26 10:30:09 -06:00
Alys
a48b8f0e34
add whitespace between GP and XP amount and label in quest modals
2016-11-26 18:32:37 +10:00
Alyssa Batula
7eeeda2aae
Send a message to the party chat when a quest is aborted, fixes #4879 ( #8150 )
...
* Send a message to the party chat when a quest is aborted
* Added test cases for sending a message to party when quest is aborted
* Restore Group.prototype.sendChat after aborted quest test
2016-11-26 17:48:42 +10:00
Sabe Jones
a5ad9c30f0
fix(mobile): temp remove new unlock styles
2016-11-24 06:06:11 +00:00
Keith Holliday
ac732b2c85
Display first login incentive reward when bailey is dismissed ( #8234 )
2016-11-23 21:44:11 -06:00
Sabe Jones
a56b2d68fb
3.57.0
2016-11-24 02:05:03 +00:00
Sabe Jones
25b0ff38c4
Login Incentives ( #8230 )
...
* feat(incentives): login bennies WIP
* feat(content): incentive prize content WIP
* fix(content): placeholders pass tests
* WIP(content): Bard instrument placeholder
* feat(content): Incentives build
* chore(sprites): compile
and fix some strings
* WIP(incentives): quests and backgrounds
* fix(quests): correct buy/launch handling
* [WIP] Incentives rewarding (#8226 )
* Added login incentive rewards
* Updated incentive rewards
* Added incentive modal and updated notification structure
* Added analytics to sleeping
* Added login incentives to user analytics
* Fixed unit tests and ensured that prizes are incremented and not replaced
* Updated style of daily login incentive modal
* Added rewards modal
* Added translations
* Added loigin incentive ui elements to profile
* Updated login incentives structure and abstracted to common.content
* Added dynamic display for login incentives on profile
* Added purple potion image
* Updated daily login modal
* Fixed progress calculation
* Added bard gear
* Updated login incentive rewards
* Fixed styles and text
* Added multiple read for notifications
* Fixed lint issues
* Fixed styles and added 50 limit
* Updated quest keys
* Added login incentives reward page
* Fixed tests
* Fixed linting and tests
* Read named notifications route. Add image for backgrounds
* Fixed style issues and added tranlsations to login incentive notification
* Hided abiltiy to purchase incentive backgrounds and added message to detail how to unlock
* Updated awarded message
* Fixed text and updated progress counter to display better
* Fixed purple potion reward text
* Fixed check in backgrouns reward text
* fix(quest): pass tests
* Added display of multiple rewards
* Updated modal styles
* Fixed neagtive 50 issue
* Remvoed total count from daily login incentives modal
* Fixed magic paw display
* fix(awards): give bunnies again
* WIP(incentives): more progress on BG shop
* fix(incentives): actually award backgrounds
* fix(incentives): more BG fixy
* fix(backgrounds): don't gem-buy checkin bgs
* Added dust bunny notification
* fix(incentives): don't redisplay bunny award
* chore(news): Bailey
and different promo sprite
2016-11-23 19:34:09 -06:00
Sabe Jones
dcc06931cc
fix(test): disable unreliable XML test
2016-11-23 23:16:16 +00:00
Matteo Pagliazzi
bc3ebbd095
pin mongoose
2016-11-23 21:22:35 +01:00
Matteo Pagliazzi
e5b9581743
update vue
2016-11-23 20:02:35 +01:00
Matteo Pagliazzi
4b9fe49e3a
skip randomly failing test
2016-11-23 14:46:23 +01:00
Alys
ab4c8b0a46
delete broken newsArchive translation and link from Whats New page to fix https://github.com/HabitRPG/habitica/pull/8216#issuecomment-262430401
2016-11-23 21:39:14 +10:00
Sabe Jones
f6c26fe869
3.56.0
2016-11-23 02:05:23 +00:00
Sabe Jones
80e9735b28
Turkey Day 2016 ( #8231 )
...
* feat(event): Turkey Day 2016
* fix(test): allow for free pet
2016-11-22 20:00:10 -06:00
Matteo Pagliazzi
aa6f188bd9
new client: remove comments
2016-11-22 13:49:35 +01:00
MathWhiz
e8b7660376
Add Costume Info to member modal ( #7768 )
...
* Add localization strings
* Change name of Equipment section
* Add costume section to member modal
* Add costume section to member modal
* Add current pet and current mount info
* Reorder Sections and Separate Active Mounts/Pets
* switch ng-show with ng-if
* Add `noActiveMount` to pets.json
* Breaking Stuff
* Add petservices.js to the manifest
* Remove Extra Parenthesis
* Progress towards backgrounds
* Add semicolons
* Add background information
* Add all methods in petServices to userCtrl and memberModalCtrl
* Add avatar settings
* Add semicolons
* Revert "Add avatar settings"
This reverts commit 6e8cca9736 .
* Remove active-pet-and-mount
* Remove Content from memberModalCtrl
* Update costumeServices.js
* Make costumeservices.js more readable
* Update costumeServices.js
* Update costumeService logic
* Remove unused strings
* Fix include statements
* move service
* Update pet/mount logic
* fixes
* Fix background logic
2016-11-21 21:19:13 +10:00
Mich Elliott
7d76622410
Remove white backgrounds from mount sprites ( #8217 )
...
* Remove white background from single mount sprite
* Remove white background on ~40 mount sprites
2016-11-21 07:48:41 +10:00
MathWhiz
928e5f66c4
Add translation link to news ( #8216 )
...
* Add translation link to news
* Add newsArchive string
* Translate news archive link
2016-11-20 14:22:59 +10:00
MathWhiz
6a343535c0
Remove party joined option ( #8212 )
...
* Remove party joined option
* Make default sort sort by profile name
* Remove extraneous comment
2016-11-20 14:08:18 +10:00
Alys
f58f6acb44
correct apidoc comments for updating and deleting a tag
2016-11-19 12:37:21 +10:00
Matteo Pagliazzi
64754777ed
New Client: working navigation ( #8131 )
...
* initial work
* new client: working navigation and tasks showing up
* finish header menu and add avatar component
* fix sprites in new client
* initial header version
* initial styling for top menu
* more progress on the header menu
* almost complete menu and avatar
* correctly apply active class for /social and /help
* fix header colors and simplify css
* switch from Roboto to native fonts
* remove small avatar and add viewport
* fixes
* fix user menu with and progress bars
* fix avatar rendeting
* move bars colors to theme
* add site overrides
* fix tests
* shrinkwrap
* fix sprites path
* another try at fixing the sprites path
* another try at fixing the sprites path
2016-11-18 19:20:25 +01:00
Sabe Jones
3b5e4b6d84
3.55.0
2016-11-17 22:26:26 +00:00
Sabe Jones
9383578cb8
chore(news): Bailey
2016-11-17 21:29:26 +00:00
Sabe Jones
474672ec64
Merge pull request #8225 from HabitRPG/sabrecat/hairstyles
...
New Hairstyles
2016-11-17 15:20:55 -06:00
Keith Holliday
25c6691793
Added party sync and request sync events ( #8223 )
...
* Added party sync and request sync events
* Changed party member sync to be handled locally
* Optimized assignment to only use member variables
* Removed party sync event
2016-11-17 20:10:33 +01:00
Keith Holliday
3ea7b72024
Passed language param to text functions ( #8220 )
2016-11-17 19:32:07 +01:00
Sabe Jones
2d6f05a9a4
fix(hairstyles): base layer above bangs
2016-11-17 17:49:35 +00:00
Sabe Jones
28637286d6
fix(sprites): remove base outlines
2016-11-17 17:49:35 +00:00
Sabe Jones
874887b790
fix(hair): exclusivity and canvas tweaks
2016-11-17 17:49:34 +00:00
Sabe Jones
c977e5ebb5
fix(sprites): adjust Y position
2016-11-17 17:49:34 +00:00
Sabe Jones
f040e668f3
chore(sprites): add
2016-11-17 17:49:34 +00:00
Sabe Jones
55a15f938c
feat(customize): new hairstyles
2016-11-17 17:45:31 +00:00
shalott
8c4f35daf4
Fixing test failure
...
This test seems to occasionally start failing (another coder reported the same thing happening to them in the blacksmiths’ guild) because the order in which the tasks are created can sometimes not match the order in the array. So I have sorted the tasks array after creation by the task name to ensure a consistent ordering, and slightly reordered the expect statements to match.
2016-11-16 21:52:23 +01:00
Matteo Pagliazzi
8f38ce3424
do not give _id to purchased.plan
2016-11-16 21:44:47 +01:00
Arashi007
b8f57a74d0
Added Airu's Theme ( #8204 )
...
* Airu's Theme
* Delete Minus_Habit.ogg
* Delete Minus_Habit.mp3
* Add files via upload
2016-11-16 20:11:22 +10:00
Sabe Jones
7ed26c0dbe
3.54.0
2016-11-16 02:12:33 +00:00
Sabe Jones
e8f5b26d4d
chore(sprites): compile
...
and Bailey
2016-11-16 02:04:10 +00:00
Sabe Jones
0273648b6b
Merge pull request #8221 from HabitRPG/sabrecat/pets-201611
...
Ferret Pet
2016-11-15 19:48:33 -06:00
Sabe Jones
b6fdac8885
feat(quest): Ferret Pet
2016-11-15 22:14:12 +00:00
Sabe Jones
00e6389672
3.53.5
2016-11-15 04:21:46 +00:00
Blade Barringer
e02c669b61
Move hr to prevent UserID comment from showing ( #8214 )
2016-11-14 21:59:31 -06:00
Blade Barringer
f0cb7c6bf3
Comment out group task fetching
2016-11-14 21:42:23 -06:00
Sabe Jones
571ef0b309
fix(news): add date
2016-11-15 03:34:50 +00:00
Blade Barringer
74328d1bcc
chore(i18n): update locales
2016-11-14 21:33:01 -06:00
Sabe Jones
d34a9d828c
Removed task get approvals request ( #8218 )
2016-11-14 21:09:36 -06:00
Keith Holliday
2fd35b3a40
Removed task get approvals request
2016-11-14 21:05:54 -06:00
Sabe Jones
e27512f626
3.53.4
2016-11-15 00:46:15 +00:00
Sabe Jones
dbf9cb3b4e
chore(news): misc Bailey
2016-11-15 00:27:40 +00:00
AccioBooks
34c1245519
Move hr to prevent UserID comment from showing
2016-11-14 10:58:03 -06:00
Keith Holliday
f602bfe438
Removed group subscription options ( #8211 )
2016-11-13 20:24:59 +01:00
Alys
9aa4b8aa64
add 'month' to gift subscription message - fixes https://github.com/HabitRPG/habitica/issues/7747
...
I haven't pluralised this by using "month(s)", because the phrase "a 3 month subscription" is acceptable in English. Translators may use pluralisation as desired, although note that the same wording will be used for 1 month subscriptions.
2016-11-13 20:40:01 +10:00
Alys
5a150ebc5b
change '/group/' to '/groups/' in docs for /api/v3/challenges/groups/:groupId
2016-11-13 17:43:52 +10:00
Keith Holliday
cbe1892b50
Added note sync when user adds task to challenge, tests, and fixed challenge tests ( #8200 )
2016-11-12 23:48:22 +01:00
Keith Holliday
13df60e0dd
Group approval ui ( #8184 )
...
* Added all ui components back
* Added group ui items back and initial group approval directive
* Added ability to mark tasks as requires approval. Added approvals ctrl. Added get approvals method to tasks service
* Added approval list view with approving functionality
* Added error to produce message when task requests approval
* Added notification display for group approvals
* Fixed notification read and adding task
* Fixed syncing with group approval required
* Added group id to notifications for redirect on client side
* Fixed approval request tests
* Fixed linting issues
* Removed expectation from beforeEach
* Moved string to locale
* Added eslint ignore
* Updated notification for group approved, added new icons, and updated styles
* Hid group plan ui
2016-11-12 23:47:45 +01:00
Blade Barringer
3ff7692528
chore(i18n): update locales
2016-11-11 08:08:46 -06:00
Sabe Jones
111bba84dc
feat(content): 2016-11 pet quest strings
2016-11-10 23:12:42 +00:00
Keith Holliday
b0d2b72b88
Updated buy special item to use function call wrapper ( #8203 )
2016-11-10 21:36:49 +01:00
Sabe Jones
696317ea8a
fix(quests): Basilist error with no party
2016-11-07 15:30:44 +00:00
Sabe Jones
593178a46a
fix(sprites): copy corrected Ian to prod path
...
fixes #7867 (again)
2016-11-07 15:20:04 +00:00
MathWhiz
f8fe16482d
Unsubscribe documentation
...
closes #8187
2016-11-06 21:41:12 -06:00
Romeeka Gayhart
5108480ec5
Get skipped/pending unit tests working for revive ( #8193 )
2016-11-06 21:17:52 -06:00
Sabe Jones
95968b1b1c
3.53.3
2016-11-06 22:05:28 +00:00
Sabe Jones
566569af98
fix(event): end Fall Fest f'real
2016-11-06 21:36:52 +00:00
Alys
6693e9fca9
replace candy food with normal food and enhance canBuy / canDrop code ( #8194 )
...
* change food to normal; add variables to choose type of food; add canBuy, canDrop to cake
* reinstate ability to control canBuy and canDrop separately
2016-11-06 15:33:19 -06:00
Romeeka Gayhart
431bde56d2
Convert test UUID to string to avoid test error ( #8195 )
2016-11-05 23:53:11 -04:00
Sabe Jones
7cf17c0e63
3.53.2
2016-11-04 21:15:10 +00:00
Sabe Jones
49561bfc8c
fix(test): accommodate changing seasons
2016-11-04 20:38:29 +00:00
Sabe Jones
8cbbb58e78
chore(event): end Fall Fest
2016-11-04 20:20:53 +00:00
Sabe Jones
905549e379
3.53.1
2016-11-04 19:23:55 +00:00
Sabe Jones
5d45c7209a
chore(news): blog Bailey
2016-11-04 19:02:29 +00:00
Rick Kasten
371cddfe17
Updated bossColl1, bossColl1Broken ( #8148 )
2016-11-04 19:38:12 +10:00
AccioBooks
fcfac30caa
Api doc status ( #8165 )
...
* Add example
* Update example
2016-11-03 08:31:30 -05:00
Corinna Jaschek
b094fb1e52
added message for challenges that could not be found - fixes #5538
...
closes #8176
2016-11-03 07:52:43 -05:00
Keith Holliday
a2dd82b6db
Hid nav bar ( #8181 )
2016-11-02 21:58:17 -05:00
Sabe Jones
e6071610e4
fix(migration): revert bogus connect info
2016-11-03 00:29:57 +00:00
Sabe Jones
bdd0e2bb79
3.53.0
2016-11-03 00:12:32 +00:00
Sabe Jones
054a9a6f2b
chore(sprites): compile
2016-11-02 23:29:12 +00:00
Sabe Jones
35b9ed6273
backgrounds and Armoire 2016-11 ( #8178 )
...
* feat(content): backgrounds and Armoire 2016-11
* chore(event): November Take This migration
* chore(news): Bailey
2016-11-02 18:27:32 -05:00
Keith Holliday
e65277baa5
Added check to ensure config is defined ( #8180 )
2016-11-02 18:27:22 -05:00
Amanda Furrow
421bd8624c
Add flagger language to flag message sent to slack
...
closes #8179
fixes #8140
2016-11-02 17:28:44 -05:00
Blade Barringer
4562c6422a
chore(i18n): update locales
2016-11-02 17:20:46 -05:00
Matteo Pagliazzi
a5cd9f2473
Merge branch 'TheHollidayInn-group-tasks-approval2' into develop
2016-11-01 21:55:32 +01:00
Matteo Pagliazzi
18bbdfa84b
Merge branch 'group-tasks-approval' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-group-tasks-approval2
2016-11-01 21:55:18 +01:00
Keith Holliday
d8c37f6e2d
Group plan subscription ( #8153 )
...
* Added payment to groups and pay with group plan with Stripe
* Added edit card for Stripe
* Added stripe cancel
* Added subscribe with Amazon payments
* Added Amazon cancel for group subscription
* Added group subscription with paypal
* Added paypal cancel
* Added ipn cancel for Group plan
* Added a subscription tab and hid only the task tab when group is not subscribed
* Fixed linting issues
* Fixed tests
* Added payment unit tests
* Added back refresh after stripe payment
* Fixed style issues
* Limited grouop query fields and checked access
* Abstracted subscription schema
* Added year group plan and more access checks
* Maded purchase fields private
* Removed id and timestampes
* Added else checks to ensure user subscription is not altered. Removed active field from group model
* Added toJSONTransform function
* Moved plan active check to other toJson function
* Added check to see if purchaed has been populated
* Added purchase details to private
* Added correct data usage when paying for group sub
2016-11-01 21:51:30 +01:00
Sabe Jones
7f38c61c70
3.52.0
2016-10-31 19:02:24 +00:00
Sabe Jones
1c018cedb1
chore(event): sprites and news
2016-10-31 18:45:39 +00:00
Sabe Jones
80892bd6a8
feat(event): JackOLantern ladder ( #8174 )
2016-10-31 08:14:06 -05:00
Keith Holliday
6801dae75d
Fixed history test
2016-10-30 03:23:01 -05:00
Keith Holliday
59e1de6771
Moved approval to subdoc
2016-10-29 14:19:16 -05:00
Keith Holliday
5b240a1950
Updated notification name and other minor fixes
2016-10-29 14:19:16 -05:00
Keith Holliday
3ec3722038
Moved approval fields to group subdoc
2016-10-29 14:19:16 -05:00
Keith Holliday
d798ebadfe
Fixed line endings
2016-10-29 14:19:16 -05:00
Keith Holliday
6cbddef627
Added get approvals route
2016-10-29 14:19:16 -05:00
Keith Holliday
016de411c9
Added notifications
2016-10-29 14:19:16 -05:00
Keith Holliday
2173f53883
Added fields for more approver details
2016-10-29 14:19:15 -05:00
Keith Holliday
f2e5bc52e5
Added requested approval fields and logic
2016-10-29 14:19:15 -05:00
Keith Holliday
393a9290e9
Added approval test and fixed line endings
2016-10-29 14:19:15 -05:00
Keith Holliday
ad5045bc09
Added git score approved task test
2016-10-29 14:19:15 -05:00
Keith Holliday
9b515ebdd1
Added task approve route
2016-10-29 14:19:15 -05:00
Keith Holliday
97bf9ee8e8
Added inital group task approval
2016-10-29 14:19:15 -05:00
Blade Barringer
f5ba636579
chore(i18n): update locales
2016-10-27 22:03:58 -05:00
Sabe Jones
4dd7e49552
3.51.1
2016-10-27 20:44:17 +00:00
Sabe Jones
d2f673ef1e
chore(news): Blog Bailey
2016-10-27 19:58:43 +00:00
Sabe Jones
e198dd551a
feat(content): strings for BGs/Armoire 2016-11
2016-10-26 20:28:44 +00:00
Travis
0bfc9d9516
fix: allows user to save an alias and checklistCollapsed properties of a challenge task. fixes #7875 ( #8170 )
2016-10-25 21:47:49 -05:00
Sabe Jones
d4e20ee4aa
3.51.0
2016-10-25 21:56:09 +00:00
Sabe Jones
a751a367fc
chore(sprites): compile
2016-10-25 21:55:40 +00:00
Sabe Jones
d323be19c6
Mystery Items 2016/10 ( #8169 )
...
* feat(content): mystery items 2016-10
* chore(news): Bailey 2016-10-25
Also ends the Enchanted Armoire A/B test.
* fix(armoire): failing tests from A/B conclusion
2016-10-25 16:16:00 -05:00
AccioBooks
be3f61a94b
Remove cookies on clearing browser data ( #8135 )
...
* remove cookies
* update cookie removal
* Remove + and add link
* Fix tests
* Add condition
* update strings
2016-10-25 19:53:56 +10:00
Alys
f1bb2db73b
fix wrong variable name in Polish questDamage string
...
The translators have been notified that it needs to be fixed in Transifex before the next migration of strings back to GitHub.
2016-10-23 09:54:18 +10:00
Matteo Pagliazzi
a622344d44
3.50.0
2016-10-22 18:12:09 +02:00
Blade Barringer
e279a3550b
chore(travis): start API tests earlier
2016-10-22 08:14:10 -05:00
Blade Barringer
70aab3059c
fix(client): bump version of ngInfinitScroll
...
v1.0.0 could not be found in bower registry
2016-10-22 08:14:09 -05:00
Blade Barringer
c264e37182
chore(travis): pend grunt build task
...
chore(travis): Move test prep to gulpfile
2016-10-22 08:14:07 -05:00
Blade Barringer
b31bc15493
chore(travis): Add grunt-cli pkg
2016-10-22 08:14:06 -05:00
Blade Barringer
ba19c00617
Setup up non-API tests to not need server and mongo running
...
chore(travis): Build files before running tests
chore(travis): require server for api tests
2016-10-22 08:14:00 -05:00
Blade Barringer
93aa92de7c
chore(travis): Split up build tasks
2016-10-20 22:14:37 -05:00
Blade Barringer
d021680945
chore(travis): Remove grunt and mocha install step
2016-10-20 22:05:21 -05:00
Blade Barringer
f9595af8a5
Re-enable armoire tests
2016-10-20 22:04:24 -05:00
Alyssa Batula
d2756278c3
Only unequip Gen 1 pets/mounts when releasing pets/mounts, fixes #5366 ( #8119 )
...
* Only unequip Gen 1 pets/mounts when releasing pets/mounts
* Changed mount declaration to match releasePets
* Check if a pet/mount is a drop type instead of checking for its name in the list of pets
* Changed references to pet and mount to petInfo and mountInfo for consistency with releasePets and releaseMounts
* Test that releasePets, releaseMounts, and releaseBoth do not unequip quest pets
* Fixed test names, and tests verify that a pet/mount is/is not a drop pet/mount on release
* Removed unneeded comments
2016-10-20 22:00:15 -05:00
Blade Barringer
2e2dc179c4
chore: pend armoire test
2016-10-20 19:30:22 -05:00
Alys
acf7b811ab
fix wrong variable name in French questTaskDamage string
...
The translators have been notified that it needs to be fixed in Transifex.
2016-10-21 08:24:36 +10:00
Blade Barringer
d5170251c0
fix: remove unneeded Math.random test
2016-10-20 17:11:28 -05:00
Sabe Jones
c9ba9054e3
chore(npm): shrinkwrap
2016-10-20 03:44:13 +00:00
MathWhiz
d4aac1ee4b
Documentation - coupon
...
closes #8109
2016-10-19 21:31:07 -05:00
Blade Barringer
9615a332a5
fix(client): Allow member hp to be clickable
...
fixes #8016
closes #8155
2016-10-19 21:01:35 -05:00
Blade Barringer
417455e5ef
Merge branch 'snyk-community-snyk-community-patch-1' into develop
2016-10-19 17:42:20 -05:00
Blade Barringer
136502a110
chore: update express
2016-10-19 17:41:58 -05:00
Blade Barringer
425887c1e4
chore(i18n): update locales
2016-10-19 17:40:26 -05:00
Sabe Jones
cfa8a5190f
3.49.0
2016-10-19 19:43:47 +00:00
Sabe Jones
df5be81706
chore(sprites): compile
2016-10-19 19:10:39 +00:00
Sabe Jones
08b3491047
Taskwoods Quest Line ( #8156 )
...
* feat(content): Gold Quest 2016-10
* chore(news): Bailey
2016-10-19 14:04:34 -05:00
Snyk Community
e73c3147c1
Fix for the ReDOS vulnerability
...
habitica is currently affected by the high-severity [ReDOS vulnerability](https://snyk.io/vuln/npm:tough-cookie:20160722 ).
Vulnerable module: `tough-cookie`
Introduced through: ` request`
This PR fixes the ReDOS vulnerability by upgrading ` request` to version 2.74.0
Check out the [Snyk test report](https://snyk.io/test/github/HabitRPG/habitica ) to review other vulnerabilities that affect this repo.
[Watch the repo](https://snyk.io/add ) to
* get alerts if newly disclosed vulnerabilities affect this repo in the future.
* generate pull requests with the fixes you want, or let us do the work: when a newly disclosed vulnerability affects you, we'll submit a fix to you right away.
Stay secure,
The Snyk team
2016-10-19 17:50:16 +03:00
Alys
a43254000e
change Indulgence Armadillo to Indulgent Armadillo
...
reference for Habitica admins: https://habitica.slack.com/archives/general/p1476655925000002
2016-10-18 17:39:52 +10:00
Blade Barringer
4e3c984baf
chore(i18n): update locales
2016-10-17 17:14:59 -05:00
Sabe Jones
c112e923f1
feat(content): Strings October 2016
2016-10-17 20:32:50 +00:00
Blade Barringer
540353f024
fix(client): Correct broken image on "how it works" page
2016-10-17 07:33:02 -05:00
AccioBooks
2b9b5e369e
/static/features TLC ( #8021 )
...
* Fix grammatical errors / stylistical changes
* Apps and Extentions
* and
* Sections -> Sectors
* Grammatical / Stylistic Changes
* remove extraneous .row
* add breaks in final marketing para
* revert features.jade
* Move period
2016-10-17 07:32:25 -05:00
Thomas Gamble
cb38475765
delete unread messages when a user leaves a group
...
closes #7955
closes #7965
2016-10-16 22:01:34 -05:00
Kees Cook
8bb92577b0
quest progress reporting whitespace fixes ( #8106 )
...
Notifications of other things (HP, GP, etc) have a regular format of
"+/- NUM THING". For example:
function gp(val, bonus) {
_notify(_sign(val) + " " + coins(val - bonus), 'gp');
}
However, the recent quest collection/damage notifications do not. This
attempts to regularize the reporting by adding in the "missing" space.
Signed-off-by: Kees Cook <kees@outflux.net >
2016-10-16 21:16:42 -05:00
Blade Barringer
fb26cbd26d
Merge pull request #8110 from Hus274/7814
...
Removing links to outdated tutorials
2016-10-16 21:02:29 -05:00
Blade Barringer
a0de5cd8f8
Merge pull request #8139 from bcpletcher/develop
...
Cleaned up some CSS
2016-10-16 20:59:22 -05:00
Blade Barringer
9fe10b1818
Merge pull request #8143 from dumindux/Issue-8115
...
changed gemCost to include the amount of gems
2016-10-16 20:58:48 -05:00
Dumindu Karunathilaka
d8dd39422a
changed gemCost to include the amount of gems
2016-10-15 18:10:22 +05:30
Benjamin Pletcher
3f9b710773
Cleaned up some CSS
2016-10-13 21:51:55 -04:00
Sabe Jones
8a8bab4be1
chore(npm): update shrinkwrap
2016-10-13 23:30:10 +00:00
Sabe Jones
2a0747ed72
3.48.0
2016-10-13 23:23:34 +00:00
Sabe Jones
a5196e94f6
chore(news): Bailey 2016-10-13
2016-10-13 23:04:32 +00:00
Sabe Jones
009ab26711
Add special spells to Seasonal Shop API ( #8138 )
...
* WIP(shops): add spells to Seasonal API
* refactor(shops): remove superfluous if
* feat(shops): handle spell purchasing
* fix(test): proper required fields check
Also corrects a linting error.
* refactor(shops): use constants
2016-10-13 17:53:02 -05:00
Blade Barringer
3fabf3391f
chore(docs): Remove uneeded links in data export docs
2016-10-12 22:43:23 -05:00
Blade Barringer
8020990264
chore(i18n): update locales
2016-10-12 20:28:32 -05:00
Blade Barringer
a2cfeafc02
fix(client): ctrl-enter can be used to send chat
...
fixes #8122
2016-10-12 20:24:48 -05:00
Matteo Pagliazzi
d04a4fb1ed
amazon: fix cancelling subscription: use correct path
2016-10-12 19:33:14 +02:00
Matteo Pagliazzi
aeb86db306
3.47.2
2016-10-12 18:45:00 +02:00
Matteo Pagliazzi
49960c0e32
amazon: fix cancelling subscription
2016-10-12 18:44:06 +02:00
Blade Barringer
932cb5cf6a
3.47.1
2016-10-12 08:07:47 -05:00
MathWhiz
74d6e77504
chore(docs): refine dataexport docs
...
closes #8120
2016-10-12 08:06:54 -05:00
Blade Barringer
8400f1786b
Merge pull request #8125 from DrStrangepork/travis-ci
...
Changed travis-ci URL to https://travis-ci.org/HabitRPG/habitica
2016-10-12 07:37:11 -05:00
Blade Barringer
d7bd5dd9f8
chore(i18n): update locales
2016-10-12 07:36:50 -05:00
Rick Kasten
3288b0de33
Changed travis-ci URL to https://travis-ci.org/HabitRPG/habitica
2016-10-12 04:52:50 -04:00
Phillip Thelen
c025ffbd10
Fix wrong identifier for old android IAP ( #8121 )
2016-10-12 09:12:58 +02:00
Blade Barringer
afb5b473a3
chore(docs): Add global definitions for param types
2016-10-11 21:35:58 -05:00
Blade Barringer
aeee29f5fa
chore(i18n): update locales
2016-10-11 18:04:25 -05:00
Sabe Jones
0cca2a07a2
fix(news): typo
2016-10-11 22:58:10 +00:00
Sabe Jones
55d94c129a
3.47.0
2016-10-11 21:19:41 +00:00
Sabe Jones
358e1aed22
chore(sprites): compile
2016-10-11 21:00:55 +00:00
Sabe Jones
36241f061f
chore(news): Bailey 2016-10-11
2016-10-11 20:59:02 +00:00
Matteo Pagliazzi
b6201a3b75
amplitude: only log generic error message
2016-10-11 22:49:54 +02:00
Matteo Pagliazzi
005f74d918
Merge branch 'vIiRuS-iap' into develop
2016-10-11 21:29:52 +02:00
Matteo Pagliazzi
926e188017
fix eslint errors
2016-10-11 21:29:35 +02:00
Matteo Pagliazzi
94da808279
Merge branch 'iap' of https://github.com/vIiRuS/habitrpg into vIiRuS-iap
2016-10-11 21:28:37 +02:00
Phillip Thelen
7568dd52e9
Fix wrong if statements
2016-10-11 20:49:46 +02:00
Phillip Thelen
c6e2b78982
Make requested syntax changes
2016-10-11 20:47:01 +02:00
Matteo Pagliazzi
b6104c3ef3
remove dup dependency
2016-10-11 18:52:50 +02:00
Sabe Jones
56b5c960f0
feat(content): Beetle Pet Quest
2016-10-11 16:40:27 +00:00
Matteo Pagliazzi
528abf77af
amazon: directly cancel subscription when already closed by amazon
2016-10-11 15:54:48 +02:00
Blade Barringer
8db6b7c6cb
fix(api): Allow x-client to be set in cors middleware ( #8117 )
...
* fix(api): Allow x-client to be set in cors middleware
* chore: update cors middlware tests
2016-10-10 17:35:00 -05:00
Sabe Jones
578dee59bd
feat(content): pet quest strings
2016-10-10 19:43:24 +00:00
Sabe Jones
d40c923e6e
refactor(test): less clunky timestamp conv
2016-10-10 16:02:08 +00:00
Sabe Jones
3c4c64b023
fix(subscriptions): don't reset Gems midmonth
2016-10-10 15:52:33 +00:00
Phillip Thelen
c84d6ba141
fix linter errors
2016-10-10 14:27:51 +02:00
Phillip Thelen
5f3b147d2a
refactor IAP handling
2016-10-10 10:07:10 +02:00
Keith Holliday
ff08e8b586
[WIP] Group tasks claim ( #8099 )
...
* Added initial group tasks ui
* Changed group compnent directory
* Added group task checklist support
* Added checklist support to ui
* Fixed delete tags route
* Added checklist routes to support new group tasks
* Added assign user tag input
* Added new group members autocomplete directive
* Linked assign ui to api
* Added styles
* Limited tag use
* Fixed line endings
* Updated to new file structure
* Fixed failing task tests
* Updatd with new checklist logic and fixed columns
* Updated add task function
* Added userid check back to tag routes
* Added back routes accidently deleted
* Added locale strings
* Moved common task function to task service
* Removed files from manifest
* Added initial group tasks ui
* Changed group compnent directory
* Added checklist support to ui
* Added assign user tag input
* Added assign user tag input
* Added new group members autocomplete directive
* Added new group members autocomplete directive
* Removed group get tasks until live
* Linked assign ui to api
* Added styles
* Added server code for claiming a task
* ADded group task meta and claim button
* Adjusted styles, added local, and added confirm
* Updated claim with new file structures
* Fixed merge issue
* Removed extra file
* Removed duplicate functions
* Removed extra directive
* Removed dev items
2016-10-09 19:23:34 +02:00
Phillip Thelen
cb2acbfefd
add additional IAP price tiers
2016-10-09 15:20:45 +02:00
Travis Husman
b16da35585
chore(cleanup): removing links to outdated tutorials
...
closes #7814
2016-10-07 17:17:29 -07:00
Sabe Jones
826d7b85d7
Subscriptions Fixes ( #8105 )
...
* fix(subscriptions): round up months
* fix(subscriptions): resub improvements
Don't allow negative extraMonths; flatten new Dates to YYYYMMDD
* fix(subscriptions): remove resub Gems exploit
Also standardizes some uses of new Date() to remove potential race condition oddities.
* fix(subscriptions): bump consecutive months...
...even if the user didn't log in then, if subscription has been continuous through that period
* test(subscriptions): cover fix cases
Also refactor: use constant for YYYY-MM format
* refactor(subscriptions): don't stringify moments
2016-10-07 15:08:30 -05:00
Travis
6bcc6a15e2
Hitting enter no longer sends a chat message, instead inserts a new line ( #8096 )
...
* changing behavior so hitting enter in a chat box only now inserts a newline instead of submitting the form. closes #8066
* Adding a tooltip message
2016-10-06 21:55:00 -05:00
MathWhiz
b600eceb49
/v3/content documentation
...
closes #8098
2016-10-06 21:45:37 -05:00
Blade Barringer
b83ef872c9
Merge branch 'JTorr-develop' into develop
2016-10-06 20:54:25 -05:00
Blade Barringer
4ebc2e2175
chore(docs): Adjust invite route docs
2016-10-06 20:54:04 -05:00
Sabe Jones
2f4b8c569a
3.46.2
2016-10-06 23:20:55 +00:00
Sabe Jones
85b5b5a62d
chore(event): enable & announce Spooky Sparkles
2016-10-06 22:49:56 +00:00
Julie Torres
e271e57f63
Improve API Docs for Invite to Group, Iss#8087
2016-10-06 14:23:07 -04:00
Blade Barringer
558fb145b5
chore: remove references to debug-scripts
2016-10-04 20:48:36 -05:00
Blade Barringer
fc30456b53
chore: remove unused debug scripts
2016-10-04 20:38:40 -05:00
Sabe Jones
68b2d19b04
3.46.1
2016-10-04 23:32:02 +00:00
Blade Barringer
6d33acccf4
fix(api) Allow revoked chat ussers to post in private guilds
2016-10-04 17:49:19 -05:00
Sabe Jones
acee4bad80
fix(sprites): add new spritesheet
2016-10-04 17:04:09 +00:00
Sabe Jones
30fe5088b8
3.46.0
2016-10-04 15:55:41 +00:00
Sabe Jones
69602f93e9
chore(sprites): compile
2016-10-04 15:54:55 +00:00
Sabe Jones
0109aa4250
feat(content): Armoire and BGs data ( #8095 )
2016-10-04 09:57:28 -05:00
Blade Barringer
2dc0958678
chore(docs): Define resource not found errors and permissions
2016-10-03 21:35:53 -05:00
Blade Barringer
52f4e5f37d
chore(docs): Update webhook documentation
2016-10-03 17:20:11 -05:00
Blade Barringer
c014da297c
chore(docs): remove unneeded apiVersion param
2016-10-03 17:11:59 -05:00
Keith Holliday
285041cdee
Group tasks ui picked ( #7996 )
...
* Added initial group tasks ui
* Changed group compnent directory
* Added group task checklist support
* Added checklist support to ui
* Fixed delete tags route
* Added checklist routes to support new group tasks
* Added assign user tag input
* Added new group members autocomplete directive
* Linked assign ui to api
* Added styles
* Limited tag use
* Fixed line endings
* Updated to new file structure
* Fixed failing task tests
* Updatd with new checklist logic and fixed columns
* Added purchased info to group and prevented non purchased group from seeing new group tasks
* Updated add task function
* Added userid check back to tag routes
* Marked tag tests as pending
* Added comments to pending tests
* Added back routes accidently deleted
* Added locale strings
* Other clarity fixes
* Moved common task function to task service
* Removed files from manifest
* Fixed naming collision and remove logic
* Removed group get tasks until live
* Fixed test to check update task. Removed extra removeTask call. Synced updated checklists. Added purchased to noset
* Fixed delete group task
2016-10-03 22:12:20 +02:00
Sabe Jones
6a82206f81
feat(content): Armoire and BG sprites
2016-10-03 19:23:05 +00:00
Blade Barringer
8b6052a3ca
fix(api): Prevent webhooks from having duplicate ids
2016-10-03 08:13:33 -05:00
Alys
04fd907a45
remove incorrect space from an Indonesian locales variable
...
The mis-formatting of the variable was causing an error when when a user tried to use the "forgot password" feature.
The Linguists have been informed of the need to fix the string in Transifex.
2016-10-03 07:56:30 +10:00
Blade Barringer
70343079f1
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-10-02 12:59:09 -05:00
Sabe Jones
df952eece5
chore(news): Take This Bailey
2016-10-02 16:03:50 +00:00
Blade Barringer
e3a619c7ff
3.45.0
2016-10-02 09:53:54 -05:00
Sabe Jones
23f531372b
chore(event): Sept-Oct Take This migration
2016-10-02 14:38:16 +00:00
Blade Barringer
97b15006fd
chore: adjust webhook migration to sort webhooks properly
2016-10-02 09:31:28 -05:00
Blade Barringer
35b92f13a3
Webhook improvements ( #7879 )
...
* refactor: Move translate test utility to helpers directory
* Add kind property to webhooks
* feat: Add options to create webhook route
* refactor: Move webhook ops into single file
* refactor: Create webhook objects for specific webhook behavior
* chore(tests): Add default sleep helper value of 1 second
* feat(api): Add method for groups to send out webhook
* feat(api): Add taskCreated webhook task creation
* feat(api): Send chat webhooks after a chat is sent
* refactor: Move webhook routes to own controller
* lint: Correct linting errors
* fix(api): Correct taskCreated webhook method
* fix(api): Fix webhook logging to only log when there is an error
* fix: Update groupChatRecieved webhook creation
* chore: Add integration tests for webhooks
* fix: Set webhook creation response to 201
* fix: Correct how task scored webhook data is sent
* Revert group chat recieved webhook to only support one group
* Remove quest activity option for webhooks
* feat: Send webhook for each task created
* feat: Allow webhooks without a type to default to taskScored
* feat: Add logic for adding ids to webhook
* feat: optimize webhook url check by shortcircuiting if no url is passed
* refactor: Use full name for webhook variable
* feat: Add missing params to client webhook
* lint: Add missing semicolon
* chore(tests): Fix inccorect webhook tests
* chore: Add migration to update task scored webhooks
* feat: Allow default value of webhook add route to be enabled
* chore: Update webhook documentation
* chore: Remove special handling for v2
* refactor: adjust addComputedStatsToJSONObject to work for webhooks
* refactor: combine taskScored and taskActivity webhooks
* feat(api): Add task activity to task update and delete routes
* chore: Change references to taskScored to taskActivity
* fix: Correct stats object being passed in for transform
* chore: Remove extra line break
* fix: Pass in the language to use for the translations
* refactor(api): Move webhooks from user.preferences.webhooks to user.webhooks
* chore: Update migration to set webhook array
* lint: Correct brace spacing
* chore: convert webhook lib to use user.webhooks
* refactor(api): Consolidate filters
* chore: clarify migration instructions
* fix(test): Correct user creation in user anonymized tests
* chore: add test that webhooks cannot be updated via PUT /user
* refactor: Simplify default webhook id value
* refactor(client): Push newly created webhook instead of doing a sync
* chore(test): Add test file for webhook model
* refactor: Remove webhook validation
* refactor: Remove need for watch on webhooks
* refactor(client): Update webhooks object without syncing
* chore: update webhook documentation
* Fix migrations issues
* chore: remove v2 test helper
* fix(api): Provide webhook type in task scored webhook
* fix(client): Fix webhook deletion appearing to delete all webhooks
* feat(api): add optional label field for webhooks
* feat: provide empty string as default for webhook label
* chore: Update webhook migration
* chore: update webhook migration name
2016-10-02 09:16:22 -05:00
Alys
556a7e5229
add new loading screen tip for The Bulletin Board guild, as discusssed in Aspiring Socialites
2016-10-02 16:23:17 +10:00
Alys
378625b4af
clarify and correct instructions for changing login name and profile name
2016-10-02 16:00:22 +10:00
Blade Barringer
ee15e29ba4
3.44.5
2016-09-30 13:01:36 -05:00
Dumindu Buddhika
ed880a665a
added balance to analytics ( #8086 )
...
* added balance to analytics
* removed if check
2016-09-30 11:52:14 -05:00
Blade Barringer
3c7f71d214
chore(i18n): update locales
2016-09-30 11:42:34 -05:00
Blade Barringer
edac06b0d1
chore(docs): Update group invite docs
2016-09-30 11:27:08 -05:00
Blade Barringer
24562f8d60
refactor: move total invitation errors to group invite validation method
2016-09-30 11:27:08 -05:00
Blade Barringer
97840ed732
chore: add apidoc watch command
2016-09-30 11:27:08 -05:00
Blade Barringer
76499412ed
refactor(api): Move invitation validation to group static method
2016-09-30 11:27:07 -05:00
Julie Torres
9b10f348cc
Prevent submission of blank invitation, fixes #7807 ( #8080 )
2016-09-30 11:25:57 -05:00
Blade Barringer
17b0329c43
chore(i18n): update locales
2016-09-30 08:54:34 -05:00
Blade Barringer
cda84a6d68
chore: move randomVal test to correct folder
2016-09-30 08:39:30 -05:00
Blade Barringer
306505ebab
fix(api,client): Pass in predictable random to revive randomVal calls
...
closes #8085
2016-09-30 08:39:30 -05:00
Blade Barringer
2476cdd873
chore: Add test shells for revive
2016-09-30 08:16:04 -05:00
Blade Barringer
8465dd69be
chore: Send author's email when sending flag notification to slack
2016-09-30 07:43:15 -05:00
Matteo Pagliazzi
461e7445c2
remove old server_side tests
2016-09-30 12:33:20 +02:00
Matteo Pagliazzi
24df8d8f2f
pusher: sync user when reconnecting
2016-09-29 23:30:11 +02:00
Matteo Pagliazzi
2bca92b4d5
3.44.4
2016-09-29 23:22:30 +02:00
Matteo Pagliazzi
c3843cae80
client: fix bug that prevented drop notifications from showing up
2016-09-29 23:19:46 +02:00
Sabe Jones
816e4a2f19
3.44.3
2016-09-29 18:12:31 +00:00
Sabe Jones
d0d4927e59
fix(login): uncomment Google auth
2016-09-29 18:11:47 +00:00
Sabe Jones
023ff5789d
3.44.2
2016-09-29 17:13:16 +00:00
Blade Barringer
cc9be6f4a1
chore(i18n): update locales
2016-09-29 11:53:29 -05:00
Sabe Jones
145bcb6f7c
3.44.1
2016-09-29 16:46:26 +00:00
Sabe Jones
d7db599f88
chore(npm): update shrinkwrap
2016-09-29 16:22:44 +00:00
Sabe Jones
ca935670f7
chore(event): GaymerX armor & news
2016-09-29 16:16:43 +00:00
AccioBooks
c2eb113672
Make Wikia Links Translatable ( #7036 )
...
* Wikia Links
* Update contrib.json (Added comma)
* Implement @Alys's Suggestions
* conLearnLink -> conLearnURL
* add link to plans.jade
* Appended "URL" to locale strings with URLs
* Add 's'
2016-09-29 21:57:44 +10:00
Matteo Pagliazzi
257e932bc3
Vue Store ( #8071 )
...
* vue: use our own store in place of vuex
* vue store: add getters, watcher and use internal vue instance
* vue store: better state getter and credits to Vuex
* vue store: $watch -> watch
* vuex store: pass store to getters and fix typos
* add comments to store, start writing tests
* fix unit tests and add missing ones
* cleanup components, add less folder, fetch tassks
* use Vuex helpers
* pin vuex version
* move semantic-ui theme to assets/less, keep website/build empty but in git
* import helpers from vuex
2016-09-29 13:32:36 +02:00
Sabe Jones
50e2731811
chore(assets): remove unused promos
2016-09-28 18:47:04 +00:00
Matteo Pagliazzi
d67b9e5688
do not send welcome email if user already exists
2016-09-28 19:23:07 +02:00
Blade Barringer
bfc7b9d3e8
fix(client): allow admins to open flag modal regardless of flag status
...
fixes #8078
2016-09-28 08:16:06 -05:00
Blade Barringer
eb0e234afa
chore(i18n): update locales
2016-09-28 07:44:30 -05:00
Matteo Pagliazzi
177f78cbb0
3.44.0
2016-09-28 12:49:30 +02:00
Phillip Thelen
e3b484b29a
Add Google Signin ( #7969 )
...
* Start adding google login
* fix local js issue
* implement syntax suggestions
* fix delete social tests
* Add service for authentication alerts
* fix social login tests
* make suggested google sign in changes
* fix accidentally deleted code
* refactor social network sign in
* fix incorrect find
* implement suggested google sign in changes
* fix(tests): Inject fake Auth module for auth controller
* fix(test): prevent social service from causing page reload
* fix loading user info
* Use lodash's implimentation of find for IE compatibility
* chore: increase test coverage around deletion route
* chore: clean up social auth test
* chore: Fix social login tests
* remove profile from login scope
* fix(api): Allow social accounts to deregister as user has auth backup
* temporarily disable google login button
2016-09-28 12:11:10 +02:00
Sabe Jones
941000d737
3.43.2
2016-09-28 03:12:35 +00:00
Sabe Jones
63ce7c6034
chore(news): misc Bailey
2016-09-28 02:40:24 +00:00
Sabe Jones
921f9a65a3
feat(content): BG and Armoire strings 201610
2016-09-27 21:15:54 +00:00
Sabe Jones
d6bf30eff8
3.43.1
2016-09-27 14:43:34 +00:00
Matteo Pagliazzi
faed0dff20
pusher: remove 1 tab limit, better disconnection
2016-09-27 15:25:07 +02:00
Matteo Pagliazzi
7bb2f4a3fa
fix semantic-ui site path
2016-09-27 10:09:46 +02:00
Matteo Pagliazzi
e3bcea4077
Add semantic-ui ( #8076 )
...
* client: add semantic-ui
* add README, disable google fonts
* karma: limit coverage to .vue and .js files
* add missing deps
* semantic-ui in assets folder
2016-09-27 09:34:45 +02:00
Sabe Jones
51ffe2c8c2
A/B Testing, Round 2 ( #8077 )
...
* feat(analytics): A/B test 2016-09-26
* feat(tutorial): A/B variant text
2016-09-26 17:10:43 -05:00
Blade Barringer
efc0469bef
fix(docs): correct email route url in api docs
2016-09-26 14:56:53 -05:00
Sabe Jones
bda0617a23
chore(npm): update shrinkwrap
2016-09-26 17:32:33 +00:00
Blade Barringer
913cb16638
refactor: move randomVal to a lib
2016-09-26 11:55:07 -05:00
Blade Barringer
331993c1df
refactor: remove seeding from randomVal
2016-09-26 11:55:07 -05:00
Blade Barringer
136e2de125
refactor: adjust randomDrop to use wrapped random function
2016-09-26 11:55:07 -05:00
Blade Barringer
966a50431f
refactor: Move user argument to options in randomVal function
2016-09-26 11:55:07 -05:00
Blade Barringer
4df1601718
fix(api): Armoire actually works randomly
2016-09-26 11:55:07 -05:00
Thomas Gamble
4d5b6992be
drops are randomly selected, not based on user values fixes #7929
2016-09-26 11:55:07 -05:00
Tom Gamble
b54441a637
Shows quest progress notification when completing task #7922 ( #7951 )
2016-09-23 20:41:31 -05:00
Matteo Pagliazzi
bccdf4e989
client: load user based on localStorage (only for testing) ( #8055 )
2016-09-23 22:39:06 +02:00
Matteo Pagliazzi
633da7ff73
Delete App.vue
2016-09-23 22:18:13 +02:00
Matteo Pagliazzi
d3371e323e
Vuex Structure ( #8054 )
...
* wip: vuex structure
* add missing files
* client: do not fail dev build on eslint error
* eslint does not block compilation, mount app when data is ready
* eslintrc.js -> eslintrc
2016-09-23 19:49:11 +02:00
Sabe Jones
5480157977
fix(shops): 2h weapon pricing
2016-09-23 15:43:45 +00:00
Blade Barringer
c5888e3d21
fix(client): Allow backgrounds to be changed
2016-09-23 07:04:11 -05:00
Blade Barringer
2ca185474f
fix(client): Advanced options not using preference when creating task
...
closes #8033
2016-09-22 21:41:42 -05:00
Kaitlin Hipkin
5f0c1687b5
Remove unused v2 code from /website/common/script ( #8034 )
...
* remove apiv2 behavior from ops
* remove apiv2 behavior from fns
2016-09-22 21:23:46 -05:00
Sabe Jones
8f9ed6e377
3.43.0
2016-09-22 20:02:48 +00:00
Blade Barringer
1a38546721
chore(i18n): update locales
2016-09-22 13:20:45 -05:00
Sabe Jones
359d9f8d3a
fix(analytics): send user on social reg
2016-09-22 18:14:02 +00:00
Sabe Jones
ca97732f21
Cows and Ghosts (but no cow ghosts) ( #8052 )
...
* feat(content): Mystery Items and Ghost Potions
* fix(news): better cow position
* fix(test): update for season
2016-09-22 13:04:15 -05:00
Sabe Jones
e820b55080
fix(shops): open Seasonal Shop in API
2016-09-22 17:02:21 +00:00
Sabe Jones
3d2d01f647
chore(npm): update shrinkwrap
2016-09-22 16:25:45 +00:00
Matteo Pagliazzi
b907590bf2
rebuild npm-shrinkwrap
2016-09-22 17:54:40 +02:00
mleko
ec01388b5a
Fix broken link ( #8051 )
...
* Fix broken link
* Update message
2016-09-22 17:24:21 +10:00
Blade Barringer
aff475b9c8
chore(i18n): update locales
2016-09-21 19:17:36 -05:00
Sabe Jones
476e06ab8b
feat(content): Ghost Hatching Potion string
2016-09-21 19:19:18 +00:00
Sabe Jones
82b905514f
feat(content): Subscriber Strings 201609
2016-09-21 19:08:41 +00:00
Sabe Jones
7f1e27f6e4
3.42.1
2016-09-21 14:55:05 +00:00
Matteo Pagliazzi
f5315a4f92
typo, correct prod check in build manifest
2016-09-21 16:33:38 +02:00
Blade Barringer
c244c3e797
chore(i18n): update locales
2016-09-21 09:27:13 -05:00
Blade Barringer
0102648f8a
chore: fix sprite paths in prod ( #8048 )
2016-09-21 09:20:48 -05:00
Matteo Pagliazzi
ed4d955e3e
remove console.log
2016-09-21 15:19:36 +02:00
Matteo Pagliazzi
6792e75c7f
add dist-client to .eslintignore
2016-09-21 14:57:33 +02:00
Matteo Pagliazzi
62f004222b
add .gitkeep to website/static so the build does not fail
2016-09-21 14:49:30 +02:00
Matteo Pagliazzi
ed1f0a04ae
client: proxy requests to real api
2016-09-21 14:43:50 +02:00
Matteo Pagliazzi
bde01c30ad
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-09-21 14:37:57 +02:00
Matteo Pagliazzi
12275cc174
build new client in production
2016-09-21 14:37:44 +02:00
Matteo Pagliazzi
f751ccacc5
expose new client at /new-app, can be enabled in prod setting a flag
2016-09-21 13:43:39 +02:00
Sabe Jones
d371297482
fix(migration): remove connect string
2016-09-21 03:20:28 +00:00
Sabe Jones
00b75b23bb
chore(sprites): remove Stressbeast
2016-09-21 03:17:02 +00:00
Sabe Jones
589b2aaf3a
3.42.0
2016-09-21 01:34:33 +00:00
Sabe Jones
676d9aedf1
Begin Fall Festival 2016 ( #8043 )
...
* feat(event): begin Fall Festival 2016
* feat(event): Seasonal Shop Fall 2016
* fix(test): season specific food
* chore(news): add Bailey
* fix(season): correct Sorceress & timetrav
2016-09-20 20:11:32 -05:00
Sabe Jones
67febde1cb
fix(analytics): send user on reg ( #8044 )
...
Also fixes an issue that could prevent item name data from being correctly sent to Amplitude.
2016-09-20 20:11:12 -05:00
Blade Barringer
019560df64
chore(i18n): update locales
2016-09-20 17:42:17 -05:00
Sabe Jones
8b1dd43e0a
feat(event): Seasonal Shop strings Fall 2015
2016-09-20 19:35:26 +00:00
Matteo Pagliazzi
2f626c7875
Vuex ( #8041 )
...
* add vuex, cleanup client directory and create example components
* disale sample unit test
* disable import for non existing file
* correct regexp for unit tests, add simple test to avoid error, add babel-polyfill for Vuex
* add line wrongly removed, update regexp
2016-09-20 18:58:02 +02:00
Blade Barringer
381bea1e94
chore(i18n): update locales
2016-09-20 11:49:18 -05:00
Sabe Jones
c12b0890d5
feat(content): Fall 2016 strings
2016-09-20 16:46:24 +00:00
Blade Barringer
5ceb470464
Merge pull request #8031 from Ozzystrasza/challenges_select_all
...
Fix "All" button to select all guilds in the filter list
2016-09-20 08:08:31 -05:00
Blade Barringer
d5d27355da
refactor(client): Only omit complex properties from task update object
2016-09-20 08:00:13 -05:00
Rebecca
190aa2c0e7
Updating a task now sends only data that's actually needed ( Fixes #7846 ) ( #8040 )
...
* Updating a task now sends only data that's actually needed (Fixes #7846 )
Updating a task with a huge history lead to 'request entity too large' errors since the client attempted to send all data associated with a task, regardless of whether that data could be changed or not. With this change, the post request is now omitting the following fields:
challenge
completed
createdAt
group
history
id
reminders
tags
type
updatedAt
userId
* Changes according to review (use _.omit)
2016-09-20 07:59:49 -05:00
Blade Barringer
fb8ec7677c
chore(i18n): update locales
2016-09-20 07:49:20 -05:00
Blade Barringer
c4c70ba1bd
fix: Clarify what toRequired string means
2016-09-20 07:46:54 -05:00
Blade Barringer
248fd1d912
chore(docs): Add documentation for valid skill ids
2016-09-19 21:54:02 -05:00
Blade Barringer
5fa76f6aeb
feat(api): Add route to export pms as HTML
...
fixes #7939
closes #7999
2016-09-19 21:32:58 -05:00
Matteo Pagliazzi
f90a31b4be
pusher: when disconnecting from tab because of inactivity, do not connect other tab
2016-09-19 16:16:13 +02:00
Blade Barringer
e3b9636c42
refactor(cient): Simplify char resize logic
...
closes #6836
2016-09-18 21:27:59 -05:00
Lucas Torroba
7f5d070ee6
Fixes issue #6679 , which referred to the EXP chart getting cropped.
2016-09-18 21:26:59 -05:00
Alys
28bb543397
specify that Orb of Rebirth does not remove equipment (in Reset advice)
2016-09-19 08:00:42 +10:00
Matteo Pagliazzi
4f3a9802c1
Vue Project Setup ( #8018 )
...
* add files for new client side and reorg gulp tasks
* add deps and script for new client
* fix webpack paths so that building works
* fix static assets not copied into prod build
* fix linting
* add eslint deps and re-enable it in webpack
* add most missing deps for client side and split .babelrc for client
* reorganize .eslintignore
* update client tests paths and .gitignore
* uncomment code
* client: move App component
* client: update oaths in App component
* fix client tests and add more deps
* add client side tests to npm test
* fix typo in depencency name
* update more deps
* fix karma.conf.js and upgrade phantomjs
* fix dep and move karma.conf to subdirectory
* update karma.conf.js position in Gruntfile
* try downgrading phantomjs
* Fixup client tests (#8032 )
* Use phantom 2
* fix(tests): Fix refresher test
* gitignore translation mock
* Update karma version
* disable e2e tests for new client from build
* write vue templates with pug
* add basic routing
* remove unnecessary Function.bind shim
* remove unused dependency
2016-09-18 21:51:20 +02:00
Blade Barringer
c615af82f8
Merge pull request #8030 from crookedneighbor/switch_serverside_markdown
...
Switch serverside markdown
2016-09-17 21:04:01 -05:00
Sabe Jones
4468c2ca2f
3.41.4
2016-09-17 03:49:23 +00:00
Sabe Jones
ff53552fd3
chore(news): Bailey 20160916
...
And compile in Beffymaroo promo sprite
2016-09-17 03:33:02 +00:00
Ozzystrasza
f3f4229e49
use groupsFilter for search.group
2016-09-17 00:23:16 -03:00
Blade Barringer
d782ed5d20
chore: compile sprites
2016-09-16 21:03:28 -05:00
Blade Barringer
31a6e89be9
Update shrinkwrap
2016-09-16 20:51:22 -05:00
Blade Barringer
b3f21421e5
chore: remove unused packages
2016-09-16 20:35:15 -05:00
Blade Barringer
a70b8bc82b
Use markdown in faq locales where possible
2016-09-16 20:35:10 -05:00
Blade Barringer
de9644f126
chore: switch out markdown-it for habitica-markdown
2016-09-16 20:35:06 -05:00
Sabe Jones
8b83d8d4e9
fix(sprites): use correct URL in CSS
2016-09-16 22:54:52 +00:00
Sabe Jones
c7fd6701ae
3.41.3
2016-09-16 21:58:00 +00:00
AccioBooks
5d18640215
Pluralization ( #8027 )
2016-09-16 16:14:23 -05:00
Sabe Jones
bde6b7d6ce
chore(contact): revert community manager links ( #8028 )
2016-09-16 16:09:57 -05:00
Blade Barringer
5393c3b6c0
chore(i18n): update locales
2016-09-16 15:49:15 -05:00
Blade Barringer
84136882d3
fix: Add back in missing translation string
...
closes #8026
2016-09-16 15:40:34 -05:00
Sabe Jones
86c9bddc09
Handle social auth in A/B testing ( #8024 )
...
* fix(AB-testing): handle social auth
* refactor(AB-testing): move to pre save hooks
2016-09-16 19:13:21 +02:00
Blade Barringer
81b7eeeb71
Common reorg ( #8025 )
...
* Re-organize common folder
* fix: Correct paths in tests
* fix: move new content to proper folder
* chore: Move audio folder to assets
* Move sprites to sprites assets directory
* Move css sprites to assets directory
* Split out readmes for common code and sprites
* Move images to assets directory
* Move destinatin of shared browserified file
* remove unused file
* move compiled js to client-old
* Fix karma tests
* fix: Correct paths for sprites
2016-09-16 17:18:07 +02:00
Matteo Pagliazzi
d971e673af
fix typo
2016-09-16 15:28:57 +02:00
Matteo Pagliazzi
603226a084
make sure Pusher cannot get stuck
2016-09-16 15:12:32 +02:00
Matteo Pagliazzi
a38f524d62
sync user n party chat system message
2016-09-16 14:36:38 +02:00
Matteo Pagliazzi
3b0e6e138a
better handling of pusher connection with logging
2016-09-16 13:09:59 +02:00
Blade Barringer
9c0998c29a
refactor(client): extract find pet logic into function
2016-09-15 22:02:11 -05:00
Oziris Moreira
4ad50b9d30
Fix Magic Mount Spacing ( #8015 )
...
* fix magic mount spacing
* simplify functions
* function hasAPetOfPotion
* var premiumPotion
2016-09-15 22:01:31 -05:00
Matteo Pagliazzi
998037e0a1
update npm-shrinkwrap.json
2016-09-15 23:46:03 +02:00
Oziris Moreira
2539655932
make eyewear purchaseable ( #8010 )
2016-09-15 07:46:53 -05:00
Matteo Pagliazzi
3d72233d54
fix Gruntfile path to old client tests
2016-09-15 13:05:35 +02:00
Matteo Pagliazzi
ab84e88650
reorganize old client tests
2016-09-15 13:05:23 +02:00
Sabe Jones
a4fd687510
3.41.2
2016-09-14 22:28:15 +00:00
Matteo Pagliazzi
0d1b5aad7e
rtc fixes: do not show notification if message was sent by current user from different computer or mobile, put back message syncing on posting for guilds and tavern
2016-09-14 23:19:32 +02:00
Blade Barringer
1484f8afe3
fix: only report webhook error if there is an error
2016-09-14 12:51:50 -05:00
Matteo Pagliazzi
616574d438
fix challenge unit test
2016-09-14 16:51:09 +02:00
Matteo Pagliazzi
33bcb40077
rename client-new to client and add README
2016-09-14 16:43:11 +02:00
Matteo Pagliazzi
6bddef6878
add new client folder and expose it at /new-app when not in production
2016-09-14 16:34:55 +02:00
Matteo Pagliazzi
fefcb0f4ac
Merge pull request #8013 from HabitRPG/paglias/reorg-client
...
Rename website/client to website/client-old
2016-09-14 16:22:25 +02:00
Matteo Pagliazzi
f6108ddb40
update npm shrinkwrap and add missing dependency for amazon payments
2016-09-14 16:18:28 +02:00
Blade Barringer
0c04a1880b
3.41.1
2016-09-14 08:19:36 -05:00
Matteo Pagliazzi
4b48b7a5f6
rename website/client to website/client-old
2016-09-14 15:06:32 +02:00
Blade Barringer
a2febc5f61
chore(i18n): update locales
2016-09-14 08:01:22 -05:00
Blade Barringer
241a031cb3
chore(i18n): update locales
2016-09-14 07:56:52 -05:00
Blade Barringer
555ddbbe4c
fix: allow todo due date to be edited
2016-09-14 07:43:35 -05:00
Blade Barringer
8b0b326aef
chore(i18n): update locales
2016-09-13 22:28:01 -05:00
Blade Barringer
269a0fd1e6
chore(i18n): update locales
2016-09-13 20:27:43 -05:00
Blade Barringer
e12e820f0a
fix: Remove flavor from translation string
2016-09-13 20:23:48 -05:00
Blade Barringer
48a2b1e66e
chore(i18n): update locales
2016-09-13 17:45:11 -05:00
Sabe Jones
0fe0c38a17
3.41.0
2016-09-13 22:00:14 +00:00
Matteo Pagliazzi
50ea1f5b08
RTC: add modal for desktop notifications ( #8007 )
...
* add initial modal for desktop notifications
* add missing files
* vertically center modal and use callback on safari
* fix(modal): update wording
2016-09-13 16:08:54 -05:00
Sabe Jones
52d8667fdb
feat(content): Pet Quest 201909
2016-09-13 20:01:53 +00:00
cincospenguinos
f5f8f8c246
Players able to flag their own messages - Fixes #8005 ( #8006 )
...
* Players able to flag their own messages
* Modify test case to match the new behavior
* Remove a comment and a locales message
2016-09-13 12:23:11 -05:00
Blade Barringer
bbe4759691
fix(client): Correct behavior for editting new tasks
2016-09-13 12:11:56 -05:00
Blade Barringer
cbefc13e25
Revert "Revert "fixes task edit cancellation commit ( #7931 )""
...
This reverts commit 2da9876e42 .
2016-09-13 11:52:47 -05:00
Blade Barringer
25aaa351ee
chore(i18n): update locales
2016-09-13 11:52:18 -05:00
Sabe Jones
2da9876e42
Revert "fixes task edit cancellation commit ( #7931 )"
...
This reverts commit bbf15e1756 .
2016-09-13 16:32:52 +00:00
Travis
282822def6
Don't show items in the seasonal shop that can't be purchased ( #7859 )
...
* making an api chnage so the seasonal shop will only return items that the user has never owned instead of all items the user doesn't currently own
* fixing commit so shop doesn't show already owned items
* recommenting out seasonal shop message as it's currently closed
2016-09-13 08:15:11 -05:00
Sabe Jones
f20a7b851f
feat(analytics): AB testing
...
User model update for AB tests, and the first AB test to start Sept 12
closes #7984
2016-09-12 22:13:25 -05:00
Kaitlin Hipkin
6f2767edd3
Separate stats and achievs pages ( #7804 )
...
* separate stats and achievs tabs, move 'enable class system' button to stats
* move stats layout stuff from profile.jade to stats.jade
* shuffle stats page into more columns
* separate stats and achievs in expandable navbar submenus
* add multiple options for stats.jade: col1, col2, all; fixes weirdly crowded members modal
* make stats and achievs strings consistent
* remove mobile checks in profile.jade
* fix merge issue
2016-09-12 22:04:47 -05:00
Kaitlin Hipkin
c126aa532c
cron does not count days with all-grey dailies as perfect ( #7983 )
2016-09-12 21:30:35 -05:00
Travis
bbf15e1756
fixes task edit cancellation commit ( #7931 )
...
* fixes the commit that shows actual task values when task edit is canceled.
This reverts commit 3d64f2b849 .
* removing _edit references from fields of a task that can't change and are always set
* removing _edit from task.type as type cannot change while editing.
* Addressing comments by blade
2016-09-12 21:23:23 -05:00
AccioBooks
289b5c2a42
Remove "flicker" ( #7926 )
2016-09-12 21:10:37 -05:00
Blade Barringer
3f03aab4ee
fix: clean up duplicate translation keys
2016-09-12 21:04:05 -05:00
Blade Barringer
78d5f8c4f5
fix(api): prevent users from signing up with habitica or habitrpg emails
...
fixes #7633
closes #7659
2016-09-12 20:41:44 -05:00
Blade Barringer
0150b355cb
fix: move attachMiddlwares function so mongoose models have tx strings
2016-09-12 20:40:12 -05:00
Blade Barringer
d31dc6d9a9
fix: Update notifications lib to make it testable
...
closes #7770
closes #7782
2016-09-12 16:59:52 -05:00
Blade Barringer
9d537d93d8
fix(client): Copy inbox messages to tasks
...
fixes #7017
closes #6994
2016-09-12 08:01:50 -05:00
Blade Barringer
ed702a437d
fix: Update challenge controller tests
2016-09-11 22:15:42 -05:00
Blade Barringer
379b318202
fix(client): Allow bulk task adding in challenges
...
closes #6781
fixes #6723
2016-09-11 21:59:18 -05:00
Blade Barringer
0474b5d2e6
chore(i18n): update locales
2016-09-11 09:19:50 -05:00
Matteo Pagliazzi
71f2f49a28
Merge pull request #7972 from HabitRPG/paglias/realtime-chat-v1
...
Real Time Chat v1 (parties only)
2016-09-11 12:59:02 +02:00
Travis
b73cf2e272
Adding tests to prove expected behavior around force starting a quest ( #7848 )
...
* starting
* adding tests to prove the expected behavior occurs around force starting a quest. part of #7653
* fixing up tests and adding functionality to remove user from quest if they are not in the questing party
* adding code to handle when the user is deleted and added a test around that situation
* fixing up comments
2016-09-10 23:10:37 -05:00
Blade Barringer
ed4039c08c
refactor(api): Use forEach instead of a for loop
2016-09-10 23:03:42 -05:00
Alyssa Batula
923b6c495e
Collection quest progress reports "found no [item names]" fixes #7816 ( #7883 )
...
* Updated collection quest tests for no found items.
Single-item quests state [user] found no [items]. instead of [user] found nothing. If a
quest has two items, the chat message is [user] found no [item1] and no [item2].
* Collection quest messages changed from [user] found nothing to [user] found no [item]
* Tests for no collection quest items found changed to [user] found 0 [item1], 0 [item2]
* Changed chat messages for no found collection quest items to [user] found 0 [item1], 0 [item2]
* Sort items alphabetically in multi-item quests so that it always returns the same string
* Formatting updates to conform to test specifications (for collection quest progress reports with no items found
* Simplified handling of items not found: any items not found are added to the list of found items with quantity 0 for reporting in the group chat. This also causes all items to appear, in the list, even if only one type is found in a multi-item quest.
* Test the group chat message when no items are found in multi-item quests. Test succes no longer depends on the order items are listed.
2016-09-10 23:03:28 -05:00
Blade Barringer
b8878df6bd
fix(client): Apply sleep prevention to some avatar generation calls
2016-09-10 22:41:20 -05:00
Alyssa Batula
aac38dda91
Avatar's eyes can be set to open or closed in modals while in the Inn fixes #6282 ( #7988 )
...
* Avatar model can be set to have eyes open, eyes shut, or left to default by specifying the sleep parameter in generatedAvatar to be false, true, or null (respectively).
* Explicitly check true and false and switched to using triple equals for equality comparisons for avatar sleep setting.
2016-09-10 22:41:00 -05:00
Blade Barringer
3d53781bd3
Fix content name error ( #7995 )
...
* fix: correct translation strings for pet/mount names
* chore: expose potion and egg key, not object in pet content api
* fix: Update feed route to use potion and egg objects
* refactor: Update feed route to use petInfo
* Use pet/mount text method for name
* correct feed route
2016-09-10 22:05:25 -05:00
Alys
295463b210
improve instructions about sending login details (no password)
2016-09-11 08:27:31 +10:00
Blade Barringer
bf3387703d
Pull out animal content into separate files ( #7989 )
...
* Pull out animal content into separate files
* Correct variable names
* Add tests for stable, eggs, and hatching potions content
* Add content test back into npm test
2016-09-10 13:37:10 -05:00
Blade Barringer
f496a6b0c7
feat: Lower cost of orb of rebirth
...
closes #7917
fixes #7944
2016-09-09 21:08:42 -05:00
Oziris
0dfb1f150f
Provide better invitation messaging
...
closes #7794
fixes #7789
2016-09-09 20:37:05 -05:00
Matteo Pagliazzi
2d6223377f
chat: better behavior for menu notification
2016-09-09 21:34:24 +02:00
Matteo Pagliazzi
60f7a1dbd9
add small timeout before asking for notification permission
2016-09-09 21:26:40 +02:00
Matteo Pagliazzi
f6c765b7b5
better notifications icon
2016-09-09 21:03:47 +02:00
Matteo Pagliazzi
e2b03ec9cf
Merge branch 'develop' into paglias/realtime-chat-v1
2016-09-09 20:13:21 +02:00
Matteo Pagliazzi
98df0f26e7
add notifications, fix too many seen requests and misc fixes
2016-09-09 20:12:17 +02:00
Matteo Pagliazzi
a748e57cd7
do not sync automatically on chat seen requests
2016-09-09 19:11:21 +02:00
Oziris Moreira
7d7bb3ecb8
Prevent Challenge page from scrolling to top ( #7975 )
...
* Test pageTitle challenge
* Test state name challenge detail
* Change != to !==
* IGNORE_SCROLL_PAGES
* add challenge to ignore_scroll
2016-09-09 08:51:08 -05:00
Kaitlin Hipkin
a3f83b9076
Improvement #6912 : New achievement modal service and more achievement tests ( #6943 )
...
* add tests for beastMaster, mountMaster, and triadBingo achievements
* add tests for challengeWon, streak, ultimateGear, rebirth, and contributor achievements
* add achievement service that has openModal function
* achievement test pass again
* fix indentation, rename openModal to more descriptive displayAchievement
* add unit tests for achievements service
* initialize user.preferences.suppressModals in specHelper.newUser
* update achievement tests to account for new notification service
* add new achievementServices file to manifest.json
* fix tests
* award wonChallenge achiev like other achievs
* differentiate between small and normal achiev modals
* refactor achievementService.displayAchievement() to take options param
2016-09-09 07:58:44 -05:00
Alys
31a1a14bae
3.40.0
2016-09-09 17:14:01 +10:00
Alys
f16f9684ca
fix spelling mistake and remove outdated material
2016-09-09 16:36:09 +10:00
Connor McArthur
598f0a7a1b
chore: Add cron semi-safe mode tests
...
fixes #7464
closes #7733
2016-09-08 21:46:02 -05:00
Blade Barringer
909ee94b20
Merge pull request #7750 from thompsnm/develop
...
Add tests for timezoneOffsetToUtc filter
2016-09-08 21:39:04 -05:00
Blade Barringer
1250d69d17
chore: Add android FAQs
...
fixes #7719
closes #7726
2016-09-08 21:28:04 -05:00
Blade Barringer
d9b8ee840d
chore: Update press kit
...
Implimented from #7262
fixes #7174
closes #7262
2016-09-08 21:18:02 -05:00
Blade Barringer
a4557e87a9
Merge pull request #7986 from JSchneidler/slack_fix
...
Use npm package instead of github for @slack/client.
2016-09-08 20:33:18 -05:00
Blade Barringer
f275265c2b
chore: Provide additional tests for local login defaults
2016-09-08 20:32:20 -05:00
Rick Kasten
97417c626a
Fixes #7933 - Change Default tags to match types, not times of day ( #7954 )
...
* Fixes #7933
Changes
Default tags changed to
- "Work"
- "Exercise"
- "Health + Wellness"
- "School"
- "Teams"
- "Chores"
- "Creativity"
Changes made only to the en and en_GB locales
UUID: 30983c37-52c3-415d-977c-38af6c7db91c
* Reverting changes to en_GB locale
* Reverting format change
2016-09-08 20:26:34 -05:00
Blade Barringer
454ccffb03
fix: save tour state
...
Implimentation of #6545 by @tylerxo
fixes #5854
fixes #5852
closes #6545
2016-09-08 20:23:49 -05:00
Jordan Schneidler
405798d958
Changed slack client to use npm package instead of github.
2016-09-08 17:38:27 -05:00
Matteo Pagliazzi
94e2691bae
Merge branch 'develop' into paglias/realtime-chat-v1
2016-09-08 19:16:37 +02:00
Matteo Pagliazzi
d1903578f9
pusher: remove more duplicate code ( sorry :( )
2016-09-08 19:13:52 +02:00
Matteo Pagliazzi
6ba721998a
Merge branch 'develop' into paglias/realtime-chat-v1
2016-09-08 19:12:05 +02:00
Blade Barringer
0c0f50f647
Merge pull request #7979 from crookedneighbor/fix_infinite_build_output
...
Fix infinite build error
2016-09-08 12:07:05 -05:00
Matteo Pagliazzi
459a41a5ac
pusher: remove duplicate code
2016-09-08 19:05:22 +02:00
Matteo Pagliazzi
136b4ada45
renable limit on number of tabs connected
2016-09-08 19:05:03 +02:00
Matteo Pagliazzi
d4dc455926
re-enable limit of 1 tab per user connected to pusher
2016-09-08 18:51:24 +02:00
Matteo Pagliazzi
cac764e5d1
add online indicator for party members
2016-09-08 18:48:07 +02:00
AccioBooks
ef73c61e0e
API Warning message ( #7978 )
...
* Warning message
* Change warning text and style
* Update settings.json
2016-09-08 16:46:21 +10:00
Blade Barringer
0862c3b077
fix: Correct quest damange calculation
...
fixes #7980
2016-09-07 21:09:12 -05:00
Blade Barringer
543a9d06c1
3.39.1
2016-09-07 21:00:46 -05:00
Blade Barringer
aff9af7db2
Revert "Disable checkbox"
...
This reverts commit 82448b2a93 .
2016-09-07 20:45:40 -05:00
Blade Barringer
730fe8898e
Fix infnite build error fix
2016-09-07 20:17:29 -05:00
Sabe Jones
0de3efe942
3.39.0
2016-09-07 20:39:51 +00:00
Sabe Jones
e474dc199b
chore(sprites): compile
2016-09-07 20:39:30 +00:00
Sabe Jones
4844aa5e47
chore(news): misc Bailey
2016-09-07 20:19:43 +00:00
Blade Barringer
ee409174f1
Format files to adhere to editorconfig ( #7977 )
2016-09-07 12:58:26 -05:00
Blade Barringer
da8f0373ba
fix: correct api tag tests to not rely on default tags
2016-09-07 12:55:07 -05:00
Blade Barringer
67716ef309
Clean up quest progress logic
2016-09-07 12:48:06 -05:00
Thomas Gamble
db19dbf49c
shows quest progress in menu #7928
...
fixes #7928
closes #7960
2016-09-07 12:47:50 -05:00
Matteo Pagliazzi
748e9f7580
Merge branch 'develop' into paglias/realtime-chat-v1
2016-09-07 17:21:43 +02:00
Matteo Pagliazzi
7ea9debe3f
trigger pusher on system messages too
2016-09-07 17:18:48 +02:00
Matteo Pagliazzi
ea2be45414
add notifications for real time messages
2016-09-07 17:16:32 +02:00
Matteo Pagliazzi
41079a65c6
correctly reconnect to pusher after inactivity
2016-09-07 17:00:43 +02:00
Matteo Pagliazzi
15ceab4bf4
Merge branch 'develop' into paglias/realtime-chat-v1
2016-09-07 16:59:50 +02:00
Matteo Pagliazzi
85c4332a40
pusher: remove commented code that is unused
2016-09-07 16:51:22 +02:00
Matteo Pagliazzi
dafae31366
disable limit of 1 tab per browser connected to pusher
2016-09-07 16:50:22 +02:00
Matteo Pagliazzi
40c9c05514
fix first connection to pusher
2016-09-07 16:46:32 +02:00
Matteo Pagliazzi
0baff2dfd9
remove limit of 1 connected tab per browser
2016-09-07 16:44:20 +02:00
Matteo Pagliazzi
a4ecdbeb3e
fully sync party on system messages
2016-09-07 16:39:53 +02:00
Matteo Pagliazzi
fd00543a8d
change button text for syncing party
2016-09-07 16:01:21 +02:00
AccioBooks
861eaf36d3
Create .editorconfig
...
fixes #4376
closes #7957
2016-09-07 08:44:57 -05:00
Blade Barringer
def2ea0add
Merge branch 'Ozzystrasza-challenge_sample_tasks' into develop
2016-09-07 08:23:55 -05:00
Ozzystrasza
82448b2a93
Disable checkbox
...
fixes #5284
closes #7961
2016-09-07 08:23:17 -05:00
Alys
9fde8b4d48
adjust footer to have relative link for Submit Bug ( fixes #7973 ) and "News" link for Old News page (ref. #7976 )
2016-09-07 23:17:21 +10:00
AccioBooks
5f9eb6a72c
Old news ( #7976 )
...
* Update footer.jade
* Update front.json
* Update front.json
2016-09-07 07:55:33 -05:00
Blade Barringer
e4fcbed769
Merge pull request #7956 from MathWhiz/patch-1
...
Clear up login button text
2016-09-06 20:57:46 -05:00
Matteo Pagliazzi
f28dead692
do not sync party every time the page is opened, update chat in realtime
2016-09-06 11:18:52 +02:00
Matteo Pagliazzi
6792464fbf
limit rtc to parties
2016-09-05 17:54:24 +02:00
Matteo Pagliazzi
4b6af73a1b
add support for brazilian portuguese ( #7910 )
2016-09-04 20:00:49 +02:00
Keith Holliday
836cee2531
Groups assign tasks ( #7887 )
...
* Added initial code for creating and reading group tasks
* Separated group task routes. Separated shared task functions
* Added taskOrder to group
* Minor style fixes
* Fixed lint issues
* Added unit tests for task manager
* Updated task helper functions
* Fixed history test
* Fixed group task query
* Removed extra var
* Updated with new file structure
* Updated noset values
* Removed unecessary undefineds, fixed comments, Added apiignore
* Separated group task routes. Separated shared task functions
* Added unit tests for task manager
* Added initial groups assign route and tests
* Added sync assigned task to user
* Added unassign route and unlink method
* Added remove and unlink group task
* Updated linking and unlinking. Add test for updating task info
* Added delete group task and tests
* Added sync on task update and tests
* Added multiple users assignment
* Updated unassign for multiple users
* Added test for delete task with multiple assigend users
* Added update task for multiple assigned users
* Fixed issue with get tasks
* Abstracted syncable attributes and add tests
* Fixed merge conflicts
* Fixed style issues, limited group query fields, and added await
* Fixed group fields needed. Removed api v2 code
* Fixed style issues
* Moved group field under group sub document. Updated tests. Fixed other broken tests
* Renamed linkedTaskId and fixed broken alias tests
* Added debug middleware to new routes
* Fixed debug middleware import
* Added additional user id check for original group tasks
* Updated challenge task check to look for challenge id
* Added checklist sync fix
2016-09-03 10:54:55 +02:00
Blade Barringer
173b3f3f84
fix: Account for system messages in flag slack alert
2016-09-02 15:23:56 -05:00
Blade Barringer
36d3ac4611
fix: prevent 500 error when unflagging a system message
2016-09-02 15:14:41 -05:00
Blade Barringer
c703517b25
3.38.0
2016-09-02 13:04:27 -05:00
Blade Barringer
b15476be7a
chore(i18n): update locales
2016-09-02 11:39:36 -05:00
Blade Barringer
aa2c941e1a
Merge pull request #7938 from HabitRPG/send_flags_to_slack
...
Send flags to slack
2016-09-02 11:32:42 -05:00
Blade Barringer
87973d7b66
chore: Switch out footer link for HabitRPG version
2016-09-02 11:10:48 -05:00
Blade Barringer
45e4c6867e
chore(test): increase test coverage around logger lib
2016-09-02 11:10:47 -05:00
Blade Barringer
6480602ee6
fix(test): Correct logger test
2016-09-02 11:10:47 -05:00
Blade Barringer
41851afe5f
fix: noop if no slack flagging url is passed in
2016-09-02 11:10:46 -05:00
Blade Barringer
2180cb3d98
feat(api): Send flag notifications to slack
2016-09-02 11:10:46 -05:00
Sabe Jones
bd5471a0e3
3.37.0
2016-09-01 21:01:40 +00:00
Sabe Jones
e5f2bd4fb1
chore(sprites): compile
2016-09-01 21:01:30 +00:00
Sabe Jones
5c761b1237
feat(content): BGs and Armoire comp ( #7964 )
2016-09-01 15:56:35 -05:00
Sabe Jones
3649699b8d
3.36.1
2016-09-01 17:57:13 +00:00
Blade Barringer
7702f9dccc
Challenge checklist fix ( #7963 )
...
* fix(challenges): don't wipe user xlists
* Add test for challenge checklists not syncing to user
2016-09-01 12:34:02 -05:00
Sabe Jones
95d33a1dff
3.36.0
2016-09-01 16:03:14 +00:00
Sabe Jones
7efde862f1
fix(challenges): temp remove challenge edit
2016-09-01 15:45:36 +00:00
Blade Barringer
ebef5ad60c
chore: Add test for duplicate locale keys
2016-08-31 21:26:05 -05:00
Sabe Jones
e65f27fb69
fix(subscriptions): gift termination date ( #7948 )
2016-08-31 17:16:40 -05:00
Sabe Jones
cb1417ea58
Handle empty market category on Drops page ( #7959 )
...
* fix(market): hide category in view
* refactor(view): if, not hide
* fix(test): allow empty market cat
2016-08-31 17:16:22 -05:00
Sabe Jones
75eb1b11cf
chore(challenge): next Take This migration
2016-08-31 19:41:04 +00:00
Sabe Jones
7e0a860b25
chore(content): disable Thunderpotions
...
Also remove superfluous message about the Quests Shop
2016-08-31 19:14:28 +00:00
AccioBooks
2d28d8ffed
Clear up login button text
2016-08-31 12:14:42 -05:00
Blade Barringer
3cda5d6b38
chore(i18n): update locales
2016-08-31 08:57:19 -05:00
Sabe Jones
57f49d2a7d
feat(content): Armoire and BG strings
2016-08-30 21:09:04 +00:00
Sabe Jones
e69b733f90
3.35.0
2016-08-30 17:36:30 +00:00
Sabe Jones
c726fa78f5
chore(news): misc Bailey
2016-08-30 17:11:29 +00:00
Sabe Jones
2e050be111
fix(contact): s/leslie/admin/g ( #7945 )
2016-08-29 19:58:51 -05:00
Blade Barringer
e5f2a06491
Merge pull request #7941 from gambtho/develop
...
When blocking a user, make them rest at the inn - fixes #7935
2016-08-27 10:52:30 -05:00
Blade Barringer
6e5d2ad20a
Merge pull request #7943 from crookedneighbor/update_require-again
...
chore: Update require-again
2016-08-27 10:31:59 -05:00
Thomas Gamble
af088d4b3a
Blocking a user makes them sleep Fixes #7935
...
Blocking a user will make the user rest at an inn, the user will
remain resting when unblocked
2016-08-27 11:17:45 -04:00
Blade Barringer
92bbafeb5d
chore: Update require-again
2016-08-27 09:57:13 -05:00
Alys
9981f450c0
clarify usage of API's block route and remove incorrect info about only admins using it
2016-08-27 06:04:51 -07:00
Blade Barringer
44abfeb013
Merge pull request #7934 from ujjwalgulecha/fix-health-potion-when-health-is-max
...
GP will not be deducted if health is max
2016-08-27 07:56:46 -05:00
Ujjwal Gulecha
03c14859d5
GP will not be deducted if health is max
2016-08-26 11:30:17 -07:00
Alys
320d8cac5f
replace "Tavern Talk" with "Tavern Chat" above Tavern's chat box - fixes https://github.com/HabitRPG/habitrpg/issues/6813
2016-08-26 07:57:16 -07:00
Blade Barringer
33377263d9
feat(api): Admins can unflag private group messages
2016-08-25 15:31:39 -05:00
Blade Barringer
7f50532e8b
Merge pull request #7930 from crookedneighbor/flag_improvements
...
Flag improvements
2016-08-24 22:28:26 -05:00
Blade Barringer
cf804be04e
chore(api): Update flag chat docs
2016-08-24 21:32:48 -05:00
Blade Barringer
65556c0444
feat: Allow admins to flag messages in private groups
2016-08-24 21:32:32 -05:00
Sabe Jones
88d26cd200
fix(news): credit TheHollidayInn
2016-08-24 15:15:43 -05:00
Husman
2308e14d3e
fix: allows leader of challenge to create new challenge tasks even when not a participant of the challenge. fixes #7918
...
closes #7924
2016-08-24 12:07:54 -05:00
Blade Barringer
5bcc2561ae
feat(client): Show battle with friends button with 3 members
...
fixes #6754
closes #6765
2016-08-24 08:45:39 -05:00
Blade Barringer
e957617386
3.34.1
2016-08-23 22:14:19 -05:00
Blade Barringer
c5ac5b4f2d
Merge pull request #7921 from HabitRPG/revert_task_cancel_pr
...
fix: Revert #7692
2016-08-23 22:00:03 -05:00
Blade Barringer
3d64f2b849
fix: Revert #7692
2016-08-23 21:40:33 -05:00
Blade Barringer
671e954cec
chore(i18n): update locales
2016-08-23 17:33:04 -05:00
Blade Barringer
f148c592f5
Merge pull request #7911 from crookedneighbor/fix_magic_pets_spacing
...
fix(client): Correct logic to show premium pets
2016-08-23 17:20:17 -05:00
Sabe Jones
53254beaaf
3.34.0
2016-08-23 20:48:36 +00:00
Sabe Jones
0e319200f1
chore(sprites): compile
2016-08-23 20:48:23 +00:00
Sabe Jones
6a04ed7392
fix(editing): send user on dblclick
2016-08-23 20:22:27 +00:00
Sabe Jones
71a759c551
feat(content): mystery items 201608 ( #7919 )
2016-08-23 14:49:22 -05:00
Alys
80f57d9a44
remove outdated Physical/Mental/Social/Other descriptions for task-based allocation
2016-08-22 21:01:34 -07:00
Alys
3a79ed6cd6
link to new wiki page describing all extensions in a neat table
...
This is for the "Other Extensions" link on the Settings > API page.
2016-08-22 09:16:18 -07:00
Alys
d691704db2
change Report a Bug link and text in website FAQ ( #7718 )
...
* change Report a Bug link in website FAQ
* add email address for reporting login problems
2016-08-20 21:33:39 -07:00
Blade Barringer
fca0188172
Merge branch 'task_edit_fix' into develop
2016-08-20 21:23:43 -05:00
Blade Barringer
67187c1b08
fix: show markdown compiled task text while editing
2016-08-20 09:21:52 -04:00
Blade Barringer
b3b7108bd6
Merge branch 'develop' into Hus274-7688
2016-08-20 08:31:22 -04:00
Alys
dd80a2e76e
make Export Data introduction more accurate (it exports more than Habits)
2016-08-19 21:07:07 -07:00
Alys
2fea2d9565
adjust message displayed on Done To-Dos tab to reflect API v3 changes
...
The 30 most recently completed To-Dos are now shown, regardless of how long ago they were completed.
2016-08-19 21:06:45 -07:00
Luveluen
a654369075
Update faq.json - description of mechanic outdated ( #7913 )
...
* Update faq.json line - description of mechanic outdated
Changed
<---Tap on a Pet, and then select \"Feed Pet\"!
--->Click on a type of food, and then select the pet you want to feed!
because clicking on the pet first does not work anymore, clicking on the pet first selects it for use.
As described by MeikeMertsch here: https://www.transifex.com/habitrpg/habitrpg/translate/#de/faqjson/60117132
* Update faq.json
2016-08-19 15:40:51 -07:00
Blade Barringer
a69ab954f5
fix(client): Correct logic to show premium pets
...
Fixes #7888
2016-08-19 08:41:27 -04:00
Sabe Jones
106bf52915
3.33.1
2016-08-18 20:28:09 +00:00
Sabe Jones
9f0d4fbd65
fix(auth): Facebook on MS Edge
2016-08-18 20:07:14 +00:00
Sabe Jones
3ac5617e57
chore(news): Bailey 20160818
2016-08-18 18:58:37 +00:00
Sabe Jones
f5224282d9
3.33.0
2016-08-18 17:58:49 +00:00
Sabe Jones
53a7f7ba5f
chore(sprites): compile
2016-08-18 17:51:51 +00:00
Sabe Jones
0c11d8fb6d
feat(content): Pets 201608 ( #7903 )
2016-08-18 12:40:29 -05:00
Phillip Thelen
7ef2c34177
add route for QR codes ( #7902 )
...
* add route for QR codes
* check that passed ID is a UUID
* add test for qr code redirect
* fix qr code test
2016-08-18 19:37:14 +02:00
Blade Barringer
e68c75c802
chore(i18n): update locales
2016-08-17 10:24:04 -05:00
Blade Barringer
fd70efcb60
Merge pull request #7900 from crookedneighbor/analytics_fix
...
Analytics fix
2016-08-15 22:39:03 -05:00
Jaka Kranjc
408d988341
api: expose user's inbox.optOut for api/v3/members/:memberId #7798 ( #7893 )
...
* api: expose user's inbox.optOut for `api/v3/members/:memberId` #7798
* test: fixed chai exist vs exists typos
* _getMembersForItem: fixed typo in api docs
2016-08-15 22:21:14 -05:00
Blade Barringer
bd8b1b0ece
chore(tests): Rewrite analytics tests to remove dependency on nock
2016-08-15 22:20:39 -05:00
Travis
1a409848a8
allow flagging the post of a deleted user ( #7897 )
...
* Allowing the flagging of messages that were written by user accounts that have since been deleted
* replacing ternary operator with else if, else paradigm
* formatting fixes
* fixing message in tests
2016-08-15 22:14:52 -05:00
Blade Barringer
9223aecfbe
fix(api): Pass in headers to payments analytics
2016-08-15 08:07:59 -05:00
Blade Barringer
977bafd2d1
fix(api): Set platform and agent to Unknown if headers are not passed in
2016-08-15 08:07:59 -05:00
Camellia Peng
12f1aae2dd
Update email check exist ( #7899 )
...
* throw a 401 error if user tries to update his/her email to an email that exists already
* Make error message generic so we don't violate users' privacy. Added test case.
* Syntax fixes
* select only the _id field when searching for users with the same email. Return found document as javascript object.
2016-08-15 07:52:53 -05:00
Blade Barringer
02545ae439
3.32.0
2016-08-14 14:10:40 -05:00
Blade Barringer
5a47f2a19f
chore(i18n): update locales
2016-08-14 14:08:50 -05:00
Blade Barringer
c7a2b69b32
chore(i18n): update locales
2016-08-13 07:03:50 -05:00
Blade Barringer
b1d06671c8
chore(i18n): update locales
2016-08-12 08:57:45 -05:00
Kaitlin Hipkin
55111a6ddc
New Party Loading Messages ( #7862 )
...
* add basic party loading message code; doesn't work yet
* fixup party loading messages, remove rpg-style messages
* move party-loading messages back into groups.json
* party-loading message logic returns a string instead of a number
2016-08-12 08:53:03 -05:00
Matteo Pagliazzi
7ccbcd7b33
add reorder task step to ios tutorial, mounts and inbox steps for both android and ios
2016-08-12 14:55:55 +02:00
Blade Barringer
8a4109b9d7
chore(i18n): update locales
2016-08-11 13:01:23 -05:00
Phillip Thelen
679378331d
add client and OS info to amplitude events
...
closes #7865
2016-08-11 08:58:13 -05:00
Blade Barringer
e3c40aa142
fix(client): Prevent restore streak from showing up in challenge creation
2016-08-11 08:48:44 -05:00
Husman
725c3b36f3
feat: allowing modification of challenge tasks after challenge creation. fixes #7320
...
closes #7877
2016-08-11 08:48:39 -05:00
Blade Barringer
89822222fe
Merge pull request #7881 from Hus274/7716
...
fix: shows user correct challenge when showing won challenge modal
2016-08-11 08:07:16 -05:00
Blade Barringer
fed1eb8c21
fix(client): set state chagne to scroll to top
...
closes #7880
fixes #4326
2016-08-11 07:59:12 -05:00
Blade Barringer
858da4f9c9
Merge pull request #7890 from HabitRPG/sabrecat/prefs-undefined
...
Fix preferences typeError
2016-08-11 07:48:14 -05:00
Josh Holland
cdeb498c0b
Align guild gems box with other page elements ( #7829 )
...
* Align guild gems box with other page elements
Fixes #7796 .
* Fix issues caused by aligning guild gems box
* Remove unnecessary comment
* Connect gem total box and plus/add gems button
When the add gems button is displayed, set border-radius on touching
corners between the two buttons to 0, so that they are displayed as a
unit rather than two separate buttons.
2016-08-11 07:45:21 -05:00
Sabe Jones
e7a820e28d
fix(editing): preferences typeError
2016-08-10 20:23:14 +00:00
Blade Barringer
395e602cfc
3.31.0
2016-08-10 12:28:32 -05:00
Blade Barringer
d50cedfd31
chore(i18n): update locales
2016-08-10 12:18:55 -05:00
Blade Barringer
a5b2e53914
fix(client): Add client redirect for coupon url
2016-08-10 12:12:56 -05:00
Blade Barringer
0e42d6ba32
Merge pull request #7889 from crookedneighbor/fix_purchase_call_in_view
...
fix: Correct purchase call to use purchaseType, not identifier
2016-08-10 12:00:06 -05:00
Blade Barringer
420cebd93b
fix: Correct purchase call to use purchaseType, not identifier
2016-08-10 08:58:01 -05:00
Blade Barringer
384783567b
chore(tests): Add test to catch bugs when adding invalid types to market
2016-08-10 08:44:21 -05:00
Sabe Jones
64ffa4912d
3.30.2
2016-08-10 05:28:29 +00:00
Sabe Jones
64c8e4d16d
fix(content): item type handling
2016-08-10 05:18:30 +00:00
Sabe Jones
0d1bff5dda
3.30.1
2016-08-10 03:47:30 +00:00
Blade Barringer
06cae45ed9
lint: Correct missing semicolons
2016-08-09 22:29:48 -05:00
Blade Barringer
2d553417b4
fix(api): Correct identifier for magic hatching potions
2016-08-09 22:21:54 -05:00
Alys
4df2b723fa
fix errors in apidocs for coupons/enter/:code and tasks/:taskId
2016-08-10 12:50:07 +10:00
Sabe Jones
f92cba6a40
3.30.0
2016-08-09 23:40:31 +00:00
Sabe Jones
9e16f9dffc
chore(sprites): compile
2016-08-09 23:40:22 +00:00
Sabe Jones
72f1114d85
refactor(content): concatenate notes
2016-08-09 23:19:53 +00:00
Sabe Jones
051763bc49
Thunderstorm Hatching Potions ( #7885 )
...
* feat(premium): Thunderstorm Potions
* chore(news): Thunderstorm Bailey
* fix(test): allow addlNotes key
2016-08-09 17:37:39 -05:00
Matteo Pagliazzi
689a321a9b
enable pusher for all users
2016-08-09 20:05:04 +02:00
Blade Barringer
bce4f55df5
chore: Fix score test to not be so flaky
2016-08-09 08:58:36 -05:00
Husman
acc9e8ca7f
fix: shows user correct challenge when showing won challenge modal
2016-08-07 16:27:18 -07:00
Matteo Pagliazzi
6dfa93dab2
correct pusher inactivity timeout
2016-08-08 00:08:54 +02:00
Matteo Pagliazzi
8ffc93f9c5
3.29.1
2016-08-07 22:24:39 +02:00
Matteo Pagliazzi
3efd900a3f
correctly check for Pusher being enabled
2016-08-07 22:23:00 +02:00
Matteo Pagliazzi
ff4a3adf7e
feat(pusher): disconnect after 30m of inactivity
2016-08-07 22:20:45 +02:00
Husman
bba56b8c29
fix: remove guild or party when user looks it up if it does not exist
...
closes #7878
fixes #7724
2016-08-07 10:41:07 -05:00
Sabe Jones
ae533652c3
3.29.0
2016-08-05 19:29:45 +00:00
Sabe Jones
77c276fefe
feat(analytics): Facebook "Pixel" ( #7871 )
2016-08-05 13:40:25 -05:00
Blade Barringer
05eacc32ba
Merge branch 'develop' into Hus274-7793
2016-08-05 12:55:00 -05:00
Blade Barringer
626b87eb79
Merge pull request #7849 from Hus274/7653-3
...
booting a member from party removes member from quest
2016-08-05 12:35:45 -05:00
Travis
d7c5d05f13
Clear invites from user when the request fails because the invite is invalid ( #7852 )
...
* making requests to accept or reject a request fail because the invite is invalid clear the invite from the user so it doesn't require admin intervention. part of #7653
* Adding await
2016-08-05 12:34:06 -05:00
Blade Barringer
093c5a72df
Merge branch 'develop' into Ozzystrasza-tavern_default_prize
2016-08-05 12:22:41 -05:00
Blade Barringer
ed0055e01b
Merge pull request #7872 from ESWAT/fix-guild-message-firefox
...
Fix #6708 - guild message maximizes width in Firefox
2016-08-05 12:00:57 -05:00
Blade Barringer
70ee091fa8
Merge pull request #7873 from ESWAT/fix-current-audio-theme
...
Fix #7869 - highlight current audio theme in dropdown
2016-08-05 11:59:34 -05:00
Philip Karpiak
2788d64a2b
Fix #7778 - update missing image in static/features ( #7874 )
2016-08-05 11:58:21 -05:00
Philip Karpiak
3429f88f5b
Fix #7869 - highlight current audio theme in dropdown
2016-08-04 18:53:21 -04:00
Philip Karpiak
bea4bf80e9
Fix #6708 - guild message maximizes width in Firefox
2016-08-04 18:02:55 -04:00
Matteo Pagliazzi
ae5b66e248
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-08-04 20:00:19 +02:00
Matteo Pagliazzi
110a9d52fa
Merge branch 'TheHollidayInn-facebook-login-add-newuser-flag' into develop
2016-08-04 19:59:59 +02:00
Matteo Pagliazzi
725ed22704
added apidoc info about data.newUser in login response
2016-08-04 19:59:48 +02:00
Matteo Pagliazzi
d1bd63289b
Merge branch 'facebook-login-add-newuser-flag' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-facebook-login-add-newuser-flag
2016-08-04 19:58:09 +02:00
Matteo Pagliazzi
d7ccf2bbe1
API: return computed stats for members routes ( #7870 )
...
* api: return computed stats for members responses
* add integration tests for computed stats
* add unit tests for computed stats
* clarify test name
* add missing query parameter to test case
* reset test database before running API tests for the Hall
2016-08-04 19:56:00 +02:00
Sabe Jones
d097868cad
3.28.0
2016-08-03 20:40:18 +00:00
Sabe Jones
3a48022878
chore(news): announce audio theme
2016-08-03 20:37:43 +00:00
Sabe Jones
b25ab8ca75
chore(sprites): compile
2016-08-03 20:27:49 +00:00
Sabe Jones
29498976ee
feat(content): Armoire and BGs 201608 ( #7868 )
...
Plus: beta shops API fixes and front page user count update
2016-08-03 14:55:12 -05:00
Matteo Pagliazzi
fb939e0300
Migrate from GCM to FCM notifications ( #7860 )
...
* Fixed logging. Fixed lint issues. Temporarly removed GCM code
* Removed extra packages. Removed lingering gcm code
* Update message structure to send a data notification instead of a regular notification
* Removed excess code
* switch from fcm-push to node-gcm
2016-08-02 23:12:39 +02:00
Keith Holliday
2a76f0c8cf
Added lint ignore comment
2016-08-02 14:29:15 -05:00
Oziris
4244c7519e
Add Dewin's new Theme ( #7795 )
...
* Add files via upload
* Add string for new theme
* Added 'dewinTheme'
* Added 'dewinTheme'
* Delete Boss Battles Background Music.mp3
* Delete Boss Battles Background Music.ogg
* Delete Settings Page Background Music.mp3
* Delete Settings Page Background Music.ogg
* Add audio files with correct names
* Delete Boss Battles_Background_Music.mp3
* Delete Boss Battles_Background_Music.ogg
* Add files via upload
2016-08-02 10:03:01 +10:00
Ozzystrasza
063995d5e4
Test prize amount before changing to 1
2016-08-01 20:26:43 -03:00
Sabe Jones
d37ee98c6d
3.27.0
2016-08-01 23:12:21 +00:00
Sabe Jones
9a338ef1de
End Summer Splash 2016 ( #7857 )
...
* chore(event): end Summer Splash 2016
* fix(event): disable Seasonal Shop buys
2016-08-01 17:47:46 -05:00
Matteo Pagliazzi
60f34dafb0
Deprecate API v2 (was Revert "Revert "Deprecate API v2"") ( #7802 )
...
* Revert "Revert "Deprecate API v2""
* fix path in shops controller
2016-08-01 22:36:10 +02:00
Sabe Jones
2a3e3fb9d3
fix(gear): buy false takeThis gear ( #7855 )
2016-08-01 15:16:34 -05:00
Oziris
d51bd68201
Enable guild challenge prize to use guild bank gems ( #7840 )
...
* add leader property to getGroups
* Add test coverage
2016-08-01 14:31:31 -05:00
Sabe Jones
a8226b2363
3.26.0
2016-08-01 00:20:13 +00:00
Sabe Jones
7ad313918a
fix(news): missing date line
2016-07-31 19:00:57 -05:00
Sabe Jones
6ce917a0f3
feat(content): Naming Day 2016 ( #7853 )
2016-07-31 18:56:20 -05:00
Sabe Jones
e021212481
Naming Day and Take This migrations ( #7838 )
...
* feat(migrations): Naming Day and Take This
* fix(migration): more goodies, better query
* fix(migration): query in wrong migration
* fix(migration): don't award goodies repeatedly
* fix(migrations): move logic to query
* fix(migrations): better field lookup
* fix(migrations): use timeouts
2016-07-31 18:55:57 -05:00
Husman
6859cf1f73
booting a member from party removes member from quest whether the quest is started or not. part of #7653
2016-07-30 09:44:21 -07:00
Travis
6804125068
voluntarily leaving a party removes the user from the quest the party is involved in ( #7845 )
...
* voluntarily leaving a party removes the user from the quest the party is involved in. part of #7653
* addressing pr comments, removing lodash dependency and unecessary comment
* using the existing update object instead of group.save to avoid duplicate behavior
* finalizing tests
2016-07-30 06:53:29 -05:00
Sabe Jones
6e55be033b
3.25.3
2016-07-30 01:26:44 +00:00
Sabe Jones
084e2e7470
fix(news): also announce iOS
2016-07-30 01:26:24 +00:00
Sabe Jones
98e74b42e0
3.25.2
2016-07-29 23:39:26 +00:00
Sabe Jones
e52f9bd786
Last Chance Bailey 2016/07 ( #7842 )
...
* chore(news): Last Chance Bailey
* fix(news): rearrange announcements
2016-07-29 18:18:15 -05:00
Ryan Castner
7c579bf850
7837-Update API Docs ( #7839 )
...
* Updated API Docs for api-v3
* Updated API Docs for top-level
* Updates relating to @crookedneighbor comments
* Updated type and field of 'to' param.
2016-07-27 18:48:03 -05:00
Keith Holliday
e6dd8cc03a
Added tests for Facebook auth
2016-07-27 14:27:21 -05:00
Blade Barringer
795ea8ba80
Merge pull request #7835 from crookedneighbor/sanity_tests
...
chore(tests): Add sanity test for proper babel routes
2016-07-26 22:25:15 -05:00
Blade Barringer
c7d08a6811
chore(tests): Add sanity test for proper babel routes
2016-07-26 21:56:51 -05:00
Sabe Jones
1ed7e21542
3.25.1
2016-07-26 22:35:28 +00:00
Sabe Jones
40eb74ea1b
fix(path): common import
2016-07-26 22:30:43 +00:00
Sabe Jones
1ab3725b54
fix(path): correct i18n import
2016-07-26 22:11:35 +00:00
Sabe Jones
8e2ab11056
3.25.0
2016-07-26 19:54:38 +00:00
Sabe Jones
1c56648ea4
chore(sprites): compile
2016-07-26 19:42:36 +00:00
Phillip Thelen
24d25026cf
Add API calls for shop inventories ( #7810 )
...
* Add API call for market inventory
* changes to shop api calls
* optimize shop categories
* add API call for quests
* add api call for time travelers shop
* fic buying items in shops
* fix linting errors
* shop adjustments for iOS app
* add tests to shops
* fix syntax issues
* Code formatting
* correct indentation
* add tests for api routes
* fix time travelers and seasonal
* Increase test coverage for shop routes
* refactor: Pull out trinket count in time traveler route
* refactor: Clarify instructions for seasonal shop script
* lint: Remove extra new line
* Adjust shops common test
2016-07-26 14:36:55 -05:00
Sabe Jones
aa00893f6c
feat(content): July 2016 Subscriber ( #7833 )
2016-07-26 14:20:50 -05:00
Ryan Castner
60367459e8
Fixes #7826 updating blog and adding tumblr links, as well as a developer link. One additional change was made in layout.jade not mentioned in ticket request which also referenced the old blog url, updated to point to new blog url. ( #7828 )
2016-07-26 21:28:15 +10:00
Keith Holliday
9d4fa6fd4e
Added new user flag when user registers with facebook
2016-07-24 17:23:19 -05:00
Sabe Jones
ef65325f67
3.24.1
2016-07-21 17:29:43 +00:00
Sabe Jones
ee5e94bc35
chore(news): Wiki Wednesday
2016-07-21 17:09:19 +00:00
Husman
bcd0915c60
Fixing up commit according to review
2016-07-19 19:23:21 -07:00
Sabe Jones
8d0e157ead
3.24.0
2016-07-19 19:21:22 +00:00
Sabe Jones
b5f7adfe09
chore(news): Comic-Con announcements
2016-07-19 19:04:28 +00:00
Husman
a798c4ef08
fix: removing party invitations
2016-07-18 19:25:02 -07:00
Matteo Pagliazzi
590adb3438
Revert "Deprecate API v2" ( #7801 )
2016-07-17 18:15:25 +02:00
Matteo Pagliazzi
45c31a2bcf
Deprecate API v2 ( #7761 )
...
* deprecate api-v2
* remove v2 test helpers
* remove unused string
2016-07-16 19:56:18 +02:00
Blade Barringer
a9c234a6d2
chore(i18n): update locales
2016-07-15 10:53:18 -05:00
Blade Barringer
30e55c16cd
chore(i18n): Update locales
2016-07-15 09:06:39 -05:00
Alys
987d580746
fix typo in Bailey news: "featuring and interview with Leslie" ("and" > "an")
2016-07-15 16:19:34 +10:00
Sabe Jones
bd8d7bb745
3.23.1
2016-07-15 03:23:34 +00:00
Sabe Jones
6487860646
chore(news): Staff Spotlight
2016-07-15 03:08:12 +00:00
Alys
852651bc0d
3.23.0
2016-07-14 10:08:53 +10:00
Alys
ee01788647
"allCompletedTodos" option in API for returning all completed To-Dos for when 30 isn't enough ( #7773 )
...
* add new "allCompletedTodos" option to API for returning all completed To-Dos at once - fixes #7301
* make minor fixes to allCompletedTodos option
* change allCompletedTodos option to _allCompletedTodos and add a BETA comment
2016-07-14 08:34:48 +10:00
Sabe Jones
dea813c296
3.22.1
2016-07-13 14:58:24 +00:00
Oziris
a19f538b90
Update questsContent.json ( #7783 )
...
Fixed an issue with text format in the Axolotl rage effect.
2016-07-13 22:56:40 +10:00
Alys
76b51b8b65
fix apidoc typo: change clear-flags to clearflags
2016-07-13 19:57:29 +10:00
Sabe Jones
0816e69fb6
fix(shrinkwrap): don't upgrade mongoose
2016-07-12 23:48:38 +00:00
Luan
bac1405a20
feat(client): Add notification badge
...
fixes #4365
closes #7755
2016-07-12 17:56:12 -05:00
Sabe Jones
28ebc92aa9
3.22.0
2016-07-12 20:38:05 +00:00
Sabe Jones
36f1e2dfbb
chore(deploy): sprites, shrinkwrap, news
2016-07-12 20:37:04 +00:00
Sabe Jones
01052028fb
feat(content): Pet Quest 2016-07 ( #7780 )
2016-07-12 15:23:45 -05:00
Husman
6543ff89e1
refactor(api): Remove prod check in payments library. Fill out tests
...
Wasn't able to mock out pushNotifications correctly and left two tests unfinished.
closes #7728
closes #7770
2016-07-12 12:43:17 -05:00
Blade Barringer
e05db11fe0
chore(i18n): update locales
2016-07-11 21:34:54 -05:00
Ross Hardy
2b30c63448
Adding new basic audio theme rosstavoTheme ( #7766 )
2016-07-12 12:30:44 +10:00
Husman
694cd8e555
feat: allowing the flagging of system messages
...
closes #7767
closes #7771
2016-07-11 21:28:43 -05:00
Alys
0631e9ba15
delete ancient code for hiding a the huge Spread the Word challenge, which has now been closed
2016-07-10 11:41:28 +10:00
Matteo Pagliazzi
1ab8dab9a3
pusher: onlkeopenaximum 1 connection per brorowser
2016-07-08 17:48:39 +02:00
Sabe Jones
485deb1a70
3.21.1
2016-07-07 22:54:00 +00:00
Sabe Jones
03cee070e9
chore(npm): update shrinkwrap
2016-07-07 22:53:08 +00:00
Sabe Jones
52ae23e9bf
chore(news): misc Bailey
2016-07-07 22:40:50 +00:00
Sabe Jones
46d618327a
fix(contact): clarify merch inquiries
2016-07-07 14:48:22 -05:00
Sabe Jones
cfd5455e3b
3.21.0
2016-07-05 20:58:58 +00:00
Sabe Jones
3eac65c4bd
chore(npm): update shrinkwrap
2016-07-05 20:58:36 +00:00
Sabe Jones
ff3f339c2e
feat(content): Armoire and BGs 2016-07 ( #7762 )
...
* feat(content): Armoire and BGs 2016-07
* fix(backgrounds): resize Dilatory Castle
Also fixes a long-overlooked issue where the Egg Hunt quest remained available long after its event ended.
2016-07-05 15:49:21 -05:00
Matteo Pagliazzi
d514109e39
Merge branch 'iap-fix' into develop
2016-07-04 17:43:26 +02:00
Matteo Pagliazzi
6120a29158
remove console.log
2016-07-04 17:42:33 +02:00
Matteo Pagliazzi
76397e64af
upgrade in-app-purchase
2016-07-04 17:23:49 +02:00
Matteo Pagliazzi
8be5ba76dd
add some logging
2016-07-04 16:46:41 +02:00
Matteo Pagliazzi
d4cff995e8
fix isValidated and port iOS iap code
2016-07-04 16:12:43 +02:00
Matteo Pagliazzi
dff9356778
remove redundant export for iap
2016-07-04 15:50:40 +02:00
Matteo Pagliazzi
0caeb518af
Merge branch 'develop' into iap-fix
2016-07-04 15:45:56 +02:00
Matteo Pagliazzi
a2da583db8
port android iap code to v3
2016-07-04 15:45:52 +02:00
Matteo Pagliazzi
f8760a337a
parse receipt object
2016-07-04 15:06:35 +02:00
Matteo Pagliazzi
e19657b8ac
more logging
2016-07-04 14:58:50 +02:00
Matteo Pagliazzi
e933914548
more logging
2016-07-04 14:43:15 +02:00
Blade Barringer
01dba9a4be
chore(i18n): update locales
2016-07-02 23:05:08 -05:00
Matteo Pagliazzi
0dee20f7eb
3.20.0
2016-07-02 15:18:44 +02:00
Matteo Pagliazzi
0880850408
Real-time Chat ( #7664 )
...
* feat(realtime-chat): add Pusher library to the server
* feat(realtime-chat): only for private groups
* feat(realtime-chat): add authentication endpoint for Pusher
* feat(realtime-chat): client proof of concept
* fix typo in apidoc
* feat(realtime-chat): redo authentication and write integration tests
* remove firebase code
* fix client side tests
* fix line ending in bower.json
* feat(realtime chat): use presence channels for parties, send events & disconnect clients if user leaves or is removed from party, automatically update UI
* pusher: enable all events in the background
* fix pusher integration tests
2016-07-02 15:17:24 +02:00
Blade Barringer
889c41fa18
chore(i18n): update locales
2016-07-01 20:31:28 -05:00
Blade Barringer
e077f7f150
3.19.0
2016-07-01 20:28:12 -05:00
Blade Barringer
9602a398b2
feat(api): Allow admins to revoke chat priveleges from website
2016-07-01 20:24:37 -05:00
Blade Barringer
3d49a1bcee
chore: bump habitica-markdown bower package version
2016-07-01 20:22:52 -05:00
Sabe Jones
aa27d2d1aa
fix(EB): consolidate extensions ( #7748 )
2016-07-01 19:40:32 -05:00
Sabe Jones
c871d8877c
Corrected transaction descriptions ( #7744 )
...
* fix(subscriptions): Habitica not HabitRPG
* fix(subscriptions): Habitica in Amazon
2016-07-01 19:40:23 -05:00
Sabe Jones
986d583ff9
fix(news): typo
2016-07-01 19:40:05 -05:00
Sabe Jones
54c841da61
chore(news): Take This Bailey
2016-07-02 00:15:22 +00:00
Nathan Thompson
d2c50c7889
Add tests for timezoneOffsetToUtc filter
2016-07-01 17:27:02 -06:00
Matteo Pagliazzi
32714e5d26
added some logging
2016-07-01 13:41:52 +02:00
Matteo Pagliazzi
75df284967
better error handling and fix typo
2016-07-01 12:37:29 +02:00
Blade Barringer
1bf96f9a33
fix(docs): Correct typo in chat docs
2016-06-30 22:09:30 -05:00
eshapard
887399b815
update documentation for marking chat seen
...
Documentation included the chatId in the url, but the api does not use it. Adding the chatId will cause a 404 error. The api marks all chats in the guild as read; not individual chats.
closes #7742
2016-06-30 22:09:30 -05:00
Blade Barringer
4b30e7265b
Merge pull request #7743 from mchlltt/develop
...
Fixes #5631
2016-06-30 22:00:10 -05:00
Blade Barringer
39f014c059
chore(client): Remove unused server error page
...
closes #7745
2016-06-30 21:41:12 -05:00
Mich Elliott
8a8eaefe2d
Fix typos in questscontent
2016-06-30 14:46:43 -05:00
Travis
21696fa258
Fixing the quest name in the previous quests scroll drop for recidivate ( #7739 )
...
* Fixing the quest name in the previous quests scroll drop for recidivate
* Updating case of 'the'
2016-06-30 10:28:45 -05:00
Sabe Jones
e17d5af07d
fix(deploy): typo
2016-06-29 20:17:54 +00:00
Sabe Jones
480ab375e1
fix(deploy): more NODE_HOME
2016-06-29 20:15:01 +00:00
Sabe Jones
168bc952d1
3.18.0
2016-06-29 19:30:59 +00:00
Sabe Jones
e1dc4a5480
chore(npm): update shrinkwrap
2016-06-29 19:30:23 +00:00
Sabe Jones
52b34bb6b8
fix(bower): pin habitica-markdown
2016-06-29 19:08:25 +00:00
Sabe Jones
25100a487a
chore(gulp): compile sprites
2016-06-29 19:06:01 +00:00
Sabe Jones
d498f5dee3
It's dangerous to go alone. Take This gear. ( #7713 )
...
* feat(content): Take This equipment
* chore(sprites): add icons
2016-06-29 13:33:56 -05:00
Sabe Jones
cabb66c5b3
Shrinkwrap dependencies (redux) ( #7732 )
...
* fix(versioning): shrinkwrap and pinning
* fix(versioning): install/shrinkwrap on 4.4.3
* fix(versioning): workaround deps/devdeps issue
* feat(npm): shrinkwrap
* fix(bower): unpin habitica-markdown
2016-06-29 13:32:35 -05:00
Sabe Jones
723bf7358b
feat(customization): enable Splashy Skins ( #7740 )
2016-06-29 13:31:37 -05:00
Blade Barringer
6ad65c35fc
3.17.0
2016-06-28 09:53:01 -05:00
Blade Barringer
af4402afb0
chore(i18n): update locales
2016-06-28 09:05:51 -05:00
Blade Barringer
70253ea584
chore(tests): Don't restart test server when modifying test file
2016-06-28 09:00:45 -05:00
Blade Barringer
c22bf2e38b
Merge pull request #7736 from crookedneighbor/fix_post_chat
...
fix(client): Prevent group from freezing up when sending a chat message
2016-06-28 08:59:41 -05:00
Blade Barringer
f8e1e51c21
fix(client): Prevent group from freezing up when sending a chat message
2016-06-28 08:13:09 -05:00
Blade Barringer
24287df702
fix(client): msg notification properly leaves after visiting party page
...
closes #7393
closes #7735
closes #7445
2016-06-28 07:37:27 -05:00
Matteo Pagliazzi
1492a8af0d
use correct identifier for apple
2016-06-27 14:32:29 +02:00
Matteo Pagliazzi
893b4d8def
fix(iap): rewrite iap library code
2016-06-27 14:26:20 +02:00
Matteo Pagliazzi
e1fc5355b8
Merge pull request #1 from paglias/iap_fix
...
chore: show how to use yields
2016-06-27 12:11:37 +02:00
Blade Barringer
16a592bf3c
chore: show how to use yields
2016-06-26 20:38:14 -05:00
Matteo Pagliazzi
c630bb9f96
fix(iap): wip
2016-06-26 17:04:16 +02:00
Blade Barringer
c9f2389765
chore(test): Unpend cancel subscription test
2016-06-26 09:49:48 -05:00
Blade Barringer
37e638a64d
fix(test): Pend send email test
2016-06-26 09:27:29 -05:00
Blade Barringer
81ac45f2a7
fix(api): Grant remaining perks when canceling an Amazon subscription
...
* Add tests for payments lib
* Add placeholder it blocks to be filled in
closes #7660
closes #4840
2016-06-26 08:08:49 -05:00
Alys
a7d4b76c58
remove bad comma from end of a locales file
2016-06-25 09:47:09 +10:00
Alys
8055db2e54
add missing gearNotOwned string
2016-06-25 09:30:04 +10:00
Travis
30cf4f5a96
fix(client): Stop duplicating completed todos ( #7709 )
...
* Deduping completed tasks on load. closes #7708
* Addressing paglias' comment
2016-06-24 07:57:15 -05:00
Alys
e441f45ac5
improve texts for password reset feature
...
- Removes full stop from the end of the password (very misleading).
- Makes messages about the password emails more accurate.
2016-06-24 21:59:34 +10:00
Alys
3d94c2e7f1
fix error in comment in apidoc for ExportUserAvatarPng
2016-06-24 20:13:22 +10:00
Matteo Pagliazzi
430160ef0e
feat(eb): update npm to v3 ( #7711 )
2016-06-24 10:31:19 +02:00
Husman
56ad8c62ef
Formatting changes
2016-06-23 19:50:56 -07:00
Sabe Jones
db2ed83a58
3.16.0
2016-06-23 19:48:52 +00:00
Sabe Jones
9d1f1fa321
Correct GA unsub info ( #7676 )
...
* fix(analytics): better GA category handling
* refactor(analytics): chained OR
* fix(analytics): prefer gaCategory
2016-06-23 14:29:50 -05:00
Sabe Jones
cfe688daa5
feat(mystery): subscriber items 201606 ( #7707 )
...
* feat(mystery): subscriber items 201606
* chore(news): announce Android
2016-06-23 14:01:11 -05:00
Matteo Pagliazzi
7edde56dad
fix(deps): add apn package
2016-06-23 17:27:20 +02:00
Blade Barringer
e274f63f9d
chore(i18n): update locales
2016-06-23 07:59:25 -05:00
Blade Barringer
1484090d27
Merge branch 'Hus274-7701' into develop
2016-06-23 07:55:56 -05:00
Travis
0af1ced462
fix(client): Sort gear by stat from class bonus ( #7710 )
...
* Accounting for class bonus when sorting equipment by stats. closes #7701
* Fixing unintended impact on last page and including special classes
* Addressing comments
2016-06-23 07:55:00 -05:00
Blade Barringer
2d3e5f86f7
feat(client): Display if gear gets class multiplier in notes
2016-06-23 07:53:01 -05:00
Blade Barringer
d5a354b499
fix(api): Only award participating members the quest rewards ( #7706 )
2016-06-23 07:10:56 -05:00
Husman
352ad783e6
Fixing test names
2016-06-22 20:23:08 -07:00
Husman
c7b54a0abf
Addressing comments
2016-06-22 20:19:48 -07:00
Blade Barringer
b27b18b323
Merge pull request #7703 from khipkin/small_api_typo
...
fix mistake in apidoc for Feed a pet
2016-06-22 22:04:46 -05:00
Husman
2d327ca6ea
Fixing unintended impact on last page and including special classes
2016-06-22 19:58:36 -07:00
Husman
cc476a0dee
Accounting for class bonus when sorting equipment by stats. closes #7701
2016-06-22 19:28:44 -07:00
Husman
997fd569e2
Fixing tests
2016-06-22 17:56:24 -07:00
Husman
e167e41731
Fixing edit task issue according to blade's comments
2016-06-22 17:14:12 -07:00
Husman
874b0d203f
Merge remote-tracking branch 'origin/7688' into 7688
2016-06-22 17:13:32 -07:00
Matteo Pagliazzi
08d7727881
Push notifications ( #7682 )
...
* Fix Social Push notifications
* Fix code formatting issues
* Fix commented issues
* Fix Syntax errors
* update push notify dependency
* specify push-notify version
* change how apn key is loaded
* feat(push-notifications): improve logging
* feat(push-notifications): disable v2 push notifications
* test(push-notifications): add unit tests and improve integration ones
* fix(push-notifications): throw when required params are missing
* fix(tests): correct descriptions and remove wrong comment
* fix(push-notifications): trim APN key
* fix(apn): log feedback only if it has data
* fix(apn): load cert and key differently
* fix(tests): correctly load apn during tests
* download creds from S3 and create AWS lib
* convert s3 buffer to a string
* fix(apn): remove console.log and do not use cert twice
* invert key and cert, disable failing test
* invert key and cert
2016-06-23 00:19:37 +02:00
Matteo Pagliazzi
09c7c45cd5
fix trailing spaces
2016-06-22 12:18:42 +02:00
Matteo Pagliazzi
3924bdc7c5
Fetch entire user when resetting password
2016-06-22 11:56:39 +02:00
Husman
1a6f08545b
Working with updated _edit model
2016-06-21 20:39:26 -07:00
Sabe Jones
b3c9bd9021
3.15.0
2016-06-22 01:13:26 +00:00
Sabe Jones
cf258676a2
feat(event): Summer Splash 2016 ( #7705 )
2016-06-21 19:22:50 -05:00
Kaitlin Hipkin
b94872a69f
fix copypasta mistake
2016-06-21 20:10:25 +02:00
Blade Barringer
cfacf039df
refactor(client): assign tasks data to tasks variable on initial sync
2016-06-21 07:34:44 -05:00
Blade Barringer
138217fe6a
fix(client): Load completed todos on sync
...
closes #7392
closes #7673
2016-06-21 07:31:19 -05:00
Christopher Wells
fd746c19d2
Fix grammar mistakes in license file
...
Correct usage of "is" to "are", as "Assets and content" is plural rather than singular.
closes #7700
2016-06-21 06:42:20 -05:00
Blade Barringer
d18f42fe7a
fix(client): Use $state on $rootScope
2016-06-20 06:35:21 -05:00
Blade Barringer
94ddd82cae
fix(lint): Correct group test file
2016-06-19 21:00:02 -05:00
Blade Barringer
e920734648
feat(api): Stop alerting about new messages for large groups
...
closes #6706
closes #6762
2016-06-19 20:54:30 -05:00
Blade Barringer
a4dba82d14
fix(client): Refresh party page when inviting users
2016-06-19 09:41:43 -05:00
Blade Barringer
851ad59fb8
fix(client): Display message about needing a party in quest modal
...
closes #7684
closes #7686
2016-06-19 09:25:57 -05:00
Blade Barringer
7fd3ad3731
fix: Do a hard redirect after creating party
...
closes #7694
2016-06-19 09:06:21 -05:00
Blade Barringer
ef2535aadc
fix: Use translatable string for mana in header
...
closes #7695
2016-06-19 09:00:59 -05:00
Blade Barringer
09ecc0eada
Merge branch 'Hus274-7689' into develop
2016-06-19 08:38:37 -05:00
Blade Barringer
941ff10cdc
fix: Prevent message from displaying if no new messages exist
2016-06-19 08:38:07 -05:00
Matteo Pagliazzi
36ef208e18
3.14.0
2016-06-19 12:33:45 +02:00
Husman
b62fbab6f8
Mark private messages as read when entering the inbox and syncing while in the inbox. closes #7689
2016-06-18 19:42:11 -07:00
Husman
db3a8cf7c3
Fixed mispelling
2016-06-18 18:30:31 -07:00
Husman
f35c4df022
Improving cancel task edit functionality. closes #7688
2016-06-18 18:26:01 -07:00
Blade Barringer
e28946bcfb
fix(client): Allow users to reject invites to new parties
...
closes #7691
2016-06-18 20:21:27 -05:00
Blade Barringer
813aa2cf38
chore(client): Remove unused clearCompleted user.ops function
2016-06-18 12:23:40 -05:00
Husman
1a19605ee6
fix: Update client to remove completed todos immediately
...
closes #7549
closes #7685
2016-06-18 12:23:28 -05:00
Blade Barringer
ea5a148add
fix(lint): Add missing semicolons
2016-06-18 12:07:30 -05:00
Blade Barringer
7c08563937
Merge branch 'velezsarain-attribute' into develop
2016-06-18 11:59:30 -05:00
Blade Barringer
b20bd86f98
refactor(common): Clarify autoallocate code
2016-06-18 11:59:04 -05:00
Blade Barringer
7cf28f6f2a
refactor(tests): Rewrite stat autoallocation tests
2016-06-18 11:58:02 -05:00
Blade Barringer
757792bcdf
chore(i18n): update locales
2016-06-18 07:25:41 -05:00
Blade Barringer
007ac4abfd
chore(i18n): update locales
2016-06-18 07:15:30 -05:00
Blade Barringer
b2c5c8d8e7
fix(locales): Correct string key
...
fixes #7683
2016-06-18 07:10:32 -05:00
Sabe Jones
4b98295977
3.13.0
2016-06-18 00:44:54 +00:00
Sabe Jones
8cb0d91f77
chore(news): misc announce
2016-06-17 23:35:23 +00:00
Blade Barringer
ca32cac6fe
chore(dependency): Pin to version of eslint that is not broken
2016-06-17 17:36:48 -05:00
Blade Barringer
8919efbbdd
Merge pull request #7681 from thompsnm/develop
...
Separate call to upgrade npm so that it occurs before any other installs
2016-06-17 17:20:32 -05:00
Alys
7a10d61281
fix inconsistencies in apidoc for member routes ( #7679 )
2016-06-17 13:10:49 +02:00
Alys
76e86bda86
fix error in API docs - flag chat had been documented as like
2016-06-17 20:25:14 +10:00
Matteo Pagliazzi
a424892dd3
Fix auth if localStorage is missing or corrupted ( #7674 )
...
* fix(auth): correctly redirect to logout page if localstorage is corrupted
* fix(auth): do not break site if localStorage has invalid JSON
* fix(karma): use $window instead of windo
* disable failing karma tests
* fix(tests): Provide mockwindow for tests
* fix(tests): Call habitrpgShared without $window
2016-06-17 12:14:41 +02:00
Nathan Thompson
a87647995d
Separate call to upgrade npm so that it occurs before any other installs
2016-06-17 00:53:08 -06:00
Blade Barringer
5a3082bd88
fix(docs): correct apidoc param for task alias|id
2016-06-16 12:55:56 -05:00
Blade Barringer
b7b61e6251
Shortname ( #7655 )
...
* feat: Add alias property to task model
2016-06-16 12:28:45 -05:00
Blade Barringer
c34c21192b
Merge pull request #7657 from Hus274/7600
...
Removing accepted guild invitations from the local copy of the user o…
2016-06-16 07:20:43 -05:00
Alys
27b7173f6c
change pet names to initial upper case in "Unlocks purchasable Petname eggs..." fixes #5631
2016-06-16 16:20:17 +10:00
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
Blade Barringer
3d7d41c517
Merge pull request #7672 from Hus274/7629
...
Fixing quest naming according to @lemoness #7629
2016-06-15 22:23:32 -05:00
Blade Barringer
d067403959
chore: Add migration file for fixing invalid emails
2016-06-15 21:46:17 -05:00
Husman
09a4930745
Fixing naming according to @lemoness #7629
2016-06-15 17:37:49 -07:00
Alys
00140eee35
3.12.1
2016-06-16 10:35:10 +10: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
23c854f068
3.12.0
2016-06-15 17:37:53 +00: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
Alys
337cb22a9d
replace inaccurate Gems tip with Grand Gala tip; fix unrelated typo
2016-06-14 19:35:37 +10:00
Alys
514962a9c7
improve loading tip: replace "Pirate Cove" and "tile"; fix capitals
...
Replaces the Pirate Cove with the Guild Leaders & Challenge Creators Guild.
Describes backgrounds as connecting instead of tiling.
Makes capitalisation of various words consistent.
2016-06-13 21:35:36 +10:00
Husman
4a3e0eb884
Removing accepted guild invitations from the local copy of the user object so the notification goes away without having to refresh. #7600
2016-06-12 16:03:44 -07:00
Blade Barringer
345a736c27
Merge pull request #7656 from Hus274/develop
...
Fixing mispelling
2016-06-12 14:06:31 -05:00
Husman
7ee81bb5f6
Fixing mispelling
...
I accidentally had a mispelling in the last pull request. Fixing.
2016-06-12 07:57:44 -07: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
MathWhiz
a58bf4ee2b
Turn automaticAllocation to false when resetting or rebirthing
...
closes #7627
fixes #7620
2016-06-12 08:34:41 -05:00
Blade Barringer
c77f165b3e
3.11.0
2016-06-11 18:26:03 -05:00
Blade Barringer
485139dbe8
chore(i18n): update locales
2016-06-11 18:12:15 -05:00
Blade Barringer
f763d7ec15
chore: Add loading screen tips locales
2016-06-11 17:04:18 -05:00
Blade Barringer
db40c96b14
chore(i18n): update locales
2016-06-11 17:00:55 -05:00
Blade Barringer
4f2ece691d
chore(i18n): update locales
2016-06-11 16:02:59 -05:00
Blade Barringer
97f527c5d5
chore: compile sprites
2016-06-11 15:59:23 -05:00
Blade Barringer
bd1bd5bfd3
Merge branch 'Hus274-develop' into develop
2016-06-11 15:56:13 -05:00
Shervin Sarain
31ad6db568
fix training values not resetting at level up
2016-06-11 21:08:58 +02: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
Husman
688bb9a6c7
Minor Icon Fixes #7635
2016-06-11 07:19:58 -07: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
a90d0f9233
3.10.0
2016-06-10 01:18:00 +00:00
Sabe Jones
e3c0d7d214
chore(news): blog announcements
2016-06-10 00:59:50 +00:00
Blade Barringer
90d4468e9e
chore(i18n): update locales
2016-06-09 09:02:28 -05: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
Alys
dc87aefefc
change group and challenge "not found" message to "not found or you don't have access"
2016-06-08 23:17:45 +10: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
Sabe Jones
00491670e0
3.9.0
2016-06-08 03:06:49 +00:00
Blade Barringer
0ccac49cd9
chore(i18n): update locales
2016-06-07 21:49:36 -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
a0008e93c0
chore(sprites): compile
2016-06-08 02:40:00 +00:00
MrEikono
09bb3e9216
Fix frog pet images ( #7619 )
2016-06-07 21:35:32 -05:00
Sabe Jones
eb63e481fa
3.8.1
2016-06-08 02:31:37 +00: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
e1b8d52a27
3.8.0
2016-06-07 16:16:06 +02: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
e0aff79ee4
3.7.3
2016-06-05 22:08:17 -05:00
Blade Barringer
453540e85d
fix: Display flower when not buffed
...
closes #7613
2016-06-05 22:06:09 -05:00
Blade Barringer
ced1e97475
3.7.2
2016-06-05 20:48:11 -05:00
Alys
0a10b2bd28
change user quest.progress.collect to quest.progress.collectedItems ( #7612 )
2016-06-05 20:47:45 -05:00
Blade Barringer
4341934d17
chore: Add migration file for bad quest data ( #7611 )
2016-06-06 10:28:51 +10:00
Blade Barringer
ac24fb31fb
chore: Remove temporary code
2016-06-05 08:56:57 -05:00
Blade Barringer
e7c9fc70d4
3.7.1
2016-06-05 07:42:36 -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
cc0d556c10
3.7.0
2016-06-04 08:36:52 -05:00
Blade Barringer
713dd16dfe
chore(i18n): update locales
2016-06-04 08:17:27 -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
Blade Barringer
b498733ce8
Merge branch 'Maslor-develop' into develop
2016-06-04 07:45:56 -05:00
Blade Barringer
b6eec73277
chore: Compile sprites
2016-06-04 07:45:42 -05:00
Blade Barringer
7e7fe3dfd6
3.6.1
2016-06-04 07:14:41 -05:00
Maslor
c70b3b8d99
changed the current glasses to transparent ones, resolves #7601
2016-06-04 13:10:17 +01: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
30d09c2e7f
Merge branch 'slow_chat' into develop
2016-06-03 21:43:32 -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
Sabe Jones
47f14a464a
fix(bower): remove BrowserQuest dep ( #7597 )
2016-06-03 16:18:30 -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
Blade Barringer
75146417c4
Merge pull request #7590 from crookedneighbor/enable_randomdrop_tests
...
tests: Use dependency injection to re-enable randomdrop tests
2016-06-03 08:50:08 -05:00
Sabe Jones
7108b02f4d
fix(profiles): public chairs
...
(cherry picked from commit 83366fa3a6 )
2016-06-03 08:18:12 -05:00
Blade Barringer
d8440f8daa
chore: Add migration helper functions
2016-06-03 06:36:20 -05:00
Sabe Jones
9828dfea21
chore(minor): Bump version to 3.6.0
2016-06-02 22:15:41 +00:00
Sabe Jones
21f3814368
feat(content): June Armoire and BGs ( #7592 )
2016-06-02 16:51:05 -05:00
Blade Barringer
c9d8c3ee40
tests: Use dependency injection to re-enable randomdrop tests
2016-06-02 12:57:59 -05:00
Sabe Jones
4ea52728ee
fix(links): Report a Bug Guild
2016-06-01 22:12:02 +00:00
Sabe Jones
6084ea2017
Fix mystery set award to new subscribers ( #7586 )
...
* fix(mystery): flip da sign
* test(subscription): check mystery box
2016-06-01 15:34:57 -05:00
Sabe Jones
afea917409
chore(minor): Bump version to 3.5.0
2016-06-01 16:25:43 +00:00
Sabe Jones
271f4b760d
chore(event): end Floral Potion availability
2016-06-01 15:08:35 +00:00
Matteo Pagliazzi
c33b7273fa
3.4.4
2016-06-01 08:59:22 +02:00
Blade Barringer
e8b1c937e4
Merge pull request #7568 from HabitRPG/fix_contributor_levels_watch
...
fix: Remove unnecessary flags.contributor property from user
2016-05-31 21:31:12 -05:00
Matteo Pagliazzi
d7cd2ce329
do not run cron when getting a group
2016-05-31 21:30:13 -05:00
Matteo Pagliazzi
e07ade5a4a
cron: set lastCron at the beginning and misc fixes
2016-05-31 21:30:07 -05:00
Blade Barringer
52f0057c3d
fix: Remove unnecessary flags.contributor property from user
...
Closes #7550
2016-05-31 21:10:58 -05:00
Blade Barringer
c0d9c54c44
test: Pend erronously failing test
2016-05-31 20:58:04 -05:00
Shervin Sarain
de21487038
Fix challenge sorting
...
Closes #7543
Closes #7507
2016-05-31 20:41:38 -05:00
Blade Barringer
a11a999839
chore: Add migration file for correcting users tasks
...
Fix for aftermath of https://github.com/HabitRPG/habitrpg/issues/7546
and https://github.com/HabitRPG/habitrpg/issues/7551
2016-05-31 18:04:53 -05:00
Sabe Jones
c746f643fd
chore(patch): Bump version to 3.4.3
2016-05-31 20:14:20 +00:00
Sabe Jones
fcc14520c5
Don't $watch drops ( #7547 )
...
* WIP(drops): get drops out of _tmp
* fix(notifications): no watch for drops/mystery
* fix(ops): only two response values
* fix(test): update op expectation
Also update API docs for modified route.
* fix(lint): remove trailing space
* fix(test): update integration check
2016-05-31 14:56:33 -05:00
Sabe Jones
9b56c6f2ba
Don't persist properties of tag filters ( #7564 )
...
* fix(filters): don't persist tag props
Partial fix for #7412
* fix(test): correct expectation
2016-05-31 14:55:59 -05:00
Lucas F T Hennigen
0b122f3b43
fix(tags): Fix tag removal functionality ( #7553 )
...
Tag removal functionality was broken. Turns out the issue was simply
that we weren't removing the tag from the local `task` object, so the
tag was removed, but readded upon sync/pressing save.
Closes #7412
2016-05-31 14:55:30 -05:00
Blade Barringer
b33505141b
docs: Correct url for member routes
2016-05-31 13:03:45 -05:00
Matteo Pagliazzi
ee836c76a4
log req.method
2016-05-31 16:37:34 +02:00
Matteo Pagliazzi
bcbf00d42c
fix api v2 tests, do not allow task.value to be updated
2016-05-31 11:32:33 +02:00
Matteo Pagliazzi
d9de6282a4
increase number of concurrent users that are synced when editing a challenge
2016-05-31 11:27:21 +02:00
Matteo Pagliazzi
87066ef6c7
do not allow casting on challenge tasks in v2
2016-05-31 11:13:28 +02:00
Matteo Pagliazzi
6b214e4e3f
sanitize task when updating in v2
2016-05-31 11:09:32 +02:00
Blade Barringer
b1a2632319
fix: Use === in comparison
2016-05-30 17:22:53 -05:00
Blade Barringer
c387c6e0a5
Merge pull request #7400 from Atomk/patch-4
...
Update tasks.json
2016-05-30 15:23:56 -05:00
Blade Barringer
da12cb9f45
Merge pull request #7513 from zesme/fix-checklist-duplicates
...
Fix #7493 - prevent duplicate items when editing checklists
2016-05-30 15:22:07 -05:00
Blade Barringer
212395cef4
lint: Add missing semicolons
2016-05-30 15:16:46 -05:00
MathWhiz
7a9e50dbba
Fix #7388 - Invert tag collapse when adding tasks
2016-05-30 15:09:08 -05:00
Blade Barringer
6e78a14f87
refactor: Move logger to separte file
2016-05-30 14:23:44 -05:00
Blade Barringer
038dd64b12
chore: Create broken challenges migration
2016-05-30 14:23:26 -05:00
Sabe Jones
d89b1e3b08
chore(patch): Bump version to 3.4.2
2016-05-30 18:07:32 +00:00
Sabe Jones
8520987afb
chore(news): May Last Chance Bailey
2016-05-30 17:42:59 +00:00
Blade Barringer
c327baad41
Merge pull request #7538 from crookedneighbor/fix_invite_self_to_party
...
fix: Prevent user from inivting self to group
2016-05-29 10:37:48 -05:00
Blade Barringer
bbafe3d52d
fix: Prevent user from inivting self to group
...
fixes #7491
2016-05-29 10:09:02 -05:00
Blade Barringer
d23f79d001
fix: Correct typo in tag documentation
...
Per https://twitter.com/Rio_Alx/status/736109816964227073
2016-05-29 09:24:33 -05:00
Blade Barringer
db3fd62af8
fix: correct link in issue template
2016-05-29 07:34:59 -05:00
hairlessbear
00aebed8c0
Use npm 3 in Dockerfile ( #7529 )
2016-05-29 09:08:14 +10:00
velezsarain
4ad81c4c28
Change install_node.sh to install npm 3 instead. Default RAM for vagrant box is now 4 GB. ( #7478 )
2016-05-28 11:53:39 +10:00
Matteo Pagliazzi
36042d42f9
disable loggly config while testing
2016-05-27 17:17:00 +02:00
Matteo Pagliazzi
7090ed5f4b
update elastic beanstalk config to install loggly
2016-05-27 17:01:25 +02:00
Matteo Pagliazzi
2d81b31c3a
remove legacy loggly code
2016-05-27 16:38:55 +02:00
Lucas Torroba (@zesme)
b20f5545b9
Cleanup add checklist item function
...
Cleaned up `addChecklistItem` function, shortening it
2016-05-27 10:41:15 -03:00
Lucas Torroba (@zesme)
46be1553f0
Close #7493
2016-05-27 10:41:15 -03:00
Matteo Pagliazzi
01a7880bc9
add migration to fix empty checklist.id
2016-05-27 15:14:27 +02:00
Matteo Pagliazzi
20ce394999
chore: Bump version to 3.4.1
2016-05-27 13:24:17 +02:00
Matteo Pagliazzi
3ce80bae2a
make checklist.id required
2016-05-27 13:17:05 +02:00
Matteo Pagliazzi
4deb5ada2f
add timestamps to logs
2016-05-27 11:29:46 +02:00
Matteo Pagliazzi
39a9753fd6
chore: Bump version to 3.4.0
2016-05-27 11:05:12 +02:00
Matteo Pagliazzi
a9d4bbd87d
dataexport: correctly handle 403 errors
2016-05-27 10:53:20 +02:00
Blade Barringer
c08df9978f
Merge pull request #7511 from HabitRPG/paglias/better-logging
...
Improve logging
2016-05-26 22:42:14 -05:00
Blade Barringer
74087d23c9
Merge branch 'HabitRPG-paglias/fix-double-cron' into develop
2016-05-26 22:40:32 -05:00
Blade Barringer
b40d8ce09d
Merge branch 'double_cron_fix' into develop
2016-05-26 22:25:36 -05:00
Blade Barringer
91aba965b0
tests: Add tests for recoverCron
2016-05-26 22:08:31 -05:00
Sabe Jones
9b7458c022
chore(patch): bump version to 3.3.3
2016-05-27 01:20:00 +00:00
Sabe Jones
31d2c5d604
fix(test): import Bluebird
2016-05-27 00:59:00 +00:00
Matteo Pagliazzi
cb4676980d
fix tests for error handler middleware
2016-05-26 23:35:57 +02:00
Matteo Pagliazzi
10cf22cd4e
better distinguish between handled and not handler errors
2016-05-26 23:19:29 +02:00
Matteo Pagliazzi
c6192dd24b
feat(logging): improve logging removing not useful data and distinguishing between user and server errors
2016-05-26 23:10:38 +02:00
Sabe Jones
792aafd737
fix(test): delay for task creation
2016-05-26 20:51:55 +00:00
Matteo Pagliazzi
0ca44fd5c2
fix tests when transferring gems
2016-05-26 22:45:12 +02:00
Sabe Jones
f95e19c14e
chore: Bump version to 3.3.2
2016-05-26 20:38:53 +00:00
Matteo Pagliazzi
b03985c6b2
fix(cron): only process checklists if they exist
2016-05-26 22:17:15 +02:00
Matteo Pagliazzi
457264faa1
remove console.log used for debugging
2016-05-26 22:11:48 +02:00
Matteo Pagliazzi
3c338ddcd7
simplify tests and add console.log for debugging
2016-05-26 21:54:26 +02:00
Sabe Jones
9c7622e5a5
chore(news): add iOS update
2016-05-26 19:31:01 +00:00
Blade Barringer
4b65deac0b
chore(i18n): update locales
2016-05-26 07:52:51 -05:00
Blade Barringer
2c89102576
fix(locales): Correct mystery armor date
2016-05-26 07:41:42 -05:00
Blade Barringer
db7a4f1911
chore: Update package.json version
2016-05-26 07:24:05 -05:00
Matteo Pagliazzi
fb035c414c
fix sending gift messages
2016-05-26 11:52:15 +02:00
Sabe Jones
328a183738
Mystery Items May 2016 ( #7501 )
...
* feat(mystery): May 2016 subscriber set
* chore(news): Bailey
2016-05-25 21:34:49 -05:00
Blade Barringer
7075cf671d
fix: Omit chat when sending group update call
...
Closes #7200
2016-05-25 20:19:15 -05:00
Matteo Pagliazzi
8292903444
fix user anonymized tests
2016-05-25 23:33:29 +02:00
Sabe Jones
8ca3144563
fix(crit): notify from server response ( #7498 )
...
Fixes #3166 .
2016-05-25 16:17:24 -05:00
Matteo Pagliazzi
275d29e3f4
run cron when getting group
2016-05-25 23:14:34 +02:00
Matteo Pagliazzi
9b529fff52
cleanup quests code
2016-05-25 21:53:44 +02:00
Matteo Pagliazzi
f9762f4f81
fix cron tests
2016-05-25 21:01:12 +02:00
Matteo Pagliazzi
ed815d4947
refactor recovering from cron
2016-05-25 19:58:18 +02:00
Blade Barringer
700d67d25b
Merge pull request #7496 from crookedneighbor/apidoc
...
Apidoc Adjustments
2016-05-25 11:53:19 -05:00
Sabe Jones
193c46db38
fix(achievement): broaden helpedHabit definition
2016-05-25 11:21:43 -05:00
Blade Barringer
7539e2a93c
chore: Remove versioning from apidoc
2016-05-25 11:11:39 -05:00
Blade Barringer
0bb7f8d931
chore: Move apidoc config to separate file
2016-05-25 11:10:03 -05:00
Blade Barringer
bca7d9fad3
chore: Correct version number
2016-05-25 11:07:45 -05:00
Matteo Pagliazzi
31850830a0
refactor cron to avoid double cronning - work in progress
2016-05-25 16:55:57 +02:00
Matteo Pagliazzi
1a26965542
wip(): prevent cron from running twice
2016-05-25 15:31:18 +02:00
Matteo Pagliazzi
3f1343fdfb
fix trailing space
2016-05-25 14:58:38 +02:00
Keith Holliday
7297a6fa76
Updated logic to not assign armoire incorrectly ( #7476 )
...
* Updated logic to not assign armoire incorrectly
* Updated test and added new test to ensure armorie is not enabled prematurely.
* Fixed linting issue
* Removed toObject from being called when called on the server
2016-05-25 14:52:17 +02:00
Matteo Pagliazzi
f713bf53c1
fix task.challenge tests and add checks when scoring challenge tasks
2016-05-25 14:49:08 +02:00
Matteo Pagliazzi
506705d738
mark includeAllMembers query parameter as beta
2016-05-25 14:47:51 +02:00
Matteo Pagliazzi
cb1d385755
fix tasks minimization
2016-05-25 14:10:31 +02:00
Matteo Pagliazzi
d8051f3bf1
fix client side tests
2016-05-25 13:08:47 +02:00
Matteo Pagliazzi
042ac16c48
client: fetch all challenges members
2016-05-25 12:41:24 +02:00
Matteo Pagliazzi
adce786ae2
feat(members): add ability to return all members
2016-05-25 12:36:52 +02:00
Matteo Pagliazzi
a771c43989
feat(test): allow logs to show up when testing
2016-05-25 12:35:58 +02:00
Blade Barringer
0008839996
Merge pull request #7475 from crookedneighbor/armoire_sync_fix
...
Fix Armoire returns wrong equipment bug
2016-05-24 21:02:02 -05:00
Matteo Pagliazzi
1e270e417c
disable push notifications and fix buying gems
2016-05-24 23:16:28 +02:00
Keith Holliday
048d55b962
Removed sync call on load ( #7485 )
2016-05-24 22:41:38 +02:00
Matteo Pagliazzi
91e16ff191
do not run cron when loading party to avoid race conditions
2016-05-24 22:40:54 +02:00
Matteo Pagliazzi
c7d3539815
do not colorize or pretty print logs in production
2016-05-24 21:42:31 +02:00
Matteo Pagliazzi
2ca52785e1
remove unused variable in payments code
2016-05-24 21:41:14 +02:00
Matteo Pagliazzi
67e68ece29
fix gifting gems
2016-05-24 21:31:29 +02:00
Matteo Pagliazzi
9855f8c385
fix typo in stripe cancel
2016-05-24 18:42:08 +02:00
Blade Barringer
35544f14c5
fix: Armoire sends back data from server rather than relying on client
...
closes #5376
2016-05-24 07:13:09 -05:00
Blade Barringer
6c017b31fb
Merge pull request #7467 from crookedneighbor/fix_change_password
...
fix: Correct change password on client
2016-05-24 06:45:44 -05:00
Blade Barringer
ac77ceb75f
fix: Correct change password on client
...
* Add additional checks on server to prevent 500
* Add tests for param checks
2016-05-24 06:21:38 -05:00
Matteo Pagliazzi
6ce2f53503
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-05-24 13:11:33 +02:00
Matteo Pagliazzi
70d7a922f6
fix expression in angular template
2016-05-24 13:10:59 +02:00
Matteo Pagliazzi
64b3896797
fix typo in migration script
2016-05-24 13:10:42 +02:00
Blade Barringer
02d075e342
lint: Ignore === for == null check in sort task
2016-05-23 22:41:37 -05:00
Blade Barringer
8faf73084a
fix: correct sort task when task is at the top
...
closes #7457
!0 === true, so we need to check for == null which matches undefined and
null
2016-05-23 22:33:18 -05:00
Alys
810355d2a5
implement cron semi-safe mode - cron behaves as normal except boss causes no damage ( #7462 )
2016-05-24 13:31:39 +10:00
Blade Barringer
aaf2ff5b70
fix: Correct api documentation for score route
...
Fixes #7458
2016-05-23 22:13:59 -05:00
Blade Barringer
977d2ae525
Merge pull request #7466 from crookedneighbor/beastmastercount_fix
...
fix: Display beastmaster count even if member route returned no items
2016-05-23 22:07:22 -05:00
Blade Barringer
f9b759ae57
fix: Impliment redirect for /static/api -> /apidoc
2016-05-23 22:06:06 -05:00
Blade Barringer
1f3bd45471
Merge pull request #7463 from crookedneighbor/make_admin
...
feat: Add make-admin debug route back in
2016-05-23 21:50:39 -05:00
Blade Barringer
b1519eed14
fix: Display beastmaster count even if member route returned no items
...
Because of this line:
f1286762a8/website/server/controllers/api-v3/members.js (L53)
We minimize any empty objects, which causes the statCalc methods to fail
2016-05-23 21:47:42 -05:00
Blade Barringer
f1286762a8
Merge branch 'TheHollidayInn-tasks-delete-checklist' into develop
2016-05-23 21:19:01 -05:00
Blade Barringer
770ffe93fc
fix: Prevent task cloning from cloneing challenge object
...
fixes #7435
closes #7451
2016-05-23 21:13:35 -05:00
Blade Barringer
2ab76db27c
feat: Add make-admin debug route back in
2016-05-23 20:59:47 -05:00
Blade Barringer
a099c1b3b5
Merge branch 'TheHollidayInn-hall-add-service' into develop
2016-05-23 20:59:24 -05:00
Keith Holliday
d4287e1fd8
Added sync with user adds checklist item. Prevented task checklist remove request from being called on blank checklist
2016-05-23 23:34:45 +01:00
Keith Holliday
80323120b6
Updated hall service and updated hall controller
2016-05-23 21:32:43 +01:00
Matteo Pagliazzi
20f4a49c0b
fix missing 4th parameter to setWith
2016-05-23 20:02:57 +02:00
Matteo Pagliazzi
f1f593bcfd
fix unlocking items with numbers in paths
2016-05-23 19:59:14 +02:00
Matteo Pagliazzi
51254c26dc
fix cancelling stripe subscription
2016-05-23 18:59:54 +02:00
Matteo Pagliazzi
30c2d8e25f
payments: fix typo in paypal code
2016-05-23 17:18:55 +02:00
Keith Holliday
0b0f744317
Merge pull request #6 from crookedneighbor/THI_party-page
...
Add loading state to party page
2016-05-23 16:12:35 +01:00
Blade Barringer
763429402b
chore(i18n): update locales
2016-05-23 09:51:47 -05:00
Blade Barringer
d856d59bf7
Merge pull request #7441 from crookedneighbor/merge_v3_correctly
...
Merge v3 correctly
2016-05-23 08:10:20 -05:00
Blade Barringer
b9a2265766
Merge branch 'api-v3' into develop
2016-05-23 07:53:22 -05:00
Blade Barringer
0a7b6b65e7
Revert "API v3 [WIP] ( #6144 )"
...
This reverts commit 28f2e9c356 .
2016-05-23 07:53:14 -05:00
Blade Barringer
0b87777e26
feat: Show loading state on party page when party isn't ready
2016-05-23 07:15:46 -05:00
Blade Barringer
0d2aa4e43a
fix: Fetches the party in the header on initial party page load
...
If the party page is refreshed, the header wasn't populating. This
fetches the party in the header _and_ the party page
2016-05-23 07:13:53 -05:00
Matteo Pagliazzi
28f2e9c356
API v3 [WIP] ( #6144 )
...
* Fixed more tests
* Added tags into user service
* Added api-v3 auth urls
* v3: fix package.json
* v3: fix package.json
* Fixed auth tests. Updated Authctrl response
* v3: remove newrelic config file in favour of env variables
* v3: upgrade some deps
* switch from Q to Bluebird
* v3 fix tests with deferred
* Removed extra consoles.log. Changed data.data to res.data
* v3 fix tests and use coroutines instead of regenerator
* v3: fix tests
* v3: do not await a non promise
* v3: q -> bluebird
* Changed id param for registration response
* Updated party query and create
* Ensured login callback happens after user sync
* Add challenges to groups. Fixed isMemberOfGuild check
* Updated party and group tests
* Fixed cron test
* return user.id and send analytics event before changing page
* fix trailing spaces
* disable redirects
* Api v3 party tavern fixes (#7191 )
* Added check if user is in party before query
* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites
* Update tavern ctrl to use new promise
* v3: misc fixes
* Api v3 task fixes (#7193 )
* Update task view to use _id
* Added try catch to user service ops calls
* v3 client: saving after syncing is complete
* Fixed test broken by part sync change (#7195 )
* v3: fix todo scoring and try to fix production testing problem
* revert changes to mongoose config
* mongoose: increase keepAlive
* test mongoose fix
* fix: Only apply captureStackTrace if it exists on the error object
* v3: fix reminders with no startDate
* mongoose: use options
* chore(): rename website/src -> website/server and website/public -> website/client (#7199 )
* v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203 )
* [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
* 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
* fix: Correct checklist on client
Closes #7207
* fix: Pin eslint to 2.9
* minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions
* fix: Add missing type param to equip call
closes #7212
* rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges
* allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227
* fix tests for /members/transfer-gems
* fix: Set gems sent notification as translatable string
* chore: Remove unusued variable
* fix: Remove requirement on message paramter in transfer-gems
* add a missing variable declaration
* chore: clarify comments on cron code
* fix: Correct client request from habitrpg -> tavern
* update apidoc URL in package.json
Closes #7222
* Fixed start party by invites
* Updated spell casting to v3
* Fixed adding and removing tags on tasks
* Fixed page reload on settings change
* Fixed battle monsters with friends button
* Loaded completed todos when done is clicked
* chore: Reinstate floating version number for eslint
babel-eslint regression fixed
* Fixed reload tests
* change "an user" to "a user" in comments and text (no code changes) (#7257 )
* fix: Alert user that drops were recieved
* remove userServices.js from karma.conf - it's been moved to website/client/js/services
* feat: Create debug update user route
* fix: Correct set cron debug function
* feat: Add make admin button to debug menu
* lint: Add missing semicolons in test
* fix: Temporarilly comment out udpate user debug route
* v3: fix _tmp for crit and streakBonus
* v3: execute all actions when leaving a solo party
* v3 client: fix group not found when leaving party
* v3 migration: fix challenge prize
* v3 cron: only save modified tasks
* v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons
* v3: fix tasks chart
* v3 client: fix ability to leave challenge
* v3 client: fix filtering by tag and correctly show tag tooltip
* v3 common: fix tags tests
* v3 client: support unlinking not found challenges tasks
* v3: disable Bluebird warning for missing return, fixes #7269
* feat: Separate out update-user into set-cron and make-admin debug routes
* chore: Disable make admin debug route for v3 prod testing
* v3: misc fixes
* v3: misc fixes
* v3: fix adding multiple tasks
* 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
* v3 client: fix casting spells
* v3: do not log sensitive data
* v3: always save user when casting spell
* v3: always save user when casting spell
* v3: more fixes for spells
* fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 (#7282 )
* v3: add TODO for client side spells
* feat: Add modify inventory debug menu
* Fixed viewing user progress on challenge
* Updated tests
* fix: Fix quest progress button
* fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion
* v3: fix stealth casting
* v3: fix tasks saving and selection for rebirth reroll and reset (server-only)
* v3: fix auto allocation
* v3 client: misc fixes
* rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error
* Added delete for saved challenge task
* Fixed member modal on front page
* adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) (#7298 )
* fix bug in Rebirth test, add new tests, adjust apidocs (#7293 )
* Updated task model to allow setting streak (#7306 )
* fix: Correct missing * in apidoc comments
* 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
* v3: fix sorting
* [API v3] add CRON_SAFE_MODE (#7286 )
* add CRON_SAFE_MODE to example config file, fix some bugs, add an unrelated low-priority TODO
* create CRON_SAFE_MODE to disable parts of cron for use after extended outage - fixes https://github.com/HabitRPG/habitrpg/issues/7161
* fix a bug with CRON_SAFE_MODE, remove duplicated code, remove completed TODO comment
* fix check for CRON_SAFE_MODE
* v3 client: fix typo
* adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons
* completed To-Dos: return the 30 most recent instead of 30 oldest (#7318 )
* v3 migration: fix createdAt date
* adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321 )
* v3: fix unlinking multiple tasks
* v3 fix releasing pets
* v3: fix authenticating with apiUrl
* v3: fix typo
* v3 fix client tests for unlinking
* v3 client: do not show start quest button when quest is active
* v3 client: fix ability to send cards
* v3 client: fix misc challenge issues
* v3: fix notifications
* v3 client: more user friendly errors
* v3 client: only load completed todos once
* v3 client: fix tests
* v3: move TAVERN_ID to common code
* fix: Provide default type and text for new task creation in score route
* fix: Provide default history [] for habit in score route
* fix: Add _legacyId prop to tasks to support non-uuid identifiers
* chore: Change v3 migration to use _legacyId instead of legacyId
* fix: check for _legacyId in tasks if id does not exist
* refactor: Extract out finding task by id or _legacyId into a function
* 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
* v3 client: remove console.log statement
* v3: misc fixes
* v3 client: fix predicatbale random
* v3: info about API v3
* v3: update footer with links to developer resources
* v3: support party invitation from email
* v3 client: fix chat flagging
* fix: Correct get tasks route to properly get todos (#7349 )
* move locales strings from api-v3.json to other locales files (#7347 )
* move locales strings from api-v3.json: authentication strings -> front.json
* move locales strings from api-v3.json: authentication strings -> tasks.json
* move locales strings from api-v3.json: authentication strings -> groups.json
* move locales strings from api-v3.json: authentication strings -> challenge.json
* move locales strings from api-v3.json: authentication strings -> groups.json (again)
* move locales strings from api-v3.json: authentication strings -> quests.json
* move locales strings from api-v3.json: authentication strings -> subscriber.json
* move locales strings from api-v3.json: authentication strings -> spells.json
* move locales strings from api-v3.json: authentication strings -> character.json
* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)
* move locales strings from api-v3.json: authentication strings -> npc.json
* move locales strings from api-v3.json: authentication strings -> pets.json
* move locales strings from api-v3.json: authentication strings -> miscellaneous
* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json
* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup
* v3 client: fix sticky header
* v3: remove unused code
* v3 client: correctly redirect after inviting
* Removed v2 calls from views (#7351 )
* v3: fix tests for challenge export
* v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails
* Added force cache update when fetching new messages (#7360 )
* v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data
* v3: misc fixes for payments
* v3: limit fields of challenge tasks that can be updated
* fix(tests): never connect to NODE_DB_URI for tests
* Added new route for setting last cron and updated front end
* v3: fix iap url
* v3: fix build and ios IAP
* Changed route to user set custom day start
* v3: iap accessible under /api/v3, fixes to spells and groups invitations
* v3: correctly use v3 routes in client
* remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246
* use natural language for error message about skills on challenge tasks (#7336 ), fix other gramatical error
* Updated ui when user rejects a guild invite (#7368 )
* feat: complete custom day start route
Closes #7363
* fix: Correct spelling of healAll skill
fix: Correct sprite name of healAll skill
* fix: Change all instances of spookDust -> spookySparkles
* add dateCreated to all tasks; add empty challenge object to tasks that don't have one (#7386 )
* add plumilla to artists for Tangle Tree in Bailey message
* Fixed quest drop modal (#7377 )
* Fixed quest drop modal
* Fixed broken party test
* [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
* Tavern party challenges invites fix (#7394 )
* Added challenges and invitations to party
* Loaded tavern challenges
* Updated group and quest services tests
* v3: implement automatic syncing if user is not up to date
* Removed unnecessary fields when updating groups and challenges (#7395 )
* v3: do not saved populated user
* v3: correctly return user subset
* Chained party promises together (#7396 )
* v3: $w -> splitWhitespace
* use bluebird
* use babel polyfill
* migration: fix items
* update links for v3
* Updated shortname validation to support multiple browsers
* Docs changes (#7401 )
* chore: Clarify transfer-gems documentation
* chore: Clarify api status route documentation
* chore: Mark webhooks as BETA
* Added tags update route. Added sort to user service (#7381 )
* Added tags update route. Added sort to user service
* Change update tasks route to reorder tasks
* Fixed linting issue
* Changed params for reorder tags route
* Fixed not found tag and added test
* Added password confirmation when deleteing account (#7402 )
* fix production logging
* feat(commit): push
* empty commit
* feat(maintenance): post-downtime news & awards (#7406 )
* fix exporting avatar
* second attempt at fixing exporting avatar
* fix production logging
* s3: convert moment to date instance
* fix avatar sharing and caching (30 minutes)
* fix: Correct missing parameter
Closes #7433
* fix: Validate challenge shortname on server
* adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name
2016-05-23 13:58:31 +02:00
Alys
fa009a19f4
adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name
2016-05-23 06:27:52 -04:00
Keith Holliday
63de1e398f
Added force sync param to party and tavern requests
2016-05-23 09:40:04 +01:00
Blade Barringer
c5215e80de
Merge branch 'TheHollidayInn-api-v3-challenge-shortname-validation' into api-v3
2016-05-22 20:58:23 -05:00
Blade Barringer
8cf4f9f414
fix: Validate challenge shortname on server
2016-05-22 20:58:03 -05:00
Blade Barringer
7d45223296
fix: Correct missing parameter
...
Closes #7433
2016-05-22 20:50:08 -05:00
Matteo Pagliazzi
4c8ad80911
fix avatar sharing and caching (30 minutes)
2016-05-22 16:35:57 +02:00
Matteo Pagliazzi
1e83ddaf69
s3: convert moment to date instance
2016-05-22 14:22:30 +02:00
Matteo Pagliazzi
deca281233
fix production logging
2016-05-22 13:59:37 +02:00
Matteo Pagliazzi
ab3371213e
second attempt at fixing exporting avatar
2016-05-22 13:51:57 +02:00
Matteo Pagliazzi
ecfacd6c9a
fix exporting avatar
2016-05-22 13:07:41 +02:00
Matteo Pagliazzi
f76e387d05
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-22 13:07:21 +02:00
Sabe Jones
57754adee7
feat(maintenance): post-downtime news & awards ( #7406 )
2016-05-21 23:40:36 -05:00
Matteo Pagliazzi
a90e607e70
Merge branch 'master' of https://git.heroku.com/habitrpg into api-v3
2016-05-22 05:13:05 +02:00
Matteo Pagliazzi
0a396c461d
empty commit
2016-05-22 05:11:38 +02:00
Sabe Jones
4d7444e46f
feat(commit): push
2016-05-22 02:53:24 +00:00
Matteo Pagliazzi
942ee522a1
fix production logging
2016-05-22 03:58:40 +02:00
Keith Holliday
1a19c9d2a6
Added password confirmation when deleteing account ( #7402 )
2016-05-22 03:55:52 +02:00
Keith Holliday
e3c79fbdfa
Added tags update route. Added sort to user service ( #7381 )
...
* Added tags update route. Added sort to user service
* Change update tasks route to reorder tasks
* Fixed linting issue
* Changed params for reorder tags route
* Fixed not found tag and added test
2016-05-22 03:55:45 +02:00
Blade Barringer
81a30d1f20
Docs changes ( #7401 )
...
* chore: Clarify transfer-gems documentation
* chore: Clarify api status route documentation
* chore: Mark webhooks as BETA
2016-05-22 03:55:03 +02:00
Keith Holliday
c9eebf0b84
Updated shortname validation to support multiple browsers
2016-05-22 02:20:25 +01:00
Matteo Pagliazzi
7ef529988a
update links for v3
2016-05-22 00:00:05 +02:00
Matteo Pagliazzi
308e70432f
migration: fix items
2016-05-21 23:22:17 +02:00
Matteo Pagliazzi
ee691c252b
use babel polyfill
2016-05-21 22:57:19 +02:00
Matteo Pagliazzi
4e12cd293c
use bluebird
2016-05-21 22:54:27 +02:00
Marco Fras
5a2616069a
Update tasks.json
...
Added a period for constistency with other strings. (hope this is the right way to do it)
2016-05-21 22:12:28 +02:00
Matteo Pagliazzi
0c20cf30d7
v3: $w -> splitWhitespace
2016-05-21 20:27:11 +02:00
Keith Holliday
25511a8e64
Chained party promises together ( #7396 )
2016-05-21 19:46:38 +02:00
Matteo Pagliazzi
58485841da
v3: correctly return user subset
2016-05-21 19:25:31 +02:00
Matteo Pagliazzi
559c7bed94
v3: do not saved populated user
2016-05-21 19:23:51 +02:00
Keith Holliday
d6e7eb8c75
Removed unnecessary fields when updating groups and challenges ( #7395 )
2016-05-21 18:45:08 +02:00
Matteo Pagliazzi
c44c2a35ba
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-21 18:43:59 +02:00
Matteo Pagliazzi
b49826129a
v3: implement automatic syncing if user is not up to date
2016-05-21 18:43:35 +02:00
Keith Holliday
b378e41f2c
Tavern party challenges invites fix ( #7394 )
...
* Added challenges and invitations to party
* Loaded tavern challenges
* Updated group and quest services tests
2016-05-21 17:26:34 +02:00
Matteo Pagliazzi
a210542e0a
Merge branch 'develop' into api-v3
2016-05-21 16:46:22 +02:00
Blade Barringer
ef3a2fc286
chore(i18n): update locales
2016-05-21 09:14:25 -05:00
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
5c885c77a0
add dateCreated to all tasks; add empty challenge object to tasks that don't have one ( #7386 )
2016-05-21 09:20:11 +10: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
Blade Barringer
f5d65a1e4d
fix: remove unused vars
...
closes #7383
2016-05-20 14:27:22 -05:00
Sabe Jones
18822854f7
fix(static-page): remove timezone handling
2016-05-20 16:53:40 +00:00
Blade Barringer
d3ecdae25c
Merge pull request #7365 from crookedneighbor/skill_fixes
...
Skill fixes
2016-05-20 09:32:58 -05:00
Blade Barringer
5bd436f3c8
fix: Change all instances of spookDust -> spookySparkles
2016-05-20 09:17:44 -05:00
Blade Barringer
42bc4bdd3d
fix: Correct spelling of healAll skill
...
fix: Correct sprite name of healAll skill
2016-05-20 09:17:16 -05:00
Blade Barringer
f3537351bf
Merge branch 'TheHollidayInn-api-v3-user-set-last-cron-fix' into api-v3
2016-05-20 08:03:47 -05:00
Blade Barringer
1fb77c0e92
feat: complete custom day start route
...
Closes #7363
2016-05-20 08:03:14 -05:00
Keith Holliday
5e30aeb24c
Updated ui when user rejects a guild invite ( #7368 )
2016-05-20 14:17:54 +02:00
Blade Barringer
25c69afb5f
chore: Update i18n locales
2016-05-20 06:55:50 -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
908e80d2ca
fix(announcement): upcoming features wording
2016-05-19 22:30:31 -05: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
Blade Barringer
283c2a0823
Merge pull request #7370 from Alys/v3-7246-unchecking-daily-mana
...
remove XP, GP when unticking a Daily with a completed checklist
2016-05-19 22:17:27 -05:00
Alys
b9d55e3562
use natural language for error message about skills on challenge tasks ( #7336 ), fix other gramatical error
2016-05-19 23:54:22 +00:00
Alys
af37b30363
remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246
2016-05-19 17:08:15 -04:00
Matteo Pagliazzi
bf776e38c7
v3: correctly use v3 routes in client
2016-05-19 22:59:17 +02:00
Matteo Pagliazzi
5ba33bc5a1
v3: iap accessible under /api/v3, fixes to spells and groups invitations
2016-05-19 22:43:11 +02:00
Keith Holliday
5b7a56d28d
Changed route to user set custom day start
2016-05-19 21:14:35 +01:00
Matteo Pagliazzi
c6da283b54
v3: fix build and ios IAP
2016-05-19 21:18:43 +02:00
Matteo Pagliazzi
c8f55302ca
v3: fix iap url
2016-05-19 20:44:44 +02:00
Keith Holliday
e8b53d6b22
Added new route for setting last cron and updated front end
2016-05-18 23:24:32 +01:00
Matteo Pagliazzi
0a14d29ebb
fix(tests): never connect to NODE_DB_URI for tests
2016-05-18 23:50:24 +02:00
Matteo Pagliazzi
e98930cd4a
v3: limit fields of challenge tasks that can be updated
2016-05-18 23:27:49 +02:00
Matteo Pagliazzi
65c739f7de
v3: misc fixes for payments
2016-05-18 22:35:03 +02:00
Matteo Pagliazzi
9efe75e9b8
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-18 22:12:02 +02:00
Matteo Pagliazzi
d6f52f0604
v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data
2016-05-18 22:11:42 +02:00
Keith Holliday
9a32a01a3e
Added force cache update when fetching new messages ( #7360 )
2016-05-18 21:49:58 +02:00
Matteo Pagliazzi
f0f67e1e88
v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails
2016-05-18 18:29:38 +02:00
Matteo Pagliazzi
ef9dc9a15a
v3: fix tests for challenge export
2016-05-18 17:49:17 +02:00
Keith Holliday
425172daae
Removed v2 calls from views ( #7351 )
2016-05-18 17:48:32 +02:00
Matteo Pagliazzi
58b9a08539
v3 client: correctly redirect after inviting
2016-05-18 17:41:42 +02:00
Blade Barringer
18a3024aea
fix: Correct hourglass test
2016-05-18 10:33:05 -05:00
Matteo Pagliazzi
163b5b4ac3
v3: remove unused code
2016-05-18 17:28:33 +02:00
Blade Barringer
7c96d45e86
feat: Add v3 strings to develop for translating ( #7354 )
2016-05-18 17:25:35 +02:00
Matteo Pagliazzi
ae26713dd9
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-18 17:16:53 +02:00
Matteo Pagliazzi
95542cd42e
v3 client: fix sticky header
2016-05-18 17:16:40 +02:00
Alys
dad60909f7
move locales strings from api-v3.json to other locales files ( #7347 )
...
* move locales strings from api-v3.json: authentication strings -> front.json
* move locales strings from api-v3.json: authentication strings -> tasks.json
* move locales strings from api-v3.json: authentication strings -> groups.json
* move locales strings from api-v3.json: authentication strings -> challenge.json
* move locales strings from api-v3.json: authentication strings -> groups.json (again)
* move locales strings from api-v3.json: authentication strings -> quests.json
* move locales strings from api-v3.json: authentication strings -> subscriber.json
* move locales strings from api-v3.json: authentication strings -> spells.json
* move locales strings from api-v3.json: authentication strings -> character.json
* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)
* move locales strings from api-v3.json: authentication strings -> npc.json
* move locales strings from api-v3.json: authentication strings -> pets.json
* move locales strings from api-v3.json: authentication strings -> miscellaneous
* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json
* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup
2016-05-18 16:56:05 +02:00
Blade Barringer
93d50e4f60
fix: Correct get tasks route to properly get todos ( #7349 )
2016-05-18 16:54:02 +02:00
Matteo Pagliazzi
73dd9f5920
v3 client: fix chat flagging
2016-05-18 16:50:50 +02:00
Matteo Pagliazzi
2f934455ad
v3: support party invitation from email
2016-05-18 16:39:11 +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
034e464bf2
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-18 15:30:46 +02:00
Matteo Pagliazzi
7ea581bb38
v3 client: fix predicatbale random
2016-05-18 15:30:23 +02:00
Blade Barringer
9fdbec879a
Merge pull request #7337 from crookedneighbor/v2_fixes
...
Legacy Id for v2
2016-05-18 06:46:23 -05:00
Matteo Pagliazzi
210ac57165
v3: misc fixes
2016-05-18 12:16:31 +02:00
Matteo Pagliazzi
d888fc7588
v3 client: remove console.log statement
2016-05-18 11:23:11 +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
dba53b85a2
refactor: Extract out finding task by id or _legacyId into a function
2016-05-17 17:12:41 -05:00
Blade Barringer
38473f09c7
fix: check for _legacyId in tasks if id does not exist
2016-05-17 16:48:42 -05:00
Blade Barringer
990d43928b
chore: Change v3 migration to use _legacyId instead of legacyId
2016-05-17 15:52:00 -05:00
Blade Barringer
5931aee26b
fix: Add _legacyId prop to tasks to support non-uuid identifiers
2016-05-17 15:51:31 -05:00
Blade Barringer
4f1d738272
fix: Provide default history [] for habit in score route
2016-05-17 15:51:31 -05:00
Blade Barringer
bf2e6489b7
fix: Provide default type and text for new task creation in score route
2016-05-17 15:51:31 -05:00
Blade Barringer
7ac67315e6
Merge branch 'develop' into api-v3
2016-05-17 15:50:31 -05:00
Matteo Pagliazzi
a0f8b715aa
v3: move TAVERN_ID to common code
2016-05-17 22:49:31 +02:00
Matteo Pagliazzi
2ff5c883d8
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-17 22:48:13 +02:00
Matteo Pagliazzi
e8b8fc3b3a
v3 client: fix tests
2016-05-17 22:43:18 +02: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
b963acb91b
v3 client: only load completed todos once
2016-05-17 19:31:59 +02:00
Matteo Pagliazzi
2064db364f
v3 client: more user friendly errors
2016-05-17 19:22:35 +02:00
Matteo Pagliazzi
a757df9f5b
v3: fix notifications
2016-05-17 19:12:39 +02:00
Matteo Pagliazzi
30c9458493
v3 client: fix misc challenge issues
2016-05-17 18:19:45 +02:00
Matteo Pagliazzi
d293b2d6ee
v3 client: fix ability to send cards
2016-05-17 17:35:49 +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
1b48ff4b8f
v3 fix client tests for unlinking
2016-05-17 17:02:36 +02:00
Matteo Pagliazzi
2d63076369
v3: fix typo
2016-05-17 16:40:18 +02:00
Matteo Pagliazzi
d2e9c45c0a
v3: fix authenticating with apiUrl
2016-05-17 16:37:48 +02:00
Matteo Pagliazzi
f4159daf21
v3 fix releasing pets
2016-05-17 16:26:59 +02:00
Matteo Pagliazzi
4b0262cee5
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-17 16:25:12 +02:00
Matteo Pagliazzi
41152157c2
v3: fix unlinking multiple tasks
2016-05-17 16:24:54 +02:00
Alys
1cf2c89171
adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings ( #7321 )
2016-05-17 15:48:58 +02:00
Matteo Pagliazzi
d648b0e0c8
v3 migration: fix createdAt date
2016-05-17 15:46:30 +02:00
Alys
810e4cbd78
completed To-Dos: return the 30 most recent instead of 30 oldest ( #7318 )
2016-05-17 08:13:47 +02:00
Alys
daf899374d
adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons
2016-05-16 23:01:23 -04:00
Matteo Pagliazzi
9f12acf241
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-16 23:10:38 +02:00
Matteo Pagliazzi
c1ef633b0f
v3 client: fix typo
2016-05-16 23:10:19 +02:00
Alys
cad538dd51
[API v3] add CRON_SAFE_MODE ( #7286 )
...
* add CRON_SAFE_MODE to example config file, fix some bugs, add an unrelated low-priority TODO
* create CRON_SAFE_MODE to disable parts of cron for use after extended outage - fixes https://github.com/HabitRPG/habitrpg/issues/7161
* fix a bug with CRON_SAFE_MODE, remove duplicated code, remove completed TODO comment
* fix check for CRON_SAFE_MODE
2016-05-16 22:52:56 +02:00
Matteo Pagliazzi
ec80785384
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-16 22:52:25 +02:00
Matteo Pagliazzi
ab6e34aa6f
v3: fix sorting
2016-05-16 22:50:58 +02:00
Sabe Jones
beb4a0d8bb
feat(content): May 2016 pet quest ( #7310 )
2016-05-16 15:18:51 -05:00
Blade Barringer
24fb7fff22
Merge branch 'TheHollidayInn-api-v3-challenge-fixes' into api-v3
2016-05-16 15:01:09 -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
a16bc02167
Merge pull request #7299 from TheHollidayInn/api-v3-load-member-front-page
...
Fixed member modal on front page
2016-05-16 14:39:52 -05:00
Blade Barringer
4672fd3b0b
Merge branch 'api-v3' into Alys-v3-armoire-fix
2016-05-16 14:10:39 -05:00
Blade Barringer
4d98aa2d89
Merge branch 'Alys-v3-buy-health-potion' into api-v3
2016-05-16 14:06:02 -05:00
Blade Barringer
e6b5fe4013
fix: Correct missing * in apidoc comments
2016-05-16 13:45:04 -05:00
Keith Holliday
dbd6daeca0
Updated task model to allow setting streak ( #7306 )
2016-05-16 20:12:46 +02:00
Alys
cfb5e2be60
fix bug in Rebirth test, add new tests, adjust apidocs ( #7293 )
2016-05-16 18:13:49 +02:00
Alys
4bba10fac2
adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) ( #7298 )
2016-05-16 18:08:54 +02:00
Keith Holliday
11b567038e
Fixed member modal on front page
2016-05-16 09:54:22 -05:00
Keith Holliday
1187d77ba5
Added delete for saved challenge task
2016-05-16 08:51:24 -05:00
Alys
daa0955ac1
rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error
2016-05-16 23:15:01 +10:00
Matteo Pagliazzi
ad03cc8f9a
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-16 12:55:14 +02:00
Matteo Pagliazzi
ab27ef47fe
v3 client: misc fixes
2016-05-16 12:54:43 +02:00
Matteo Pagliazzi
4d08fde068
v3: fix auto allocation
2016-05-16 12:17:26 +02:00
Matteo Pagliazzi
793ca3b172
v3: fix tasks saving and selection for rebirth reroll and reset (server-only)
2016-05-16 12:04:09 +02:00
Matteo Pagliazzi
ba1628427e
v3: fix stealth casting
2016-05-16 11:38:22 +02:00
Alys
b676fc0b71
fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion
2016-05-16 16:21:24 +10:00
Blade Barringer
6bbfbbf613
fix: Fix quest progress button
2016-05-15 21:17:11 -05:00
Keith Holliday
bb0be9a626
Updated tests
2016-05-15 18:57:15 -05:00
Keith Holliday
20642c9dde
Fixed viewing user progress on challenge
2016-05-15 18:19:00 -05:00
Blade Barringer
08d4b13b05
Merge pull request #7284 from crookedneighbor/debug_inventory
...
feat: Add modify inventory debug menu
2016-05-15 16:27:09 -05:00
Blade Barringer
21203c3f2e
feat: Add modify inventory debug menu
2016-05-15 16:07:30 -05:00
Matteo Pagliazzi
93546f6546
v3: add TODO for client side spells
2016-05-15 22:55:06 +02:00
Alys
4ceab38d0b
fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 ( #7282 )
2016-05-15 22:37:31 +02:00
Matteo Pagliazzi
faaa52035d
v3: more fixes for spells
2016-05-15 22:37:08 +02:00
Matteo Pagliazzi
fff65f5dda
v3: always save user when casting spell
2016-05-15 22:32:16 +02:00
Matteo Pagliazzi
c1c77b68b4
v3: always save user when casting spell
2016-05-15 22:30:04 +02:00
Matteo Pagliazzi
1a14a6f4b7
v3: do not log sensitive data
2016-05-15 22:20:10 +02:00
Matteo Pagliazzi
52bedc3563
v3 client: fix casting spells
2016-05-15 21:17:17 +02:00
Keith Holliday
f593add576
Fixed particiapting filter
2016-05-15 11:40:45 -05:00
Keith Holliday
2173719e43
Fixed deleting challenge tasks
2016-05-15 11:32:47 -05:00
Keith Holliday
21191fdc45
Fixed challenge member info. Fixed challenge winner selection
2016-05-15 11:19:58 -05:00
Keith Holliday
a7e71163c0
Fixed default selected group
2016-05-15 10:52:44 -05:00
Keith Holliday
bda90fad68
Synced challenge tasks after leave and join.
2016-05-15 10:14:29 -05:00
Keith Holliday
fcc02b16c6
Fixed bulk add tasks to challenge
2016-05-15 10:03:34 -05:00
Keith Holliday
400e434f1c
Queried only user groups to be available when creating challenges
2016-05-15 09:50:30 -05:00
Keith Holliday
6bd893d497
Fixed join/leave button updates
2016-05-15 09:44:23 -05:00
Matteo Pagliazzi
b31de3845b
v3: fix adding multiple tasks
2016-05-15 16:43:17 +02:00
Matteo Pagliazzi
0be5d1da9c
v3: misc fixes
2016-05-15 15:10:41 +02:00
Matteo Pagliazzi
3fbc156811
v3: misc fixes
2016-05-15 14:20:20 +02:00
Blade Barringer
164c024512
Merge branch 'set-cron_make-admin' into api-v3
2016-05-15 07:17:09 -05:00
Blade Barringer
2851af1a29
chore: Disable make admin debug route for v3 prod testing
2016-05-15 07:01:09 -05:00
Blade Barringer
44c9449913
feat: Separate out update-user into set-cron and make-admin debug routes
2016-05-15 06:58:54 -05:00
Matteo Pagliazzi
6ec4d942df
v3: disable Bluebird warning for missing return, fixes #7269
2016-05-15 13:38:18 +02:00
Matteo Pagliazzi
23a9a3e0e4
v3 client: support unlinking not found challenges tasks
2016-05-15 13:00:42 +02:00
Matteo Pagliazzi
438d2779b5
v3 common: fix tags tests
2016-05-15 12:45:27 +02:00
Matteo Pagliazzi
cb0939a38c
v3 client: fix filtering by tag and correctly show tag tooltip
2016-05-15 12:31:27 +02:00
Matteo Pagliazzi
0f7964cac1
v3 client: fix ability to leave challenge
2016-05-15 12:12:19 +02:00
Matteo Pagliazzi
4c056426e8
v3: fix tasks chart
2016-05-15 12:00:50 +02:00
Matteo Pagliazzi
64930ea07f
v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons
2016-05-15 11:35:10 +02:00
Matteo Pagliazzi
18ce4127e9
v3 cron: only save modified tasks
2016-05-15 11:31:34 +02:00
Matteo Pagliazzi
708f495684
v3 migration: fix challenge prize
2016-05-15 11:12:12 +02:00
Matteo Pagliazzi
6ab3280045
v3 client: fix group not found when leaving party
2016-05-15 11:06:20 +02:00
Matteo Pagliazzi
a8a063d3f6
v3: execute all actions when leaving a solo party
2016-05-15 11:01:37 +02:00
Matteo Pagliazzi
bbf5791aa0
v3: fix _tmp for crit and streakBonus
2016-05-15 10:45:12 +02:00
Blade Barringer
480937c800
fix: Temporarilly comment out udpate user debug route
2016-05-14 23:07:18 -05:00
Blade Barringer
7b15967215
Merge pull request #7263 from crookedneighbor/debug-update-user
...
Debug update user
2016-05-14 22:48:20 -05:00
Blade Barringer
4a2e3d4410
lint: Add missing semicolons in test
2016-05-14 22:45:35 -05:00
Blade Barringer
8ae3dd779e
Merge pull request #7264 from Alys/karma.conf
...
remove userServices.js from karma.conf
2016-05-14 22:43:16 -05:00
Blade Barringer
50d7345832
feat: Add make admin button to debug menu
2016-05-14 22:37:26 -05:00
Blade Barringer
bc58bd97bb
fix: Correct set cron debug function
2016-05-14 22:33:02 -05:00
Blade Barringer
3b8ce8451b
feat: Create debug update user route
2016-05-14 22:30:18 -05:00
Alys
d28860620b
remove userServices.js from karma.conf - it's been moved to website/client/js/services
2016-05-15 13:21:08 +10:00
Blade Barringer
ac87366f20
Merge pull request #7261 from crookedneighbor/fix_drops
...
fix: Alert user that drops were recieved
2016-05-14 21:51:05 -05:00
Blade Barringer
44102f6b46
fix: Alert user that drops were recieved
2016-05-14 18:45:36 -05:00
Alys
887d187691
change "an user" to "a user" in comments and text (no code changes) ( #7257 )
2016-05-15 01:10:08 +02:00
Sabe Jones
6ceea9346f
chore(news): misc announcements
2016-05-14 20:56:22 +00:00
Blade Barringer
8a72c91060
Merge branch 'TheHollidayInn-upstream/api-v3-fixes-2' into api-v3
...
Closes #7245
2016-05-14 12:00:53 -05:00
Keith Holliday
2d5bf9b1bc
Fixed reload tests
2016-05-14 12:00:41 -05:00
Blade Barringer
2487ebac90
chore: Reinstate floating version number for eslint
...
babel-eslint regression fixed
2016-05-14 11:59:00 -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
936ff1f200
Fixed page reload on settings change
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
Keith Holliday
6222c23810
Updated spell casting to v3
2016-05-14 11:05:31 -05:00
Keith Holliday
439d20c82e
Fixed start party by invites
2016-05-14 11:05:31 -05:00
Blade Barringer
769d9e5148
Merge branch 'Alys-api-v3-apidoc-url' into api-v3
2016-05-14 10:21:04 -05:00
Alys
e4b17d2d04
update apidoc URL in package.json
...
Closes #7222
2016-05-14 10:20:43 -05:00
Blade Barringer
c534f31593
Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename
...
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
2016-05-14 10:19:43 -05:00
Blade Barringer
a697d028b7
fix: Correct client request from habitrpg -> tavern
2016-05-14 09:37:21 -05:00
Blade Barringer
e654b47537
Merge branch 'Alys-api-v3-cron-comments-etc' into api-v3
2016-05-14 09:21:55 -05:00
Blade Barringer
56dccf016e
chore: clarify comments on cron code
2016-05-14 09:20:57 -05:00
Alys
210d01ddae
add a missing variable declaration
2016-05-14 23:01:45 +10:00
Blade Barringer
9969aa667a
fix: Remove requirement on message paramter in transfer-gems
2016-05-14 07:37:47 -05:00
Blade Barringer
25f0819f1e
chore: Remove unusued variable
2016-05-14 06:59:11 -05:00
Blade Barringer
3e57620666
fix: Set gems sent notification as translatable string
2016-05-14 06:54:44 -05:00
Alys
44e9d8b09e
fix tests for /members/transfer-gems
2016-05-14 07:18:00 -04:00
Alys
2e078f4776
allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227
2016-05-14 05:58:40 -04:00
Alys
fd13c7aa60
rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges
2016-05-14 16:40:40 +10:00
Blade Barringer
4dd7c29baf
fix: Add missing type param to equip call
...
closes #7212
2016-05-13 22:49:05 -05:00
Blade Barringer
38f09c7766
Merge pull request #7215 from crookedneighbor/fix_checklist
...
[API v3] Correct checklist on v3 client
2016-05-13 22:38:50 -05:00
Alys
6acaef50e6
minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions
2016-05-14 13:26:26 +10:00
Blade Barringer
e19146d6be
fix: Pin eslint to 2.9
2016-05-13 22:17:19 -05:00
Blade Barringer
0a8b8236c1
fix: Correct checklist on client
...
Closes #7207
2016-05-13 22:05:00 -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
Lucas Torroba (@zesme)
2a8f24697f
chore(typo): Fix typos in ISSUE_TEMPLATE.md
...
Closes #7202
2016-05-13 12:50:09 -05: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
468a312357
v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results ( #7203 )
2016-05-13 19:08:38 +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
486b93a3c9
mongoose: use options
2016-05-13 10:42:48 +02:00
Matteo Pagliazzi
9514e9c5a8
v3: fix reminders with no startDate
2016-05-13 10:34:09 +02:00
Matteo Pagliazzi
8183b0d084
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-13 10:31:49 +02:00
Blade Barringer
afc51cbdc4
Merge pull request #7198 from crookedneighbor/capture_stack_trace
...
fix: Only apply captureStackTrace if it exists on the error object
2016-05-12 19:25:44 -05:00
Blade Barringer
de1f2c2788
fix: Only apply captureStackTrace if it exists on the error object
2016-05-12 18:57:49 -05:00
Matteo Pagliazzi
b5a7f8e3a1
test mongoose fix
2016-05-12 23:12:11 +02:00
Matteo Pagliazzi
e47ae45f9f
mongoose: increase keepAlive
2016-05-12 22:43:38 +02:00
Matteo Pagliazzi
c7fb69b530
revert changes to mongoose config
2016-05-12 21:44:57 +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
ca6dca5fd0
Fixed test broken by part sync change ( #7195 )
2016-05-12 19:55:34 +02:00
Matteo Pagliazzi
bb1cb3397e
v3 client: saving after syncing is complete
2016-05-12 18:18:24 +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
93336f3894
v3: misc fixes
2016-05-12 18:06:26 +02:00
Keith Holliday
c9b7aa8342
Api v3 party tavern fixes ( #7191 )
...
* Added check if user is in party before query
* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites
* Update tavern ctrl to use new promise
2016-05-12 16:45:53 +02:00
Matteo Pagliazzi
7fea1d3a98
disable redirects
2016-05-12 14:07:05 +02:00
Matteo Pagliazzi
3f555b012d
fix trailing spaces
2016-05-12 09:53:32 +02:00
Matteo Pagliazzi
8c351b6c56
return user.id and send analytics event before changing page
2016-05-12 09:40:21 +02:00
Matteo Pagliazzi
1dbd866ca1
Merge pull request #7189 from TheHollidayInn/api-v3-fixes
...
Api v3 fixes
2016-05-12 09:37:22 +02:00
Keith Holliday
01a8fde124
Fixed cron test
2016-05-11 23:40:20 -05:00
Keith Holliday
5d7ebd82a4
Updated party and group tests
2016-05-11 17:06:16 -05:00
Keith Holliday
eff2f04b45
Add challenges to groups. Fixed isMemberOfGuild check
2016-05-11 14:34:36 -05:00
Keith Holliday
12eba7bbe9
Ensured login callback happens after user sync
2016-05-11 14:18:32 -05:00
Keith Holliday
ee948f2447
Updated party query and create
2016-05-11 14:17:11 -05:00
Sabe Jones
0eb7bc537d
fix(contact): add clear subscription trouble email
2016-05-11 18:43:59 +00:00
Matteo Pagliazzi
679d56bc5c
Merge pull request #7186 from TheHollidayInn/api-v3-registration-fix
...
Changed id param for registration response
2016-05-11 20:35:32 +02:00
Keith Holliday
5b490116db
Changed id param for registration response
2016-05-11 10:40:40 -05:00
Matteo Pagliazzi
bf2c69aaca
v3: q -> bluebird
2016-05-11 16:57:43 +02:00
Matteo Pagliazzi
a8f4731a0a
Merge pull request #7091 from HabitRPG/api-v3-client
...
[API v3] Client
2016-05-11 16:36:22 +02:00
Matteo Pagliazzi
969459252b
v3: do not await a non promise
2016-05-11 16:22:56 +02:00
Matteo Pagliazzi
8276ffcfe2
v3: fix tests
2016-05-11 16:21:22 +02:00
Matteo Pagliazzi
998c679e96
Merge branch 'api-v3' into api-v3-client
2016-05-11 16:01:54 +02:00
Matteo Pagliazzi
95aff08de3
v3 fix tests and use coroutines instead of regenerator
2016-05-11 15:59:18 +02:00
Matteo Pagliazzi
bcb2877f61
Merge pull request #7145 from TheHollidayInn/api-v3-client-user-service
...
[WIP] Ported User Serivce to client side and to api v3
2016-05-11 15:50:09 +02:00
Keith Holliday
2e2aa55fc5
Removed extra consoles.log. Changed data.data to res.data
2016-05-11 08:27:35 -05:00
Matteo Pagliazzi
84b198f17f
v3 fix tests with deferred
2016-05-11 14:55:51 +02:00
Matteo Pagliazzi
a947afa5c6
Merge branch 'develop' into api-v3
2016-05-11 14:36:58 +02:00
Matteo Pagliazzi
cee7700a50
switch from Q to Bluebird
2016-05-11 14:34:01 +02:00
Matteo Pagliazzi
299ed624f5
v3: upgrade some deps
2016-05-11 13:48:39 +02:00
Matteo Pagliazzi
0d4870b1e6
v3: remove newrelic config file in favour of env variables
2016-05-11 11:43:50 +02:00
Keith Holliday
f807bc2a49
Fixed auth tests. Updated Authctrl response
2016-05-10 22:09:04 -05:00
Matteo Pagliazzi
f46b336a1f
v3: fix package.json
2016-05-11 01:33:49 +02:00
Matteo Pagliazzi
17e763db37
v3: fix package.json
2016-05-11 01:32:55 +02:00
Keith Holliday
04d8e7dd28
Added api-v3 auth urls
2016-05-10 16:54:50 -05:00
Keith Holliday
1315e5914c
Added tags into user service
2016-05-10 16:35:23 -05: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
4e41028ddd
Fixed more tests
2016-05-10 15:15:55 -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
a92359e119
Moved markPMSRead to common.ops. Added tests
2016-05-10 15:15:55 -05:00
Keith Holliday
c88cae4ddb
Added mark pms read route. Fixed error checking and extra code.
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
Matteo Pagliazzi
02a01a64ec
Merge pull request #7030 from HabitRPG/sabrecat/v3-payments
...
[API v3] Payments refactor
2016-05-10 18:33:00 +02:00
Matteo Pagliazzi
b3a78fba97
v3 payments: fix tests
2016-05-10 18:14:28 +02:00
Matteo Pagliazzi
d33564e5d4
v3 payments: port paypal
2016-05-10 17:57:55 +02:00
Matteo Pagliazzi
1c887b18e1
v3 payments: fix urls in tests
2016-05-10 17:00:47 +02:00
Matteo Pagliazzi
cd84ebd4c5
v3 payments: fix client errors for Stripe
2016-05-10 16:57:12 +02:00
Matteo Pagliazzi
1a43ab35c0
v3 payments: port amazon payments
2016-05-10 16:56:01 +02:00
Keith Holliday
9146e4601e
Added tags service ( #7176 )
2016-05-10 16:27:36 +02:00
Matteo Pagliazzi
03008c0d40
Merge branch 'api-v3' into sabrecat/v3-payments
2016-05-09 23:29:38 +02:00
Matteo Pagliazzi
0cb0780c14
v3: do not log entire promise on error and add ability to enable console logging of errors in prod
2016-05-09 23:29:20 +02:00
Keith Holliday
20f9bbf449
Corrected reset checklist logic ( #7154 )
...
* Corrected reset checklist logic
* Change cron logic to reset rather than set
* Remove extra paranthesis
2016-05-09 23:06:27 +02:00
Matteo Pagliazzi
0114e310eb
v3 payments: working IAP and Stripe, move paypalBillingSetup to its own file, closeChal is now a challenge instance method
2016-05-09 22:58:15 +02:00
Matteo Pagliazzi
e980b3ce0a
Merge branch 'api-v3' into sabrecat/v3-payments
2016-05-08 19:19:20 +02:00
Keith Holliday
e747bba669
Updated add and remove tests for challenges ( #7155 )
2016-05-08 18:35:38 +02:00
Matteo Pagliazzi
94220c5483
Merge branch 'TheHollidayInn-api-v3-client-tests2' into api-v3-client
2016-05-08 16:59:30 +02:00
Matteo Pagliazzi
34251ca7fc
Merge branch 'api-v3-client-tests' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-client-tests2
2016-05-08 16:59:15 +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
Keith Holliday
a7c6457d79
Removed dateCreated
2016-05-08 09:40:08 -05:00
Matteo Pagliazzi
e19130bd8c
fix typo custsomerId -> customerId
2016-05-08 15:50:38 +02:00
Matteo Pagliazzi
77d2d943ae
v3: fix crashes when group or leader cannot be populated and fixes challenges migration for tavern challenges
2016-05-07 17:35:13 +02:00
Matteo Pagliazzi
4e3d4c8831
v3: more verbose logging in production and fix migration bugs
2016-05-07 15:01:40 +02:00
Matteo Pagliazzi
afb7d1d627
v3: start cleaning up TODO comemnts
2016-05-06 20:24:53 +02:00
Matteo Pagliazzi
b687a6bf9d
fix typo in v3 groups migration
2016-05-06 19:40:36 +02:00
Blade Barringer
7d41b76b2e
Merge pull request #7148 from crookedneighbor/require-again
...
feat: Add require-again to help with unit testing
2016-05-06 12:20:19 -05:00
Blade Barringer
192488cb02
feat: Add require-again to help with unit testing
2016-05-06 12:05:06 -05:00
Keith Holliday
6556c2a670
Added missing done to tests. Fixed partyCtrl tests
2016-05-06 09:10:47 -05:00
Keith Holliday
fd244ac021
Turned on client side tests. Fixed broken tests
2016-05-05 23:36:17 -05:00
Matteo Pagliazzi
c94f4ef0e9
v3 migration: delete old completed todos
2016-05-05 12:15:28 +02:00
Sphinx
7bfd9b0fd9
shieldSpecialSpring2015RogueNotes typo ( #7144 )
2016-05-05 19:55:02 +10:00
Matteo Pagliazzi
ebf3a0979f
fix challenges members migration
2016-05-05 09:28:07 +02:00
Matteo Pagliazzi
bb2dd8ca08
v3: remove trimming and lowercase from fields that must be unique
2016-05-04 23:43:04 +02:00
Matteo Pagliazzi
e5e4bb5823
v3 migration: correctly migrate challenges tasks
2016-05-03 23:27:24 +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
Matteo Pagliazzi
c218a2cbdf
v3 fix apidoc broken layout
2016-05-03 15:54:02 +02:00
Matteo Pagliazzi
21d798bca7
v3: GET /groups accept a guilds type which returns all the guilds the user is a member of
2016-05-03 15:49:47 +02:00
Sabe Jones
166a37d53f
chore(event): end Spring Fling 2016
2016-05-02 01:36:03 +00:00
Matteo Pagliazzi
72f4bd0aab
Merge branch 'api-v3' into sabrecat/v3-payments
2016-05-02 00:26:02 +02:00
Matteo Pagliazzi
01c07ae6df
Merge branch 'api-v3' into api-v3-client
2016-05-02 00:25:25 +02:00
Matteo Pagliazzi
f0e696b0ec
Merge branch 'develop' into api-v3
2016-05-02 00:24:50 +02:00
Matteo Pagliazzi
fbce7e65ab
v3 migration: fixes
2016-05-01 23:54:58 +02:00
Matteo Pagliazzi
60eefde15f
fix linting
2016-05-01 16:36:21 +02:00
Matteo Pagliazzi
e8024f98e1
v3 migration: first finished version that contains all models
2016-05-01 16:27:04 +02:00
Matteo Pagliazzi
a0e63c0eb2
use uuid module for uuids
2016-05-01 15:01:00 +02:00
Matteo Pagliazzi
4457b1c18c
v3: fix tags and challenges migration
2016-05-01 14:46:22 +02:00
Matteo Pagliazzi
8391494b89
v3: fix tags tests
2016-05-01 14:15:26 +02:00
Matteo Pagliazzi
a8fbafb801
v3: fix tags tests
2016-05-01 13:48:55 +02:00
Matteo Pagliazzi
a63d5ae97f
v3: fix tags tests
2016-05-01 13:25:19 +02:00
Matteo Pagliazzi
f5144fddaa
v3 adapt v2: fix tags _id, stickyHeader and unlocking
2016-05-01 12:51:32 +02:00
Matteo Pagliazzi
79c8449e1e
Merge branch 'api-v3' into sabrecat/v3-payments
2016-04-30 19:28:45 +02:00
Matteo Pagliazzi
115c5374cb
Merge branch 'api-v3' into api-v3-client
2016-04-30 19:28:16 +02:00
Matteo Pagliazzi
6380161321
Api v3 Migration (WIP) ( #7131 )
...
* v3 migration: remove old code and polish user migration
* v3 migration: start to work on challenges
* wip v3 migration
* wip v3 migration: fix _id -> id for reminders, tags and checklists
2016-04-30 18:34:16 +02:00
Matteo Pagliazzi
0c38caa2f9
Merge branch 'api-v3' into sabrecat/v3-payments
2016-04-30 16:51:51 +02: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
Victor Pudeyev
a567476bb7
V3 payments 7 stripe ( #7124 )
...
* payments api: cancelSubscription
* some more tests for amazon payments
* promisifying amazon payments
* somehow payment stub is not working
* cleaning up tests
* renaming tests in api/v3/integration/payments
* improvements
* cleanup, lint
* fixes as per comments
* moment.zone() is back in.
* basic controller for stripe payments
* authWithUrl is in
* stripe cleanup
* making tests pass
* stripe bug fixes
* 400 error is right
* cleanup of sinon spy for fakeSend
* paypal payments
* lint of paypal
* require -> import
2016-04-30 16:42:10 +02:00
Keith Holliday
415418f30c
Api v3 members port ( #7109 )
...
* 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
* Updated members service to use api v3
* Removed onlys
* Added invites to group detail
* Removed old user reject invite code
2016-04-30 10:54:25 +02:00
Alys
590e185ecd
fix spelling mistake: reseting to resetting
2016-04-29 18:44:49 -04:00
Sabe Jones
1787342951
chore(news): Last Chance Bailey 201604
2016-04-29 22:16:36 +00:00
Matteo Pagliazzi
3364019fcc
v3 and adapted v2: bugs fixes for groups, challenges and tasks
2016-04-29 11:49:12 +02:00
Blade Barringer
2aa3a3175f
Merge branch 'develop' into kelsin-develop
2016-04-27 19:11:56 -05:00
Victor Pudeyev
fa21577c46
V3 payments 6 ( #7104 )
...
* payments api: cancelSubscription
* some more tests for amazon payments
* promisifying amazon payments
* somehow payment stub is not working
* cleaning up tests
* renaming tests in api/v3/integration/payments
* improvements
* cleanup, lint
* fixes as per comments
* moment.zone() is back in.
2016-04-27 21:26:32 +02:00
Matteo Pagliazzi
f78bc2e6a8
v3 migration: barebone migration
2016-04-27 19:35:07 +02:00
Sabe Jones
7bc89aa55c
fix(sprites): updateabee
2016-04-27 17:14:49 +00:00
Keith Holliday
570d5c7fd9
Updated challenge service to user apiv3 and update challenge ctrl ( #7111 )
...
* Updated challenge service to user apiv3 and update challenge ctrl
* Removed extra code. Added challenge update. Fixed group qurey
2016-04-27 16:11:06 +02:00
Keith Holliday
2619b34c65
Updated chat service to use api v3 ( #7113 )
...
* Updated chat service to use api v3
* Removed , added back User functions, added todo
2016-04-27 15:59:10 +02:00
Sabe Jones
bf7ce46ea4
chore(news): Be-Wilder conclusion
2016-04-27 04:16:35 +00:00
Blade Barringer
a326873935
chore: Add emoji lib back in
...
The 3rd party chat extension was breaking because this library was
missing. Remove this after the chat extension is updated
https://github.com/Horacious/HabitRPG-Chat-Extension/pull/40
2016-04-26 23:07:15 -05:00
Blade Barringer
ebe3eefcc5
chore: reorganize quest sprites
2016-04-26 21:13:06 -05:00
Sabe Jones
0d4532c12e
fix(elastic-beanstalk): extend connection timeout for ELB
2016-04-26 19:09:36 +00:00
Blade Barringer
ee3aa056f9
feat: Add eb extension to increase deploy timeout to 30 minutes ( #7049 )
2016-04-26 14:07:28 -05:00
Blade Barringer
f415810a0f
Merge branch 'markdown_rework' into develop
2016-04-26 12:53:47 -05:00
Blade Barringer
b5de787c4d
refactor: Remove uneeded emoji images
2016-04-26 12:53:18 -05:00
Blade Barringer
e88d0ff450
feat: switch to version number for habitica-markdown
2016-04-26 12:52:59 -05:00
Blade Barringer
4f1a4393e1
fix: Adjust spacing of emoji in tags
2016-04-26 12:50:37 -05:00
Blade Barringer
e7315253dd
feat: Switch out js-emoji for habtiica-markdown
2016-04-26 08:19:47 -05: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
Blade Barringer
b86348dd0e
refactor: Remove MOBILE_APP logic
2016-04-25 07:44:05 -05:00
Blade Barringer
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
Matteo Pagliazzi
d6ea0a3b40
v3: fix setting challenge.official
2016-04-25 14:34:59 +02:00
Matteo Pagliazzi
5b217ec3db
v3: fix setting challenge.official
2016-04-25 14:21:00 +02:00
Matteo Pagliazzi
6cad3616f3
v3: define migration spec (add files)
2016-04-25 13:53:42 +02:00
Matteo Pagliazzi
12b05b9492
v3: define migration spec and misc fixes
2016-04-25 13:51:08 +02:00
Matteo Pagliazzi
f2d5c921ed
Merge branch 'api-v3' into api-v3-client
2016-04-24 15:09:10 +02:00
Matteo Pagliazzi
b6f79aff0b
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-04-24 15:08:54 +02:00
Matteo Pagliazzi
6197fcea3b
Merge branch 'develop' into api-v3
2016-04-24 15:08:13 +02:00
Matteo Pagliazzi
c78c3b9fd8
v3: first iteration of users migration
2016-04-24 15:07:45 +02:00
Keith Holliday
050539d8f3
Added tests for cron ( #7081 )
...
* Added inital cron tests
* Added more subscribe tests and updated various tests for syntax and expectations
2016-04-24 00:54:50 +02:00
Matteo Pagliazzi
c608d03e35
v3: start writing migrations
2016-04-23 15:00:55 +02:00
Sabe Jones
8355dbe63f
chore(news): Bewildered Bailey
2016-04-23 04:00:30 +00:00
Matteo Pagliazzi
537facd118
Merge branch 'api-v3' into api-v3-client
2016-04-23 03:33:32 +02:00
Matteo Pagliazzi
7dab7939cc
v3: fix tavern during tests
2016-04-23 03:33:00 +02:00
Matteo Pagliazzi
4cda56e3eb
Merge branch 'api-v3' into api-v3-client
2016-04-23 03:08:37 +02:00
Matteo Pagliazzi
c5aa15cf47
v3: fix ability to join public guild you were already a member of
2016-04-23 03:08:03 +02:00
Matteo Pagliazzi
2d87cb0d87
Merge branch 'develop' into api-v3
2016-04-22 17:43:48 +02:00
Matteo Pagliazzi
91314a497c
Merge branch 'api-v3-unlock-fix' into api-v3
2016-04-22 12:33:55 +02:00
Matteo Pagliazzi
6ba1afe479
Merge branch 'api-v3' into api-v3-unlock-fix
2016-04-22 12:33:39 +02:00
Matteo Pagliazzi
1fe2220aa1
v3: improve docs and fix bugs
2016-04-22 12:15:24 +02:00
Sabe Jones
2cdb30bd5b
fix(NR): remove metric check that crashed
2016-04-21 22:47:04 +00:00
Sabe Jones
73e4c719b2
Merge pull request #7096 from piousbox/v3-payments-5
...
V3 payments 5
2016-04-21 14:45:41 -05:00
Sabe Jones
578e28b6b6
Merge pull request #7095 from piousbox/v3-payments-4
...
V3 payments 4
2016-04-21 14:42:58 -05: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
Sabe Jones
43f8e943f6
Merge pull request #7097 from vIiRuS/patch-7
...
Fix timezone issue with iOS app
2016-04-21 12:54:44 -05:00
Phillip Thelen
a5fbc08016
Set timezoneOffset to 0 as default
...
Fixes an issue with the iOS app not setting the offset, when no initial value exists.
2016-04-21 19:41:39 +02:00
Blade Barringer
5c1d86c513
Merge branch 'develop' into MathWhiz-mount-images
2016-04-21 07:52:21 -05:00
Victor Piousbox
cbf1a4c8d3
breaking changes promisifying amazon payments
2016-04-21 04:37:25 +00:00
Victor Piousbox
54a94db2de
working on amazon payments
2016-04-21 03:52:29 +00:00
Victor Piousbox
612e3b725f
little changes to lint
2016-04-21 00:25:43 +00:00
Victor Piousbox
f9915c3f77
recovering last weeks work on promisifying amazon payments
2016-04-21 00:07:58 +00:00
mathwhiz
45bc69308c
mounts
2016-04-20 23:52:26 +00:00
Matteo Pagliazzi
6568fcfd5e
res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests
2016-04-21 00:52:03 +02:00
Victor Piousbox
62b059d4d8
little changes, no console.log
2016-04-20 22:27:37 +00:00
Victor Piousbox
3cba6d934b
resolving conflicts
2016-04-20 22:04:31 +00:00
Alys
823f51e727
revert npm 3 to npm 2 for vagrant installs; adjust instructions so novice users don't try to run commands before doing 'vagrant ssh'
2016-04-20 09:25:05 +10:00
Sabe Jones
cdf4a384d6
fix(sprites): add Bee mount icon
2016-04-19 21:07:03 +00:00
Keith Holliday
9e3d8ba4ac
Separated out buy functions into buyGear, buyArmoire, and buyPotion ( #7065 )
2016-04-19 16:50:04 +02: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
Matteo Pagliazzi
2dd633a471
better organize common/index
2016-04-19 12:11:10 +02:00
Matteo Pagliazzi
ad77922cf0
Merge branch 'piousbox-shared-code-random-drop2' into api-v3
2016-04-19 12:07:31 +02:00
Matteo Pagliazzi
7aa6587f2f
Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2
2016-04-19 12:07:18 +02:00
lucubro
ea9900d27f
Fix installation of test dependencies in vagrant provisioning ( #7069 )
...
* Fix #7054 installation test dependencies in vagrant provisioning
* Fix small typo in output during vagrant provisioning
2016-04-19 17:28:17 +10:00
Alys
5d040ac442
change habitrpg.com to habitica.com in new profile edit message
2016-04-19 10:39:04 +10: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
Sabe Jones
62f44771af
fix(stable): rename Bumblebees throughout code
2016-04-18 21:02:24 +00:00
Matteo Pagliazzi
277248b8b7
switch to standard response format in v3
2016-04-18 21:56:58 +02:00
Matteo Pagliazzi
318abfeefa
v2: fix debug menu in production
2016-04-17 12:54:27 +02:00
Matteo Pagliazzi
2c87a0bf34
v2: fix casting
2016-04-17 12:50:48 +02:00
Matteo Pagliazzi
2eca9fce32
v3: fix linting
2016-04-17 01:24:46 +02:00
Matteo Pagliazzi
b271520c53
v3: general cleanup
2016-04-17 01:17:22 +02:00
Matteo Pagliazzi
dea693f799
v3: start to fix unlocking
2016-04-16 20:51:16 +02:00
Matteo Pagliazzi
c2b8cad886
v3: fix v3 proxied ops in v2, logout
2016-04-16 19:56:33 +02:00
Victor Pudeyev
715bb5e047
shared-code-statsComputed ( #7067 )
...
* shared-code-statsComputed
* \$w is in common/script/index.js
2016-04-16 19:24:13 +02:00
Sabe Jones
ee6092d7d2
refactor(payments): PayPal setup linting pass
2016-04-15 21:31:40 +00:00
Sabe Jones
881cf0292d
chore(news): mobile and Beguilement Bailey
2016-04-15 18:46:02 +00:00
Sabe Jones
36740e7dc8
Merge pull request #7087 from piousbox/v3-payments-3
...
bringing v3-payments up to date with api-v3 branch
2016-04-15 12:10:42 -05:00
Victor Piousbox
ab156c0e4d
resolving conflicts
2016-04-15 16:55:37 +00:00
Sabe Jones
c608ac9ecc
fix(news): Erratum
2016-04-15 11:53:58 -05:00
Victor Piousbox
4a45fc1c37
working on amazon payment promisification
2016-04-15 16:46:50 +00:00
Victor Piousbox
2bb36b5e04
things are broken with nconf
2016-04-15 16:46:50 +00:00
Victor Piousbox
d27bbbe994
some locales work
2016-04-15 16:46:50 +00:00
Victor Piousbox
261a5a66b1
working on promisifying amazonPayments
2016-04-15 16:46:50 +00:00
Matteo Pagliazzi
1d5d6e9146
move payments to /top-level
2016-04-15 16:45:03 +00:00
Ubuntu
c850ccf463
refactor(payments): Stripe linting pass
2016-04-15 16:45:03 +00:00
Ubuntu
d49115eff6
refactor(payments): IAP linting pass
2016-04-15 16:45:03 +00:00
Ubuntu
a06f9954dd
refactor(payments): index.js lint pass
2016-04-15 16:45:03 +00:00
Ubuntu
8870cef0e2
WIP(payments): lint Amazon Payments file
2016-04-15 16:45:03 +00:00
Blade Barringer
887aa478ec
chore: merge in develop
2016-04-15 10:11:54 -05:00
Blade Barringer
227797a393
Merge pull request #7079 from crookedneighbor/eslint-config
...
chore: Switch to custom eslint-config
2016-04-15 09:15:39 -05:00
Blade Barringer
10936d9a4d
chore: Switch to custom eslint-config
2016-04-15 09:03:59 -05:00
Blade Barringer
e27bdfef6a
Merge pull request #7085 from crookedneighbor/lint_for_new_config
...
chore(lint): lint files in preparation for eslint v2
2016-04-15 09:00:44 -05:00
Blade Barringer
33c0cdd569
chore(lint): lint files in preparation for eslint v2
2016-04-15 08:37:05 -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
Sabe Jones
cb08003007
Merge pull request #7080 from piousbox/v3-payments-2
...
V3 payments - promisifying amazon
2016-04-14 17:57:26 -05:00
Victor Piousbox
74fc45524b
working on promisifying amazonPayments
2016-04-14 22:49:24 +00:00
Matteo Pagliazzi
11b5c1b405
v3: several fixes to class system, move /logout outside of api
2016-04-14 20:05:30 +02:00
Victor Piousbox
948d667a67
Merge branch 'sabrecat/v3-payments' of https://github.com/HabitRPG/habitrpg into v3-payments
2016-04-14 17:38:31 +00:00
Victor Piousbox
14d3abdd90
moved payments/ to controllers/top-level/
2016-04-14 16:20:15 +00:00
Ubuntu
7f89f8b936
refactor(payments): Stripe linting pass
2016-04-14 16:20:15 +00:00
Ubuntu
f4be29952b
refactor(payments): IAP linting pass
2016-04-14 16:20:15 +00:00
Ubuntu
fc46bdf184
refactor(payments): index.js lint pass
2016-04-14 16:20:15 +00:00
Ubuntu
a13f25e07c
WIP(payments): lint Amazon Payments file
2016-04-14 16:20:15 +00:00
Matteo Pagliazzi
c9e3e0e68c
move payments to /top-level
2016-04-14 18:18:57 +02:00
Ubuntu
da84f631e9
refactor(payments): Stripe linting pass
2016-04-14 18:17:51 +02:00
Ubuntu
71e0792da8
refactor(payments): IAP linting pass
2016-04-14 18:17:51 +02:00
Ubuntu
c5549787b4
refactor(payments): index.js lint pass
2016-04-14 18:17:51 +02:00
Ubuntu
626d8d6e73
WIP(payments): lint Amazon Payments file
2016-04-14 18:17:51 +02:00
Matteo Pagliazzi
7562a589c5
apidoc: update urls and add notice about private api
2016-04-14 16:02:28 +02:00
Matteo Pagliazzi
4c4a7ce3ce
do not run cron when user is not available
2016-04-14 13:51:01 +02:00
Matteo Pagliazzi
6ba41f3099
remove console statement
2016-04-14 13:31:35 +02:00
Matteo Pagliazzi
bc9f2b81e7
refactor getUserLanguage, automatically apply getUserLanguage and cron middlewares where needed
2016-04-14 13:30:58 +02:00
Matteo Pagliazzi
a590a66c47
support top level controllers
2016-04-14 11:54:47 +02:00
Blade Barringer
e70add1ac4
chore: lint files
2016-04-13 20:11:07 -05: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
Matteo Pagliazzi
54aac99a6a
v2: make tests working with new tavern id
2016-04-13 22:28:29 +02:00
Matteo Pagliazzi
57497f246f
make tests working with new tavern id
2016-04-13 22:27:32 +02:00
Matteo Pagliazzi
cc024533aa
FIXME -> TODO to make searching easier
2016-04-13 21:55:31 +02:00
Matteo Pagliazzi
99e201fc07
v3: move tavern to valid UUID and set Leslie as the leader
2016-04-13 21:52:53 +02:00
Matteo Pagliazzi
2458f92e1b
fix linting and correctly save collect quests progress
2016-04-13 20:03:26 +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
Matteo Pagliazzi
471657c013
fix tests that relied on different logger
2016-04-13 18:43:15 +02:00
Matteo Pagliazzi
8817f795b1
v3: expose public interface for logger and add tests
2016-04-13 18:18:00 +02: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
28d8c370c3
v3 adapt v2: remove references to sanitizeCreate and fix tests
2016-04-12 23:53:55 +02:00
Matteo Pagliazzi
793ce38f6b
v3: review some more files, add logging for unhandled promises
2016-04-12 20:14:36 +02:00
Matteo Pagliazzi
6458796a36
v3: first review of common code and task models
2016-04-12 19:30:39 +02:00
Matteo Pagliazzi
004b032084
adapt reset to v2 and remove deleted files from gulpfile
2016-04-12 18:50:02 +02:00
Matteo Pagliazzi
c64ba3e8d7
Merge pull request #7043 from TheHollidayInn/api-v3-ops-reset
...
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 18:46:53 +02:00
Matteo Pagliazzi
7de93cdd12
apidoc: change url to testing heroku app
2016-04-12 18:43:20 +02:00
Keith Holliday
3970064fe5
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 11:19:36 -05:00
Angel Piscola
59749acf50
Fixed reward sound playing after gold subtracted
...
(cherry picked from commit 2508b5ac18 )
closes #7058
fixes #6963
2016-04-12 07:36:44 -05:00
Matteo Pagliazzi
40c9366a47
v3 adapt v2: misc fixes
2016-04-12 12:59:30 +02:00
Matteo Pagliazzi
fa32dabc92
Merge pull request #7064 from piousbox/shared-code-crit
...
shared-code-crit
2016-04-12 09:58:46 +02:00
Victor Pudeyev
2f1329254e
shared-code-tags-gold-silver ( #7056 )
2016-04-12 09:57:57 +02:00
Matteo Pagliazzi
a29dd1a1c7
fix(build) temporarily use habitrpg-shared from habitica.com in v3 client
2016-04-12 09:46:01 +02:00
Matteo Pagliazzi
1b699ea6d3
Merge pull request #7068 from crookedneighbor/api_doc_build
...
feat: build api doc after prod build
2016-04-12 00:46:33 +02:00
Blade Barringer
83850d7a0c
feat: build api doc after prod build
2016-04-11 17:34:44 -05:00
Victor Piousbox
2d69285080
shared-code-crit
2016-04-11 20:21:33 +00:00
Matteo Pagliazzi
26b718ba1f
fix(build) require babel-polyfill in production too
2016-04-11 20:03:44 +02:00
Matteo Pagliazzi
463ba81468
fix(build) only require/import the main common file
2016-04-11 19:46:48 +02:00
Matteo Pagliazzi
27a2b9002d
fix(gulp) make apidoc available in production
2016-04-11 19:05:15 +02:00
Matteo Pagliazzi
36594b668a
fix(apidoc): apidoc now builds correctly
2016-04-11 18:05:54 +02:00
Matteo Pagliazzi
020b7c5464
v3 adapt v2: fix tasks creation
2016-04-11 17:54:37 +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
2f715c4530
chore: Compile skill icon sprites
2016-04-11 07:59:53 -05:00
mathwhiz
5b110159a1
Add spell images
2016-04-11 07:59:39 -05:00
Matteo Pagliazzi
2f4f62f342
return filters only for api v2
2016-04-10 19:51:05 +02:00
Matteo Pagliazzi
01a2afc12f
v3 adapt v2: fix updating and deleting tags
2016-04-10 19:26:32 +02:00
Matteo Pagliazzi
ad3c8f0ad2
fix(lint): missing semicolon
2016-04-10 19:18:46 +02:00
Matteo Pagliazzi
8ea05c3c46
v3 adapt v2: fix a few bugs with batchUpdate and tasks
2016-04-10 19:09:53 +02:00
Matteo Pagliazzi
c6879aa5df
fix(v3): cleanup of shared code
2016-04-10 18:42:59 +02:00
Matteo Pagliazzi
9027a9a907
Merge pull request #7052 from TheHollidayInn/api-v3-ops-addPushDevice
...
Ported addPushDevice. Added unit tests. Added addPushDevice route.
2016-04-10 18:07:30 +02:00
Keith Holliday
42ef779b46
Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests
2016-04-10 09:47:14 -05:00
Matteo Pagliazzi
7a24bceac9
Merge pull request #7051 from piousbox/shared-code-percent
...
shared-code-percent
2016-04-10 12:29:43 +02:00
Matteo Pagliazzi
9b7186a839
Merge pull request #7040 from piousbox/shared-code-private-messages
...
shared-code-private-messages
2016-04-10 12:27:00 +02:00
Victor Piousbox
3c784e869a
shared-code-percent
2016-04-09 21:13:16 +00:00
Victor Piousbox
1f4a0680ea
shared-code-private-messages
2016-04-09 16:56:03 +00:00
Matteo Pagliazzi
f4d2184f34
Merge pull request #7010 from HabitRPG/api-v3-adapt-v2
...
[API v3] Adapt v2
2016-04-09 17:42:44 +02:00
Matteo Pagliazzi
6f1dde4beb
v3 adapt v2: port challenge.update
2016-04-09 17:25:41 +02:00
Matteo Pagliazzi
aa8fb81b26
v3 adapt v2: port res.respond, challenge.getMember and challenge.csv
2016-04-09 17:16:00 +02:00
Matteo Pagliazzi
6b2d1a1416
v3 adapt v2: adapt common ops
2016-04-09 16:45:43 +02:00
Blade Barringer
80c115940e
fix: Correct southpole background
...
closes #7039
closes #7041
2016-04-09 09:31:18 -05:00
Blade Barringer
8ba150074a
chore(i18n): update locales
2016-04-09 09:27:04 -05:00
Blade Barringer
231cfc176a
Merge branch 'develop' into api-v3
2016-04-09 09:12:53 -05:00
Matteo Pagliazzi
910ea836ba
Merge branch 'api-v3' into api-v3-adapt-v2
2016-04-09 15:31:09 +02:00
Matteo Pagliazzi
06db7e6353
v3 adapt v2: port leave, join and unlink for challenges
2016-04-09 15:29:37 +02:00
Matteo Pagliazzi
81fa689a11
Merge pull request #7042 from TheHollidayInn/api-v3-ops-reroll
...
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-09 15:14:04 +02:00
Blade Barringer
db62d1add0
fix: correct coupon generation code
2016-04-09 08:03:32 -05:00
Blade Barringer
fd1f42af24
Merge pull request #7047 from HabitRPG/merge_in_develop
...
[v3] Merge in develop
2016-04-08 22:19:53 -05:00
Blade Barringer
1ab78f1c9a
refactor: Port v2 flag report change to v3
2016-04-08 21:49:16 -05:00
Blade Barringer
60f99a29ed
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-04-08 21:31:53 -05:00
Blade Barringer
8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
Blade Barringer
1bc1968f3a
chore: Upgrade winston dependency and remove unused modules
2016-04-08 17:35:03 -05:00
Blade Barringer
3a63896e40
chore: Upgrade dependencies to v3 versions
2016-04-08 17:35:03 -05:00
Blade Barringer
3250d9d064
chore: Remove unused qs dependency
2016-04-08 17:35:03 -05:00
Blade Barringer
46681d9a1a
chore: Update nodemailer to v1
2016-04-08 17:35:03 -05:00
Blade Barringer
e6b5a6820f
Merge pull request #7044 from HabitRPG/flag_email_refactor
...
refactor: Simplify flag_report_email load
2016-04-08 17:31:13 -05:00
Blade Barringer
2bbae8c5f5
refactor: Simplify flag_report_email load
2016-04-08 17:14:14 -05:00
Sabe Jones
b7d801a603
fix(news): typo
2016-04-08 16:17:51 -05:00
Keith Holliday
1685b7285f
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-08 15:56:11 -05:00
Ubuntu
7118e68cf0
chore(news): Beguilement Strike Bailey
2016-04-08 19:06:09 +00:00
Matteo Pagliazzi
83fa30fd0a
v3 adapt v2: port challenges closing and fix create
2016-04-08 18:45:50 +02:00
Matteo Pagliazzi
70fd869934
Merge branch 'api-v3' into api-v3-adapt-v2
2016-04-08 12:03:50 +02:00
Matteo Pagliazzi
276cbc58bb
v3: fix cron middleware, remove unused code from shared
2016-04-08 11:56:51 +02:00
Matteo Pagliazzi
116839ca81
Merge pull request #7018 from piousbox/shared-code-webhooks
...
Shared code webhooks
2016-04-08 11:04:57 +02:00
Victor Piousbox
9704c47293
Merge branch 'api-v3' into shared-code-webhooks
2016-04-07 21:23:38 +00:00
Victor Piousbox
4c0f9ed1c8
resolving conflicts
2016-04-07 21:23:16 +00:00
Matteo Pagliazzi
4d28eea6e2
Merge pull request #7037 from TheHollidayInn/api-v3-ops-rebirth
...
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
2016-04-07 23:18:15 +02:00
Keith Holliday
fec9ce3dbe
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
2016-04-07 15:02:55 -05:00
Matteo Pagliazzi
5a259e7a25
v3 adapt v2: port quests
2016-04-07 16:11:17 +02:00
Matteo Pagliazzi
2d3fbe9f13
v3 adapt v2: lint client only shared ops and enable members integration tests
2016-04-07 11:54:36 +02:00
Matteo Pagliazzi
d49847688e
v2 adapt to v3: port challenges create, get and list
2016-04-07 11:22:10 +02:00
Matteo Pagliazzi
12255181d8
Merge branch 'TheHollidayInn-api-v3-ops-revive' into api-v3
2016-04-06 23:24:27 +02:00
Matteo Pagliazzi
81d665513c
Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive
2016-04-06 23:24:14 +02:00
Matteo Pagliazzi
cc4ade2e6d
Merge pull request #7029 from TheHollidayInn/api-v3-ops-unlock
...
Ported unlock. Add unit tests. Create unlock route. Add integration tests
2016-04-06 23:08:17 +02:00
Keith Holliday
621bf9609e
Ported revive. Added unit tests. Add revive route. Added integration tests
2016-04-06 15:59:42 -05:00
Keith Holliday
2bd710a882
Ported unlock. Add unit tests. Create unlock route. Add integration tests
2016-04-06 15:53:32 -05:00
Matteo Pagliazzi
884493f165
fix(delete tags): correctly import Tasks module
2016-04-06 19:41:38 +02:00
Matteo Pagliazzi
b431b02012
v3 adapt v2: port tags, cast, cron, deletUser and removeMember. Fix a few bugs in v3
2016-04-06 19:28:43 +02:00
Matteo Pagliazzi
a72c6c782d
Merge pull request #7026 from TheHollidayInn/api-v3-ops-sell
...
Ported sell function. Add unit tests. Create sell route. Add integration tests
2016-04-06 18:42:06 +02:00
Keith Holliday
05b41bb41c
Ported sell function. Add unit tests. Create sell route. Add integration tests
2016-04-06 08:27:18 -05:00
Blade Barringer
7e9163a17f
chore: Remove apdex check from new relic monitoring
2016-04-05 20:08:44 -05:00
Blade Barringer
74dace9b5a
chore: Re-enable New Relic
...
closes #7011
2016-04-05 20:08:31 -05:00
Blade Barringer
ae14d405cb
fix(css): Scope textarea z-index to just task boxes
2016-04-05 20:07:11 -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
Blade Barringer
7425af4fb4
Merge pull request #7013 from Hus274/develop
...
Splitting party and boss damage notifications into two code blocks.
2016-04-05 09:01:36 -05:00
Blade Barringer
7d17921621
Merge pull request #7020 from MathWhiz/patch-2
...
fix: Allow task notes textarea to rest above other elements when expanded
2016-04-05 08:56:39 -05:00
Matteo Pagliazzi
08239345b5
v3 adapt v2: port leave, join and invite for groups controller
2016-04-05 13:03:20 +02:00
Matteo Pagliazzi
374d11b0e4
v3 adapt v2: port chat routes and group.update
2016-04-05 12:02:00 +02:00
MathWhiz
c7d058f2bc
Add z-index to notes textarea
2016-04-04 20:48:54 -05:00
Matteo Pagliazzi
0a40c56973
api v3 adapt v2: correctly import dependencies, port create, get, list groups
2016-04-04 23:18:49 +02:00
Victor Piousbox
14b0ec8b03
shared-code-webhooks
2016-04-04 16:31:48 +00:00
Matteo Pagliazzi
f6fc50f6c2
adapt v2: port updateUser
2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
10583b78de
fix challenge unit tests
2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
c3945de098
fix tasks updating and reminders tests
2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
f3abdaf692
adapt v2: port updateTask
2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
382e391fd0
port updateTask, addTask, clearCompleted, taskDefaults, uuid
2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
060e3b1045
adapt v2: fix linting
2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
cc65bb1ed7
adapt v2: getTask, getTasks, clearCompleted, addTask, deleteTask, getUser, getUserAnonymized, scoreTask (challenge part missing)
2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
58c20c2a64
v2 port: enable integration tests, port register route
2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
fc73fc7f8c
v3: start adapting v2
2016-04-04 17:16:57 +02:00
Matteo Pagliazzi
68ff26e6d6
v3: check that tasks are deleted when the user deletes the acocunt and misc fixes
2016-04-04 17:16:36 +02:00
Matteo Pagliazzi
1620614b3b
Merge branch 'TheHollidayInn-api-v3-ops-release-mounts' into api-v3
2016-04-04 11:49:17 +02:00
Matteo Pagliazzi
c86898c7e4
Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts
2016-04-04 11:49:06 +02:00
Matteo Pagliazzi
4083b1b045
Merge branch 'TheHollidayInn-api-v3-ops-release-both' into api-v3
2016-04-04 11:46:56 +02:00
Matteo Pagliazzi
66959c23f5
Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both
2016-04-04 11:46:46 +02:00
Matteo Pagliazzi
c755cb5d26
Merge pull request #7003 from TheHollidayInn/api-v3-ops-release-pets
...
Ported release pets, added unit tests, added route with integration t…
2016-04-03 22:19:25 +02:00
Keith Holliday
c916c74775
Ported release both, added unit tests, add release both route with integration tests
2016-04-03 14:44:00 -05:00
Keith Holliday
487a26ec43
Ported release pets, added unit tests, added route with integration tests
2016-04-03 14:37:20 -05:00
Keith Holliday
24b7b4c838
Ported release mounts, add unit tests, added release mounts route with integration tests
2016-04-03 14:34:43 -05:00
Husman
bb373ed93a
Splitting party and boss damage notifications into two code blocks.
...
Splitting the party and boss damage notifications into two code blocks will allow the page to push them to newlines if needed instead of added a scroll bar and making the user scroll to see the entire message.
Related issue: https://github.com/HabitRPG/habitrpg/issues/3453
2016-04-03 10:42:15 -07:00
Victor Piousbox
3844bafae5
shared-code-random-drop
2016-04-03 16:22:21 +00:00
Matteo Pagliazzi
d133fc08f2
Merge pull request #7004 from HabitRPG/api-v3-coupons
...
[Api v3] Coupons
2016-04-02 19:44:06 +02:00
Matteo Pagliazzi
de74fae0b4
v3: port coupons
2016-04-02 16:37:55 +02:00
Matteo Pagliazzi
731ac86244
port changes to cron develop
2016-04-02 12:15:24 +02:00
Matteo Pagliazzi
e95837f69f
Merge branch 'develop' into api-v3
2016-04-02 11:34:04 +02:00
Alys
0ba47de43d
adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases)
...
* start to fix cron for when timezones change
* add some incomplete code
* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later
* change timezone offset variable names
* improve handling of each individual timezone change possibility
* remove unnecessary casting to number
* remove duplicated code
* finish code for dangerous timezone change
* fix linting errors
* remove console.log lines and other testing code
* add a TODO comment for further actions for timezone changes in the "safe" direction
2016-04-02 11:42:15 +10:00
Matteo Pagliazzi
3b98fe377f
Merge pull request #6999 from piousbox/shared-code-update-stats
...
Shared code update stats
2016-04-01 23:16:35 +02:00
Victor Piousbox
7f3feedd12
shared-code-update-stats
2016-04-01 20:50:28 +00:00
Matteo Pagliazzi
843dd09d35
Merge pull request #6986 from HabitRPG/api-v3-one-app
...
[Api v3] Consolidate server code and share middlewares where possible
2016-04-01 19:30:52 +02:00
Matteo Pagliazzi
6cbbdcdcbe
v3: port static pages, make routes lib more flexible, share middlewares between v2 and v3, port v1, simplify server.js
2016-04-01 19:07:03 +02:00
Matteo Pagliazzi
238dee7608
Merge pull request #6962 from piousbox/shared-code-user-score-task
...
shared-code-user-score-task
2016-04-01 18:28:55 +02:00
Victor Piousbox
e6e2c26a12
shared-code-user-score-task
2016-04-01 16:11:37 +00:00
Matteo Pagliazzi
e54bd0f364
Merge branch 'TheHollidayInn-api-v3-open-mystery-item3' into api-v3
2016-04-01 16:40:08 +02:00
Matteo Pagliazzi
aae94bf1b4
Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3
2016-04-01 16:39:52 +02:00
Matteo Pagliazzi
ad0f1ee0f4
Merge branch 'TheHollidayInn-api-v3-ops-read-card' into api-v3
2016-04-01 16:30:59 +02:00
Matteo Pagliazzi
82afc1971d
Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card
2016-04-01 16:30:48 +02:00
Matteo Pagliazzi
4b77dd171d
Merge branch 'TheHollidayInn-api-v3-hourglass-purchase2' into api-v3
2016-04-01 16:28:30 +02:00
Matteo Pagliazzi
7e093f1622
Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2
2016-04-01 16:28:20 +02:00
Matteo Pagliazzi
519b3a1e4f
Merge pull request #6988 from TheHollidayInn/api-v3-ops-purchase
...
Ported purchase, add unit tests, created new user purchase route, and added tests
2016-04-01 16:20:33 +02:00
Keith Holliday
6d9617e345
Ported read card, added unit tests, added read card route and integration tests
2016-04-01 09:17:40 -05:00
Keith Holliday
3fe88fd8d0
Ported open mystery item, added unit tests, added route, and integration tests
2016-04-01 08:23:40 -05:00
Keith Holliday
ad0bc58028
Ported purchase, add unit tests, created new user purchase route, and added tests
2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166
Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests
2016-04-01 08:11:26 -05:00
Matteo Pagliazzi
c5f17b4011
Merge branch 'develop' into api-v3
2016-04-01 11:50:41 +02:00
Sabe Jones
41b3ee1df0
fix(world-boss): Correct generic Tavern text
2016-03-31 23:45:34 -05:00
Sabe Jones
a90562e3ad
Merge pull request #6992 from HabitRPG/sabrecat/spring-boss
...
Spring Fling 2016 World Boss
2016-03-31 21:51:10 -05:00
Sabe Jones
3281894d83
chore(news): World Boss Bailey
2016-03-31 19:54:13 -04:00
Sabe Jones
7aa668be4e
chore(gulp): compile sprites
2016-03-31 18:41:10 -05:00
Sabe Jones
a07aed331c
fix(world-boss): add chat message, Bailey handling, animation
2016-03-31 19:38:43 -04:00
Sabe Jones
def6b6cd5c
chore(gulp): compile sprites
2016-03-31 17:20:30 -05: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
Matteo Pagliazzi
7e9520b920
fix(test): make sure error is catched using done() callback
2016-03-30 23:32:12 +02:00
Matteo Pagliazzi
d0383766e3
Merge pull request #6985 from HabitRPG/api-v3-update-user
...
[Api v3] update user
2016-03-30 23:16:28 +02:00
Sabe Jones
4fa8c6dfbd
chore(news): Bailey 2016-03-30
2016-03-30 15:39:12 -04:00
Sabe Jones
95fa91522a
Merge pull request #6955 from HabitRPG/wheelchair
...
Wheelchair
2016-03-30 14:25:12 -05:00
Matteo Pagliazzi
bf93275693
v3: port updateUser
2016-03-30 16:18:22 +02:00
Blade Barringer
5c34f7586d
Merge pull request #6984 from lbraun/develop
...
Remove extra 'it' from spec description
2016-03-29 23:29:12 -04:00
Lucas Braun
ee9dc7c196
Remove extra 'it' from spec description
2016-03-29 22:11:36 -04:00
Alys
9a1e7a0ad7
Merge pull request #6981 from Alys/develop
...
cron timezone fix (stage 1): cron records current timezone in preferences.timezoneOffsetAtLastCron
2016-03-29 23:05:50 +10:00
Alys
ae9e6fbe30
allow cron to record user's current timezone offset in preferences.timezoneOffsetAtLastCron (initial stage of cron timezone fix for https://github.com/HabitRPG/habitrpg/issues/3806 )
2016-03-29 22:34:23 +10:00
Blade Barringer
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
Blade Barringer
02a60d90d8
Merge branch 'develop' into api-v3
2016-03-28 16:02:04 -05:00
Blade Barringer
f4b43f55f0
refactor: Remove express-csv dependency
2016-03-28 10:24:29 -05:00
Blade Barringer
cb5a79b1bf
chore: Set express session options
2016-03-28 10:24:01 -05:00
Blade Barringer
b1c3b8e7e7
chore: Update res.json(code, json) to res.status(code).json(json)
2016-03-28 10:24:00 -05:00
Blade Barringer
cf8153fd93
chore: Update res.send(code) to res.sendStatus(code)
2016-03-28 10:24:00 -05:00
Blade Barringer
2477507b2e
chore: Set extended option for bodyParser
...
See
3f1b022477/lib/types/urlencoded.js (L41-L44)
2016-03-28 10:24:00 -05:00
Blade Barringer
41b961004a
chore: upgrade express to version 4
2016-03-28 10:24:00 -05:00
Blade Barringer
6552f04b0c
chore(i18n): update locales
2016-03-28 09:58:32 -05:00
Matteo Pagliazzi
1112d93b15
Merge pull request #6907 from HabitRPG/sabrecat/server-party-cheevos
...
[v3] Add Party Up / Party On achievements to server in V3
2016-03-27 20:53:15 +02:00
Sabe Jones
861a32f72a
feat(achievements): move party cheevos to server
2016-03-27 14:51:39 -04:00
Matteo Pagliazzi
c4bbfcf2f3
Merge pull request #6968 from HabitRPG/api-v3-buy-list
...
v3: port getBuyList and shared.updateStore
2016-03-26 16:39:52 +01:00
Matteo Pagliazzi
228ce7ca0d
Merge pull request #6960 from HabitRPG/api-v3-content
...
Api v3 Get Content
2016-03-26 16:38:47 +01:00
Matteo Pagliazzi
67d49bc9fc
v3: port getContent route caching responses to disk
2016-03-26 16:29:22 +01:00
Matteo Pagliazzi
3002c9b7fd
v3: port getBuyList and shared.updateStore
2016-03-26 16:25:15 +01:00
Matteo Pagliazzi
93b80352c4
Merge branch 'piousbox-api-v3-get-user-anonymized' into api-v3
2016-03-25 16:05:01 +01:00
Matteo Pagliazzi
5ee33b08b9
Merge branch 'api-v3-get-user-anonymized' of https://github.com/piousbox/habitrpg into piousbox-api-v3-get-user-anonymized
2016-03-25 16:04:48 +01:00
Matteo Pagliazzi
d89d1e50dd
Merge branch 'develop' into api-v3
2016-03-25 15:58:04 +01:00
Matteo Pagliazzi
53b2743d94
Merge branch 'TheHollidayInn-api-v3-send-private-message' into api-v3
2016-03-25 15:56:37 +01:00
Matteo Pagliazzi
15e8f881fe
Merge branch 'api-v3-send-private-message' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-send-private-message
2016-03-25 15:56:28 +01:00
Matteo Pagliazzi
55b0642523
Merge pull request #6934 from TheHollidayInn/api-v3-user-delete
...
[v3] Ported user delete route and added initial tests
2016-03-25 15:51:54 +01:00
Keith Holliday
d7b6e0b760
Ported refPush and added tests
2016-03-25 08:33:55 -05:00
Keith Holliday
19a63e8128
Ported sendGift route and renamed it to transferGems. Refactored user.sendMessage logic.
2016-03-25 08:33:54 -05:00
Keith Holliday
95ea73d440
Fixed route namespace and added translation strings
2016-03-25 08:33:54 -05:00
Keith Holliday
e9a9079c46
Ported sendPrivateMessage route and added initial tests
2016-03-25 08:33:54 -05:00
Keith Holliday
075b31c075
Added password requirement
2016-03-25 08:32:49 -05:00
Keith Holliday
7f65707ee4
Ported user delete route and added initial tests
2016-03-25 08:32:49 -05:00
Matteo Pagliazzi
be9312deb0
Merge branch 'api-v3-equip-feed-hatch2' into api-v3
2016-03-25 12:23:12 +01:00
Matteo Pagliazzi
192409a0b5
Merge branch 'api-v3' into api-v3-equip-feed-hatch2
2016-03-25 12:22:55 +01:00
Blade Barringer
cd6adf2421
fix: correct wheelchair spelling
2016-03-24 21:31:20 -05:00
Victor Piousbox
5aacd978c6
api-v3-get-user-anonymized
2016-03-24 18:23:43 +00:00
Matteo Pagliazzi
9452fd3128
Merge pull request #6945 from piousbox/api-v3-test-attach-local-to-social-auth
...
[v3] working on attaching local to social auth
2016-03-24 19:18:04 +01:00
Matteo Pagliazzi
0f1add62cf
Merge pull request #6956 from HabitRPG/api-v3-shared-ops
...
[Api v3] Port changeClass and disableClasses
2016-03-24 19:17:48 +01:00
Matteo Pagliazzi
0a65e6a6f1
v3: port hatch, equip and feed ops
2016-03-24 18:59:09 +01:00
Victor Piousbox
528d805cda
api-v3-test-attach-local-to-social-auth
2016-03-24 17:51:31 +00:00
Sabe Jones
2652de88ae
Merge pull request #6940 from HabitRPG/sabrecat/mystery-201603
...
Subscriber items 2016-03
2016-03-24 12:33:06 -05:00
Matteo Pagliazzi
159b9eaa8d
port disable classes and change class ops
2016-03-24 14:25:30 +01:00
Blade Barringer
2d55a2a31d
chore: compile sprites
2016-03-24 07:57:57 -05:00
Blade Barringer
c88f2ce580
refactor: Use resized version of wheelchair for selection
2016-03-24 07:57:57 -05:00
Blade Barringer
f33469609c
Adjust sprite task to not include wheelchair images in the customize-option handling
2016-03-24 07:57:50 -05:00
Nick Bunn
0f9cf57613
feat: Add wheelchair to avatar customization
2016-03-24 07:57:13 -05:00
Blade Barringer
01a7132b0b
refactor: Extract play reward sound logic into function
2016-03-23 17:55:44 -05:00
Kenny Carlsen
7b708f51ba
Proposed bug fix, issue #6668 - erroneous reward purchase sound
2016-03-23 17:55:41 -05:00
Sabe Jones
17b02f2867
fix(news): missing promo
2016-03-23 15:47:22 -04:00
Sabe Jones
ba1cc67654
chore(news): fill out remaining Bailey
2016-03-23 15:36:24 -04:00
Sabe Jones
be159adf77
fix(event): pastel skin, not hair
2016-03-23 15:36:24 -04:00
Sabe Jones
1286b6fbee
fix(event): make spring hair/skin available server side
2016-03-23 15:36:24 -04:00
Sabe Jones
f7027b5cf3
feat(event): subscriber items 2016-03
2016-03-23 15:36:24 -04:00
Blade Barringer
2a4a8466ca
Merge pull request #6948 from MathWhiz/patch-1
...
Fix ISSUE_TEMPLATE.md
2016-03-23 11:48:13 -05:00
MathWhiz
802b8bed0a
Fix ISSUE_TEMPLATE.md
...
Added parentheses around two of the comments to hide them.
2016-03-23 09:11:08 -05:00
Blade Barringer
a958fefa6b
Merge pull request #6946 from HabitRPG/update_pageres
...
Update pageres
2016-03-23 08:36:52 -05:00
Blade Barringer
ef2a1f5929
chore: Update pageres
...
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
2016-03-23 08:16:39 -05:00
Blade Barringer
fd10422e0c
tests: Add preliminary tests around send message and send gift
2016-03-22 21:49:27 -05:00
Blade Barringer
f5d4eba292
fix: Default message to '' when not passed in sendGift route
2016-03-22 21:49:27 -05:00
Brian Murray
eaea55687b
Make change regarding pluralization of gem gift message easier to read and not one long line
2016-03-22 21:49:27 -05:00
Brian Murray
369386e370
Only add an 's' to months of subscription or gems given if they are not 1.
2016-03-22 21:49:22 -05:00
Blade Barringer
9b9722a7b4
chore(i18n): update locales
2016-03-22 17:40:42 -05:00
Bleu
521195ab95
fix: Unify html in translation strings
...
Closes #6859
2016-03-22 17:34:29 -05:00
Matteo Pagliazzi
23f92e2d28
Merge pull request #6923 from TheHollidayInn/api-v3-groups-reject-invite
...
[v3] Added group reject invite route and initial tests
2016-03-22 22:46:12 +01:00
Keith Holliday
da08b6c814
Removed group query from route
2016-03-22 16:10:17 -05:00
MathWhiz
86516b5e20
Update presskit
2016-03-22 08:41:02 -05:00
Blade Barringer
92ac703ecc
chore(i18n): update locales
2016-03-22 08:31:14 -05:00
Blade Barringer
3add287a85
Merge branch 'khipkin-fix_class_change_gear_modal' into develop
2016-03-22 08:10:55 -05:00
MathWhiz
c70b40e0a3
Add pull request instructions to CONTRIBUTING.MD
2016-03-22 07:59:13 -05:00
Blade Barringer
bbcef441bf
Adjust template instructions
2016-03-22 07:59:13 -05:00
mathwhiz
a5b7066358
Add templates for issues and pull requests
2016-03-22 07:59:06 -05:00
Matteo Pagliazzi
0bde9e2df2
Merge branch 'develop' into api-v3
2016-03-21 23:03:28 +01:00
Matteo Pagliazzi
d8dab49b79
Merge pull request #6898 from HabitRPG/api-v3-buy-ops
...
[v3] Port several shared ops and their linked fns
2016-03-21 23:00:43 +01:00
Matteo Pagliazzi
85a05e0a99
Merge pull request #6938 from piousbox/api-v3-test-local-login-2
...
local login test
2016-03-21 22:50:37 +01:00
Matteo Pagliazzi
f04d8d4d97
do not remove ops/fns from common/script/index.js until they have been ported everywhere
2016-03-21 22:50:18 +01:00
Victor Piousbox
a03f34362c
resolving conflicts
2016-03-21 21:28:07 +00:00
Victor Piousbox
b555930e9e
invalid login credentials fixes
2016-03-21 21:27:11 +00:00
Victor Piousbox
5426d63a36
local login test
2016-03-21 21:26:04 +00:00
Matteo Pagliazzi
d6fa16f86c
skip tests that cannot be stubbed correctly
2016-03-21 22:22:26 +01:00
Victor Piousbox
ddbb8a1beb
invalid login credentials fixes
2016-03-21 21:10:17 +00:00
Keith Holliday
a8e4455124
Added group reject invite route and initial tests
2016-03-21 15:42:38 -05:00
Matteo Pagliazzi
1d3c67af40
Merge pull request #6937 from piousbox/api-v3-delete-social-auth-test
...
Api v3 delete social auth test
2016-03-21 21:28:59 +01:00
Victor Piousbox
fa079bd764
added those awaits for DELETE social user testing
2016-03-21 18:35:00 +00:00
Victor Piousbox
5f5fc754b0
local login test
2016-03-21 05:48:37 +00:00
Victor Piousbox
363e23b5e0
Merge branch 'api-v3-delete-social-auth-test' of github.com:piousbox/habitrpg into api-v3-delete-social-auth-test
2016-03-21 04:53:40 +00:00
Victor Piousbox
ebcf913676
strengthen the test of password-reset just a little
2016-03-21 04:49:29 +00:00
Matteo Pagliazzi
0b5506b16b
Merge pull request #6908 from piousbox/api-v3-password-reset
...
api-v3 password reset
2016-03-20 22:32:32 +01:00
Matteo Pagliazzi
bd3c162b97
port allocateNow and autoAllocate
2016-03-20 20:21:15 +01:00
Victor Piousbox
f73141f1f6
strengthen the test of password-reset just a little
2016-03-20 19:00:23 +00:00
Matteo Pagliazzi
480194f53c
add routes for buy ops and integration tests
2016-03-20 17:41:17 +01:00
Matteo Pagliazzi
fea2e0d8c0
correctly stub methods and test errors
2016-03-20 16:06:31 +01:00
Matteo Pagliazzi
657f19af0d
add tests for shared.ops.buySpecialSpell and partially fix shared.ops.buy
2016-03-20 13:46:56 +01:00
Matteo Pagliazzi
2560096466
port buyQuest tests
2016-03-20 13:33:34 +01:00
Matteo Pagliazzi
ad8834f4ed
port tests for shared.ops.buyMysterySet.js
2016-03-20 13:12:06 +01:00
Matteo Pagliazzi
71f304786c
add pickDeep utility function to pick nested properties from objects
2016-03-20 13:07:14 +01:00
Victor Piousbox
ebbca3276e
revert email.send()
2016-03-20 03:29:12 +00:00
Victor Piousbox
99cb8a07f7
reset password route
2016-03-20 02:54:52 +00:00
Victor Piousbox
6d972ea9af
resolving conflicts
2016-03-20 02:53:58 +00:00
Victor Piousbox
3784f68dd8
mock for emailer for resetPassword route
2016-03-20 02:32:55 +00:00
Victor Piousbox
d2c1c2cec6
cleanup and moving text strings to a locale object
2016-03-19 17:37:08 +00:00
Victor Piousbox
e9a355a60b
tests pass
2016-03-19 10:13:44 -07:00
Matteo Pagliazzi
957e1d26d6
add tests for fns/ultimateGear, fns/handleTwoHanded, fns/randomVal, fns/predictableRandom and partial tests for ops/buy
2016-03-19 18:05:02 +01:00
Matteo Pagliazzi
ff72706cae
wip(shared): port buy ops and linked fns
2016-03-19 16:04:27 +01:00
Matteo Pagliazzi
e68ebee980
temporarily skip challenge task deletion test
2016-03-19 13:10:40 +01:00
Matteo Pagliazzi
0a906da50c
Merge pull request #6918 from TheHollidayInn/api-v3-challenge-task-score-tests
...
Added tests for challenge task scoring and moved scoring code to model
2016-03-19 12:08:37 +01:00
Kaitlin Hipkin
9f0704aa94
modal explaining new class gear is now class-agnostic
2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
Blade Barringer
e124b1a00b
Merge pull request #6894 from TheHollidayInn/api-v3-development-controller
...
Added development controller, middleware, and initial tests
2016-03-18 16:06:10 -05:00
Sabe Jones
b5f91a657f
feat(event): Spring Fling complete
2016-03-18 16:56:16 -04:00
Keith Holliday
a3d7edd0c1
Renamed namespace to debug and added unit test for middleware
2016-03-18 14:05:14 -05:00
Keith Holliday
b46219adc5
Added tests for challenge task scoring and moved scoring code to model
2016-03-18 14:00:14 -05:00
Blade Barringer
99ff440abc
Merge pull request #6896 from crookedneighbor/v3_update_user_routes
...
[V3] WIP - User update routes
2016-03-18 08:54:22 -05:00
Blade Barringer
75ed4080dc
tests: Clean up styling of auth update tests
2016-03-18 08:42:03 -05:00
Blade Barringer
f6f5b1a118
tests: Remove dependency on mongoose User model in auth tests
2016-03-18 07:57:42 -05:00
Blade Barringer
2ef176c6f2
refactor: Move auth route tests to auth folder
2016-03-18 07:55:19 -05:00
Blade Barringer
cd6ab23106
Merge pull request #6900 from doyler/develop
...
Note about weekly progress update (fixes #6884 )
2016-03-18 07:37:32 -05:00
Blade Barringer
4cb652dca4
Merge pull request #6889 from crookedneighbor/add_debug_scripts
...
feat: Add debug scripts to easilly get all pets/mounts/gear
2016-03-18 07:36:27 -05:00
Blade Barringer
5c3c8ebb74
refactor: Move auth update routes from user to auth controller
2016-03-18 07:35:29 -05:00
Blade Barringer
d1af7adff6
refactor: Update user update routes to be under auth namespace
2016-03-18 07:35:14 -05:00
Blade Barringer
22d25f8be3
fix: Change update user routes to use PUT instead of POST
2016-03-18 07:35:14 -05:00
Blade Barringer
22c83c92c2
Merge pull request #6904 from HabitRPG/inventory_sorting_debug
...
Inventory sorting debug
2016-03-18 07:33:45 -05:00
Matteo Pagliazzi
6d14b9d5c5
move preening tests to correct location
2016-03-18 02:59:17 +01:00
Alys
fb338a00cb
prevent quests being started in guilds
2016-03-18 08:38:32 +10:00
Blade Barringer
de2f9eb28b
Update tests to us set by default
2016-03-17 17:28:46 -05:00
Victor Piousbox
4655e5061a
api-v3 password reset
2016-03-17 14:47:22 -07:00
Sabe Jones
ccdbdb2969
fix(seasonal-shop): choose quest more precisely
2016-03-17 13:13:21 -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
Sabe Jones
816ef00378
Merge pull request #6890 from khipkin/new_party_badges
...
add tests for awarding party {up,on} achievs
2016-03-17 11:05:20 -05:00
Blade Barringer
e056a62af0
refactor: Setup middleware for all development routes
2016-03-17 09:24:29 -05:00
Blade Barringer
6921c1694a
feat: Allow routes to not need an async handler
2016-03-17 09:24:29 -05:00
Keith Holliday
6184fb5d24
Added development controller, middleware, and initial tests
2016-03-17 09:24:29 -05:00
Matteo Pagliazzi
7c005e7c68
fix typo in tests and increase sleep time
2016-03-17 15:20:41 +01: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
Christopher Giroir
cfae524579
Updating button text to GET instead of VIEW
2016-03-16 23:23:36 -07:00
Sabe Jones
b4b0d7e89c
chore(news): mobile updates Bailey
2016-03-17 00:09:42 -04:00
Kaitlin Hipkin
0ca949b1bb
pull initialization of controller into helper method and stub state
2016-03-16 23:50:16 -04:00
Blade Barringer
3f16cd4fbf
refactor: Adjust stat allocation modal
2016-03-16 22:07:00 -05:00
Josh Holland
a639038a41
Move stat allocation to a mixin to avoid code duplication
2016-03-16 22:07:00 -05:00
Josh Holland
952d9ec929
Quick allocation of attribute points from level-up modal
...
Resolves #6720 .
2016-03-16 22:06:54 -05:00
Kaitlin Hipkin
469ece70c3
clean up party {up,on} tests, add calls to $controller after setup
2016-03-16 22:32:24 -04:00
Blade Barringer
a150dbc9ca
chore(i18n): update locales
2016-03-16 20:32:15 -05:00
Kaitlin Hipkin
a0f65f8b25
emojis now properly displayed in challenge won modal
2016-03-16 20:12:52 -05:00
Kaitlin Hipkin
ae92a98037
challenge title on challenge winner's profile supports markdown w/o emojis
2016-03-16 20:12:49 -05:00
doyler
51f3008a20
Note about weekly progress update ( fixes #6884 )
2016-03-16 22:11:01 +01:00
Kaitlin Hipkin
ee09bee1e2
use sandbox.stub instead of sandbox.spy
2016-03-16 00:55:20 -04:00
Blade Barringer
be0bcad24b
chore(i18n): update locales
2016-03-15 19:51:47 -05:00
Blade Barringer
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -05:00
Blade Barringer
146810a3e9
feat: Add set property to content
2016-03-15 19:41:19 -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
Kaitlin Hipkin
68c3c2973b
cannot spy on an undefined function
2016-03-15 19:49:33 -04:00
Kaitlin Hipkin
c0e636dba0
fix spy?
2016-03-15 18:36:36 -04:00
Kaitlin Hipkin
979acded92
Merge branch 'develop' into new_party_badges
2016-03-15 16:17:25 -04:00
Kaitlin Hipkin
93c5cc0385
add tests for awarding party {up,on} achievs
2016-03-15 16:03:36 -04:00
Sabe Jones
a9e0a4dfaf
chore(news): announce badges and Spring Plot
2016-03-15 15:42:15 -04:00
Sabe Jones
beb86ea4bd
Merge branch 'khipkin/party-badges' into develop
...
Conflicts:
common/dist/sprites/spritesmith-main-10.png
common/dist/sprites/spritesmith-main-11.png
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.png
2016-03-15 14:57:38 -04:00
Matteo Pagliazzi
3db06c6537
Merge branch 'develop' into api-v3
2016-03-15 19:23:23 +01:00
Matteo Pagliazzi
9a337ad15f
Merge pull request #6888 from HabitRPG/api-v3-allocate
...
[Api v3] Port shared.ops.allocate
2016-03-15 19:21:00 +01:00
Matteo Pagliazzi
67ef70db0f
remove constants tests
2016-03-15 19:10:00 +01:00
Matteo Pagliazzi
5b2584871e
increase sleep time when testing "allows user to delete challenge task after challenge task is broken"
2016-03-15 19:07:01 +01:00
Blade Barringer
d62807f760
feat: Add debug scripts to easilly get all pets/mounts/gear
2016-03-15 12:47:24 -05:00
Matteo Pagliazzi
219ec01ce9
port shared.ops.allocate
2016-03-15 18:41:23 +01:00
Matteo Pagliazzi
fb6c927ce9
Merge pull request #6886 from HabitRPG/api-v3-port-sleep
...
[API v3] Port sleep operation from shared code
2016-03-15 17:42:26 +01:00
Matteo Pagliazzi
73cb50b01a
Merge pull request #6872 from TheHollidayInn/api-v3-delete-challenge-tasks-tests
...
Added initial delete challenge tasks tests
2016-03-15 17:26:39 +01:00
Matteo Pagliazzi
b2b4340ee3
change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it
2016-03-15 17:05:07 +01:00
Matteo Pagliazzi
490c6a9ae1
wip(shared): port sleep op
2016-03-15 16:33:44 +01:00
Keith Holliday
534ec07b6a
Added tests to ensure challenge member can not delete active challenge task and can delete broken or unlinked challenge task
2016-03-15 10:03:48 -05:00
Matteo Pagliazzi
fdeddc8631
pin stripe to specific version
2016-03-14 18:30:10 +01:00
Blade Barringer
ed013ee34d
Merge pull request #6878 from crookedneighbor/update_protractor
...
Update protractor
2016-03-13 22:24:59 -05:00
Blade Barringer
278b972c61
lint: Add missing semicolon to test helper
2016-03-13 22:06:09 -05:00
Blade Barringer
6ce0893edc
test: unpend registration test
2016-03-13 21:56:42 -05:00
Blade Barringer
3ffb84d890
test: Reset db before running e2e tests
2016-03-13 21:56:12 -05:00
Blade Barringer
88ef920a2f
fix: Update travis yaml to run protractor 3
2016-03-13 21:16:51 -05:00
Matteo Pagliazzi
f55df39fb7
Merge branch 'develop' into api-v3
2016-03-13 23:19:04 +01:00
Matteo Pagliazzi
e506864e00
Merge pull request #6877 from HabitRPG/v3-adapt-shared
...
Make shared code ready for API v3
2016-03-13 23:13:00 +01:00
Matteo Pagliazzi
f7c94ad854
Merge pull request #6875 from piousbox/api-v3-update-username-password-2
...
update username, password
2016-03-13 23:03:17 +01:00
Matteo Pagliazzi
f65a7321b7
fix common tests, explictly exclude tests from linting
2016-03-13 23:00:48 +01:00
Blade Barringer
17d2efb822
refactor: Organize protractor setup
2016-03-13 16:41:57 -05:00
Matteo Pagliazzi
70df1137a0
fix statsComputed getter
2016-03-13 22:39:14 +01:00
Matteo Pagliazzi
8e3284a4e3
wip(shared): adapt to v3
2016-03-13 22:26:32 +01:00
Victor Piousbox
0b25720232
cleanup
2016-03-13 14:01:53 -07:00
Matteo Pagliazzi
b948fc031f
fix typo in common code
2016-03-13 21:12:19 +01:00
Victor Piousbox
c61b10a6eb
resolve conflicts
2016-03-13 10:45:19 -07:00
Victor Piousbox
c14f0c4247
update username, password
2016-03-13 10:42:59 -07:00
Blade Barringer
0b65292e4b
test: Update protractor to v3 and use mocha
2016-03-13 09:51:01 -05:00
Victor Piousbox
46322cfd38
update username, password
2016-03-12 23:32:20 -08:00
Keith Holliday
c04e53b5a5
Added initial delete challenge tasks tests
2016-03-12 21:00:43 -06:00
Matteo Pagliazzi
13a86c3858
Merge pull request #6869 from TheHollidayInn/api-v3-remove-challenge-checklist-item
...
Added initial test for removing challenge checklist item
2016-03-12 18:08:27 +01:00
Matteo Pagliazzi
ce916e31bd
Merge pull request #6866 from TheHollidayInn/api-v3-updated-checklist-item
...
Added initial checklist item update tests
2016-03-12 18:07:50 +01:00
Keith Holliday
152f7605cd
Added initial test for removing challenge checklist item
2016-03-12 10:55:12 -06:00
Keith Holliday
e4124f9e02
Added initial checklist item update tests
2016-03-12 10:38:40 -06:00
Matteo Pagliazzi
c02082a200
Merge branch 'develop' into api-v3
2016-03-12 16:00:24 +01:00
Matteo Pagliazzi
2fa361d9ea
Merge pull request #6865 from TheHollidayInn/api-v3-challenge-add-checklist-item
...
Add initial tests for add checklist item to challenge
2016-03-12 15:56:32 +01:00
Matteo Pagliazzi
8463abb830
Merge pull request #6853 from TheHollidayInn/api-v3-challenge-tasks-put
...
Added initial challenge task update tests
2016-03-12 14:52:54 +01:00
Keith Holliday
0af912bebb
Add initial tests for add checklist item to challenge
2016-03-11 14:19:46 -06:00
Matteo Pagliazzi
c6e5e3eb1f
Merge pull request #6787 from TheHollidayInn/api-v3-challenge-model-tests
...
Added initial challenge model tests
2016-03-11 19:17:09 +01:00
Matteo Pagliazzi
8ca4a7ce8a
Merge pull request #6824 from TheHollidayInn/api-v3-get-challenge-tasks
...
Added initial tests for get challenge tasks
2016-03-11 19:16:51 +01:00
Matteo Pagliazzi
6fa23ae49f
make sure to clone drop so original properties do not change
2016-03-11 19:11:46 +01:00
Matteo Pagliazzi
29b6e958c6
fix failing tests
2016-03-11 09:51:59 +01:00
Kaitlin Hipkin
997fe155e2
fix blurry upscale of achievement-partyUp img
2016-03-10 20:49:54 -05:00
Kaitlin Hipkin
792e8d8094
fix awarding of party {up,on} achievs to update server
2016-03-10 20:38:53 -05:00
Sabe Jones
d28219e90d
fix(content): Pfeffernusse typo, again
2016-03-10 17:35:36 -06:00
Sabe Jones
d608fdb437
fix(news): Pfeffernusse typo
2016-03-10 16:59:39 -06:00
Keith Holliday
61e360a1d8
Added initial challenge task update tests
2016-03-10 15:30:22 -06:00
Matteo Pagliazzi
78c1ee2053
Merge pull request #6858 from crookedneighbor/babel_fix
...
Add fix for running in dev and test mode
2016-03-10 19:38:32 +01:00
Blade Barringer
0f7a730a58
Add fix for running in dev and test mode
2016-03-10 12:16:19 -06:00
Matteo Pagliazzi
fbdbd8e006
Merge branch 'develop' into api-v3
2016-03-10 18:30:09 +01:00
Matteo Pagliazzi
a9c9d6d1cc
Merge pull request #6834 from HabitRPG/split-shared
...
Split shared ops
2016-03-10 17:34:46 +01:00
Matteo Pagliazzi
05676d834e
remove git conflict data
2016-03-10 17:13:13 +01:00
Matteo Pagliazzi
c39967767c
Merge branch 'develop' into split-shared
2016-03-10 17:00:59 +01:00
Matteo Pagliazzi
ec13a34228
Merge pull request #6842 from TheHollidayInn/api-v3-challenge-tasks-get
...
Added initial get challenge task by id
2016-03-10 16:53:14 +01:00
Sabe Jones
2a5011b648
fix(content): don't be clever with quest names
2016-03-09 16:57:43 -06:00
Sabe Jones
d92614844a
Merge pull request #6849 from HabitRPG/sabrecat/pets-201603
...
Pet quest March 2016
2016-03-09 15:11:14 -06:00
Sabe Jones
cc53e6e9dc
Merge pull request #6733 from vIiRuS/mobileStorage
...
Store data for next mobile update
2016-03-09 14:56:15 -06:00
Sabe Jones
45b8dbc1a6
feat(content): snails complete
2016-03-09 15:55:22 -05:00
Sabe Jones
d153df7805
feat(content): snail pet quest WIP
2016-03-09 15:34:57 -05:00
Kaitlin Hipkin
b0fe5f4081
add 2x party up/on achieve images and recompile spritesheets
2016-03-09 12:43:54 -05:00
Kaitlin Hipkin
6642a8e131
add party up/on achiev images and recompile spritesheets
2016-03-09 12:02:43 -05:00
Keith Holliday
f96de74abd
Added test for incorrect task and id and renamed test file
2016-03-09 10:01:16 -06:00
Kaitlin Hipkin
fe178a62d9
move party up/on achievs about beast/mount achievs on profile
2016-03-08 21:03:57 -05:00
Kaitlin Hipkin
2ade78fc34
show party up/on achievs on user's profile achievements section
2016-03-08 20:57:19 -05:00
Kaitlin Hipkin
d2d3b9deab
award party {up,on} achiev when party reaches {2,4} members
2016-03-08 20:55:18 -05:00
Kaitlin Hipkin
167eb8973a
add strings for new partyUp and partyOn achievs
2016-03-08 20:45:33 -05:00
Blade Barringer
3fa9d17ad4
Merge branch 'develop' into api-v3
2016-03-08 19:25:50 -06:00
Matteo Pagliazzi
582ded4494
disable rate limiting middleware
2016-03-08 23:21:11 +01:00
Sabe Jones
f5ea9c5524
fix(analytics): don't log chat messages
2016-03-08 15:19:39 -05:00
Blade Barringer
842d031d5b
Merge pull request #6828 from HabitRPG/upgrade_node
...
chore: Upgrade node
2016-03-08 13:09:59 -06:00
Keith Holliday
22e64bb88e
Added initial get challenge task by id
2016-03-08 12:42:05 -06:00
Matteo Pagliazzi
986bfd8035
split remaining utilities from shared
2016-03-08 19:35:02 +01:00
Blade Barringer
155cd6c626
fix: Correct how faq module is exported
2016-03-08 11:59:45 -06:00
Matteo Pagliazzi
bb6f0f4252
split user.fns
2016-03-08 18:58:39 +01:00
Matteo Pagliazzi
393a26e51a
fix typo: reroll -> rebirth
2016-03-08 18:02:23 +01:00
Matteo Pagliazzi
a351cb5f4e
change references to imported libs
2016-03-08 17:49:18 +01:00
Matteo Pagliazzi
5a2daabada
remove all changes from eslint --fix
2016-03-08 17:45:14 +01:00
Alys
76799eee05
Merge pull request #6837 from zesme/fix-tavern-tier-1-icon
...
Changed tavern tier 1 text icon
2016-03-08 20:26:46 +10: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
Matteo Pagliazzi
eeebe4c342
wip: split shared ops
2016-03-07 23:02:42 +01:00
Matteo Pagliazzi
8437c21a51
start splitting ops (readCard has tests)
2016-03-07 19:32:49 +01:00
Kaitlin Hipkin
98497ea739
Merge branch 'develop' of https://github.com/khipkin/habitrpg into develop
2016-03-07 03:20:58 -05:00
Phillip Thelen
36790592c6
add tests for improvement categories
2016-03-06 17:56:51 +01:00
Alys
34057c375b
Merge pull request #6819 from zesme/develop
...
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
2016-03-06 20:28:47 +10:00
Alys
87bd55cca1
Merge pull request #6780 from colwem/issue6774
...
Improve styling of markdown blockquotes - fixes #6774
2016-03-06 19:59:30 +10:00
Alys
e59f614568
Merge pull request #6786 from murraybd/use-level-style-in-modals
...
Use level style in modals
2016-03-06 18:52:21 +10: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
Alys
612d455fe1
Merge pull request #6782 from andrewcham/issue6779
...
update community guidelines - fixes #6779
2016-03-06 17:42:08 +10:00
Christopher Giroir
edce3d01a9
Resizing image to remove aliasing
2016-03-05 11:13:20 -08:00
Christopher Giroir
82cfd8afc8
Moving to new purple logo.png
2016-03-05 11:06:01 -08:00
Matteo Pagliazzi
b5e1cd33e2
Merge branch 'develop' into api-v3
2016-03-05 19:29:02 +01:00
Matteo Pagliazzi
45e7609dd1
Merge branch 'piousbox-api-v3-email-3' into api-v3
2016-03-05 19:24:22 +01:00
Matteo Pagliazzi
6830a4464a
Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3
2016-03-05 19:24:11 +01:00
Matteo Pagliazzi
a266ffdabd
Merge pull request #6821 from HabitRPG/upgrade_babel_v3
...
Upgrade babel v3
2016-03-05 19:07:34 +01:00
Matteo Pagliazzi
863ca9954e
errors working with babel 6, export v3 shared modules in main common module
2016-03-05 18:58:40 +01:00
Blade Barringer
d82dd67930
chore: Upgrade node
2016-03-05 09:17:31 -06:00
Blade Barringer
b553a6c134
fix: Remove active handles (incompatible with node v4)
2016-03-05 08:11:21 -06:00
Blade Barringer
a007effddd
chore(i18n): update locales
2016-03-05 07:46:08 -06:00
Alys
9517920de6
fix error in nodemon command for running API tests individually
2016-03-05 15:51:54 +10:00
Keith Holliday
0e96840e3d
Added initial tests for get challenge tasks
2016-03-04 15:38:32 -06:00
Victor Piousbox
7dfdbb8b05
/user/update-email endpoint
2016-03-04 21:27:16 +00:00
Blade Barringer
b97511db31
fix: Use module.exports instead of export default
2016-03-04 13:29:51 -06:00
Blade Barringer
4cd0428f0a
Merge branch 'develop' into api-v3
2016-03-04 12:16:22 -06:00
Keith Holliday
bcc4d568df
Moved unlinkChallengeTasks to challenge model and added tests
2016-03-04 11:45:21 -06:00
Lucas Torroba
4f4ea8416c
Closed issue #6758
...
After some discussion on the thread, this is probably the neatest
solution to issue #6758 . I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
2016-03-04 13:16:37 -03:00
Blade Barringer
511b003ec5
Merge pull request #6811 from crookedneighbor/upgrade_babel
...
chore: upgrade babel to v6
2016-03-04 08:36:08 -06:00
Blade Barringer
9447a6ce10
feat: pre-compile babel when used in production
2016-03-04 07:44:22 -06:00
Phillip Thelen
a1e1ac211f
improve improvement category validation
2016-03-04 14:00:26 +01:00
Blade Barringer
99242ac60f
fix: remove dependency that was causing build to fail
2016-03-03 22:24:55 -06:00
Blade Barringer
7f4beb747f
Merge branch 'develop' into api-v3
2016-03-03 21:24:54 -06:00
Blade Barringer
b61cfefc30
fix: fix issue where build would fail but exit as if oy passed
2016-03-03 21:05:06 -06:00
Blade Barringer
8c6d8163bc
refactor: adjust path to cron module in common code
2016-03-03 18:09:07 -06:00
Matteo Pagliazzi
d85c64705e
Merge branch 'develop' into api-v3
2016-03-03 21:15:16 +01:00
Matteo Pagliazzi
ba4d969751
Merge pull request #6802 from HabitRPG/api-v3-cast-2
...
[Api v3] Cast
2016-03-03 21:06:47 +01:00
Sabe Jones
ea983179a4
Merge pull request #6804 from HabitRPG/sabrecat/active-handles
...
Active handles logging
2016-03-03 13:55:14 -06:00
Matteo Pagliazzi
96c582e062
fix tests, move most errors to shared code
2016-03-03 19:16:03 +01:00
Blade Barringer
0406142e0e
chore: upgrade babel to v6
2016-03-02 21:36:27 -06:00
Alys
c3107ad3fb
improve commenting style
2016-03-03 13:35:55 +10:00
Matteo Pagliazzi
80f791c86b
add tests, move CustomError to common, fix casting
2016-03-03 00:16:28 +01:00
Alys
56e53cc95f
fix Burst of Flames / fireball skill - was doing too much boss damage; add human-friendly names to skills for ease of searching
2016-03-03 08:30:49 +10:00
Sabe Jones
af38e83e36
fix(logging): don't log without env var
2016-03-02 11:30:49 -05:00
Sabe Jones
c761944c35
feat(logging): timestamp active handles output
2016-03-02 10:22:46 -05:00
Matteo Pagliazzi
05b6e25c28
port spells to api-v3
2016-03-02 13:05:17 +01:00
Matteo Pagliazzi
8920b05f9e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
2016-03-02 12:59:51 +01:00
Matteo Pagliazzi
5b012750bb
convert spells to es6
2016-03-02 12:46:06 +01:00
Alys
f69a29c152
improve group invitation code and tests
2016-03-02 09:26:55 +10:00
Sabe Jones
a698559c04
fix(log-handles): don't log verbose code
2016-03-01 16:46:39 -05:00
Sabe Jones
bff5258a56
fix(logging): get interval from env var
2016-03-01 16:46:39 -05:00
Sabe Jones
078100aac8
chore(logging): output active handles per 10 minutes
2016-03-01 16:46:38 -05:00
Sabe Jones
2516eae8d3
Merge pull request #6799 from HabitRPG/sabrecat/armoire-201603
...
Armoire and BGs 2016-03
2016-03-01 15:34:50 -06:00
Sabe Jones
ea6abbfabc
feat(content): Armoire and BGs 2016-03
2016-03-01 15:59:25 -05:00
Keith Holliday
20621b940e
Added better tests to ensure tasks are synced
2016-03-01 14:38:09 -06:00
Blade Barringer
ae56dd5c2e
Merge pull request #6796 from crookedneighbor/refactor_remove_unused_common_src_files
...
refactor: Remove unused common script src files
2016-03-01 09:21:58 -06:00
Blade Barringer
c96ddaeebe
refactor: Remove unused common script src files
2016-03-01 08:49:25 -06:00
Matteo Pagliazzi
9114d74357
Merge branch 'develop' into api-v3
2016-03-01 09:44:57 +01:00
Matteo Pagliazzi
531d3969f4
fix cluster.fork
2016-03-01 09:15:13 +01:00
Alys
01b12cd8b4
Merge pull request #6793 from Sinble/develop
...
Change Menu Names
2016-03-01 15:43:27 +10:00
Nick Bunn
b6255e9240
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into menu_name_change
2016-02-29 20:23:24 -06:00
Nick Bunn
251dd3cb8e
Changed submenu from Hall of Heroes to Hall of Contributors
2016-02-29 20:23:05 -06:00
Matteo Pagliazzi
25471b3f81
Merge pull request #6792 from HabitRPG/api-v3-tmp-filters
...
[API v3] add support for user._tmp, disable user.filters since it is not used
2016-03-01 00:09:34 +01:00
Matteo Pagliazzi
e5224a7b2a
add support for user._tmp, disable user.filters since it is not used
2016-02-29 23:20:13 +01:00
Alys
3464914655
Revert "remove common/script/src"
...
This reverts commit 7c5572608f .
2016-03-01 05:30:44 +10:00
Matteo Pagliazzi
a04bf4c045
use different i18n module for tests
2016-02-29 17:07:33 +01:00
Matteo Pagliazzi
0c700cc36d
Merge branch 'develop' into api-v3
2016-02-29 16:39:31 +01:00
Matteo Pagliazzi
7c5572608f
remove common/script/src
2016-02-29 16:35:35 +01:00
Matteo Pagliazzi
cbb29eac55
update gitignore for elastic beanstalk
2016-02-29 16:28:08 +01:00
Josh Holland
fae0bbc8f6
Add Moonstone Chain quest art
2016-02-28 19:37:07 -06:00
Matteo Pagliazzi
03c3beba0e
Merge pull request #6788 from HabitRPG/api-v3-model-paths
...
[Api v3] Models paths
2016-02-29 01:12:55 +01:00
Matteo Pagliazzi
3512233966
add meta/models controller to get public models paths
2016-02-29 01:04:19 +01:00
Nick Bunn
075ed9f172
updated menu names for better description
2016-02-28 16:10:26 -06:00
Keith Holliday
6e732a67c9
Added initial challenge model tests
2016-02-28 14:44:18 -06:00
Christopher Giroir
7e845962f4
Fixing comments
2016-02-28 11:58:39 -08:00
Brian Murray
8d7c46d79f
Merge branch 'develop' into use-level-style-in-modals
2016-02-28 10:13:10 -08:00
Josh Holland
e2ca21f935
Add Message in a Bottle quest art
2016-02-28 17:12:57 +00:00
Alys
6cd861dcdc
Merge pull request #6742 from murraybd/develop
...
Display attribute info in Character Build
2016-02-28 19:39:20 +10:00
Andrew Cham
518532efdc
#6779 Update community-guidelines.jade with current date
2016-02-28 01:20:31 -08:00
Alys
c8b5cf95be
Merge pull request #6764 from querry43/add-missing-docker-depends
...
adding two deps to dockerfile required for karma
2016-02-28 19:11:01 +10:00
Alys
ccfff7270f
Merge pull request #6763 from querry43/tests-in-docker
...
TEST_DB_URI env override
2016-02-28 19:04:58 +10:00
Alys
91fc6186e5
Merge pull request #6736 from delftswa2016/fix-perks-buygems
...
Fixed perk amounts when buying subscription through gem
2016-02-28 18:32:39 +10:00
Matteo Pagliazzi
5e68589ac8
check for membership when leaving public guild, fix memberCount update when leaving group, add missing files
2016-02-28 01:11:45 +01:00
Matteo Pagliazzi
733da70b48
getFirebaseToken route
2016-02-27 18:31:28 +01:00
Matteo Pagliazzi
3284bb2384
add logout
2016-02-27 18:18:56 +01:00
Matteo Pagliazzi
84810ae758
Merge pull request #6778 from HabitRPG/api-v3-session-invite
...
[API v3] Refactor session invite (no more session!)
2016-02-27 18:07:39 +01:00
Matteo Pagliazzi
9321a2d904
remove checks for emails
2016-02-27 17:58:56 +01:00
Matteo Pagliazzi
6c8da9a53a
fix user schema definition and add missing schema
2016-02-27 17:46:00 +01:00
Matteo Pagliazzi
432d27fab2
better default values for user schema
2016-02-27 12:40:24 +01:00
Matteo Pagliazzi
b4f7625d93
Merge branch 'develop' into api-v3-session-invite
2016-02-27 12:04:39 +01:00
Matteo Pagliazzi
b4e4e31be5
fix invitations and add missing tests
2016-02-27 12:01:00 +01:00
Andrew Cham
bf64c6503d
#6779 Update community guidelines
2016-02-27 02:47:58 -08:00
Alys
cc5f794f3d
prevent party inviter's email address being used as a Reply-To
2016-02-27 18:48:41 +10:00
Martin Colwell
93410c4f7a
issue(6774): add support for markdown blockquote
2016-02-26 20:07:12 -05:00
Matteo Pagliazzi
0014afb75e
add tests for req.query.groupInvite
2016-02-26 19:43:17 +01:00
Matteo Pagliazzi
d2ba8e223c
remove session party invitation. Implement the same feature using a query string when signing up
2016-02-26 19:18:18 +01:00
Matteo Pagliazzi
bb461f0c5a
Merge branch 'develop' into api-v3
2016-02-26 10:08:24 +01:00
Brian Murray
c107e42978
Change userLevelStyle to a root scope so it can be used in modals.
2016-02-25 15:59:04 -08:00
Matteo Pagliazzi
82c4f91317
put newrelic behind a flag
2016-02-25 21:05:42 +01:00
Sabe Jones
bf002a2d1e
chore(news): add bang
2016-02-25 14:06:06 -05:00
Sabe Jones
3270cbf89f
fix(events): revert missed sprite and quest availability
2016-02-24 19:49:17 -05:00
Matt Harrington
46e13fecad
TEST_DB_URI env override
2016-02-25 00:08:24 +00:00
Sabe Jones
d2a487aea1
Merge pull request #6761 from HabitRPG/sabrecat/mystery-201602
...
Mystery Items 201602
2016-02-24 17:01:18 -06:00
Sabe Jones
86824c5304
fix(news): add byline
2016-02-24 17:25:49 -05:00
Sabe Jones
ca57fad0b9
feat(time-travel): add Phoenixes
...
Also adds Bailey news for the above and the subscriber set.
2016-02-24 17:23:42 -05:00
Phillip Thelen
668ad6ff45
change imrovementCategories to array;
2016-02-24 15:57:08 +01:00
Matt Harrington
f129df2e03
adding two deps required for karma
2016-02-24 05:22:31 +00:00
Sabe Jones
5c1d379f41
feat(subscription): mystery items 201602
2016-02-23 17:00:55 -05:00
Kaitlin Hipkin
8c444e8a62
Merge pull request #1 from HabitRPG/develop
...
update my fork
2016-02-23 14:25:07 -05:00
Christopher Giroir
47688bfed5
Moving to a specific commit of smart-app-banner
2016-02-22 22:57:37 -08:00
Matteo Pagliazzi
2b8846b803
Merge pull request #6748 from TheHollidayInn/api-v3-unsubscribe
...
Added unsubscribe route and initial tests
2016-02-22 18:03:05 +01:00
Keith Holliday
d60ff421c9
Updated route to be named /emails/unsubscribe and other minor fixes
2016-02-22 09:03:21 -06:00
Matteo Pagliazzi
68a57bc2f6
enable strict mode to allow use of let, const without babel
2016-02-22 11:45:26 +01:00
Matteo Pagliazzi
9ef4b6409e
Merge branch 'develop' into api-v3 and move new relic to new location
2016-02-22 11:43:35 +01:00
Matteo Pagliazzi
d3e1a415a8
require newrelic as the first thing on startup
2016-02-21 22:39:55 +01:00
Matteo Pagliazzi
f4d66c7384
config newrelic
2016-02-21 22:30:25 +01:00
Matteo Pagliazzi
4dfb24af6e
enable newrelic
2016-02-21 22:02:37 +01:00
Keith Holliday
34b03934cc
Added unsubscribe route and initial tests
2016-02-21 10:05:51 -06:00
Matteo Pagliazzi
91be89e05a
Merge pull request #6735 from HabitRPG/api-v3-dataexport
...
[API v3] Data export
2016-02-20 21:17:32 +01:00
Matteo Pagliazzi
e9ac123d0e
make sure cookie is never shared among multiple test users
2016-02-20 21:14:11 +01:00
Matteo Pagliazzi
62ebde3186
fix tests that require session authentication
2016-02-20 21:02:46 +01:00
Christopher Giroir
896773f9ef
Adding android app banners
...
Fixes #6692
2016-02-20 11:56:39 -08:00
Matteo Pagliazzi
2ed2fb5d06
tests for user data export
2016-02-20 10:46:11 +01:00
Matteo Pagliazzi
a6d87aaa9b
add tests for /export/history.csv
2016-02-20 10:16:55 +01:00
Brian Murray
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
Brian Murray
04d0bcadb7
in profile.jade in the character build section display detailed info about the attribute
2016-02-19 19:22:05 -08:00
Brian Murray
7822e2aaec
end sureRest sentence with a period
2016-02-19 19:15:32 -08:00
kogelnikp
00473dded7
fixed partially hidden button
...
added clearfix class to prevent floating for the next elements.
2016-02-19 22:17:39 +01:00
Matteo Pagliazzi
3aab4d3ef6
Merge pull request #6739 from HabitRPG/api-v3-pushnotifications
...
port push notifications in api v3
2016-02-19 21:08:00 +01:00
Matteo Pagliazzi
fbc944a5cc
fix push notifications imports
2016-02-19 20:59:12 +01:00
Matteo Pagliazzi
fb343f8feb
port push notifications in api v3
2016-02-19 20:34:55 +01:00
Matteo Pagliazzi
130110fed2
use correct path for v2 locals middleware
2016-02-19 19:44:43 +01:00
Matteo Pagliazzi
cc31d266e4
port locals middleware, add some tests and a lot of fixes
2016-02-19 18:42:03 +01:00
Matteo Pagliazzi
feadfbcd9e
fix case when req.session is undefined and use correct syntax for authWithSession
2016-02-19 12:23:53 +01:00
Matteo Pagliazzi
192c57fa85
re-add removed code for dataexport.history
2016-02-19 12:16:09 +01:00
Matteo Pagliazzi
a6db8e693f
refactor dataexport controller
2016-02-19 12:13:48 +01:00
kogelnikp
db595564b3
fixed perk amounts when buying subscription through gem
...
set SettingsCtrl as ng-controller for modal buy-gems window to show perk
amounts when buying subscriptions through gem button
2016-02-18 23:43:25 +01:00
Phillip Thelen
762576e7a2
fix typo
2016-02-18 20:59:20 +01:00
Matteo Pagliazzi
624c0da5ab
Merge pull request #6732 from HabitRPG/api-v3-hall
...
[API v3] Hall
2016-02-18 20:49:51 +01:00
Phillip Thelen
c751ee74c0
store which areas the user wants to improve in
2016-02-18 20:30:14 +01:00
Phillip Thelen
86181253c6
store reminders for tasks
2016-02-18 20:30:02 +01:00
Matteo Pagliazzi
d79e0f6e2e
add tests for hall
2016-02-18 19:41:35 +01:00
Matteo Pagliazzi
2547676783
add hall controller, missing tests
2016-02-18 14:55:52 +01:00
Alys
c95950c679
recompile spritesheets
2016-02-18 20:07:35 +10:00
Alys
8d106d6d78
Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons
...
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
2016-02-18 18:56:40 +10:00
Alys
f631712a45
deemphasise the warning that spritesheets might be too large for mobile safari - ref https://github.com/HabitRPG/habitrpg/pull/6683#issuecomment-185462180
2016-02-18 18:52:09 +10:00
Alys
3563244cdc
change number of users from 1,000,000 to 1,100,000
2016-02-18 12:42:47 +10:00
Sabe Jones
bafdfc4ed5
chore(news): Bailey 20160217
2016-02-17 20:59:11 -05:00
Alys
ffb5cfd46e
Merge pull request #6582 from tylerxo/remove_modal_username
...
Adds user details to the removal modal
2016-02-18 06:39:31 +10:00
Matteo Pagliazzi
5ca45df602
Revert "tests for deleting old todos"
...
This reverts commit d9dd031e7f .
2016-02-15 22:12:21 +01:00
Matteo Pagliazzi
e6b425d713
Revert "delete completed todos 30/90 days after completion"
...
This reverts commit 0a9391ea75 .
2016-02-15 22:11:03 +01:00
Sabe Jones
f7c9769aab
chore(event): revert Valentine's
2016-02-15 14:48:39 -05:00
Blade Barringer
d0ac43592f
chore(i18n): update locales
2016-02-14 21:13:40 -06:00
Matteo Pagliazzi
28c6c27b78
Merge branch 'develop' into api-v3
2016-02-14 13:03:29 +01:00
Matteo Pagliazzi
8b7719d25e
fix apidoc comments
2016-02-14 12:56:40 +01:00
Matteo Pagliazzi
1eee27bdd4
Merge pull request #6374 from HabitRPG/api-v3-groups
...
[API v3] Port groups, challenges and members
2016-02-13 11:48:31 +01:00
Matteo Pagliazzi
e1b01e3853
Merge pull request #6565 from HabitRPG/sabrecat/quest-accept
...
WIP: Quests for API v3
2016-02-12 20:56:19 +01:00
Sabe Jones
00f98d90b6
Merge pull request #6705 from HabitRPG/sabrecat/chat-cutoff
...
No chat notifs from big Guilds
2016-02-12 13:22:10 -06:00
Matteo Pagliazzi
edaf3ef4db
fix typo: 1028->1024 bytes
2016-02-12 19:50:50 +01:00
Matteo Pagliazzi
599510aa78
higher maxBuffer for integration tests
2016-02-12 19:49:53 +01:00
Sabe Jones
b4b64dcf19
fix(performance): no chat notifs from big Guilds
2016-02-12 13:18:30 -05:00
Blade Barringer
4360f01936
feat(api-v3): Add force-start quest route
2016-02-12 08:09:16 -06:00
Sabe Jones
a74279f629
Merge pull request #6702 from HabitRPG/sabrecat/fix-newbie-guild
...
Don't send chat notifs for Newbies Guild
2016-02-11 20:48:17 -06:00
Sabe Jones
67929f3a96
fix(performance): don't send chat notifs for Newbies Guild
2016-02-11 21:29:32 -05:00
Matteo Pagliazzi
befdb189fc
fix tests for quests routes
2016-02-11 21:09:14 +01:00
Matteo Pagliazzi
f68b812b90
Merge branch 'TheHollidayInn-api-v3-quests-leave' into sabrecat/quest-accept
2016-02-11 20:48:26 +01:00
Matteo Pagliazzi
6cae147b83
Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-leave
2016-02-11 20:48:18 +01:00
Matteo Pagliazzi
498bd31f10
Merge branch 'TheHollidayInn-api-v3-quests-abort' into sabrecat/quest-accept
2016-02-11 20:44:45 +01:00
Matteo Pagliazzi
e8a38a6326
Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-abort
2016-02-11 20:44:27 +01:00
Matteo Pagliazzi
7d86039a82
Merge branch 'TheHollidayInn-api-v3-quests-cancel' into sabrecat/quest-accept
2016-02-11 20:24:44 +01:00
Matteo Pagliazzi
84d03dc2ad
Merge branch 'sabrecat/quest-accept' into TheHollidayInn-api-v3-quests-cancel
2016-02-11 20:24:16 +01:00
Matteo Pagliazzi
a73d9af020
Merge pull request #6693 from HabitRPG/TheHollidayInn-api-v3-quests-reject
...
Updated quest reject
2016-02-11 20:18:25 +01:00
Sabe Jones
fdd170c977
Merge pull request #6698 from HabitRPG/sabrecat/elastic-beanstalk
...
AWS Elastic Beanstalk
2016-02-11 11:38:12 -06:00
Matteo Pagliazzi
41c3276e66
fetch leader id when cancelling quest
2016-02-11 15:36:21 +01:00
Matteo Pagliazzi
c79cb0efc6
update quest abort route
2016-02-11 15:32:25 +01:00
Matteo Pagliazzi
096bb3f853
Merge branch 'api-v3-quests-abort' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-abort
2016-02-11 15:16:29 +01:00
Matteo Pagliazzi
ab187720a5
reject quest: test response
2016-02-11 15:14:07 +01:00
Matteo Pagliazzi
dfb6ec2f48
cancel quest: test response
2016-02-11 15:11:38 +01:00
Matteo Pagliazzi
354b6bc39e
update quest leave route
2016-02-11 15:07:45 +01:00
Matteo Pagliazzi
c6c852cd6d
Merge branch 'api-v3-quests-leave' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-leave
2016-02-11 14:52:09 +01:00
Matteo Pagliazzi
6c1950972b
update quest cancel routes
2016-02-11 13:19:46 +01:00
Matteo Pagliazzi
3cd7e8ad5d
Merge branch 'api-v3-quests-cancel' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-cancel
2016-02-11 12:54:34 +01:00
Matteo Pagliazzi
879506b38a
update reject quest route
2016-02-11 12:50:28 +01:00
Matteo Pagliazzi
210a8ee11f
Merge branch 'api-v3-quests-reject' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-quests-reject
2016-02-11 12:12:09 +01:00
Matteo Pagliazzi
a998282c35
Merge pull request #6690 from HabitRPG/paglias/quest-accept
...
Quest accept
2016-02-11 12:02:37 +01:00
Sabe Jones
81098d5fe8
fix(static): update Android app image
2016-02-10 18:48:31 -05:00
Matteo Pagliazzi
a2af6c390b
fix quest accept route and add tests
2016-02-10 22:27:59 +01:00
Sabe Jones
b228aa3f89
feat(elastic-beanstalk): deploy extensions
2016-02-10 16:24:24 -05:00
Matteo Pagliazzi
fa14464a0c
add accept quest route
2016-02-10 17:07:34 +01:00
Matteo Pagliazzi
95a3cea297
Merge pull request #6688 from crookedneighbor/blade-quest-start-tests
...
start quest tests
2016-02-10 16:10:18 +01:00
Matteo Pagliazzi
02a61e260b
add tests for GET challenges/:challengeId
2016-02-10 16:10:00 +01:00
Blade Barringer
8ff4cfe709
tests: Finish start quest
2016-02-10 08:51:12 -06:00
Blade Barringer
b6ed2f8c44
refactor: Move sleep function to seprate file
2016-02-10 08:21:36 -06:00
Alys
e425e75b9d
change Beast Master text from insanely to incredibly - partial fix for https://github.com/HabitRPG/habitrpg/issues/6685
2016-02-10 07:45:22 +10:00
Taldin
b293d7acc2
Fixes #6356 (gryphon avatar clipping)
...
Updated gryphon mount graphics.
2016-02-09 10:27:10 -08:00
Alys
e7c88d6e5d
set purchased.plan.dateUpdated during cron if it hasn't been set - ref https://github.com/HabitRPG/habitrpg/issues/6682
2016-02-09 20:52:50 +10:00
Alys
13c06756e3
Merge pull request #6586 from anowlcalledjosh/front_page_image_alts
...
#6560 : Add alt attributes for images on front page
2016-02-09 18:15:47 +10:00
Alys
badebe8bcc
adjust rebirth description to specify that you must change class to buy class-specific gear
2016-02-09 11:52:07 +10:00
Matteo Pagliazzi
0b336d8012
add missing dot in field path
2016-02-08 23:40:03 +01:00
Matteo Pagliazzi
2f3ae32a0e
finalize invite to quest route and startQuest method
2016-02-08 23:30:49 +01:00
Sabe Jones
884e3573a6
fix(deploy): junk commit for Heroku
2016-02-08 17:25:01 -05:00
Sabe Jones
75b95bfd67
Merge pull request #6681 from HabitRPG/sabrecat/pets-201602
...
Monkey Pet Quest
2016-02-08 15:30:55 -06:00
Sabe Jones
e1b13db6e8
feat(quests): pets 201602
...
Also enables the Valentine's Day card for selection in the Market.
2016-02-08 16:20:05 -05:00
Matteo Pagliazzi
35e6274cd6
Move cron and preening code to server, add support for quests in cron
2016-02-08 22:18:57 +01:00
Alys
7aca788ce8
adjust subscription benefit task history information
2016-02-07 22:24:32 +10:00
Alys
2e79c5b5b8
create script to mark the Enchanted Arrmoire as not being empty for users who logged in recently and who do not have all gear
2016-02-07 16:07:33 +10:00
Sabe Jones
a3251ac9a0
fix(groups): DRY profile name logic
2016-02-05 15:26:15 -05:00
Sabe Jones
dd3918436f
fix(groups): don't show HP in Guilds
2016-02-05 15:19:23 -05:00
Blade Barringer
3b9c921c2f
feat(api-v3): First iteration of quest invite
2016-02-05 10:26:06 -06:00
Blade Barringer
03c9c2933f
feat(api-v3): finish first iteration of group.startQuest method
2016-02-05 09:29:46 -06:00
Matteo Pagliazzi
1e433290d2
Merge pull request #6665 from HabitRPG/paglias/quests-methods
...
API v3 - Group model methods
2016-02-05 11:14:12 +01:00
Matteo Pagliazzi
18958bde5a
review and fix group model methods
2016-02-05 11:06:40 +01:00
Sabe Jones
e0effcdf5f
Merge pull request #6626 from taldin/party_health
...
Add HP to party page
2016-02-04 15:56:39 -06:00
Sabe Jones
b5bb73347a
Merge pull request #6631 from anowlcalledjosh/icon_zoom
...
Make task help icons consistent across browsers
2016-02-04 15:51:49 -06:00
Keith Holliday
6f606df211
Added quest abort route and initial tests
2016-02-04 15:22:37 -06:00
Alys
2d6a8e4b6a
renumber armoire Jester Set - fixes https://github.com/HabitRPG/habitrpg/issues/6658
2016-02-05 06:55:29 +10:00
Keith Holliday
5ca663db57
Added quest leave route and initial tests
2016-02-04 12:31:38 -06:00
Keith Holliday
442a654e94
Removed questKey from url, added quest member support, removed extra tests, and fixed analytics import
2016-02-04 12:27:51 -06:00
Keith Holliday
0684e30790
Added quest cancel route and initial tests
2016-02-03 17:04:57 -06:00
Sabe Jones
963b4849d2
Merge pull request #6647 from HabitRPG/sabrecat/armoire-201602
...
BGs and Armoire 201602
2016-02-03 13:56:28 -06:00
Matteo Pagliazzi
19a709c360
remove console.log statements
2016-02-03 11:30:09 +01:00
Matteo Pagliazzi
1daf87531a
add population to join and update routes of challenges and groups, remove chat flags info everywhere
2016-02-03 11:29:19 +01:00
Keith Holliday
d5148a7bf0
Added quest reject route and intial tests
2016-02-02 16:38:31 -06:00
Matteo Pagliazzi
a8dc529449
adapt create challenge tests to population
2016-02-02 22:09:35 +01:00
Sabe Jones
d8e9b781c8
feat(content): BGs and Armoire 201602
2016-02-02 16:02:50 -05:00
Matteo Pagliazzi
9af2282c36
Merge pull request #6625 from KristianTashkov/challenge-create-tests
...
Challenge create tests
2016-02-02 21:56:37 +01:00
Matteo Pagliazzi
7a5aa731db
add population to challenge.group, challenge.leader and group.leader
2016-02-02 21:47:12 +01:00
Kristian Tashkov
0e5c3f6e82
Challenge create tests
2016-02-02 22:16:03 +02:00
Tyler Smith
065238525c
Removing extra class in favor of .lead
2016-02-02 10:22:17 -08:00
Matteo Pagliazzi
509dffd0c7
update hasAccess to include public guilds
2016-02-02 19:13:29 +01:00
Matteo Pagliazzi
2ad5dbcc74
Merge pull request #6590 from TheHollidayInn/api-v3-get-group-challenges
...
Added get group challenges route and initial tests
2016-02-02 19:06:37 +01:00
Taldin
51e579cb6a
Update for cleaner code.
...
Per Alys and crookedneighbor's suggestion.
2016-02-02 10:01:08 -08:00
Keith Holliday
754befc580
Updated test syntax and added get user challenges tests
2016-02-02 10:29:55 -06:00
Matteo Pagliazzi
337b68ce43
make sure that tasks are returned in the correct order
2016-02-02 12:23:56 +01:00
Matteo Pagliazzi
4aa6545c79
fix access control when getting tasks for a challenge
2016-02-02 11:56:06 +01:00
Matteo Pagliazzi
9854d1cf34
add missing test file and update parameters for GET tasks
2016-02-02 11:42:05 +01:00
Matteo Pagliazzi
824603bc89
fix moveTask and add tests
2016-02-02 11:14:55 +01:00
Alys
a05f6c46d6
add name for mysterySet201601 (Champion of Resolution Set) - fixes https://github.com/HabitRPG/habitrpg/issues/6642
2016-02-02 15:48:28 +10:00
Blade Barringer
e3c7d2834e
refactor(api-v3): Move quest routes to separate file
2016-02-01 21:14:20 -06:00
Blade Barringer
a7486821e5
feat: Add quest details to group in quest invite route
2016-02-01 18:02:32 -06:00
Blade Barringer
c699874e36
feat: Add startQuest method on group model
2016-02-01 17:55:55 -06:00
Sabe Jones
8ee535b4fa
Merge pull request #6636 from HabitRPG/sabrecat/end-wonderland
...
End Winter Wonderland 2015-16
2016-02-01 16:14:32 -06:00
Sabe Jones
0fcdc49adb
chore(event): end Winter Wonderland
2016-02-01 17:01:17 -05:00
Taldin
12749ba497
fixed it so infinite decimals wouldn't print
...
Added .toFixed(1) call.
2016-02-01 10:14:42 -08:00
Matteo Pagliazzi
d9dd031e7f
tests for deleting old todos
2016-01-31 21:24:59 +01:00
Matteo Pagliazzi
0a9391ea75
delete completed todos 30/90 days after completion
2016-01-31 19:45:30 +01:00
Josh Holland
f7163519c1
Make task help icons consistent across browsers
...
The zoom CSS property isn't supported by Firefox, and nor is
vertical-align: -webkit-baseline-middle. font-size: 1.5em has the same
effect, and vertical-align: middle ensures that the tooltip doesn't
overlap with the icon.
2016-01-31 15:41:00 +00:00
Alys
ea57808176
remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed)
2016-01-31 18:25:37 +10:00
Alys
9b9072be45
removed mention of cookies from message about clearing local storage (cookies are not removed)
2016-01-31 18:16:26 +10:00
Taldin
e08f77651b
Add HP to party page
...
Party page now displays each party member's health next to their name
(healers don't have to click on each party member to see their health)
2016-01-30 16:32:10 -08:00
Keith Holliday
461eb96d45
Added get group challenges route and initial tests
2016-01-30 13:46:01 -06:00
Blade Barringer
707170ec7e
feat(api-v3): Add failure conditions for quest invite route
2016-01-30 13:35:46 -06:00
Matteo Pagliazzi
9b09848655
revert change to static files testing
2016-01-30 19:42:09 +01:00
Matteo Pagliazzi
6851a39dec
test no-cache instead of max-age=0
2016-01-30 19:24:56 +01:00
Blade Barringer
a6ed635978
Merge branch 'api-v3-groups' into sabrecat/quest-accept
2016-01-30 11:10:33 -06:00
Blade Barringer
a84e0d1a6c
Merge branch 'api-v3' into api-v3-groups
2016-01-30 10:20:04 -06:00
Blade Barringer
a2f5c2a842
tests: Add readme for v3 tests
2016-01-30 09:28:03 -06:00
Blade Barringer
0533e46576
Merge pull request #6599 from KristianTashkov/fix-broken-unit-tests-windows
...
Fix failing unit tests on windows
2016-01-30 09:18:50 -06:00
Matteo Pagliazzi
69e24eafa3
fix typo when creating tavern
2016-01-30 16:04:38 +01:00
Sabe Jones
834cca0ddc
test(quests): finish invite route
2016-01-29 18:30:41 -05:00
Alys
376e1b7491
Merge pull request #6617 from murraybd/develop
...
Add in missing word your to passMan phrase.
2016-01-30 08:49:08 +10:00
Brian Murray
4b5e3cd4fb
Update front.json
2016-01-29 14:24:14 -08:00
Brian Murray
e48c47fbec
Revert change to en_GB since the locales files don't get updated through
...
GitHub.
2016-01-29 14:20:06 -08:00
Sabe Jones
b7ee6f7da0
fix(event): award old Robes to new users, not 2016
2016-01-29 15:12:07 -05:00
Brian Murray
2799905169
Add in missing word your to passMan phrase.
2016-01-29 11:37:51 -08:00
Matteo Pagliazzi
0972d32d03
improve _closeChal to run some ops immediately
2016-01-29 20:05:06 +01:00
Matteo Pagliazzi
9c5683c45c
Merge pull request #6611 from KristianTashkov/challenge-delete-tests
...
Add challenge delete tests
2016-01-29 19:22:00 +01:00
Matteo Pagliazzi
340e918def
Merge pull request #6600 from KristianTashkov/challenge-winner-tests
...
Challenge select winner route tests
2016-01-29 19:21:52 +01:00
Sabe Jones
5512be01cd
fix(subscription): clarify credits wording
2016-01-29 13:09:40 -05:00
Matteo Pagliazzi
0084a0d057
move tests to gulp tasks
2016-01-29 19:09:19 +01:00
Sabe Jones
9c809ce2e3
Merge pull request #6612 from HabitRPG/sabrecat/birthday-2016
...
Habit Birthday 2016
2016-01-29 11:57:48 -06:00
Matteo Pagliazzi
98a110c5c8
Merge branch 'api-v3-groups-fix-tests' into api-v3-groups
2016-01-29 14:43:51 +01:00
Matteo Pagliazzi
b1848da8de
do not output server logs when testing, ability to run tests and server separately
2016-01-29 14:43:14 +01:00
Matteo Pagliazzi
549b1b0fac
Merge pull request #6615 from HabitRPG/api-v3-groups-fix-tests
...
Api v3 Fix Tests
2016-01-29 13:00:06 +01:00
Matteo Pagliazzi
361d0aa35c
finally fix tests
2016-01-29 12:52:57 +01:00
Matteo Pagliazzi
80160597b0
fix for travis?
2016-01-29 12:37:17 +01:00
Matteo Pagliazzi
bcfb52a16e
passing tests
2016-01-29 12:14:33 +01:00
Matteo Pagliazzi
bcbaa75aad
failing integration test
2016-01-29 12:08:30 +01:00
Matteo Pagliazzi
e345fa76f5
failing unit test
2016-01-29 12:07:46 +01:00
Matteo Pagliazzi
b960ecdd94
first attempt to fix fialing api-v3 tests
2016-01-29 11:13:39 +01:00
Sabe Jones
91c6ce27c5
feat(event): Habit Birthday 2016
...
Also adds AWS Elastic Beanstalk local config file to .gitignore.
2016-01-28 17:16:01 -05:00
Kristian Tashkov
2c378bf2f2
Add challenge delete tests
2016-01-28 23:22:35 +02:00
Kristian Tashkov
c52064b3df
Add challenge select winner test for broken and winner flags of challenge tasks
2016-01-28 23:08:22 +02:00
Matteo Pagliazzi
1369327c44
requester should resolve response.text if response is not json, better tests for csv export
2016-01-28 11:30:53 +01:00
Kristian Tashkov
6dce552140
Challenge select winner route tests
2016-01-28 00:05:16 +02:00
Kristian Tashkov
32be629878
Fix failing unit tests on windows
2016-01-27 23:07:29 +02:00
Matteo Pagliazzi
6d38caf78b
tests for challengeExportCsv
2016-01-27 20:52:47 +01:00
Matteo Pagliazzi
4518d3693c
add exportChallengeCsv route (missing tests)
2016-01-27 20:28:54 +01:00
Matteo Pagliazzi
2cd8d202b5
Merge pull request #6595 from HabitRPG/api-v3-groups-update-challenge
...
[Api v3] Update challenge
2016-01-27 12:32:34 +01:00
Matteo Pagliazzi
1bf4d1298a
Merge pull request #6591 from KristianTashkov/challenge-leave-route
...
Challenge leave route and tests
2016-01-27 12:25:11 +01:00
Matteo Pagliazzi
f16b605c37
add update challenge with tests
2016-01-27 12:22:24 +01:00
KristianTashkov
995148cbfb
Make challenge leave route return empty object on success
2016-01-27 11:37:52 +02:00
Kristian Tashkov
13b12830da
Challenge leave route and tests
2016-01-27 09:34:54 +02:00
Sabe Jones
d7782584db
chore(news): Bailey 20160126
2016-01-26 20:31:43 -05:00
Sabe Jones
f6468a1520
Merge pull request #6587 from HabitRPG/sabrecat/mystery-201601
...
January 2016 mystery items
2016-01-26 14:47:08 -06:00
Sabe Jones
e7ee38758f
feat(subscription): update migration
2016-01-26 15:30:36 -05:00
Sabe Jones
953c504867
feat(subscription): mystery gear strings
2016-01-26 15:26:11 -05:00
Sabe Jones
c6d6e73ae6
feat(subscription): January 2016 mystery items
2016-01-26 15:20:55 -05:00
Josh Holland
7cc618b32c
Add alt attributes for images on front page
...
Some images have an empty alt attribute (alt=""); this isn't a mistake,
it's part of the HTML spec for images that don't add any information.
Debatably, some images marked up as such with this commit do add
information, but that information (e.g. what the Habitica UI looks
like from the intro image) isn't likely to be useful to someone not
able to see.
It's also difficult to convey purely visual concepts like the arrows
with alt-text, especially as the arrows themselves are not images and
therefore cannot have an alt attribute.
Fixes #6560 .
2016-01-26 17:35:35 +00:00
Tyler Smith
ff2ebe46b8
Fixing jade and angular syntax miscues
2016-01-26 07:59:31 -08:00
Tyler Smith
588fdc6cad
Properly chaining classes in jade
2016-01-26 07:52:35 -08:00
Matteo Pagliazzi
f225843cf6
Merge pull request #6579 from TheHollidayInn/api-v3-groups-chat-refactor
...
Updated chat tests with new async/await syntax
2016-01-26 11:25:49 +01:00
Alys
6c106ad644
fix name of Base Hatching Potion quest reward - https://github.com/HabitRPG/habitrpg/pull/6583
2016-01-26 18:42:22 +10:00
Phillip Thelen
8e8c28725a
Add avatar customizations to content API
2016-01-25 21:59:13 -06:00
Blade Barringer
f430b6ff6f
tests: Correct phrasing of tests
2016-01-25 21:46:53 -06:00
Tyler Smith
fd157785f4
Adding text-center to container rather than individual elements
2016-01-25 17:42:50 -08:00
Tyler Smith
77cfc99b59
Adding user details to the removal modal
2016-01-25 17:37:18 -08:00
Blade Barringer
e5f1c44a3e
feat: Add removeFromArray function
2016-01-25 18:08:01 -06:00
Blade Barringer
95603b9d21
tests: Change baseModel test to more accurately reflect use case
2016-01-25 17:55:10 -06:00
Matteo Pagliazzi
f12c9d2353
fix removeMember route and tests
2016-01-26 00:20:56 +01:00
Keith Holliday
bd87ada902
Updated chat tests with new async/await syntax
2016-01-25 15:22:54 -06:00
Matteo Pagliazzi
b28e0629b1
add feature to invite user if he is partying solo
2016-01-25 18:17:09 +01:00
Matteo Pagliazzi
211a7bb46a
add new files for clearCompletedTodos functionality
2016-01-25 17:23:22 +01:00
Matteo Pagliazzi
d5751837ed
add clearCompletedTodos route with tests, add test for getting completed todos, misc fixes
2016-01-25 17:23:01 +01:00
Alys
0d06d765f2
Merge pull request #6569 from shellbot/quest-accept-highlight
...
Color code quest accepted/rejected text
2016-01-25 08:13:59 +10:00
Matteo Pagliazzi
4149cbf381
check for memberCount in join group and removeMemberFromGroup test
2016-01-24 13:14:29 +01:00
Matteo Pagliazzi
490d92eb2f
fix increments memberCount when joining guilds test
2016-01-24 12:59:54 +01:00
Matteo Pagliazzi
df0b49f4f3
tests: check that memberCount is increased for public guilds too
2016-01-24 12:59:04 +01:00
Matteo Pagliazzi
9239ea931a
Merge pull request #6513 from KristianTashkov/missing-join-group-tests
...
Add missing tests in group join route
2016-01-24 12:54:28 +01:00
Matteo Pagliazzi
ea48194d96
Merge pull request #6543 from TheHollidayInn/api-v3-groups-remove-member
...
Added intial group remove member tests
2016-01-24 12:53:35 +01:00
Matteo Pagliazzi
59f5a80af7
improve access control for challenges
2016-01-24 12:52:59 +01:00
Matteo Pagliazzi
198d2e6ab5
misc fixes and run gulp lint when testing
2016-01-24 12:38:20 +01:00
Matteo Pagliazzi
ba60604899
Merge branch 'TheHollidayInn-api-v3-groups-chat-clear-flagss' into api-v3-groups
2016-01-24 12:27:42 +01:00
Matteo Pagliazzi
e8c2d16f2c
Merge branch 'api-v3-groups-chat-clear-flags' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-chat-clear-flagss
2016-01-24 12:27:23 +01:00
Matteo Pagliazzi
bf1991d3de
Merge branch 'TheHollidayInn-api-v3-chat-delete' into api-v3-groups
2016-01-24 12:24:25 +01:00
Matteo Pagliazzi
9e1f23edbd
Merge branch 'api-v3-chat-delete' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-chat-delete
2016-01-24 12:23:51 +01:00
Matteo Pagliazzi
fe170a591a
Merge pull request #6531 from TheHollidayInn/api-v3-group-get-groups-test
...
Added initial get groups tests
2016-01-24 12:13:54 +01:00
Matteo Pagliazzi
c5d731aa80
Merge pull request #6563 from TheHollidayInn/api-v3-get-group-tests
...
Added initial get group tests
2016-01-24 12:12:28 +01:00
Matteo Pagliazzi
f8274ad504
Merge pull request #6574 from TheHollidayInn/api-v3-groups-seen-chat
...
Fixed send message and added intiial seen chat tests
2016-01-24 12:06:47 +01:00
Keith Holliday
e8c13d3117
Added initial clear chat flags tests
2016-01-23 23:11:57 -06:00
Keith Holliday
c498eef21c
Added initial chat delete tests
2016-01-23 23:09:22 -06:00
Keith Holliday
ff034cf61b
Fixed send message for parties and added party seen message test
2016-01-23 19:56:11 -06:00
Keith Holliday
9405d4b054
Fixed send message and added intiial seen chat tests
2016-01-23 14:32:24 -06:00
Keith Holliday
2063070f18
Added group toJSON conversion and fixed syntax errors
2016-01-23 13:42:01 -06:00
Keith Holliday
febc48cd41
Fixed failing chat test by using and admin to view chat flags
2016-01-23 13:42:01 -06:00
Keith Holliday
ab5fc1f526
Added initial get group tests
2016-01-23 13:42:00 -06:00
Matteo Pagliazzi
13693a041a
fix npm test so that it does not fail - temporary solution
2016-01-23 19:44:55 +01:00
Matteo Pagliazzi
cded1aa8ab
remove duplicate eslint rules
2016-01-23 19:13:24 +01:00
Sabe Jones
a414aeaf70
fix(test): linting
2016-01-22 17:38:47 -05:00
Sabe Jones
0ec63ca68d
test(quests): invite and accept WIP
2016-01-22 16:59:34 -05:00
Shellbot
7d0ad86c43
Color code quest accepted/rejected text
2016-01-22 21:56:39 +00:00
Blade Barringer
71c4a0de32
Merge pull request #6564 from KristianTashkov/fix-vagrant
...
Return enable symlinks in vagrant and use npm@3
2016-01-22 09:06:43 -06:00
Sabe Jones
3bd806a0f0
test(quests): accept route WIP
2016-01-21 17:31:54 -05:00
Kristian Tashkov
2fec986006
Return enable symlinks in vagrant and use npm@3
2016-01-21 23:28:28 +02:00
Sabe Jones
f872547264
chore(news): Bailey 2016-01-20
2016-01-20 16:32:12 -05:00
Matteo Pagliazzi
1a31f73238
fix query when setting new group leader
2016-01-20 21:35:00 +01:00
Sabe Jones
274157d21d
Merge branch 'tylerxo/menu-error-fix' into develop
2016-01-20 14:34:55 -05:00
Sabe Jones
016b080836
Merge branch 'anowlcalledjosh/add-task-fix' into develop
2016-01-20 14:27:21 -05:00
Sabe Jones
af53285e01
Merge branch 'proarunas/fix-css-bugs' into develop
2016-01-20 14:17:39 -05:00
Kristian Tashkov
926f22f272
Add missing tests in group join route
2016-01-20 19:52:09 +02:00
Keith Holliday
ef6afaedb4
Added intitial group leave tests
...
Fixed test readability, updated party test, and updated challenge update code when leaving group
Updated library, added group existance check, and reset full party
Updated syntax, added new userUnlinkChallenges, and added some initial testing for challenges
Added challenge tasks tests
Added try/catch to group remove, add more party tests, fixed broken challenge test, removed useless return value
Added public guild tests, added more tests to party, and abstracted remove invitations logic
Closes #6506
2016-01-20 08:51:30 -06:00
Tyler Smith
f3d6c62484
More closely matching coding style within the file
2016-01-19 19:57:11 -08:00
Tyler Smith
b5b3a1545b
Adding conditional to prevent undefined object error
2016-01-19 19:53:20 -08:00
Josh Holland
77342e5790
Fix 'add task' button jumping around
2016-01-19 20:56:06 +00:00
Sabe Jones
023ee44ddc
Merge pull request #6553 from dbarnett/develop
...
Open links from task notes into new browser window/context (Fixes #5622 )
2016-01-19 14:54:59 -06:00
Sabe Jones
c4acd262eb
Merge pull request #6476 from Sighne/sighne/upgrade-amount-users
...
#6460 : upgrade amount of users
2016-01-19 13:41:03 -06:00
David Barnett
7a29542815
Open links from task notes into new browser window/context ( Fixes #5622 )
2016-01-19 11:01:41 -08:00
Sabe Jones
2848f5d709
Merge branch 'NathanMaton/fix-homepage-text' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:59:49 -05:00
Sabe Jones
95ee19b4ca
Merge branch 'taldin/faq-wiki-links' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-19 13:50:35 -05:00
Matteo Pagliazzi
3a300cb93e
add new emails images
2016-01-19 18:30:57 +01:00
Keith Holliday
be55176954
Ensured tavern is not returned twice and removed leader population
2016-01-19 08:13:24 -06:00
Blade Barringer
92657fa8af
refactor: Remove unused code in test
2016-01-18 22:40:11 -06:00
Jason Vinson
2989057dd3
Fix for issue #5182 : Allow cancel editing group infobox
2016-01-18 22:39:06 -06:00
Blade Barringer
0b5a8bf76d
chore(i18n): update locales
2016-01-18 18:24:44 -06:00
Blade Barringer
66083f766c
Merge branch 'api-v3' into api-v3-groups
2016-01-18 18:04:20 -06:00
Blade Barringer
32a2b3121e
Merge branch 'develop' into api-v3
2016-01-18 18:04:07 -06:00
Kristian Tashkov
5b740b1a11
Fix setting of environment variables in gulp test tasks in Windows
...
See this stackoverflow link for why this is necessary
http://stackoverflow.com/questions/27084392/code-coverage-for-mocha-in-windows-7/27193866#27193866
2016-01-18 16:55:15 -06:00
Sabe Jones
fc8c377eab
Merge pull request #6455 from querry43/docker-changes
...
Docker changes
2016-01-18 16:13:18 -06:00
Sabe Jones
d44ff94acb
Merge pull request #6547 from vIiRuS/guidelinespage
...
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 15:37:58 -06:00
Sabe Jones
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
Sabe Jones
9b008f71a0
fix(CSS): remove redundant style
2016-01-18 16:13:24 -05:00
Alys
fe58129cd3
remove Completion from Octopus quest text - ref https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-172600908
2016-01-19 06:18:49 +10:00
Phillip Thelen
d0de12abac
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 20:52:27 +01:00
Alys
fd62e39f20
fix spelling mistake: crystaline -> crystalline
2016-01-19 04:47:50 +10:00
Blade Barringer
477603539e
Merge branch 'api-v3' into api-v3-groups
2016-01-18 11:24:55 -06:00
Blade Barringer
64c4f0f94a
Merge branch 'develop' into api-v3
2016-01-18 11:24:34 -06:00
Blade Barringer
79f2dc6b1a
tests: Update gulp task to use npm scripts
2016-01-18 11:10:22 -06:00
Blade Barringer
c56f5fefc1
chore: remove unused npmignore
2016-01-18 10:14:06 -06:00
Blade Barringer
1ff9db253b
Merge branch 'api-v3' into api-v3-groups
2016-01-18 10:13:48 -06:00
Blade Barringer
aa68a5ed38
fix: Update vagrant to use npm 3
2016-01-18 10:13:09 -06:00
Blade Barringer
a0a840e22a
Merge branch 'develop' into api-v3
2016-01-18 10:12:42 -06:00
Blade Barringer
89ef7c24c4
refactor: Modularize vagrant scripts
2016-01-18 10:08:49 -06:00
Blade Barringer
0ee7970276
fix: vagrant provisioning installs node automatically
2016-01-18 08:47:57 -06:00
Matteo Pagliazzi
ee854229c7
fix dateCompleted not remove from un-completed todos and fix tasks test
2016-01-18 15:01:46 +01:00
Blade Barringer
5b0d3be444
Merge branch 'develop' into KristianTashkov-nvm-in-vagrant-develop
2016-01-18 06:47:17 -06:00
Blade Barringer
0c1bb2e4df
Merge pull request #6119 from nivl4/nivl4/vagrant
...
Update vagrant provisioning script to create symlinks for any binaries the package might contain
2016-01-18 06:42:28 -06:00
Blade Barringer
af19d0d77b
fix: Correct stylus comment about modal height
2016-01-17 16:11:42 -06:00
Blade Barringer
0a2c833f9b
Merge branch 'tylerxo-develop' into develop
2016-01-17 16:10:59 -06:00
Blade Barringer
53f93675c3
Merge branch 'anowlcalledjosh-homepage_news_icons' into develop
2016-01-17 16:07:30 -06:00
Keith Holliday
d93cabafb9
Added initial tests for createChallengeTasks and fixed some issues in the challenge and challengeTask routes
2016-01-17 16:03:19 -06:00
Kristian Tashkov
f37b5a7fac
Challenges join route and tests
2016-01-17 15:44:15 -06:00
Blade Barringer
b24ff233f2
Merge pull request #6542 from crookedneighbor/api_v3_generate_challenge
...
Api v3 generateChallenge helper
2016-01-17 14:55:18 -06:00
Keith Holliday
c5947ca9c4
Updated party test to conform to new leader populate
2016-01-17 14:20:51 -06:00
Keith Holliday
417d754a0d
Added intial group remove member tests
2016-01-17 14:02:17 -06:00
Blade Barringer
7b59455252
tests(api): Add generateChallenge helper
2016-01-17 13:58:46 -06:00
Blade Barringer
81e6172fb1
tests: Tighten up generateGroup members helper
2016-01-17 13:42:09 -06:00
Keith Holliday
b60e0a4c64
Added initial get groups tests
2016-01-17 13:32:31 -06:00
Blade Barringer
b75adb4f3b
tests(api): Pull in theunknown's changes to createAndPopulateGroup
...
bf6814265c
2016-01-17 13:22:39 -06:00
Blade Barringer
1e9f24a6b0
Merge branch 'api-v3' into api-v3-groups
2016-01-17 11:45:00 -06:00
Blade Barringer
5d803fde56
tests(api): Adjust v3 api-integration helper to export all generate methods
2016-01-17 11:43:31 -06:00
Blade Barringer
08381793a8
Merge branch 'develop' into api-v3
2016-01-17 11:41:49 -06:00
Blade Barringer
4a3871f52f
tests(api): Add ApiChallenge class
2016-01-17 11:41:29 -06:00
Matteo Pagliazzi
3630f5a3ea
Merge pull request #6504 from HabitRPG/api-v3-members
...
[API v3] Members routes
2016-01-17 18:40:17 +01:00
Matteo Pagliazzi
ec7ed9c90e
add tests for getChallengeMemberProgress route and several bug fixes
2016-01-17 18:31:03 +01:00
Matteo Pagliazzi
8de8ca7e18
add getChallengeMemberProgress route and misc fixes
2016-01-17 12:01:57 +01:00
Matteo Pagliazzi
c27f98075c
Merge branch 'api-v3-groups' into api-v3-members
2016-01-17 11:24:10 +01:00
Blade Barringer
38cdf07a4d
Merge branch 'api-v3' into api-v3-groups
2016-01-16 21:56:55 -06:00
Blade Barringer
5de2503039
Merge branch 'develop' into api-v3
2016-01-16 21:54:13 -06:00
Blade Barringer
96f6bbfb0c
tests(api): Add sync method to api objects
2016-01-16 21:50:54 -06:00
Blade Barringer
965c5dbaa7
Merge branch 'api-v3' into api-v3-groups
2016-01-16 19:46:47 -06:00
Blade Barringer
a44cf5e0fc
lint: Fix linting erros in test helpers
2016-01-16 19:27:03 -06:00
Blade Barringer
5dd2dcd6d8
Merge branch 'improve_tests' into api-v3
2016-01-16 19:24:39 -06:00
Blade Barringer
87d4c68bea
lint: Correct linting errors
2016-01-16 19:13:33 -06:00
Tyler Smith
1d7c30a06d
Fixes for the profile modal
...
This commit fixes the following:
1. Unintented scrollbar was being created on the .modal container element
2. 15px gap between the footer and scrollable content, creating an odd visual lapse
3. Modal was too wide between 768px and 900px, bleeding off the page.
2016-01-16 16:14:20 -08:00
Blade Barringer
ec9d0fd278
tests: Set up placeholder file for api test helpers
2016-01-16 18:13:11 -06:00
Blade Barringer
07f08de989
Merge branch 'improve_tests' into api-v3
2016-01-16 18:12:36 -06:00
Blade Barringer
91ffe5c402
tests(api): Reorganize integration helper for v2
2016-01-16 17:28:36 -06:00
Blade Barringer
ef5064f351
Move generators to own file
2016-01-16 17:23:30 -06:00
Joshua Holland
e98dc1405b
Fix rendering of front page news icons
...
Rendering was 'pixelated', is now 'auto'.
2016-01-16 22:43:29 +00:00
Joshua Holland
c85f994f4c
Make .img-rendering-auto apply to descendants
2016-01-16 22:39:40 +00:00
Blade Barringer
6287ae6776
tests(api): Outsource mongo updates to mongo module in api helper
2016-01-16 14:33:53 -06:00
Blade Barringer
80224adafa
tests: Extract mongo functions into separate file
2016-01-16 14:12:26 -06:00
Blade Barringer
54159c069d
tests: Move api translation checkout out into separate file
2016-01-16 14:09:20 -06:00
Blade Barringer
e9f618da5e
tests: Extract api objects to separate files
2016-01-16 14:06:47 -06:00
Blade Barringer
29415441f7
tests: Create base class that ApiUser and ApiGroup inherit from
2016-01-16 09:48:51 -06:00
Blade Barringer
9f2a8c03b2
tests: Remove references to different api routes in helper
2016-01-16 09:45:02 -06:00
Matteo Pagliazzi
f8f591e521
do not use wait inside for loop
2016-01-16 16:37:21 +01:00
Matteo Pagliazzi
a59da8607b
add tests for getting invites to a group
2016-01-16 16:32:46 +01:00
Matteo Pagliazzi
4e5c4e9953
add missing test file
2016-01-16 16:18:29 +01:00
Matteo Pagliazzi
f447af19ae
add tests for getting challenge members and fix a lot of bugs
2016-01-16 16:18:06 +01:00
Matteo Pagliazzi
d7d63ad229
populate group.leader
2016-01-16 15:10:18 +01:00
Sighne
4d1daf1c41
Uses a const instead of a variable
2016-01-16 11:11:48 +01:00
Sighne
a716ce3fa7
Adds a variable to manage user count
2016-01-16 11:11:48 +01:00
Sighne
5931ddf2ba
Decrease margin for the new logo to fit in social pages
2016-01-16 11:11:48 +01:00
Sighne
ffe1dd6c6a
Upgrade amount of users where I missed and add Discover logo on social pages
2016-01-16 11:11:48 +01:00
Sighne
a9f10380b9
Upgrades amount of users on static page
2016-01-16 11:11:48 +01:00
Sighne
de3d4ae8e7
Adds Discover magazine logo
2016-01-16 11:11:48 +01:00
Blade Barringer
28fc6dd4bd
tests: Convert helpers to use async/await
2016-01-15 20:36:54 -06:00
Matteo Pagliazzi
96c523493a
fix missing semicolon
2016-01-15 22:08:51 +01:00
Matteo Pagliazzi
ad41037f59
finish tests for members controller
2016-01-15 21:47:20 +01:00
Sabe Jones
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
Matteo Pagliazzi
2ee75c1ad3
add tests for getMember
2016-01-15 19:44:45 +01:00
Matteo Pagliazzi
b0caf71641
fix several busg with tasks and challenges
2016-01-15 18:54:28 +01:00
Taldin
3b3c1fead7
Moved the Habitica Wiki link down to the bottom
...
Per Lemoness' request.
2016-01-15 09:48:16 -08:00
Matteo Pagliazzi
3eb9d4b098
members controller: support challenges
2016-01-15 15:30:13 +01:00
Matteo Pagliazzi
50a85337a7
better access control for challenges
2016-01-15 15:29:50 +01:00
Matteo Pagliazzi
e0b10d44ca
Merge branch 'api-v3-groups' into api-v3-members
2016-01-15 11:22:11 +01:00
Luveluen
5315cc9055
Update character.json to separate optOut into two translation strings
...
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.
Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
Georgi Gardev
24e08676db
Add icon for pinned Safari tabs
...
Fixes #6451
Closes #6522
2016-01-14 20:32:51 -06:00
Georgi Gardev
e761315c74
Remove tooltip for 'reverse chat messages' checkbox
...
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -06:00
Josh Holland
a0b264f686
Align progress and help icons on to-dos column
...
Fixes #6474
As per #6474 , progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.
Move inline styles on task column icons to a class
This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.
In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
2016-01-14 20:24:09 -06:00
Blade Barringer
c084b6b7cd
Merge pull request #6526 from HabitRPG/no_sprite_sheets_css
...
refactor: Remove compiled spritesheet from source control
2016-01-14 18:10:31 -06:00
Blade Barringer
d02c3d321e
refactor: Remove compiled spritesheet from source control
2016-01-14 18:03:14 -06:00
Blade Barringer
2a6241d549
Merge pull request #6520 from HabitRPG/api-v3-groups-create-and-populate
...
Add createAndPopulate group helper for v3
2016-01-14 17:26:35 -06:00
Sabe Jones
b6b2c25358
style(modal): text and visual tweaks for Gems
2016-01-14 15:58:14 -05:00
Matteo Pagliazzi
7d5a7503cb
fix access to user.tasksOrder
2016-01-14 20:55:13 +01:00
Matteo Pagliazzi
5206469e90
add unlinkTask route and refactor user.unlink (now user.unlinkChallengesTasks)
2016-01-14 19:46:43 +01:00
Blade Barringer
5ff54fa332
Merge branch 'api-v3-groups' into api-v3-groups-create-and-populate
2016-01-14 12:23:52 -06:00
Blade Barringer
0f5cf318d9
fix: Update member objects with guild info in test helper
2016-01-14 12:22:56 -06:00
Matteo Pagliazzi
01458574f9
Merge branch 'api-v3-challenges-tasks' into api-v3-groups
2016-01-14 18:27:22 +01:00
Matteo Pagliazzi
2b9aa11598
Merge branch 'api-v3-groups' into api-v3-challenges-tasks
2016-01-14 18:25:59 +01:00
Blade Barringer
42530b9a5f
refactor(tests): Adjust tests to use createAndPopulateGroup
2016-01-14 08:56:16 -06:00
Blade Barringer
2cc02ee1f1
refactor(test helper): Fix api v3 helper to be specific for v3
2016-01-14 08:55:44 -06:00
Sabe Jones
b0a9425cee
Merge pull request #6512 from HabitRPG/sabrecat/pets-201601
...
feat(quests): January 2016 pet
2016-01-13 17:01:57 -06:00
Sabe Jones
14a6d0dabf
feat(quests): January 2016 pet
2016-01-13 17:15:02 -05:00
Matteo Pagliazzi
52eaecf653
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2016-01-13 23:07:34 +01:00
Matteo Pagliazzi
9a908785c1
new history preening, save tasks after cron
2016-01-13 23:07:08 +01:00
Blade Barringer
1f4e58e5cc
tests(api): Port integration helper to v3 version for groups tests
2016-01-13 12:39:23 -06:00
Blade Barringer
799b3780b1
Merge branch 'api-v3' into api-v3-groups
2016-01-13 12:32:48 -06:00
Blade Barringer
b68861681c
tests(integration): Create separate helper for api integration tests
2016-01-13 12:32:36 -06:00
Matteo Pagliazzi
6f6d4edcec
Merge branch 'api-v3-groups' into api-v3-members
2016-01-13 18:41:53 +01:00
Matteo Pagliazzi
4afad11067
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:41:27 +01:00
Matteo Pagliazzi
771bc0c5b5
put back acceptablePUTPaths variable deleted in merge
2016-01-13 18:41:09 +01:00
Matteo Pagliazzi
e2edb974d7
Merge branch 'api-v3' into api-v3-groups
2016-01-13 18:40:04 +01:00
Matteo Pagliazzi
914b2eb008
Merge branch 'develop' into api-v3
2016-01-13 18:39:44 +01:00
Matteo Pagliazzi
6088b6da42
fix edge case where res.respond would not work, misc comments
2016-01-13 18:35:29 +01:00
Matteo Pagliazzi
7c15472fab
wip on members controllers
2016-01-13 18:29:02 +01:00
Alys
fc01104a0d
change habitrpg to habitica for PayPal subscription config
2016-01-14 03:08:16 +10:00
Matteo Pagliazzi
f83b271b30
rever new history preening
2016-01-13 11:07:52 +01:00
Blade Barringer
7a8321ec36
Merge branch 'api-v3' into api-v3-groups
2016-01-12 18:10:48 -06:00
Blade Barringer
c9d378ab35
tests(api): bring in await format tests
2016-01-12 18:10:10 -06:00
Blade Barringer
0c30b56bb0
Merge pull request #6498 from TheHollidayInn/api-v3-groups-update
...
Added initial group update tests
2016-01-12 18:03:38 -06:00
Blade Barringer
a3fd838677
tests(api): Fix PUT /task test to be valid
2016-01-12 18:01:47 -06:00
Blade Barringer
ae67efd7ce
Merge branch 'GeorgeSG-api-v3-groups' into api-v3-groups
2016-01-12 17:47:21 -06:00
Blade Barringer
336d8c9916
tests(api): Clean up misc test styles
2016-01-12 17:36:14 -06:00
Blade Barringer
fdfc8fb2f5
Merge branch 'api-v3-groups' into GeorgeSG-api-v3-groups
2016-01-12 17:20:55 -06:00
Sabe Jones
9887fe58c4
fix(Stripe): zoom out so gryphon is visible
2016-01-12 16:12:44 -05:00
Sabe Jones
6247d5e365
Merge pull request #6346 from HabitRPG/sabrecat/conditional-buy-gem
...
(WIP) Conditional Buy Gem modal, cont'd
2016-01-12 14:47:31 -06:00
Sabe Jones
81842bbee1
fix(subscription): visual and wording tweaks
2016-01-12 15:29:10 -05:00
Sabe Jones
2db1ef0f7a
style(subscriptions): Gem layout feedback
2016-01-12 15:00:07 -05:00
AnitaYCheng
8bc78af5ae
Added specificity to CSS, removed exxtra line
2016-01-12 15:00:07 -05:00
AnitaYCheng
bf6ebd88f6
Modifications to settings mixin and misc last changes.
2016-01-12 15:00:07 -05:00
AnitaYCheng
6a72027d8b
Add subscription conditionals for buying or purchasing gems
2016-01-12 14:58:39 -05:00
AnitaYCheng
5f88aef3ca
Add new mixin for purchasing gems. Add new areas that will be conditionally set by user subscription status.
2016-01-12 14:58:39 -05:00
AnitaYCheng
313a18971e
Add CSS changes for conditional buy-gem modal
2016-01-12 14:58:39 -05:00
AnitaYCheng
2a8eb9f476
Added translation strings for conditional buy-gems modal
2016-01-12 14:58:39 -05:00
Keith Holliday
e4fd37f3d0
Cleaned up code style and abstracted variables that are reused.
2016-01-12 13:08:13 -06:00
Matteo Pagliazzi
45aacc1e6f
challenge.group -> challenge.groupId
2016-01-12 19:43:41 +01:00
Keith Holliday
da02f8ca0f
Removed pending status on test
2016-01-12 11:48:07 -06:00
Keith Holliday
99217e865c
Added initial group update tests
2016-01-12 11:44:44 -06:00
Georgi Gardev
ac6a0276ab
Refactor Tasks tests to use await syntax
2016-01-12 19:11:59 +02:00
Georgi Gardev
2e3bee08d8
Refactor User tests to use await expect instead of return expect
2016-01-12 19:00:16 +02:00
Matteo Pagliazzi
12705932e3
abstract common logic in members controller
2016-01-12 18:00:03 +01:00
Georgi Gardev
eaddf5a393
Refactor notFound test to use await expect syntax
2016-01-12 18:59:53 +02:00
Matteo Pagliazzi
55db0a4a4b
add routes to get a single user, get members for a group, get members invited to a group
2016-01-12 17:27:06 +01:00
Georgi Gardev
98b0db749b
Refactor User tests to use await syntax
2016-01-12 18:02:09 +02:00
Matteo Pagliazzi
baf0179eb7
Merge branch 'TheHollidayInn-api-v3-groups-invites' into api-v3-groups
2016-01-12 15:48:59 +01:00
Matteo Pagliazzi
b102ff7cae
Merge branch 'api-v3-groups-invites' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-invites
2016-01-12 15:48:47 +01:00
Keith Holliday
1b395b39f8
Added invite limit and tests for when multiple users with an error
2016-01-12 08:43:11 -06:00
Keith Holliday
9141598a34
Updated invite route and function for new standards, and added tests.
2016-01-12 08:43:11 -06:00
Blade Barringer
36cd9e9430
tests(api): Increase test coverage for group post tests
2016-01-12 08:14:50 -06:00
Blade Barringer
88755e69ae
tests(api): Simplify tests
2016-01-12 08:14:12 -06:00
Georgi Gardev
ddd0709b12
Refactor Tags tests to use await syntax
2016-01-12 16:12:35 +02:00
Blade Barringer
fffa95ca09
refactor: Test against party not being private, instead of public
2016-01-12 08:11:19 -06:00
Kristian Tashkov
37cabedecb
Use nvm to install node 4 to vagrant env
2016-01-11 22:29:23 +02:00
Sabe Jones
dba620ee7a
Merge pull request #6417 from GeorgeSG/reverse-chat-option
...
Add option to reverse chat order
2016-01-11 12:55:28 -06:00
Sabe Jones
7e8f0d24c5
Merge remote-tracking branch 'origin/pr/6307' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-11 13:48:01 -05:00
Keith Holliday
ffbd4696e3
Converted posts tests to async/await syntax and updated tests
2016-01-11 12:35:46 -06:00
Matteo Pagliazzi
9e61137e8e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-01-11 18:30:10 +01:00
Matteo Pagliazzi
5244702e48
perf improvements for challenges history and migration
2016-01-11 18:29:39 +01:00
Alys
0d47f8d116
allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405
2016-01-12 02:58:33 +10:00
Matt Harrington
1a1823bd43
fixup
2016-01-11 05:17:20 +00:00
Matt Harrington
67f184c0f4
docker maintenance
...
- added docker-compose.yml for quick one-command spinup
- added docker-compose.dev.yml to override /habitrpg mount
- modified Dockerfile to accept /habitrpg mount
2016-01-11 05:04:22 +00:00
Matt Harrington
85c532fe8a
docker maintenance
...
- removing broken sed (was also updating BASE_URL) in favor of NODE_DB_URI (will require documentation)
- changing build order to reduce rebuilding some things unnecessarily
- more effectively using WORKDIR to simplify commands
2016-01-11 05:04:22 +00:00
Matteo Pagliazzi
193e89a79e
fix index when marking task as modified after history preening
2016-01-10 15:57:22 +01:00
Taldin
fd81f70ffa
Adjusted for generic translation
...
Per Lady Alys's suggestion.
2016-01-09 23:59:05 -08:00
Blade Barringer
c5ad006007
chore(i18n): update locales
2016-01-09 23:46:53 -06:00
Blade Barringer
980bec9be3
Merge pull request #6456 from querry43/use-example-dot-com
...
use example.com in the example json so as not to spam legit servers
2016-01-09 23:38:38 -06:00
Blade Barringer
502ba27b47
chore(sprites): Compile sprites
2016-01-09 23:32:17 -06:00
Nathan Maton
b26d3bef40
replaced collars
2016-01-09 23:29:54 -06:00
Matteo Pagliazzi
1d0b05a6df
fix typo in history preening
2016-01-09 21:17:17 +01:00
Matteo Pagliazzi
f55e4f65f9
Merge pull request #6483 from HabitRPG/new-history-preening
...
fixes for new history preening, allow only 1 history entry per day in…
2016-01-09 21:03:18 +01:00
Matteo Pagliazzi
b1a7e44722
fixes for new history preening, allow only 1 history entry per day in challenges tasks
2016-01-09 21:02:40 +01:00
Matteo Pagliazzi
be0fe3eb4f
Merge pull request #6479 from HabitRPG/new-history-preening
...
New history preening
2016-01-09 20:12:33 +01:00
Matteo Pagliazzi
2fff34cff4
finalize tests
2016-01-09 19:47:18 +01:00
pittaxx
8cd34e49bd
Removed extra scrollbars at medium width. Cleared floating for todo tab in medium width.
2016-01-09 18:47:04 +02:00
Alys
58a92f626d
Merge pull request #6464 from HabitRPG/fix_stat_allocation_bug
...
fix: Corrects stat allocation bug where it was possible to receive more points than 100
2016-01-09 23:00:06 +10:00
Matteo Pagliazzi
dec08955ac
fix tests
2016-01-08 23:02:18 +01:00
Sabe Jones
1b7f17cbd2
chore(news): Bailey 2016-01-08
2016-01-08 16:28:49 -05:00
Sabe Jones
eadf967c9f
Merge pull request #6409 from pnrich/flag-text
...
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648 , parts 3 and 4
2016-01-08 14:05:22 -06:00
Matteo Pagliazzi
82651cf1ed
initial tests
2016-01-08 18:58:54 +01:00
Matteo Pagliazzi
ae852f9a2e
complete preening and enable for challenges too
2016-01-08 17:47:08 +01:00
Matteo Pagliazzi
243b839392
wip: new history preening, delineate process and differentiate between subscribers and non
2016-01-07 20:07:13 +01:00
Matteo Pagliazzi
fdd5ab724a
begin implementing new preenUserHistory method: port current code to es6 and setup tests
2016-01-07 18:44:25 +01:00
Blade Barringer
44dd6674d1
Merge branch 'TayHobbs-develop' into develop
2016-01-06 20:52:53 -06:00
Blade Barringer
8a19a84f3f
lint(tests): Add e2e tests to linter
2016-01-06 20:52:24 -06:00
Taylor Hobbs
a92646b4e9
tests(e2e): Fix test name to use proper English
2016-01-06 20:09:42 -06:00
Daniel Van Camp
99a694bb10
added EU version of t-shirt
2016-01-06 23:15:36 +01:00
Daniel Van Camp
0362977dbd
Merge branch 'develop' into static-page-merch
2016-01-06 22:38:19 +01:00
Matteo Pagliazzi
f235010536
add getChallenge route and remove old code
2016-01-06 22:29:47 +01:00
Sabe Jones
a150efc202
Merge pull request #6473 from HabitRPG/sabrecat/armoire-201601
...
Backgrounds and Armoire 2016-01
2016-01-06 14:29:37 -06:00
Sabe Jones
adfa248dd0
feat(content): backgrounds and Armoire 2016-01
2016-01-06 15:11:20 -05:00
Matteo Pagliazzi
9dfcad238c
rename tasks tests to match new routes
2016-01-06 18:41:25 +01:00
Matteo Pagliazzi
8ba486ec12
change tasks routes to /tasks/(user|challenge)
2016-01-06 18:40:11 +01:00
Matteo Pagliazzi
2b2dcfe7ce
do not delete completed todos that belongs to a challenge
2016-01-06 12:25:53 +01:00
Matteo Pagliazzi
3a6d7bd466
fix sync of remove challenge task
2016-01-06 12:16:41 +01:00
Nathan Maton
602dfd8369
went with head on habitrpg-shared.css
2016-01-05 22:09:33 -08:00
Nathan Maton
ef52e276ce
try 2 to ignore the right files
2016-01-05 20:10:19 -08:00
Nathan Maton
6fa0fbc03a
tried to remove .gitignore from push
2016-01-05 20:06:57 -08:00
Nathan Maton
0e28c59878
changed type of activity from habit to daily for goals and chores on front page
2016-01-05 19:48:55 -08:00
Taldin
07fc30a131
update help menu and FAQ to jump to Wikia
...
The Help > FAQ option no longer jumps to the Wiki. Added a help menu
item to fix that. I also added a link to the Wiki FAQ at the bottom of
the FAQ.
2016-01-05 12:19:18 -08:00
Matteo Pagliazzi
a5b1dfd32d
finish implementing tasks syncing for challenges
2016-01-05 20:19:55 +01:00
Blade Barringer
8a546c7ec3
chore(i18n): update locales
2016-01-05 08:40:48 -06:00
Blade Barringer
75f71bc2ca
fix: Corrects stat allocation bug where it was possible to recieve more points than 100
...
fixes #6434
2016-01-05 08:35:40 -06:00
Sabe Jones
cb984d8d22
fix(event): remove NYE card
2016-01-04 18:27:52 -05:00
Alys
8db492099c
Revert "fix(common): Corrects bug where stat points could be awarded after level 100"
...
This reverts commit 2bbdf66d76 .
2016-01-05 07:05:40 +10:00
Alys
ece0de51cc
Revert "assign correct number of attribute points after leveling up - fixes 6434"
...
This reverts commit 53e2939ad9 .
2016-01-05 07:05:26 +10:00
Matteo Pagliazzi
3bc8945bcc
adapt current tests and change urls to avoid conflicts
2016-01-04 22:03:21 +01:00
Alys
53e2939ad9
assign correct number of attribute points after leveling up - fixes 6434
2016-01-05 06:31:43 +10:00
Matteo Pagliazzi
6680853078
finish adding challenges support for tasks (except syncing)
2016-01-04 20:48:48 +01:00
Matteo Pagliazzi
b73f5a8f40
add support for getting single challenges tasks
2016-01-04 19:57:20 +01:00
Matteo Pagliazzi
d25cb70f66
wip get and create tasks plus initial user syncing
2016-01-04 19:44:39 +01:00
Sabe Jones
cc00602112
fix(event): remove magic potions
2016-01-04 11:56:34 -05:00
Blade Barringer
2bbdf66d76
fix(common): Corrects bug where stat points could be awarded after level 100
...
Closes #6434
2016-01-04 07:58:59 -06:00
Matt Harrington
cad31cb69a
use example.com in the example json so as not to spam legit servers
2016-01-04 05:30:58 +00:00
Blade Barringer
837c27ff4c
Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars
...
Encode special characters when sending to paypal
2016-01-03 19:40:39 -06:00
Blade Barringer
874f319d95
fix: Corrects logic where it was possible to customize avatar
...
with gem purchasable items without purchasing them.
Closes #6427
Closes #6448
lint(common): Add unnecessary quotes to make object look less weird
2016-01-03 10:41:44 -06:00
Blade Barringer
45eed84d55
Merge pull request #6446 from KristianTashkov/group-join-tests
...
Add tests for group join route
2016-01-03 10:16:24 -06:00
Kristian Tashkov
5bcce0b86b
Add tests for group join route
2016-01-03 18:09:17 +02:00
Blade Barringer
f38d0ebf81
Merge branch 'api-v3' into api-v3-groups
2016-01-03 09:50:38 -06:00
Blade Barringer
f80f41f764
lint: Correct linting errors in v3 tests
2016-01-03 09:47:27 -06:00
Blade Barringer
76c97dfa6e
Merge branch 'api-v3' into api-v3-groups
2016-01-02 22:29:59 -06:00
Blade Barringer
37916271e8
Merge branch 'develop' into api-v3
2016-01-02 22:29:03 -06:00
Blade Barringer
dfa2228dcc
tests(api): Convert v2 status test to use await syntax
2016-01-02 22:23:53 -06:00
Blade Barringer
116fffaf4f
lint: Fix linting errors in api v2 tests
2016-01-02 22:19:47 -06:00
Blade Barringer
ff1e5ef221
lint: Use eslint --fix to automatically fix some issues in api v2 tests
2016-01-02 18:28:06 -06:00
Blade Barringer
262d04e14c
lint(tests): Re-enable inting for api tests
2016-01-02 18:27:27 -06:00
Blade Barringer
c06d87b98b
lint: Add babel rules to .eslintrc
2016-01-02 18:25:30 -06:00
Matteo Pagliazzi
a775c992ab
fix linting and add pending test
2016-01-02 18:23:01 +01:00
Matteo Pagliazzi
27065b3f4d
more tests for user.tasksOrder
2016-01-02 18:21:06 +01:00
Matteo Pagliazzi
743f98d67d
make sure user.tasksOrder is update only when necessary
2016-01-02 17:46:31 +01:00
Matteo Pagliazzi
7490bfae87
update POST-tasks test to async/await syntax
2016-01-02 16:04:39 +01:00
Matteo Pagliazzi
775766b30f
allow multiple tasks to be created at once
2016-01-02 15:43:33 +01:00
Blade Barringer
66572ad9d5
tests(api): Update PUT user test to use await
2016-01-01 19:37:14 -06:00
Blade Barringer
195fdce9ce
tests(api): Update GET groups and GET groups id tests to use await
2016-01-01 19:33:23 -06:00
Blade Barringer
9f9ba2797a
tests(api): Update complex beforeEachs to use await
2016-01-01 13:31:11 -06:00
Blade Barringer
70b23d0629
tests(api): Convert simple user generation to use await
2016-01-01 13:17:25 -06:00
Blade Barringer
ed753f4921
tests(api): Remove extra async
2016-01-01 12:56:43 -06:00
Blade Barringer
69c5192f70
tests(api): Add async to every it, before and beforeEach in v2 tests
2016-01-01 10:33:26 -06:00
Alys
23aaf78167
revert change to Bailey about Party Hats now that the code behaviour has changed
2016-01-01 16:06:52 +10:00
Sabe Jones
2c6f600703
fix(event): NYE hat for new users
2015-12-31 21:35:17 -05:00
Alys
6a7cd0900e
adjust Bailey message about party hats to clarify that they're not available to players who join from now on, and that only one hat will appear for each player
2016-01-01 11:24:15 +10:00
Blade Barringer
91e7b9eb32
tests(api): Convert GET and flag chat posts to use async/await
2015-12-31 18:11:03 -06:00
Blade Barringer
90cd322af5
Merge branch 'api-v3' into api-v3-groups
2015-12-31 15:50:46 -06:00
Blade Barringer
3a0e7149f6
Merge branch 'develop' into api-v3
2015-12-31 15:50:34 -06:00
Blade Barringer
730e5e3431
chore(lint): Add sandbox as global to test .eslintrc
2015-12-31 15:49:59 -06:00
Blade Barringer
0d75d5b541
lint: Move test eslint rules to .eslintrc in test directory
2015-12-31 15:46:47 -06:00
Kristian Tashkov
7025bbfa32
Fix basilist scroll giving logic when joining party
...
closes #6416
2015-12-31 12:32:52 -06:00
Blade Barringer
7cf43680e6
Merge branch 'api-v3' into api-v3-groups
2015-12-31 12:22:20 -06:00
Blade Barringer
aa6f5fff23
Merge branch 'develop' into api-v3
2015-12-31 12:17:57 -06:00
Blade Barringer
108f90b0bf
tests(api): Add update method for api user
2015-12-31 12:15:57 -06:00
Blade Barringer
4bc96c2c99
tests(api): Update GET /user test to use async syntax
2015-12-31 12:11:40 -06:00
Blade Barringer
9428c6d997
lint: Correct linting errors in api v3 tests
2015-12-31 08:57:20 -06:00
Blade Barringer
70151fd073
lint: Fix tests that can be fixed with the eslint --fix flag
2015-12-31 08:57:20 -06:00
Blade Barringer
6f220c6869
lint: Turn on linting for v3 group tests
2015-12-31 08:57:20 -06:00
Blade Barringer
16e8104d35
chore: Move eslint modules to devDependencies
2015-12-31 07:42:15 -06:00
Blade Barringer
bf0a5cba2b
fix: Remove extranous comma in eslint confi
2015-12-31 07:37:25 -06:00
Blade Barringer
a86c160370
Merge pull request #6424 from HabitRPG/api-v3-async
...
Port API v3 controllers to es7 async functions
2015-12-31 07:34:33 -06:00
Alys
5304b37102
properly fix Winter Flame Set
2015-12-31 22:09:06 +10:00
Alys
e7cbb2cd16
add Winter Flame Set to locale file - fixes #6433
2015-12-31 21:49:21 +10:00
Matteo Pagliazzi
aebe2fa400
finish porting to async/away syntax
2015-12-31 11:46:21 +01:00
Georgi Gardev
430bcd2652
Encode special characters when sending to paypal
2015-12-31 02:46:56 +02:00
Sabe Jones
02f4a84146
fix(news): Winter Flame not Penguin
2015-12-30 18:38:00 -05:00
Blade Barringer
790cf647e5
Merge pull request #6423 from crookedneighbor/test_with_async_and_await
...
tests(api): Convert new group tests to use async and await (ES7)
2015-12-30 17:34:56 -06:00
Blade Barringer
4563f0efb7
tests(api): Convert new group tests to use async and await (ES7)
2015-12-30 17:32:08 -06:00
Sabe Jones
050baf96d8
Merge pull request #6413 from HabitRPG/sabrecat/nye2015
...
New Year's Eve 2015
2015-12-30 16:09:45 -06:00
Matteo Pagliazzi
f76c9d025f
remove comments
2015-12-30 23:00:54 +01:00
Matteo Pagliazzi
25b0c3be2b
porh auth controller to es7 async functions
2015-12-30 22:59:36 +01:00
Sabe Jones
6c3e8e2081
feat(event): more NYE
2015-12-30 16:58:57 -05:00
Georgi Gardev
42d09bd758
Reverse order of chat messages from chat box
2015-12-30 23:47:10 +02:00
Georgi Gardev
beaf0b83bb
Add option to reverse order of chat messages
2015-12-30 23:47:03 +02:00
Matteo Pagliazzi
59b8ba0c85
add TODOs to tavern creation
2015-12-30 17:14:20 +01:00
Blade Barringer
dc3407e1af
tests(api): Convert groups tests to use user['HTTP_METHOD'] syntax
2015-12-30 08:44:02 -06:00
Blade Barringer
cd9fe5f1b6
Merge branch 'api-v3' into api-v3-groups
2015-12-30 08:30:43 -06:00
Blade Barringer
ca1513aaa9
tests(api): Use new user['HTTP_METHOD'] for v3 integration tests
2015-12-30 08:25:06 -06:00
Blade Barringer
a662d4b688
Merge branch 'develop' into api-v3
2015-12-30 07:58:55 -06:00
Blade Barringer
eab15a3dd0
tests(api): Port over new integration helper from develop
2015-12-30 07:57:41 -06:00
Blade Barringer
802bb93b6c
tests(api): Update integration helper in v2 to v3 changes
2015-12-29 20:37:29 -06:00
Blade Barringer
381b30fcfc
Merge pull request #6415 from crookedneighbor/add_user_request_class
...
Add user request class for integration tests
2015-12-29 19:55:39 -06:00
Blade Barringer
4c74c9949c
Correct linting error
2015-12-29 17:43:11 -06:00
Blade Barringer
4cf9518a5a
tests(api): Convert tests to use new api user methods
2015-12-29 17:34:33 -06:00
Blade Barringer
b2336c7adf
tests(api): Add http methods to user object that is returned form generateUser
2015-12-29 17:34:11 -06:00
Matteo Pagliazzi
24f1b8c71b
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2015-12-29 21:37:25 +01:00
Matteo Pagliazzi
a5aeb6917e
allow getGroup to optionally work for groups where the user is not a member
2015-12-29 21:36:52 +01:00
Matteo Pagliazzi
8361afc433
Merge pull request #6412 from KristianTashkov/fix-api-v3-tests
...
Fix GET chat tests stopping execution of other tests in api-v3-groups branch
2015-12-29 21:05:46 +01:00
Matteo Pagliazzi
08e0c67089
refactor pushNotifications
2015-12-29 20:57:37 +01:00
Matteo Pagliazzi
6003dad24b
misc fixes, port challenge task scoring, delete chal and select winner
2015-12-29 20:57:20 +01:00
Sabe Jones
054e3cb361
feat(event): New Year's Eve 2015
2015-12-29 14:55:05 -05:00
Kristian Tashkov
411bfe1bb6
Fix GET chat tests stopping execution of other tests
2015-12-29 20:51:16 +02:00
Matteo Pagliazzi
61fc490f84
port challenges\' tasks scoring
2015-12-29 18:35:34 +01:00
Matteo Pagliazzi
a44090e1ed
Merge branch 'api-v3' into api-v3-groups
2015-12-29 18:17:36 +01:00
Blade Barringer
ae9ec63229
Merge branch 'develop' into api-v3
2015-12-29 08:07:04 -06:00
Blade Barringer
bce049a316
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
2015-12-29 08:06:22 -06:00
Blade Barringer
f3ae42e49a
refactor(common): Update beastmaster functions to use newer each syntax
2015-12-29 08:03:19 -06:00
Matteo Pagliazzi
71a910ccfb
temporary fix for eslint
2015-12-29 14:45:29 +01:00
Blade Barringer
773bb23b88
chore(dependency): Remove unneeded lodash submodules
2015-12-29 07:45:13 -06:00
Blade Barringer
b3050e5a67
chore(dependency): Upgrade lodash from v2 to v3
2015-12-29 07:45:03 -06:00
Matteo Pagliazzi
565d5f08dc
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2015-12-29 14:43:40 +01:00
Matteo Pagliazzi
547e8a04f5
cleanup group model
2015-12-29 14:43:29 +01:00
Matteo Pagliazzi
ad58a77b75
Merge pull request #6393 from TheHollidayInn/api-v3-chat-post
...
Added chat post route and initial tests
2015-12-29 13:57:47 +01:00
Blade Barringer
33714b4947
chore(i18n): update locales
2015-12-28 21:40:51 -06:00
Georgi Gardev
ea54ec607a
Add confirmation popover for Release pets/mounts
...
Add tests for releasing pets and mounts
Refactor tests to use expect syntax from sinon-chai
tests(karma): Refine settings controller tests
refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
Georgi Gardev
f6f82cafc4
Add confirmation popover for Rebirth
...
Add confirmation popover for Fortify/Reroll
Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
Keith Holliday
2750446e7b
Updated POST like route to persist data between updates
2015-12-28 18:45:34 -06:00
Keith Holliday
cb388eea40
Ensured that only one like or flag is updated during query
2015-12-28 14:08:10 -06:00
Paul Rich
c9fdff38f9
Fix for issue #4648 , parts 3 and 4
2015-12-28 14:24:48 -05:00
Matteo Pagliazzi
9748ffb0a6
add updateGroup route
2015-12-28 19:45:34 +01:00
Blade Barringer
d53ac4c66f
tests: Add ability to use ES2015 in karma tests
2015-12-28 08:24:23 -06:00
Keith Holliday
b3feb997d3
Change group save to Group update, added flags route and tests, and made eslint edits
2015-12-28 08:09:17 -06:00
Paul Rich
56a00efb19
Fix for Issue #3517 Display Current Page Name
...
Revision for Fix for issue #3517
lint: Remove extraneous white space in app.js file
fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
Matteo Pagliazzi
ceb20742dc
fix an import
2015-12-28 12:21:15 +01:00
Matteo Pagliazzi
488685ceff
typo
2015-12-28 12:15:28 +01:00
Matteo Pagliazzi
ba0fb884dd
port create challenge
2015-12-28 12:14:56 +01:00
Matteo Pagliazzi
01e2bb56df
port getChallenges
2015-12-28 11:18:58 +01:00
Matteo Pagliazzi
20092f3ddb
port challenge model
2015-12-28 10:46:34 +01:00
Matteo Pagliazzi
831c8c4165
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2015-12-27 17:26:01 +01:00
Matteo Pagliazzi
6ae2c5fa89
wip on groups controller
2015-12-27 17:24:55 +01:00
Alys
7ef4fab289
change scroll drop text for The Golden Knight, Part 1 quest - it drops Gold Knight (Scroll) not Tarnished Gold (Scroll)
2015-12-28 01:06:08 +10:00
Blade Barringer
b5b44072fb
Merge pull request #6394 from KristianTashkov/fix-vagrant-e2e-tests
...
Fix e2e test in vagrant environment
2015-12-27 08:13:41 -06:00
pittaxx
6fff7f9b93
Changed css bootstrap screen-width constants to variables.
2015-12-27 13:28:41 +02:00
Keith Holliday
54109f0e62
Removed redundant code and changed like route to return only altered message
2015-12-27 00:27:06 -06:00
Blade Barringer
e46436f77b
chore(i18n): update locales
2015-12-26 22:28:55 -06:00
Blade Barringer
b6ab74ceda
refactor(common): Update variable name
2015-12-26 20:10:56 -06:00
Blade Barringer
80ed048d5c
tests: Update updateStats test
2015-12-26 19:52:25 -06:00
Blade Barringer
1b118d86b2
refactor: Extract constants into constants file
2015-12-26 19:41:20 -06:00
Blade Barringer
ba31cda85d
Merge branch 'develop' into TheHollidayInn-leveling-ensure-user-gets-100-points
2015-12-26 19:14:40 -06:00
Blade Barringer
363ef5e091
fix: Remove stray {{ characters
2015-12-26 19:05:12 -06:00
Blade Barringer
d0e6dbe103
fix: Remove only call from tests
2015-12-26 19:04:14 -06:00
Blade Barringer
5127068ca7
chore: Compile css
2015-12-26 19:02:28 -06:00
Blade Barringer
7df3b333f6
feat: Refine clear local storage function
2015-12-26 19:00:45 -06:00
Blade Barringer
ef25956ba3
feat(views): Create generic message alert modal
2015-12-26 19:00:44 -06:00
Blade Barringer
d36755b64a
tests: Remove unnecessary describe closure in auth ctrl spec
2015-12-26 19:00:44 -06:00
darkmeep
1c261056fe
clear local storage page added
...
changed submit bug to clear browser data
feat(views): Style clear local storage button
2015-12-26 19:00:42 -06:00
pittaxx
c7d47dcd0a
Fixed css bug, where both min-width and max-width were set to 768.
...
Max-width was changed to 767 to prevent overlap, which produces artifacts when
screen width is exactly 768 pixels.
2015-12-26 21:37:42 +02:00
Blade Barringer
e5c9924141
lint: Ignore rule for one-var in tests
2015-12-26 08:13:45 -06:00
Blade Barringer
c5bf06cd24
tests(common): Add test for preening todos
2015-12-26 08:11:02 -06:00
Keith Holliday
dff464489a
Added chat like route and tests
2015-12-24 18:52:14 -06:00
Sabe Jones
7a41d36834
fix(mystery): add event timeframe
2015-12-23 20:33:45 -05:00
Sabe Jones
799e68614d
Revert "fix(test): pend brittle subscription checks"
...
This reverts commit 61c5e2e3e9 .
2015-12-23 20:32:39 -05:00
Sabe Jones
26a1bcee6b
Merge pull request #6395 from HabitRPG/sabrecat/subscriber-201512
...
Subscriber items 2015-12
2015-12-23 14:17:33 -06:00
Sabe Jones
61c5e2e3e9
fix(test): pend brittle subscription checks
2015-12-23 15:07:21 -05:00
Sabe Jones
7d0efdeeda
chore(news): Android announcement
...
Also adds a higher-quality version of the Winter Town background.
2015-12-23 14:43:16 -05:00
Sabe Jones
468198b9e2
feat(mystery): subscriber items 2015-12
...
Also enables the Snowball in the Seasonal Shop.
2015-12-22 16:16:30 -05:00
Kristian Tashkov
1607b05a77
Add dependencies in vagrant dev environment for e2e tests
2015-12-22 21:53:36 +02:00
Keith Holliday
77414ca49a
Added chat post route and initial tests
2015-12-22 08:48:47 -06:00
Blade Barringer
1aaebef114
tests(docs): Document how to run tests against a locally running server
2015-12-21 18:08:01 -06:00
Blade Barringer
6539399667
tests: Move api integration test readme to api directory
2015-12-21 18:03:13 -06:00
Sabe Jones
a48ece7a34
fix(test): return functions
2015-12-21 18:45:24 -05:00
Sabe Jones
67da5a977a
test(chat): user not member of group
...
Currently failing because group is not getting defined correctly?
2015-12-21 17:33:16 -05:00
Matteo Pagliazzi
99be74b6f7
misc fixes
2015-12-21 12:20:10 +01:00
Matteo Pagliazzi
83364c1d56
add leaveGroup, joinGroup and remove member from group methods
2015-12-21 11:53:47 +01:00
Matteo Pagliazzi
8b79f74e54
fix tests
2015-12-19 18:23:13 +01:00
Matteo Pagliazzi
3e87c8d3e9
fix some tests
2015-12-19 18:07:39 +01:00
Matteo Pagliazzi
ba22575e1a
Merge pull request #6380 from TheHollidayInn/thehollidayinn/api-v3-groups
...
Added initial group POST tests
2015-12-19 17:40:26 +01:00
Keith Holliday
33525b105f
Added initial group POST tests
2015-12-18 23:43:57 -06:00
Sabe Jones
afe3c87357
fix(credits): Lady Snuffles
2015-12-18 20:09:26 -05:00
Sabe Jones
1c833eadc1
Merge pull request #6381 from HabitRPG/sabrecat/winter-wonderland
...
Winter Wonderland 2015-16
2015-12-18 17:08:49 -06:00
Sabe Jones
c259c5c819
fix(event): sprite and string tweaks
2015-12-18 17:58:46 -05:00
Sabe Jones
1e1f15b495
fix(content): linting errors
2015-12-18 17:27:27 -05:00
Sabe Jones
493ae6f26a
feat(event): Winter Wonderland complete
2015-12-18 15:48:14 -05:00
Matteo Pagliazzi
d8fae3a067
add sanitization to group creation
2015-12-18 17:45:56 +01:00
Matteo Pagliazzi
c4ea3efb2e
initial implementation for POST group
2015-12-18 17:37:26 +01:00
Matteo Pagliazzi
1132e3971d
initial implementation for GET groups
2015-12-18 17:26:49 +01:00
Matteo Pagliazzi
6b430e6866
add getGroup static method and refactor controllers to use it
2015-12-18 16:38:10 +01:00
Matteo Pagliazzi
7adc060312
add GET group
2015-12-18 16:32:37 +01:00
Matteo Pagliazzi
e53bd5079a
adapt chat routes to groups saved on user model
2015-12-18 16:29:57 +01:00
Matteo Pagliazzi
ddf77e0e35
add cliff for completed todos and PMs
2015-12-18 16:00:49 +01:00
Matteo Pagliazzi
c1daada82c
do not store members or invitations on group doc
2015-12-18 15:10:37 +01:00
Sabe Jones
c7b3e3c3e1
fix(test): Remove only
2015-12-17 18:50:26 -05:00
Sabe Jones
c3b981dc91
test(api): chat WIP
2015-12-17 18:48:10 -05:00
Sabe Jones
21f93c9399
WIP(chat): v3 controller
2015-12-17 14:49:14 -05:00
Matteo Pagliazzi
18c49493e0
fixes tests
2015-12-17 16:27:17 +01:00
Matteo Pagliazzi
bbc47f5e00
finish porting group model
2015-12-17 16:11:45 +01:00
Sabe Jones
1bf0b6ca8d
Merge pull request #6375 from mfdeveloper/phantomjs-dependency
...
Fix npm install error - Phantomjs dependency
2015-12-16 16:14:28 -06:00
Michel Felipe de Oliveira Ferreira
11bbf165b1
Added explicitly phantomjs dependency
2015-12-16 16:47:17 -03:00
Matteo Pagliazzi
455eaf0932
add skeleton for groups controller
2015-12-16 20:41:54 +01:00
Matteo Pagliazzi
bf7fc985d0
begins porting group model to es6
2015-12-16 20:00:10 +01:00
Matteo Pagliazzi
2e5c7df94f
Merge pull request #6343 from HabitRPG/api-v3-tasks2
...
[API v3] Tasks 2
2015-12-16 13:18:05 +01:00
Matteo Pagliazzi
35316ebeb6
move completed todos outside of tasksOrder (and back) with tests
2015-12-16 12:57:19 +01:00
Matteo Pagliazzi
d9e786ebaa
checklists tests
2015-12-16 12:29:03 +01:00
Matteo Pagliazzi
cc7bd1b5ac
disable server_side (api v2) tests for api v3
2015-12-16 11:17:56 +01:00
Matteo Pagliazzi
a46fa873a9
disable common tests for api v3
2015-12-16 11:16:30 +01:00
Keith Holliday
ad196ecafb
Added Max Stat Points constant
2015-12-15 18:48:47 -06:00
Keith Holliday
5573689d4e
Added tests for ensuring user gets 100 points
2015-12-15 18:38:33 -06:00
Keith Holliday
ff1f63da9a
Removed user.stats.lvl check before attribution
2015-12-15 18:38:33 -06:00
Keith Holliday
298df73619
Added check for total points before skipping attribution
2015-12-15 18:38:33 -06:00
Sabe Jones
6ed9133f70
WIP(event): Winter Wonderland 2015-16 partial
2015-12-15 17:15:02 -05:00
Sabe Jones
3cc2866c76
Merge pull request #6368 from HabitRPG/sabrecat/pets-201512
...
December Pet Quest
2015-12-15 11:55:08 -06:00
Nathan Maton
35a921bf43
feat(content): Make mystery set strings translatable
...
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
2015-12-15 08:47:13 -06:00
Matteo Pagliazzi
13cbf03759
use cron middleware
2015-12-15 12:11:32 +01:00
Matteo Pagliazzi
e547eb2dde
add tests for tags ops on tasks
2015-12-14 22:44:50 +01:00
Sabe Jones
fe1de12494
feat(pets): December quest
2015-12-14 16:28:39 -05:00
Matteo Pagliazzi
da154d3ea3
tests for tags (missed some files before)
2015-12-14 21:56:29 +01:00
Matteo Pagliazzi
9864b8a1cb
tests for tags
2015-12-14 21:56:09 +01:00
Daniel Van Camp
338cfb3fc9
update logo and image links to be dynamicly added instead with a manual written link
2015-12-14 21:44:32 +01:00
Sabe Jones
e638661c71
Merge pull request #6314 from TheHollidayInn/tasks-fix-delete-message
...
Changed language when deleteing tasks to indicate type and text of task
2015-12-14 14:30:06 -06:00
Daniel Van Camp
3c7ddf8df1
Merge branch 'develop' into static-page-merch
2015-12-14 21:27:50 +01:00
Matteo Pagliazzi
155719996d
remove user.tasks getter on the server
2015-12-14 20:10:18 +01:00
Blade Barringer
6709c83804
tests(apiv3): Remove incorrect tests
2015-12-14 12:37:59 -06:00
Blade Barringer
3857316a1e
fix(api): Correct sendTaskWebhook call
2015-12-14 12:23:13 -06:00
Blade Barringer
9205f01e01
tests(apiv3): Use lessThan and greaterThan expectation syntax
2015-12-14 12:13:02 -06:00
Blade Barringer
ac61809fc0
tests(apiv3): Remove user dependency
2015-12-14 12:00:23 -06:00
Blade Barringer
c20617e185
tests(apiv3): Remove unused dependency
2015-12-14 09:00:22 -06:00
Blade Barringer
f4af7309cb
tests(helpers): Fix local doc update
2015-12-14 08:59:41 -06:00
Nathan Maton
9ac1dd8f9e
went with head on habitrpg-shared.css merge conflict
2015-12-13 15:30:17 -08:00
Matteo Pagliazzi
409102ae19
wip score tests
2015-12-13 23:51:06 +01:00
Blade Barringer
850aeb6565
Merge branch 'develop' into api-v3
2015-12-13 16:41:08 -06:00
Blade Barringer
883fd14775
tests(lint): remove unused variables
2015-12-13 16:40:44 -06:00
Blade Barringer
65bb655a10
Merge branch 'develop' into api-v3
2015-12-13 16:39:59 -06:00
Blade Barringer
9ec26a8ee9
tests(common): Use generateUser helper in dailies test
2015-12-13 16:29:29 -06:00
Blade Barringer
b10c6f21a8
tests(common): Convert algos tests to use generateUser helper
2015-12-13 16:23:25 -06:00
Blade Barringer
e82085ac1b
tests(helpers): Add common helpers for generating tasks
2015-12-13 16:22:58 -06:00
Blade Barringer
0f789ba780
Merge branch 'TheHollidayInn-skills-burst-backstap-leveling-fix' into develop
2015-12-13 15:38:03 -06:00
Blade Barringer
ce06d8a873
tests(common): Simplify spell tests
2015-12-13 15:37:18 -06:00
Alys
9edb0831c0
specify $ USD for subscription prices
2015-12-14 07:16:22 +10:00
Matteo Pagliazzi
9394fb0d94
use res.respond
2015-12-13 20:12:04 +01:00
Matteo Pagliazzi
a34f41f0f7
misc fixes, GET user (with tests), more comments for preenHistory
2015-12-13 20:08:14 +01:00
Keith Holliday
f152a352bb
Merge pull request #4 from crookedneighbor/common_helper
...
Common helper
2015-12-13 12:06:22 -06:00
Blade Barringer
4ee21f2578
tests(common): Use helper to generate user
2015-12-13 10:40:50 -06:00
Blade Barringer
70751abe01
tests(helpers): Add helper to generate user for common and content tests
2015-12-13 10:40:00 -06:00
Blade Barringer
dafe014ec8
Merge branch 'develop' into TheHollidayInn-skills-burst-backstap-leveling-fix
2015-12-13 10:06:27 -06:00
Keith Holliday
beea6d920f
Added tests for backstab and fireball
2015-12-13 09:19:20 -06:00
Nathan Maton
6203d94ec8
updated .gitignore
2015-12-12 20:03:17 -08:00
Blade Barringer
5fa91713f5
fix(favicon): Add 192x192 image
2015-12-12 20:11:25 -06:00
Blade Barringer
025b302ec6
Merge branch 'develop' into anilanar-favicon192
2015-12-12 20:08:34 -06:00
Blade Barringer
530babf516
chore(css): Add explanation for empty-task-notification rule
2015-12-12 17:27:43 -06:00
Blade Barringer
73c8db01ad
chore(sprites): Update readme
2015-12-12 17:17:04 -06:00
Blade Barringer
81067efd19
Merge branch 'joyclark-new_mount_heads' into develop
2015-12-12 17:16:36 -06:00
Blade Barringer
ee87d1b4b7
chore(sprites): Compile
2015-12-12 17:12:53 -06:00
Blade Barringer
a7ffb41acd
fix(sprites): Correct size of tiger mount icon
2015-12-12 16:04:03 -06:00
Blade Barringer
1f37338782
fix(sprites): Correct mount head icons for peppermint pets
2015-12-12 14:35:14 -06:00
Blade Barringer
6d6e1caf0f
fix(sprites): Correct spooky pet mount icons
2015-12-12 14:20:38 -06:00
Blade Barringer
8ad2b07253
fix(sprites): Correct gryphon mount icon sizing
2015-12-12 11:09:27 -06:00
Blade Barringer
9aa73db281
fix(sprites): Correct size of tiger sprites
2015-12-12 11:02:54 -06:00
Blade Barringer
963995e42e
refactor(css): Adjust mount heads pixel paw positioning
2015-12-12 10:50:05 -06:00
Alys
10a63a6cb7
make Android link in footer open in new tab
2015-12-12 18:59:44 +10:00
Alys
95dbcde4b6
change Android link in footer to point to Google Play
2015-12-12 18:33:36 +10:00
Blade Barringer
c0e2520bb3
Merge pull request #6365 from VirenMohindra/updated-readme
...
removed gymnasium dependency status
2015-12-11 20:29:11 -06:00
Alys
5d6c4d4dcd
add Android app with Google Play logo to static apps page; remove mailing list signup form
2015-12-12 11:32:17 +10:00
Viren Mohindra
3c08a26312
removed gymnasium dependency status
...
broken link- no point in keeping it in the readme
2015-12-11 20:24:49 -05:00
Matteo Pagliazzi
e6d9c978f7
change score task route
2015-12-11 11:41:46 +01:00
Matteo Pagliazzi
501a808893
move cron logic back to common
2015-12-11 11:21:36 +01:00
Sabe Jones
f6cdf5d257
chore(news): Android Bailey
2015-12-10 17:00:48 -05:00
Alys
cf01376f7d
adjust forgot password text to specify that you must use the website - fixes https://github.com/HabitRPG/habitrpg-android/issues/170
2015-12-11 06:39:03 +10:00
Matteo Pagliazzi
9ffa0d5893
port cron and preening
2015-12-10 19:07:09 +01:00
Sabe Jones
33f5dda99a
Merge pull request #6351 from HabitRPG/sabrecat/docker
...
Overhauled Dockerfile
2015-12-09 15:56:01 -06:00
Sabe Jones
1bd9582b2c
refactor(Dockerfile): more readable comments re IP
2015-12-09 16:32:39 -05:00
Sabe Jones
816ce5b782
feat(Docker): overhauled Dockerfile
2015-12-09 16:23:47 -05:00
Matteo Pagliazzi
c5b7873406
add support for habitica-android in x-client header
2015-12-09 11:02:26 +01:00
Matteo Pagliazzi
6a0f9564e0
begins testing score task route
2015-12-09 10:40:40 +01:00
Matteo Pagliazzi
0f3b307f40
port tests for score and randomDrop
2015-12-09 10:21:15 +01:00
Keith Holliday
215cf840b1
Added tests for removing task
2015-12-08 12:40:43 -06:00
Joy Clark
8756aeebfa
fixing wolf sprite
2015-12-08 18:05:18 +01:00
Matteo Pagliazzi
72b2791bc4
refactor scoreTask
2015-12-08 14:41:42 +01:00
joyclark
91fe5fed97
Merge remote-tracking branch 'origin/new_mount_heads' into new_mount_heads
...
Conflicts:
common/dist/sprites/spritesmith-main-10.css
common/dist/sprites/spritesmith-main-10.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-12-08 13:43:49 +01:00
joyclark
faf2611ca3
making change for peppermit heads.
2015-12-08 13:36:25 +01:00
Joy Clark
1769fc15f7
css files and sprite sheets
2015-12-08 13:22:13 +01:00
Joy Clark
7628882f24
use new css class
2015-12-08 13:22:13 +01:00
Joy Clark
d8b0774618
Add Mount_Icon images
2015-12-08 13:22:12 +01:00
Sabe Jones
3385cb807e
Merge pull request #6334 from bennyty/develop
...
Normalize theme audio volumes
2015-12-07 18:33:39 -06:00
Sabe Jones
7472d17c3a
Merge pull request #6335 from HabitRPG/sabrecat/peppermint-pets
...
Peppermint Hatching Potions
2015-12-07 15:18:42 -06:00
Sabe Jones
dd4ca5c476
refactor(modals): More readable invalid hatch check
2015-12-07 16:00:52 -05:00
Matteo Pagliazzi
237be08a61
GET-tasks_id tests
2015-12-07 21:15:02 +01:00
Matteo Pagliazzi
3c4491606b
finish PUT-tasks_id tests and fix some edge bugs
2015-12-07 21:00:15 +01:00
Matteo Pagliazzi
0272a36bac
finish implementing tests for POST-tasks.test.js
2015-12-07 14:22:54 +01:00
Matteo Pagliazzi
af1946dd7c
starts implementing scoreTask
2015-12-06 18:03:51 +01:00
Matteo Pagliazzi
66a675c5b0
simplify some tests, replace tags when updating tags (like for checklist)
2015-12-06 17:29:14 +01:00
Matteo Pagliazzi
582aeafb4b
Merge branch 'develop' into api-v3
2015-12-06 17:17:20 +01:00
Matteo Pagliazzi
dc5a1d1438
Merge pull request #6309 from HabitRPG/api-v3-tasks
...
[API v3] Port tasks and tags
2015-12-06 17:14:44 +01:00
Matteo Pagliazzi
955b0f042b
fix tests
2015-12-06 17:07:29 +01:00
Matteo Pagliazzi
cb08c383b9
misc fixes, add tests for some tasks routes
2015-12-06 16:51:18 +01:00
Joy Clark
7f2496b397
css files and sprite sheets
2015-12-06 00:16:36 +01:00
Joy Clark
1b50197610
use new css class
2015-12-05 23:26:50 +01:00
Joy Clark
545a802a03
Add Mount_Icon images
2015-12-05 23:17:44 +01:00
Joy Clark
144e3003bb
Add Mount_Icon images
2015-12-05 23:17:39 +01:00
Sabe Jones
0f578b79ff
feat(pets): Peppermint Hatching Potions
...
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
bennyty
ed944f83bf
Rebalance audio themes
2015-12-04 13:39:29 -05:00
Blade Barringer
8a872bd8c0
tests: Add pending tests for scoring tasks
2015-12-04 11:12:25 -06:00
Blade Barringer
834ae123e8
tests: Add pending test for GET /tasks
2015-12-04 10:56:54 -06:00
Blade Barringer
431fc571fa
tests: Add pending tests for getting a specific task in v3
2015-12-04 10:55:15 -06:00
Blade Barringer
5aca166837
tests: Add delete task integration test for v3
2015-12-04 10:50:41 -06:00
Blade Barringer
1a2cda0835
tests: Add additional pending tests
2015-12-04 10:39:20 -06:00
Blade Barringer
49cc6db05b
tests(tasks): Rename test to conform to route style
2015-12-04 10:25:27 -06:00
Blade Barringer
b0bcfff12d
tests(tasks): Add pending tests for create task test
2015-12-04 10:24:40 -06:00
Blade Barringer
c2ba90afcc
tests(fix): Add return to expect promise in create task test
2015-12-04 09:13:50 -06:00
Matteo Pagliazzi
1e9386f7b6
create model for tags, add routes
2015-12-04 14:47:02 +01:00
Blade Barringer
a3665e7095
chore(image): Add vice2 quest image
2015-12-04 07:46:02 -06:00
Sabe Jones
aa00eae0d5
Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix
...
Unequip notification fix
2015-12-03 14:01:45 -06:00
Matteo Pagliazzi
a6648fc638
add tags routes, misc fixes
2015-12-03 19:19:53 +01:00
Matteo Pagliazzi
c0a99eec8b
fix user model, sanitize some fields on task creation, add some tests and comments
2015-12-03 18:15:22 +01:00
Matteo Pagliazzi
506609cc29
starts writing tests for tasks, fix errors in auth middleware and tasks methods
2015-12-03 17:48:32 +01:00
Oliver Eyton-Williams
36df8138fc
Fixed template syntax.
2015-12-03 13:33:52 +01:00
Alys
d63cf64944
allow Fetch Recent Messages button to appear on newly-created groups
2015-12-03 10:03:59 +10:00
Alys
e907e2e4ee
adjust test for IAP GooglePlay to specify 21 gems
2015-12-03 07:23:31 +10:00
Alys
904dd595ed
change Google iap-live for Android mobile app gem purchases, at negue's request
2015-12-03 06:22:59 +10:00
Negue
b337efb01a
raise android gem purchase: 21 instead 20
2015-12-02 20:13:33 +01:00
Oliver Eyton-Williams
dcd7cae312
Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages.
2015-12-02 16:51:01 +01:00
Blade Barringer
6aa164ab31
chore(i18n): update locales
2015-12-02 07:42:29 -06:00
Matteo Pagliazzi
62708d4365
cleanup
2015-12-02 11:30:58 +01:00
Matteo Pagliazzi
427c805ea5
fix user tests and misc changes
2015-12-02 11:22:53 +01:00
Sabe Jones
1add0084e8
chore(news): Update Bailey for GX3
2015-12-01 18:27:03 -05:00
Sabe Jones
5b943b4ab9
feat(event): Enable GaymerX armor
2015-12-01 18:11:04 -05:00
Sabe Jones
03222bf084
feat(content): Armoire and backgrounds 2015/12
2015-12-01 16:29:22 -05:00
Sabe Jones
483ff8cb67
Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom
...
Tasks add push to bottom
2015-12-01 14:20:02 -06:00
Sabe Jones
9366b22fef
Merge pull request #6320 from HabitRPG/sabrecat/fix-rehatch-modal
...
Fix modal display when rehatching pets
2015-12-01 14:16:21 -06:00
Oliver Eyton-Williams
da35eb6067
user.ops functions can now send multiple messages at once. Clearer messages are sent when equipping/unequipping two-handed weapons.
2015-12-01 18:24:23 +01:00
Oliver Eyton-Williams
ee7bfece06
Added tests for equipping and unequipping.
2015-12-01 17:58:12 +01:00
Sabe Jones
dd3218ebbd
refactor(modal): Remove unnecessary ternary
2015-11-30 16:43:46 -05:00
Daniel Van Camp
3d9b2047d0
updated static.styl with less classes
...
added key attribute to merchant array
changed item to merchant for clearity
added fallback for when no logo is found (no image can be provided)
updated guidelines
updated json
2015-11-30 22:33:12 +01:00
Sabe Jones
1643e3dbc6
test(modals): Rehatch scenario
2015-11-30 16:19:12 -05:00
Sabe Jones
3a20455cda
fix(modals): Rehatch pets
...
Corrects an issue with #6281 that would cause the pet hatching modal to fail to display if the pet had a value of -1 (i.e. raised to a mount and not yet re-hatched).
2015-11-30 16:11:13 -05:00
Alys
c4f3c2b1f4
change website FAQ to link to Overview for New Users on website instead of wiki
2015-12-01 07:08:07 +10:00
Sabe Jones
a42c671f1f
fix(model): Remove common.inviteParty
...
Per @vIiRuS
2015-11-30 15:48:46 -05:00
Matteo Pagliazzi
fde47bdc90
add ability to get completed todos (only 30 for now)
2015-11-30 21:00:09 +01:00
Matteo Pagliazzi
93fcc7957e
fix trying to move completed todos
2015-11-30 20:22:22 +01:00
Sabe Jones
78890012c1
Merge pull request #6305 from markhowson/fix_narrow_guild_desc
...
Fixes #6252 - Guild description is too narrow on guild page
2015-11-30 13:16:59 -06:00
Matteo Pagliazzi
67bcfde6dc
implement move task
2015-11-30 20:14:53 +01:00
Matteo Pagliazzi
1bd794b5e3
simplify tasks naming
2015-11-30 19:38:53 +01:00
Matteo Pagliazzi
ebdfe4c49b
add checklists routes
2015-11-30 17:25:40 +01:00
Keith Holliday
4663c7cf5e
Added translation functions to task types
2015-11-30 09:26:07 -06:00
Keith Holliday
ea87784575
tasks-fix-delete-message
2015-11-29 14:30:22 -06:00
Daniel Van Camp
6056a59cbe
minor update in the comment section
2015-11-29 19:12:45 +01:00
Daniel Van Camp
afecae9ef0
cleared merch.json of attributes that should not be translated
2015-11-29 19:05:32 +01:00
Matteo Pagliazzi
3002db3d75
add ability to update tasks, can pass additional fields to Model.sanitize at runtime
2015-11-29 19:05:24 +01:00
Matteo Pagliazzi
5291753841
prevent the deletion of challenge tasks
2015-11-29 18:29:35 +01:00
Keith Holliday
06ee603942
Initialized usr._temp when score function is skipped
2015-11-29 11:11:06 -06:00
Matteo Pagliazzi
6849fd49be
add ability to remove a task
2015-11-29 17:47:10 +01:00
Alys
5e105a0e45
allow moderators to reset flags for a chat message when there's only one flag
2015-11-29 19:46:27 +10:00
Keith Holliday
0dcba276a6
Fixed task push text and move ctrlPressed logic to rootScope.
2015-11-28 12:06:34 -06:00
Matteo Pagliazzi
454aa3731c
add tasks to user.tasksOrder or creation
2015-11-28 18:18:28 +01:00
Matteo Pagliazzi
c2dac2c494
fix import paths
2015-11-28 18:05:07 +01:00
Matteo Pagliazzi
6c904330e7
misc fixes, add createTask route and ability to get tasks by type to getTasks route
2015-11-28 17:47:32 +01:00
Matteo Pagliazzi
786845effd
fix tour/tutorial on signup
2015-11-28 14:07:33 +01:00
Matteo Pagliazzi
90d7f1f6a8
improve tasks models, fix a part of user pre save, rename auth controller
2015-11-28 13:46:53 +01:00
Alys
42d1fd93f3
Merge branch 'kylestratis-issue-6043' into develop
2015-11-28 19:41:00 +10:00
Alys
7bf5300369
Merge branch 'issue-6043' of https://github.com/kylestratis/habitrpg into kylestratis-issue-6043 and remove redundant $and specifier
...
Conflicts:
migrations/mystery_items.js
2015-11-28 19:07:37 +10:00
Daniel Van Camp
6a535277a7
updated tab indent
...
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
2015-11-27 23:25:56 +01:00
Matteo Pagliazzi
58d87887e6
fix linting
2015-11-27 21:28:49 +01:00
Matteo Pagliazzi
cfa776fff3
starts fixing default tasks and use discriminator
2015-11-27 21:18:37 +01:00
Sabe Jones
046e7bcfdc
chore(event): Revert NPCs
2015-11-27 13:10:54 -05:00
Matteo Pagliazzi
7d53a4fd54
port task model to es6 and implement discriminators
2015-11-27 19:06:26 +01:00
Matteo Pagliazzi
9adfd6311f
fix merge conflict
2015-11-27 17:09:01 +01:00
Matteo Pagliazzi
5fa514b6fa
Merge branch 'develop' into api-v3
2015-11-27 17:05:29 +01:00
Daniel Van Camp
37378e8497
once more i try to add it back
2015-11-27 10:28:45 +01:00
Daniel Van Camp
a28a167437
merge
2015-11-27 10:25:08 +01:00
Daniel Van Camp
ae8153c1f0
Merge branch 'static-page-merch' of https://github.com/danielvancamp/habitrpg into static-page-merch
2015-11-27 10:23:53 +01:00
Daniel Van Camp
45f43379b0
added original static.styl again, mistakenly removed it while editing
2015-11-27 10:23:10 +01:00
Daniel Van Camp
1f8ae40d9d
updated counter to the real 2 sellers
2015-11-27 10:07:12 +01:00
Daniel Van Camp
3a47221d74
added better bootstrap for multiple merchandises
2015-11-27 10:07:12 +01:00
Daniel Van Camp
f67bf77143
added guide how to add merchandise
2015-11-27 10:07:12 +01:00
Daniel Van Camp
e881ba37e7
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-27 10:07:12 +01:00
Daniel Van Camp
a7c05de8e7
added better bootstrap for multiple merchandises
2015-11-27 00:19:52 +01:00
Daniel Van Camp
610a555849
added guide how to add merchandise
2015-11-27 00:06:33 +01:00
Daniel Van Camp
169a8d9915
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-26 23:51:57 +01:00
Alys
9f53365648
add comment for refactoring to fix reset bug that doesn't unequip gear properly (e.g., https://github.com/HabitRPG/habitrpg/issues/6304 )
2015-11-27 06:13:14 +10:00
Mark Howson
f67bd384d4
Moved guild leader message down slightly
2015-11-26 18:47:54 +00:00
Sabe Jones
ad347090c3
Merge remote-tracking branch 'origin/pr/5968' into develop
...
Conflicts:
website/views/options/social/challenge-box.jade
2015-11-26 13:33:33 -05:00
Sabe Jones
3c672ea814
Merge pull request #6281 from TheHollidayInn/inventory-prevent-hatch-model-from-showing-on-hatched-pet
...
Prevented modal from showing when user tries to hatch a pet they own
2015-11-26 11:56:38 -06:00
Sabe Jones
846b6597ab
Merge pull request #6280 from vIiRuS/patch-6
...
Store inviteParty coachmark for iOS app
2015-11-26 11:45:33 -06:00
Sabe Jones
0a90c7c66d
Merge pull request #6270 from Arodang/challenge-tag-field-character-limit
...
Removed Challenge Tag Maxlength
2015-11-26 11:15:23 -06:00
Sabe Jones
5d02b70be1
Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix
...
Two-handed weapons no longer automatically equip unless desired. fixes #6231
2015-11-26 10:53:50 -06:00
Sabe Jones
9cbe94c602
chore(gulp): compile sprites
2015-11-26 11:25:25 -05:00
Daniel Van Camp
98a62c5cc9
fix the phoenix base on the right place now
...
(cherry picked from commit a8a2e3b74a )
2015-11-26 11:22:57 -05:00
Matteo Pagliazzi
99f6ac8f1a
Merge pull request #6290 from HabitRPG/api-v3-baseModel
...
[API v3] [WIP] Base model plugin
2015-11-26 16:19:08 +01:00
Mark Howson
fa462a1829
Renamed to wide-popover as it's the only remaining use
2015-11-26 12:56:22 +00:00
Mark Howson
848a96a9fa
Fix for #6252
2015-11-26 11:56:32 +00:00
Keith Holliday
274f4ab4d2
Removed css in favor of using inverted glyphicon
2015-11-25 23:44:13 -06:00
Alys
0c77737f36
Merge pull request #6299 from ojeytonwilliams/static-string-fix
...
Fixed broken string reference and centered the string.
2015-11-26 08:59:03 +10:00
Alys
5461345770
remove trailing whitespace
2015-11-26 08:49:40 +10:00
Keith Holliday
83934bf5c9
Added markdown directive to challenge titles
2015-11-26 08:49:40 +10:00
Sabe Jones
e429be7046
Merge pull request #6293 from HabitRPG/sabrecat/fix-mount-modal
...
Show mount modal more often
2015-11-25 16:24:05 -06:00
Sabe Jones
863f416514
Merge pull request #6303 from HabitRPG/sabrecat/thanksgiving
...
Habitica Thanksgiving event
2015-11-25 16:23:09 -06:00
Sabe Jones
29a84e6666
feat(event): Habitica Thanksgiving
2015-11-25 17:06:52 -05:00
Sabe Jones
9671f4a09d
feat(event): November sprites
2015-11-25 13:33:36 -06:00
Oliver Eyton-Williams
d385b2e415
Fixed broken string reference and centered the string.
2015-11-25 15:46:59 +01:00
Matteo Pagliazzi
d67836ee1f
allow for additional transform functions for toJSON and sanitize
2015-11-25 15:42:29 +01:00
Matteo Pagliazzi
94fc1c9bef
baseModel: delete properties instead of setting them to undefined, transform toJSON only not toObject
2015-11-25 15:19:21 +01:00
Matteo Pagliazzi
77d25ddc32
correctly add _id default
2015-11-25 13:43:34 +01:00
Oliver Eyton-Williams
9bda5657d2
Fixed syntax for linter.
2015-11-25 12:40:40 +01:00
Oliver Eyton-Williams
707cd08a8b
Merged: updating two-handed tests to use arrow functions.
2015-11-25 12:12:22 +01:00
Sabe Jones
28205663e4
fix(modals): Show mount modal more often
...
Fixes #6288 . Previously, we used a count of all properties within the user's items.pets.mounts to determine whether or not they'd gained a new mount. That would not work as expected if they had mounts with a null or false status, such as after using the Key to the Kennels. This commit also adds some tests to the inventory controller in Angular for pet raising.
2015-11-24 16:54:59 -05:00
Matteo Pagliazzi
3f1faf113e
add baseModel plugin with some tests
2015-11-24 18:51:48 +01:00
Alys
e04066e45f
Merge pull request #6228 from AminArria/timezone-information
...
Timezone information
2015-11-24 21:21:10 +10:00
Alys
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
Alys
69553260d3
revert refactor of preenHistory
2015-11-24 08:24:33 +10:00
Matteo Pagliazzi
1826cf2784
Merge pull request #6266 from HabitRPG/api-v3-user
...
[API v3] User controller
2015-11-23 21:52:32 +01:00
Matteo Pagliazzi
6a4ab17c56
fix linting and add comment
2015-11-23 21:43:39 +01:00
Matteo Pagliazzi
1bf91030c6
format express-validator errors
2015-11-23 21:34:21 +01:00
Matteo Pagliazzi
4a941deece
remove success field from json responses
2015-11-23 21:04:21 +01:00
Keith Holliday
b6e79f3ba8
Prevented modal from showing when user tries to hatch a pet they own
2015-11-23 10:20:39 -06:00
Amin Arria
671d4aaecc
Change timezone text
2015-11-23 11:38:26 -04:30
Phillip Thelen
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
Blade Barringer
093970b48a
Merge branch 'api-v3' into api-v3-user
2015-11-23 08:51:30 -06:00
Blade Barringer
8196c65627
fix(api tests): Let api test script pass the correct api version for helper.
...
(cherry picked from commit 2fa2e0f483 )
2015-11-23 08:48:24 -06:00
Blade Barringer
7d49a8cbf8
Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers
2015-11-23 08:07:58 -06:00
Blade Barringer
b88a1c98db
Merge branch 'Alys-refactor-cron-time-day-2015-11-21' into develop
2015-11-23 08:04:17 -06:00
Matteo Pagliazzi
645095e58f
fix errorHandler tests, add tests for res.respond
2015-11-23 13:28:25 +01:00
Matteo Pagliazzi
7086fbfbd6
add res.respond middleware... and use it in user controller
2015-11-23 13:07:21 +01:00
Matteo Pagliazzi
349122c9a1
add res.respond, fix linting
2015-11-23 13:01:47 +01:00
Matteo Pagliazzi
a26f713e18
misc fixes, add ability to attach local auth to social user
2015-11-23 12:47:15 +01:00
Matteo Pagliazzi
3459b51cef
use throw instead of returning next inside of promises
2015-11-23 10:20:07 +01:00
Matteo Pagliazzi
6d238a0770
fix .eslintrc
2015-11-23 10:09:17 +01:00
Keith Holliday
9a8f9c6938
Fixed wording to be parallel with logic
2015-11-22 15:59:18 -06:00
Keith Holliday
b668829d85
Added ability to invert pushToBottom when holding down ctrl or cmd button
2015-11-22 15:57:14 -06:00
Alys
65c276c477
fix formatting in preenHistory
2015-11-22 21:08:51 +10:00
Matteo Pagliazzi
dcfd7eb6d0
Merge pull request #6274 from crookedneighbor/api-v3-user-local-spike
...
Api v3 user local spike
2015-11-22 11:59:28 +01:00
Alys
1082bb1f81
refactor preenHistory from index.js to cron.js
2015-11-22 15:52:30 +10:00
Alys
83ea085c21
refactor api.shouldDo and associated code; fix new bug in sanitizeOptions()
2015-11-22 11:28:51 +10:00
Alys
728a94d199
improve coding style
2015-11-22 11:05:03 +10:00
Alys
a380c1aa30
refactor api.daysSince to a cron.js function not exposed on api
2015-11-22 10:48:15 +10:00
Blade Barringer
867efd7078
fix(controller): Adjust next calls to throw errors instead inside promise
2015-11-21 17:01:56 -06:00
Blade Barringer
d1839b816e
chore(lint): Clean up user model and controller
2015-11-21 16:17:42 -06:00
Alys
2f8b6d68e8
refactor api.startOfDay to a cron.js function not exposed on api
2015-11-22 07:13:44 +10:00
Blade Barringer
074b3f5079
fix(controller): Validate params for register route in user controller
2015-11-21 14:57:59 -06:00
Blade Barringer
75cea0c810
refactor(model): Remove password and passwordConfirmation from user model
2015-11-21 14:56:44 -06:00
Blade Barringer
43ef4e51b5
fix(model): Remove pre validation from user model
2015-11-21 14:56:20 -06:00
Blade Barringer
7ce554c578
fix(controller): Correct path to EmailUnsubscription model
2015-11-21 14:41:07 -06:00
Blade Barringer
78cdc1753f
tests(api): Add test for registering with an invalid email
2015-11-21 13:52:09 -06:00
Blade Barringer
49e7799baa
tests(api): clean up code style of test file
2015-11-21 13:51:31 -06:00
Blade Barringer
ade764acbd
tests(helper): Allow route to register user to be variable based on api version.
2015-11-21 13:45:46 -06:00
Blade Barringer
4f6b765923
Merge branch 'api-v3' into api-v3-user
2015-11-21 09:43:58 -06:00
Blade Barringer
4dee29a20b
tests(fix): Correct path to i18n.js module
2015-11-21 09:42:40 -06:00
Blade Barringer
1166601510
Merge branch 'develop' into api-v3
2015-11-21 09:37:34 -06:00
Blade Barringer
9a76e7a62c
chore(gulp): Add convience task for starting up a test server.
2015-11-21 09:33:29 -06:00
Blade Barringer
a54db44406
Merge branch 'api-v3' into api-v3-user
2015-11-21 09:20:44 -06:00
Blade Barringer
b3e9872f59
tests: Adjust integration helper to display server errors for each API.
2015-11-21 09:20:08 -06:00
Blade Barringer
85a08f881b
chore(lint): Correct linting errors in test files.
2015-11-21 09:19:48 -06:00
Matteo Pagliazzi
5c33a404fb
handle mongoose validation errors, fix bug in import and add more tests for errors
2015-11-21 15:00:31 +01:00
Matteo Pagliazzi
afbfbdd01c
fix mongoose promise, some user validation, tests urls
2015-11-21 14:27:24 +01:00
Alys
6183fd9e71
refactor api.startOfWeek to a cron.js function not exposed on api
2015-11-21 22:26:05 +10:00
Alys
e0784a9791
refactor sanitizeOptions from index.js to cron.js
2015-11-21 22:06:02 +10:00
Matteo Pagliazzi
3608742e20
fix bugs on user controller
2015-11-21 12:26:48 +01:00
Matteo Pagliazzi
22464f53e9
put back linting on emailUnsubscription model
2015-11-21 12:12:48 +01:00
Matteo Pagliazzi
2e02e1bd5a
Merge branch 'api-v3' into api-v3-user
2015-11-21 12:12:15 +01:00
Matteo Pagliazzi
f87d6d250a
remove unlinted file
2015-11-21 12:11:53 +01:00
Matteo Pagliazzi
444aff7d33
Merge branch 'api-v3' into api-v3-user
2015-11-21 12:11:25 +01:00
Matteo Pagliazzi
4862cebdb7
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-21 12:10:11 +01:00
Matteo Pagliazzi
041224b5ac
fix merge conflicts
2015-11-21 12:09:40 +01:00
Matteo Pagliazzi
2f4e6e015a
Merge branch 'api-v3-user' of github.com:HabitRPG/habitrpg into api-v3-user
2015-11-21 12:03:26 +01:00
Matteo Pagliazzi
7866f7393b
clean up code, add deleteSocial method
2015-11-21 12:03:08 +01:00
Alys
a73662bab6
refactor api.dayMapping to DAY_MAPPING const, not exposed on api
2015-11-21 20:48:18 +10:00
Blade Barringer
07247033b2
test: Add integration test for POST user/register/local
2015-11-20 19:14:07 -06:00
Blade Barringer
e4827f1b78
fix(user ctrl): Correct path to use model import
2015-11-20 19:08:25 -06:00
Blade Barringer
2fa2e0f483
fix(api tests): Let api test script pass the correct api version for helper.
2015-11-20 19:02:08 -06:00
Arodang
0b1758f5c6
Removed col-lg-6 class from tags and prize
2015-11-20 18:17:51 -05:00
Sabe Jones
66725a561c
fix(test): Remove only
2015-11-20 13:39:54 -05:00
Sabe Jones
e5d3e7bc83
fix(test): Linting and coverage
2015-11-20 13:36:41 -05:00
Sabe Jones
fb17c3ae80
Merge branch 'develop' into sabrecat/modularize-statHelpers
2015-11-20 13:27:25 -05:00
Blade Barringer
a6fb5790e5
refactor(gulp): Dry out linting task
2015-11-20 07:56:59 -06:00
arodang
b286a93006
removed challenge tag maxlength, reduced tag and prize field size
2015-11-19 23:21:15 -05:00
Blade Barringer
776faddb34
(chore): lint test/common files
2015-11-19 20:27:39 -06:00
Sabe Jones
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05:00
Matteo Pagliazzi
c87200f582
comment out incomplete code
2015-11-19 22:04:18 +01:00
Matteo Pagliazzi
e028af9f3f
add social login / signup and misc fixes
2015-11-19 21:50:23 +01:00
Matteo Pagliazzi
972cbbdaa6
try moving all the logic to the model
2015-11-19 21:09:39 +01:00
Matteo Pagliazzi
55d743ebe5
remove q import
2015-11-19 16:29:22 +01:00
Matteo Pagliazzi
5874e89e2a
simplify code
2015-11-19 16:22:16 +01:00
Matteo Pagliazzi
dd8c22584d
req.t --> res.t
2015-11-19 12:17:44 +01:00
Matteo Pagliazzi
6451264572
start porting register local user handler, several bug fixes
2015-11-19 12:13:54 +01:00
Blade Barringer
5947dcf68b
(chore): Add lint:watch task
2015-11-18 17:23:33 -06:00
Alys
cb1f745d39
Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons
...
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
2015-11-19 07:09:14 +10:00
Matteo Pagliazzi
5c859ca52e
add req.t in place of i18n.t passing req.language, begins implementing user signup
2015-11-18 22:04:36 +01:00
Sabe Jones
72ea9426dd
fix(lint): Space infix operator (?)
2015-11-18 15:18:44 -05:00
Sabe Jones
ed443b490a
refactor(constant): Screaming camel MAX_LEVEL
2015-11-18 15:14:47 -05:00
Sabe Jones
31b68219d1
refactor(stats): Address PR comments
2015-11-18 15:06:55 -05:00
Matteo Pagliazzi
662c9ecc29
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3-user
2015-11-18 20:50:15 +01:00
Blade Barringer
6991d5ab67
Correct reject block to include details about error
2015-11-18 13:01:56 -06:00
Blade Barringer
f95c6ef927
Move notFound api v3 test to integration folder.
2015-11-18 13:01:35 -06:00
Blade Barringer
a64085828b
Correct path to api-v3 integration files in gulp test task.
2015-11-18 13:01:06 -06:00
Matteo Pagliazzi
bd980e166b
fix action method
2015-11-18 18:16:14 +01:00
Matteo Pagliazzi
de75849c7a
fix apidoc comment
2015-11-18 18:06:37 +01:00
Matteo Pagliazzi
d5d13477d7
wip user controllers: local login method
2015-11-18 18:02:35 +01:00
Matteo Pagliazzi
2dfca76a5e
Merge pull request #6256 from HabitRPG/api-v3-apidoc
...
API v3 - apidoc wip
2015-11-18 17:12:14 +01:00
Oliver Eyton-Williams
570d7c3c76
Added tests for buying two-handed weapons
2015-11-18 16:41:06 +01:00
Blade Barringer
627da76b49
Merge branch 'develop' into api-v3
2015-11-18 09:09:49 -06:00
Blade Barringer
eded44fea5
Adjust helper files for linting preferences.
2015-11-18 08:54:34 -06:00
Blade Barringer
22c8a24d15
Move test specific eslint rules to eslint task
2015-11-18 08:50:03 -06:00
Blade Barringer
f94394127a
Remove unused var
2015-11-18 08:00:14 -06:00
Blade Barringer
9e557c43d3
Fix bug where seasonal items could not be purchased.
2015-11-18 07:58:01 -06:00
Blade Barringer
26b82dff4b
Fix bug where armoire items could not be repurchased.
2015-11-18 07:57:45 -06:00
Matteo Pagliazzi
3b633a87b9
try fixing the notFound test
2015-11-18 12:44:52 +01:00
Matteo Pagliazzi
65a8d2e255
misc fixes and improvements, starts adding route tests
2015-11-18 12:36:13 +01:00
Oliver Eyton-Williams
cae267c0fa
Two-handed weapons no longer automatically equip unless desired.
2015-11-18 11:59:31 +01:00
Matteo Pagliazzi
b5adf9f19b
add apidoc to production build step
2015-11-18 11:52:13 +01:00
Matteo Pagliazzi
6fb4fdfd8a
create apidoc task in grunt, update package.json version
2015-11-18 11:50:55 +01:00
Blade Barringer
08c4ec5557
Merge branch 'develop' into api-v3
2015-11-17 23:15:15 -06:00
Blade Barringer
553548046f
Add linting for tests
2015-11-17 23:14:49 -06:00
Blade Barringer
94bf181301
Add noscript locales
2015-11-17 22:02:57 -06:00
Blade Barringer
0a7d7fc42d
Merge pull request #6251 from crookedneighbor/modularize-content-gear
...
Pull out gear into separate modules
2015-11-17 21:57:13 -06:00
Blade Barringer
4d415ee9c1
chore(i18n): update locales
2015-11-17 21:54:30 -06:00
Blade Barringer
fba35ea491
chore(i18n): update locales
2015-11-17 21:48:55 -06:00
Blade Barringer
6bd0ed76cc
Fixes #6524 . Correct spelling of community
2015-11-17 21:41:06 -06:00
Blade Barringer
71473a93ad
chore(i18n): update locales
2015-11-17 21:38:32 -06:00
Blade Barringer
c452cf9f99
Adjust styling of noscript block
2015-11-17 21:35:07 -06:00
Blade Barringer
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06:00
Blade Barringer
5b7c02334a
Adjust sm modal to not attach objects on rootScope
2015-11-17 21:23:20 -06:00
Gautham Chandra
37e08e8d5d
Converted noscript text into translatable strings
2015-11-17 22:22:55 -05:00
Blade Barringer
b280267cde
Expand object to make it more readable.
2015-11-17 21:10:29 -06:00
Blade Barringer
05eb0ec782
Add missing comma.
2015-11-17 17:26:18 -06:00
Blade Barringer
a11048b604
Split out wondercon gear into separate module
2015-11-17 17:16:38 -06:00
Blade Barringer
f58b3eee64
Move special gear into own subdirectory
2015-11-17 17:06:00 -06:00
Sabe Jones
f5f33bd1b9
fix(modals): SM modal fixes
...
Fixes #6253 , allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042 .
2015-11-17 16:56:11 -05:00
Sabe Jones
7d2643063f
fix(math-helpers): diminishingReturns parameter logic
2015-11-17 16:00:18 -05:00
Sabe Jones
4bf20959dd
refactor(stats): Math helpers ES2015 module
2015-11-17 15:41:26 -05:00
Matteo Pagliazzi
18503e31c3
fix linting
2015-11-17 19:31:51 +01:00
Matteo Pagliazzi
2a51117d21
comment errors according to apidoc, add new tests and fix existing ones
2015-11-17 19:22:47 +01:00
Matteo Pagliazzi
846800ccc9
fix linting
2015-11-17 17:49:59 +01:00
Matteo Pagliazzi
9905deec06
move static handler to separate middleware
2015-11-17 17:02:53 +01:00
Matteo Pagliazzi
aa1b046cf2
add example apidoc comments, add notFound middleware
2015-11-17 16:48:50 +01:00
Blade Barringer
195b39561b
Move contributor gear to own module
2015-11-17 09:01:38 -06:00
Blade Barringer
2bac9c3c17
Separate out backer gear into own module
2015-11-17 08:17:40 -06:00
Blade Barringer
03c1a957f6
Correct ownsItem function to allow owning item if user has ever previously owned the item.
2015-11-17 08:13:20 -06:00
Oliver Eyton-Williams
53417adda1
Replaced magic numbers with variables
2015-11-17 14:07:35 +01:00
Blade Barringer
8b7f50bfcf
Adjust memory leak message to be meaningful.
...
Got this message in the heroku logs:
2015-11-17T04:28:18.549451+00:00 app[web.1]: '[Memory Leak] Memory=' + parseFloat(memory).toFixed(3) + ' Time=' + moment()
Converted the line into a variable and threw that instead.
2015-11-16 22:34:06 -06:00
Blade Barringer
3000517b06
Fix bug where any backer or contributor item could be purchased.
2015-11-16 21:47:46 -06:00
Blade Barringer
e6a5d08150
Merge branch 'develop' into api-v3
2015-11-16 17:34:30 -06:00
Blade Barringer
639dfb31d7
Pull out gear into separate modules
2015-11-16 17:29:13 -06:00
Sabe Jones
29c4e21b67
Merge pull request #6250 from HabitRPG/sabrecat/costume-awards
...
Costume Contest awards 2015
2015-11-16 17:08:26 -06:00
Sabe Jones
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
Sabe Jones
2d1ad12cbd
fix(strings): Make plural more greppable
2015-11-16 17:08:38 -05:00
Sabe Jones
16878af76f
fix(string): Contest to Contestant
2015-11-16 16:17:48 -05:00
Sabe Jones
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
Sabe Jones
bf0f3634d1
chore(contest): Award Costume achievements
2015-11-16 15:24:08 -05:00
Blade Barringer
2b8cf178b0
Merge pull request #6244 from crookedneighbor/modularize-content
...
Modularize content
2015-11-16 12:40:46 -06:00
Blade Barringer
8f9224c2ae
Adjust error handling for test task.
2015-11-16 12:23:09 -06:00
Blade Barringer
61948e1ca5
Add filter to lodash import.
2015-11-16 12:22:00 -06:00
Blade Barringer
c3f8bb0726
Correct count module to use correct lodash 3 syntax
2015-11-16 12:10:58 -06:00
Blade Barringer
086e1da0e1
Merge branch 'develop' into api-v3
2015-11-16 12:04:42 -06:00
Blade Barringer
7a865b5c2a
Correct test output agregator
2015-11-16 12:04:09 -06:00
Matteo Pagliazzi
30eed12903
Merge pull request #6245 from HabitRPG/api-v3-routes
...
Api v3 Routes
2015-11-16 17:07:46 +01:00
Blade Barringer
9bf1ebdb0f
Remove last of coffee files
2015-11-16 08:14:42 -06:00
Blade Barringer
dcca17fa4e
Set up i18n in unit test helper.
2015-11-16 08:12:45 -06:00
Oliver Eyton-Williams
e811693752
Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.
2015-11-16 15:11:11 +01:00
Blade Barringer
9ec39a597e
Set up i18n in test helpers
2015-11-16 08:07:28 -06:00
Blade Barringer
f20336861a
Correct lodash syntax
2015-11-16 08:07:20 -06:00
Amin Arria
b87592c8a7
Changed p blocks to single line
2015-11-15 23:00:44 -04:30
Amin Arria
21dcafd964
Fixed missing 0 when minutes where less than 10
2015-11-15 22:59:58 -04:30
Gautham Chandra
41e6abfc83
Fixed capitalization
2015-11-15 16:58:19 -05:00
Blade Barringer
4ab2fafc5e
Remove coffee files
2015-11-15 15:45:56 -06:00
Blade Barringer
cc0eefd97d
Remove coffeescript dependency
2015-11-15 15:45:30 -06:00
Matteo Pagliazzi
3fe6f87a96
fix linting
2015-11-15 22:44:17 +01:00
Gautham Chandra
8df005d29e
Added noscript content for the landing page
2015-11-15 16:42:48 -05:00
Matteo Pagliazzi
448ed70ab9
add example controller and lib to setup routes
2015-11-15 22:40:00 +01:00
Blade Barringer
6ba9027252
Switch out babel for babel-core
2015-11-15 15:15:52 -06:00
Blade Barringer
24cd36e716
Remove second babel require
2015-11-15 15:08:31 -06:00
Blade Barringer
49fd6b9f5c
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-15 14:59:57 -06:00
Blade Barringer
00055ad055
Merge branch 'develop' into api-v3
2015-11-15 14:57:41 -06:00
Gautham Chandra
b5e10bf1e9
Added a helpful message for when JS is disabled
2015-11-15 14:12:12 -05:00
Matteo Pagliazzi
83eb2308fb
Merge pull request #6232 from HabitRPG/api-v3-utils
...
[API v3] Port Utils
2015-11-15 20:01:48 +01:00
Blade Barringer
d1c1940bde
Merge pull request #6243 from crookedneighbor/lint
...
Lint Common Files
2015-11-15 12:36:36 -06:00
Blade Barringer
ea87910c2f
Correct test path
2015-11-15 12:34:40 -06:00
Blade Barringer
2a7dfe09a0
Move user can own quest categories constant to constants module.
2015-11-15 12:27:16 -06:00
Matteo Pagliazzi
1ccb9a5aaa
move ported middlewares to /api-v2
2015-11-15 18:15:06 +01:00
Matteo Pagliazzi
5dc2fb0b6f
port domainMiddleware
2015-11-15 18:12:55 +01:00
Blade Barringer
40cee42e03
Remove unneeded return statement
2015-11-15 11:04:17 -06:00
Blade Barringer
6ec864ea4e
Remove unused src files in content directory
2015-11-15 11:03:30 -06:00
Blade Barringer
1a31c26330
Add item list to common constants module
2015-11-15 11:03:17 -06:00
Blade Barringer
f7c88478bc
Explicitly bump ampitude version
2015-11-15 10:48:46 -06:00
Matteo Pagliazzi
1cd7189119
Merge pull request #6240 from HabitRPG/api-v3-buildManifest
...
[API v3] Build manifest lib
2015-11-15 17:40:03 +01:00
Matteo Pagliazzi
78e5d913f5
update test to match possible html string
2015-11-15 17:27:22 +01:00
Blade Barringer
ea14326025
Adjust faq test
2015-11-15 10:18:10 -06:00
Blade Barringer
411946e487
Modularize mystery sets
2015-11-15 10:08:40 -06:00
Blade Barringer
600f3e4554
Extract classes, events and gearTypes into constants file.
2015-11-15 09:47:06 -06:00
Blade Barringer
b13b2d0f62
Remove coffee content index file
2015-11-15 09:28:26 -06:00
Blade Barringer
a127bb8711
Switch to babel-core form babel.
...
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
Blade Barringer
9ee56a5622
Remove rule
2015-11-15 08:52:29 -06:00
Blade Barringer
01946b64e6
Remove coffeescript from dependencies.
2015-11-15 08:29:54 -06:00
Blade Barringer
2e16bade2b
Add lint task to test command.
2015-11-15 08:28:16 -06:00
Blade Barringer
037337d54f
Remove extraneous anonymous function.
2015-11-15 08:24:42 -06:00
Blade Barringer
5be9b88cc6
Add babel compiler to mocha.opts
2015-11-15 08:24:19 -06:00
Blade Barringer
da881153b9
Convert coffee tests to js
2015-11-15 08:19:41 -06:00
Blade Barringer
e5d99ce271
Convert common files to es2015.
2015-11-15 08:16:55 -06:00
Blade Barringer
ddeb0e7b23
Add babel register in the server file
2015-11-15 08:16:11 -06:00
Blade Barringer
6f11054994
Add trailing comma
2015-11-15 08:10:54 -06:00
Blade Barringer
6c5afb9369
Downgrade to babelify v6. (v7 uses babel v6)
2015-11-15 08:10:07 -06:00
Blade Barringer
351172d178
Correct common test command to compile with babel.
2015-11-14 21:52:59 -06:00
Blade Barringer
4a38c36cce
Register babel in gruntfile
2015-11-14 21:51:02 -06:00
Blade Barringer
c829eb21ed
Removed unused mocha.opts
2015-11-14 21:50:47 -06:00
Blade Barringer
bc90893284
Correct test to declare variable
2015-11-14 21:45:20 -06:00
Blade Barringer
ff929b669d
Convert common tests to js
2015-11-14 21:44:10 -06:00
Matteo Pagliazzi
a80be380f9
add txt emails tests
2015-11-14 18:58:33 +01:00
Matteo Pagliazzi
a8b3780cc0
add send email tests
2015-11-14 18:13:17 +01:00
Matteo Pagliazzi
3b75fe6ade
add tests for emails (wip) and encryption, misc fixes
2015-11-14 17:43:56 +01:00
Matteo Pagliazzi
19ce7c9b53
add tests for emails (wip) and encryption, misc fixes
2015-11-14 17:43:56 +01:00
Matteo Pagliazzi
170a25c712
remove v2 utils where possible
2015-11-14 17:43:56 +01:00
Matteo Pagliazzi
b315d10c79
migrate utils to v3, uprade nodemailer
2015-11-14 17:43:56 +01:00
Matteo Pagliazzi
466797cc6c
add some basic tests
2015-11-14 15:50:57 +01:00
Matteo Pagliazzi
6343bc9f59
port buildManifest lib
2015-11-14 15:50:57 +01:00
Matteo Pagliazzi
9c8d4c383f
fix eslint, remove unused constant
2015-11-14 15:37:02 +01:00
Matteo Pagliazzi
38416811c3
Merge branch 'develop' into api-v3
2015-11-14 14:52:20 +01:00
Matteo Pagliazzi
ae656b044c
firebase can be enabled when not in production
2015-11-14 14:52:10 +01:00
Blade Barringer
c3b4f03c35
Add linting for common files
2015-11-14 07:49:48 -06:00
Blade Barringer
7ec9687774
Add linting from api-v3
2015-11-14 07:40:05 -06:00
Matteo Pagliazzi
cf4eb7c89b
Merge pull request #6237 from HabitRPG/api-v3-firebase
...
port firebase lib to api v3
2015-11-14 13:14:50 +01:00
Matteo Pagliazzi
d89b1cb60d
port firebase lib to api v3
2015-11-14 02:50:58 +01:00
Blade Barringer
1e814058e1
Merge pull request #6224 from HabitRPG/api-v3-i18n
...
API v3 - i18n lib and getUserLanguage middleware
2015-11-13 19:37:28 -06:00
Blade Barringer
2e21d227e0
Simplify get language from user function.
2015-11-13 19:36:49 -06:00
Blade Barringer
4a52f22774
Correct path to old i18n file
2015-11-13 19:30:36 -06:00
Blade Barringer
1ae9b7aff0
Correct path to i18n
2015-11-13 18:40:46 -06:00
Blade Barringer
805d4bba24
Adjust for linter.
2015-11-13 18:29:19 -06:00
Blade Barringer
4cd4c588a8
Add tests for browser selection of language and refactor
2015-11-13 18:22:20 -06:00
Blade Barringer
f672ac8c59
Port over change to v2 lib
2015-11-13 18:22:20 -06:00
Blade Barringer
dc8d52e00a
Correct paths in v2 lib
2015-11-13 18:22:20 -06:00
Blade Barringer
06dd343d47
Adjust i18n script to actually display zh_TW language.
2015-11-13 18:22:19 -06:00
Blade Barringer
8372a56d88
Adjust style of User.findOne call.
2015-11-13 18:22:17 -06:00
Blade Barringer
43058f1642
Add queries for which req pieces take precedence.
2015-11-13 18:22:17 -06:00
Blade Barringer
500c520c59
Move sandbox stub to test that uses it
2015-11-13 18:22:16 -06:00
Blade Barringer
d365868fdc
Merge pull request #6235 from crookedneighbor/fix_ch_tw
...
Adjust i18n script to actually display zh_TW language.
2015-11-13 16:17:58 -06:00
Blade Barringer
0a99361953
Adjust i18n script to actually display zh_TW language.
2015-11-13 15:52:52 -06:00
Matteo Pagliazzi
0daa63c2ca
Merge branch 'api-v3' into api-v3-i18n
2015-11-13 19:38:31 +01:00
Matteo Pagliazzi
e84e3e1352
fix another require path
2015-11-13 18:06:50 +01:00
Matteo Pagliazzi
8fd82c6808
fix some requires
2015-11-13 17:50:34 +01:00
Blade Barringer
49a6a7167b
Merge branch 'api-v3' into api-v3-i18n
2015-11-13 10:49:21 -06:00
Matteo Pagliazzi
eede74758d
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-13 17:41:41 +01:00
Matteo Pagliazzi
879ec97408
fix some requires
2015-11-13 17:41:18 +01:00
Blade Barringer
c6f059c1df
Move delete cacth to afterEach
2015-11-13 10:40:31 -06:00
Blade Barringer
6bb107f9e0
Set up analytics middleware to test prod and non prod behavior.
2015-11-13 10:35:58 -06:00
Matteo Pagliazzi
38749eae1b
fix i18n.js so that it supports lodash 3
2015-11-13 17:30:12 +01:00
Blade Barringer
810a818334
Add headers to req generator and unpend failing test.
2015-11-13 09:36:18 -06:00
Blade Barringer
a6a9c3c74f
Use context blocks instead of describe blocks.
2015-11-13 09:27:17 -06:00
Blade Barringer
db67451a38
Add done callback to test.
2015-11-13 09:24:03 -06:00
Blade Barringer
939bc893c6
Correct test to check req status after function is finished.
2015-11-13 09:21:22 -06:00
Blade Barringer
eab9d7b3ba
Reorganize i18n tests.
2015-11-13 09:15:11 -06:00
Amin Arria
256bce1172
Revert "Ignorado sublime"
...
This reverts commit 0947a5be73 .
2015-11-13 10:36:27 -04:30
Matteo Pagliazzi
79c20105a1
use new logger where possible
2015-11-13 15:16:00 +01:00
Blade Barringer
be672e570c
Merge branch 'api-v3' into api-v3-i18n
2015-11-13 07:44:48 -06:00
Blade Barringer
6e8e1648d9
Merge branch 'develop' into api-v3
2015-11-13 07:38:24 -06:00
Blade Barringer
ada97c1f91
Add invite party to ios tutorial
2015-11-13 07:19:51 -06:00
Blade Barringer
27d3d9d296
Merge pull request #6229 from HabitRPG/emails
...
Adjust the way email invitations resolve.
2015-11-13 07:18:41 -06:00
Blade Barringer
565aaff976
Merge pull request #6219 from HabitRPG/js_ify_common
...
Js ify common
2015-11-13 06:49:54 -06:00
Blade Barringer
e4679d6a63
Adjust the way email invitations resolve.
2015-11-12 18:58:01 -06:00
Blade Barringer
8e147d7b12
Allow users who register via facebook to see site tutorial.
2015-11-12 18:26:42 -06:00
Amin Arria
807726305f
Added timezone form
2015-11-12 19:27:25 -04:30
Amin Arria
3f37da6f04
Created filter to convert timezone offset to UTC
2015-11-12 19:24:28 -04:30
Blade Barringer
71567be4a6
Merge pull request #6227 from crookedneighbor/fix_tutorial_flag
...
Fixes #6225
2015-11-12 13:05:18 -06:00
Blade Barringer
abe778836d
Fixes #6225
2015-11-12 12:52:35 -06:00
Blade Barringer
5fb585b896
Merge pull request #6226 from HabitRPG/fix_tutorial_flag
...
Move header assignment to app level
2015-11-12 12:37:31 -06:00
Blade Barringer
431bbd762f
Move header assignment to app level
2015-11-12 12:23:42 -06:00
Matteo Pagliazzi
de21b72027
move old i18n version to api-v2 folder and use new i18n where possible
2015-11-12 16:43:02 +01:00
Matteo Pagliazzi
60b51b8862
Merge branch 'api-v3' into api-v3-i18n
2015-11-12 16:36:19 +01:00
Matteo Pagliazzi
9516133bd8
Merge pull request #6223 from crookedneighbor/v3-port-webhooks
...
V3 port webhooks
2015-11-12 16:32:19 +01:00
Matteo Pagliazzi
4af8a8f7aa
add tests for i18n and getUserLanguage
2015-11-12 16:24:08 +01:00
Blade Barringer
1e106b3c53
Move old webhooks to v2 lib
2015-11-12 09:08:36 -06:00
Blade Barringer
a18c2f7444
Port v2 webhook lib to v3
2015-11-12 09:03:28 -06:00
Matteo Pagliazzi
a07d4dad12
port i18n lib to es6 and extract middleware
2015-11-12 15:28:43 +01:00
Blade Barringer
c77df40614
Merge pull request #6222 from crookedneighbor/move_logging_to_v2_directory
...
Move old logging lib v2 directory
2015-11-12 08:26:55 -06:00
Blade Barringer
858bf99930
Move old logging lib v2 directory
2015-11-12 08:18:23 -06:00
Blade Barringer
3a1075a0e6
Merge pull request #6221 from crookedneighbor/move_analytics_to_v2_directory
...
Move old analytics lib to v2 directory
2015-11-12 08:02:25 -06:00
Blade Barringer
9a3e4c8f8b
Move old analytics lib to v2 directory.
2015-11-12 07:51:51 -06:00
Blade Barringer
5ebead68ab
Remove coffee version of i18n
2015-11-11 21:24:21 -06:00
Blade Barringer
efd0e2333e
Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies
...
User can now check out of inn from tasks page
2015-11-11 20:49:35 -06:00
Blade Barringer
7559f14f4d
Remove coffee from files
2015-11-11 20:40:26 -06:00
Blade Barringer
3a13a5ee2c
Remove unneeded coffeescript requires in tests.
2015-11-11 20:32:17 -06:00
Blade Barringer
25ae2e4252
Move browserify task to gulp
2015-11-11 20:32:17 -06:00
Blade Barringer
9408effb4e
Remove coffeescript dependency from website
2015-11-11 20:32:16 -06:00
Blade Barringer
774a42d67e
Convert coffee files to JS
2015-11-11 20:32:00 -06:00
kylestratis
b5efa4ae4c
Additional formatting
2015-11-11 21:25:22 -05:00
Blade Barringer
92a8c3d958
chore(i18n): update locales
2015-11-11 20:24:12 -06:00
Sabe Jones
f0a484bbe1
fix(strings): Variable population count
2015-11-11 21:10:24 -05:00
kylestratis
77ded02fa0
Formatting changes for readability
2015-11-11 21:05:08 -05:00
Blade Barringer
40fab075e2
Clean up linting for user model.
2015-11-11 19:53:22 -06:00
Blade Barringer
533440ce55
Merge pull request #6214 from HabitRPG/api-v3-add-password-tests
...
Add tests for password utilities
2015-11-11 19:43:50 -06:00
Blade Barringer
c5445dc426
Merge branch 'develop' into api-v3
2015-11-11 19:42:39 -06:00
Sabe Jones
52f9f03afb
fix(news): Link to Teespring storefront
2015-11-11 20:19:48 -05:00
Blade Barringer
6acd6460ea
Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route
...
Increase code coverage for clearflags route
2015-11-11 18:49:37 -06:00
Blade Barringer
43064dcf9a
Wrap flag purcging code in check for flags object
2015-11-11 18:00:15 -06:00
Blade Barringer
13da95b552
Add tests for clearflags route
2015-11-11 17:58:41 -06:00
Sabe Jones
bbff19920f
Merge pull request #6217 from HabitRPG/sabrecat/pet-201511
...
November pet quest: Snakes
2015-11-11 17:51:41 -06:00
Sabe Jones
83b61f9aa3
Merge branch 'develop' into sabrecat/pet-201511
...
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-11-11 18:36:25 -05:00
Sabe Jones
06a5a1cb95
Merge pull request #6042 from HabitRPG/sabrecat/more-modals
...
More and better modals; Social Media sharing
2015-11-11 17:32:43 -06:00
Sabe Jones
b32ab5a587
chore(news): Pet quest Bailey
...
Also adds one missing sprite asset for the quest.
2015-11-11 18:31:22 -05:00
Blade Barringer
cdb05e1b42
Add analytics service to v3
2015-11-11 17:30:36 -06:00
Amin Arria
edb0b5e0af
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-11-11 18:28:12 -04:30
Sabe Jones
eba2ac386e
feat(pets): November quest
...
Fully functional commit. Missing only Bailey and the quest scroll sprite.
2015-11-11 17:23:16 -05:00
Sabe Jones
3672601999
fix(chat): Handle nonexistent message.flags
2015-11-11 16:25:36 -05:00
Sabe Jones
586edc03c6
WIP(pets): Incomplete cobra sprites
2015-11-11 16:23:38 -05:00
Sabe Jones
cc92b985a2
fix(sharing): Translatable share strings
2015-11-11 13:35:14 -05:00
Sabe Jones
cc2a6d4db1
fix(sharing): Push ng-binding into Jade
2015-11-11 13:09:00 -05:00
Matteo Pagliazzi
ac4f26a94f
add tests for password utilities
2015-11-11 16:05:35 +01:00
Blade Barringer
117a254cc8
Patch exploit that would allow users to auto-delete messages
2015-11-11 06:46:11 -06:00
Blade Barringer
c91c3f78ed
Remove lodash.defaultsDeep dependency
2015-11-11 06:44:45 -06:00
Matteo Pagliazzi
367223e15c
port password utilities to api v3
2015-11-11 13:05:46 +01:00
Matteo Pagliazzi
249037b80f
upgrade some deps, and remove unused qs module
2015-11-11 12:12:44 +01:00
Matteo Pagliazzi
8864508482
rewrite server.js in es6
2015-11-11 11:58:15 +01:00
Matteo Pagliazzi
4f21ee290b
finish upgrading to lodash 3
2015-11-11 11:08:16 +01:00
Matteo Pagliazzi
3795b1d151
wip: starts upgrading lodash to v3
2015-11-11 10:32:49 +01:00
Matteo Pagliazzi
8f9d2a5f9a
change to erro handler middleware to log full error object and support express-validator
2015-11-11 10:12:13 +01:00
kylestratis
be3fe8f1f4
Added check for existence of dateTerminated field
2015-11-10 22:39:53 -05:00
Sabe Jones
63f00d3643
fix(sharing): Better Tweet syntax
...
Angular bindings would fail to parse in Tweets if the expression evaluated to something with a space in it. Adding quotes stretches the Tweet by two characters, but addresses the issue. Commit also takes out a spurious console message from the Notifications service.
2015-11-10 17:07:34 -05:00
Sabe Jones
a393cdc94b
fix(sharing): Correct Jade interpolation
2015-11-10 16:33:33 -05:00
Sabe Jones
ada7ca71ad
fix(sharing): Use env BASE_URL
2015-11-10 16:27:40 -05:00
Sabe Jones
23df5b608d
feat(sharing): Remaining cheevo modals
2015-11-10 13:43:37 -05:00
Blade Barringer
1fc21167dc
Send back flag data if user had flagged the message.
2015-11-10 08:15:54 -06:00
Sabe Jones
875f2ac552
feat(sharing): More achievements
2015-11-10 00:08:17 -05:00
Blade Barringer
e518e2795f
Correct setupConfig to use proper linting.
2015-11-09 19:11:25 -06:00
Blade Barringer
c8ee1eaaec
Add support for passing in custom env file to nconf.
2015-11-09 18:41:04 -06:00
Sabe Jones
eed4207c6d
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
2015-11-09 16:24:17 -05:00
Amin Arria
e3f3be828e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-11-09 14:58:38 -04:30
Blade Barringer
d6764d4f37
Merge branch 'develop' into api-v3
2015-11-09 12:52:25 -06:00
Blade Barringer
6b7a757459
Run tests in sequence
2015-11-09 12:47:56 -06:00
Blade Barringer
851631e465
Fix build errors
2015-11-09 08:19:24 -06:00
Blade Barringer
bab41be646
Correct gruntfile to use babel require hook
2015-11-09 08:05:51 -06:00
Blade Barringer
84158c92f5
Remove extra space
2015-11-09 07:58:36 -06:00
Blade Barringer
68eb94a759
Merge pull request #6203 from crookedneighbor/v3_make_linter_happy
...
V3 - make linter happy
2015-11-09 07:47:02 -06:00
Blade Barringer
88a80162ee
Merge branch 'api-v3' into v3_make_linter_happy
2015-11-09 07:46:39 -06:00
Blade Barringer
78bdbfc96f
Add todo to use catch syntax
2015-11-09 07:43:48 -06:00
Matteo Pagliazzi
1489b41fcc
fix typo
2015-11-09 10:53:49 +01:00
Matteo Pagliazzi
7dd6eb76c9
add express-validator, add body parser middleware, support some more errors in error handler middleware
2015-11-08 22:48:31 +01:00
Matteo Pagliazzi
87f50ff2b9
use callback in place of catch
2015-11-08 19:01:48 +01:00
Blade Barringer
6aaef14300
Convert catch to second callback
2015-11-08 10:06:40 -06:00
Blade Barringer
a0094f4f48
Add exception for camelcase rule
2015-11-08 09:49:54 -06:00
Blade Barringer
7251a3a104
Extract profile name logic to private function
2015-11-08 09:36:10 -06:00
Blade Barringer
366cbd9bff
Remove unneeded variable
2015-11-08 09:30:31 -06:00
Blade Barringer
3d86cefe78
Convert switch statement to if-else
2015-11-08 09:28:40 -06:00
Blade Barringer
7b58873866
Add names to functions
2015-11-08 09:25:45 -06:00
Matteo Pagliazzi
46505c8a0b
Merge pull request #6202 from crookedneighbor/nconf_setup
...
Nconf setup
2015-11-08 16:14:45 +01:00
Matteo Pagliazzi
5b3c460344
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-08 16:14:10 +01:00
Matteo Pagliazzi
4b60698527
migrate user model to new code style and es6
2015-11-08 16:11:55 +01:00
Blade Barringer
832e837f6a
Simplify nconf test
2015-11-08 09:07:43 -06:00
Blade Barringer
9451e7239b
Add nconf setup to unit test helper
2015-11-08 09:01:25 -06:00
Blade Barringer
447d4c332d
Remove extraneous nconf setup.
2015-11-08 08:56:27 -06:00
Blade Barringer
1ef6839eea
Add IS_PROD to logger utility
2015-11-08 08:49:16 -06:00
Blade Barringer
0d7f984fce
Add setupNconf function
2015-11-08 08:47:46 -06:00
Blade Barringer
22f76e9479
Use npm 3 for travis
2015-11-07 21:06:59 -06:00
Blade Barringer
58cf34af9d
Merge branch 'develop' into api-v3
2015-11-07 21:06:37 -06:00
Blade Barringer
598d25dc48
Update browserify package
2015-11-07 20:56:56 -06:00
Blade Barringer
a6c7e3b885
Update protractor dependency
2015-11-07 20:31:28 -06:00
Blade Barringer
f137e0d41d
Add gulp to travis
2015-11-07 20:16:32 -06:00
Blade Barringer
b6a1414e1c
Update npm to v2
2015-11-07 20:09:36 -06:00
Blade Barringer
05ae419d7e
Update karma dependencies and remove unused packages.
2015-11-07 19:56:09 -06:00
Blade Barringer
88f8a2a375
Swap out gulp-clean for rimraf
2015-11-07 19:09:51 -06:00
Gautham Chandra
b9b2536478
User can now check out of inn from tasks page
...
Fixes #5651
2015-11-07 18:32:19 -05:00
Blade Barringer
320b7e4a93
Merge pull request #6196 from crookedneighbor/add_unit_test_helpers
...
Add unit test helpers
2015-11-07 09:50:15 -06:00
Blade Barringer
3559be0f83
Use toObject instead of _doc
2015-11-07 09:42:57 -06:00
Matteo Pagliazzi
f26737ab79
use q for mongoose promises and switch to promises from callbacks in queries
2015-11-07 16:28:52 +01:00
Blade Barringer
b323c3b5e9
Use res and req generators in error handler test
2015-11-07 09:26:13 -06:00
Blade Barringer
1eadceea3d
Add status to default res
2015-11-07 09:25:43 -06:00
Matteo Pagliazzi
0834f8eeea
disable api v2 and related tests to enable changes to models
2015-11-07 15:51:26 +01:00
Matteo Pagliazzi
b7fb9ec805
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-07 15:41:05 +01:00
Matteo Pagliazzi
3a12490ad7
simplify code
2015-11-07 15:40:57 +01:00
Matteo Pagliazzi
ac7d3e642f
port middlewares to authenticate users with headers and sessions
2015-11-07 15:37:38 +01:00
Blade Barringer
e657a30320
Add next generator for easier controller testing.
2015-11-07 08:32:02 -06:00
Blade Barringer
94dbb25fa6
Add unit helper
2015-11-06 21:28:47 -06:00
Blade Barringer
6e344ce04b
Add sandbox as a global
2015-11-06 21:28:31 -06:00
Blade Barringer
303b88b6fa
Adjust api tests
2015-11-06 21:28:19 -06:00
Blade Barringer
18328c0c42
Add lodash.deepDefaults as a dependency
2015-11-06 21:27:38 -06:00
Blade Barringer
30ba9582b5
Merge branch 'develop' into api-v3
2015-11-06 19:07:28 -06:00
Sabe Jones
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
Sabe Jones
b6702c293e
Merge pull request #6172 from AminArria/Move-Overview-To-Website
...
Move overview to website
2015-11-06 11:04:44 -06:00
Amin Arria
4aba7afdce
Merge pull request #1 from HabitRPG/sabrecat/Move-Overview-To-Website
...
fix(overview): Wording and layout tweaks
2015-11-05 17:44:15 -04:30
Sabe Jones
56fbc33d1c
Merge branch 'develop' into Move-Overview-To-Website
...
Conflicts:
website/src/routes/pages.js
2015-11-05 14:31:00 -05:00
Matteo Pagliazzi
9cf3c72002
Merge pull request #6188 from crookedneighbor/fix_user
...
Correct code to not iterate over mongoose object
2015-11-05 20:20:25 +01:00
Sabe Jones
18c2279be4
fix(overview): Wording and layout tweaks
2015-11-05 14:18:51 -05:00
Blade Barringer
4cbda6818c
Correct code to not iterate over mongoose object
2015-11-05 13:08:37 -06:00
Sabe Jones
bb55a74f48
chore(news): iOS update Bailey
...
Also fixes the color of the iOS app icon and codes it more intelligently.
2015-11-05 11:48:51 -05:00
Blade Barringer
0cf964728e
Merge pull request #6176 from crookedneighbor/api-v3_add-babel
...
Api v3 add babel
2015-11-05 08:47:44 -06:00
Blade Barringer
8967e6ee90
Give function more meaningful name.
2015-11-05 08:46:20 -06:00
Blade Barringer
1e4570ff88
Move all delete user tests to new structure
2015-11-05 08:17:06 -06:00
Alys
a49fecb063
minor fix to migration script
2015-11-05 18:15:25 +10:00
Alys
67a291f03d
migration script for setting flags.tutorial.ios
2015-11-05 18:13:55 +10:00
Blade Barringer
78cfbd2c6a
Revert btn-buy style change
2015-11-04 22:02:50 -06:00
Blade Barringer
3726f48ff2
chore(i18n): update locales
2015-11-04 21:57:16 -06:00
Sabe Jones
3a1862ecef
fix(static): Non-widgety App Store links
2015-11-04 22:42:10 -05:00
Blade Barringer
07df642f15
Add gulp tasks for v3 testing
2015-11-04 21:27:19 -06:00
Blade Barringer
5cd3f0dd6e
Fix eslint styling errors.
2015-11-04 21:19:58 -06:00
Blade Barringer
292177e51f
Update eslintrc
2015-11-04 21:19:29 -06:00
Blade Barringer
77d60cd616
Add tests for error handling
2015-11-04 20:49:08 -06:00
Blade Barringer
87eb63ba9b
Add case where errorhandlerr does not receive an error
2015-11-04 20:48:39 -06:00
Blade Barringer
d5736e1178
Convert classes to use Babel syntax
2015-11-04 20:47:32 -06:00
Blade Barringer
2f6f0eb933
Add Babel require hook
2015-11-04 20:46:37 -06:00
Blade Barringer
a4f12f06f4
Remove extraneous white space
2015-11-04 20:46:23 -06:00
Blade Barringer
aaa4a7da12
Add sinon to helpers
2015-11-04 20:45:51 -06:00
Blade Barringer
0e8ad62607
Update nvmrc
2015-11-04 20:44:21 -06:00
Blade Barringer
eae9adfaec
Merge branch 'develop' into api-v3
2015-11-04 20:25:05 -06:00
Blade Barringer
cde66d6167
Merge pull request #6183 from crookedneighbor/clientIdentifier
...
Client identifier
2015-11-04 20:03:31 -06:00
Blade Barringer
5a36d8e3f5
Switch to single quotes to conform to code style.
2015-11-04 18:03:50 -06:00
Blade Barringer
905e7b17ea
Refactor user model
2015-11-04 18:00:40 -06:00
Blade Barringer
797287a75c
Add and adjust tests for new register behavior.
2015-11-04 17:40:49 -06:00
Blade Barringer
8618716ca4
Update requester to take in additional set parameters.
2015-11-04 17:40:10 -06:00
Sabe Jones
de5d2df94c
fix(i18n): Add missing string
2015-11-04 16:04:51 -05:00
Sabe Jones
c61e49f5a7
Merge pull request #6182 from HabitRPG/sabrecat/apps-page
...
Apps page
2015-11-04 14:46:49 -06:00
Sabe Jones
df7e0236c2
fix(static): Improved /apps layout
2015-11-04 15:30:42 -05:00
Sabe Jones
8c4ecb8f6c
feat(static): Apps page
2015-11-04 13:35:31 -05:00
Matteo Pagliazzi
bea5fd6e59
add eslint task to tests
2015-11-04 18:58:50 +01:00
Matteo Pagliazzi
3135613be3
tweaks eslint rules, fixes gulp-eslint, adds some comments
2015-11-04 18:50:08 +01:00
Matteo Pagliazzi
235f1977ba
finish .eslintrc file and update gulp task
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
f02ef9b6be
add some eslint rules
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
54d89a59e3
add some eslint rules
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
cbca250b99
remove winston-mail and winston-newrelic from deps as they may not be compatible with v2
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
182e4bff6f
wip api-v3: adds some comments and more eslint rules
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
5e73bc9f1c
adds logger and starts logging errors
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
5f3e798016
add basic .eslintrc and correct some style issues
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
7b4d082ab8
use node v4 in travis
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
4322b8c3dc
wip api-v3: add error handler middleware and custom error classes
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
b21df9edb3
use node 4, npm 3, mongoose 4 and express 4
2015-11-04 18:26:38 +01:00
Matteo Pagliazzi
f1dbe1b51d
deprecate api v1
2015-11-04 18:26:38 +01:00
Phillip Thelen
7f189bebba
disable tutorial/tour depending on client
2015-11-04 16:54:47 +01:00
Phillip Thelen
921ee881a5
Only create sample habits+dailies when registered through website
2015-11-04 16:41:13 +01:00
Phillip Thelen
e13c008076
send "habitica-web" as x-client header
2015-11-04 16:26:50 +01:00
Blade Barringer
a7f0a2a8ca
Merge pull request #6171 from crookedneighbor/flag_messages_in_api
...
Flag messages in api
2015-11-04 08:58:34 -06:00
Blade Barringer
269fd2a94f
Add test for admin flagging a message
2015-11-04 08:00:35 -06:00
Blade Barringer
799190a898
Merge branch 'develop' into flag_messages_in_api
2015-11-04 07:56:34 -06:00
Amin Arria
6d93356967
Changed overview link
2015-11-03 22:56:47 -04:30
Blade Barringer
6ed3ba36ae
Refactor task helper for unit and integration tests.
2015-11-03 21:21:16 -06:00
Amin Arria
8611c00201
Added links
2015-11-03 22:38:55 -04:30
Amin Arria
5278a08c93
Added horizontal line
2015-11-03 22:32:23 -04:30
Amin Arria
7342735b1b
Fix error missing web in webStep
2015-11-03 22:18:41 -04:30
Amin Arria
f79110d6d2
Changed to be more like the FAQ
2015-11-03 22:03:24 -04:30
Sabe Jones
caa4170f12
fix(sharing): Wording tweaks
2015-11-03 17:19:57 -05:00
Sabe Jones
02abee9f4e
fix(sharing): Landing page tweaks
2015-11-03 16:16:17 -05:00
Sabe Jones
0260ea3fcd
WIP(sharing): Draft functional landing page
2015-11-03 15:04:31 -05:00
Sabe Jones
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
Sabe Jones
3691a59ddb
fix(front-page): Update registered user count
2015-11-03 12:30:54 -06:00
Amin Arria
0947a5be73
Ignorado sublime
2015-11-03 13:36:24 -04:30
Amin Arria
167af1afd4
New static page: overview
2015-11-03 13:35:14 -04:30
Sabe Jones
1fa15ba24a
Merge pull request #6167 from HabitRPG/sabrecat/content-201511
...
November backgrounds and Armoire
2015-11-03 11:58:51 -06:00
Amin Arria
fa9b331f03
Created route for overview
2015-11-03 13:15:55 -04:30
Blade Barringer
0923077f2f
Correct task.
2015-11-03 08:49:10 -06:00
Blade Barringer
b71f1f7862
Extract mocha function into taskHelper
2015-11-03 08:41:16 -06:00
Blade Barringer
8c95de0835
Move api tests to v2 namespace
2015-11-03 08:31:20 -06:00
Blade Barringer
1a68b5e9ee
Refactor and add tests to flagged messages.
2015-11-03 08:00:14 -06:00
Blade Barringer
24480e5f04
Merge branch 'develop' into srrvnn-develop
2015-11-03 07:31:48 -06:00
Blade Barringer
2713b0f26f
chore(i18n): update locales
2015-11-02 22:08:28 -06:00
Sabe Jones
6b3fcd3d11
fix(content): Correct stats for Royal Robes
...
...in newtype content file
2015-11-02 17:34:59 -05:00
Sabe Jones
510080325d
fix(content): Correct missing Armoire items
...
...in newstyle content files
2015-11-02 17:33:03 -05:00
Sabe Jones
e74c83be2e
feat(content): November backgrounds and Armoire
2015-11-02 17:28:20 -05:00
Sabe Jones
2cb4e80019
chore(event): End Fall Festival
2015-11-02 12:55:48 -05:00
Matteo Pagliazzi
ed0e4c6d20
Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other \
...
for the upcoming api v3
Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other for the upcoming api v3
move api v2 routes in a separate folder, rename apiv1 file for better readability, remove auth routes for api v1
move api-v2 controllers in subdirectory
move unorganized files to /libs
fix gulp requires and separate server in old (api v1 and v2) and new (api v3) app
fix require paths
fix require paths
fix require paths
put api v1 back
Reorganize files under /src and separate express app in one for api v1 and v2 and the other for v3
2015-11-02 17:43:32 +01:00
Blade Barringer
6f3be77961
Add tests for flagged messages in get group object test
2015-11-02 07:46:21 -06:00
Blade Barringer
0894a3ea2d
Merge branch 'develop' into srrvnn-develop
2015-11-02 06:45:45 -06:00
Sabe Jones
9227dd89be
fix(event): Extend festival one day
2015-11-01 13:27:36 -06:00
Blade Barringer
da06e0736a
Adjust style of tests.
2015-10-31 21:37:44 -05:00
Blade Barringer
f84a10ee4e
Simplify delete user test
2015-10-31 21:37:17 -05:00
Blade Barringer
d5c346bf3f
Merge branch 'develop' into jeremyabbott-deleteusertestupdates
2015-10-31 21:27:16 -05:00
Jeremy Abbott
19128cf8f2
Fnished user in solo group tests
...
Also minor code cleanup in random files.
2015-10-31 16:19:50 -05:00
Sabe Jones
2e7006a0f7
chore(news): Burnout win Bailey
2015-10-31 16:03:34 -04:00
Blade Barringer
421b402948
Add helper to check the existence of a document
2015-10-31 10:55:28 -05:00
Blade Barringer
6a65711c2f
Close db connections in helpers
2015-10-31 10:55:17 -05:00
Alys
fa060bf6cd
revert a commit that went live prematurely when I was distracted - sorry for commit spam
2015-10-31 19:26:05 +09:00
Alys
559a2cea50
revert my stupid tavern quest hack because a server restart was all that was needed
2015-10-31 19:11:07 +09:00
Alys
fbb1f9aec5
create a nasty hack to get rid of the persistent Tavern quest exhaust sprites
2015-10-31 19:01:21 +09:00
Alys
8f21fb2419
set lastCron to current moment if the user's timezone has changed when they authenticate
2015-10-31 18:34:35 +09:00
Blade Barringer
eaad27dfee
Merge pull request #6147 from crookedneighbor/modals_adjustments
...
Create a social layout
2015-10-30 23:23:00 -05:00
Blade Barringer
c419ca8839
Merge pull request #6068 from AminArria/Wrong-max-level-messages
...
Wrong max level messages
2015-10-30 23:21:29 -05:00
Blade Barringer
2eb6cab2be
Merge pull request #6014 from ahstro/toggle-chevrons
...
Toggle chevron direction
2015-10-30 23:13:51 -05:00
Blade Barringer
add761e58e
Remove extraneous div
2015-10-30 23:05:19 -05:00
Blade Barringer
4a9b0f1d12
Merge branch 'Thrashmandicoot-merchant-button-fix' into develop
2015-10-30 22:50:26 -05:00
Blade Barringer
898850fd6e
Adjust wording of market message.
2015-10-30 22:50:04 -05:00
Blade Barringer
92271c2049
Clean up view for market.
2015-10-30 22:49:13 -05:00
Blade Barringer
391e09dd33
Fix auto-redirect
2015-10-30 22:28:11 -05:00
Thrashmandicoot
76de8af848
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 20:02:16 -07:00
Thrashmandicoot
1051ff0006
Fix inline-styling to be class styling
2015-10-30 20:01:22 -07:00
Thrashmandicoot
c2222a42c7
Add 70% width styling for item sales
2015-10-30 20:01:06 -07:00
Alys
154fcb4f8c
make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron
2015-10-31 13:00:42 +10:00
Alys
34c51fc710
revert recent cron change (better code incoming; what WAS I thinking)
2015-10-31 10:59:41 +10:00
Blade Barringer
d37450622c
Create a social layout
2015-10-30 18:41:46 -05:00
Sabe Jones
0c5e520e6f
WIP(sharing): Incomplete landing page
...
First stab at creating landing pages for inbound social traffic. May need a different solution.
2015-10-30 17:35:30 -04:00
Sabe Jones
5d3f41637f
Merge branch 'develop' into sabrecat/more-modals
2015-10-30 16:33:17 -04:00
Blade Barringer
ad6fbef85c
Move chat tests to new infrastructure
2015-10-30 14:47:14 -05:00
Sabe Jones
68660b3043
Merge pull request #6140 from HabitRPG/sabrecat/habitoween
...
WIP: Habitoween
2015-10-30 14:46:44 -05:00
Sabe Jones
dca0d7c3f3
fix(event): Keep NPCs burnt out
2015-10-30 15:36:17 -04:00
Alys
161069cfec
prevent cron running if the lastCron date is in the future
2015-10-31 04:12:43 +10:00
Blade Barringer
003524a19b
Update npm
2015-10-30 10:28:10 -05:00
Blade Barringer
724bc6e861
Compiled css for sprites
2015-10-30 10:10:12 -05:00
Matteo Pagliazzi
e82d4e59d8
put.nvmrc back
2015-10-30 15:29:56 +01:00
Matteo Pagliazzi
e145439b0b
starts cleaning up the repo
2015-10-30 15:27:33 +01:00
Blade Barringer
e8fa22bf93
chore(i18n): update locales
2015-10-30 09:25:43 -05:00
Blade Barringer
47168cfdc1
Merge pull request #6145 from crookedneighbor/test_updates
...
Update Tests to test server error messages against translation strings
2015-10-30 09:21:49 -05:00
Blade Barringer
6f18470b65
Update readme
2015-10-30 09:04:19 -05:00
Blade Barringer
aa111b3c1a
Update tests to assert against translation strings
2015-10-30 09:01:57 -05:00
Matteo Pagliazzi
75e85c085d
fix typo in package.json
2015-10-30 14:18:14 +01:00
Matteo Pagliazzi
0131ba3e45
reert all the deps upgrades
2015-10-30 14:16:35 +01:00
Matteo Pagliazzi
413a06c8d3
disable newrelic
2015-10-30 13:34:18 +01:00
Thrashmandicoot
f979dd9c0f
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:55:23 -07:00
Matteo Pagliazzi
715dd28e24
chore(newrelic): upgrade to ~1.23.0
2015-10-30 11:51:18 +01:00
Thrashmandicoot
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
Thrashmandicoot
0e52a62ad2
dynamic images for merchant, finishes refactor
2015-10-30 03:43:13 -07:00
Matteo Pagliazzi
2097004676
chore(node): upgrade to ^4.2.1
2015-10-30 10:44:13 +01:00
Thrashmandicoot
e1b26a884c
Add display for selling items, needs right img
2015-10-30 02:27:36 -07:00
Thrashmandicoot
ebbc72e9c2
Refactor sellForGold, add displayPotion/item
2015-10-30 02:26:41 -07:00
Sabe Jones
d3a6ff5b2d
fix(front-page): Remove extra script tag
...
Why did I even do that?
2015-10-29 17:07:41 -04:00
Alys
1923a3a467
change on-hover text for Mystery Item gift box to just mention wiki page
2015-10-30 06:59:54 +10:00
Sabe Jones
c28afc9abc
feat(sharing): Buttons for more modals
2015-10-29 16:33:27 -04:00
Alys
11ae4a9b87
change on-hover text for Mystery Item gift box to link to wiki page and remove statement about finding exact date on wiki
2015-10-30 06:30:11 +10:00
Matteo Pagliazzi
4051cdf06d
add requirejs to devDeps as it is a required peerDependency
2015-10-29 19:56:50 +01:00
Matteo Pagliazzi
332df1d646
Merge pull request #6136 from HabitRPG/upgrade-stack
...
Upgrade stack
2015-10-29 19:28:51 +01:00
Sabe Jones
27d1e9c788
feat(event): Habitoween
...
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
2015-10-29 14:15:18 -04:00
Matteo Pagliazzi
82f5897c41
Merge pull request #6138 from crookedneighbor/mongo3
...
Update travis to use mongo 3 and npm v3
2015-10-29 19:12:27 +01:00
Blade Barringer
9844d3dc76
Use most recent version of npm 3 in travis
2015-10-29 13:07:50 -05:00
Blade Barringer
b4d45834d1
Update travis to use mongo 3 and npm v3
2015-10-29 12:59:10 -05:00
Blade Barringer
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
Blade Barringer
0c82d757c8
Move cs tests to js
2015-10-29 12:25:02 -05:00
Matteo Pagliazzi
e813b756ac
use higher npm version
2015-10-29 17:26:35 +01:00
Matteo Pagliazzi
23984a7543
revert to old travis file
2015-10-29 17:12:53 +01:00
Matteo Pagliazzi
64852ae2bd
Revert "add mongodb to travis ci"
...
This reverts commit 8c99cc1d3b .
2015-10-29 17:09:03 +01:00
Matteo Pagliazzi
8c99cc1d3b
add mongodb to travis ci
2015-10-29 16:41:54 +01:00
Matteo Pagliazzi
37d83fdade
mongoo 4 and new travis ci infrastructure
2015-10-29 16:35:02 +01:00
Matteo Pagliazzi
8ea69e90dd
enable new relic, node 4 and npm 3
2015-10-29 16:11:56 +01:00
Matteo Pagliazzi
92fc2683c6
fix(cluster): use for loop instead of _.times
2015-10-29 16:04:30 +01:00
Matteo Pagliazzi
f9ab04e4f9
upgrade to express 4.x
...
cleanup package.json
put errorHandler middleware as the last one
use accepts module instead of req.acceptedLanguages
use normal object notation as it is supported is es5
remove deprecations from auth controller
remove deprecations from groups controller
Revert "remove deprecations from groups controller"
This reverts commit 7cf36295ebbc50c1f2b210a8ab447d7f2c41dba9.
Revert "remove deprecations from auth controller"
This reverts commit deecd701e0551862ba53ea894f2d87a746384fed.
request limit upped to 1mb and 10k chars for query parameters
Upgrade to Express 4.x
2015-10-29 15:59:45 +01:00
Blade Barringer
ee55c44548
Add text assertion to test
2015-10-29 08:42:37 -05:00
Blade Barringer
6ff904bd5a
Merge branch 'develop' into czan-develop
2015-10-29 08:40:03 -05:00
Blade Barringer
bf27d62cc2
Merge branch 'api_tests' into develop
2015-10-29 08:07:55 -05:00
Blade Barringer
68fabbf56f
Update names
2015-10-29 08:07:06 -05:00
Blade Barringer
4b44c935e8
Merge branch 'develop' into Bunjl-develop
2015-10-29 07:58:31 -05:00
Blade Barringer
bce37f7220
Adjusted Press Kit naming.
2015-10-29 07:55:17 -05:00
Blade Barringer
5cc790093e
Move join party tests to new structure.
2015-10-29 07:41:49 -05:00
Blade Barringer
55fcf678c3
Move push notification to new infrastructure.
2015-10-28 21:36:04 -05:00
Blade Barringer
ab1ac1f543
Remove unneeded test
2015-10-28 21:09:55 -05:00
Blade Barringer
265bb56db2
Move get user tests
2015-10-28 21:06:28 -05:00
Blade Barringer
e98484d0ec
Move anonymous route test to new structure.
2015-10-28 21:00:28 -05:00
Blade Barringer
fd4fb836f0
Move task tests
2015-10-28 17:18:27 -05:00
Sabe Jones
22caaa7eda
feat(sharing): More opt outs
...
Also fixes a bug where "Display Now" didn't work for pets with a space in their name.
2015-10-28 17:48:16 -04:00
Sabe Jones
aad3e5ade6
fix(sharing): Add social service to Inventory
...
Also fixes accidental 'only' in tests.
2015-10-28 16:52:07 -04:00
Sabe Jones
f4ea6c1d5d
feat(sharing): Opt Out WIP
...
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
Amin Arria
bd230df0d3
Added rebirthLevel var to remove need of extra translation string
2015-10-28 14:33:45 -04:30
Sabe Jones
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04:00
Matteo Pagliazzi
01373882c6
make error notification persistent, change text and make it translatable
2015-10-28 19:42:26 +01:00
Blade Barringer
7205ac689d
Merge pull request #6114 from kylestratis/issue-5542a
...
Issue 5542a - remove FIXME comment from invitations section in user model
2015-10-28 06:45:50 -05:00
jpk24rent
909d556a6d
Merge remote-tracking branch 'HabitRPG/develop' into develop
2015-10-28 09:47:47 +02:00
jpk24rent
5269df2932
namefix
2015-10-28 09:47:04 +02:00
Blade Barringer
5754b4f72a
chore(i18n): update locales
2015-10-27 21:38:23 -05:00
Blade Barringer
1a6b1f2a1c
Update string
2015-10-27 21:36:52 -05:00
Blade Barringer
b82054128d
chore(i18n): update locales
2015-10-27 21:36:51 -05:00
Blade Barringer
b70597e1d1
Merge pull request #6122 from crookedneighbor/batch_update_adjustment
...
Batch update adjustment
2015-10-27 21:35:19 -05:00
Blade Barringer
ed464a2b70
Merge pull request #6127 from crookedneighbor/reinstate_amplitude
...
Reinstate amplitude
2015-10-27 21:35:10 -05:00
Blade Barringer
711413f832
Update string
2015-10-27 21:28:33 -05:00
Blade Barringer
cdc58c78fd
Merge branch 'nicolevonvon-develop' into develop
2015-10-27 20:19:09 -05:00
Blade Barringer
c812c0ae90
Add popover to no owner label
2015-10-27 20:18:39 -05:00
kylestratis
0283408d1e
Removed FIXME comment above invitations object - the object is still being used.
2015-10-27 21:12:19 -04:00
Blade Barringer
691ab86bd6
Add test for default user id
2015-10-27 19:40:11 -05:00
Blade Barringer
a7c52e6086
Reinstate amplitude analytics
2015-10-27 19:37:57 -05:00
Matteo Pagliazzi
3bae95d3ae
remove console.log for push notifications
2015-10-27 22:11:47 +01:00
nicolevonvon
47ec2e1f93
Challenges now display'no owner' if original owner deletes account
2015-10-27 22:15:19 +02:00
Blade Barringer
68689d1a05
Remove debug option from mocha opts
2015-10-27 12:25:39 -05:00
Matteo Pagliazzi
7541c5a260
fix(analytics): disable amplitude
2015-10-27 17:59:29 +01:00
Matteo Pagliazzi
d05b00fb34
fix(analytics): enable analytics and correctly export methods
2015-10-27 17:39:37 +01:00
Matteo Pagliazzi
2443177729
fix(server): disable analytics until bug is fixed
2015-10-27 17:26:15 +01:00
Matteo Pagliazzi
98a00fcb4e
fix(memory) do not check for new relic until it is enabled again
2015-10-27 17:10:46 +01:00
Blade Barringer
f9afc8a8c6
Reorganize development user operations
2015-10-27 08:48:18 -05:00
jpk24rent
078c37bdda
presskit
...
press kit update
2015-10-27 15:34:52 +02:00
Blade Barringer
4886b50aa3
Add testing for batch update. Handle unknown operations better.
2015-10-27 08:13:30 -05:00
Blade Barringer
f13641b6a9
Add NODE_ENV to test server startup
2015-10-27 08:00:33 -05:00
Alys
1cc7ea872f
chore(news): Exhaust Strike Bailey - recommiting after temporary removal
2015-10-27 19:18:05 +10:00
Alys
23059763eb
revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment
2015-10-27 18:45:30 +10:00
Alys
a29c412781
prevent addTenGems and addHourglass being used in production -- PRs https://github.com/HabitRPG/habitrpg/pull/6115 and https://github.com/HabitRPG/habitrpg/pull/6117 by nivl4
2015-10-27 18:31:17 +10:00
Sabe Jones
f5d6c92897
chore(news): Exhaust Strike Bailey
2015-10-27 00:24:11 -04:00
Carlo Zancanaro
4d6bd38648
Add GET routes for /user/tags and /user/tags/{id}
...
An operation that is useful for tools to be able to do is to list a
user's tags without having to pull down the entire user object (which is
likely significantly larger than the tags). This commit adds a route to
GET /user/tags, to get a list of the user's tags, as well as a GET
/user/tags/{id} to get the details of a particular tag.
This commit also includes tests for the two new routes.
2015-10-27 13:49:17 +11:00
Blade Barringer
c04b27ffd5
Simplify community guidelines string
2015-10-26 18:08:45 -05:00
Blade Barringer
f0e4149adb
Merge branch 'develop' into ksami-develop
2015-10-26 17:56:05 -05:00
Blade Barringer
4dd368a028
Merge pull request #6082 from anilanar/reroll-syntax-bug
...
fix a minor syntax error when opening reroll modal.
2015-10-26 17:55:16 -05:00
Blade Barringer
a556cf1c13
Merge pull request #6113 from crookedneighbor/ogAc8BA0_prevent_changing_class_change_from_api
...
ogAc8BA0 - prevent changing class change from api without spending gems
2015-10-26 17:45:56 -05:00
Blade Barringer
09596c657b
Remove only form test
2015-10-26 17:34:29 -05:00
Blade Barringer
2790008937
Adjust error message to not point to a readme file that does not exist.
2015-10-26 17:27:08 -05:00
Blade Barringer
13bca6b9a9
Prevent class from being changed via PUT /user
2015-10-26 17:25:51 -05:00
Blade Barringer
c7b162271c
Adjust context title.
2015-10-26 17:13:21 -05:00
Sabe Jones
2df6df2bee
Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510
...
October 2015 Subscriber Items
2015-10-26 15:04:43 -05:00
Blade Barringer
13fa14270d
Add additional check for stat change
2015-10-26 12:52:18 -05:00
Blade Barringer
f8d08b4195
Merge branch 'jeremyabbott-userputtests' into userput
2015-10-26 12:25:17 -05:00
Blade Barringer
6a6922bb3f
Add tests for protected paths
2015-10-26 12:24:02 -05:00
Jeremy Abbott
e4269723e1
Creates initial PUT /user test
...
Adds missing semi-colon to DELETE-user.test.js
2015-10-26 10:54:37 -05:00
Blade Barringer
0eac953170
Adjust stying of put test
2015-10-26 08:04:30 -05:00
Blade Barringer
cf7be0b7a3
Merge branch 'develop' into jeremyabbott-userputtests
2015-10-26 08:00:30 -05:00
Blade Barringer
04fbdaa107
Reinstate error code in resolve promise for api tests.
2015-10-26 07:53:51 -05:00
Jeremy Abbott
eeb14075bb
Creates initial PUT /user test
2015-10-25 22:58:10 -05:00
Jeremy Abbott
6b52a32265
Creates user-put file with stub test
2015-10-25 18:07:50 -05:00
kylestratis
b75f044d07
Changed Mongo query to check DateTerminated to prevent accumulation of mystery items when subscription is ended.
2015-10-25 18:16:42 -04:00
Blade Barringer
01914523e1
Remove dependency on chai-shallow-deep-equal
2015-10-25 12:50:14 -05:00
Blade Barringer
b72c37301c
Update api tests readme
2015-10-25 11:34:45 -05:00
Blade Barringer
8e282738f5
Convert pending api tests to use promise syntax
2015-10-25 11:21:19 -05:00
Blade Barringer
829b1253fb
Revert nodemon change for tests and log errors if they arise
2015-10-25 11:10:10 -05:00
Blade Barringer
f06d3cdffe
Convert remaining active api tests to use promises
2015-10-25 11:09:50 -05:00
Blade Barringer
12ce4b133d
Update GET groups route test to use promises.
2015-10-25 10:57:42 -05:00
Blade Barringer
177c81da81
Use promise syntax for Get groups id route test.
2015-10-25 10:43:34 -05:00
Blade Barringer
5961e02f5f
Use promise syntax in POST groups test.
2015-10-25 10:12:43 -05:00
Blade Barringer
7fe2a19bc5
Adjust start server task to use nodemon to recover from syntax errors
2015-10-25 09:54:09 -05:00
Blade Barringer
a5c0bae273
Update POST group id tests.
2015-10-25 09:40:36 -05:00
Blade Barringer
f98c6b7192
Add chai-shallow-deep-equal plugin
2015-10-25 09:40:23 -05:00
Blade Barringer
45afc9f3fb
Only start up server in tests if it is not already running.
2015-10-25 09:19:42 -05:00
Blade Barringer
96c77dad9c
Promisify join group route test
2015-10-25 09:02:22 -05:00
Blade Barringer
d370219142
Use promise syntax for leave groups route test.
2015-10-25 08:59:43 -05:00
Blade Barringer
a52b30b33c
Update group leaveMember test
2015-10-25 08:19:45 -05:00
Blade Barringer
27cb5881cd
Adjust delete route test to use promises
2015-10-25 08:16:21 -05:00
Blade Barringer
69d48cb98e
Adjust the get user integration test
2015-10-25 08:14:16 -05:00
Blade Barringer
600f56dae0
Convert status test to promise
2015-10-25 08:02:30 -05:00
Blade Barringer
661d070b56
Add additional tests for register route
2015-10-24 22:28:04 -05:00
Blade Barringer
b763aedd29
Change helper to reject only error message
2015-10-24 22:23:30 -05:00
Blade Barringer
a0547b99ca
Update dependencies
2015-10-24 20:14:48 -05:00
Blade Barringer
fb30a7b03b
Compile sprites.
2015-10-24 20:14:30 -05:00
nivl4
495e103be5
Update vagrant provisioning script to create symlinks for any binaries the package might contain (default npm install behavior), as without those symlinks "npm test" gives the following error:
...
vagrant@habitrpg:/vagrant$ npm test
> habitrpg@0.0.0-152 test /vagrant
> gulp test
[Error: /vagrant/node_modules/bson/build/Release/bson.node: invalid ELF header]
js-bson: Failed to load c++ bson extension, using pure JS version
[07:07:48] Using gulpfile /vagrant/gulpfile.js
[07:07:48] Starting 'test:prepare:build'...
[07:07:48] Starting 'test:prepare:mongo'...
[07:07:48] Starting 'test:prepare:webdriver'...
[07:07:48] 'test:prepare:build' errored after 33 ms
[07:07:48] Error: Command failed: /bin/sh: 1: ./node_modules/.bin/grunt: not found
at ChildProcess.exithandler (child_process.js:658:15)
at ChildProcess.emit (events.js:98:17)
at maybeClose (child_process.js:766:16)
at Socket.<anonymous> (child_process.js:979:11)
at Socket.emit (events.js:95:17)
at Pipe.close (net.js:466:12)
[07:07:48] Finished 'test:prepare:mongo' after 78 ms
[07:08:50] Finished 'test:prepare:webdriver' after 1.02 min
npm ERR! Test failed. See above for more details.
- "npm install" was giving the following error in earlier version of VirtualBox when creating symlinks with relative "../" path in shared folders. "--no-bin-links" was a workaround, but it's been fixed in the latest VirtualBox 5.0.8 (https://www.virtualbox.org/ticket/14563 )
vagrant@habitrpg:/vagrant$ npm install
npm WARN install Couldn't install optional dependency: Unsupported
npm WARN install Couldn't install optional dependency: Unsupported
npm WARN install Couldn't install optional dependency: Unsupported
npm WARN EPEERINVALID chai-as-promised@3.3.1 requires a peer of chai@>= 1.0.2 < 2 but none was installed.
npm WARN EPEERINVALID karma-requirejs@0.2.2 requires a peer of requirejs@~2.1 but none was installed.
npm ERR! Linux 3.2.0-23-generic
npm ERR! argv "node" "/usr/bin/npm" "install"
npm ERR! node v0.10.37
npm ERR! npm v3.3.6
npm ERR! path ../acorn/bin/acorn
npm ERR! code UNKNOWN
npm ERR! errno -1
npm ERR! UNKNOWN, symlink '../acorn/bin/acorn'
npm ERR!
npm ERR! If you need help, you may report this error at:
npm ERR! <https://github.com/npm/npm/issues >
npm ERR! Please include the following file with any support request:
npm ERR! /vagrant/npm-debug.log
2015-10-24 09:53:01 +08:00
nivl4
719eb6583a
Remove vagrant customization that enables symlinks in /vagrant shared folder, at that is the default behavior of vagrant since 1.1. ( https://github.com/mitchellh/vagrant/issues/713#issuecomment-13201507 )
2015-10-24 09:51:54 +08:00
Blade Barringer
ff64523ae4
Merge pull request #6062 from crookedneighbor/new_api_test_infrastructure
...
New api test infrastructure
2015-10-23 18:06:39 -05:00
Blade Barringer
e456bdb2ae
Revert npm bin command
2015-10-23 17:35:45 -05:00
Blade Barringer
6aa6c1e1c2
Merge branch 'develop' into new_api_test_infrastructure
2015-10-23 17:32:44 -05:00
Blade Barringer
26ccde6e10
Create guidelines for writing api tests
2015-10-23 17:31:29 -05:00
Sabe Jones
2582d0b7c7
fix(sprites): Flip goblin tail
...
The Goblin Tail slightly breaks from convention for items (it's 12px wider than most), but that allows it to remain visible and well composed when the avatar is riding a mount.
2015-10-23 16:33:58 -04:00
Sabe Jones
392889c7da
feat(mystery): October 2015 subscriber set
2015-10-23 15:45:43 -04:00
Blade Barringer
5481178dbe
Move e2e tests higher up in test calls
2015-10-23 12:42:47 -05:00
Blade Barringer
7ad2e6d1ff
Add comments to helper methods
2015-10-23 12:32:15 -05:00
Blade Barringer
6492554cf1
Add error handling for when mongo is not running.
2015-10-23 12:19:51 -05:00
ksami
f2c856f6e6
Make link translatable in options/inventory/time-travelers
2015-10-23 23:40:11 +08:00
ksami
b3cc58886c
Make strings translatable in options/social/chat-box
2015-10-23 23:20:59 +08:00
Blade Barringer
27d9e60d0f
Update api legacy test readme
2015-10-22 20:05:31 -05:00
Blade Barringer
73b2208106
Port final groups test to new structure
2015-10-22 20:02:08 -05:00
Blade Barringer
3c8c4343ee
Move group tests to new test structure
2015-10-22 18:04:16 -05:00
Blade Barringer
e3234a54ce
Refactor get groups test to test all kinds of groups
2015-10-22 17:15:40 -05:00
Sabe Jones
78416f68da
fix(sharing): Better social button positioning
2015-10-22 16:00:55 -04:00
Sabe Jones
152fb72899
fix(sharing): Needed return object
2015-10-22 15:08:04 -04:00
Sabe Jones
e2cfd1bd54
feat(sharing): Load widgets from service
2015-10-22 14:37:29 -04:00
Sabe Jones
281411f423
Merge branch 'develop' into sabrecat/more-modals
2015-10-22 14:05:26 -04:00
Blade Barringer
9a79870b93
Change convention for naming tests
2015-10-22 12:53:48 -05:00
Sabe Jones
bcc522f08d
feat(sharing): Add Tumblr button
2015-10-22 13:52:26 -04:00
Blade Barringer
c4402b2634
Port removeMember tests to new test format
2015-10-22 12:48:45 -05:00
Blade Barringer
abf4b1c643
Fix bug where tests were failing erroneously
2015-10-22 12:46:54 -05:00
Blade Barringer
d28450d52a
Port groups /leave tests to new integration tests.
2015-10-22 12:28:26 -05:00
Sabe Jones
0bd4de3b88
fix(test): Update push notif string
2015-10-22 13:28:01 -04:00
Sabe Jones
d08a3efbcd
fix(news): Bogus trailing slash
2015-10-22 12:04:43 -05:00
Anil Anar
e269e04172
fix a minor syntax error when opening reroll modal.
2015-10-22 09:24:04 +02:00
Blade Barringer
c3aa70ecc3
Moved guild update tests from legacy file to new file
2015-10-21 18:02:02 -05:00
Blade Barringer
f4256f7bf6
Adjust context description
2015-10-21 17:59:44 -05:00
Sabe Jones
9fb671f068
fix(social): Better share image
2015-10-21 16:25:03 -05:00
Sabe Jones
a2c0e02283
fix(social): Correct OG tag errors
2015-10-21 16:37:33 -04:00
Sabe Jones
d32f6f23cc
feat(sharing): Improved front page FB share
2015-10-21 15:59:17 -04:00
Sabe Jones
44818882f6
feat(sharing): Pretty Tweet button for level up
2015-10-21 15:23:31 -04:00
Matteo Pagliazzi
e75d3547c5
force emails to lowercase and use a lowercase version of username to check for duplicates
2015-10-21 13:14:18 +02:00
Matteo Pagliazzi
fc9d0775ab
add migration for lowercase version of emails and username
2015-10-21 11:19:14 +02:00
Matteo Pagliazzi
c7f8426bce
preparation for code for lowercase emails and lowercase version of username to check for duplicates
2015-10-21 11:01:06 +02:00
Alys
2745a172ea
Merge pull request #6076 from claushellsing/patch-2
...
Update README.md
2015-10-21 15:37:04 +10:00
Rainer Eli
32cb29b45f
Update README.md
2015-10-20 22:48:58 -06:00
Blade Barringer
b52f901f41
Convert legacy api helper to js
2015-10-20 21:53:52 -05:00
Blade Barringer
3036c6db9e
Merge branch 'develop' into new_api_test_infrastructure
2015-10-20 21:18:49 -05:00
Blade Barringer
a0e7eef956
Fix legacy tests
2015-10-20 20:17:10 -05:00
Sabe Jones
d4146d69e2
Merge pull request #6072 from HabitRPG/sabrecat/pets-201510
...
Pet Quest for October 2015
2015-10-20 18:12:19 -05:00
Sabe Jones
5fbd6814b0
fix(pets): Realign frog sprites
...
Also adds a note about the To-Do sorting fix to the Bailey announcement
2015-10-20 18:55:57 -04:00
Blade Barringer
23398b1a37
Closes #6071
2015-10-20 12:39:04 -05:00
Sabe Jones
1ad6ffd35d
Merge branch 'develop' into sabrecat/more-modals
2015-10-20 12:50:34 -04:00
Sabe Jones
d0a34fc0ad
feat(quests): 2015-10 Pet
...
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
Saravanan Ganesh
df7fd2e036
fix(chat): #5864 API should return flagged messages in chat only to mods
2015-10-19 21:43:24 -07:00
Sabe Jones
0a6d9fa23a
WIP(pets): Frog quest
2015-10-19 23:12:24 -04:00
Blade Barringer
703caeadff
Merge pull request #6038 from vIiRuS/patch-5
...
store iOS tutorial steps
2015-10-19 17:49:13 -05:00
Blade Barringer
a0753d31b2
Merge pull request #6046 from vIiRuS/newIAPs
...
Handle new possible iOS in-app-purchases
2015-10-19 17:49:01 -05:00
Amin Arria
23114ac929
Fix trailing comma
2015-10-19 17:19:30 -04:30
Matteo Pagliazzi
ad6be153f4
Revert "use lowercase only emails - register phase"
...
This reverts commit 69fdff615a .
2015-10-19 19:42:25 +02:00
Matteo Pagliazzi
7a2d2fd3dc
Revert 215ca0371c
2015-10-19 19:42:13 +02:00
Amin Arria
3bd809f7c2
Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages
2015-10-19 12:14:38 -04:30
Amin Arria
038039dbee
Fixes #5550 , change message according to rebirthLevel
2015-10-19 12:10:27 -04:30
Blade Barringer
2883dc6c85
Merge branch 'ksami-develop' into develop
2015-10-19 08:14:48 -05:00
Blade Barringer
9ad1dbd8ce
Adjust mystic hourglass string to take in interpolation
2015-10-19 08:10:37 -05:00
Blade Barringer
d9de32f2dc
Add todo to investigate magic numbers
2015-10-19 08:04:47 -05:00
Blade Barringer
1a2510e4da
Adjsut string to take in interpolation
2015-10-19 08:03:27 -05:00
Blade Barringer
931d688637
Use Content service
2015-10-19 08:03:14 -05:00
Blade Barringer
f03be07595
Add extra line breaks
2015-10-19 08:02:35 -05:00
Blade Barringer
4a3e60d0d7
Merge branch 'develop' into ksami-develop
2015-10-19 06:26:34 -05:00
Phillip Thelen
2fde3c771f
remove empty line
2015-10-19 12:50:30 +02:00
Phillip Thelen
3a42711427
nicer style for default gem value
2015-10-19 12:48:50 +02:00
Ricardo Mendes
6e68450309
Tweaks tests to account for autoEquip user preference.
2015-10-19 08:26:15 +00:00
Ricardo Mendes
5e3f46d786
Checks user auto-equip preference in buy function
2015-10-19 05:52:46 +00:00
Ricardo Mendes
73924df241
Adds auto-equip UI to equipment view
2015-10-19 05:20:11 +00:00
Ricardo Mendes
e79863e134
Adds auto-equip boolean to user preferences
2015-10-19 05:20:10 +00:00
Ricardo Mendes
860abce1d7
Adds auto-equip string to locales/en
2015-10-19 05:20:10 +00:00
Blade Barringer
fcec018616
Merge pull request #6009 from locks/patch-2
...
Typo in test description string
2015-10-18 21:35:51 -05:00
Blade Barringer
dbc9c5a48c
Merge pull request #6008 from locks/patch-1
...
Typo in comment string
2015-10-18 15:29:29 -05:00
Phillip Thelen
7a7d038602
Split up tutorial parts
2015-10-18 17:29:06 +02:00
Blade Barringer
1417d643e4
Comment out content test until we know for sure what we're doing with the content files
2015-10-18 10:14:54 -05:00
Blade Barringer
b2350f10f1
Create get groups test
2015-10-18 10:01:55 -05:00
Blade Barringer
cd224ac8d8
Add members attribute to tavern
2015-10-18 09:59:39 -05:00
Blade Barringer
63b17f0173
Create method to reset habitica db
2015-10-18 08:47:14 -05:00
Blade Barringer
ece2985eb0
Return better error when connection can't be established
2015-10-18 08:46:47 -05:00
Blade Barringer
bab093b7ab
Write get group tests
2015-10-18 07:15:35 -05:00
Blade Barringer
4fa82ba196
Update generated document with update object
2015-10-18 07:00:48 -05:00
Blade Barringer
9b2da51991
Create pending tests for unhandled behavior
2015-10-18 06:48:43 -05:00
Blade Barringer
82b133e8fc
Add tests for creating groups
2015-10-18 06:38:22 -05:00
Blade Barringer
24001c5c66
Create generate group function
2015-10-18 06:15:38 -05:00
Blade Barringer
8f7ecf7d7c
Rename uuid function
2015-10-18 06:03:22 -05:00
Blade Barringer
ab2b564a03
Update error check
2015-10-17 21:24:46 -05:00
Anil Anar
a08fd12aa1
add new favicon with 192x192 resolution, meta tag for android:chrome.
2015-10-18 03:56:17 +02:00
Blade Barringer
477fb8edcb
Add missing semicolon
2015-10-17 20:38:18 -05:00
Blade Barringer
7f5c556654
Add pending tests
2015-10-17 20:23:29 -05:00
Blade Barringer
680be3a641
Add delete user test
2015-10-17 20:18:44 -05:00
Blade Barringer
416f82ade7
Clean up user test
2015-10-17 20:18:37 -05:00
Blade Barringer
1d22382c16
Remove get user test from legacy script
2015-10-17 20:15:34 -05:00
Blade Barringer
75f63b1367
Add functionality to generate user to update user
2015-10-17 19:19:40 -05:00
Blade Barringer
7f6b392511
Add gulp watch task for api tests
2015-10-17 19:17:23 -05:00
Blade Barringer
c51caa0664
Add generate new user helper
2015-10-17 18:27:19 -05:00
Blade Barringer
5291d1a4e9
Add test for registering a user
2015-10-17 18:13:38 -05:00
Blade Barringer
de6a853aaf
Adjust api helper
2015-10-17 18:05:44 -05:00
Blade Barringer
5d268c58de
Adjust api test commands
2015-10-17 18:04:32 -05:00
Blade Barringer
0444a7d713
Move status test to own folder
2015-10-17 15:51:00 -05:00
Blade Barringer
ddf2ceeccd
Change name of test
2015-10-17 15:05:32 -05:00
Blade Barringer
4a69dcbdf1
Remove status test from legacy infrastructure
2015-10-17 12:40:00 -05:00
Blade Barringer
5b729bf776
Merge branch 'develop' into new_api_test_infrastructure
2015-10-17 12:39:24 -05:00
Blade Barringer
02e9775ba7
Set up new api test structure
2015-10-17 12:37:17 -05:00
Blade Barringer
59e2b92dae
Kill mocha test if not set to watch
2015-10-17 12:23:04 -05:00
Blade Barringer
9a14368170
Correct test commands
2015-10-17 12:22:04 -05:00
Blade Barringer
56baf59195
Add global module to mocha requires
2015-10-17 11:55:05 -05:00
Blade Barringer
aa9be8cb1a
Update superagent
2015-10-17 11:46:57 -05:00
Sabe Jones
22ec450521
feat(modals): Won Challenge
...
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
2015-10-16 23:36:57 -04:00
Blade Barringer
a61632fa92
Set up api tests
2015-10-16 21:56:46 -05:00
Blade Barringer
b26c8c3e74
Add api test task
2015-10-16 21:43:43 -05:00
Blade Barringer
c5b0e82acb
Merge pull request #6057 from Vorgone/develop
...
Refactor API unit tests
2015-10-16 19:26:21 -05:00
Blade Barringer
115af819a0
Create task to set up a test server
2015-10-16 15:00:33 -05:00
Alex Hart
d7498245dc
Refactor API unit tests
...
Move GET /user tests from status.coffee to users.coffee.
Remove GET /status test that uses user id and token.
2015-10-16 14:59:09 -05:00
Blade Barringer
0992f560e0
Merge branch 'develop' into new_api_test_infrastructure
2015-10-16 14:54:03 -05:00
ksami
65dc274e49
Make text in options/settings translatable
2015-10-16 20:48:12 +08:00
Sabe Jones
338aced208
feat(modals): Grew Mount
...
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10
feat(modals): Hatch Pet modal
...
Complete except for the planned addition of a heart sprite over the pet.
2015-10-15 16:34:53 -04:00
Alys
8af975755f
Merge pull request #6049 from nivl4/develop
...
Updated vagrant provisioning script to update npm to the latest version
2015-10-16 06:12:43 +10:00
Matteo Pagliazzi
215ca0371c
fix(signup): correct email checks
2015-10-15 19:52:21 +02:00
Matteo Pagliazzi
69fdff615a
use lowercase only emails - register phase
2015-10-15 18:26:23 +02:00
nivl4
485dc68fe4
Updated vagrant provisioning script to update npm to the latest version as the older version (1.4.28) was causing the following error during npm install.
...
npm ERR! EEXIST, open '/home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock'
File exists: /home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock
Move it away, and try again.
npm ERR! System Linux 3.2.0-23-generic
npm ERR! command "/usr/bin/node" "/usr/bin/npm" "install" "--no-bin-links"
npm ERR! cwd /vagrant
npm ERR! node -v v0.10.37
npm ERR! npm -v 1.4.28
npm ERR! path /home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock
npm ERR! code EEXIST
npm ERR! errno 47
npm ERR! not ok code 0
2015-10-15 21:51:36 +08:00
Sabe Jones
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
Phillip Thelen
4835de55a8
Adjust iap test
2015-10-15 00:09:24 +02:00
Phillip Thelen
319c294354
Fix global variable leak
2015-10-15 00:08:25 +02:00
Sabe Jones
e88030e15f
Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
...
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
Phillip Thelen
b0922f04b8
Handle new possible iOS in-app-purchases
2015-10-14 23:21:19 +02:00
Sabe Jones
59b2c1662e
fix(news): Revised Bailey
2015-10-14 12:54:33 -04:00
Alys
f9a3884c79
Merge pull request #6044 from roryokane/patch-1
...
Fix capitalization of “GitHub” on Contact Us page
2015-10-14 18:11:16 +10:00
Rory O’Kane
4a23f40415
Fix capitalization of “GitHub” on Contact Us page
...
The live page is at https://habitica.com/static/contact .
2015-10-14 03:55:46 -04:00
Sabe Jones
5bfea172ee
fix(notifications): Don't double-modal
...
Corrects behavior of the Notifications controller so that it skips showing the generic levelup modal if it's going to display the quest scroll version.
2015-10-13 17:01:07 -04:00
Sabe Jones
6505824cb6
feat(modals): Levelup modal
...
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
Sabe Jones
825b316ba8
fix(analytics): Cap progressUp
...
Previously, users could cron with enormous quest progress values, and this would be logged to the cron event in Analytics. However, for the purposes of damaging world bosses, quest progress is capped at 900. Given that progressUp is primarily used to predict world boss damage, this commit now caps progressUp in analytics at 900 as well.
2015-10-13 14:27:16 -04:00
Sabe Jones
5eacba54b8
feat(modals): Slim scroll notif
...
Establishes a new template for modal notifications, to be used across the app including a number of new notifications.
2015-10-13 14:20:51 -04:00
Alys
30de99b700
adjust world bosses FAQ answer
2015-10-13 06:49:07 +10:00
Sabe Jones
dcf17b5505
feat(event): Jack-O'-Lantern mounts
2015-10-12 14:49:12 -04:00
Phillip Thelen
caa7d4a220
store iOS tutorial steps
2015-10-12 16:34:07 +02:00
Blade Barringer
02133600ce
Add ios question to content
2015-10-12 07:40:31 -05:00
Alys
ece3e0d0aa
add FAQ item for World Bosses
2015-10-12 21:26:59 +10:00
Matteo Pagliazzi
a4b1c6cf64
Merge pull request #6033 from vIiRuS/patch-4
...
Add iOS smart app banner
2015-10-10 14:30:08 +02:00
Phillip Thelen
87012f6a7c
Add iOS start app banner
2015-10-10 13:52:53 +02:00
Sabe Jones
f00bbd9652
feat(modals): Small style scroll award
2015-10-09 15:39:36 -04:00
Sabe Jones
b775b8f399
feat(modals): Simplified scroll drop
...
Conflicts:
website/views/shared/modals/quests.jade
2015-10-09 14:07:54 -04:00
Alys
20415da586
Merge pull request #6018 from dcecile/develop
...
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
Blade Barringer
2cc4d65d78
Allow disabling logger in non-prod for testing
2015-10-08 22:42:09 -05:00
Sabe Jones
4044b0cb64
fix(world-boss): Update mechanics explanation
2015-10-08 18:48:13 -04:00
Blade Barringer
60cc428b81
chore(i18n): update locales
2015-10-08 17:42:10 -05:00
Blade Barringer
d873848f81
Commit missing file
2015-10-08 17:37:10 -05:00
Blade Barringer
0ccf07a4e0
Compile sprites
2015-10-08 17:32:34 -05:00
Blade Barringer
ccd77090f4
Fix css template for sprites
2015-10-08 17:31:32 -05:00
Sabe Jones
58801f5025
fix(world-boss): Don't repeat explanation
2015-10-08 13:17:49 -04:00
Sabe Jones
291a135fe1
Merge pull request #6023 from HabitRPG/sabrecat/world-boss
...
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
Sabe Jones
1d4536fc47
fix(sprites): Remove errant blob
2015-10-08 10:59:44 -05:00
Sabe Jones
c45736fc6f
Merge pull request #6024 from crookedneighbor/fix_world_dmg
...
Fix world dmg
2015-10-08 10:19:38 -05:00
Blade Barringer
36d471ddff
Correct module exports
2015-10-08 08:42:42 -05:00
Blade Barringer
5e10b8f4c9
Correct assinging of tavernQuest object when boss damage is calculated
2015-10-08 08:32:40 -05:00
Blade Barringer
9e88d17a78
Adjust tavern export to send over only quest object
2015-10-08 07:45:25 -05:00
Thrashmandicoot
40ea62344b
Add bold to item output when selling item
2015-10-07 20:11:07 -07:00
Thrashmandicoot
a1328bc837
Add bolding to item name
2015-10-07 20:10:27 -07:00
Thrashmandicoot
7c16197ec9
Refactor market to display eggs properly, wip
2015-10-07 19:19:56 -07:00
Thrashmandicoot
04550a3346
Add btn-sell to increase width of market button to container
2015-10-07 19:18:54 -07:00
Thrashmandicoot
921cb3ca5d
Add displayXForGold keys, refactor sell egg for gold
2015-10-07 19:17:13 -07:00
Sabe Jones
aba3908170
chore(gulp): Compile sprites
2015-10-07 15:15:21 -04:00
Thrashmandicoot
dadf1d5b0b
Add divider between sell button and text for market
2015-10-07 11:52:47 -07:00
Dan Cecile
22284bbc24
Issue #2606 - Verify/fix indices during sortTask
...
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
2015-10-06 21:24:34 -04:00
Sabe Jones
51355f7eea
fix(quest-eggs): Short-circuit canBuy
...
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
2015-10-06 16:56:17 -04:00
Sabe Jones
d27fb9dba2
WIP(world-boss): Rage and rewards
...
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones
3ca836a81c
fix(world-boss): Pass test
...
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
2015-10-05 17:18:44 -04:00
Sabe Jones
f6abcc0ddf
WIP(world-boss): Initial stats outlay
...
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
ahstro
76fcbfc19f
Toggle chevron direction
...
When editing a task, there are some expandable options available with a
chevron next to them (e.g. 'Tags' and 'Advanced Options'). This commit
makes the chevrons' directions toggle based on whether the related
option is expanded or collapsed, up and down respectively.
2015-10-05 22:17:28 +02:00
Sabe Jones
0d7a57d176
Merge branch 'develop' into sabrecat/world-boss
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones
dd53383ec6
Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
...
October 2015 backgrounds
2015-10-05 11:29:44 -05:00
Alys
f035dfd8b9
fix "Advanced Options in tasks start collapsed" when "Open new tasks in edit mode" is on - fixes https://github.com/HabitRPG/habitrpg/issues/5981
2015-10-05 19:37:53 +10:00
Ricardo Mendes
c462e65942
typo
2015-10-04 13:34:51 +01:00
Ricardo Mendes
f29f3a6b0e
typo
2015-10-04 13:34:22 +01:00
Blade Barringer
2683b2b0a0
Use var to declare mongoose
2015-10-03 20:55:28 -05:00
Blade Barringer
62b15c4f48
Simplify background tests
2015-10-03 11:54:58 -05:00
Blade Barringer
cc579b97a3
Increase converage around egg content
2015-10-03 11:42:23 -05:00
Blade Barringer
04d3bf0f19
Refactor faq tests
2015-10-03 11:19:27 -05:00
Blade Barringer
b82123e1a2
Update food tests
2015-10-03 11:11:16 -05:00
Blade Barringer
7e080d5423
Expand hatching potions test
2015-10-03 11:08:03 -05:00
Blade Barringer
95a17f6fbb
Expand user defaults test
2015-10-03 11:04:04 -05:00
Blade Barringer
4b46a0e9fc
Convert other globals to exported functions
2015-10-03 10:48:42 -05:00
Blade Barringer
f9ee70e912
Increase max buffer for content tests
2015-10-03 10:47:26 -05:00
Blade Barringer
d4843d958d
Remove unneded function
2015-10-03 10:31:20 -05:00
Blade Barringer
8987645725
Export constants instead of putting them on global scope
2015-10-03 10:26:10 -05:00
Blade Barringer
3f6be30ebc
Simplify spell tests and test more attributes
2015-10-03 10:21:52 -05:00
Blade Barringer
6fdfe6c3bf
Correct spelling of canBuy
2015-10-03 09:59:40 -05:00
Blade Barringer
a492649f71
Simplify gear tests and test more items
2015-10-03 09:59:10 -05:00
Blade Barringer
8eadecdc1a
Improve testing around armor
2015-10-03 09:34:56 -05:00
Blade Barringer
393cc71309
Correct gold purchasable quests
2015-10-03 09:21:15 -05:00
Blade Barringer
495a3d3125
Add additional tests for quests
2015-10-03 09:21:06 -05:00
Blade Barringer
53a51ca3db
Create helper function for testing items in object
2015-10-03 09:00:06 -05:00
Blade Barringer
36d7c59a0c
Add backgrounds to content file
2015-10-03 06:49:14 -05:00
Blade Barringer
6dbfbeec81
Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510
2015-10-03 06:40:50 -05:00
Blade Barringer
928e8478f7
Add coffeescript back in
2015-10-03 06:39:10 -05:00
Blade Barringer
655d8de7c8
chore(i18n): update locales
2015-10-02 22:28:12 -05:00
Blade Barringer
7a9bdfc9bf
Correct base sets
2015-10-02 22:26:51 -05:00
Sabe Jones
56419aee25
feat(content): October 2015 backgrounds
2015-10-02 16:13:11 -04:00
Blade Barringer
36cbca380e
Corrected order of backgrounds
2015-10-02 14:45:06 -05:00
Blade Barringer
bf7d6dddcc
chore(i18n): update locales
2015-10-02 11:41:57 -05:00
Blade Barringer
c6c159a44c
Add midnight shield back in
2015-10-02 11:40:42 -05:00
Blade Barringer
eb5e77cbb2
Fix locales for healAll
2015-10-02 10:34:54 -05:00
Blade Barringer
97ad1a8bb2
chore(i18n): update locales
2015-10-02 10:31:27 -05:00
Blade Barringer
339ab9e507
correct key to use mispelled version :/
2015-10-02 10:11:20 -05:00
Blade Barringer
5a7662db09
Merge pull request #5976 from crookedneighbor/refactor-content
...
Refactor Content Files
2015-10-02 08:55:10 -05:00
Blade Barringer
a6453fec71
Merge pull request #6000 from Gondulf/develop
...
Issue #5928 - Replaced 'link' with actual URL in faq.json
2015-10-02 08:40:13 -05:00
Damien Gourbiere
17eff9ed84
Issue #5928 - Replaced 'link' with actual URL in faq.json
2015-10-02 08:56:25 -04:00
Blade Barringer
e07a99dc27
Export premium pets and mounts
2015-10-02 04:01:14 -05:00
Blade Barringer
e600791374
Merge pull request #5991 from tcyrus/patch-1
...
Update README.md
2015-10-01 23:01:36 -05:00
Blade Barringer
54c5741fca
chore(i18n): update locales
2015-10-01 22:44:53 -05:00
Blade Barringer
4d682214c1
Merge pull request #5996 from Gondulf/develop
...
Issue #5978 - Corrected grammar in gear.jason
2015-10-01 22:40:43 -05:00
Blade Barringer
913faeba70
Remved unused readme
2015-10-01 22:38:58 -05:00
Damien Gourbiere
4df9299e25
Reverted change to the stirring stick description
2015-10-01 23:25:27 -04:00
Damien Gourbiere
c8b1c2622e
Merge branch 'develop' of https://github.com/Gondulf/habitrpg into develop
2015-10-01 23:20:25 -04:00
Damien Gourbiere
d43242884f
Issue #5978 - Corrected grammar in gear.jason
2015-10-01 23:09:24 -04:00
Blade Barringer
b4ce683190
Correct tests
2015-10-01 21:56:14 -05:00
Damien Gourbiere
1c0df66eed
Issue #5978 - Corrected grammar in gear.jason
2015-10-01 22:45:25 -04:00
Blade Barringer
be3decf859
Merge branch 'develop' into refactor-content
2015-10-01 21:20:04 -05:00
Blade Barringer
a7fe29e04e
Add comment to quest block
2015-10-01 17:26:21 -05:00
Sabe Jones
22c69c7e2f
fix(magic-potions): Correct potion list merge
2015-10-01 16:53:11 -04:00
Sabe Jones
8e69681718
chore(news): Bailey 2015-10-01
2015-10-01 15:48:18 -04:00
Sabe Jones
5349bc7312
chore(gulp): Compile sprites
2015-10-01 14:27:21 -05:00
Sabe Jones
fc46023561
feat(armoire): October content
...
(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith-main-3.png
common/dist/sprites/spritesmith-main-4.css
common/dist/sprites/spritesmith-main-4.png
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-10-01 14:21:01 -05:00
Sabe Jones
f4c18bb7f3
chore(gulp): Compile sprites
2015-10-01 14:11:22 -05:00
Sabe Jones
233211adc9
Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
...
Magic Potions!
2015-10-01 14:04:14 -05:00
Sabe Jones
3d38777ec8
fix(content): Correctly generate api.hatchingPotions
2015-10-01 14:54:52 -04:00
Sabe Jones
bebc4556ea
Merge pull request #5992 from crookedneighbor/magic-potions-row
...
Put magic pets on their own row
2015-10-01 13:48:42 -05:00
Blade Barringer
0f8c3e03c2
Correct mount mixin
2015-10-01 13:25:00 -05:00
Blade Barringer
c8afac9580
Put magic pets on their own row
2015-10-01 13:21:15 -05:00
Blade Barringer
6667adb983
Reorder helper keys
2015-10-01 12:32:40 -05:00
Blade Barringer
86ec40e43d
Add comment to gear file
2015-10-01 12:32:22 -05:00
Blade Barringer
3c933eaf4e
Add comment to food file
2015-10-01 12:31:08 -05:00
Blade Barringer
ee2134dcb7
Add comment to eggs file
2015-10-01 12:30:51 -05:00
Blade Barringer
5f4aa427fc
Add comment to pets and mounts file
2015-10-01 12:30:36 -05:00
Timothy Cyrus
ad6c0b322a
Update README.md
...
Change all Readme Badges to SVG's
2015-10-01 08:53:47 -04:00
Blade Barringer
6c9fab254d
Add coffeescript dependency back in
2015-09-30 22:49:19 -05:00
Blade Barringer
08e6759da2
Fix path to content
2015-09-30 22:38:23 -05:00
Blade Barringer
6ad7b6ba4c
Correct content in analytics
2015-09-30 20:56:40 -05:00
Blade Barringer
faf5d263e0
Correct gear sets
2015-09-30 20:12:14 -05:00
Blade Barringer
6ed417842f
Move gulp-babel to dependency
2015-09-30 19:55:20 -05:00
Blade Barringer
02126533e7
Allow gulp babelify to exist in prod
2015-09-30 19:51:19 -05:00
Blade Barringer
b96d3fc3fc
Add special back
2015-09-30 19:50:57 -05:00
Blade Barringer
3be24456ec
Move special and armoire gear to own module
2015-09-30 19:04:09 -05:00
Sabe Jones
3968acecb4
chore(news): Bailey 2015-09-30
2015-09-30 15:39:38 -04:00
Sabe Jones
9afaa92c2e
feat(magic-potions): Clarify drop behavior
2015-09-30 15:31:09 -04:00
Blade Barringer
0199dcadf3
Add armoire set
2015-09-29 21:38:45 -05:00
Blade Barringer
c56e7ba44e
Move base euqipment to own module
2015-09-29 17:58:37 -05:00
Blade Barringer
ff4dae8f89
Move mystery set into own module
2015-09-29 17:53:32 -05:00
Blade Barringer
e9a4465a4c
Merge branch 'develop' into refactor-content
2015-09-29 17:30:33 -05:00
Blade Barringer
5c0a0e1d18
Compile css
2015-09-29 17:30:08 -05:00
Blade Barringer
228b8e030e
Remove only form test
2015-09-29 17:20:15 -05:00
Blade Barringer
152cb99750
Add spell tests
2015-09-29 12:58:53 -05:00
Blade Barringer
9de2ee473d
Correct gear test
2015-09-29 12:54:45 -05:00
Blade Barringer
26d73d0bc1
Create user default test
2015-09-29 12:53:39 -05:00
Blade Barringer
61589ca262
Add armoire and potion locale tests
2015-09-29 12:44:35 -05:00
Blade Barringer
c846cfd653
Add background content test
2015-09-29 12:38:34 -05:00
Blade Barringer
0fc41abe25
Add FAQ content test
2015-09-29 12:33:55 -05:00
Blade Barringer
8676e660a8
Correct rogue shield
2015-09-29 12:20:57 -05:00
Blade Barringer
cc0eb7d672
Add gear content test
2015-09-29 09:00:27 -05:00
Blade Barringer
8e9a08ba46
Add helper to run all tests in directory
2015-09-29 08:59:42 -05:00
Blade Barringer
400f82b2d5
Add food content test
2015-09-29 08:12:10 -05:00
Blade Barringer
0af658dab7
Add hatching potions test
2015-09-29 08:09:43 -05:00
Blade Barringer
54e910d67a
Add egg content test
2015-09-29 08:07:07 -05:00
Blade Barringer
e27751c1be
Organize quest tests by key
2015-09-29 08:06:48 -05:00
Blade Barringer
bc47d44acc
Add in text for evil santa quests
2015-09-29 08:00:53 -05:00
Blade Barringer
f6aa316eb1
Create quest content test
2015-09-29 07:55:35 -05:00
Blade Barringer
1b9c7c51c2
Set up content tests
2015-09-29 07:55:13 -05:00
Blade Barringer
2db4b7b7b2
Move i18n to javascript
2015-09-28 17:33:45 -05:00
Sabe Jones
ffe0cff7cd
fix(drops): Pick drop eggs from dropEggs
2015-09-28 16:28:59 -04:00
Sabe Jones
feff6fadfa
feat(magic-potions): Final tweaks
2015-09-28 14:58:46 -04:00
Blade Barringer
b8a8eff434
Merge branch 'develop' into refactor-content
2015-09-28 12:45:18 -05:00
Blade Barringer
f1e442bed4
Extract test commands into constants
2015-09-28 08:54:53 -05:00
Blade Barringer
2d862593ae
Compile sprites
2015-09-28 08:50:20 -05:00
Blade Barringer
d1faa50e5e
Merge branch 'develop' into refactor-content
2015-09-28 07:52:02 -05:00
Blade Barringer
bc46609fbc
Use shorthand function syntax
2015-09-28 07:44:31 -05:00
Blade Barringer
1616b237fa
Revert npm bin commit
...
Vagrant installs don't use the .bin directory because Virtualbox has issues with symlinks see https://github.com/HabitRPG/habitrpg/issues/4591#issuecomment-72344790
2015-09-27 22:54:01 -05:00
Blade Barringer
86fd9cf32a
Extract base into separate set
2015-09-27 09:59:29 -05:00
Blade Barringer
8bc70150c2
Remove unused module
2015-09-27 09:54:37 -05:00
Blade Barringer
43fbe23b05
Extract rogue gear into set
2015-09-27 09:53:43 -05:00
Blade Barringer
5d1a22848a
Extra healer into set file
2015-09-27 09:47:59 -05:00
Blade Barringer
5a44d266f8
Extract wizard content to set file
2015-09-27 09:38:02 -05:00
Blade Barringer
3e335b591c
Rewrite gear helper to take a whole set
2015-09-27 09:23:26 -05:00
Blade Barringer
40fc03263d
Reformate warrior content file
2015-09-27 09:11:40 -05:00
Blade Barringer
4f0e822f09
Merge branch 'develop' into refactor-content
2015-09-26 17:04:57 -05:00
Blade Barringer
5652a47290
Move quest set defaults to helpers
2015-09-26 17:03:22 -05:00
Blade Barringer
70b68707b5
Move quest defaults function to helpers
2015-09-26 16:10:17 -05:00
Blade Barringer
6d7a7b2500
Add missing semi-colons
2015-09-26 16:04:11 -05:00
Blade Barringer
3ca761eccb
Collect default and generator functions
2015-09-26 16:02:11 -05:00
Blade Barringer
f73d1d35ee
Collect translator functions together
2015-09-26 15:58:54 -05:00
Alys
6902d9aa2f
swap README files for en and zk. What WAS I thinking?
2015-09-27 06:52:23 +10:00
Alys
7b4c50bdb7
update locales edit/translate instructions
2015-09-27 06:13:56 +10:00
Blade Barringer
64b36f8f2a
Merge pull request #5916 from TheHollidayInn/user-remove-invites-when-cancels-account-tests
...
Added test to check that group invites are removed when user cancels account
2015-09-26 12:44:12 -05:00
Alys
b9490a2aa4
change --no-bin-link to the correct --no-bin-links for npm install step - ref https://docs.npmjs.com/cli/install
2015-09-26 09:11:23 +10:00
Blade Barringer
cc6117fd17
Refactor eggs
2015-09-25 17:53:58 -05:00
Blade Barringer
bd8d9415e0
Move hatching potion tranform to helpers
2015-09-25 17:53:43 -05:00
Blade Barringer
68cd51fbb0
Move egg function to helpers
2015-09-25 17:34:17 -05:00
Blade Barringer
373f2757ca
Move background function to helpers
2015-09-25 17:16:30 -05:00
Sabe Jones
8dcfe3078f
fix(inventory): Missing pixel paws
2015-09-25 16:31:07 -04:00
Sabe Jones
926bedcfea
fix(test): Change quest's canBuy to fn call
2015-09-25 15:16:17 -04:00
Sabe Jones
38bdbf020b
feat(content): Generalize canBuy
2015-09-25 15:01:08 -04:00
Blade Barringer
77d75c164e
Use helper for backgrounds
2015-09-25 12:59:38 -05:00
Blade Barringer
c21802e7e7
Merge branch 'develop' into refactor-content
2015-09-25 12:22:11 -05:00
Blade Barringer
3d1bbaf6ef
Move Content index file to js
2015-09-25 12:09:43 -05:00
Blade Barringer
8145d5a77c
Correct export of quest module
2015-09-25 12:09:11 -05:00
Matteo Pagliazzi
a0f84bcf48
fix a few eslint rules
2015-09-25 15:58:39 +02:00
Matteo Pagliazzi
5ac46716a3
add eslint tasks to gulp, remove .jshintrc
2015-09-25 15:44:45 +02:00
Blade Barringer
3bb48063c9
Correct saddle
2015-09-25 08:08:44 -05:00
Sabe Jones
b27a12b54d
Merge pull request #5973 from HabitRPG/sabrecat/quest-analytics
...
Track daily quest progress in server-side analytics
2015-09-24 20:57:07 -05:00
TheHollidayInn
bfca612be2
Moved intial filtering to a scope function and added test
2015-09-24 16:39:53 -05:00
Sabe Jones
04416c4d73
feat(pets): Improve egg canBuy logic
2015-09-24 17:33:58 -04:00
Sabe Jones
5d6efd4f9d
fix(sprite): clean up horse
2015-09-24 15:52:41 -05:00
Sabe Jones
0ceba13e7c
feat(analytics): Track daily progress
...
Adds progressUp and progressDown event properties to the Cron analytics event. With these, we can total up the site population's quest progress, both positive and negative, for the purposes of estimating likely pace of battle with a World Boss. Note that these values are tracked regardless of whether or not the user is currently questing.
2015-09-24 16:40:20 -04:00
Sabe Jones
6d6f0f597b
feat(world-boss): Dry run
2015-09-24 15:39:16 -04:00
Blade Barringer
c051325f85
Remove lodash from content index
2015-09-23 17:57:20 -05:00
Blade Barringer
d0e8afc068
Move mystery set transform to mystery set module
2015-09-23 17:56:44 -05:00
Blade Barringer
363b086a5c
Move time travelers store to separate module
2015-09-23 17:42:54 -05:00
Blade Barringer
f3a99893bc
Clean up file
2015-09-23 17:29:12 -05:00
Blade Barringer
6f8511c6a6
Move potion and armoire into separate modules
2015-09-23 17:28:20 -05:00
Sabe Jones
1aa5757847
fix(magic-potions): Hatching tweaks
...
* Additional notes on popover noting magic potions can't be used on quest pet eggs
* Less techy error message when attempting to hatch quest pet egg with magic potion
* Don't highlight quest pet eggs as targets for magic hatching potion
2015-09-23 16:40:45 -04:00
Sabe Jones
c953a25fe4
Merge branch 'develop' into sabrecat/magic-potions
2015-09-23 16:08:47 -04:00
Sabe Jones
35068481c4
chore(news): Fall plotline Bailey
2015-09-23 15:58:13 -04:00
Sabe Jones
c2269b5f35
Merge pull request #5967 from HabitRPG/sabrecat/content-201509
...
September subscriber items and Fall Festival avatar customizations
2015-09-23 14:43:06 -05:00
Sabe Jones
009c92b532
feat(content): September sub items and customizations
2015-09-23 15:23:42 -04:00
Blade Barringer
3578e05979
Move spell function into separate module
2015-09-23 12:53:43 -05:00
Blade Barringer
f3bfded624
Correct content file
2015-09-23 08:11:53 -05:00
Blade Barringer
955c163544
Merge branch 'develop' into refactor-content
2015-09-23 07:52:36 -05:00
Blade Barringer
90387707d8
Move flattening function to gear module
2015-09-22 20:53:51 -05:00
Blade Barringer
4a6c380dc3
Set up warrior set
2015-09-22 19:59:07 -05:00
Blade Barringer
edce15a722
Add generateGearSet function
2015-09-22 17:39:00 -05:00
Sabe Jones
6a6b67b9c1
Merge pull request #5909 from HabitRPG/sabrecat/social-buttons
...
Front page Tweet button
2015-09-22 17:38:47 -05:00
Sabe Jones
8c67d22a91
feat(pets): Full purchase behavior
2015-09-22 17:03:41 -04:00
Sabe Jones
e96410aa57
feat(pets): Spooky pets/mounts
2015-09-22 14:23:52 -04:00
Blade Barringer
7948e8a8e2
Create merge function
2015-09-22 13:00:46 -05:00
Blade Barringer
ed5abf44e1
Move food defaults function into helpers
2015-09-22 12:46:48 -05:00
Sabe Jones
cd9c372254
feat(pets): Spooky sprites
2015-09-22 12:45:59 -04:00
Blade Barringer
8eeffeb2a9
Consolidate helpers
2015-09-22 08:16:38 -05:00
TheHollidayInn
43c9683a8b
Added param to filter challenges by guild when a challenge is first clicked from guild
2015-09-21 19:35:14 -05:00
Blade Barringer
ad7e01d87e
Move translator to helpers.js
2015-09-21 17:35:27 -05:00
Blade Barringer
0e6f563c1f
Add sets
2015-09-21 17:25:14 -05:00
Blade Barringer
f94c8e1060
Move gear types to separate folders
2015-09-21 17:24:42 -05:00
Sabe Jones
acd3480b51
fix(test): Remove only
2015-09-21 17:14:57 -04:00
Sabe Jones
389b5b370a
feat(pets): Magic Hatching Potions WIP
2015-09-21 17:12:23 -04:00
Sabe Jones
87f6af346a
fix(misc): Tweaks
...
* Updates the text shown for Mystic Hourglasses in the inventory to account for new features.
* Fixes the date range for the Fall Festival to correctly start September 21.
* Updates test for the Inventory Controller to use lodash for object key iteration.
2015-09-21 13:59:00 -04:00
Blade Barringer
5469d1cb05
Correct candy
2015-09-21 12:29:33 -05:00
Blade Barringer
cbc31cbce1
Correct food
2015-09-21 12:27:59 -05:00
Blade Barringer
1610a62b82
Move gear to separate module
2015-09-21 12:20:10 -05:00
Blade Barringer
90fc76d44c
Correct module name
2015-09-21 12:13:24 -05:00
Blade Barringer
7aba6a6b99
Move item list to separate module
2015-09-21 12:10:39 -05:00
Sabe Jones
b3297383d3
Merge pull request #5954 from HabitRPG/sabrecat/fall-2015
...
Fall Festival 2015
2015-09-21 12:06:40 -05:00
Blade Barringer
050be4a3db
Add babel task as dependency
2015-09-21 12:01:06 -05:00
Sabe Jones
b608e061a5
test(drops): Generalize
2015-09-21 12:57:35 -04:00
Blade Barringer
9b8e6534d0
Add pets and egss as modules
2015-09-21 09:02:12 -05:00
Blade Barringer
1d4159ebf3
Split out spells into separate modules
2015-09-21 08:56:34 -05:00
Blade Barringer
d02d8159e4
Use es2015 default args
2015-09-20 21:14:42 -05:00
Blade Barringer
c4ef6623f0
Add defaults to main file for quests
2015-09-20 21:05:16 -05:00
Blade Barringer
66b575ce20
Split quests into separate files
2015-09-20 20:46:35 -05:00
Blade Barringer
fc00821206
Correct hatching potions
2015-09-20 08:42:37 -05:00
Blade Barringer
8b96e2ed1a
Move hatching potions to separate module
2015-09-20 07:46:30 -05:00
Blade Barringer
7697b6f4a2
Split food out into separate files
2015-09-20 07:35:03 -05:00
Blade Barringer
90a0bc7e2d
Move food to separate module
2015-09-20 07:10:35 -05:00
Blade Barringer
5550125455
Move quest categories to module
2015-09-20 06:55:21 -05:00
Blade Barringer
bd6d8c1595
Move quests to separate module
2015-09-19 21:49:17 -05:00
Blade Barringer
278e3ca6d6
Clean up envName creation
2015-09-19 21:16:48 -05:00
Blade Barringer
a4f0d96606
Move backgrounds to module
2015-09-19 21:12:09 -05:00
Blade Barringer
301ce56a5b
Use import syntax
2015-09-19 19:45:53 -05:00
Blade Barringer
b7cd46a6fe
Move subscription blocks to separate module
2015-09-19 19:42:47 -05:00
Blade Barringer
4cb7ae4f6f
Add translator
2015-09-19 19:42:38 -05:00
Blade Barringer
110480be5a
Use single quotes
2015-09-19 19:37:40 -05:00
Blade Barringer
1c0943b5a4
Add parens
2015-09-19 19:36:54 -05:00
Blade Barringer
c01795af2a
Move user defaults to separate module
2015-09-19 19:36:35 -05:00
Blade Barringer
6665339229
Remove dist location variable. Wasn't working for some reason :(
2015-09-19 19:29:56 -05:00
Blade Barringer
b51ca509ca
Change to export syntax
2015-09-19 19:29:15 -05:00
Blade Barringer
fd0dcbebde
chore(i18n): update locales
2015-09-19 15:19:47 -05:00
Blade Barringer
87197bea8a
Merge branch 'LuneFox-develop' into develop
2015-09-19 10:41:47 -05:00
Blade Barringer
2a530a207d
Rename translation key
2015-09-19 10:41:21 -05:00
Blade Barringer
ca6137a24e
Remove unneeded file
2015-09-19 09:11:51 -05:00
LuneFox
512b959cab
Merge pull request #1 from LuneFox/origin
...
#5955
2015-09-19 02:01:43 +03:00
LuneFox
8ae1c35b27
added string for askQuestion
2015-09-19 01:57:30 +03:00
Alys
f7478aa81d
add value 100 (gold cost) to Enchanted Armoire items that were missing it
2015-09-19 08:46:04 +10:00
LuneFox
91a0e0452e
added match for askQuestion
2015-09-19 01:12:30 +03:00
LuneFox
ec336c4f88
added link to the newbies guild
2015-09-19 01:11:27 +03:00
Sabe Jones
bbf9f45aa4
fix(test): Seasonal food drop
2015-09-18 15:32:24 -04:00
Sabe Jones
aed39a206d
fix(services): Remove accidental WIP inclusion
2015-09-18 15:24:56 -04:00
Sabe Jones
3e8a3ee5f4
feat(event): Fall Festival 2015
2015-09-18 15:19:59 -04:00
Sabe Jones
6449fbdbc0
feat(event): Fall 2015 sprites
2015-09-18 12:42:55 -05:00
Kevin Gisi
ff52aca587
Merge pull request #5951 from HabitRPG/revert-5943-revert-5912-group-remove-party-invites-when-last-member-leaves
...
Revert "Revert "Removed user's party invites when last user leaves pa…
2015-09-17 20:27:52 -07:00
Kevin Gisi
4525ee5358
Revert "Revert "Removed user's party invites when last user leaves party""
2015-09-17 23:27:21 -04:00
Blade Barringer
85a16b62e5
Add babel task and move to src directory
2015-09-17 17:42:53 -05:00
Blade Barringer
993b568ad8
Add mount names for all drop pets and make creation more programmic
2015-09-17 12:43:42 -05:00
Blade Barringer
df5a434d71
Move drop eggs into separate module
2015-09-17 08:45:35 -05:00
Blade Barringer
c64fd6e321
Move drop eggs to separate file
2015-09-17 08:42:21 -05:00
Blade Barringer
550ceb8701
Remove uneeded .js extension
2015-09-17 08:09:47 -05:00
Blade Barringer
4681fc6c96
Move card types to separate file
2015-09-17 08:08:09 -05:00
Blade Barringer
d20354dd47
Es2015ify the js content
2015-09-17 08:03:33 -05:00
Blade Barringer
eaaac546b9
Move translator file into helpers folder
2015-09-17 07:47:23 -05:00
Blade Barringer
a1d7ad70af
Move spells to won file
2015-09-17 07:41:19 -05:00
Kevin Gisi
e15cc9ec82
Merge pull request #5943 from HabitRPG/revert-5912-group-remove-party-invites-when-last-member-leaves
...
Revert "Removed user's party invites when last user leaves party"
2015-09-17 01:08:37 -07:00
Kevin Gisi
c26cd1fe5b
Revert "Removed user's party invites when last user leaves party"
2015-09-17 04:00:07 -04:00
Sabe Jones
347d028af7
fix(API): Fix inaccessible route
...
Mystic Hourglass routes aren't yet used by live code.
2015-09-17 01:57:28 -04:00
Blade Barringer
eecc4e4a22
Rename mystery sets module
2015-09-16 20:29:26 -05:00
Blade Barringer
50d7adcae8
Extract mystery items into module
2015-09-16 20:28:46 -05:00
Blade Barringer
ccdcd32174
Extract time traveler stable into separate module
2015-09-16 20:22:42 -05:00
Blade Barringer
504a2e7a52
Move events to own module
2015-09-16 20:12:09 -05:00
Blade Barringer
8881dbc034
Remove uneeded blank spaces
2015-09-16 20:01:42 -05:00
Sabe Jones
09ccb9584f
Merge pull request #5938 from HabitRPG/sabrecat/timetravel-stable
...
Time Travel Stable
2015-09-16 18:31:48 -05:00
Sabe Jones
15cddabd80
fix(test): Remove only
2015-09-16 19:21:05 -04:00
Sabe Jones
f8db8f597a
refactor(test): Give user mystery items
...
...instead of stubbing out timeTravelerStore
2015-09-16 19:16:21 -04:00
Sabe Jones
9be0990217
chore(news): Bailey 2015-09-16
2015-09-16 18:34:20 -04:00
Sabe Jones
eb0dd636c1
feat(hourglass): Confirm before buy
2015-09-16 17:40:25 -04:00
Sabe Jones
fb50f27fa7
fix(hourglass): Use method on $scope
2015-09-16 16:46:12 -04:00
Sabe Jones
98cd8364c6
feat(hourglass): Individual filter functions
2015-09-16 16:35:04 -04:00
Sabe Jones
2bde07fa1c
fix(test): Call hasAll correctly
2015-09-16 16:12:29 -04:00
Sabe Jones
7cc29810f3
fix(test): inject Content
...
Also refactors to remove lodash where it's overkill.
2015-09-16 16:01:13 -04:00
Sabe Jones
3bfeb15715
test(hourglass): TDD for Time Travel filtering
2015-09-16 15:27:19 -04:00
Sabe Jones
c8cc01fc44
feat(hourglass): Buy pets/mounts
...
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
2015-09-16 14:35:43 -04:00
Sabe Jones
25b133c562
Merge branch 'develop' into sabrecat/timetravel-stable
2015-09-16 12:48:12 -04:00
Blade Barringer
e5b19344f6
Use $(npm bin) in gulp test
2015-09-16 08:18:50 -05:00
Blade Barringer
3c1fd385fa
Rename existing api tests to api-legacy
2015-09-16 08:12:47 -05:00
Blade Barringer
c9c169a0fb
Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves
...
Removed user's party invites when last user leaves party
2015-09-16 07:59:32 -05:00
Blade Barringer
f71e3e20eb
Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only
...
Adjustments to group quest behavior
2015-09-15 18:57:32 -05:00
Blade Barringer
4c84728873
Removes quest from group if quest leader is booted
2015-09-15 18:10:31 -05:00
Blade Barringer
a655242c49
Correct test assertion
2015-09-15 17:38:22 -05:00
Blade Barringer
e0c30a4214
Merge pull request #5935 from ziir/use-npm-bin
...
Ensure NPM scripts always use local binary
2015-09-15 17:21:52 -05:00
Tim PILLARD
6a96a2910e
Ensure NPM scripts always use local binary
2015-09-16 00:19:19 +02:00
Blade Barringer
9abe67b0ad
Prevent quest leaders from leaving party
...
(cherry picked from commit dc43aa5902 )
2015-09-15 16:41:50 -05:00
Blade Barringer
f8850755d0
Correct leave call to prevent leaving if quest is in progress
...
(cherry picked from commit eddea562f4 )
2015-09-15 16:41:25 -05:00
Blade Barringer
78fe1073d4
Add user sync to sendAction
2015-09-15 16:39:08 -05:00
Sabe Jones
6e4cc4b35b
fix(API): Missing colons
2015-09-15 15:47:19 -04:00
Sabe Jones
ce764ca28e
WIP(hourglass): Mystery sets API route
2015-09-15 15:41:57 -04:00
Sabe Jones
2ce52e980d
feat(hourglass): Buy pets/mounts
2015-09-15 14:55:38 -04:00
Sabe Jones
66a8be526b
WIP(hourglass): Error catches
2015-09-15 12:40:01 -05:00
Sabe Jones
bc16ec1729
Merge branch 'develop' into sabrecat/timetravel-stable
2015-09-15 11:32:28 -05:00
Blade Barringer
6aa04aa6fb
Add another dev dep to deps
2015-09-15 10:57:18 -05:00
Blade Barringer
0fe6054b76
Add missing client code
2015-09-15 10:53:56 -05:00
Blade Barringer
41afe0a2f5
Add another dev dep to deps
2015-09-15 10:49:28 -05:00
Blade Barringer
76bd6cbd59
Move some dev dependencies to normal dependencies
2015-09-15 10:38:48 -05:00
Blade Barringer
b32e521c56
Pull in client side changes for quest routes
2015-09-15 09:35:17 -05:00
Sabe Jones
580a9871b9
chore(news): Bailey 2015/09/14
2015-09-14 21:21:22 -05:00
Blade Barringer
38e07246da
chore(i18n): update locales
2015-09-13 18:38:59 -05:00
Blade Barringer
737b4703e6
Fix markdown bug in faq. Fixes #5920
2015-09-13 18:36:36 -05:00
Blade Barringer
d573f3c53d
Merge branch 'melarish-Mystery_items_already_owned' into develop
2015-09-13 18:28:18 -05:00
Blade Barringer
5974c7e079
Simplify time travelers page
2015-09-13 18:27:57 -05:00
Blade Barringer
d5eaaefa72
Adjust positioning of alert message
2015-09-13 16:56:39 -05:00
Blade Barringer
5553d74334
Create method to calculate whether or not user has attained all mystery equipment
2015-09-13 16:26:29 -05:00
Blade Barringer
b6f02d388f
Correct method to correctly add an hourglass in debug menu
2015-09-13 16:25:57 -05:00
Blade Barringer
50b709045d
Remove only from test
2015-09-13 16:24:46 -05:00
Alys
909ab4eb35
remove extra line breaks from "What are some sample tasks?" FAQ question - fixes https://github.com/HabitRPG/habitrpg/issues/5920
2015-09-14 07:07:12 +10:00
Alys
cbd5626cfd
remove FAQ from CONTRIBUTING.md - it's less relevant there and confusing now that we have two FAQs
2015-09-14 06:58:11 +10:00
Blade Barringer
e554309822
Add route to add a hourglass
2015-09-13 15:09:41 -05:00
Blade Barringer
33c51a77d9
Add unit test for addTenGems route
2015-09-13 14:42:10 -05:00
Blade Barringer
5e9b74a2b9
Add test for addHourglass
2015-09-13 10:01:14 -05:00
Blade Barringer
7e97b73e8b
Add test for addTenGems
2015-09-13 09:59:46 -05:00
Blade Barringer
edbdab5912
Add test shells for debug mode functions
2015-09-13 09:47:34 -05:00
Blade Barringer
7c8a46b178
Move message into alert box
2015-09-13 09:34:54 -05:00
Blade Barringer
cd4ec5bd12
Adjust formatting in footer controller
2015-09-13 02:19:34 -05:00
Blade Barringer
7aad958062
Merge pull request #5922 from crookedneighbor/gulpify
...
Gulpify the sprites tasks
2015-09-13 02:15:05 -05:00
Blade Barringer
14fabfbe40
Remove excess white space
2015-09-12 22:34:58 -05:00
Blade Barringer
dab6b555c4
Revert files
2015-09-12 22:32:13 -05:00
Blade Barringer
41458fbd5b
chore(i18n): update locales
2015-09-12 22:26:30 -05:00
Blade Barringer
be6acd7c09
Move post to slack function to task helper
2015-09-12 22:23:08 -05:00
Blade Barringer
b65c8e3b16
Change directory name from guides to scenes
2015-09-12 21:23:41 -05:00
Blade Barringer
5876c37271
Remove underscores from function names
2015-09-12 21:04:38 -05:00
Blade Barringer
a0e5ea6f4f
Reformat sprite tasks
2015-09-12 20:43:04 -05:00
Blade Barringer
1df4cf81dd
compile sprites using gulp
2015-09-12 11:22:15 -05:00
Blade Barringer
c2eb916be1
Add cssmin task to build:dev
2015-09-12 11:19:56 -05:00
Blade Barringer
d79427e879
Functionify sprite task creation
2015-09-12 11:09:29 -05:00
Blade Barringer
2c2ab97666
Move larger sprites to separate folder
2015-09-12 11:09:08 -05:00
Blade Barringer
1a28c37167
Reorganize sprite task
2015-09-12 10:51:15 -05:00
Blade Barringer
43576addf8
Refactor sprite indicies function
2015-09-12 10:24:06 -05:00
Blade Barringer
384ee42bca
Remove unused sprites
2015-09-12 08:35:18 -05:00
Blade Barringer
5cea988891
Calculate number of sprite tasks by img dimensions
2015-09-12 08:27:05 -05:00
Alys
fbfd2ef0ea
add a missing closing bracket to the end of webFaqAnswer6
2015-09-12 23:22:47 +10:00
Blade Barringer
17efad6a30
Rework compiled dimensions task to not rely on lodash
2015-09-11 20:53:32 -05:00
Alys
365a58641d
Merge pull request #5917 from Alys/audio-LuneFox-2015-09-09
...
new audio theme from LuneFox
2015-09-12 11:24:12 +10:00
Alys
fbaa5d4321
add new audi theme from LuneFox, moved themes to alphabetical order, adjusted file permissions for Watts Theme
2015-09-12 11:05:31 +10:00
Blade Barringer
d3d365a74a
Move sprites task to gulp
2015-09-11 19:59:06 -05:00
TheHollidayInn
aab7d5c257
Added test to check that group invites are removed when user cancels account
2015-09-11 12:56:19 -05:00
TheHollidayInn
26e6126a25
Removed redundant code when removing group invitations
2015-09-11 12:14:01 -05:00
TheHollidayInn
5c8c5a9ed3
Removed user's party invites when last user leaves party
2015-09-10 23:29:32 -05:00
Sabe Jones
6396b064d2
fix(social): Localize Tweet button
2015-09-10 18:51:19 -04:00
Sabe Jones
45c8bb06e2
Revert "feat(modals): Simplified scroll drop"
...
This reverts commit 8b4d34da00 .
2015-09-10 18:08:51 -04:00
Sabe Jones
c03107b54b
feat(social): Twitter share main page
2015-09-10 17:54:40 -04:00
Sabe Jones
9d5f9328da
WIP(social): Twitter widget script
2015-09-10 17:44:52 -04:00
Sabe Jones
e4c7870c22
WIP(social): Non-AddThis Tweet button
2015-09-10 17:31:12 -04:00
Sabe Jones
7a10715eee
WIP(social): Tweaked Twitter desc
2015-09-10 17:12:00 -04:00
Sabe Jones
4492007f49
feat(social): Twitter meta on front
2015-09-10 16:36:23 -04:00
melarish
05cf144630
Pulled and merged
2015-09-09 23:23:45 +01:00
Matteo Pagliazzi
e86809dc07
fix leaving group
2015-09-09 22:41:41 +02:00
Matteo Pagliazzi
0330735e8e
fix migrations
2015-09-09 22:32:12 +02:00
Sabe Jones
3931894d97
Merge pull request #5897 from HabitRPG/sabrecat/pet-201509
...
September 2015 Pet Quest
2015-09-09 11:29:51 -07:00
Sabe Jones
8b4d34da00
feat(modals): Simplified scroll drop
2015-09-09 14:27:34 -04:00
melarish
f3ec5ccb89
Added whitespace before all items owned message
2015-09-09 17:40:59 +01:00
Blade Barringer
bd1ae09749
Simplify scripts (node scripts use ./node_modules version of things by default)
2015-09-09 09:04:10 -05:00
Blade Barringer
addf19afc1
Add nvmrc file
2015-09-09 06:57:57 -05:00
Blade Barringer
ddfb5c92ab
Merge pull request #5899 from crookedneighbor/gulp-ify-start
...
Gulp-ify the start process
2015-09-09 06:46:06 -05:00
Matteo Pagliazzi
d64ce2fcdf
fix groups migration
2015-09-09 11:43:00 +02:00
Matteo Pagliazzi
c292d7b438
Merge pull request #5888 from TheHollidayInn/groups-delete-when-last-member-leaves
...
Groups delete when last member leaves
2015-09-09 11:26:04 +02:00
TheHollidayInn
ca37f4161c
Removed firebase deleteGroup to post remove
2015-09-08 21:17:28 -05:00
TheHollidayInn
cf2548693f
Changed cb2 to cb and removed extra query when removing group
2015-09-08 20:12:58 -05:00
Blade Barringer
1406166823
remove unneeded require
2015-09-08 16:21:02 -05:00
TheHollidayInn
c7d09acd74
Moved inivtation removal functions to group pre remove middleware
2015-09-08 15:58:53 -05:00
Blade Barringer
a85116540c
Move run:dev task to gulp
2015-09-08 15:45:09 -05:00
Sabe Jones
74cb7d7f04
chore(news): Horse Bailey
2015-09-08 14:56:49 -04:00
Sabe Jones
41b4d497f7
Merge branch 'develop' into sabrecat/pet-201509
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-09-08 13:25:10 -05:00
Mel Marley
def3eb5c36
Now correctly displays message when user owns all Mystery items
2015-09-08 17:49:56 +01:00
Mel Marley
2bddd79ffd
Some things I tried
2015-09-08 13:59:34 +01:00
Sabe Jones
54fde74c29
feat(analytics): Track another partying button
2015-09-07 22:31:41 -04:00
Sabe Jones
f8ce7c2292
fix(analytics): Track modals correctly
...
Fixes #5879 .
2015-09-07 22:23:42 -04:00
Sabe Jones
9421c63ac9
fix(FAQ): Remove sample task anchors
2015-09-07 21:58:56 -04:00
Sabe Jones
f044f83772
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-09-07 21:55:28 -04:00
Blade Barringer
bb06e95c4e
Add emoji class to list of classes that should not use pixelated rendering
2015-09-07 15:29:24 -05:00
Blade Barringer
325fa976f6
chore(i18n): update locales
2015-09-07 15:27:52 -05:00
Sabe Jones
d6f416b6d3
feat(analytics): Track party buttons
2015-09-07 12:02:01 -04:00
Blade Barringer
168ba0c96c
Merge pull request #5887 from HabitRPG/sabrecat/faq
...
Static FAQ page
2015-09-06 20:34:49 -05:00
Blade Barringer
31aace95ef
Merge pull request #5894 from crookedneighbor/merge-faqs
...
Merge faqs
2015-09-06 20:32:05 -05:00
Blade Barringer
c9af8e60b8
Adjust formatting
2015-09-06 20:29:09 -05:00
Blade Barringer
82b7bb3a1b
Add markdown to faq
2015-09-06 19:46:29 -05:00
Blade Barringer
205bbeee75
Add marked to jade rendering
2015-09-06 19:45:35 -05:00
Blade Barringer
1e29020df9
Add marked to packagejson
2015-09-06 19:44:55 -05:00
Blade Barringer
e32de87991
Adjust numbering of faq.js
2015-09-06 19:44:37 -05:00
Blade Barringer
ebc069747b
Zero index faq strings
2015-09-06 19:43:52 -05:00
Blade Barringer
0b99f77a1c
Simplify web faq
2015-09-06 18:30:01 -05:00
Blade Barringer
6fd2b9e537
Update content with web faq
2015-09-06 17:13:04 -05:00
Blade Barringer
6a1d4adcda
Merge branch 'develop' into HabitRPG-sabrecat/faq
2015-09-06 17:10:45 -05:00
TheHollidayInn
82a3ca8a4d
Merged changes to firebase branch
2015-09-06 16:58:44 -05:00
Blade Barringer
d02f2d34e3
Merge pull request #5893 from crookedneighbor/content-faq
...
Content FAQ for iOS
2015-09-06 16:38:18 -05:00
Blade Barringer
2fcc7df218
Change name of locales keys
2015-09-06 16:36:21 -05:00
Blade Barringer
1bce23c12b
Transform magic number to constant
2015-09-06 16:22:06 -05:00
Blade Barringer
898ea845b3
Convert translation function to js
2015-09-06 16:20:14 -05:00
Blade Barringer
245c7d48c8
Simplify faq logic
2015-09-06 16:11:53 -05:00
Blade Barringer
4081a9a62a
Add faq to content
2015-09-06 16:08:53 -05:00
Blade Barringer
6bad9623d8
Remove link
2015-09-06 16:08:22 -05:00
Blade Barringer
8a06514c72
Move translation function to separate module
2015-09-06 15:54:38 -05:00
TheHollidayInn
b839c0cd0c
Change condition scope to fix updating for public guilds with a member count of 1
2015-09-06 15:31:41 -05:00
TheHollidayInn
700a6ddd9e
Remove users inviations when guild is deleted
2015-09-06 15:31:40 -05:00
TheHollidayInn
e68e29db8f
Delete private guilds or parties when last member leaves.
2015-09-06 15:31:40 -05:00
Blade Barringer
5045ce3b2f
Add FAQ
2015-09-06 15:31:20 -05:00
Blade Barringer
b9bbc3f1ea
Move content to own directory
2015-09-06 15:31:08 -05:00
Matteo Pagliazzi
15eef927a2
fix leaders migrations when there are no other members
2015-09-06 22:18:22 +02:00
Matteo Pagliazzi
ea477823f6
Merge pull request #5885 from HabitRPG/paglias/firebase-requirements
...
Changes necessary for Firebase
2015-09-06 21:29:43 +02:00
Matteo Pagliazzi
bfd6d055b0
merge into develop
2015-09-06 21:21:39 +02:00
Blade Barringer
82030a50fb
Add faq to other languages
2015-09-06 13:54:40 -05:00
Blade Barringer
7bfa18fd05
chore(i18n): update locales
2015-09-06 13:33:29 -05:00
Blade Barringer
4177202cee
Merge pull request #5855 from HabitRPG/sabrecat/party-page
...
Party Page Revamp
2015-09-06 13:28:14 -05:00
Blade Barringer
9896851001
Merge pull request #5890 from HabitRPG/change_custom_day_start
...
Change custom day start to ask for confirmation and prevent immediate cron
2015-09-06 13:28:04 -05:00
Matteo Pagliazzi
4600e96dc0
firebase can be enabled through config
2015-09-06 20:19:53 +02:00
Matteo Pagliazzi
607ddbb1f2
typos and disable firebase
2015-09-06 20:11:24 +02:00
Matteo Pagliazzi
ef9aecf531
disable firebase syncing for tavern
2015-09-06 20:08:31 +02:00
Matteo Pagliazzi
6e2b3a805e
migration to sync groups with firebase
2015-09-06 19:44:55 +02:00
Matteo Pagliazzi
4bb2c33e40
fix problems with migrations and start firebase migration
2015-09-06 19:23:11 +02:00
Matteo Pagliazzi
45f2b093f8
add migrations to fix groups
2015-09-06 19:10:24 +02:00
Blade Barringer
346440d32c
Disable cds button if cds == user's preference
2015-09-06 10:14:44 -05:00
Blade Barringer
ee50fec2c1
Tweak wording of custom day start warning
2015-09-06 10:11:28 -05:00
Blade Barringer
074e683ba7
Change formatting of cds modal
2015-09-06 09:57:44 -05:00
Blade Barringer
0508f77ed4
Change wording of cds modal message
2015-09-06 09:45:12 -05:00
Blade Barringer
a44cd748af
Use the user's preferred date format
2015-09-06 09:42:48 -05:00
Blade Barringer
f1224bc6be
Use select instead of an input for cds
2015-09-06 09:36:29 -05:00
Matteo Pagliazzi
b395596614
firebase should only run in production
2015-09-06 16:35:49 +02:00
Matteo Pagliazzi
995e3a796d
store group name on firebase
2015-09-06 16:29:45 +02:00
Blade Barringer
085a785e4d
Convert input to select box
2015-09-06 09:22:40 -05:00
Matteo Pagliazzi
4c89538d18
typos and comments
2015-09-06 16:22:12 +02:00
Matteo Pagliazzi
521c999963
delete groups and users from firebase when deleted on habitica
2015-09-06 16:09:13 +02:00
Blade Barringer
3a8eda6c1a
Remove extraneous info about last cron
2015-09-05 15:35:07 -05:00
Blade Barringer
9ce6144fa4
Adjustments to custom day start
2015-09-05 15:32:49 -05:00
Blade Barringer
d45602c340
Adjust spacing
2015-09-05 09:45:08 -05:00
Blade Barringer
310bb3dfd9
Format settings page
2015-09-05 09:39:30 -05:00
Matteo Pagliazzi
9764e31e2a
firebase: remove instead of set(false)
2015-09-05 16:33:41 +02:00
Blade Barringer
9bcaea6fa2
Merge branch 'develop' into carolstone-chron-run-early-issue-4488
2015-09-05 09:32:24 -05:00
Matteo Pagliazzi
db0a73d332
add router to get firebase token for user
2015-09-05 16:21:46 +02:00
Blade Barringer
6fc8e0b5a5
Merge branch 'develop' into sabrecat/party-page
2015-09-05 09:20:06 -05:00
Matteo Pagliazzi
c89cf20bd3
sync groups' members with firebase
2015-09-05 15:44:45 +02:00
Matteo Pagliazzi
ec45a87dce
fix tests
2015-09-05 15:44:45 +02:00
Matteo Pagliazzi
0f1d514460
typo
2015-09-05 15:44:45 +02:00
Matteo Pagliazzi
37ae48891c
wip: firebase
2015-09-05 15:44:45 +02:00
Matteo Pagliazzi
f5f19d146e
start adding firebase
2015-09-05 15:44:45 +02:00
Matteo Pagliazzi
6d91a1905a
remove unnecessary code
2015-09-05 15:44:45 +02:00
Matteo Pagliazzi
d9383e0f97
add Group.methods.leave, user is removed from groups when his account is deleted
2015-09-05 15:44:44 +02:00
Matteo Pagliazzi
e5f4898222
when last user is removed from private group, delete the group
2015-09-05 15:44:44 +02:00
Blade Barringer
37b230b940
Add in @thehollidayinn's test from #5885
2015-09-05 15:44:44 +02:00
Matteo Pagliazzi
ee9b3d7857
remove unnecessary code
2015-09-05 15:44:44 +02:00
Matteo Pagliazzi
d5fb2afaa4
add Group.methods.leave, user is removed from groups when his account is deleted
2015-09-05 15:44:44 +02:00
Matteo Pagliazzi
0cd35a374a
when last user is removed from private group, delete the group
2015-09-05 15:44:44 +02:00
Blade Barringer
c141ee6d1c
Fix test
2015-09-05 08:14:55 -05:00
Blade Barringer
f65ca3cf48
Fix bug where non-party members could not send invitations
2015-09-05 08:02:00 -05:00
Alys
e0b57fa2c5
remove Show Classes Tour button from Settings page, and associated code
2015-09-05 17:29:27 +10:00
Blade Barringer
807e6eb7cf
Merge branch 'develop' into sabrecat/party-page
2015-09-04 19:00:48 -05:00
Blade Barringer
c41c4e2d41
Remove recursive call
2015-09-04 18:58:34 -05:00
Blade Barringer
1b7e9c9290
Add tests for group.invite
2015-09-04 18:40:12 -05:00
Blade Barringer
1d032a43a6
Format if else
2015-09-04 18:39:45 -05:00
Blade Barringer
43439741b2
add recursive call for server_side tests
2015-09-04 17:32:26 -05:00
Blade Barringer
90cea7016d
Merge branch 'gulp_build' into develop
2015-09-04 17:10:47 -05:00
Sabe Jones
fe89f950f4
fix(FAQ): Bad indent
2015-09-04 17:52:20 -04:00
Sabe Jones
7637b55195
fix(style): Move accordion tweaks to static.styl
2015-09-04 17:50:01 -04:00
Blade Barringer
f746f6375f
Remove container class
2015-09-04 16:47:12 -05:00
Blade Barringer
1eac011d0e
Remove padding rule
2015-09-04 16:46:16 -05:00
Blade Barringer
047a88cef5
Merge branch 'zedutchgandalf-develop' into gulp_build
2015-09-04 16:35:45 -05:00
Blade Barringer
53a03b4396
Hide older news link in older news page
2015-09-04 16:32:05 -05:00
Blade Barringer
3e03ff124d
Remove trailing blank spaces
2015-09-04 16:24:27 -05:00
Blade Barringer
f7df464ebd
Remove unneeded class
2015-09-04 16:24:10 -05:00
Sabe Jones
0a71037095
fix(accordion): Move jQuery to static.js
2015-09-04 17:19:23 -04:00
Blade Barringer
c8c9d6c892
Set different gulp tasks for production use
2015-09-04 15:53:07 -05:00
Blade Barringer
7aae3d6aa9
Move gulp-grunt to regular dependency
2015-09-04 15:44:18 -05:00
Blade Barringer
3434a13782
Move glob to normal dependencies
2015-09-04 15:40:57 -05:00
Blade Barringer
bc9c12f253
Move static new stuff task to gulp
2015-09-04 15:32:08 -05:00
Blade Barringer
cfae45a5f7
Move build task to gulp
2015-09-04 15:30:44 -05:00
Blade Barringer
d3360ec403
Hide all npm-debug logs from source control
2015-09-04 15:22:59 -05:00
Sabe Jones
8213643485
fix(FAQ): Link from Help button
...
Also swaps a couple of URLs to use HTTPS.
2015-09-04 15:12:17 -04:00
Sabe Jones
869651f5a2
feat(FAQ): Static FAQ page
...
Introduces a new static page for Frequently Asked Questions, linked from the Help menu. Fixes #5773 .
2015-09-04 15:05:15 -04:00
Blade Barringer
0d78c01de3
Merge pull request #5877 from TheHollidayInn/guilds-user-becomes-lead-when-joins-empty-group
...
Groups now make joining user the leader when they are empty
2015-09-04 09:43:26 -05:00
Robin Arys
e6a0f405e3
Fix Bailey's news modal
2015-09-04 15:56:32 +02:00
Robin Arys
39df743693
Change headers to use the proper ones
2015-09-04 15:52:34 +02:00
Robin Arys
345ab4bdbe
Move repeated classes up one level into a div
2015-09-04 15:34:03 +02:00
Robin Arys
c5d1f37499
Add small margin to images so text doesn't stick to them
2015-09-04 10:42:05 +02:00
Robin Arys
a497724d18
Fix Bailey's modal
2015-09-04 10:41:40 +02:00
Robin Arys
c7dc8d551b
Remove small_news_header and big_news_header CSS classes
2015-09-04 10:41:22 +02:00
Robin Arys
60d176d578
Add ability to add an extra class to the container
2015-09-04 10:40:24 +02:00
Robin Arys
39c85b9938
Make CSS statement more precise to make sure I'm not changing stuff I don't want to change.
2015-09-04 00:42:55 +02:00
Robin Arys
74dc455183
fix spacing
2015-09-04 00:22:51 +02:00
Robin Arys
d03acee4bc
Redesign static old news page per #5836
2015-09-04 00:22:41 +02:00
Sabe Jones
b5124e6cd8
fix(warnings): Show modal only once
...
Also removes a random extra newline.
2015-09-03 11:12:54 -04:00
Sabe Jones
d29c7ff1bb
Merge pull request #5878 from HabitRPG/sabrecat/modal-warnings
...
Modal warning for low health
2015-09-02 16:14:52 -05:00
Sabe Jones
e6068b23a7
feat(analytics): Track low health modal
2015-09-02 17:03:32 -04:00
Sabe Jones
1a675b8461
feat(warning): Revised low health modal
2015-09-02 16:31:56 -04:00
Sabe Jones
e82f73c712
Merge branch 'develop' into sabrecat/modal-warnings
2015-09-02 15:17:33 -04:00
Sabe Jones
c370344164
test(time-travel): TDD for pets/mounts
2015-09-02 15:03:57 -04:00
Sabe Jones
1d6bd8f392
fix(style): Decap guild/party/chat
2015-09-02 13:50:34 -04:00
Sabe Jones
9eaa35ba2f
test(time-travel): Rename test
2015-09-02 13:47:37 -04:00
TheHollidayInn
0adfcc3415
Groups now make joining user the leader when they are empty
2015-09-02 12:36:13 -05:00
melarish
b2bb6016fa
Added +1 Hourglass to debug menu
2015-09-02 18:12:48 +01:00
Blade Barringer
ceebb33daf
Merge pull request #5872 from HabitRPG/paglias/firebase
...
Firebase changes
2015-09-02 08:35:47 -05:00
Sabe Jones
7765f9ca04
test(mystery): Time Travelers test WIP
2015-09-01 17:37:39 -04:00
Sabe Jones
5274fd236a
WIP(time-travel): Time Travel pets/mounts
...
Also begins process of adding tests for Mystic Hourglass purchases.
2015-09-01 17:17:50 -04:00
Sabe Jones
2c0d59989a
feat(groups): Hide sync button when irrelevant
...
Also extends the "your party chat is empty" message to have a counterpart in Guilds.
2015-09-01 15:14:38 -04:00
Sabe Jones
6f85fcfde2
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-09-01 13:40:20 -05:00
Sabe Jones
3ccf09ca27
feat(quests): Horse quest
2015-09-01 13:26:41 -04:00
Sabe Jones
daf3a2d2bc
feat(pets): Horse sprites
2015-09-01 12:07:21 -05:00
Sabe Jones
68fef118e1
Merge pull request #5866 from HabitRPG/sabrecat/content-201509
...
Content 201509
2015-09-01 10:56:24 -05:00
Matteo Pagliazzi
7acec14e6b
do not allow leaders to kick themselves from group
2015-09-01 16:33:24 +02:00
Blade Barringer
41c38c6e63
Merge branch 'TheHollidayInn-directives-test-task-focus' into develop
2015-08-31 20:36:07 -05:00
Blade Barringer
1d8b10dc99
Adjust formatting
2015-08-31 20:35:23 -05:00
Blade Barringer
f4ca8bb78d
Rename task-focus focus-element
2015-08-31 20:31:03 -05:00
Blade Barringer
d5bd5f281c
Rename file names
2015-08-31 20:21:01 -05:00
Blade Barringer
c65ab56641
Remove focus-me directive
2015-08-31 20:17:30 -05:00
Blade Barringer
3e44c3a8ce
Change focus-me to use task-focus
2015-08-31 20:16:14 -05:00
Blade Barringer
499e8578cd
Merge branch 'TheHollidayInn-menu-fix-notification-menu-closing' into develop
2015-08-31 19:02:32 -05:00
Blade Barringer
dc5c35bb17
Merge branch 'develop' into TheHollidayInn-menu-fix-notification-menu-closing
2015-08-31 19:01:11 -05:00
Blade Barringer
ca49412313
Use === instead of ==
2015-08-31 18:59:01 -05:00
Blade Barringer
dfaaed05a4
Switch double quotes to single quotes
2015-08-31 18:54:06 -05:00
Blade Barringer
0bed76d336
Restructure test
2015-08-31 17:42:33 -05:00
Blade Barringer
8e2247ab3e
Remove extraneous white space
2015-08-31 17:28:47 -05:00
Sabe Jones
5ba6cfc2f5
feat(content): September content adds
2015-08-31 18:16:54 -04:00
Kevin Gisi
ae5ea39c58
Merge pull request #5864 from gisikw/develop
...
Fixed the wrong redirect
2015-08-31 17:59:54 -04:00
Kevin Gisi
69782b5bd1
Fixed the wrong redirect
2015-08-31 17:59:19 -04:00
TheHollidayInn
42066be2cf
Fixed broken test by change element to a focusable element
2015-08-31 16:49:34 -05:00
Kevin Gisi
509f845389
Merge pull request #5862 from gisikw/develop
...
Domain redirects -> 301
2015-08-31 17:42:00 -04:00
Kevin Gisi
177c48820c
Domain redirects -> 301
2015-08-31 17:34:18 -04:00
Sabe Jones
c0a47130e4
chore(content): Compile sprites
2015-08-31 15:54:08 -05:00
melarish
348d7c356d
Added missing modules to package.json
2015-08-31 13:54:33 +01:00
Sabe Jones
3ead359538
chore(news): August Last Chance Bailey
2015-08-30 21:06:25 -05:00
TheHollidayInn
1624fc4417
Adjusted var declration technique
2015-08-30 20:39:21 -05:00
Blade Barringer
ee0bcb5309
Correct class name
2015-08-30 17:52:16 -05:00
Blade Barringer
6e7787dcf5
chore(i18n): update locales
2015-08-30 10:25:55 -05:00
Blade Barringer
0b4c03a678
chore(i18n): update locales
2015-08-29 17:41:19 -05:00
Blade Barringer
19c3e22176
chore(i18n): update locales
2015-08-29 11:46:01 -05:00
Blade Barringer
cbea9f4200
chore(i18n): update locales
2015-08-29 07:38:54 -05:00
Blade Barringer
8cb11aa85d
Remove merge conflict marking
2015-08-29 07:18:17 -05:00
Blade Barringer
a0040d736f
Merge branch 'develop' into sabrecat/party-page
2015-08-28 23:06:00 -05:00
Blade Barringer
fcf187fb47
Remove logic for removing quest info
2015-08-28 22:55:02 -05:00
Blade Barringer
29c7dd3e77
Merge branch 'sabrecat/party-page' of github.com:HabitRPG/habitrpg into sabrecat/party-page
2015-08-28 22:41:50 -05:00
Blade Barringer
342343d34f
Prevent user from leaving party during active quest
2015-08-28 22:41:30 -05:00
Blade Barringer
2e3c166a40
Add test for removing quest data from user
2015-08-28 21:58:00 -05:00
Blade Barringer
4af1a4d6ac
Rename image rendering class
2015-08-28 21:48:42 -05:00
Blade Barringer
dd1e69b9d5
Merge branch 'RossBrunton-develop' into develop
2015-08-28 21:42:16 -05:00
Blade Barringer
df3c498fcc
Add rasterize class
2015-08-28 21:41:53 -05:00
Sabe Jones
5e8894a0a6
fix(groups): Show specific invite modal
2015-08-28 16:48:39 -04:00
Sabe Jones
3ad95e1ab7
fix(tutorial): Unstick Justin head
...
Fixes #5497 .
2015-08-28 16:12:45 -04:00
Sabe Jones
6ecf3a0e50
Merge pull request #5851 from HabitRPG/sabrecat/onboarding-tweaks
...
Sabrecat/onboarding tweaks
2015-08-28 13:50:42 -05:00
Sabe Jones
9e45017faa
Merge branch 'develop' into sabrecat/onboarding-tweaks
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-08-28 13:24:10 -05:00
Sabe Jones
8d713a53c4
feat(tutorial): Splash screen overhaul complete
2015-08-28 13:58:30 -04:00
Sabe Jones
f308116c54
feat(tutorial): Moar avatars
2015-08-28 11:48:30 -05:00
Blade Barringer
15a6929b44
Merge branch 'develop' into sabrecat/party-page
2015-08-28 08:41:57 -05:00
Sabe Jones
f88c536836
chore(news): Back to School Bailey
2015-08-27 16:20:15 -05:00
Sabe Jones
f5c08c4ae5
WIP(tutorial): Gregarious Vice
2015-08-27 15:36:53 -05:00
Sabe Jones
f8994a3ee3
WIP(tutorial): Revised images
2015-08-27 15:21:09 -05:00
Sabe Jones
c4012ad762
WIP(tutorial): New intro splash
2015-08-27 16:04:59 -04:00
Ross Brunton
821d562998
Set image-rendering to pixelated
...
Closes #5846
I explictly disabled it on img because most things that use the img tag
tend not to be pixel art.
2015-08-27 19:17:42 +01:00
Sabe Jones
5c4ebef0a9
feat(tutorial): New intro images
2015-08-27 13:08:12 -05:00
TheHollidayInn
6fb29d8766
Added ability to close menu when a child element has closeMenu directive
2015-08-26 15:32:59 -05:00
Alys
049f9280a2
Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12
...
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
2015-08-26 22:01:29 +10:00
TheHollidayInn
06f59bed7c
Added test for task-focus directive
2015-08-25 16:11:18 -05:00
Sabe Jones
2a8529012b
feat(tutorial): GP and EXP awards
2015-08-25 17:09:51 -04:00
Sabe Jones
0c0525640c
Merge branch 'develop' into sabrecat/onboarding-tweaks
2015-08-25 16:47:46 -04:00
Sabe Jones
6564cb52dc
fix(news): wording tweak
2015-08-25 13:10:33 -04:00
Alys
bbcb9e6063
fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later
2015-08-25 19:23:25 +10:00
Sabe Jones
9ed1e2ba6d
fix(mystery): Force coffee compile
2015-08-24 23:37:54 -05:00
Sabe Jones
d70aa46ec1
fix(mystery): Adjust date range
2015-08-24 21:33:02 -05:00
Blade Barringer
5b583f43d6
Fix api and karma test
2015-08-24 18:07:21 -05:00
Blade Barringer
484609c634
Stub Q
2015-08-24 17:55:20 -05:00
Blade Barringer
ce7d0039f8
Q-ify save functions
2015-08-24 17:36:06 -05:00
Sabe Jones
99a9647c46
Merge pull request #5837 from HabitRPG/sabrecat/august-mystery
...
August Mystery Items
2015-08-24 16:29:09 -05:00
Sabe Jones
c23312f771
feat(mystery): 2015 August items
2015-08-24 17:19:12 -04:00
Sabe Jones
a0e1d50bd6
feat(mystery): 2015 August sprites
2015-08-24 15:38:09 -05:00
Sabe Jones
23259cd456
WIP(tutorial): Award GP and XP
2015-08-24 16:02:25 -04:00
Blade Barringer
f584b173c8
Add user scrub quest data back in
2015-08-24 12:58:31 -05:00
Blade Barringer
66d16fefc3
Send back 204 from questLeave route
2015-08-24 12:38:43 -05:00
Blade Barringer
af20986fbc
Simplify qroup service quest functions
2015-08-24 08:06:34 -05:00
Blade Barringer
928a54911a
Return promises in groups service
2015-08-24 07:47:01 -05:00
Blade Barringer
fbd4490dbc
Fix sinon assertions
2015-08-24 07:46:37 -05:00
Blade Barringer
bc24fa8130
Add front end button to leave quest
2015-08-23 22:38:55 -05:00
Blade Barringer
0b7e43f156
Add route for leaving active quest
2015-08-23 20:29:57 -05:00
Blade Barringer
6955add15d
Use locale string
2015-08-23 15:05:49 -05:00
Blade Barringer
427fbb959b
Add join existing party button
2015-08-23 14:59:06 -05:00
Blade Barringer
3098c7d460
Refactor invite
2015-08-23 14:47:10 -05:00
Blade Barringer
63315ce281
Remove extra ng-if
2015-08-23 10:23:41 -05:00
Blade Barringer
a685828226
remove unused classes
2015-08-23 10:21:21 -05:00
Blade Barringer
12137428e9
Show loading new party message when creating a solo party
2015-08-23 10:17:48 -05:00
Blade Barringer
1144defbca
Restructure party page
2015-08-23 10:15:00 -05:00
Blade Barringer
74bef58537
Simplify text-centering
2015-08-23 09:32:59 -05:00
Blade Barringer
08edcb6743
Move loading new party to own partial
2015-08-23 09:31:46 -05:00
Blade Barringer
963b136a91
Reorg party views
2015-08-23 09:28:45 -05:00
Blade Barringer
a36c08930e
Separate out party sections
2015-08-23 09:24:55 -05:00
Blade Barringer
3f874e25a4
Fix bug where booting a member makes them appear in the other members list
2015-08-23 09:07:18 -05:00
Blade Barringer
ccff3998bd
Hide quest button if quest is pending or active
2015-08-23 08:42:15 -05:00
Blade Barringer
e6fb8f34bb
Add user id to solo party page
2015-08-23 08:34:33 -05:00
Blade Barringer
fd35f58ccd
Display invite party to quest only if party has more than one member
2015-08-23 08:29:45 -05:00
Blade Barringer
59a2d2b2f0
Improve quest modal appearance
2015-08-23 08:22:34 -05:00
Blade Barringer
e4f2a1a699
Adjust text
2015-08-23 07:59:40 -05:00
Alys
3d47f3f835
remove "as if you had created a new account" from Orb of Rebirth description
2015-08-23 17:43:33 +10:00
Blade Barringer
fefcbd1d2f
Merge branch 'develop' into sabrecat/party-page
2015-08-22 21:42:05 -05:00
Blade Barringer
8b75de56b6
Correct tabbing on server side specs reporting
2015-08-22 21:41:13 -05:00
Blade Barringer
a07d0cde85
Fixed karma reporting
2015-08-22 21:41:13 -05:00
Blade Barringer
37859e51b7
Move gulp task
2015-08-22 21:41:13 -05:00
Blade Barringer
f4bc208226
Reorganize karma.conf
2015-08-22 21:41:13 -05:00
Blade Barringer
9fde84f3d0
Remove directive
2015-08-22 21:41:12 -05:00
Blade Barringer
7a43e7f90a
Remove mocks
2015-08-22 21:41:12 -05:00
Blade Barringer
7a9cbe2cc5
Glob files in karma.conf
2015-08-22 21:41:12 -05:00
Alys
5b8c161932
changed habitrpg.wikia.com to habitica.wikia.com
2015-08-23 12:31:10 +10:00
Alys
fd446fc5e5
convert habitica.com to BASE_URL
2015-08-23 12:23:35 +10:00
Blade Barringer
699ce83ee9
Merge branch 'develop' into sabrecat/party-page
2015-08-22 19:18:44 -05:00
Blade Barringer
8e80b4d8e7
Remove directive
2015-08-22 19:18:34 -05:00
Blade Barringer
99d2b7f749
Merge branch 'develop' into sabrecat/party-page
2015-08-22 19:18:08 -05:00
Blade Barringer
85243c7512
Remove mocks
2015-08-22 19:16:32 -05:00
Blade Barringer
75a77faa92
Glob files in karma.conf
2015-08-22 19:15:45 -05:00
Blade Barringer
a4627be3ea
Merge branch '3onyc-fix-hash-leak' into develop
2015-08-22 17:54:42 -05:00
Blade Barringer
b2c4d5c012
Add test for items that are deleted when getting the user
2015-08-22 17:53:49 -05:00
Blade Barringer
8fc69102aa
Merge branch 'develop' into 3onyc-fix-hash-leak
2015-08-22 17:45:47 -05:00
Blade Barringer
87c04e885d
Merge pull request #5818 from lacrimae/patch-6
...
Wording: Proper English it was not
2015-08-22 17:44:35 -05:00
Blade Barringer
9ddf5353d1
Clean up directive tests
2015-08-22 17:21:30 -05:00
Blade Barringer
b41b629e93
Remove test variable
2015-08-22 17:08:28 -05:00
Blade Barringer
01d122ad67
Remove unneded declaration
2015-08-22 17:04:46 -05:00
Blade Barringer
9643b6e650
Merge branch 'develop' into TheHollidayInn-menu-hide-when-navigate-away
2015-08-22 17:03:26 -05:00
Blade Barringer
6b7ca3e823
Use $scope instead of scope in directives
2015-08-22 17:02:32 -05:00
Blade Barringer
e4eae7a23b
Move ian inside quest scrolls div
2015-08-22 15:43:35 -05:00
Blade Barringer
a6c5fab8a7
Correct quest display bug
2015-08-22 15:36:29 -05:00
TheHollidayInn
5e510aade0
Added tests for new menu directives
2015-08-22 15:25:51 -05:00
Blade Barringer
bbb878d983
Remove uncessary divs
2015-08-22 14:26:17 -05:00
Blade Barringer
e04bc21018
Move ng-if up
2015-08-22 14:26:07 -05:00
Blade Barringer
950fab237d
Correct invite users to guild
2015-08-22 12:52:21 -05:00
Blade Barringer
63b492ab51
Merge branch 'develop' into sabrecat/party-page
2015-08-22 12:44:07 -05:00
Blade Barringer
67e60e7d06
Add loading screen between leaving old party and joining new one
2015-08-22 12:42:52 -05:00
Blade Barringer
93f02363e5
Add feature to join new party if user is in a party of one
2015-08-22 12:19:37 -05:00
Blade Barringer
8c66714e5f
Convert methods to use sandbox
2015-08-22 11:54:03 -05:00
Blade Barringer
1ff597e944
Provide group name if not provided and save
2015-08-22 08:40:16 -05:00
Blade Barringer
1f86babad3
Assign group a type of party
2015-08-22 08:18:58 -05:00
Blade Barringer
60a36ca6fc
Correct view
2015-08-22 08:18:39 -05:00
Blade Barringer
cac5770649
Remove console log
2015-08-22 08:17:02 -05:00
Blade Barringer
53531ae296
Add btn-block class
2015-08-22 07:42:15 -05:00
Blade Barringer
d55da12c01
Hide + button on invite by uuid tab
2015-08-22 07:41:54 -05:00
Blade Barringer
07b9b35234
Filter out blank emails
2015-08-21 21:39:04 -05:00
Blade Barringer
59dc0cdb4f
Add method to remove blank uuids
2015-08-21 21:28:52 -05:00
Blade Barringer
3153fbac3c
Fix bug where mutliple user ids could not be saved
2015-08-21 08:19:39 -05:00
Blade Barringer
7fcfe6734b
Correct spacing
2015-08-21 08:19:06 -05:00
Alys
f9a0e494a7
changed "The Dreadful Cheetah" to "Such a Cheetah"
2015-08-21 20:49:58 +10:00
lacrimae
b8bd87eeb8
Wording: Proper English it was not
2015-08-20 16:55:05 +02:00
Blade Barringer
e8b658b0de
Add controllers to manifest and sort them
2015-08-20 08:17:47 -05:00
Blade Barringer
65888d3f8a
Merge branch 'develop' into sabrecat/party-page
2015-08-20 07:39:25 -05:00
Alys
28e360d7f4
change Janet Janet Mongilio to janetmango
2015-08-20 11:23:29 +10:00
Blade Barringer
0f5f80f910
Unpend preening test
2015-08-19 19:23:23 -05:00
Sabe Jones
f306ee6d1d
fix(test): Skip preen test
2015-08-19 20:08:39 -04:00
Sabe Jones
99c8f941e6
chore(news): August pet Bailey
2015-08-19 17:39:11 -04:00
Sabe Jones
190fdd5bb9
feat(pets): August cheetah quest
2015-08-19 16:55:14 -04:00
Sabe Jones
3e848ce67e
chore(pets): Compile sprites
2015-08-19 14:59:26 -05:00
Sabe Jones
2a09eb8911
feat(pets): August sprites
2015-08-19 14:50:09 -05:00
Blade Barringer
322785dd44
Merge branch 'develop' into sabrecat/party-page
2015-08-19 08:56:36 -05:00
Blade Barringer
59068c17a2
Add watch task for karma test
2015-08-19 08:56:20 -05:00
TheHollidayInn
e762a51e4c
Moved menu expand directive and created menu close directive
2015-08-19 08:53:51 -05:00
Blade Barringer
635c1ecd5a
Make openInviteModal function more readable
2015-08-19 08:53:43 -05:00
Blade Barringer
0eb61a5bec
Split out group controllers into separate files
2015-08-19 08:20:13 -05:00
Blade Barringer
b902ff63a2
Merge branch 'develop' into sabrecat/party-page
2015-08-19 08:07:34 -05:00
Blade Barringer
45b7e9a7d2
Remove .DS_Store files
2015-08-19 08:07:06 -05:00
Blade Barringer
5b02c2776e
Fix habitica in privacy policy
2015-08-19 08:06:02 -05:00
Blade Barringer
fa7f957ccc
Update habitrpg.com to habitica.com where applicable
2015-08-19 08:00:34 -05:00
Blade Barringer
1fecc7dc89
Change wiki links to habitica
2015-08-19 07:46:25 -05:00
Blade Barringer
00ec16877b
Merge pull request #5799 from Alys/challenges-editable-by-admins-2015-08-16
...
allow Challenges to be edited, closed, and deleted by staff and moderators
2015-08-18 17:20:19 -05:00
Sabe Jones
12b0361d45
WIP(warning-modal): Low health warning
2015-08-18 16:05:48 -04:00
Sabe Jones
120550666d
refactor(avatar): DRY out paperdolls
2015-08-18 13:07:27 -04:00
Blade Barringer
7f834429ac
Add test for clickStartQuest
2015-08-18 08:19:04 -05:00
Blade Barringer
861a90a562
Use rootScope as variable
2015-08-18 08:18:53 -05:00
Blade Barringer
b2e90ffb16
Merge branch 'develop' into sabrecat/party-page
2015-08-18 08:10:57 -05:00
Blade Barringer
be87f69cd4
Actually save copy message modal spec
2015-08-18 08:10:38 -05:00
Blade Barringer
b5a7b31fa8
Merge branch 'develop' into sabrecat/party-page
2015-08-18 08:09:33 -05:00
Blade Barringer
fe22f76e30
Move copy message modal controller spec to own file
2015-08-18 08:06:46 -05:00
Blade Barringer
3f48364a4a
Move autocomplete controller to own file
2015-08-18 08:05:56 -05:00
Blade Barringer
a032c80aaf
Move chat controller to own spec file
2015-08-18 08:05:35 -05:00
Blade Barringer
a749e2d9f7
Move party controller to own spec
2015-08-18 08:04:17 -05:00
Blade Barringer
ee6fe4f756
Use _.find for clickStart Quest
2015-08-18 08:02:23 -05:00
Blade Barringer
2e289777d5
Clean up groups page
2015-08-18 07:46:01 -05:00
Blade Barringer
a57e19bdba
Convert to private methods
2015-08-18 07:34:49 -05:00
Blade Barringer
ab7a23ad00
Add quest abort function back in
2015-08-17 22:15:51 -05:00
Blade Barringer
690100b9f8
Correct common count test
2015-08-17 22:09:11 -05:00
Blade Barringer
14ae3b1046
Add one time binding
2015-08-17 22:07:09 -05:00
Blade Barringer
ba2988ac98
Use new content for mixin
2015-08-17 21:51:08 -05:00
Blade Barringer
f792155b45
Order quests with array
2015-08-17 21:48:58 -05:00
Blade Barringer
8ed13f1c12
Update wiki url
2015-08-17 21:34:20 -05:00
Blade Barringer
58888c8118
Add test for questOfCategory counting function
2015-08-17 19:18:21 -05:00
Blade Barringer
344eded949
Merge branch 'develop' into sabrecat/party-page
2015-08-17 19:04:25 -05:00
Alys
aea8c3e5f6
Merge pull request #5806 from Gbear605/develop
...
Update information about max levels for buffs.
2015-08-18 09:02:03 +10:00
Garrison Taylor
94a31985b7
Update information about max levels for buffs.
2015-08-17 11:34:30 -05:00
Alys
0fec63a2a7
Merge pull request #4 from crookedneighbor/add_test_to_admin_editable_pr
...
Add tests to PR that lets admins edit challenges
2015-08-17 07:29:20 +10:00
3onyc
1c13c48bee
Fix removing user salt+hash from API response
2015-08-16 17:04:24 +02:00
Blade Barringer
9b73c5eab8
Add tests for non-owner permissions
2015-08-16 09:45:01 -05:00
Blade Barringer
ab9aab9262
Rework challenge integration test to be more autonomous
2015-08-16 09:44:38 -05:00
Blade Barringer
f9e337ed40
Merge pull request #5796 from GitHubSphinx/Sphinx-i18n-db1
...
Change 2 locale strings to exclude html character codes not shown on the front page
2015-08-16 07:31:09 -05:00
GihHubSphinx
a1f8035515
Change 2 strings to exclude html character codes
...
exclude mldr and rsquo character codes not shown correctly on the front
page
2015-08-16 14:17:26 +05:00
GihHubSphinx
0a0d41510e
Revert "Enable html rendering for 2 locale strings"
...
This reverts commit a2108bbb51 .
2015-08-16 14:08:58 +05:00
Alys
71a9f7caf4
make challenge permission error messages translatable
2015-08-16 17:30:51 +10:00
Alys
53f861f3c0
allow challenges to be edited, deleted, closed by admin users (moderators and staff) through the web UI (not by API calls)
2015-08-16 16:51:53 +10:00
Alys
8e667b1019
delete an outdated favicon.ico file - partial fix for https://github.com/HabitRPG/habitrpg/issues/5464
2015-08-16 14:35:38 +10:00
Alys
c957fa476e
remove text about unlocking Item Shop because it is now available to new players
2015-08-16 13:42:53 +10:00
Alys
a94dd0d6a3
adjust Orb of Rebirth modal to state that you keep free equipment
2015-08-16 13:12:53 +10:00
Alys
87c81df375
add test for Orb of Rebirth not removing free equipment (zero gold cost gear)
2015-08-16 13:06:48 +10:00
Alys
57e7fc93d7
prevent Orb of Rebirth removing free equipment (gear that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
2015-08-16 12:33:40 +10:00
GihHubSphinx
a2108bbb51
Enable html rendering for 2 locale strings
...
Strings dreimQuote and teamSample3 on the front page contain symbol
codes `…` and `’` which are not shown correctly
Closes #5571
2015-08-16 00:50:43 +05:00
Matteo Pagliazzi
7d59e1e039
start server using just node, not nodemon
2015-08-15 18:23:29 +02:00
Alys
8c186f3068
add close button audio menu on mobile web view - fixes https://github.com/HabitRPG/habitrpg/issues/5359
2015-08-15 15:21:17 +10:00
Blade Barringer
25d52bccc5
Use new newUser specHelper syntax
2015-08-15 00:08:41 -05:00
Blade Barringer
53133c6439
Adjust newUser spec helper
2015-08-14 23:55:36 -05:00
Blade Barringer
426acf44c8
Wrap task analytics in if statement
2015-08-14 23:43:47 -05:00
Blade Barringer
c10a0ad31a
Add habits
2015-08-14 23:43:32 -05:00
Blade Barringer
a040acf739
Compile sprites
2015-08-14 23:26:50 -05:00
Blade Barringer
f6dbea008a
Merge pull request #5792 from Alys/deleteDefaultDaily
...
remove unused default tasks
2015-08-14 23:23:54 -05:00
Alys
7f0889f405
remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx)
2015-08-15 13:23:42 +10:00
Blade Barringer
9e47bc3f4c
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
2015-08-14 20:11:37 -05:00
Blade Barringer
2821e25451
Reinstate the string interpolation
2015-08-14 18:04:04 -05:00
Blade Barringer
f0e3360c35
chore(i18n): update locales
2015-08-14 17:52:37 -05:00
Blade Barringer
28dda9ae9e
Fix string interpolation
2015-08-14 17:49:51 -05:00
Blade Barringer
80a6b2dcf9
Merge branch 'develop' into card_tweaks
2015-08-14 17:29:17 -05:00
Matteo Pagliazzi
a58c3d1e8b
Merge pull request #5789 from HabitRPG/paglias/loading-times
...
Stringify into window.env only what is used on the client
2015-08-14 22:14:54 +02:00
Matteo Pagliazzi
b31966b1ee
use assign in place of merge, make sure references to tavern and mods are not lost
2015-08-14 22:02:19 +02:00
Matteo Pagliazzi
2e1b046701
add TODO comments, send mods to client as they are used there
2015-08-14 21:05:04 +02:00
Matteo Pagliazzi
f896fdf16f
use only client vars on index.jade
2015-08-14 20:58:57 +02:00
Matteo Pagliazzi
3cda8b0b56
remove newrelic javascript from client
2015-08-14 20:40:51 +02:00
Sabe Jones
c4c563aca1
WIP(party-page): Restore Guild invite modal
2015-08-14 13:17:19 -05:00
Sabe Jones
572e64e3ed
WIP(party-page): Refactor groups service
2015-08-14 12:58:46 -05:00
Sabe Jones
0f31873262
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
website/views/options/social/index.jade
2015-08-14 11:23:35 -05:00
Matteo Pagliazzi
1840c3907b
fix avatar export page
2015-08-14 15:37:04 +02:00
Matteo Pagliazzi
dc4c6fa6e7
add TODO commit about logging errors catched when party invite code is invalid
2015-08-14 15:21:17 +02:00
Blade Barringer
59d4d9706a
Remove quotes from card strings
2015-08-14 08:13:25 -05:00
Blade Barringer
80ba33bf7c
Fix issue where card strings required quotes
2015-08-14 08:13:05 -05:00
Matteo Pagliazzi
289d288f38
fix typo
2015-08-14 15:02:46 +02:00
Matteo Pagliazzi
d3c78bb890
revert dataexport controller changes
2015-08-14 15:02:16 +02:00
Matteo Pagliazzi
e1620bad2b
stringify into window.env only what we really need, save a lot of KBs
2015-08-14 14:53:17 +02:00
Blade Barringer
998e336818
Remove extraneous white space
2015-08-14 07:40:07 -05:00
Blade Barringer
6be339fc77
Fix bug where armoire notes would not display correctly
2015-08-14 06:59:23 -05:00
Blade Barringer
576688c15b
Clean up content file
2015-08-14 06:41:10 -05:00
Matteo Pagliazzi
34dd4494ec
in locals middleware require tavern and mods only once
2015-08-14 13:10:53 +02:00
Matteo Pagliazzi
fbeeb18923
Merge pull request #5788 from HabitRPG/paglias/loading-times
...
Refactor middlewares
2015-08-14 12:53:02 +02:00
Matteo Pagliazzi
ca457df36a
fix typo catatories -> categories
2015-08-14 12:23:10 +02:00
Matteo Pagliazzi
491652d712
fix several typypos and a missing dep
2015-08-14 12:00:09 +02:00
Matteo Pagliazzi
47f6f2febe
refactor middlewares in their own folder, move buildFiles to libs/buildFiles
2015-08-14 11:50:09 +02:00
Matteo Pagliazzi
078ea4768a
upgrade jade version
2015-08-14 10:58:19 +02:00
Sabe Jones
ab91a6fba9
Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards
...
Greeting and Thank-You Cards
2015-08-13 22:35:25 -05:00
Blade Barringer
610ce048cb
Refactor card achievements
2015-08-13 22:27:14 -05:00
Sabe Jones
534cb48dce
Merge pull request #5782 from crookedneighbor/card_tweaks
...
Tweaks to card PR
2015-08-13 22:21:56 -05:00
Blade Barringer
c7282dc10a
Remove blank space
2015-08-13 20:33:19 -05:00
Blade Barringer
4adc19caf0
Fix test
2015-08-13 19:55:13 -05:00
Blade Barringer
b1b4522b4b
Fix test
2015-08-13 19:40:25 -05:00
Sabe Jones
00a212660a
feat(greeting-cards): Thank-You & Greets
2015-08-13 16:58:31 -05:00
Sabe Jones
f57e3e69a1
WIP(greeting-cards): Working send + modals
2015-08-13 15:43:51 -05:00
Sabe Jones
b2100c2c54
WIP(greeting-cards): Abandon spell refactor
2015-08-13 14:31:34 -05:00
Matteo Pagliazzi
f750c53ccc
remove quote from filename
2015-08-13 17:52:38 +02:00
GihHubSphinx
dd7ace7eb3
Reconstructing pets and mounts progress strings
...
Second take, keeping the previous view
2015-08-13 20:39:23 +05:00
Matteo Pagliazzi
61cd8f58af
start using cloudfront for frontpage assets
2015-08-13 17:16:24 +02:00
Matteo Pagliazzi
4993d67f2f
export avatars to separate folder in s3 bucket
2015-08-13 14:12:32 +02:00
Alys
619b33795a
remove mention of ads from locale strings, delete ads strings that are no longer used - fixes https://github.com/HabitRPG/habitrpg/issues/5765
2015-08-13 16:46:02 +10:00
Blade Barringer
3f941c3534
chore(i18n): update locales
2015-08-12 22:37:52 -05:00
Blade Barringer
bf4d690a7c
Merge pull request #5775 from HabitRPG/item_store_fix
...
Split out potion and armoire out of the itemStore object
2015-08-12 22:35:54 -05:00
Blade Barringer
a5efc2af2b
Merge pull request #5762 from crookedneighbor/transifex_test
...
Transifex test
2015-08-12 22:35:38 -05:00
Blade Barringer
7c6641482a
Merge pull request #5776 from crookedneighbor/qhUQxV7Q_add_number_of_user_tasks_to_analytics
...
Analytics improvements
2015-08-12 22:31:44 -05:00
Blade Barringer
ceec310e5f
Use human readable name
2015-08-12 22:16:30 -05:00
Blade Barringer
9a27b2e8cb
Add task numbers to analytics
2015-08-12 21:47:04 -05:00
Blade Barringer
39ead02d6c
Remove comment
2015-08-12 19:09:11 -05:00
Blade Barringer
bcf7c9712e
Split out potion and armoire out of the itemStore object
...
Fixes #5743
2015-08-12 18:53:49 -05:00
GihHubSphinx
c711074809
Duplicating 2 strings for better i18n
...
Duplicating strings "Pets Found" and "Mounts Tamed" used in inventory
and in stats with different order of numbers - words
2015-08-12 23:39:11 +05:00
Sabe Jones
3c8424a83e
Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards
2015-08-12 11:53:28 -05:00
Sabe Jones
2d8fdab496
WIP(party-page): Roll back to 1x invites
...
Also a draft of logic for 1-step create group + invite people.
2015-08-12 11:29:36 -05:00
Blade Barringer
c7edbfb9b2
Remove empty object in close
2015-08-12 08:42:01 -05:00
Blade Barringer
203a26b6df
Refactor how cards are recieved
2015-08-12 08:36:57 -05:00
Alys
f4c89f9379
initialise buyThis message variable at point of declaration - fixes https://github.com/HabitRPG/habitrpg/issues/5770
2015-08-12 21:26:51 +10:00
Alys
dbbd03e6cb
remove one-time binding from "You're resting in the inn" banner above Dailies column - fixes https://github.com/HabitRPG/habitrpg/issues/5693
2015-08-12 16:53:51 +10:00
Alys
879ba83002
change habitrpg.com to habitica.com where appropriate - email addresses in static Contact page and various in-game URLs
2015-08-12 16:12:59 +10:00
Alys
665c32ee54
change Fortify Potion description for blue tasks making the game too easy - fixes https://github.com/HabitRPG/habitrpg/issues/5758
2015-08-12 11:25:08 +10:00
Blade Barringer
60f92a8997
chore(i18n): update locales
2015-08-11 20:02:59 -05:00
Blade Barringer
869b27d786
Correct markdown
2015-08-11 20:01:45 -05:00
Blade Barringer
6861f1460a
chore(i18n): update locales
2015-08-11 18:50:51 -05:00
Blade Barringer
0dc10b5f8e
Convert valentines to markdown
2015-08-11 18:47:12 -05:00
Blade Barringer
a29dd4cc16
Correct styling for focusable buttons
...
Fixes #5767
2015-08-11 18:34:46 -05:00
Alys
8360aa93fb
Merge pull request #5756 from Alys/cron-missed-days-ignore-multiple-2015-07-21
...
make cron count multiple missed days as one missed day (part 2)
2015-08-12 08:35:37 +10:00
Blade Barringer
1477c5601c
Merge branch 'develop' into transifex_test
2015-08-11 08:16:09 -05:00
Blade Barringer
455dae1032
chore(i18n): update locales
2015-08-11 08:15:34 -05:00
Blade Barringer
5750da4a13
chore(i18n): update locales
2015-08-11 08:13:41 -05:00
Blade Barringer
9d9e99045d
Add exceptions to not check for malformities
2015-08-11 08:12:03 -05:00
Blade Barringer
3b0993c781
Merge branch 'develop' into transifex_test
2015-08-11 07:55:15 -05:00
Blade Barringer
e31138fb76
chore(i18n): update locales
2015-08-11 07:54:42 -05:00
Blade Barringer
55934c9cc0
Merge branch 'develop' into transifex_test
2015-08-11 07:40:59 -05:00
Blade Barringer
01e2c30795
chore(i18n): update locales
2015-08-11 07:38:42 -05:00
Matteo Pagliazzi
0a340de9c8
chore(i18n): update locales
2015-08-11 14:32:00 +02:00
Blade Barringer
c46659c622
Add top level transifex task
2015-08-10 17:31:43 -05:00
Blade Barringer
c74625a624
Add line break for styling consistency
2015-08-10 17:17:27 -05:00
Blade Barringer
ae2a9f5756
remove unused functions
2015-08-10 17:16:50 -05:00
Blade Barringer
ee621b526e
Remove unused dependency
2015-08-10 17:15:20 -05:00
Blade Barringer
3b1dc7be3b
Merge branch 'develop' into transifex_test
2015-08-10 17:14:21 -05:00
Sabe Jones
5b15d603aa
WIP(party-page): Broken multi-invite
2015-08-10 15:16:45 -05:00
Sabe Jones
beacce7fe0
Merge branch 'develop' into sabrecat/party-page
2015-08-10 13:43:44 -05:00
Sabe Jones
28ae6afd92
WIP(party-page): UI draft
2015-08-10 13:42:36 -05:00
Blade Barringer
6ed3e77008
Remove double warning
2015-08-10 07:53:26 -05:00
Blade Barringer
2ec7e631e9
Update locales
2015-08-10 07:52:07 -05:00
Blade Barringer
cb89f07dcf
Add clarification about missing interpolations
2015-08-10 07:42:52 -05:00
Blade Barringer
c8af280ce4
Revert formatting back to backticks
2015-08-10 07:33:27 -05:00
Blade Barringer
abb19d1d20
Correct casing on config example
2015-08-10 07:33:14 -05:00
Blade Barringer
1ffad1997e
Removed mocha test for translations
2015-08-09 16:52:25 -05:00
Blade Barringer
b35453cd4b
Add transifex config to example config
2015-08-09 16:52:00 -05:00
Blade Barringer
6cd3ed3e07
Set default channel
2015-08-09 16:44:34 -05:00
Blade Barringer
8415322717
Create malformed string check
2015-08-09 16:43:04 -05:00
Blade Barringer
d0e4590a01
Change missingStrings to that it posts to slack
2015-08-09 16:42:44 -05:00
Blade Barringer
c1f0fae456
Change format of reporting
2015-08-09 16:14:09 -05:00
Blade Barringer
cd15b115ad
Add constant for all languages array
2015-08-09 16:13:17 -05:00
Blade Barringer
7aa67e68d8
Revert emdash changes
2015-08-09 09:19:46 -05:00
Garrison Taylor
df98a28d4c
Fix typo
...
"successully" to "successfully"
2015-08-09 10:06:00 -04:00
Garrison Taylor
f2503d0d41
Replace a hyphen with an emdash
2015-08-09 09:45:04 -04:00
Garrison Taylor
36aef28f72
Replace a hyphen with an emdash
2015-08-09 09:44:25 -04:00
Garrison Taylor
a261840fb3
Rewrite the maximum gems sentence
...
It is not in plainer English
2015-08-09 09:40:38 -04:00
Garrison Taylor
028b5ed825
Fix grammar typo
...
Replace a comma with a semicolon.
2015-08-09 09:38:45 -04:00
Garrison Taylor
969d121b80
Fix grammar typo
...
Change "you get one point to allocate to particular stat" to "you get one point to allocate to a particular stat"
2015-08-09 09:37:16 -04:00
Garrison Taylor
f5890131c7
Fix grammar typo
...
Change "but knight shows no signs of stopping" to "but the knight shows no signs of stopping"
2015-08-09 09:35:38 -04:00
Garrison Taylor
b8d13413b8
Fix type with "Successully"
...
"Successully" to "Successfully" in detachedFacebook
2015-08-09 09:31:54 -04:00
Alys
3e9cfdc437
Improve instructions in password reset email. Replace BASE_URL with habitica.com TEMPORARILY (Alys has a To-Do to revert this).
2015-08-09 20:07:27 +10:00
Alys
9db46bd999
add test for cron reducing the value of a todo by only one day's worth when multiple days are missed
2015-08-09 16:37:20 +10:00
Alys
a53625aafb
remove (probably) unused completeDaily code from dailies tests
2015-08-09 14:10:29 +10:00
Alys
fd0176f4fc
fix an outdated comment
2015-08-09 14:09:10 +10:00
Alys
262340147d
remove code that was added purely for testing and development
2015-08-09 14:08:28 +10:00
Alys
696027025b
add tests for Dailies under new cron behaviour where multiple missed days are treated as one
2015-08-09 14:04:42 +10:00
Alys
06fd9c7a67
replace _.times with for loop to allow break
2015-08-09 13:58:18 +10:00
Alys
c3d65f0bcf
initial changes to cause cron to count multiple missed days as one missed day
2015-08-09 13:58:18 +10:00
Blade Barringer
8b00a772cf
Remove hash function
2015-08-08 22:50:18 -05:00
Blade Barringer
bfc5ac9435
Add task to check for missing files
2015-08-08 22:47:26 -05:00
Blade Barringer
092ba23ae4
Adjust each file to handle errors
2015-08-08 22:46:51 -05:00
Blade Barringer
f58c9e2192
Rename task
2015-08-08 22:25:02 -05:00
Blade Barringer
9d3c40122a
REmove unsued task
2015-08-08 22:24:52 -05:00
Blade Barringer
2069936603
Correct spelling of increases
...
Fixes #5744
2015-08-08 16:34:22 -05:00
Blade Barringer
67686c4b0b
Merge branch 'develop' into transifex_test
2015-08-08 09:58:52 -05:00
Blade Barringer
e1ecb9d29b
Part 3 of translation fixes
2015-08-08 09:58:20 -05:00
Blade Barringer
e05426ecae
Part 2 of translation fix
2015-08-08 08:14:48 -05:00
Blade Barringer
6c6e22f9e6
Part 1 of translation fixes
2015-08-07 23:43:37 -05:00
Blade Barringer
6a8a189a33
Merge branch 'develop' into transifex_test
2015-08-07 23:09:01 -05:00
Blade Barringer
f378fdf860
chore(i18n): update locales
2015-08-07 23:02:00 -05:00
Blade Barringer
f355e8e3af
Wrote task that can look up english strings
2015-08-07 22:59:55 -05:00
Blade Barringer
7ca785f33e
Remove unused callback
2015-08-07 19:28:21 -05:00
Blade Barringer
894611bc34
Create shell of task for looking up strings
2015-08-07 09:34:18 -05:00
Blade Barringer
563072712b
Refactor untranslated strings task
2015-08-07 09:00:17 -05:00
Blade Barringer
c51f8a1289
Merge branch 'develop' into transifex_test
2015-08-07 07:42:07 -05:00
Blade Barringer
28046ba3a3
chore(i18n): update locales
2015-08-07 07:38:14 -05:00
Blade Barringer
fd76baa6f8
Missing strings task
2015-08-06 22:42:24 -05:00
Sabe Jones
f97012798e
WIP(party-page): Party preview graphic
2015-08-06 16:36:28 -05:00
Sabe Jones
f1704a6a92
WIP(party-page): Active party page
2015-08-06 12:13:50 -05:00
Blade Barringer
89a351a0d1
Add check for if string exists
2015-08-06 08:58:58 -05:00
Blade Barringer
1f6cad7baf
Revert change that made death.json executable :/
2015-08-06 08:53:08 -05:00
Blade Barringer
4bdb2a8b84
chore(i18n): update locales
2015-08-06 08:50:06 -05:00
Blade Barringer
46156601ff
Add death files for other languages
2015-08-06 08:10:46 -05:00
Blade Barringer
0ca2339d87
chore(i18n): update locales
2015-08-06 08:03:11 -05:00
Blade Barringer
cf507df375
chore(i18n): update locales
2015-08-06 07:38:20 -05:00
carolstone
9fe96b7f94
Renamed variables for clarity.
...
Moved calculation to actually change lastcron into its own function.
Changed validation errormessage to run: if ( dayStart != Math.floor(dayStart) || dayStart < 0 || dayStart > 24 ) {error message}.
Created new calculation for daystart because daystart could never be
future to the current timestamp. This "fix" has broken the whole endeavor,
though, because cron runs immedately when newlastcron > now and now >
oldlastcron.
2015-08-05 22:47:45 -04:00
Blade Barringer
ac7ee80c27
Merge branch 'sgabler-add-hints-to-repeat-every-x-days-functionality' into develop
2015-08-05 18:28:09 -05:00
Blade Barringer
787cb6cabb
Final adjustments to PR
...
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
2015-08-05 18:27:24 -05:00
Blade Barringer
383ae3be55
Merge pull request #5746 from crookedneighbor/enchanted_armoire_test_improvements
...
Enchanted armoire test improvements
2015-08-05 18:13:12 -05:00
Blade Barringer
e34c30a37f
Improve formatting of gulp task
2015-08-05 18:12:28 -05:00
Simon Gabler
2343e4720c
Add tooltips for day buttons to show "due" or "not due"
2015-08-05 22:25:03 +02:00
Simon Gabler
1997338751
Show popover for daily and weekly dailies
2015-08-05 22:23:41 +02:00
Blade Barringer
47681e90bd
Reorganize and set stub behavior
2015-08-05 13:02:36 -05:00
Sabe Jones
c275db6b4b
Merge branch 'develop' into sabrecat/party-page
2015-08-05 12:43:56 -05:00
Blade Barringer
2598fa1ecb
Move ulitmate gear
2015-08-05 12:00:57 -05:00
Blade Barringer
1bcc241c04
Rename common test
2015-08-05 12:00:00 -05:00
Simon Gabler
99bdf4c541
Add hint for "Repeat every" option title. Fixes #5603
2015-08-05 17:02:02 +02:00
Blade Barringer
b402df329d
Remove unneeded content variable
2015-08-05 09:01:27 -05:00
Blade Barringer
c8d957255b
Add placeholders for more buy tests to transfer over
2015-08-05 09:00:26 -05:00
Blade Barringer
7f3bfa0dc7
Extract enchanted armoire tests into separate file
2015-08-05 08:57:25 -05:00
Blade Barringer
e22e853f21
Fix some formatting
2015-08-05 08:18:03 -05:00
Blade Barringer
ba2753edc2
Refactor armoire test no longer need to be updated when items are added to the armoire
...
Fixes #5739
2015-08-05 08:16:38 -05:00
Blade Barringer
2d59bcab61
Add common watch task
2015-08-05 08:15:53 -05:00
Blade Barringer
d1b9739c58
Merge pull request #5742 from crookedneighbor/vIiRuS-armoireResponse
...
Add response to armoire purchases for display in API
2015-08-04 22:10:06 -05:00
Blade Barringer
008a5f1209
Merge branch 'develop' of github.com:HabitRPG/habitrpg into vIiRuS-armoireResponse
2015-08-04 19:52:11 -05:00
Blade Barringer
3e5a3a00cb
Merge pull request #5741 from HabitRPG/use_base_url_for_redirect
...
Adjust Force Habitica Code
2015-08-04 19:22:50 -05:00
Blade Barringer
82d2d6507f
Add missing space
2015-08-04 18:55:55 -05:00
Blade Barringer
e6c1b69cb0
Swap out isHabitrpg for ignoreRedirect
2015-08-04 18:55:26 -05:00
Blade Barringer
e7705a7d77
chore(i18n): update locales
2015-08-04 18:42:39 -05:00
Blade Barringer
93a2d3d660
Use constants for is_prod and base_url
2015-08-04 18:30:27 -05:00
Blade Barringer
675808e54e
Catch habitrpg.com specifically
2015-08-04 18:16:36 -05:00
Sabe Jones
68cc0fd56a
fix(avatar): Delist Splashy Skins
...
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
2015-08-04 15:17:38 -05:00
Sabe Jones
bc11e03bef
fix(sharing): Localize Tweet text
2015-08-04 14:55:15 -05:00
Sabe Jones
a03fa32a3a
fix(NPCs): De-Splashify sprites
2015-08-04 14:39:29 -05:00
Sabe Jones
6b37b0ced6
fix(armoire): Add sprites, pass tests
2015-08-04 13:00:34 -05:00
Sabe Jones
60e65a8bea
feat(armoire): August additions
...
Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.
2015-08-04 12:45:01 -05:00
Blade Barringer
5731f00736
Add baseUrl variable
2015-08-04 12:09:54 -05:00
Sabe Jones
4d576acb57
WIP(party-page): Naming and LFG
2015-08-04 11:58:57 -05:00
Blade Barringer
a8d98e5f57
Add esnext parameter to jshint
2015-08-04 08:56:47 -05:00
Blade Barringer
0c92c4a048
Switch redirect to baseUrl
2015-08-04 08:42:53 -05:00
Blade Barringer
c402ec61b2
Remove checkmark from focused task, increase opacity of background
...
Fixes #5682
2015-08-04 08:16:31 -05:00
Blade Barringer
5156d9b604
Merge pull request #5731 from teh-maxh/patch-1
...
HabitRPG -> Habitica
2015-08-03 22:02:08 -05:00
Max Harmony
64a3009e7a
HabitRPG -> Habitica
2015-08-03 19:24:24 +00:00
Sabe Jones
cafdb4d57e
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/locales/en/groups.json
2015-08-03 12:45:32 -05:00
Matteo Pagliazzi
4f333c4f8a
fix(amazon-payments): swap colors between paypal and amazon
2015-08-03 18:41:34 +02:00
Blade Barringer
5ed5ca8126
Merge branch 'adjustments-to-challenge-participant-pr' into develop
2015-08-03 08:47:30 -05:00
Blade Barringer
01237df213
Add buttons to challenge participant modal
2015-08-03 08:40:33 -05:00
Blade Barringer
1b19cc1c4d
Merge branch 'teh-maxh-patch-1' into develop
2015-08-03 07:54:15 -05:00
Blade Barringer
71f7578aa0
Merge pull request #5723 from sgabler/add-code-climate-yml
...
Add .codeclimate.yml
2015-08-03 07:43:08 -05:00
Blade Barringer
f0283278b9
Correct spelling mistake
2015-08-02 21:55:16 -05:00
Blade Barringer
475b868e67
Pin to specific bower versions
2015-08-02 21:43:27 -05:00
Sabe Jones
af4bb5e23f
chore(news): End Summer Splash
2015-08-02 14:09:26 -05:00
Simon Gabler
cfa2d937b2
Only list javascript in .codeclimate.yml
2015-08-02 17:54:05 +02:00
Blade Barringer
919c072b5d
chore(i18n): update locales
2015-08-02 10:30:43 -05:00
Blade Barringer
68f5a162fd
Merge branch 'Lokeh_webhooks-more-details' into develop
2015-08-02 09:28:49 -05:00
Simon Gabler
c9db579763
Add .codeclimate.yml
2015-08-02 11:44:52 +02:00
Max Harmony
7c4331080c
add'l link changes
2015-08-02 01:03:34 +00:00
Blade Barringer
a960f5ef72
Revert back to toJSON()
2015-08-01 16:08:54 -05:00
Blade Barringer
c7e751d662
Adjsut formatting
2015-08-01 14:04:33 -05:00
Blade Barringer
b567a0d9a6
Refactor webhook and add tests
2015-08-01 14:03:45 -05:00
Simon Gabler
c9e7b4d73d
Make challenge participant's name clickable in progress modal. Fixes #5558
2015-08-01 16:12:58 +02:00
Alys
2780cd0317
Merge pull request #5714 from sgabler/cantras-mod-avatar
...
Add mod Cantras to community guidelines page. Fixes #5676
2015-08-01 07:56:02 +10:00
Simon Gabler
cba9752111
Add mod Cantras to community guidelines page. Fixes #5676
2015-07-31 23:05:17 +02:00
Max Harmony
7b5822be4d
new Habitica urls
2015-07-31 16:09:44 +00:00
Blade Barringer
4598d3d445
chore(i18n): update locales
2015-07-31 09:05:58 -05:00
Blade Barringer
09070a71b5
chore(i18n): update locales
2015-07-31 09:00:26 -05:00
Blade Barringer
b565b04a69
chore(i18n): update locales
2015-07-31 08:48:30 -05:00
Blade Barringer
a7de79a496
chore(i18n): update locales
2015-07-31 08:28:21 -05:00
Blade Barringer
f10657af2a
chore(i18n): update locales
2015-07-31 07:43:21 -05:00
Alys
07bdc89738
habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change.
2015-07-31 18:53:32 +10:00
Alys
c211af8e8f
HabitRPG -> Habitica
2015-07-31 18:38:51 +10:00
Alys
c4c21a58c6
HabitRPG -> Habitica in header on static pages
2015-07-31 18:10:40 +10:00
Alys
798b2890d0
HabitRPG -> Habitica text changes
2015-07-31 18:05:10 +10:00
Alys
5ac3edc1d2
Merge pull request #5709 from lacrimae/patch-5
...
HabitRPG -> Habitica where missed
2015-07-31 17:54:04 +10:00
Alys
4c5ae5391b
Merge pull request #5708 from lacrimae/patch-4
...
HabitRPG -> Habitica where missed
2015-07-31 17:53:05 +10:00
Alys
46550f629d
Merge pull request #5707 from lacrimae/patch-3
...
HabitRPG -> Habitica where missed
2015-07-31 17:49:56 +10:00
lacrimae
7ba91ea0c6
HabitRPG -> Habitica where missed
2015-07-31 09:47:02 +02:00
lacrimae
8869e1b32a
HabitRPG -> Habitica where missed
2015-07-31 09:45:09 +02:00
lacrimae
4c88ddc7d1
HabitRPG -> Habitica where missed
2015-07-31 09:37:17 +02:00
Alys
d494d99283
Merge pull request #5706 from lacrimae/patch-2
...
HabitRPG -> Habitica where missed
2015-07-31 17:34:18 +10:00
Alys
30c8355922
Merge pull request #5705 from lacrimae/patch-1
...
HabitRPG -> Habitica where missed
2015-07-31 17:32:30 +10:00
lacrimae
2daff46991
HabitRPG -> Habitica where missed
2015-07-31 09:27:30 +02:00
lacrimae
49891d311f
HabitRPG -> Habitica where missed
2015-07-31 09:20:20 +02:00
Blade Barringer
a888a120d9
chore(i18n): update locales
2015-07-30 23:25:04 -05:00
Blade Barringer
25fc92d59e
chore(i18n): update locales
2015-07-30 22:49:22 -05:00
Blade Barringer
e28bd5bc57
Update English strings
2015-07-30 21:36:09 -05:00
Sabe Jones
183755cf74
fix(test): Correct e2e expectation
2015-07-30 20:59:55 -05:00
Sabe Jones
3dc78a86f6
fix(naming-day): Improved Habitica logo
2015-07-30 20:51:57 -05:00
Sabe Jones
65f21619ae
feat(naming-day): Bailey etc.
2015-07-30 19:46:04 -05:00
Kevin Gisi
85584eaa60
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-07-30 19:32:37 -04:00
Kevin Gisi
efcf0a57d4
Change host check to proxy check
2015-07-30 19:27:00 -04:00
Kevin Gisi
339dec3ac0
Emergency fix
2015-07-30 19:10:14 -04:00
Sabe Jones
2a0a26e5ce
feat(naming-day): New logo
...
Updates the static front page to use the purple gryphon icon, changes same to refer to "Habitica" instead of "HabitRPG", and updates the site favicon to the new logo.
2015-07-30 18:01:47 -05:00
Sabe Jones
1de80a3ed8
WIP(party-page): Revised invite modals
2015-07-30 16:48:08 -05:00
Kevin Gisi
8465e8adbf
Merge pull request #5699 from gisikw/habitica-redirect
...
Added redirects to habitica for non-API urls
2015-07-30 15:42:04 -04:00
Kevin Gisi
cfdcadb2bc
Added redirects to habitica for non-API urls
2015-07-30 13:20:24 -04:00
Blade Barringer
1001cc8889
Refactor webhook section to be cleaner
...
Added note to put webhook into own module
2015-07-30 08:19:22 -05:00
Will
7245ffa94a
refactor user.toJSON()
2015-07-30 00:21:41 -07:00
Will
4e5d630a87
remove profile object from webhooks
2015-07-29 21:43:13 -07:00
Will
b3ae6eef17
maxHEalth uses new shared.maxHealth
2015-07-29 21:43:13 -07:00
Will
f3829c8ce4
code cleanup and commenting
2015-07-29 21:43:13 -07:00
Will
a27f8d6705
add profile info and computed stats
2015-07-29 21:43:12 -07:00
Sabe Jones
f8d7547923
WIP(party): Incomplete no-party page
2015-07-29 16:28:23 -05:00
Sabe Jones
6946dd23e5
Merge branch 'develop' into sabrecat/party-page
2015-07-29 15:03:46 -05:00
Sabe Jones
a398fe0af2
Merge pull request #5692 from HabitRPG/sabrecat/habitica-day
...
Habitica Day
2015-07-29 12:28:09 -07:00
Sabe Jones
b4e3efeab7
fix(news): Break before list
...
For readability
2015-07-29 14:17:32 -05:00
Sabe Jones
bbbae27631
chore(naming-day): Bailey and sprites
2015-07-29 14:12:04 -05:00
Sabe Jones
788fba08c2
Merge branch 'develop' into sabrecat/habitica-day
2015-07-29 14:00:58 -05:00
Blade Barringer
661e79d668
Use party variable
2015-07-28 21:27:15 -05:00
Blade Barringer
442c1f358b
Use Groups.party()
2015-07-28 21:05:33 -05:00
Kevin Gisi
21020a9e74
Merge pull request #5686 from gisikw/allow-proxy-bypass
...
Missed a baseUrl instance.
2015-07-28 19:41:19 -04:00
Kevin Gisi
27b2d932ce
Missed a baseUrl instance.
2015-07-28 19:40:26 -04:00
Kevin Gisi
39b19636d7
Merge pull request #5685 from gisikw/allow-proxy-bypass
...
Allow x-habitica-lb: yes suffice to bypass SSL redirect
2015-07-28 19:27:08 -04:00
Kevin Gisi
3be5c2cb96
Allow x-habitica-lb: yes suffice to bypass SSL redirect
2015-07-28 19:12:52 -04:00
Sabe Jones
39a17d933d
fix(achievements): Day copypasta
2015-07-28 16:26:46 -05:00
Sabe Jones
ceb9cf7817
WIP(event): Habitica Day
2015-07-28 16:20:08 -05:00
Sabe Jones
60d6a479de
Merge pull request #5683 from HabitRPG/sabrecat/enable-drops-sooner
...
Enable pets at Level 3
2015-07-28 13:12:40 -07:00
Sabe Jones
ac9244af7c
Merge pull request #5675 from HabitRPG/sabrecat/party-analytics
...
Party analytics properties
2015-07-28 13:12:25 -07:00
Sabe Jones
0f08c2a8b1
test(unlocks): Check Rebirth
2015-07-28 14:35:37 -05:00
Sabe Jones
6dbac3280d
test(levelup): Add tests for unlocks
2015-07-28 14:32:16 -05:00
Sabe Jones
8492541636
fix(visuals): Armoire and Seasonal Shop
...
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
2015-07-28 13:35:17 -05:00
Sabe Jones
13ab60cafe
feat(drops): Enable pets at Level 3
2015-07-28 13:28:45 -05:00
Sabe Jones
7c56f5e7f6
fix(analytics): Tweaks per code review
2015-07-28 13:26:39 -05:00
Blade Barringer
a23b7d23a9
chore(i18n): update locales
2015-07-28 08:00:08 -05:00
Blade Barringer
d3bcf57246
chore(i18n): update locales
2015-07-28 07:43:40 -05:00
Blade Barringer
08a4e30b8e
chore(i18n): update locales
2015-07-27 23:15:48 -05:00
Sabe Jones
5d5f1d2b1b
chore(legal): Update revision date
2015-07-27 16:58:16 -05:00
Sabe Jones
1a14ac20a6
refactor(avatar): DRY out paperdolls
2015-07-27 16:35:06 -05:00
Sabe Jones
4f36ecb8d1
fix(legal): TOS and privacy tweaks
...
Also updates the front page daily users brag to account for the 25% growth since the introduction of the joinOthers string.
2015-07-27 15:26:31 -05:00
Sabe Jones
f6bbae3beb
fix(analytics): Bad comparison
...
Corrects an error caught via test, where the check for intro tour completion would always fail. Also tweaks the updateUser behavior to save an explicit false if tour completion data is not found, including a test for that behavior.
2015-07-27 15:13:59 -05:00
Sabe Jones
e9ed561907
fix(analytics): Add missing ID update
...
Also make the order of partyID and partySize consistent across updateUser calls.
2015-07-27 14:34:31 -05:00
Sabe Jones
9d7a2a1c24
feat(analytics): Party properties
...
Adds tracking of the user's party ID and size as user-level analytics properties.
2015-07-27 14:25:11 -05:00
Blade Barringer
e72543641c
Puts keys of the kennel modal on the inventory ctrl so pet counting variables can be accesssed
...
Closes #5668
2015-07-25 23:22:35 -05:00
Alys
f5c66e51d1
refactor cron process for todos and dailys to give them separate code
2015-07-26 11:27:00 +10:00
Blade Barringer
f31d1b4b1b
Merge branch 'develop' into TheHollidayInn-tasks-select-with-keys-fix
2015-07-24 22:16:57 -05:00
Blade Barringer
f749d1a3cb
Make todos selectable with vimium
2015-07-24 22:08:13 -05:00
Blade Barringer
7c43f87858
Add test for discard method
2015-07-24 17:30:48 -05:00
Blade Barringer
60ee0c911f
Add test for edit
2015-07-24 17:30:48 -05:00
Blade Barringer
6aae668b8c
Rework gem adjustment so it actually makes sense
2015-07-24 17:30:47 -05:00
Blade Barringer
68f9a78aac
Write tests for creating challenges
2015-07-24 17:30:47 -05:00
Blade Barringer
9e25c29e04
Correct maxPrize calculation
2015-07-24 17:30:47 -05:00
Blade Barringer
099beb5e8d
Add task manipulation tests for challenges
2015-07-24 17:30:46 -05:00
Blade Barringer
aea1ceafe5
Move test
2015-07-24 17:30:46 -05:00
Blade Barringer
875f30bece
Add tests for filtering groups
2015-07-24 17:30:46 -05:00
Blade Barringer
e37c60e0f2
Expand functions to make them readable
2015-07-24 17:30:45 -05:00
Blade Barringer
800c270944
Add tests for leave functions
2015-07-24 17:30:45 -05:00
Blade Barringer
d3da391f6e
Add challenge join test
2015-07-24 17:30:45 -05:00
Blade Barringer
0b85dc3e27
Correct getChallenges name
2015-07-24 17:30:44 -05:00
Blade Barringer
12e0bda8a2
Use specHelper to create mock challenges
2015-07-24 17:30:44 -05:00
Blade Barringer
32ebc8734e
Set default prize for challenge at 0
2015-07-24 17:30:44 -05:00
Blade Barringer
f9cc9a87ee
Add challenge factory to karma specs
2015-07-24 17:30:44 -05:00
Blade Barringer
2722116b40
Organize challenge controllers specs
2015-07-24 17:30:43 -05:00
Blade Barringer
61d0172567
Add mising semi colons and line breaks
2015-07-24 17:30:43 -05:00
Blade Barringer
95131f276b
Add tests for save function
2015-07-24 17:30:43 -05:00
Blade Barringer
a89b612bbe
Impliment challenge controller changes in view
2015-07-24 17:30:42 -05:00
Blade Barringer
bac979ca4d
Eliminate unused variable
2015-07-24 17:30:42 -05:00
Blade Barringer
2441f6363e
Consolidate transition code
2015-07-24 17:30:42 -05:00
Blade Barringer
5cd42e85c7
bail out and alert user if prize is too high
2015-07-24 17:30:41 -05:00
Blade Barringer
7c4486e001
Use gem calc functions
2015-07-24 17:30:41 -05:00
Blade Barringer
c92678008b
Write functions to check if user has balance for challenge creation
2015-07-24 17:30:41 -05:00
Blade Barringer
cb27c3dc44
Correct indentation and equality checks on shuldShowChallenge
2015-07-24 17:30:40 -05:00
Blade Barringer
eea01216d7
Move backToChallenges to private functions section
2015-07-24 17:30:40 -05:00
Blade Barringer
fb6a34c2ed
Set default group to tavern if no default group is found
2015-07-24 17:30:40 -05:00
Blade Barringer
fe2fb6deba
Remove out of context comment
2015-07-24 17:30:40 -05:00
Blade Barringer
f8e2e74336
Move getChallenges private method to bottom of file
2015-07-24 17:30:39 -05:00
Blade Barringer
061e6dbfa5
Add test for shouldShow function
2015-07-24 17:30:39 -05:00
Blade Barringer
26b3ab1f9a
Add pending tests
2015-07-24 17:30:39 -05:00
Blade Barringer
59e19d98ca
Remove misplaced challenge spec
2015-07-24 17:30:38 -05:00
Blade Barringer
bcb128f4b6
Adjust wording for tavern challenge popover
2015-07-24 17:30:38 -05:00
Blade Barringer
791e2f0c16
Add method to get user balance in gems
2015-07-24 17:30:38 -05:00
TheHollidayInn
061e381abf
Updated broken test to mimic other save test
2015-07-24 17:30:37 -05:00
TheHollidayInn
79101f5eb8
Added and fixed hasEnoughGems test
2015-07-24 17:30:37 -05:00
TheHollidayInn
ef9dfac087
Create new function to check for enough gems, added @crookedneighbor 's tests, and added tests to check for enoughGems when user creates a habitrpg challenge
2015-07-24 17:30:37 -05:00
TheHollidayInn
53c21b07a3
Reset enough gems variable if user selects group other than habitrpg
2015-07-24 17:30:36 -05:00
TheHollidayInn
fce622ddc7
Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems
2015-07-24 17:30:36 -05:00
Sabe Jones
63a8bf63cb
Merge pull request #5664 from HabitRPG/sabrecat/death-modal
...
Kinder, gentler death
2015-07-24 14:36:33 -07:00
Sabe Jones
3adb315184
feat(death): Release candidate
...
Version to push live for end user feedback. (Pardon the merge conflict garbage included in prior commit; rerunning spritesmith sorted it out!)
2015-07-24 16:24:14 -05:00
Sabe Jones
d022a0eb67
Merge branch 'develop' into sabrecat/death-modal
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-07-24 16:11:51 -05:00
Blade Barringer
4c316cab72
Merge pull request #5591 from crookedneighbor/analytics-service-server-side
...
Analytics service - server side
2015-07-24 15:28:24 -05:00
Blade Barringer
fca6f91f13
Merge branch 'develop' into analytics-service-server-side
2015-07-24 15:19:31 -05:00
Sabe Jones
dc26e1680c
Merge pull request #5661 from HabitRPG/sabrecat/mystery
...
July 2015 subscriber goodies
2015-07-24 12:29:07 -07:00
Blade Barringer
4ea5e0c71a
Update newGroup spec helper
2015-07-24 14:03:44 -05:00
Blade Barringer
f6bc929ddd
Refacor how spec factory overrides works
2015-07-24 11:38:52 -05:00
TheHollidayInn
966e90da4e
Added height and width so Vimium can find the checkboxes
2015-07-23 21:20:18 -05:00
Sabe Jones
65c2f5c9d5
fix(death): Gentler wording
2015-07-23 17:08:00 -05:00
Sabe Jones
c8982b3513
fix(analytics): Track intro tour steps 1-2
2015-07-23 15:07:37 -05:00
Sabe Jones
d32d05e873
feat(mystery): July 2015 goodies
...
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
Blade Barringer
bfd56b35e1
Revert armoire counting code back to old system
...
@TODO: work out why it's hpapening and unpend test for new system
2015-07-23 08:43:08 -05:00
Alys
c3e2b92546
add all the files I forgot to add for 02cccb01ef (blank placeholder image for collection quests, partial fix for #4936 )
2015-07-23 13:58:38 +10:00
Blade Barringer
36a082f4ef
chore(i18n): update locales
2015-07-22 21:51:17 -05:00
Blade Barringer
d8434a5512
chore(i18n): update locales
2015-07-22 21:24:10 -05:00
Blade Barringer
8a363efc43
Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel
2015-07-22 17:59:50 -05:00
Blade Barringer
f876988cb9
Merge pull request #5642 from crookedneighbor/refactor_member_modal_and_stats_page
...
Refactor member modal and stats page
2015-07-22 17:46:57 -05:00
Blade Barringer
c41271e558
Merge branch 'develop' into refactor_member_modal_and_stats_page
2015-07-22 17:39:39 -05:00
Blade Barringer
7b9102c88c
Move gear counting to counting script
2015-07-22 17:37:35 -05:00
Blade Barringer
f40cfd2b66
Move all pet counting to shared count scripts
2015-07-22 17:32:12 -05:00
Sabe Jones
0f1c92184c
chore(news): iOS update Bailey
2015-07-22 15:42:35 -05:00
TheHollidayInn
c61eccaaba
Removed if statements and fixed style issues
2015-07-22 15:38:17 -05:00
Sabe Jones
7d622792a8
Merge pull request #5635 from HabitRPG/sabrecat/quests-page
...
Improve quest drop notification
2015-07-22 10:28:16 -07:00
Sabe Jones
6d52f842ff
fix(quest): Move party jump to cb
2015-07-22 11:52:15 -05:00
Blade Barringer
de30d6bf0c
chore(i18n): update locales
2015-07-22 07:41:49 -05:00
Alys
02cccb01ef
add blank placeholder image for collection quests that don't have quest box artwork - partial fix for https://github.com/HabitRPG/habitrpg/issues/4936
2015-07-22 20:48:06 +10:00
TheHollidayInn
107e27a2c6
Deselect food, egg, and potion when hitting the escape key
2015-07-21 21:52:29 -05:00
Blade Barringer
063e53b0ea
Added function to count pets that are actually owned
2015-07-21 20:14:15 -05:00
Blade Barringer
20660f50c0
Add count function for remaining items in gear set
2015-07-21 18:06:07 -05:00
Sabe Jones
0313170921
feat(quests): Invite party button
2015-07-21 15:25:34 -05:00
Sabe Jones
5789f22320
WIP(death): Draft with decal
2015-07-21 14:39:08 -05:00
Sabe Jones
0039a17366
WIP(death): More display tweaks
2015-07-21 13:57:13 -05:00
Blade Barringer
73e1764413
Move beast/mount master counts to separate file
2015-07-21 08:13:50 -05:00
Sabe Jones
c286d08bc8
WIP(death): New death modal
2015-07-20 16:24:05 -05:00
Sabe Jones
632faafa4f
fix(quests): Refactoring
...
Based on feedback from @crookedneighbor and @gisikw. Removes double ternary in the block that normalizes the item type string, and reverts the notification logic to if/else if format instead of switch/case. Also removes a block of commented-out code once used for death notifications.
2015-07-20 14:17:35 -05:00
Blade Barringer
65c14b1e3f
Refactor inventory ctrl variables
2015-07-20 12:51:10 -05:00
Blade Barringer
3d40da4004
Remove countPets and countMounts from codebase
2015-07-20 08:11:00 -05:00
Blade Barringer
610f7faa5c
Add test for count beast/mount master progress
2015-07-20 08:04:03 -05:00
Blade Barringer
2695419182
Use better beastMaster / mountMaster counts
2015-07-19 21:51:30 -05:00
Blade Barringer
3643d11d97
Refactor pet and mount count into one method
2015-07-19 20:56:14 -05:00
Blade Barringer
aee37b2a0e
Swap out pet and mount count with stat calc functions
2015-07-19 20:40:15 -05:00
Blade Barringer
89bfc83b95
Organize stat functions alphabetically
2015-07-19 20:19:16 -05:00
Blade Barringer
11f56d491c
Remove close button from menu
...
Closes #3820
2015-07-19 19:08:48 -05:00
Blade Barringer
1fb068d06d
Update test for new quest name
2015-07-19 10:17:03 -05:00
Blade Barringer
054d884154
Merge branch 'develop' into analytics-service-server-side
2015-07-19 10:13:34 -05:00
Blade Barringer
16c6647b34
Bump version number to resolve error message
2015-07-19 10:09:00 -05:00
Blade Barringer
0ce1183652
Automatically sends item name when item is purchased
2015-07-19 10:06:50 -05:00
Blade Barringer
a950339f01
Clarify cron
2015-07-19 08:41:45 -05:00
Blade Barringer
b49995c676
Allow optional value to be passed in
2015-07-19 08:33:44 -05:00
Blade Barringer
deac9619bc
Refactor to use object method of sending google data
2015-07-19 08:27:16 -05:00
Blade Barringer
a139ca8ba5
Merge branch 'develop' into refactor_member_modal_and_stats_page
2015-07-18 17:10:04 -05:00
Blade Barringer
dc2fab14d0
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
2015-07-18 17:06:26 -05:00
Blade Barringer
4f5626b73b
Merge branch 'hairlessbear-fix-ian-popover' into develop
2015-07-18 17:00:32 -05:00
Blade Barringer
4e6c2e7335
Add missing classes
2015-07-18 16:59:54 -05:00
Blade Barringer
4cff85784d
Move stats to separate partials
2015-07-18 16:00:09 -05:00
Blade Barringer
9994b27f1e
Fix member modal on static/front
2015-07-18 16:00:09 -05:00
Blade Barringer
d44dbef859
Move member modal controller to own file
2015-07-18 16:00:08 -05:00
Blade Barringer
b716d882b6
Began refactor of stats page
2015-07-18 16:00:08 -05:00
Blade Barringer
c784b97586
Create private method for how stats should be displayed
2015-07-18 16:00:08 -05:00
Blade Barringer
53fb0ec8b0
Add display experience function
2015-07-18 16:00:07 -05:00
Blade Barringer
f1453d30c4
Add gold display function
2015-07-18 16:00:07 -05:00
Blade Barringer
2eb62de056
Add mpdisplay function
2015-07-18 16:00:07 -05:00
Blade Barringer
17ef7e2885
Add hpDisplay function
2015-07-18 16:00:06 -05:00
Blade Barringer
f9304bd28f
Move stat calc scripts to angular service
2015-07-18 16:00:06 -05:00
Blade Barringer
3926a6e95a
Remove unnecssary semicolons
2015-07-18 16:00:06 -05:00
Blade Barringer
94d476f837
Correct method name
2015-07-18 16:00:06 -05:00
Blade Barringer
ff42505d1b
Add string
2015-07-18 16:00:05 -05:00
Blade Barringer
2b4e48fbe6
Add stat calc to common
2015-07-18 16:00:05 -05:00
Blade Barringer
20148be288
Watch js files in common folder
2015-07-18 16:00:05 -05:00
Blade Barringer
163b0545e8
Adjustments for error handling
2015-07-18 16:00:04 -05:00
Blade Barringer
6d5b57d139
Add class bonus calc function
2015-07-18 16:00:04 -05:00
Blade Barringer
e5428f29c1
Add calculation for equipment stat bonus
2015-07-18 16:00:04 -05:00
Blade Barringer
841923e054
Add level bonus calculation script
2015-07-18 16:00:03 -05:00
Blade Barringer
a9757c9dbb
Refactor member service; Remove logic in functions that were never used
2015-07-18 16:00:03 -05:00
hairlessbear
6525cd6f8c
Revert "First shot at modifying stats.jade attribute table to use ng-repeat"
...
This reverts commit 0d6bc403d0 .
2015-07-18 16:00:03 -05:00
hairlessbear
d8f74e5d9f
First shot at modifying stats.jade attribute table to use ng-repeat
2015-07-18 16:00:03 -05:00
hairlessbear
dbf406c921
Fixes #5623 and fixes #5135 (correctly displays equipment stats in member modals)
2015-07-18 16:00:02 -05:00
carolstone
3fa3b491dc
Modified common/script/index.coffee to display dayStart, but send back a
...
variable of dayStart for processing, instead of having the object directly
updated at the time of edit.
Modified website/views/options/settings.jade to allow a timestamp to be
cast to an iso timestamp because lastCron is saved as an iso timestamp,
and as a straight moment()-based timestamp in order to compare timestamps.
Modified website/public/js/controllers/settingsCtrl.js to do the
following:
Accept the new proposed dayStart
Calculate the timestamp of the old dayStart and the new dayStart
These two steps were necessary because dayStart is an integer between
and including 0 and 23. I tested and confirmed the current production
dayStart does not allow 24 to be entered but does allow 0. I was
careful to NOT change how that worked.
Cast the old dayStart, the new dayStart and lastCron to the moment()
version of time so they could be compared.
Cast the new dayStart to the iso timestamp for storage in lastCron
The important change is the following:
if oldDayStart < lastCron AND lastCron < newDayStart then lastCron
should be set to newDayStart. I modified this to include if oldDayStart
= lastCron, although I think that's pretty unlikely to be possible.
When I tested this, my lastCron was a mere 17 seconds after my
oldDayStart, so it seemed to me that the equal case should be included
with the less than case.
2015-07-17 21:17:07 -04:00
Matteo Pagliazzi
3fa8ab80b5
chore(i18n): update locales
2015-07-17 15:31:12 +02:00
Matteo Pagliazzi
86eaff7cb0
fix(i18n): string for amazon payments
2015-07-17 15:28:55 +02:00
hairlessbear
c61c572887
'.row.col-md-12' changed to '.row: .col-md-12'
2015-07-16 21:10:48 -04:00
hairlessbear
eae7f79363
Fixed time traveler items repositioning strangely on window resize
2015-07-16 20:37:14 -04:00
hairlessbear
e2073f75b8
Refactored inventory file NPCs to use Bootstrap v3 grid and CSS instead of tables
2015-07-16 20:19:32 -04:00
hairlessbear
6657be51d7
Merge pull request #11 from crookedneighbor/death_to_tables
...
Change Ian on quests page to not use tables
2015-07-16 19:09:54 -04:00
Sabe Jones
3f8a4a0957
fix(quests): Remove controller instantiation
2015-07-16 16:35:21 -05:00
Sabe Jones
ffc441ab82
feat(quests): Improve drop notif
2015-07-16 16:22:49 -05:00
Sabe Jones
2407c9eeb8
feat(quests): Improve buy confirm dialog
2015-07-16 12:56:26 -05:00
Blade Barringer
668a8bb6f6
chore(i18n): update locales
2015-07-16 12:04:10 -05:00
Sabe Jones
73a1c7c596
fix(style): Remove extra class
2015-07-16 11:29:04 -05:00
Sabe Jones
e25819f6de
feat(party): Conclude invite experiment
2015-07-16 11:22:19 -05:00
Matteo Pagliazzi
695c793f6e
Merge pull request #5632 from HabitRPG/paglias/amazon-payments
...
Amazon Payments: implement one time purchases
2015-07-16 13:24:42 +02:00
GihHubSphinx
e48703602a
Make colon is stats hideable
2015-07-16 12:00:56 +05:00
GihHubSphinx
aa0aec8d4b
Revert "New string in stats if gear has no benefits (take 2)"
...
This reverts commit fdbd18a8ed .
2015-07-16 10:54:17 +05:00
Alys
239f7c9c95
change message on Armoire when it is empty to say that new gear arrives in the first week of the month
2015-07-16 12:56:28 +10:00
Sabe Jones
c15f2b1f80
Merge branch 'sabrecat/quests-page' into develop
2015-07-15 14:12:05 -05:00
Sabe Jones
4a54363966
fix(quests): Show info modal for Gold quests
2015-07-15 14:02:49 -05:00
Matteo Pagliazzi
e0bfd60eb1
amazon payments: switch to green button
2015-07-15 20:07:17 +02:00
Matteo Pagliazzi
ecc98411c7
refactor amazon payments and add one time purchases once again
2015-07-15 20:07:17 +02:00
Matteo Pagliazzi
bade139b4b
wip amazon payments donation
2015-07-15 20:07:17 +02:00
Matteo Pagliazzi
de32461787
feat(amazon-payments): WIP add donations
2015-07-15 20:07:17 +02:00
Blade Barringer
6c6c9b3464
Change Ian on quests page to not use tables
2015-07-15 08:19:39 -05:00
Blade Barringer
8a97b597f5
Resize sea foam image
...
Fixes #5609
2015-07-15 07:53:12 -05:00
Blade Barringer
3e1f1f191d
Merge pull request #5619 from gisikw/habitica-console
...
Add a 'gulp console' method which preloads Mongo, models
2015-07-15 06:58:04 -05:00
Matteo Pagliazzi
38ac664284
chore(i18n): update locales
2015-07-15 13:17:57 +02:00
hairlessbear
a9b3e6bf49
Refactored active time travlers code to move popover closer to NPCs
2015-07-15 01:14:21 -04:00
hairlessbear
4f65bab7bf
Refactored inventory files with NPCs to cause popovers to be close to NPC
2015-07-15 01:00:08 -04:00
Alys
d8e7108098
moved twoHanded:true out of bracketed region in rancherLasso - it was causing "Error processing the string"
2015-07-15 14:56:57 +10:00
hairlessbear
b591428717
Changed number of columns for ian and popover
2015-07-15 00:13:06 -04:00
Alys
9ccab259b0
add message to Inventory/Market (drops) page to explain where quests have gone
2015-07-15 13:29:03 +10:00
Kevin Gisi
9645f08769
Add a 'gulp console' method which preloads Mongo, models, and sets up utility methods
2015-07-14 23:22:02 -04:00
Blade Barringer
0bc5db4885
Merge branch 'aedotj-patch-1' into develop
2015-07-14 21:10:05 -05:00
Blade Barringer
3437975ba3
Change order of quests
2015-07-14 19:44:55 -05:00
Blade Barringer
e5a740a74f
Adjust spacing
2015-07-14 19:32:45 -05:00
Sabe Jones
32a74471db
Merge branch 'sabrecat/quests-page' into develop
2015-07-14 18:56:32 -05:00
Blade Barringer
435d33724b
Set test to listen on rootScope.openModal
2015-07-14 18:32:50 -05:00
Blade Barringer
1adb3c479b
Merge branch 'blurbs' into develop
2015-07-14 18:21:37 -05:00
Sabe Jones
08e9f4f769
fix(test): Quest buy typo
2015-07-14 17:42:15 -05:00
Sabe Jones
6cad2df6a3
test(quests): Add user.ops.buyQuest test
...
Also adds the Bailey announcement for the day and implements "locked" quest scrolls for the beginning quests in extant quest chains.
2015-07-14 17:34:01 -05:00
Matteo Pagliazzi
8f9fa7942a
fix(settings): use correct value for inactivity emails
2015-07-15 00:13:17 +02:00
Greg G.
1fe900db25
pets.jade: IE better support
...
It is currently impossible to see how fed a pet is in IE. The width of the .progress-bar-success is "{{user.items.pets["Wolf-Base"]/.5}}%".
Now, it works.
2015-07-14 22:58:24 +02:00
Sabe Jones
5e0d754553
fix(test): Inject Content
2015-07-14 14:55:13 -05:00
Sabe Jones
79b3597693
fix(tests): Buy specific quest keys
2015-07-14 14:27:25 -05:00
Sabe Jones
af5b7d4d24
fix(test): Partial tests fix
2015-07-14 14:24:11 -05:00
Sabe Jones
eb3a72995c
test(quests): Buy quest tests
2015-07-14 12:43:02 -05:00
Sabe Jones
0955d63998
test(quests): Fix tests
2015-07-14 11:46:13 -05:00
Blade Barringer
7ad2839f05
Adjust look of page blurbs
2015-07-14 08:18:02 -05:00
Blade Barringer
cdc54038ba
Remove bad file encoding
2015-07-14 07:56:53 -05:00
unknown
7e60864d41
Fixing color on blurbs
2015-07-14 07:46:57 -05:00
unknown
1789bf3c6a
Making suggests changes to issue 5513
2015-07-14 07:44:51 -05:00
unknown
a25296a855
adding more links to heroes blurb and links not included in json
2015-07-14 07:44:51 -05:00
unknown
65b7465081
adding blurbs to pages
2015-07-14 07:44:51 -05:00
Matteo Pagliazzi
6cf0840c71
chore(i18n): update locales
2015-07-14 13:55:03 +02:00
Blade Barringer
a01b2756f2
Merge pull request #5605 from hairlessbear/join-party-quest-invite-fix
...
Invite a new party member to a quest if the quest is still in the invitation stage (fixes #5598 )
2015-07-13 22:37:46 -05:00
Sabe Jones
266b6b87e2
test(quests): Quests Service spec WIP
...
First test on new Quests Service. Also fix Armoire tests to account for new items.
2015-07-13 19:16:29 -05:00
Sabe Jones
b9f795529b
feat(quests): Dilatory Distress
...
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
2015-07-13 18:21:32 -05:00
Alys
cb9f5bcff3
Merge pull request #5523 from hairlessbear/update_isOnQuest_logic
...
Removed user.party.quest.key checks from isOnQuest and added check for user ID in quest members
2015-07-14 08:11:35 +10:00
Sabe Jones
209989d7aa
Merge pull request #5601 from crookedneighbor/quests-fix-merge-coflicts
...
fix merge conflicts for quests refactor
2015-07-13 12:18:27 -07:00
hairlessbear
7223eeb681
Invites a new party member to a quest if the quest is still in the invitation stage ( fixes #5598 )
2015-07-13 13:01:35 -04:00
Blade Barringer
60e92805dd
Remove unneeded comment
2015-07-13 08:36:01 -05:00
Blade Barringer
87f5449267
Merge branch 'develop' into quests-fix-merge-coflicts
2015-07-13 08:20:52 -05:00
Blade Barringer
148e418c8a
Change file names to use hyphen syntax
2015-07-13 08:19:15 -05:00
Blade Barringer
b01e4489ef
Compile sprites
2015-07-12 22:30:46 -05:00
Blade Barringer
6f4b76edc5
Rename rancher armor to rancher robes
2015-07-12 22:25:05 -05:00
Blade Barringer
dad6a9527b
Added shop versions of armoire stuff
2015-07-12 22:21:39 -05:00
Blade Barringer
9ebf5dee2c
Renamed crown sprite
2015-07-12 22:18:08 -05:00
Blade Barringer
cb992e1083
Added category to whale quest
2015-07-12 21:16:49 -05:00
Matteo Pagliazzi
fefc8ee732
Merge pull request #5600 from gisikw/remove-apdex-check
...
Remove apdex check from middleware until NR is back
2015-07-12 23:50:35 +02:00
Matteo Pagliazzi
4b170cd4dc
chore(i18n): update locales
2015-07-12 23:45:26 +02:00
Blade Barringer
fe5bbfadde
Remove credit
2015-07-12 14:35:08 -05:00
Blade Barringer
4e9c252367
Removed extraneous jade file
2015-07-12 14:27:53 -05:00
Blade Barringer
0b53da0798
Double-check seasonal shop jades
2015-07-12 14:24:18 -05:00
Blade Barringer
316c3e9c2e
Sort out conflicts from develop
2015-07-12 13:51:42 -05:00
Kevin Gisi
c82e5a885d
Put memory check back in
2015-07-12 13:51:22 -04:00
Kevin Gisi
be420a67a0
Remove apdex check from middleware until NR is back
2015-07-12 13:39:16 -04:00
Blade Barringer
add35bc17c
Correct names of sprites
2015-07-12 12:21:12 -05:00
Blade Barringer
74de248109
Adjust how quest drops are sent
2015-07-12 10:05:00 -05:00
Blade Barringer
284fa03223
Add platform, change itemName to itemKey
2015-07-12 10:03:41 -05:00
Blade Barringer
6ac049cc71
Allow animal ears to be added to costume or equipped gear
2015-07-12 09:23:03 -05:00
Blade Barringer
a767cf9a21
Add server_side tests to gulp
2015-07-12 08:50:25 -05:00
Blade Barringer
d09b24e1a5
Add sprites to website
2015-07-12 08:24:03 -05:00
Alys
92bfc66c67
fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear
2015-07-12 18:18:31 +10:00
TheHollidayInn
fe6a42b2b7
Escaped second parameter in sparameter in score function
2015-07-11 21:25:00 -05:00
Alys
18db504d2a
allow Trivial priority (difficulty) to cause a tiny amount of damage from a boss
2015-07-12 11:05:01 +10:00
Blade Barringer
87dddb178f
Merge branch 'duckspeaker-issue-5570-hall-of-heroes-table-resize' into develop
2015-07-11 16:53:09 -05:00
Blade Barringer
18ebbdac67
Remove extra class
2015-07-11 16:52:55 -05:00
Blade Barringer
c9ac32231d
Remove inventory again
2015-07-11 16:37:26 -05:00
Blade Barringer
4a9ea83d6b
Added whale quest back in, refactor
2015-07-11 16:35:16 -05:00
Blade Barringer
4acc0c03a8
Add in changes to equipment and seasonalshop
2015-07-11 16:16:29 -05:00
Blade Barringer
b71f68ef32
Merge branch 'develop' into equipment-refactor-merge-into-develop
2015-07-11 15:55:53 -05:00
Blade Barringer
74dee2727e
Remove out of date todo
2015-07-11 15:54:09 -05:00
Blade Barringer
dccc10aa4d
Refactor
2015-07-11 15:05:58 -05:00
Blade Barringer
ba13f2d9aa
Add locale strings
2015-07-11 15:05:32 -05:00
Blade Barringer
eeae12b002
Refactore inventory pages
2015-07-11 13:50:30 -05:00
Blade Barringer
066206f41c
Refactored inventory into separate files
2015-07-11 13:13:00 -05:00
Blade Barringer
c33a22ceb3
Put locale key creation into private function
2015-07-11 12:07:20 -05:00
Blade Barringer
94cd0bb852
Use user variable
2015-07-11 11:18:19 -05:00
Blade Barringer
d2e61bf5ef
Change string to str
2015-07-11 11:15:04 -05:00
Blade Barringer
cb4b2e43bf
Change variable name to itemList
2015-07-11 11:14:50 -05:00
Alys
ef496525a1
change white "Report" button to red "Report Violation" button in chat message flag modal
2015-07-11 21:23:39 +10:00
Joe Gallo
aabc50e992
surround tables in table-responsive class
2015-07-11 01:19:47 -04:00
Blade Barringer
22f92e5388
Merge pull request #2 from SabreCat/crookedneighbor/analytics-service-server-side
...
feat(analytics): Server tweaks
2015-07-11 00:19:41 -05:00
Blade Barringer
305414e152
Merge pull request #5553 from Lokeh/Lokeh/maxHealth
...
maxHealth refactor
2015-07-11 00:18:15 -05:00
Arbixal
48b520509c
fixes https://github.com/HabitRPG/habitrpg/issues/5555
2015-07-11 00:15:55 -05:00
Blade Barringer
c941511d11
Merge branch 'barbourkd-develop' into develop
2015-07-11 00:11:23 -05:00
Blade Barringer
50a924e470
Add space
2015-07-11 00:11:02 -05:00
Blade Barringer
09d85f39fc
Merge pull request #5586 from GitHubSphinx/Sphinx-entry2
...
Introducing a class for buttons allowing wrapping
2015-07-11 00:07:26 -05:00
Blade Barringer
ddf2489664
Merge pull request #5581 from barbourkd/bugfix/5552
...
Show Extra Notes icon regardless of task ownership.
2015-07-11 00:05:04 -05:00
Blade Barringer
2722651cc8
Merge branch 'GitHubSphinx-Sphinx-entry3' into develop
2015-07-10 23:47:42 -05:00
Blade Barringer
3644d43f0a
Remove unnecessary duplication
2015-07-10 23:47:23 -05:00
Blade Barringer
ab1870c1aa
Merge branch 'TheHollidayInn-groups-remove-message-when-kick' into develop
2015-07-10 23:24:20 -05:00
Blade Barringer
cdcc085530
Adjust test
2015-07-10 23:21:23 -05:00
TheHollidayInn
acb82f99ce
Remove user's group msg notification when they are kicked from the group
2015-07-10 22:39:17 -05:00
Sabe Jones
3bbde2a548
fix(analytics): Include GA label for quest actions
2015-07-10 13:57:46 -05:00
Sabe Jones
175b4fa6e0
fix(analytics): Correct quest key
2015-07-10 13:51:27 -05:00
Sabe Jones
5e89ae200d
feat(analytics): Server tweaks
...
Remove duplicate browser-side tracking for new user registration. Move quest tracking to server side and expand to include all quest accept/reject actions.
2015-07-10 13:47:03 -05:00
GihHubSphinx
cc00bd17b3
Don't show unneeded spaces between buttons in chat
...
Don't show spaces in front of a button in a chat message if button
itself is not shown
2015-07-10 20:47:24 +05:00
Joe Gallo
9367ff80b6
Use bootstrap table-responsive class instead of inline css.
2015-07-10 11:23:33 -04:00
Blade Barringer
8d1231a1ee
Remove erroneous var
2015-07-10 09:14:22 -05:00
Matteo Pagliazzi
5e8baf6c92
chore(i18n): update locales
2015-07-10 15:45:58 +02:00
Blade Barringer
acb0793baf
Correct indentation
2015-07-10 07:49:22 -05:00
Blade Barringer
2f1d3400bc
Added additional analytics info
2015-07-10 07:47:52 -05:00
Blade Barringer
d9f8e54d1a
Remove gogle analytics from export
2015-07-10 07:41:07 -05:00
Blade Barringer
2e6725997d
Swap out ga for analytis service in auth controller
2015-07-10 07:40:01 -05:00
Blade Barringer
ac02ad3aa2
Update amplitude version
2015-07-10 07:35:45 -05:00
Joe Gallo
b708095472
make sure hall of heroes table contents fit as table is resized
2015-07-10 00:23:07 -04:00
Blade Barringer
52620bb69d
Impliment analytics in user actions; remove mixpanel
2015-07-09 22:18:37 -05:00
Blade Barringer
a6d162bfc0
Update how info is sent to google
2015-07-09 22:17:27 -05:00
Blade Barringer
d6444f922b
Remove double instantiation
2015-07-09 22:16:50 -05:00
GihHubSphinx
00f7af7807
Introducing a class for buttons allowing wrapping
...
New .btn-wrap class for buttons with long text allowing wrapping
2015-07-10 02:33:09 +05:00
Sabe Jones
44bcb1c233
Merge pull request #5584 from HabitRPG/sabrecat/derby-day
...
Derby Day
2015-07-09 12:32:40 -07:00
Sabe Jones
d5f97b2781
chore(news): Derby Day Bailey
2015-07-09 14:24:22 -05:00
Sabe Jones
353dcff908
fix(Market): Sell whale eggs
2015-07-09 13:27:16 -05:00
Sabe Jones
6cc0a08dc2
feat(event): Derby Day pet quest
2015-07-09 12:57:43 -05:00
Blade Barringer
7bc74f2c11
Track unsubscription
2015-07-08 21:47:57 -05:00
Kevin Barbour
5a57895077
Show Extra Notes icon regardless of task ownership.
...
fixes #5552
2015-07-08 20:48:42 -04:00
Kevin Barbour
d6aef8ee24
Prevent "Resting in the Inn" message when viewing challenges.
...
fixes #5559
2015-07-08 20:22:23 -04:00
Sabe Jones
c0d35dc472
WIP(quests): Quests page cont'd
...
Test fixes and addition of function for buying Quests with Gold
2015-07-08 17:43:08 -05:00
Sabe Jones
78d4989544
WIP(event): Summer Splash cont'd
...
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
2015-07-08 16:13:23 -05:00
Sabe Jones
46543f9072
feat(event): Derby Day mount
2015-07-08 16:07:37 -05:00
TheHollidayInn
6e7d94a317
Added keyboard selection for rewards and habits
2015-07-08 08:36:00 -05:00
Blade Barringer
c92cf58acb
Track purchases with analytics service
2015-07-08 08:11:27 -05:00
Blade Barringer
f58dbb2a68
Send only analytics for use in cron
2015-07-08 08:10:48 -05:00
Blade Barringer
1c2ec66c93
Add format user data function to analytics server
2015-07-08 08:09:43 -05:00
Blade Barringer
73b2d816d1
Track cron with analytics service
2015-07-08 08:08:45 -05:00
Blade Barringer
c4c4f4a3a5
Add analytics to utils
2015-07-08 07:47:52 -05:00
Blade Barringer
7dc64f8448
Update iOS link to point to new app in footer
2015-07-07 21:30:08 -05:00
Blade Barringer
d2b74f11dd
Create analytics.track
2015-07-07 18:00:41 -05:00
Sabe Jones
3dd2493fed
chore(news): iOS release Bailey
2015-07-07 13:27:19 -05:00
TheHollidayInn
0089a260c7
Added opacity to hide input field. Added enter to submit input fields. Added background color change when user focuses task with keyboard
2015-07-06 23:22:35 -05:00
Matteo Pagliazzi
fa8e2785bd
chore(i18n): update locales
2015-07-06 22:11:26 +02:00
Blade Barringer
e6ee4d303c
Set up purchase tracking
2015-07-06 08:11:31 -05:00
Matteo Pagliazzi
3a2422086f
fix(french): use env.t client side
2015-07-06 13:39:18 +02:00
Blade Barringer
fb5ad3830c
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-07-05 22:06:04 -05:00
Blade Barringer
6553c9b346
Merge branch 'duckspeaker-issue-5563-pin-or-replace-unregistered-packages' into develop
2015-07-05 22:04:07 -05:00
Blade Barringer
ed5afb85a5
Alphabetize dependencies in bower.json
2015-07-05 22:01:16 -05:00
Blade Barringer
1ae505eabd
Adjust tags for bower; Set github link to main habitrpg org
2015-07-05 21:58:48 -05:00
Blade Barringer
fca4ef8d3f
Remove changelog; pin to lefnire's version of icalendar
2015-07-05 21:57:39 -05:00
Matteo Pagliazzi
1618534785
chore(i18n): update locales
2015-07-05 20:51:08 +02:00
Alys
d7084ce0c8
remove unnecessary default for dailyTask.startDate (website/src/models/task.js gives default); give user's timezone to their task startDate values (possible solution for https://github.com/HabitRPG/habitrpg/issues/5395 https://github.com/HabitRPG/habitrpg/issues/5510 https://github.com/HabitRPG/habitrpg/issues/5549 )
2015-07-05 19:22:10 +10:00
Matteo Pagliazzi
2fb25207bb
fix(amazon-payments): use lastBillingDate
2015-07-05 11:17:40 +02:00
TheHollidayInn
2946dd5c4a
Restyled task when focused with keyboard.
2015-07-04 19:51:51 -05:00
Joe Gallo
bd39d378fd
update or pin unregistered bower packages
2015-07-04 20:08:21 -04:00
Joe Gallo
4c70cfd8d2
simplify github repo urls in bower packages file
2015-07-04 19:20:24 -04:00
Joe Gallo
b8df812621
all possible unregistered packages in package.json replaced/upgraded
...
(upgrading swagger-node-express breaks api tests)
2015-07-04 19:17:23 -04:00
Will
a21f2427e9
jade syntax errors
2015-07-03 22:22:29 -07:00
Will
b3a780b720
more places in header.jade needing maxHealth fix
2015-07-03 22:22:28 -07:00
Will
9bcb3b5cbe
update model maxHealth
2015-07-03 22:22:28 -07:00
Will
5f6ddd76a7
update view: stats box in header
2015-07-03 22:22:28 -07:00
Will
03eec12fdd
update view: stats table
2015-07-03 22:22:28 -07:00
Will
512d248255
update getUser to use shared.maxHealth
2015-07-03 22:22:28 -07:00
Will
4027c99959
maxHealth added to shared scripts
2015-07-03 22:22:28 -07:00
Blade Barringer
12d5515879
Change motivate message
2015-07-03 19:13:31 -05:00
Sabe Jones
dc5b7f31d8
fix(build): Pin working zocial CSS commit
2015-07-03 18:19:39 -05:00
Sabe Jones
6845e8caf3
fix(experiment): Style fixes
...
Corrects the display of Google Experiment variants in the absence of an API callback, and widens the avatar stat bar for users who don't have a party.
2015-07-03 13:46:22 -05:00
Blade Barringer
e924157fdf
Merge pull request #5508 from Alys/trivial-difficulty
...
add Trivial difficulty/priority setting to task Advanced Options
2015-07-03 10:08:46 -05:00
Matteo Pagliazzi
fb912313b9
fix(amazon-payments): handle declined payments
2015-07-03 16:54:57 +02:00
Matteo Pagliazzi
313ac91020
improve(amazon-payments): do not redirect after cancellation with ?noRedirect=true
2015-07-03 14:56:19 +02:00
Matteo Pagliazzi
f6480faf22
chore(i18n): update locales
2015-07-03 10:49:35 +02:00
Blade Barringer
95c29c5c97
Remove one-time bindings
2015-07-02 20:26:31 -05:00
Blade Barringer
33f2ef7cef
Simplify start party button
2015-07-02 19:36:58 -05:00
Sabe Jones
fb81c79b78
feat(analytics): Invite Friends experiment
...
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -05:00
Blade Barringer
4d7a3afc93
Merge branch 'LionC-develop' into develop
2015-07-02 07:58:59 -05:00
Blade Barringer
4bcff71859
Adjust login modal
...
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
Blade Barringer
f2cd6f921c
Merge pull request #5543 from hairlessbear/pointer_on_notes_icon
...
Changed task notes icon from 'span' to 'a' element to cause cursor to show icon as clickable
2015-07-02 07:40:12 -05:00
Blade Barringer
fe7642e33a
Add find the cub art
...
Closes #5545
2015-07-01 20:19:46 -05:00
Blade Barringer
ba85487b29
Correct naming of backgrounds
2015-07-01 19:50:49 -05:00
Blade Barringer
e6f0acba4c
Add initial server side analytics service
2015-07-01 18:36:43 -05:00
Blade Barringer
0ac76cfe34
Remove mixpanel mock
2015-07-01 18:32:11 -05:00
hairlessbear
ebbc6666a6
Modified broken challenge icon to cause cursor to show item as clickable
2015-07-01 18:00:49 -04:00
hairlessbear
6e5f741e4a
Changed task notes from 'span' to 'a' element to cause cursor to show item as clickable
2015-07-01 17:53:45 -04:00
Kevin Gisi
74d51e530f
Merge pull request #5541 from alexbragdon/gulp_fail_fix
...
Gulp Tests now report summaries even when some tests fail.
2015-07-01 15:44:49 -04:00
Sabe Jones
d248b74569
fix(event): Splash visual tweaks
2015-07-01 14:21:37 -05:00
Alexander Bragdon
d6a7bc36c7
Changes hard tabs to double space soft tabs in the error throwing failure block.
2015-07-01 15:20:47 -04:00
Alexander Bragdon
45ddc77eaa
Fixes a typo in test:api:safe, missed semicolon on line 97.
2015-07-01 14:45:27 -04:00
Alexander Bragdon
9b31cf462a
Creates safe versions of tests for Common, API, Karma, and E2E that don't pass errors via callback. The summary information will check if any tests failed and throw an error after all tests have been run.
2015-07-01 14:42:43 -04:00
Lion Cilu
5cb6f0f482
Small login form attribute improvements
...
Added "spellcheck='false'" to username inputs to make it less annoying to use on some devices where some usernames will be "corrected" by default.
Added "required" to user/email and password inputs on the login form.
2015-07-01 20:38:57 +02:00
Sabe Jones
d4b5620ada
Merge branch 'sabrecat/summer-splash' into develop
2015-07-01 13:13:23 -05:00
Sabe Jones
25dd82ffa0
feat(event): Summer Splash cont'd
...
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
Matteo Pagliazzi
0ea98880be
Merge pull request #5537 from HabitRPG/paglias/amazon-payments
...
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 19:11:48 +02:00
Matteo Pagliazzi
4e7afcbe94
feat(amazon-payments): add a lastBillingDate attribute
2015-07-01 18:59:51 +02:00
Alexander Bragdon
75c25dc7a9
Rollback of /social/index.jade to reverse previous commits changes and return branch to upstream parity.
2015-07-01 10:13:10 -04:00
Alexander Bragdon
cbb0988679
Adds a space to social/index.jade to test development platform and git tracking.
2015-07-01 09:59:48 -04:00
Blade Barringer
851868296f
Merge branch 'Alys-guild-list-links-2015-06-28' into develop
2015-06-30 22:40:35 -05:00
Blade Barringer
a3f5f626a6
Put h3 and a on one line
2015-06-30 22:39:48 -05:00
Alys
eeb9793eb8
Merge pull request #5526 from Alys/cron-fix-yet-again-2015-06-30
...
make api.shouldDo use the day being checked as the default date instead of today
2015-07-01 13:17:01 +10:00
Matteo Pagliazzi
ca36c5c632
Merge pull request #5531 from HabitRPG/paglias/amazon-payments
...
Amazon Payments Subscriptions
2015-07-01 01:40:27 +02:00
Matteo Pagliazzi
96ec70487f
fix(amazon-payments): remove unused config var
2015-07-01 01:39:52 +02:00
Sabe Jones
71d8fd2f0c
fix(analytics): Handle missing user object
2015-06-30 17:13:56 -05:00
TheHollidayInn
7719f46e49
Removed style preventing user from selecting tasks with keyboard
2015-06-30 16:54:04 -05:00
Sabe Jones
3d15da61ec
fix(analytics): Correct user ID handling
2015-06-30 16:52:18 -05:00
Sabe Jones
46a7591492
Merge branch 'release-june-30th-2015' into develop
2015-06-30 13:39:51 -05:00
Sabe Jones
f88c5fb8b5
chore(news): June 30 Bailey
2015-06-30 12:35:16 -05:00
Matteo Pagliazzi
65f4aac23c
feat(amazon-payments): working subscriptions, put donations and gifts on hold
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
8747cf4cce
fix(amazon-oayments): use production url
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
dbce6f7676
fix(amazon-payments): use right url in production
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
271245f1e6
feat(amazon-payments): finalize one time purchases
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
78cca423f0
feat(amazon-payments): completely refactor client side flow, support subscription widgets WIP
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
e38f8bf4ef
amazon payments: wip
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
a377501f64
feat(amazon-payments): wip on donations
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
6faef6f737
wip amazon payments
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
b0643e7177
WIP: start working on amazon payments
2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
cca3e8bfdf
chore(i18n): update locales
2015-06-30 17:59:11 +02:00
sablecliff
d44a0a1608
Shortened another line using new the object
2015-06-30 17:16:09 +10:00
Alys
2cd34b0f6e
make api.shouldDo use the day being checked as the default date instead of today - fixes https://github.com/HabitRPG/habitrpg/issues/5521
2015-06-30 14:28:00 +10:00
Blade Barringer
4304e56e70
Merge pull request #5511 from Alys/use-costume-explanation-2015-06-28
...
make costume option more noticeable and understandable
2015-06-29 19:25:44 -05:00
Blade Barringer
547523c8f7
Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015
2015-06-29 17:56:42 -05:00
hairlessbear
0094d3267d
Fixed equivalency check (added missing '=')
2015-06-29 18:28:08 -04:00
hairlessbear
bcfc17dd18
Added check for user id in active quest to 'isOnQuest'
2015-06-29 15:42:45 -04:00
hairlessbear
860e68ee15
Merge remote-tracking branch 'upstream/develop' into update_isOnQuest_logic
2015-06-29 14:57:54 -04:00
Blade Barringer
bc837fd4db
Moved menu stuff to own controller
2015-06-29 12:39:05 -05:00
hairlessbear
0b1cc5f0ea
Removed user.party.quest.key checks from isOnQuest. They are no longer accurate checks due to changes made in #5298
2015-06-29 13:12:29 -04:00
Matteo Pagliazzi
2f48534342
chore(i18n): update locales
2015-06-29 18:14:46 +02:00
Blade Barringer
567ed1f28b
Correct seenMessage use in menu
...
Closes #5519
2015-06-29 08:58:51 -05:00
Blade Barringer
522181890e
Added additional check for chatChanged
2015-06-29 08:13:03 -05:00
Alys
a946f2b5a5
rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section
2015-06-29 21:49:54 +10:00
Alys
03d1f12a7c
fix isOnQuest function to correctly check for quest being active - fixes https://github.com/HabitRPG/habitrpg/issues/5518
2015-06-29 19:42:22 +10:00
sablecliff
c8dd666939
Implemented changes as suggested by @crookedneighbour
...
Should be passing all tests now.
2015-06-29 18:11:12 +10:00
Alys
a4e9e5dbfc
replace Gokul Theme audio files with new versions https://github.com/HabitRPG/habitrpg/pull/5407#issuecomment-116251843
2015-06-29 13:16:14 +10:00
Blade Barringer
b72b14fe6c
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-28 21:07:32 -05:00
Alys
11396d4756
make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204
2015-06-28 19:40:39 +10:00
Alys
b5ca45a713
convert name of guild to link to guild in index list of public guilds
2015-06-28 15:35:37 +10:00
Alys
122920975d
add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines)
2015-06-28 14:41:02 +10:00
GihHubSphinx
fdbd18a8ed
New string in stats if gear has no benefits (take 2)
2015-06-28 09:23:49 +05:00
GihHubSphinx
44a120b577
Revert "New string if gear has no benefits"
...
This reverts commit c2f0f89f2b .
2015-06-28 09:18:39 +05:00
Blade Barringer
5f29e19aa7
Merge pull request #5452 from gisikw/isolate-directives
...
Encapsulate directive functions in anonymous functions
2015-06-27 22:33:29 -05:00
Blade Barringer
bcf141840d
Merge branch 'TheHollidayInn-tasks-search-checklists' into develop
2015-06-27 22:23:08 -05:00
Blade Barringer
4abd7f85f8
Adjustments to PR#5494
...
* Update filter name to be more accurate
* Add additional tests
* Simplify checklist checking logic
* Prevent errors from multiple matches in checklist
2015-06-27 22:21:50 -05:00
Blade Barringer
5c4732304a
Merge pull request #5504 from Alys/cid-2015-06-25
...
prevent challenge tasks being deleted when challenge ID has been lost
2015-06-27 17:07:10 -05:00
Blade Barringer
2dd7894a2c
Merge branch 'image-min' into develop
2015-06-27 16:41:24 -05:00
Alys
eceae75631
Merge pull request #5482 from Alys/startDate-fix-2015-06-25
...
Refactor api.shouldDo and fix https://github.com/HabitRPG/habitrpg/issues/5395
2015-06-28 07:31:04 +10:00
Blade Barringer
7aa2bb0db5
Chore(compile sprites)
2015-06-27 16:24:12 -05:00
Blade Barringer
3262c2d869
Refactored avatar
2015-06-27 16:08:38 -05:00
hairlessbear
9f70598d64
Fix comment typo
2015-06-27 12:40:53 -04:00
hairlessbear
76a0bf48f2
Fix typo
2015-06-27 12:33:04 -04:00
hairlessbear
94abf9ca8c
Merge branch 'crookedneighbor-fix_ng-class_for_hb' into refactor_avatar_view
2015-06-27 12:16:56 -04:00
hairlessbear
7616c6d224
Fixed ng-class syntax
2015-06-27 12:16:43 -04:00
hairlessbear
4ba82f80da
Added mixin to reduce code duplication
2015-06-27 12:12:01 -04:00
Blade Barringer
6d11de8769
Correct missing one
2015-06-27 10:07:14 -05:00
Blade Barringer
7d92b39790
Correct usage of ng-class
2015-06-27 09:57:59 -05:00
Alys
d7a203ccc2
set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code
2015-06-27 20:06:04 +10:00
Andy Martin
24f35d84e7
add imagemin task to grunt, to shrink file size after spritesmith
2015-06-27 00:13:03 -06:00
Alys
0fc14f129d
prevent challenge tasks being deleted when challenge ID (cid) has been lost - possible fix for https://github.com/HabitRPG/habitrpg/issues/4466
2015-06-27 14:19:40 +10:00
hairlessbear
01b3df17af
Changed all double-spans in avatar.jade to single spans used ternary operators
2015-06-26 17:15:04 -04:00
GihHubSphinx
c2f0f89f2b
New string if gear has no benefits
2015-06-26 21:49:48 +05:00
Matteo Pagliazzi
fd11b054eb
chore(i18n): update locales
2015-06-26 18:17:14 +02:00
GihHubSphinx
3501dbf027
Make gear attributes translatable in stats
2015-06-26 20:49:35 +05:00
sablecliff
96a3653620
Now includes the refactoring into different files.
...
Currently there a multiple ways to create the string being shown.
This will be changed upon the decision of which is prefered.
I personally prefer the first method, which uses a function inside the
object being created in content.coffee
2015-06-26 19:33:39 +10:00
Andy Martin
0fb911016a
shrink spritesmith images to reduce page load
2015-06-25 22:25:14 -06:00
TheHollidayInn
8ba621795a
Task filter now searches checklists
2015-06-25 22:33:08 -05:00
Blade Barringer
07541ea7e4
Merge branch 'TheHollidayInn-settings-unsubscribe-email-checkall-fix' into develop
2015-06-25 20:51:19 -05:00
Blade Barringer
08c7ca1833
Refactor email notifications
2015-06-25 20:49:38 -05:00
Kevin Gisi
f9ee0657f6
Merge pull request #5493 from gisikw/temporarily-disable-nr
...
Disable NR to check memory issues
2015-06-25 19:42:31 -04:00
Kevin Gisi
e93cb817be
Disable NR to check memory issues
2015-06-25 19:21:45 -04:00
Sabe Jones
335acd276c
fix(sprites): Reposition snorkely things
2015-06-25 15:08:26 -05:00
Sabe Jones
e6b6a5e468
Merge pull request #5487 from HabitRPG/sabrecat/summer-splash
...
Summer Splash / June Mystery
2015-06-25 11:27:06 -07:00
Sabe Jones
e9877b6684
Revert "Update node version"
...
This reverts commit 837c26415d .
2015-06-25 12:35:23 -05:00
Sabe Jones
775f903c3d
feat(events): Limited edition
...
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
Matteo Pagliazzi
7f0b826943
chore(i18n): update locales
2015-06-25 11:51:48 +02:00
sablecliff
459d5bfee3
Fixed small error with ternary statement and assignment of string
2015-06-25 19:45:34 +10:00
TheHollidayInn
81a05230e7
Uncheck all email notication options when we click unsubscribe all
2015-06-24 21:38:02 -05:00
Alys
51fb278438
stop changing the task's actual Start Date, move related task Start Date code tothe same place, adjust comments
2015-06-25 12:19:27 +10:00
Alys
9b8b7af7d5
replace api.numDaysApart (not used elsewhere and new to the EveryXDays code) with moment#diff
2015-06-25 12:19:26 +10:00
Alys
e7e82a2aed
keep startDate as a moment(), fix check for Start Date in future (ignore time, don't do incorrect CDS conversion), add comments
2015-06-25 12:19:26 +10:00
Alys
266055c0d4
rename 'day' variable to 'startOfDayWithCDSTime' (more verbose, sorry, but clearer)
2015-06-25 12:19:26 +10:00
Alys
99bc09fb25
move dayOfWeekNum to correct scope and improve comment
2015-06-25 12:19:26 +10:00
Alys
f6cdc57228
move dailyTask.repeat error handling to correct location; add dailyTask.everyX error handling (might not be needed)
2015-06-25 12:19:26 +10:00
Alys
bacd35b895
refactor shouldDo check for Daily's startDate being in the future
2015-06-25 12:19:26 +10:00
sablecliff
ebcfa849a2
implemented the object and checking function to retrieve objects from it.
...
At the moment it is only one instance in the rootCtrl.js file but once shown to work and in the proper setout the change will be propograted.
2015-06-25 11:46:19 +10:00
Blade Barringer
ac7c1a1436
Merge pull request #5474 from hairlessbear/show_selected_food
...
Added selectableInventory class to selected food on Pets page
2015-06-24 08:29:03 -05:00
Blade Barringer
2d78f6c838
Remove only from karma test
2015-06-24 08:15:33 -05:00
Kevin Gisi
44c83eb341
Merge pull request #5477 from gisikw/fix-analytics-again
...
Fix analytics
2015-06-24 03:52:30 -04:00
Kevin Gisi
8c343c1845
*ahem* You saw nothing.
2015-06-24 03:45:25 -04:00
Kevin Gisi
c8b5480157
Repair tests to respect setTimeout
2015-06-24 03:41:49 -04:00
Kevin Gisi
01755a6d98
setTimeout all the analytics stuff
2015-06-24 03:23:48 -04:00
Kevin Gisi
c7fea86aa5
Revert "Debug all the things"
...
This reverts commit be79d20864 .
2015-06-24 03:21:30 -04:00
Kevin Gisi
be79d20864
Debug all the things
2015-06-24 02:33:58 -04:00
hairlessbear
1318cdd1fb
Added selectableInventory class to selected food on Pets page
2015-06-23 23:45:51 -04:00
Blade Barringer
095f0f17c0
Merge pull request #5472 from gisikw/api-test-watch
...
Add gulp test:api:watch
2015-06-23 21:08:33 -05:00
Kevin Gisi
10cb1d651a
Add gulp test:api:watch
2015-06-23 21:33:05 -04:00
Sabe Jones
981e1f553f
Merge pull request #5468 from HabitRPG/sabrecat/analytics-service
...
Analytics service
2015-06-23 12:36:22 -07:00
Sabe Jones
fcd278c2f6
fix(analytics): Pass tests
...
Restores the "UUID" property so that tests no longer fail. Corrects various typos in analytics service test. Moves landing page tracking to the Jade file to avoid duplicate tracking.
2015-06-23 10:11:03 -05:00
Sabe Jones
8b04768b37
fix(analytics): Resolve errors
...
Should correct 400 Bad Request errors with Amplitude and cannot read undefined errors in tmp_static_front.
2015-06-23 09:30:18 -05:00
Matteo Pagliazzi
782ae4f81c
chore(i18n): update locales
2015-06-23 10:43:29 +02:00
Matteo Pagliazzi
e03bf6a711
fix(i18n): remove unused, empty string that was breaking Transifex
2015-06-23 10:38:30 +02:00
Matteo Pagliazzi
2c41553d7a
chore(i18n): update locales
2015-06-23 10:31:10 +02:00
Alys
a7e1c30dca
remove http from link to fonts.googleapis.com to prevent Mixed Content Warnings - partial fix for #5464
2015-06-23 16:47:18 +10:00
hairlessbear
0e4e7a032a
Added explanatory comment
2015-06-22 21:36:06 -04:00
hairlessbear
f0ddbae775
Added quest completion modal test for when RSVPNeeded is true; modified quest invite test to use 'to.not.be.calledWith'
2015-06-22 21:33:38 -04:00
hairlessbear
c942c10c17
Added a line break
2015-06-22 21:21:38 -04:00
hairlessbear
b249e103de
Removed duplicated test
2015-06-22 21:04:28 -04:00
hairlessbear
f75bbb6e5f
Modified 'RSVPNeeded is not true' test to not set user.party.quest.completed because it is not needed for the test
2015-06-22 20:55:50 -04:00
hairlessbear
8026e99219
Added quest completion modal watch tests
2015-06-22 20:48:11 -04:00
hairlessbear
c5292e7ff8
Changed 'invite modal does not open' tests to focus on completion modal opening, but being the only modal to open. Also modified the named of two tests to be more intuitive and accurate
2015-06-22 20:33:49 -04:00
hairlessbear
78b5ac4fdc
Changed completion modal watch to be on instead of
2015-06-22 20:06:37 -04:00
Sabe Jones
f8e3120b3a
fix(analytics): Move landing page tracking
...
...to AuthCtrl
2015-06-22 18:49:15 -05:00
Sabe Jones
f5dfa5f015
fix(analytics): Define Analytics on scope
2015-06-22 18:30:47 -05:00
hairlessbear
a1a46933eb
Merge branch 'crookedneighbor-quest-invite-modal-on-sync' into quest_invite_modal_on_user_sync
2015-06-22 18:08:09 -04:00
Sabe Jones
2ce1daffb8
feat(analytics): call service from app
2015-06-22 16:35:17 -05:00
Sabe Jones
83e0eb374f
fix(analytics): Load scripts in factory
2015-06-22 16:32:44 -05:00
Sabe Jones
196490ecb1
WIP(analytics): Enable service
2015-06-22 15:44:33 -05:00
Sabe Jones
56a461c513
Revert "feat(analytics): Analytics service"
...
This reverts commit 9a0e31db40 .
2015-06-22 14:14:33 -05:00
Blade Barringer
78689e6e7c
Made analytics mock, adjusted sandbox
2015-06-22 12:52:24 -05:00
Blade Barringer
8579bb86df
Merge branch 'develop' into sabrecat/analytics-service
2015-06-22 12:37:17 -05:00
Matteo Pagliazzi
afc6fba5bf
chore(i18n): update locales
2015-06-22 18:24:37 +02:00
Sabe Jones
9a0e31db40
feat(analytics): Analytics service
...
Inject Analytics service into controllers where needed. Call Analytics service instead of GA or Mixpanel for tracking within the app.
2015-06-22 11:21:02 -05:00
Kevin Gisi
78b424e247
Encapsulate directive functions in anonymous functions - avoid the global namespace
2015-06-21 23:52:08 -04:00
Blade Barringer
f5647ecd76
Wrap task service in anon function
2015-06-21 20:35:45 -05:00
Blade Barringer
10c709a9f2
Merge branch 'develop' into TheHollidayInn-challenges-clone
2015-06-21 20:05:20 -05:00
Blade Barringer
b4c4b891a1
Moved sandbox.js to mocks directory
2015-06-21 20:02:48 -05:00
Blade Barringer
7064871557
Create Vagrantfile.example
2015-06-21 19:28:19 -05:00
Blade Barringer
4574501e07
Set base stats lower for vagrantfile
2015-06-21 19:10:36 -05:00
Blade Barringer
d98e6081e6
Merge branch 'develop' into kusold-vagrant-more-power
2015-06-21 19:02:43 -05:00
Blade Barringer
38e24571da
Merge branch 'develop' into TheHollidayInn-challenges-clone
...
Take specHelper off of global scope
2015-06-21 18:59:11 -05:00
Blade Barringer
5ab3a80b57
Closes #5360
2015-06-21 17:49:59 -05:00
Blade Barringer
a98d9ac29c
Merge pull request #5437 from crookedneighbor/add-user-to-analyticsService
...
Add user to analytics service, rewrite updateUser to match test
2015-06-21 17:22:57 -05:00
Blade Barringer
73f8f48450
Merge branch 'sabrecat/analytics-service' into add-user-to-analyticsService
2015-06-21 17:21:17 -05:00
Blade Barringer
232afffbb8
Merge branch 'develop' into sabrecat/analytics-service
2015-06-21 17:19:12 -05:00
Blade Barringer
34c08e941f
Wrap service in anonymous function; put constants at top of file
2015-06-21 17:16:06 -05:00
Blade Barringer
fbc466cb29
Create private methods for analytics functions
2015-06-21 17:07:48 -05:00
Blade Barringer
15c08f091d
Remove mixpanel from analytics service
2015-06-21 17:07:22 -05:00
Blade Barringer
7ee1899807
Refactore analytics service and tests
2015-06-21 16:39:32 -05:00
Blade Barringer
1be73011eb
Merge branch 'develop' into add-user-to-analyticsService
2015-06-21 14:04:17 -05:00
Blade Barringer
54509d234c
Clean up groups controller
...
* Put nullifying variables back in per https://github.com/HabitRPG/habitrpg/pull/5437/files#r32896108
* converted questStart to a hoisted function
2015-06-21 14:02:40 -05:00
Blade Barringer
11fcb54c03
Corrected watch check
...
4fc04fea24 (commitcomment-11784493)
2015-06-21 10:44:59 -05:00
Alys
c6256d7fa1
fix https://github.com/HabitRPG/habitrpg/issues/5439 for the other darned gear types that I freaking forgot about
2015-06-21 17:32:46 +10:00
Alys
fc9f511542
allow Body Accessory equipment to be purchased from Seasonal Shop - fixes https://github.com/HabitRPG/habitrpg/issues/5439
2015-06-21 16:37:56 +10:00
Sabe Jones
c3b4950314
Merge branch 'sabrecat/summer-splash' into develop
2015-06-20 23:08:03 -05:00
Sabe Jones
3641bea441
feat(event): Summer Splash 2015
...
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
2015-06-20 23:07:14 -05:00
Blade Barringer
4fc04fea24
Adjustments to PR #5298
...
* Put watch on $scope
* Check for quest.completed !== true or false
* Add test for quest invite modal watch
2015-06-20 21:10:18 -05:00
Blade Barringer
19f8ca7980
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-20 17:36:32 -05:00
Blade Barringer
96162b37bd
Merge pull request #5433 from gisikw/ultimate-gear-fix
...
Ultimate gear fix
2015-06-20 17:34:47 -05:00
Blade Barringer
11ba5ad368
Merge branch 'develop' into add-user-to-analyticsService
2015-06-20 16:56:29 -05:00
Blade Barringer
95f1c01b01
Removed more variable assignments that were never getting set
2015-06-20 16:54:33 -05:00
Blade Barringer
68f764bca6
Removed var assignment that is never reached
2015-06-20 16:50:48 -05:00
Blade Barringer
d96b362531
Add additional tests for updateUser
2015-06-20 16:37:30 -05:00
Blade Barringer
9008a31c4a
Add user to analytics service, rewrite updateUser to match test
2015-06-20 16:04:34 -05:00
Blade Barringer
21b8fc35ba
Merge branch 'play-in-the-sandbox' into sabrecat/analytics-service
2015-06-20 16:01:02 -05:00
Blade Barringer
9fea2b5a90
Merge pull request #5435 from gisikw/sabrecat/analytics-service
...
Repaired specs (stubbing issues)
2015-06-20 16:00:11 -05:00
Blade Barringer
71fad8ca97
Provide user for anaylitcs service test
2015-06-20 15:50:06 -05:00
Blade Barringer
ab53391fee
Convert analytics service to use sinon.sandbox
2015-06-20 15:00:30 -05:00
Blade Barringer
c7615e1cbd
Merge branch 'develop' into gisikw-sabrecat/analytics-service
2015-06-20 14:52:28 -05:00
Blade Barringer
944cef4d44
Switch over to using sinon.sandbox in karma specs
2015-06-20 14:48:38 -05:00
Kevin Gisi
266122567d
Repaired specs (stubbing issues)
2015-06-20 14:25:34 -04:00
Blade Barringer
970b8d4061
Merge branch 'update-node-version' into develop
2015-06-20 10:51:39 -05:00
Blade Barringer
837c26415d
Update node version
2015-06-20 10:02:46 -05:00
Blade Barringer
f4ae2b98ff
Merge pull request #5432 from hairlessbear/remove_armorSet
...
Removed unused 'armorSet' attribute in user model
2015-06-20 08:38:31 -05:00
Alys
6eac1174a2
sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217
2015-06-20 20:22:27 +10:00
Keith Holliday
824ba3b932
Merge pull request #2 from crookedneighbor/refactor-clone-challenges
...
Refactor clone challenges
2015-06-19 23:32:41 -07:00
Kevin Gisi
f32305458a
Fix armoire edge case
2015-06-20 01:58:54 -04:00
Kevin Gisi
951d5417bc
Add failing spec for armoire edge case
2015-06-20 01:58:05 -04:00
hairlessbear
02acad9dfc
Removed unused 'armorSet' attribute in user model
2015-06-20 01:38:47 -04:00
Blade Barringer
a44d760b8f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-06-19 23:52:20 -05:00
Blade Barringer
2acf7eb71e
Move score tests to separate file
2015-06-19 23:51:37 -05:00
Blade Barringer
ddc8508816
Merge branch 'develop' into TheHollidayInn-tasks-api-up-checkoff-todo
2015-06-19 23:00:18 -05:00
Blade Barringer
86f18e9a5a
Refactor clone challenges PR
2015-06-19 20:49:24 -05:00
Alys
83089720c8
Update migration script that sets Ultimate Gear object in user accounts to ensure true OR false values for all classes. Ref https://github.com/HabitRPG/habitrpg/issues/5427
2015-06-20 09:17:32 +10:00
Sabe Jones
f6fafc5b6d
WIP(event): Summer Splash 2015
2015-06-19 10:42:20 -05:00
Blade Barringer
deff0d4da2
Merge branch 'develop' into TheHollidayInn-challenges-clone
2015-06-19 07:41:21 -05:00
TheHollidayInn
925cc81425
Removed complete param from creating todos with up and down url and added test for overriding complete parameter
2015-06-18 23:10:50 -05:00
Sabe Jones
86d711bb5e
WIP(analytics): Remove Mixpanel
2015-06-18 20:33:54 -05:00
Sabe Jones
3c5ae80e0b
WIP(analytics): Move client tracking to service
2015-06-18 15:43:57 -05:00
Alys
07b41d16b6
Revert "Revert "new GSalvadi audio theme, created by NomindTR""
...
This reverts commit 30a091e14e .
2015-06-18 22:19:35 +10:00
TheHollidayInn
caec2d8476
Added editTask function back
2015-06-17 23:04:42 -05:00
TheHollidayInn
838c912906
Moved clone tasks function to task service
2015-06-17 22:22:55 -05:00
TheHollidayInn
e9269d332c
Removed dateCreated from being cloned in tasks
2015-06-17 21:08:33 -05:00
TheHollidayInn
b81024bdd6
Fixed task clone functionality and updated code organization/semantics
2015-06-17 21:08:33 -05:00
TheHollidayInn
9ed3fbf613
Clone gems, all task info, and spacing.
2015-06-17 21:08:33 -05:00
TheHollidayInn
c3307dd684
Added clone challenge test
2015-06-17 21:08:33 -05:00
TheHollidayInn
7890abe31a
Added clone ability to challenges.
2015-06-17 21:08:03 -05:00
Blade Barringer
bcc99791dd
Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop
2015-06-17 19:13:13 -05:00
Blade Barringer
c1b429c8bf
Adjust spacing; remove comment
2015-06-17 19:12:49 -05:00
Blade Barringer
4042c1ce7a
Merge branch 'GitHubSphinx-Sphinx-entry1' into develop
2015-06-17 19:06:56 -05:00
Blade Barringer
03c1476840
Change location of sellFor strings
2015-06-17 19:06:28 -05:00
Blade Barringer
3ff310294b
Hide row if not part of reward; add one-time bindings
2015-06-17 18:57:15 -05:00
Blade Barringer
e150a4d4f6
Merge branch 'develop' into hairlessbear-add_quest_rewards_to_pending_quest
2015-06-17 18:51:30 -05:00
Blade Barringer
685c09aa0d
Merge branch 'task_service_refactoring_v2' into develop
2015-06-17 18:46:13 -05:00
Sabe Jones
ad7e5a6dc9
feat(pets): Cuttlefishies
2015-06-17 17:26:36 -05:00
Alys
c404e5ca5e
Merge pull request #5420 from HabitRPG/revert-5407-GSalvadi-audio-NOMINDTR-2015-06-15
...
Temporarily revert "new GSalvadi audio theme, created by NomindTR"
2015-06-18 08:04:35 +10:00
Alys
30a091e14e
Revert "new GSalvadi audio theme, created by NomindTR"
2015-06-18 07:39:38 +10:00
hairlessbear
3046bbb0d7
Added quest rewards to pending quest display
2015-06-17 13:21:17 -04:00
Blade Barringer
4da3018ad9
Simplify editTask
2015-06-17 07:51:07 -05:00
Alys
910fc2f213
Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15
...
new GSalvadi audio theme, created by NomindTR
2015-06-17 21:39:39 +10:00
Blade Barringer
e422ea065f
Reword tests
2015-06-16 23:16:11 -05:00
Blade Barringer
3ab27f32d2
Refactored editTask into TaskService
2015-06-16 23:11:04 -05:00
TheHollidayInn
3dc3891ec6
Fixed habit tests to create habits and check scoring
2015-06-16 20:19:02 -05:00
Blade Barringer
63e1bdf5fd
Merge pull request #5415 from hairlessbear/update_locales_link
...
Update README.md link in _README_FIRST.md files and add missing _README_FIRST.md files
2015-06-16 19:27:26 -05:00
Blade Barringer
1801ad0bce
Add authors to bailey and correct refresh text
2015-06-16 17:59:59 -05:00
hairlessbear
205f700c7e
Fix links
2015-06-16 18:04:12 -04:00
Sabe Jones
7152bea4fe
chore(news): 6/16 misc Bailey
2015-06-16 16:59:27 -05:00
hairlessbear
73f87213e9
Added _README_FIRST.md files to directories that were missing them
2015-06-16 17:51:54 -04:00
hairlessbear
0b40237b91
Updated README.md link in all _README_FIRST.md files
2015-06-16 17:46:21 -04:00
Matteo Pagliazzi
b12ee725f4
incrementally enable weekly recap emails
2015-06-16 20:26:58 +02:00
Matteo Pagliazzi
95b481b31d
use discriminator field to distinguish users with weekly recap emails enabled
2015-06-16 17:51:24 +02:00
GihHubSphinx
0cd1ffb794
Fixing button caption for selling Eggs and Potions in the Market
2015-06-16 19:06:53 +05:00
Matteo Pagliazzi
a82270fbaa
feat(weekly-recap): enable for new users who sign in
2015-06-16 11:15:03 +02:00
hairlessbear
18fe4b6166
Fix task advanced settings display setting ( fixes #5408 )
2015-06-16 00:52:48 -04:00
Alys
14983cb996
replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet
2015-06-16 13:10:49 +10:00
GihHubSphinx
071f2796db
Adjusting challenges view translation
...
- Make "Back to all challenges" button translatable
- Allow some flexibility for the line "#_of_gems gem_icon Prize" - this
is made following the practices with linkstart/linkend implementation
- prize "string" is left as is because used as a placeholder
- code comment "prize" had to be moved 1 line up - before the p (as no
room for it is left inside the p) which however seems OK to me, because
the comments above and below has been made the same way before
2015-06-16 02:37:18 +05:00
Blade Barringer
ecb2544cdc
Merge pull request #5396 from hairlessbear/remove_freeRebirth
...
Removed 'freeRebirth' from user model and everywhere else in codebase
2015-06-15 08:00:18 -05:00
Blade Barringer
6ed306a7e0
Merge pull request #5403 from vIiRuS/iOS-IAP
...
Enable in app purchase for iOS
2015-06-15 07:42:57 -05:00
Matteo Pagliazzi
d3353aa751
chore(i18n): update locales
2015-06-15 13:20:09 +02:00
Phillip Thelen
39adff0e2c
improve error reporting for iOS IAP
2015-06-15 13:09:22 +02:00
Phillip Thelen
e4a10d70ee
Add human readable text to response
2015-06-15 12:57:08 +02:00
Phillip Thelen
6467dd8fc0
Merge pull request #1 from crookedneighbor/vIiRuS-iOS-IAP
...
Viirus iOS iap - add tests
2015-06-15 12:54:35 +02:00
Alys
b6b2873faf
add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015
2015-06-15 20:33:14 +10:00
hairlessbear
05effefef1
Merge pull request #7 from crookedneighbor/hairlessbear-quest_invite_modal_on_user_sync
...
Make party page sync the party automatically (includes hacky fix for #4816 )
2015-06-14 22:27:32 -04:00
Blade Barringer
00c50f1212
Fixes #4816
2015-06-14 21:17:18 -05:00
Blade Barringer
bb73253e8e
Make party page sync the party automatically
2015-06-14 19:26:01 -05:00
hairlessbear
6884263a55
Replaced accept/reject button actions with 'questAccept(party)' and 'questReject(party)' respectively to solve sync issues
2015-06-14 20:21:58 -04:00
hairlessbear
fbf1d64a04
Moved accept/reject buttons to the bottom, and simplified logic for quest leader buttons
2015-06-14 20:12:50 -04:00
hairlessbear
22ca76cf40
Added quest accept/reject to pending quest display
2015-06-14 19:46:43 -04:00
Blade Barringer
bb2f97e802
Added android tests for iap
2015-06-14 18:35:19 -05:00
Blade Barringer
1ea7193694
Add missing test
2015-06-14 18:11:07 -05:00
Blade Barringer
5b6afde475
Remove console.logs
2015-06-14 18:08:00 -05:00
Blade Barringer
cd45fc06c6
Collapse return and res.json statements
2015-06-14 18:07:23 -05:00
Blade Barringer
6318b0828f
Add test for iOS in-app purchases
2015-06-14 18:04:47 -05:00
hairlessbear
dc8cdc1930
Merge pull request #6 from crookedneighbor/hairlessbear-quest_invite_modal_on_user_sync
...
Hairlessbear quest invite modal on user sync - bring up to date with develop
2015-06-14 18:02:10 -04:00
Blade Barringer
090ac94eec
Merge pull request #5406 from GitHubSphinx/Sphinx-entry1
...
Rewording translation string error message
2015-06-14 17:01:32 -05:00
Blade Barringer
5385471cb2
Fix push notifications test
2015-06-14 17:00:13 -05:00
Blade Barringer
14fe29dd4a
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
2015-06-14 16:33:38 -05:00
Blade Barringer
92e2393114
Merge branch 'hairlessbear-pending_quest_display' into develop
2015-06-14 16:20:20 -05:00
Blade Barringer
109acb0d97
Correct ng-style syntax
2015-06-14 16:15:31 -05:00
GihHubSphinx
232888212a
Rewording translation string error message
...
Making error message about inaccurate translation match the UI link to
Report a Bug.
Addressing https://github.com/HabitRPG/habitrpg/issues/5405 to m
2015-06-15 01:42:47 +05:00
Blade Barringer
4b3d82613e
Allow leader to be shown in member list; do not allow leader to kick out self from group
2015-06-14 12:54:21 -05:00
Phillip Thelen
4aa9e81d8a
Add data about armoire content to buy response
2015-06-14 18:08:58 +02:00
Blade Barringer
795710ce63
Rename boss folder to quests
2015-06-14 11:05:53 -05:00
Blade Barringer
35f2a36215
Split out pieces of boss jade files
2015-06-14 10:48:46 -05:00
Blade Barringer
178e7b1c8c
Move participants to partial
2015-06-14 10:14:05 -05:00
Blade Barringer
44a556f4fe
Refactor to use tabset
2015-06-14 09:01:28 -05:00
Phillip Thelen
6997783037
Check that iOS IAP is of correct type
2015-06-14 15:59:43 +02:00
Blade Barringer
a6e0d5f2de
Merge branch 'develop' into hairlessbear-pending_quest_display
2015-06-14 08:44:25 -05:00
Phillip Thelen
7ccf246119
Enable authentication for iOS IAP route
2015-06-14 15:28:30 +02:00
Blade Barringer
b4f4db9c1d
Create jade variabel for ultimate gear check
2015-06-14 01:56:32 -05:00
Blade Barringer
c44ca785aa
Merge branch 'develop' into SabreCat-develop
2015-06-14 01:50:16 -05:00
Blade Barringer
d89ee5fff2
Adjust margin
2015-06-14 01:36:38 -05:00
Blade Barringer
831f5b89bd
Merge branch 'develop' into nthomsn-develop
2015-06-14 01:27:35 -05:00
Blade Barringer
41b1abba3a
Checkout help button changes
2015-06-13 23:16:12 -05:00
Blade Barringer
0eb8caec23
Various task ui improvements
...
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
2015-06-13 22:29:06 -05:00
Blade Barringer
3457068351
Cleaned up location of test files
2015-06-13 21:11:43 -05:00
Blade Barringer
2134465a75
Impliment check for leader object's existence in challenge search
2015-06-13 20:50:32 -05:00
Blade Barringer
703a2511da
Merge branch 'TheHollidayInn-challenges-owner-filter' into develop
2015-06-13 19:42:54 -05:00
Blade Barringer
6513527d8b
Refactor challenges filter
2015-06-13 19:41:41 -05:00
Blade Barringer
ddb28c0305
Merge branch 'develop' into TheHollidayInn-challenges-owner-filter
2015-06-13 18:23:51 -05:00
Blade Barringer
9d4713bdf3
Merge pull request #5392 from GitHubSphinx/Sphinx-entry1
...
Still addressing #5202 - making Click for help button translatable
2015-06-13 18:01:57 -05:00
Blade Barringer
c490f9338d
Merge pull request #5394 from hairlessbear/ultimateGear_orb_logic_fix
...
Removed user.achievements.ultimateGear checks from orb of rebirth logic
2015-06-13 18:01:15 -05:00
Blade Barringer
90173e6943
Remove unused html files
2015-06-13 15:18:04 -05:00
Blade Barringer
b052f803e4
Initialize user.filterQuery as undefined
2015-06-13 14:09:08 -05:00
Blade Barringer
62f12cf8b5
Correct path of translations mock
2015-06-13 13:39:21 -05:00
hairlessbear
31e7b052a1
Removed 'freeRebirth' modal and its associated strings
2015-06-13 14:18:03 -04:00
hairlessbear
4bf1b94c1d
Removed 'freeRebirth' from user model and all uses in codebase
2015-06-13 14:18:03 -04:00
Blade Barringer
8fe4d9a5a8
Merge branch 'blade-feature/search' into develop
2015-06-13 12:40:08 -05:00
Blade Barringer
3e32d4244f
Adjust formatting of task ordering filter
2015-06-13 12:39:20 -05:00
Blade Barringer
8faf96f5b9
Refactored filters
2015-06-13 12:39:11 -05:00
Blade Barringer
71407478b7
Merge pull request #5389 from JiriChara/feature/search
...
Enable filtering for tasks and custom rewards
2015-06-13 12:01:00 -05:00
Blade Barringer
719907189f
Organized spec folder
2015-06-13 09:58:08 -05:00
Jiří Chára
653d601d04
Merge pull request #1 from crookedneighbor/blade-feature/search
...
Blade feature/search
2015-06-13 09:53:16 +02:00
Blade Barringer
5d56bd02ef
Merge branch 'develop' into blade-feature/search
2015-06-13 00:10:44 -05:00
hairlessbear
2504b06026
Removed user.achievements.ultimateGear checks from orb of rebirth logic ( fixes #5352 )
2015-06-12 17:17:50 -04:00
Sabe Jones
e2ba8fb859
fix(achievement): Ultimate Gear logic
...
Fixes #5387 .
2015-06-12 15:35:34 -05:00
Blade Barringer
2f1111522c
Adjust PR #5389
...
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
2015-06-12 09:05:06 -05:00
GihHubSphinx
fc5cb5d228
Still addressing #5202
...
The last thing left as it seems is Click for help toolbar
2015-06-12 17:42:40 +05:00
TheHollidayInn
8d20168b6b
Added up and down test to complete and uncomplete a todo respectively.
2015-06-11 23:38:44 -05:00
Blade Barringer
3f8066eee5
Compile sprites
2015-06-11 20:24:52 -05:00
Blade Barringer
8d450aefb8
Replace head sprites with dark outline versions
...
Closes #5171
2015-06-11 20:24:19 -05:00
Jiri Chara
b413e38682
Put tasks filter field to the right
2015-06-11 22:16:40 +02:00
Jiri Chara
72a3419327
Change the styling of filter box to bootstrap
2015-06-11 20:41:08 +02:00
Jiri Chara
2c52829256
Implement filter tasks by text & notes
...
In order to be able to filter tasks by it's text or notes - we need an
extra filter to be implemented, because angular does not support OR
condition for it's default filter directive.
2015-06-11 20:39:29 +02:00
Nicholas Thomson
867308975f
Merge https://github.com/HabitRPG/habitrpg into develop
2015-06-11 08:40:36 -07:00
Jiri Chara
2625b57f2d
Make sure search filter has same margin as tags
2015-06-11 15:32:01 +02:00
Jiri Chara
0b74736cf2
Remove unused dependency
2015-06-11 09:18:20 +02:00
Jiri Chara
df7d36923c
Enable filtering for tasks and custom rewards
...
Add search input box next to the tags. When user changes the value of
the input box then it's propagated to the user service as filterQuery
string. filterQuery string is then used in the tasks template to filter
tasks by text.
2015-06-11 09:10:31 +02:00
TheHollidayInn
31f61c05f4
Added tests for using directional tasks endpoints
2015-06-10 23:10:37 -05:00
TheHollidayInn
c2614c0447
Moved if statement to assign task completion before saving task to user
2015-06-09 18:48:03 -05:00
Mike Kusold
ca35a7ca81
Adding more power for vagrant
2015-06-07 22:27:57 -06:00
hairlessbear
2a7f2447b8
Moved 'env.t' to same line as 'a' tags
2015-05-31 21:33:27 -04:00
hairlessbear
6b52cf55c2
Changed 'selectedTab' to 'questBoxTab', changed state check to strings, and removed unnecessary media classes
2015-05-31 16:50:56 -04:00
hairlessbear
4949e39fc9
Changed 'selectedTab' to 'questBoxTab', changed state check to strings, and removed unnecessary media classes
2015-05-31 16:43:19 -04:00
hairlessbear
4ef9762e99
Merge pull request #5 from crookedneighbor/blade-hairlessbear-quest_invite_modal_on_user_sync
...
Refactor chat related things into own service
2015-05-30 18:46:36 -04:00
Blade Barringer
fa86cd6d8c
Make phrasing of tests consistent
2015-05-30 12:42:31 -05:00
Blade Barringer
d21a3b80bf
Remove unused dependency
2015-05-30 12:33:51 -05:00
Blade Barringer
c1501db292
Refactor chat related things into own service
2015-05-30 12:08:32 -05:00
hairlessbear
4fc0234fd4
Added behavior from #5239 (make quest completion modal always display before quest invite modal)
2015-05-29 18:25:47 -04:00
hairlessbear
177f835353
Merge pull request #4 from crookedneighbor/blade-hairlessbear-quest_invite_modal_on_user_sync
...
Blade hairlessbear quest invite modal on user sync
2015-05-29 15:36:21 -04:00
Blade Barringer
e3bc8805fe
Refactor quest functions and add tests
2015-05-29 09:13:36 -05:00
Blade Barringer
42b482cb7e
Make user sync after accepting or rejecting a quest
2015-05-28 08:18:08 -05:00
hairlessbear
dc8647d6ae
Changed all party.quest.key instances in quest invite modal to user.party.quest.key and changed invite modal check
2015-05-27 18:49:35 -04:00
hairlessbear
966f9d2aca
Fixed tests using crookedneighbor's code
2015-05-27 12:06:19 -04:00
hairlessbear
a0f3e02f74
Set party.quest.key to null on quest reject and quest cancel
2015-05-27 11:52:53 -04:00
hairlessbear
cc3d63b858
Fixed rewards on quest invite modal
2015-05-27 10:05:03 -04:00
hairlessbear
cfcfb8fd02
Changed invite to RSVPNeeded
2015-05-27 09:18:44 -04:00
hairlessbear
0fa93506f5
Made quest invite modal pop-up on user sync (rewards display currently nonfunctional)
2015-05-26 23:01:29 -04:00
hairlessbear
cdceb7d6c8
Put br hiding code in the right place
...
The previous commit put it in the `quest.active == false` block, but it was supposed to be in the `quest.active == true` block. This commit fixes the error
2015-05-21 14:08:47 -04:00
hairlessbear
7b700bd320
Tiny formatting change for world boss
...
Remove `br` when 'tavern' is true.
2015-05-18 15:43:07 -04:00
hairlessbear
4f1036af9b
Fixed world boss logic
2015-05-17 23:21:00 -04:00
hairlessbear
6d2fa4a940
Added 'hr' to active quest display for consistency
2015-05-17 22:44:56 -04:00
hairlessbear
05f9167b3f
Changed 'invites' to 'invitations'
2015-05-17 22:32:06 -04:00
hairlessbear
f3a6eeb426
Changed button default behavior based on quest progress
2015-05-16 00:01:29 -04:00
hairlessbear
905c4e8273
Added tabbed display to quest in progress, added profile links, changed button behavior
2015-05-15 23:28:01 -04:00
hairlessbear
420a2a661a
Changed initial tab to invitation list
2015-05-15 19:41:49 -04:00
hairlessbear
6ba795ae8c
New style of pending quest display
2015-05-15 15:16:07 -04:00
hairlessbear
5d17ea9c60
Added quest details, picture and goals to pending quest display
2015-05-06 12:33:48 -04:00
TheHollidayInn
6f8d80dcac
Split challenge filter test into multiple tests
2015-04-23 14:27:41 -05:00
TheHollidayInn
ad2ad70421
Updated comments and removed extra console.log
2015-04-23 08:58:40 -05:00
TheHollidayInn
f3f1bd4d8e
Andded together filters and created tests for challenge filtering
2015-04-23 00:33:31 -05:00
TheHollidayInn
71cc5f76fe
Set default ownership filter to either and fixed editing bug
2015-04-22 11:54:02 -05:00
TheHollidayInn
74ef8cd443
Added filter by owner for challenges
2015-04-22 11:54:01 -05:00
Nicholas Thomson
e5ba26d46b
Normal checklist explanation re-added
2015-03-11 16:52:44 -04:00
Nicholas Thomson
39712ca60e
Removed unnecessary string
2015-03-08 22:49:10 -04:00
Nicholas Thomson
075b3e5b4e
Denser task edit style
2015-03-08 15:14:21 -04:00