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

16 Commits

Author SHA1 Message Date
Blade Barringer 306505ebab fix(api,client): Pass in predictable random to revive randomVal calls 
closes #8085
 2016-09-30 08:39:30 -05:00
Sabe Jones ca935670f7 chore(event): GaymerX armor & news 2016-09-29 16:16:43 +00:00
Phillip Thelen e3b484b29a Add Google Signin (#7969) 
* Start adding google login

* fix local js issue

* implement syntax suggestions

* fix delete social tests

* Add service for authentication alerts

* fix social login tests

* make suggested google sign in changes

* fix accidentally deleted code

* refactor social network sign in

* fix incorrect find

* implement suggested google sign in changes

* fix(tests): Inject fake Auth module for auth controller

* fix(test): prevent social service from causing page reload

* fix loading user info

* Use lodash's implimentation of find for IE compatibility

* chore: increase test coverage around deletion route

* chore: clean up social auth test

* chore: Fix social login tests

* remove profile from login scope

* fix(api): Allow social accounts to deregister as user has auth backup

* temporarily disable google login button
 2016-09-28 12:11:10 +02:00
Blade Barringer 913cb16638 refactor: move randomVal to a lib 2016-09-26 11:55:07 -05:00
Blade Barringer 331993c1df refactor: remove seeding from randomVal 2016-09-26 11:55:07 -05:00
Blade Barringer 136e2de125 refactor: adjust randomDrop to use wrapped random function 2016-09-26 11:55:07 -05:00
Blade Barringer 966a50431f refactor: Move user argument to options in randomVal function 2016-09-26 11:55:07 -05:00
Blade Barringer 4df1601718 fix(api): Armoire actually works randomly 2016-09-26 11:55:07 -05:00
Thomas Gamble 4d5b6992be drops are randomly selected, not based on user values fixes #7929 2016-09-26 11:55:07 -05:00
Tom Gamble b54441a637 Shows quest progress notification when completing task #7922 (#7951) 2016-09-23 20:41:31 -05:00
Sabe Jones 5480157977 fix(shops): 2h weapon pricing 2016-09-23 15:43:45 +00:00
Kaitlin Hipkin 5f0c1687b5 Remove unused v2 code from /website/common/script (#8034) 
* remove apiv2 behavior from ops

* remove apiv2 behavior from fns
 2016-09-22 21:23:46 -05:00
Sabe Jones ca97732f21 Cows and Ghosts (but no cow ghosts) (#8052) 
* feat(content): Mystery Items and Ghost Potions

* fix(news): better cow position

* fix(test): update for season
 2016-09-22 13:04:15 -05:00
Sabe Jones 676d9aedf1 Begin Fall Festival 2016 (#8043) 
* feat(event): begin Fall Festival 2016

* feat(event): Seasonal Shop Fall 2016

* fix(test): season specific food

* chore(news): add Bailey

* fix(season): correct Sorceress & timetrav
 2016-09-20 20:11:32 -05:00
Blade Barringer 248fd1d912 chore(docs): Add documentation for valid skill ids 2016-09-19 21:54:02 -05:00
Blade Barringer 81b7eeeb71 Common reorg (#8025) 
* Re-organize common folder

* fix: Correct paths in tests

* fix: move new content to proper folder

* chore: Move audio folder to assets

* Move sprites to sprites assets directory

* Move css sprites to assets directory

* Split out readmes for common code and sprites

* Move images to assets directory

* Move destinatin of shared browserified file

* remove unused file

* move compiled js to client-old

* Fix karma tests

* fix: Correct paths for sprites
 2016-09-16 17:18:07 +02:00