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

1900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Stan Lindsey e2dc08bae0 Update app.json 2013-03-29 10:23:39 +00:00
Shane Lister f72c8f33ec Added Gem to Sprite Sheet and Egg CSS 2013-03-28 19:04:01 -07:00
Shane Lister 9ecb53747c Merge pull request #10 from lefnire/pets 
Update my Pets Branch
 2013-03-28 17:04:25 -07:00
Stan Lindsey ef12b2adce Incomplete up of EN "translation" 2013-03-28 22:29:54 +00:00
Tyler Renelle f87ab6866f Merge branch 'master' of github.com:lefnire/habitrpg 2013-03-28 08:46:50 -07:00
Tyler Renelle b03bf8ea60 Merge branch 'develop' 2013-03-28 08:43:25 -07:00
Tyler Renelle 51f054e51c show tokens in character modal at all times 2013-03-28 08:43:13 -07:00
Stan Lindsey 6ba25e40b0 Added Community Link 2013-03-28 11:29:02 +00:00
Stan Lindsey e0a28514c7 Added Community Link 2013-03-28 11:27:52 +00:00
Tyler Renelle f57734eda5 Merge branch 'develop' 2013-03-28 01:36:29 -07:00
Tyler Renelle 3d36a3f531 "new stuff" update 2013-03-28 01:36:18 -07:00
Tyler Renelle f3c43628c7 Merge branch 'develop' 2013-03-28 00:52:22 -07:00
Tyler Renelle d2b4072ad6 better wording on buying tokens 2013-03-28 00:49:57 -07:00
Tyler Renelle 88badc4929 pets: list cost of items in market 2013-03-28 00:36:57 -07:00