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
