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

11223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kylestratis b5efa4ae4c Additional formatting 2015-11-11 21:25:22 -05:00
kylestratis 77ded02fa0 Formatting changes for readability 2015-11-11 21:05:08 -05:00
kylestratis be3fe8f1f4 Added check for existence of dateTerminated field 2015-11-10 22:39:53 -05:00
kylestratis b75f044d07 Changed Mongo query to check DateTerminated to prevent accumulation of mystery items when subscription is ended. 2015-10-25 18:16:42 -04: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
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 fc9d0775ab add migration for lowercase version of emails and username 2015-10-21 11:19:14 +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
Alys 2745a172ea Merge pull request #6076 from claushellsing/patch-2 
Update README.md
 2015-10-21 15:37:04 +10:00
Rainer Eli 32cb29b45f Update README.md 2015-10-20 22:48:58 -06: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
Blade Barringer 23398b1a37 Closes #6071 2015-10-20 12:39:04 -05: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 2883dc6c85 Merge branch 'ksami-develop' into develop 2015-10-19 08:14:48 -05: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
Blade Barringer 4a3e60d0d7 Merge branch 'develop' into ksami-develop 2015-10-19 06:26:34 -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
Blade Barringer fcec018616 Merge pull request #6009 from locks/patch-2 
Typo in test description string
 2015-10-18 21:35:51 -05:00
Blade Barringer dbc9c5a48c Merge pull request #6008 from locks/patch-1 
Typo in comment string
 2015-10-18 15:29:29 -05:00
Phillip Thelen 7a7d038602 Split up tutorial parts 2015-10-18 17:29:06 +02:00
Blade Barringer c5b0e82acb Merge pull request #6057 from Vorgone/develop 
Refactor API unit tests
 2015-10-16 19:26:21 -05:00
Alex Hart d7498245dc Refactor API unit tests 
Move GET /user tests from status.coffee to users.coffee.
Remove GET /status test that uses user id and token.
 2015-10-16 14:59:09 -05:00
ksami 65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Alys 8af975755f Merge pull request #6049 from nivl4/develop 
Updated vagrant provisioning script to update npm to the latest version
 2015-10-16 06:12:43 +10:00
Matteo Pagliazzi 215ca0371c fix(signup): correct email checks 2015-10-15 19:52:21 +02:00
Matteo Pagliazzi 69fdff615a use lowercase only emails - register phase 2015-10-15 18:26:23 +02:00
nivl4 485dc68fe4 Updated vagrant provisioning script to update npm to the latest version as the older version (1.4.28) was causing the following error during npm install. 
npm ERR! EEXIST, open '/home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock'
File exists: /home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock
Move it away, and try again.

npm ERR! System Linux 3.2.0-23-generic
npm ERR! command "/usr/bin/node" "/usr/bin/npm" "install" "--no-bin-links"
npm ERR! cwd /vagrant
npm ERR! node -v v0.10.37
npm ERR! npm -v 1.4.28
npm ERR! path /home/vagrant/.npm/9fb4c098-adable-stream-1-0-33-package-tgz.lock
npm ERR! code EEXIST
npm ERR! errno 47
npm ERR! not ok code 0
 2015-10-15 21:51:36 +08:00
Sabe Jones 380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Phillip Thelen 4835de55a8 Adjust iap test 2015-10-15 00:09:24 +02:00
Phillip Thelen 319c294354 Fix global variable leak 2015-10-15 00:08:25 +02:00
Sabe Jones e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount 
Jack-O'-Lantern mounts
 2015-10-14 16:46:55 -05:00
Phillip Thelen b0922f04b8 Handle new possible iOS in-app-purchases 2015-10-14 23:21:19 +02:00
Sabe Jones 59b2c1662e fix(news): Revised Bailey 2015-10-14 12:54:33 -04:00
Alys f9a3884c79 Merge pull request #6044 from roryokane/patch-1 
Fix capitalization of “GitHub” on Contact Us page
 2015-10-14 18:11:16 +10:00
Rory O’Kane 4a23f40415 Fix capitalization of “GitHub” on Contact Us page 
The live page is at https://habitica.com/static/contact.
 2015-10-14 03:55:46 -04:00