sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1514 commits 3 branches 0 tags 1.6 GiB
Commit graph

1514 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
3407565d37 remove console.log(req.headers.origin) 2013-03-08 18:10:26 -05:00
Tyler Renelle
023f8aeaad Merge branch 'origin-develop' 2013-03-08 18:05:06 -05:00
Tyler Renelle
399e4b9dda strange fix to CORS issue - move CORS middleware to top, respond with 
200 if OPTIONS request
 2013-03-08 18:04:57 -05:00
Tyler Renelle
1ddd06ce38 remove webkit-agent (thought i already did?) 2013-03-08 15:39:03 -05:00
Tyler Renelle
8cbf777232 allow OPTIONS, req.headers.origin || * 2013-03-08 15:34:37 -05:00
Tyler Renelle
5c7fdc7ff5 Merge branch 'origin-develop' 2013-03-08 14:33:40 -05:00
Tyler Renelle
75c1a38beb add x-api-user and x-api-key to accpeted headers 2013-03-08 14:33:19 -05:00
Tyler Renelle
354ed148f4 Merge branch 'origin-develop' 2013-03-07 14:31:43 -05:00
Tyler Renelle
1fadb7955a add exp overflow migration 2013-03-07 14:28:24 -05:00
Tyler Renelle
eba727249e add find_unique_user script for lost user accounts (https://github.com/lefnire/habitrpg/wiki/User-ID) 2013-03-07 13:40:04 -05:00
Tyler Renelle
36677c0585 Merge branch 'origin-develop' 2013-03-07 13:16:54 -05:00
Tyler Renelle
05bd0fdd52 semi-colons 2013-03-07 13:16:47 -05:00
Tyler Renelle
63c00a7261 add @MrConcepts normalization migration for busted busted values, and 
in preparation for another big algorithm upgrade
 2013-03-07 12:53:45 -05:00
Daniel Saewitz
d5b3d89a73 Rename user.stats.tnl to user.stats.toNextLevel 2013-03-06 23:50:19 -05:00
Daniel Saewitz
c9822efbf8 Fix broken tnl test 2013-03-06 23:50:16 -05:00
Tyler Renelle
ac419e7813 add default numbers for restore tool if one isn't provided: #594 2013-03-06 23:50:06 -05:00
Tyler Renelle
5b0dd6f797 Merge pull request #607 from switz/api-alg 
@lefnire => Fix broken tnl test
 2013-03-06 19:00:18 -08:00
Daniel Saewitz
7cb291c4de Rename user.stats.tnl to user.stats.toNextLevel 2013-03-06 20:39:48 -05:00
Daniel Saewitz
5141aeda78 Fix broken tnl test 2013-03-06 19:59:19 -05:00
Tyler Renelle
75aadf6eb1 add default numbers for restore tool if one isn't provided: #594 2013-03-06 13:32:10 -05:00
Tyler Renelle
db805b6388 Merge pull request #592 from aaron4/patch-1 
Added space after each line of text (privacy.html)
 2013-03-06 10:11:01 -08:00
Tyler Renelle
467cbfba64 Merge pull request #593 from aaron4/patch-2 
Added space after each line of text (terms.html)
 2013-03-06 10:09:42 -08:00
Tyler Renelle
1ecebe4cbb Merge branch 'master' into origin-develop 2013-03-06 12:48:48 -05:00
Tyler Renelle
f602f69893 Merge pull request #604 from MrConcept/algos 
New Algorithms + fixes
 2013-03-06 09:46:14 -08:00
Philip How
0dbf2257d7 New Algorithms + fixes 2013-03-06 17:02:08 +00:00
Tyler Renelle
722b5c7640 Merge pull request #601 from switz/api-alg 
Add 'To next level' to user stats on API
 2013-03-06 07:19:22 -08:00
Daniel Saewitz
5a1343a3b7 Set maxHealth to 50 2013-03-06 09:11:14 -05:00
Daniel Saewitz
ef7d705059 Add to next level to user stats on API 2013-03-06 08:45:51 -05:00
Tyler Renelle
27ce1b050b try x-requested-with for CORS 2013-03-05 23:05:59 -05:00
Tyler Renelle
b6564828ce use different rewards selector for items-unlocked popover, wasn't getting it 2013-03-05 21:41:01 -05:00
Tyler Renelle
4f7cdc38e9 add help popover to difficulty 2013-03-05 18:58:15 -05:00
Tyler Renelle
9c14b29a3d rename priority multiplier to "Difficulty" -> easy, medium, 
hard (people keep getting confused) and putting it back into
"advanced" section
 2013-03-05 18:07:22 -05:00
Tyler Renelle
df220b43df Merge branch 'develop' 2013-03-05 17:05:32 -05:00
Tyler Renelle
41b1ca9f73 typo 2013-03-05 17:05:05 -05:00
Tyler Renelle
b0b591dc96 Merge branch 'develop' 2013-03-05 17:04:31 -05:00
Tyler Renelle
6a280c57ea re-applying #553 fix 2013-03-05 17:04:22 -05:00
Tyler Renelle
a8c09110f7 reverting redisign commits. @zakkain some issues here ill follow up with you on - if i forget, "add" button in responsive layout, item store issues 2013-03-05 17:02:22 -05:00
Tyler Renelle
16b9ea3b58 reverting my #553 & html cleanup fixes, merge conflicts from redesign - gotta go through and do these again 2013-03-05 17:00:44 -05:00
Tyler Renelle
1cd3299388 strange fix for #553, also #539 take note 2013-03-05 16:16:08 -05:00
Tyler Renelle
9a60ed5269 some html cleanup 2013-03-05 16:06:56 -05:00
Tyler Renelle
bb82bcc62a namespacing for tasks & rewards too 2013-03-05 15:52:47 -05:00
Tyler Renelle
8132dbfe05 <task:> tabbing borked 2013-03-05 15:23:16 -05:00
Tyler Renelle
26a26b5344 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-05 14:23:00 -05:00
Tyler Renelle
4ca62b9f28 put splash middleware back in 2013-03-05 14:09:56 -05:00
Tyler Renelle
6bfe1d076e CORS middleware 2013-03-05 14:09:53 -05:00
Tyler Renelle
57b497f1bd put splash middleware back in 2013-03-05 14:09:39 -05:00
Tyler Renelle
26a8917862 tour fix 2013-03-05 14:02:57 -05:00
Tyler Renelle
22c5acc303 tour fix 2013-03-05 14:02:46 -05:00
Tyler Renelle
1f94085875 CORS middleware 2013-03-05 13:12:09 -05:00
aaron4
9ad67fa169 Added space after each line of text 
Same for this one. Added space to each line of text if line of text is following.
Also changed "Terms Of Use" to "Terms of Use".
 2013-03-05 10:42:40 -06:00