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

15 Commits

Author SHA1 Message Date
Blade Barringer bfc7b9d3e8 fix(client): allow admins to open flag modal regardless of flag status 
fixes #8078
 2016-09-28 08:16:06 -05: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
Tom Gamble b54441a637 Shows quest progress notification when completing task #7922 (#7951) 2016-09-23 20:41:31 -05:00
Blade Barringer c5888e3d21 fix(client): Allow backgrounds to be changed 2016-09-23 07:04:11 -05:00
Blade Barringer 2ca185474f fix(client): Advanced options not using preference when creating task 
closes #8033
 2016-09-22 21:41:42 -05: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
Blade Barringer 5ceb470464 Merge pull request #8031 from Ozzystrasza/challenges_select_all 
Fix "All" button to select all guilds in the filter list
 2016-09-20 08:08:31 -05:00
Blade Barringer e3b9636c42 refactor(cient): Simplify char resize logic 
closes #6836
 2016-09-18 21:27:59 -05:00
Lucas Torroba 7f5d070ee6 Fixes issue #6679, which referred to the EXP chart getting cropped. 2016-09-18 21:26:59 -05:00
Ozzystrasza f3f4229e49 use groupsFilter for search.group 2016-09-17 00:23:16 -03: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
Blade Barringer 9c0998c29a refactor(client): extract find pet logic into function 2016-09-15 22:02:11 -05:00
Oziris Moreira 4ad50b9d30 Fix Magic Mount Spacing (#8015) 
* fix magic mount spacing

* simplify functions

* function hasAPetOfPotion

* var premiumPotion
 2016-09-15 22:01:31 -05:00
Matteo Pagliazzi 0d1b5aad7e rtc fixes: do not show notification if message was sent by current user from different computer or mobile, put back message syncing on posting for guilds and tavern 2016-09-14 23:19:32 +02:00
Matteo Pagliazzi 4b48b7a5f6 rename website/client to website/client-old 2016-09-14 15:06:32 +02:00