Commit Graph

713 Commits

Author SHA1 Message Date
SabreCat 1379140cf6 Merge branch 'release' into develop 2017-09-19 21:00:19 +00:00
Sabe Jones 68a438f3d4 3.113.2 2017-09-18 23:08:55 +00:00
Sabe Jones a23d44347e 3.113.1 2017-09-15 00:22:34 +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
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
SabreCat 0c6540e6d8 Merge branch 'release' into develop 2017-09-12 16:57:30 +00:00
Sabe Jones 176a4a0962 3.112.2 2017-09-11 20:59:49 +00:00
Sabe Jones eb52f73cac 3.112.1 2017-09-08 19:30:58 +00: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
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
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
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
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 32fd4e33c8 feat(dates): Clear and Today buttons (#9005) 2017-08-30 12:15:24 -05:00
Sabe Jones d0d319316b 3.111.4 2017-08-28 22:36:13 +00: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 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
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
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
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
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
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
Sabe Jones 1a99380a53 3.110.3 2017-08-15 22:41:34 +00:00
Sabe Jones 4ba97755a5 3.110.2 2017-08-11 20:03:14 +00:00
Sabe Jones 32c3a3886f Merge branch 'develop' into release 2017-08-11 19:53:40 +00:00
Sabe Jones 68b19c931b 3.110.1 2017-08-10 23:18:37 +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
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 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
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
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
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
Sabe Jones 5d6e8c8729 3.107.0 2017-07-31 20:34:57 +00:00
Sabe Jones aad6130b21 3.106.1 2017-07-30 20:37:17 +00:00
Sabe Jones 413626a971 3.106.0 2017-07-30 16:15:45 +00:00
Sabe Jones d00131fc4a 3.105.2 2017-07-27 21:12:40 +00:00