Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,645 Commits 64 Branches 1,256 Tags
05effefef1165aab0c8674f51bb659eea7af266d
Commit Graph

9645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hairlessbear 05effefef1 Merge pull request #7 from crookedneighbor/hairlessbear-quest_invite_modal_on_user_sync 
Make party page sync the party automatically (includes hacky fix for #4816)
 2015-06-14 22:27:32 -04:00
Blade Barringer 00c50f1212 Fixes #4816 2015-06-14 21:17:18 -05:00
Blade Barringer bb73253e8e Make party page sync the party automatically 2015-06-14 19:26:01 -05:00
hairlessbear 6884263a55 Replaced accept/reject button actions with 'questAccept(party)' and 'questReject(party)' respectively to solve sync issues 2015-06-14 20:21:58 -04:00
hairlessbear fbf1d64a04 Moved accept/reject buttons to the bottom, and simplified logic for quest leader buttons 2015-06-14 20:12:50 -04:00
hairlessbear 22ca76cf40 Added quest accept/reject to pending quest display 2015-06-14 19:46:43 -04:00
hairlessbear dc8cdc1930 Merge pull request #6 from crookedneighbor/hairlessbear-quest_invite_modal_on_user_sync 
Hairlessbear quest invite modal on user sync - bring up to date with develop
 2015-06-14 18:02:10 -04:00
Blade Barringer 5385471cb2 Fix push notifications test 2015-06-14 17:00:13 -05:00
Blade Barringer 14fe29dd4a Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync 2015-06-14 16:33:38 -05:00
Blade Barringer 92e2393114 Merge branch 'hairlessbear-pending_quest_display' into develop 2015-06-14 16:20:20 -05:00
Blade Barringer 109acb0d97 Correct ng-style syntax 2015-06-14 16:15:31 -05:00
Blade Barringer 4b3d82613e Allow leader to be shown in member list; do not allow leader to kick out self from group 2015-06-14 12:54:21 -05:00
Blade Barringer 795710ce63 Rename boss folder to quests 2015-06-14 11:05:53 -05:00
Blade Barringer 35f2a36215 Split out pieces of boss jade files 2015-06-14 10:48:46 -05:00
Blade Barringer 178e7b1c8c Move participants to partial 2015-06-14 10:14:05 -05:00
Blade Barringer 44a556f4fe Refactor to use tabset 2015-06-14 09:01:28 -05:00
Blade Barringer a6e0d5f2de Merge branch 'develop' into hairlessbear-pending_quest_display 2015-06-14 08:44:25 -05:00
Blade Barringer b4f4db9c1d Create jade variabel for ultimate gear check 2015-06-14 01:56:32 -05:00
Blade Barringer c44ca785aa Merge branch 'develop' into SabreCat-develop 2015-06-14 01:50:16 -05:00
Blade Barringer d89ee5fff2 Adjust margin 2015-06-14 01:36:38 -05:00
Blade Barringer 831f5b89bd Merge branch 'develop' into nthomsn-develop 2015-06-14 01:27:35 -05:00
Blade Barringer 41b1abba3a Checkout help button changes 2015-06-13 23:16:12 -05:00
Blade Barringer 0eb8caec23 Various task ui improvements 
* Use bootstrap form-control class for text and notes
* Can't edit start date or days of the week in challenge dailies from website
* Refactor dailies
 2015-06-13 22:29:06 -05:00
Blade Barringer 3457068351 Cleaned up location of test files 2015-06-13 21:11:43 -05:00
Blade Barringer 2134465a75 Impliment check for leader object's existence in challenge search 2015-06-13 20:50:32 -05:00
Blade Barringer 703a2511da Merge branch 'TheHollidayInn-challenges-owner-filter' into develop 2015-06-13 19:42:54 -05:00
Blade Barringer 6513527d8b Refactor challenges filter 2015-06-13 19:41:41 -05:00
Blade Barringer ddb28c0305 Merge branch 'develop' into TheHollidayInn-challenges-owner-filter 2015-06-13 18:23:51 -05:00
Blade Barringer 9d4713bdf3 Merge pull request #5392 from GitHubSphinx/Sphinx-entry1 
Still addressing #5202 - making Click for help button translatable
 2015-06-13 18:01:57 -05:00
Blade Barringer c490f9338d Merge pull request #5394 from hairlessbear/ultimateGear_orb_logic_fix 
Removed user.achievements.ultimateGear checks from orb of rebirth logic
 2015-06-13 18:01:15 -05:00
Blade Barringer 90173e6943 Remove unused html files 2015-06-13 15:18:04 -05:00
Blade Barringer b052f803e4 Initialize user.filterQuery as undefined 2015-06-13 14:09:08 -05:00
Blade Barringer 62f12cf8b5 Correct path of translations mock 2015-06-13 13:39:21 -05:00
Blade Barringer 8fe4d9a5a8 Merge branch 'blade-feature/search' into develop 2015-06-13 12:40:08 -05:00
Blade Barringer 3e32d4244f Adjust formatting of task ordering filter 2015-06-13 12:39:20 -05:00
Blade Barringer 8faf96f5b9 Refactored filters 2015-06-13 12:39:11 -05:00
Blade Barringer 71407478b7 Merge pull request #5389 from JiriChara/feature/search 
Enable filtering for tasks and custom rewards
 2015-06-13 12:01:00 -05:00
Blade Barringer 719907189f Organized spec folder 2015-06-13 09:58:08 -05:00
Jiří Chára 653d601d04 Merge pull request #1 from crookedneighbor/blade-feature/search 
Blade feature/search
 2015-06-13 09:53:16 +02:00
Blade Barringer 5d56bd02ef Merge branch 'develop' into blade-feature/search 2015-06-13 00:10:44 -05:00
hairlessbear 2504b06026 Removed user.achievements.ultimateGear checks from orb of rebirth logic (fixes #5352) 2015-06-12 17:17:50 -04:00
Sabe Jones e2ba8fb859 fix(achievement): Ultimate Gear logic 
Fixes #5387.
 2015-06-12 15:35:34 -05:00
Blade Barringer 2f1111522c Adjust PR #5389 
* Convert $watch to ng-change and re-wrote test
* Removed unnecessary styles
* Use .form-control instead of class='form-control'
 2015-06-12 09:05:06 -05:00
GihHubSphinx fc5cb5d228 Still addressing #5202 
The last thing left as it seems is Click for help toolbar
 2015-06-12 17:42:40 +05:00
Blade Barringer 3f8066eee5 Compile sprites 2015-06-11 20:24:52 -05:00
Blade Barringer 8d450aefb8 Replace head sprites with dark outline versions 
Closes #5171
 2015-06-11 20:24:19 -05:00
Blade Barringer 54681e36b5 Merge branch 'develop' into blade-Finish_weeklies_pr v1.0.1 2015-06-11 19:47:46 -05:00
Matteo Pagliazzi 5d84ead3f8 add image for bulk email 2015-06-11 22:17:34 +02:00
Jiri Chara b413e38682 Put tasks filter field to the right 2015-06-11 22:16:40 +02:00
Sabe Jones 4da4777ddd chore(news): Every X Bailey 2015-06-11 14:22:39 -05:00