Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,578 Commits 64 Branches 1,256 Tags
9488ec2eb0b873dcc6ff4bafbb00048a7ffff5e2
Commit Graph

85 Commits

Author SHA1 Message Date
Matteo Pagliazzi 9488ec2eb0 Merge branch 'release' into develop 2018-01-30 18:56:25 +01:00
Alexey Pyltsyn 3c603e3bb1 Fixed horizontal scrollbar (#9853) 2018-01-29 15:07:59 -06:00
Alys c1e264955f describe Login Name limitations on Registration form and Add Local Auth form (#9896) 
* describe Login Name limitations on registration form and Add Local Auth form

* adjust text in response to this change: https://github.com/HabitRPG/habitica/pull/9895/commits/c69687f935bc95a94f557ef9950e435622c282ff

* update max length
 2018-01-27 09:38:23 -07:00
SabreCat 2b04ed3246 feat(content): Mystery Items 2018/01 2018-01-23 22:38:23 +00:00
SabreCat 274f942b1e chore(news): Add note re audio themes 2018-01-18 21:45:15 +00:00
SabreCat 4aad52242c chore(news): iOS + Blog Bailey 2018-01-18 21:25:59 +00:00
MathWhiz 183c90ac3a Fix presskit (#9418) 
* Move presskit to static folder

* Fix image location

* Add press kit FAQ strings

* Add faq section, fix images

* Update Images

* Add images to presskit page

* Remove unecessary parts
 2018-01-12 16:18:20 -06:00
SabreCat c41123c36c chore(news): Blog Bailey 2018-01-12 21:38:16 +00:00
SabreCat 3d5d5da933 feat(content): Pept quest 2018-01-10 16:31:56 +00:00
SabreCat 71cb4e8510 feat(content): enable Wintery Skins and Hair 2018-01-04 21:35:26 +00:00
Sabe Jones 7e241bb76f Merge branch 'release' into develop 2018-01-03 00:07:42 +00:00
SabreCat 88e6b2da7c feat(content): Armoire and BGs 2018-01 
Also ends New Year's hat fanciness
 2018-01-02 23:49:50 +00:00
Sabe Jones da73c5c418 Merge branch 'release' into develop 2017-12-31 02:45:04 +00:00
SabreCat d57c525fab feat(event): New Year's 2017-18 2017-12-31 02:34:52 +00:00
Keith Holliday d90d781740 Added mobile style fixes (#9741) 2017-12-26 17:31:00 -06:00
SabreCat 4764f115b1 feat(content): Subscriber Items Dec 2017 2017-12-21 23:10:54 +00:00
Sabe Jones 75092336c4 fix(news): Holly, not Peppermint, potions 2017-12-20 04:43:43 +00:00
SabreCat 98bb6fd7ce feat(content): Winter Wonderland 2017-18 
and Starry Night Hatching Potions
 2017-12-20 02:23:11 +00:00
SabreCat e229bc5042 Merge branch 'release' into develop 2017-12-15 05:37:04 +00:00
SabreCat c4ffe39ec9 chore(news): Bailey 2017-12-15 05:34:30 +00:00
SabreCat b0ebdfeb65 Merge branch 'release' into develop 2017-12-13 22:16:30 +00:00
SabreCat 5a3751cbac chore(news): Blog Bailey 2017-12-13 22:14:19 +00:00
Keith Holliday 7802e30e80 Added static/front and meta tags (#9712) 
* Added static/front and meta tags

* Moved meta to index
 2017-12-13 15:11:22 -06:00
SabreCat 2a42bc9450 Merge branch 'release' into develop 2017-12-12 21:27:04 +00:00
SabreCat 355773ecf3 chore(news): FCC CTA 
Also fixes an issue with sprite alignment of the Lamplighter Set.
 2017-12-12 21:24:18 +00:00
Keith Holliday 759ce61492 Added support for party invites by email (#9665) 
* Added support for party invites by email

* Changed to groupInvite
 2017-12-07 12:57:01 -05:00
SabreCat 2be8ddb60d fix(news): winner typo 2017-12-06 19:15:34 +00:00
Sabe Jones 9e8807c40d Armoire and Backgrounds December 2017 (#9659) 
* feat(content): Armoire and Backgrounds 2017/12

* chore(sprites): compile

* chore(news): Bailey
 2017-12-05 19:29:00 +00:00
Sabe Jones 9bfbeaf93e Armoire and Backgrounds December 2017 (#9659) 
* feat(content): Armoire and Backgrounds 2017/12

* chore(sprites): compile

* chore(news): Bailey
 2017-12-05 13:25:52 -06:00
SabreCat d72b40d5b0 Merge branch 'release' into develop 2017-11-29 05:07:42 +00:00
SabreCat 00dc990974 chore(event): end Thanksgiving, add Bailey 2017-11-29 05:03:01 +00:00
Garrett Scott d95836b881 Translator minor changes fixes #8917 (#9297) 
* Updated userItemsNotEnough string

* Added a variable to be passed to the deleteSocialAccountText string. This variable name is `magic_word` and is set as DELETE where used

* modified incorrectDeletePhrase to use a variable rather than translatable string for the word DELETE. Updated the DELETE-user test and the user api

* Changed noSudoAccess from translatable string to static

* Changed enterprisePlansEmailSubject from a translatable string to a static string within groupPlans.vue

* Fixed test problems with translation fixes

* Added no sudo access string to api messages

* changed plain string to apiMessage for no sudo access messages
 2017-11-27 20:08:39 -06:00
Joseti 9b8676f02e Changed "Donate" button to "Contribute" button (#9581) 
* Changed functionality of "donate"-button on static pages

* Changed strings to reflect change from "donate" to "contribute"
 2017-11-27 19:29:45 -06:00
Matteo Pagliazzi 53c83c585a fix navbar not showing up in homepage 2017-11-23 16:07:58 +01:00
SabreCat 2a5e9c0780 feat(event): Turkey Day 2017 
and (content) November Subscriber Items
 2017-11-17 22:21:05 +00:00
Sabe Jones 838b9a5822 Merge branch 'release' into develop 2017-11-15 01:03:07 +00:00
SabreCat dbc5b9f850 feat(content): Yarn Pet Quest 2017-11-15 00:53:10 +00:00
Matteo Pagliazzi 03a09b7546 Fix issues with Bootstrap Vue and Boostrap upgrades (#9452) 
* start to fix modals

* fixed cards paddings

* fix notifications not being marked as read

* add tests for reading a notification

* fixed indentation and added tests for reading multiple notifications

* register from home page using enter key
 2017-11-09 19:37:47 +01:00
SabreCat 74d8ecc732 Merge branch 'release' into develop 2017-11-09 17:24:48 +00:00
SabreCat 50d3226a86 feat(content): change to Thunderstorm Hatching Potions 2017-11-07 22:02:46 +00:00
Matteo Pagliazzi 0caa195c6f fix confetti image on home page 2017-11-07 20:34:52 +01:00
SabreCat d7ad3efabf fix(news): proper Take This announcement 2017-11-03 02:49:41 +00:00
SabreCat f8876fe055 feat(content): Backgrounds and Armoire 2017-11 
End Habitoween and Fall Festival
 2017-11-03 01:56:15 +00:00
SabreCat d5cedaa925 feat(event): Habitoween 2017-10-30 20:40:29 +00:00
SabreCat 2d4dc9e23c chore(news): blog Bailey 2017-10-26 21:13:04 +00:00
SabreCat dc3ee25e65 feat(content): subscriber items 
Also fix(sprites): resize and recanvas gift boxes
 2017-10-24 20:21:30 +00:00
SabreCat 0c973b1cf0 chore(news): Bailey 2017-10-21 03:33:42 +00: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 5ea20e4c8c fix(news): add links 2017-10-17 00:01:39 +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