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

10468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer ecb2544cdc Merge pull request #5396 from hairlessbear/remove_freeRebirth 
Removed 'freeRebirth' from user model and everywhere else in codebase
 2015-06-15 08:00:18 -05:00
Blade Barringer 6ed306a7e0 Merge pull request #5403 from vIiRuS/iOS-IAP 
Enable in app purchase for iOS
 2015-06-15 07:42:57 -05:00
Matteo Pagliazzi d3353aa751 chore(i18n): update locales 2015-06-15 13:20:09 +02:00
Phillip Thelen 39adff0e2c improve error reporting for iOS IAP 2015-06-15 13:09:22 +02:00
Phillip Thelen e4a10d70ee Add human readable text to response 2015-06-15 12:57:08 +02:00
Phillip Thelen 6467dd8fc0 Merge pull request #1 from crookedneighbor/vIiRuS-iOS-IAP 
Viirus iOS iap - add tests
 2015-06-15 12:54:35 +02:00
Alys b6b2873faf add new GSalvadi audio theme, created by NomindTR 70d88957-673a-4edd-b97e-f1ecb018dd89 https://trello.com/c/tljx8gKC/18-music-sound-effects-v3 13 June 2015 2015-06-15 20:33:14 +10:00
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
Blade Barringer bb2f97e802 Added android tests for iap 2015-06-14 18:35:19 -05:00
Blade Barringer 1ea7193694 Add missing test 2015-06-14 18:11:07 -05:00
Blade Barringer 5b6afde475 Remove console.logs 2015-06-14 18:08:00 -05:00
Blade Barringer cd45fc06c6 Collapse return and res.json statements 2015-06-14 18:07:23 -05:00
Blade Barringer 6318b0828f Add test for iOS in-app purchases 2015-06-14 18:04:47 -05: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 090ac94eec Merge pull request #5406 from GitHubSphinx/Sphinx-entry1 
Rewording translation string error message
 2015-06-14 17:01:32 -05: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
GihHubSphinx 232888212a Rewording translation string error message 
Making error message about inaccurate translation match the UI link to
Report a Bug.

Addressing https://github.com/HabitRPG/habitrpg/issues/5405 to m
 2015-06-15 01:42:47 +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
Phillip Thelen 4aa9e81d8a Add data about armoire content to buy response 2015-06-14 18:08:58 +02: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
Phillip Thelen 6997783037 Check that iOS IAP is of correct type 2015-06-14 15:59:43 +02:00
Blade Barringer a6e0d5f2de Merge branch 'develop' into hairlessbear-pending_quest_display 2015-06-14 08:44:25 -05:00
Phillip Thelen 7ccf246119 Enable authentication for iOS IAP route 2015-06-14 15:28:30 +02: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