sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 15:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
15162 commits 3 branches 0 tags 1.6 GiB
Commit graph

591 commits

Author SHA1 Message Date
Sabe Jones
6d06685dfa 3.83.0 
(cherry picked from commit ea18489991)
 2017-03-29 03:58:14 +00:00
Sabe Jones
421bdce38b fix(sprites): don't get blocked (#8576) 2017-03-23 12:23:29 -05: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
SabreCat
01af658c2d 3.80.1 2017-03-16 19:43:18 +00:00
SabreCat
fc69a3a960 3.80.0 2017-03-15 00:49:36 +00:00
Matteo Pagliazzi
c5633e2074 client redesign: add infinite loading for guilds + misc fixes 2017-03-13 19:47:09 +01:00
SabreCat
237e0df611 3.79.2 2017-03-11 00:20:04 +00: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
d19237cdbe 3.79.0 2017-03-10 01:47:32 +00: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
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
Sabe Jones
3629f7f8a5 Merge branch 'release' into develop 2017-03-03 17:36:25 +00: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
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
Sabe Jones
68d8c0de51 3.77.0 2017-02-23 05:22:59 +00:00
Sabe Jones
2f9ff92cbd 3.76.0 2017-02-16 23:12:55 +00: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
Sabe Jones
d7df18a97a 3.75.3 2017-02-14 18:29:11 +00:00
Sabe Jones
ac566882fe 3.75.2 2017-02-08 22:02:59 +00:00
Sabe Jones
ffd36465c9 chore(packages): update passport 2017-02-07 00:25:41 +00:00
Matteo Pagliazzi
07ce68c596 remove newrelic 2017-02-05 18:43:00 +01:00
Matteo Pagliazzi
7121653515 3.75.1 2017-02-03 11:38:55 +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
fb8f0bed43 3.75.0 2017-02-02 22:08:17 +00:00
Sabe Jones
d52d759733 3.74.1 2017-02-02 15:45:23 +00:00
Sabe Jones
248b64a43f 3.74.0 2017-02-02 00:59:44 +00:00
Sabe Jones
d44c9ea853 3.73.1 2017-01-31 21:11:21 +00:00
Sabe Jones
f666f3cd04 3.73.0 2017-01-31 19:22:22 +00:00
Sabe Jones
1dad176320 3.72.1 2017-01-26 18:52:39 +00:00
Sabe Jones
ca448f081d 3.72.0 2017-01-25 00:35:36 +00: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
Matteo Pagliazzi
79c3efaf9c 3.71.0 2017-01-23 19:05:39 +01:00
Sabe Jones
9b456d1760 3.70.0 2017-01-21 03:13:36 +00:00
Sabe Jones
ad5b2fe540 3.69.1 2017-01-19 23:02:41 +00:00
Sabe Jones
281b8e2b7c 3.69.0 2017-01-19 22:09:56 +00:00
Sabe Jones
65eca22407 3.68.0 2017-01-18 01:26:58 +00:00
Matteo Pagliazzi
bbffa9830b client: replace deprecated vue-resource with axios, lint more file 2017-01-15 20:49:15 +01:00
Sabe Jones
08aa5758b4 3.67.1 2017-01-13 00:05:39 +00:00
Sabe Jones
1540ec89ee 3.67.0 2017-01-10 20:49:54 +00:00
Sabe Jones
0cac34dd26 3.66.3 2017-01-07 22:42:50 +00:00
Sabe Jones
121fd38bd1 3.66.2 2017-01-06 21:28:35 +00: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
Sabe Jones
e4bd466cc7 3.66.1 2017-01-06 02:37:50 +00:00
Sabe Jones
514d35c0be 3.66.0 2017-01-03 22:03:09 +00:00
Sabe Jones
d905ab7f86 3.65.2 2017-01-03 00:50:46 +00:00
Alys
12930a2bac 3.65.1 2016-12-31 07:47:49 +00:00