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

2015 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shane Lister
35da5c2a1e Fix to some pixel grid alignment issues 2013-04-06 10:06:37 -07:00
Tyler Renelle
69d8d478da Merge branch 'develop' 2013-04-06 12:56:28 -04:00
Tyler Renelle
1beb50c1fc Merge pull request #779 from Shaners/develop 
Rename the Sprinkle Button to Pour
 2013-04-06 08:28:29 -07:00
Shane Lister
4742e4236e Update pets.html 
Changing the sprinkle button to say pour.
 2013-04-05 22:55:34 -07:00
Shane Lister
70e75b6515 Merge pull request #11 from lefnire/develop 
Update my develop branch
 2013-04-05 22:04:17 -07:00
Tyler Renelle
db4ebe3813 add bs-docs-masthead 2013-04-05 14:16:26 -04:00
Tyler Renelle
4260361a65 Merge branch 'develop' 2013-04-05 13:50:39 -04:00
Daniel Saewitz
9808b9a9f7 Merge pull request #770 from arscan/valuefix 
Fixes bug when user attempts to create task with no value field through the API
 2013-04-04 17:31:43 -07:00
Rob Scanlon
4958690bcb update a test to check for undefined value when making new habit 2013-04-04 18:09:06 -04:00
Tyler Renelle
234d3725be nix the "remove if empty auth & no more session" cron task 2013-04-04 18:01:53 -04:00
Tyler Renelle
85432cabdc cap minimum %chance of drop to 1% so users still rewarded for 
championed habits. Will remove once we have streaks / combos. Also
factor in task difficulty
 2013-04-04 18:01:46 -04:00
Tyler Renelle
02a1a0d3b4 cap minimum %chance of drop to 1% so users still rewarded for 
championed habits. Will remove once we have streaks / combos. Also
factor in task difficulty
 2013-04-04 18:01:06 -04:00
Tyler Renelle
aba7a67457 Merge branch 'master' into develop 2013-04-04 17:44:28 -04:00
Tyler Renelle
dd736923ca Merge pull request #757 from ThibG/master 
Fix rewards moving / item unlocking
 2013-04-04 14:43:34 -07:00
Tyler Renelle
a07dbaf9fd nix the "remove if empty auth & no more session" cron task 2013-04-04 17:38:31 -04:00
Rob Scanlon
3139e51535 fix problem when updating task 2013-04-04 17:11:27 -04:00
Tyler Renelle
584759bd25 shift some require() statements around, attempt to get things out of 
app.coffee top-level scope - working towards mem leak fix
 2013-04-04 16:44:54 -04:00
Tyler Renelle
1c2cc06a6e BREAKING CHANGE! this removes list cleanup / re-establishment. In the past, id-lists in refLists were being completely emptied (see #85 & #86). I'm still not sure why (see https://github.com/codeparty/racer/issues/101 or https://github.com/codeparty/derby/issues/237 possibly?). This commit reverts working around that issue, but potentially fixes #769. Going to test this on heroku a bit before merging in 2013-04-04 16:24:13 -04:00
Tyler Renelle
0abbc98b1c move all view helpers out of their respective files and into 
helpers.coffee. we need viewHelpers at top-level scope, but nothing
else per se - this is preparation for memory leak fixing
 2013-04-04 16:17:30 -04:00
Rob Scanlon
4113eefaf1 Fixes bug when user attempts to create task with no value field 2013-04-03 22:51:41 -04:00
Tyler Renelle
ee281cf352 Merge branch 'develop' 
Conflicts:
	src/server/static.coffee
 2013-04-03 17:18:27 -04:00
Tyler Renelle
367ca4a76b redirect about, team, extensions to the community site. remove header 2013-04-03 17:15:28 -04:00
Tyler Renelle
c45885cfac redirect extensions to community site 2013-04-03 16:37:32 -04:00
Tyler Renelle
6c8bd52a11 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-04-03 16:37:18 -04:00
Tyler Renelle
1bdbd93afa redirect extensions to community site 2013-04-03 16:37:05 -04:00
Tyler Renelle
da5b06f916 Merge pull request #760 from yangit/develop 
Develop
 2013-04-03 11:32:37 -07:00
yangit
6369e8e9c0 using eval tests 2013-04-02 22:08:16 +08:00
yangit
032564334c using eval tests2 2013-04-02 22:05:36 +08:00
yangit
8a6fede4fe using eval tests2 2013-04-02 21:47:37 +08:00
yangit
c9112feaf7 using eval tests 2013-04-02 21:30:53 +08:00
yangit
2570e5e134 stats tests ok 
tests splitted into files
add.items tests fail
 2013-04-01 22:43:26 +08:00
Thibaut Girka
96d1dbd430 Fix rewards being movable only once and item tooltips not showing up after that 2013-03-31 23:34:20 +02:00
Tyler Renelle
41449d349a protocol-agnostic amazon images & hover-script at the end 2013-03-31 00:27:47 -07:00
Tyler Renelle
a189aae8bc Merge branch 'develop' 2013-03-31 00:06:40 -07:00
Tyler Renelle
ce43a7503b no more adsense, switching to amazon affiliates because of https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo 2013-03-31 00:06:29 -07:00
Tyler Renelle
16643e8b1c Merge branch 'develop' 2013-03-30 18:46:15 -07:00
Tyler Renelle
c9907f9558 move some external script loading into app.on('render') to see if that 
solves https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo
 2013-03-30 18:45:57 -07:00
Tyler Renelle
d90f594cb8 Merge remote-tracking branch 'origin/pets' into develop 2013-03-30 13:08:43 -07:00
Tyler Renelle
533deb7c83 Merge pull request #751 from Shaners/pets 
More Gem Sizes
 2013-03-30 09:16:06 -07:00
Shane Lister
b5665cdd7c new line 2013-03-29 22:50:15 -07:00
Shane Lister
86102ce8e7 More Gem sizes 2013-03-29 22:44:44 -07:00
Tyler Renelle
96ce6da743 update habit version to upgrade nodemodules 2013-03-29 22:39:56 -07:00
Tyler Renelle
ea92779ef8 Merge branch 'master' of github.com:lefnire/habitrpg 2013-03-29 22:29:09 -07:00
Tyler Renelle
be83a2c46e Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-29 22:28:27 -07:00
Tyler Renelle
9b42eb825b small ads & static-bindings cleanup (doesn't fix the ads issue) 2013-03-29 21:48:08 -07:00
Stan Lindsey
acfb76c243 renamed comments 2013-03-29 21:38:13 +00:00
Tyler Renelle
1444143c7b Merge pull request #748 from switz/translations 
@lefnire => Remove translations for now
 2013-03-29 11:17:53 -07:00
Daniel Saewitz
2b59c205a2 Remove translations for now 2013-03-29 14:15:17 -04:00
Stan Lindsey
d81cbe570b Merge pull request #743 from Shaners/pets 
Addition of Gem
 2013-03-29 03:50:10 -07:00
Stan Lindsey
bb2ba07672 Update app.json 2013-03-29 10:46:42 +00:00