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
1893 commits 3 branches 0 tags 1.6 GiB
Commit graph

1893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rob Scanlon
3139e51535 fix problem when updating task 2013-04-04 17:11:27 -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
367ca4a76b redirect about, team, extensions to the community site. remove header 2013-04-03 17:15:28 -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
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
Tyler Renelle
a966c2ce65 pets: rename base.name to from "Common" to "Base" for technical reasons 2013-03-28 00:34:05 -07:00
Tyler Renelle
6d6085e29b Merge branch 'ads' into pets 2013-03-28 00:28:59 -07:00
Tyler Renelle
157f0400e1 fix tokens migration script 2013-03-28 00:25:45 -07:00
Tyler Renelle
83bfee0fa3 and include email in apply_tokens 2013-03-27 23:23:19 -07:00
Tyler Renelle
a84d1920bf pets: remove unecessary css 2013-03-27 17:57:39 -07:00
Tyler Renelle
e44304f63a Merge branch 'pets' of github.com:lefnire/habitrpg into pets 2013-03-27 17:33:27 -07:00
Tyler Renelle
fdcf927a47 Merge pull request #739 from Shaners/pets 
Last Four Potions for New Pet System from Lemoness
 2013-03-27 17:32:50 -07:00