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

2959 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
4c018d84c1 Merge branch 'paypal' into develop 
Conflicts:
	bower.json
 2013-10-12 19:23:44 -07:00
Tyler Renelle
f8328d3eeb paypal: add configurable merchant and sandbox/production environment 2013-10-12 19:22:06 -07:00
Tyler Renelle
5de0c928fe paypal: conslidate buy gems modals 2013-10-12 16:51:01 -07:00
Tyler Renelle
09cd132420 paypal: begin adding paypal alternative to credit-card payments 2013-10-12 15:24:35 -07:00
Tyler Renelle
43be09a5d5 Merge pull request #1575 from Shaners/newSkin 
New skin tones
 2013-10-04 15:27:09 -07:00
Tyler Renelle
5464cdf34d Merge pull request #1592 from onduhray/popover_fix 
Removed HTML code in Guild Gems popover for now.
 2013-10-03 19:55:01 -07:00
onduhray
327a454f61 Merge pull request #1583 from onduhray/remove_docker 
Remove Docker from Gruntfile. Also rename Docs Readme.
 2013-10-03 17:32:27 -07:00
Andre Casey
b3c3aeab05 Fixes #1556. Removed HTML code in popover for now. 2013-10-03 16:49:15 -07:00
Andre Casey
730c82ccaf Removes devDependecies for docker from Package.json. 2013-09-30 19:11:14 -07:00
Matteo Pagliazzi
bb8bbe4e0f remove stable flickering, fixes #1557 2013-09-29 16:43:01 +02:00
Andre Casey
a1c4db8727 Updated DOCS-README.md for Docker 2013-09-28 14:59:34 -07:00
Andre Casey
7e056e5278 Removed Docker from Gruntfile. Changed Docs readme filename. 2013-09-28 11:43:01 -07:00
Dušan Juretić
602c78c1be show egg and potion count in inventory 2013-09-28 11:52:51 -04:00
Shane Lister
ab9d6a53fe Update customizer.styl 
Add new skin types to customizer style. Add shirts to cropped images for customizer to fit with other customization options.
 2013-09-26 23:25:50 -07:00
Shane Lister
91c9e5627f Update profile.jade 
Reorder and add new skin choices.
 2013-09-26 23:23:30 -07:00
Tyler Renelle
b0f0ec39d6 Merge pull request #1563 from lefnire/paglias/big-response 
Reduce response size
 2013-09-26 16:44:41 -07:00
Andre Casey
92485a938e Documentation configuration for Docker 
Includes:
- Gruntfile config
- read me for docs (docs-home.md. maps to --> docs-home.md.html)
- updated package.json for docker dep
- updated .gitignore to not include generated files
 2013-09-26 18:10:50 -04:00
Andre Casey
883646ddaa Remove generated html files from repo. 2013-09-26 18:10:42 -04:00
Andre Casey
ac7aba4ce0 Fix spelling error on Mongoose 2013-09-26 18:10:35 -04:00
Andre Casey
784113e9c1 updated generated .html files of documentation. 2013-09-26 18:10:28 -04:00
Andre Casey
48602e4f91 Added FIXME line, since this commented code was confusing. 
Not sure whether to comment it referring to doc.filters or if it is a legacy function.
 2013-09-26 18:10:21 -04:00
Andre Casey
978497656b add markdown to existing comments. 2013-09-26 18:10:11 -04:00
Andre Casey
cbc12b0077 Docoo stylesheets and fonts 2013-09-26 18:09:54 -04:00
Andre Casey
a119033763 oops. this was created by accidentally running docco in the wrong directly. removed. 2013-09-26 18:09:43 -04:00
Andre Casey
0296bb953f changed default docco.css to line things up better with headings and comments. 2013-09-26 18:09:36 -04:00
Andre Casey
ab669ac3c5 Default docco.css file, for styling generated html pages 2013-09-26 18:09:25 -04:00
Tyler Renelle
8aefe96910 Merge branch 'master' of github.com:lefnire/habitrpg 2013-09-22 12:57:30 -04:00
Tyler Renelle
423170d0cf Revert "Fixes the bower post install fail in windows. I think it should be fine on all other OS, but I don't have the environment set up to test it." 
This reverts commit 219bb4e572.
 2013-09-22 12:57:00 -04:00
Matteo Pagliazzi
993a255c46 may be fix for #1560 2013-09-22 17:29:16 +02:00
Matteo Pagliazzi
6b87a2065e readme typo 2013-09-22 13:26:45 +02:00
Matteo Pagliazzi
087f8eec81 readme typo 2013-09-22 13:26:10 +02:00
Matteo Pagliazzi
f6250b5333 rewrite readme 2013-09-22 13:24:43 +02:00
Matteo Pagliazzi
4287c19bc3 remove .gitmodules 2013-09-22 13:24:31 +02:00
Matteo Pagliazzi
4ded02e5dc fix getBuildUrl 2013-09-22 11:56:50 +02:00
Tyler Renelle
705bc9cd14 Revert "Fixes the bower post install fail in windows. I think it should be fine on all other OS, but I don't have the environment set up to test it." 
This reverts commit 219bb4e572.
 2013-09-21 22:40:34 -04:00
fragmental
219bb4e572 Fixes the bower post install fail in windows. I think it should be fine on all other OS, but I don't have the environment set up to test it. 2013-09-21 17:45:51 -05:00
Matteo Pagliazzi
3fb6f25c42 set reorder distance to 5px 2013-09-21 16:50:14 +02:00
Matteo Pagliazzi
332b4bd899 allow header to be scrolled horizontally 2013-09-21 16:25:17 +02:00
Matteo Pagliazzi
93aab9d459 typo 2013-09-21 16:14:19 +02:00
Matteo Pagliazzi
f816947b8e update blog link 2013-09-20 19:50:56 +02:00
Matteo Pagliazzi
55661a6659 typo 2013-09-20 18:05:01 +02:00
Matteo Pagliazzi
2c2367cf7c update store, fix #1553 2013-09-20 18:04:20 +02:00
Matteo Pagliazzi
2d02e49e06 always send _v 2013-09-20 16:09:55 +02:00
Matteo Pagliazzi
0c0e0834be send response only if modified or drop 2013-09-20 16:01:09 +02:00
Matteo Pagliazzi
3b273dadee typo 2013-09-20 16:00:07 +02:00
Matteo Pagliazzi
6444d5796e set wasmodified to true if missing req.query._v 2013-09-20 15:59:17 +02:00
Matteo Pagliazzi
8540e2f59b show group gems popover 2013-09-19 19:04:32 +02:00
Matteo Pagliazzi
2c32095924 confirmation when leaving party or guilds, fix #866 2013-09-18 20:09:35 +02:00
Matteo Pagliazzi
86b3ca5d6b remove duplicate tooltip 2013-09-18 17:41:23 +02:00
Matteo Pagliazzi
190c617d4c fix #1045 2013-09-18 17:02:17 +02:00