Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,914 Commits 64 Branches 1,256 Tags
bbffa9830bc7ae96d657e7aee601459aba21b790
Commit Graph

3731 Commits

Author SHA1 Message Date
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 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 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
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 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
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 c707b6c99b Add check to ensure obj is not user (#8373) 2017-01-06 10:23:39 -06: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 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 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 91f5c47d9d Revert "feature: adding hp notification for boss damage" (#8340) 2016-12-31 17:31:25 +10: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