Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,346 Commits 64 Branches 1,256 Tags
5754b4f72a4fe2f8a8445e27e8ae8d358ddbcebb
Commit Graph

1552 Commits

Author SHA1 Message Date
Blade Barringer b70597e1d1 Merge pull request #6122 from crookedneighbor/batch_update_adjustment 
Batch update adjustment
 2015-10-27 21:35:19 -05:00
Blade Barringer ed464a2b70 Merge pull request #6127 from crookedneighbor/reinstate_amplitude 
Reinstate amplitude
 2015-10-27 21:35:10 -05:00
Blade Barringer cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
Blade Barringer a7c52e6086 Reinstate amplitude analytics 2015-10-27 19:37:57 -05:00
Matteo Pagliazzi 3bae95d3ae remove console.log for push notifications 2015-10-27 22:11:47 +01:00
nicolevonvon 47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00
Matteo Pagliazzi 7541c5a260 fix(analytics): disable amplitude 2015-10-27 17:59:29 +01:00
Matteo Pagliazzi d05b00fb34 fix(analytics): enable analytics and correctly export methods 2015-10-27 17:39:37 +01:00
Matteo Pagliazzi 2443177729 fix(server): disable analytics until bug is fixed 2015-10-27 17:26:15 +01:00
Matteo Pagliazzi 98a00fcb4e fix(memory) do not check for new relic until it is enabled again 2015-10-27 17:10:46 +01:00
Blade Barringer f9afc8a8c6 Reorganize development user operations 2015-10-27 08:48:18 -05:00
Blade Barringer 4886b50aa3 Add testing for batch update. Handle unknown operations better. 2015-10-27 08:13:30 -05:00
Alys 1cc7ea872f chore(news): Exhaust Strike Bailey - recommiting after temporary removal 2015-10-27 19:18:05 +10:00
Alys 23059763eb revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment 2015-10-27 18:45:30 +10:00
Alys a29c412781 prevent addTenGems and addHourglass being used in production -- PRs https://github.com/HabitRPG/habitrpg/pull/6115 and https://github.com/HabitRPG/habitrpg/pull/6117 by nivl4 2015-10-27 18:31:17 +10:00
Sabe Jones f5d6c92897 chore(news): Exhaust Strike Bailey 2015-10-27 00:24:11 -04:00
Blade Barringer c04b27ffd5 Simplify community guidelines string 2015-10-26 18:08:45 -05:00
Blade Barringer f0e4149adb Merge branch 'develop' into ksami-develop 2015-10-26 17:56:05 -05:00
Blade Barringer 4dd368a028 Merge pull request #6082 from anilanar/reroll-syntax-bug 
fix a minor syntax error when opening reroll modal.
 2015-10-26 17:55:16 -05:00
Blade Barringer a556cf1c13 Merge pull request #6113 from crookedneighbor/ogAc8BA0_prevent_changing_class_change_from_api 
ogAc8BA0 - prevent changing class change from api without spending gems
 2015-10-26 17:45:56 -05:00
Blade Barringer 2790008937 Adjust error message to not point to a readme file that does not exist. 2015-10-26 17:27:08 -05:00
Blade Barringer 13bca6b9a9 Prevent class from being changed via PUT /user 2015-10-26 17:25:51 -05:00
Sabe Jones 392889c7da feat(mystery): October 2015 subscriber set 2015-10-23 15:45:43 -04:00
ksami f2c856f6e6 Make link translatable in options/inventory/time-travelers 2015-10-23 23:40:11 +08:00
ksami b3cc58886c Make strings translatable in options/social/chat-box 2015-10-23 23:20:59 +08:00
Sabe Jones bcc522f08d feat(sharing): Add Tumblr button 2015-10-22 13:52:26 -04:00
Sabe Jones d08a3efbcd fix(news): Bogus trailing slash 2015-10-22 12:04:43 -05:00
Anil Anar e269e04172 fix a minor syntax error when opening reroll modal. 2015-10-22 09:24:04 +02:00
Sabe Jones 9fb671f068 fix(social): Better share image 2015-10-21 16:25:03 -05:00
Sabe Jones a2c0e02283 fix(social): Correct OG tag errors 2015-10-21 16:37:33 -04:00
Sabe Jones d32f6f23cc feat(sharing): Improved front page FB share 2015-10-21 15:59:17 -04:00
Matteo Pagliazzi e75d3547c5 force emails to lowercase and use a lowercase version of username to check for duplicates 2015-10-21 13:14:18 +02:00
Matteo Pagliazzi c7f8426bce preparation for code for lowercase emails and lowercase version of username to check for duplicates 2015-10-21 11:01:06 +02:00
Sabe Jones d4146d69e2 Merge pull request #6072 from HabitRPG/sabrecat/pets-201510 
Pet Quest for October 2015
 2015-10-20 18:12:19 -05:00
Sabe Jones 5fbd6814b0 fix(pets): Realign frog sprites 
Also adds a note about the To-Do sorting fix to the Bailey announcement
 2015-10-20 18:55:57 -04:00
Sabe Jones d0a34fc0ad feat(quests): 2015-10 Pet 
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
 2015-10-20 12:32:45 -04:00
Sabe Jones 0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Blade Barringer 703caeadff Merge pull request #6038 from vIiRuS/patch-5 
store iOS tutorial steps
 2015-10-19 17:49:13 -05:00
Blade Barringer a0753d31b2 Merge pull request #6046 from vIiRuS/newIAPs 
Handle new possible iOS in-app-purchases
 2015-10-19 17:49:01 -05:00
Matteo Pagliazzi ad6be153f4 Revert "use lowercase only emails - register phase" 
This reverts commit 69fdff615a.
 2015-10-19 19:42:25 +02:00
Matteo Pagliazzi 7a2d2fd3dc Revert 215ca0371c 2015-10-19 19:42:13 +02:00
Blade Barringer 9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer d9de32f2dc Add todo to investigate magic numbers 2015-10-19 08:04:47 -05:00
Blade Barringer 1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Blade Barringer 931d688637 Use Content service 2015-10-19 08:03:14 -05:00
Blade Barringer f03be07595 Add extra line breaks 2015-10-19 08:02:35 -05:00
Phillip Thelen 2fde3c771f remove empty line 2015-10-19 12:50:30 +02:00
Phillip Thelen 3a42711427 nicer style for default gem value 2015-10-19 12:48:50 +02:00
Phillip Thelen 7a7d038602 Split up tutorial parts 2015-10-18 17:29:06 +02:00