sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2968 commits 3 branches 0 tags 1.6 GiB
Commit graph

1014 commits

Author SHA1 Message Date
Tyler Renelle
109d46b2ca paypal: fix to #1615 , explicitly set rm variable to avoid POST / on 
paypal redirect
 2013-10-13 16:05:18 -07:00
Matteo Pagliazzi
68426c7ccb profile edits saved only on click 2013-10-13 20:47:59 +02:00
Matteo Pagliazzi
4e56df0e82 restore values saved only when Save is clicked 2013-10-13 19:58:13 +02:00
Matteo Pagliazzi
c3086c6194 fix not showing veteran wolf 2013-10-13 19:40:07 +02:00
Tyler Renelle
a53725da14 gems: add to tutorial on drop unlock 2013-10-12 20:22:56 -07:00
Tyler Renelle
890e8bf8b3 gems: can click main gem button, doens't require [+] 2013-10-12 20:08:06 -07:00
Tyler Renelle
81f9f9b4c5 gems: justin in gem-purchase dialog 2013-10-12 20:01:18 -07:00
Tyler Renelle
b4e5a1925b add donate button 2013-10-12 19:47:40 -07:00
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
Andre Casey
b3c3aeab05 Fixes #1556. Removed HTML code in popover for now. 2013-10-03 16:49:15 -07:00
Matteo Pagliazzi
bb8bbe4e0f remove stable flickering, fixes #1557 2013-09-29 16:43:01 +02:00
Dušan Juretić
602c78c1be show egg and potion count in inventory 2013-09-28 11:52:51 -04:00
Shane Lister
91c9e5627f Update profile.jade 
Reorder and add new skin choices.
 2013-09-26 23:23:30 -07:00
Matteo Pagliazzi
f816947b8e update blog link 2013-09-20 19:50:56 +02:00
Matteo Pagliazzi
8540e2f59b show group gems popover 2013-09-19 19:04:32 +02:00
Matteo Pagliazzi
86b3ca5d6b remove duplicate tooltip 2013-09-18 17:41:23 +02:00
Dušan Juretić
c6472bc615 fix hardcoded total pets count 2013-09-18 11:07:23 -03:00
Tyler Renelle
35945f0a44 change bailey links to her twitter 2013-09-17 15:40:20 -04:00
Tyler Renelle
e62007e74e add jquery.cookie for tour (suddenly required?) 2013-09-17 15:20:09 -04:00
Tyler Renelle
5006cda946 [#1394] fix customizationsNotification issue 2013-09-17 14:59:06 -04:00
Tyler Renelle
082bfd46da Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-17 14:16:11 -04:00
Tyler Renelle
36b3a77877 [#1397 #1543 #1540] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes 2013-09-17 14:10:10 -04:00
Matteo Pagliazzi
66a8af5959 Merge pull request #1545 from djuretic/develop 
Profile: allow deletion of websites
 2013-09-17 10:50:04 -07:00
Tyler Renelle
f26b0a2cf5 [#1394] add drop notifications back in 2013-09-17 12:16:16 -04:00
Dušan Juretić
daa06943ab fix user profile websites show/hide conditions 2013-09-16 22:59:08 -03:00
Tyler Renelle
bb2b17b24e Merge pull request #1538 from djuretic/develop 
Do not allow empty task names when editing tasks
 2013-09-16 13:33:38 -07:00
Dušan Juretić
64edf31eb4 show hatching potion selector after buying an egg 2013-09-15 16:40:20 -03:00
Dušan Juretić
72c4733a0f do not allow empty task names when editing tasks 2013-09-14 21:38:50 -03:00
Matteo Pagliazzi
98fa007f36 do not trigger validation error on float number, fix #1463 2013-09-13 20:01:22 +02:00
Matteo Pagliazzi
2523643dd5 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-09-13 18:31:16 +02:00
Matteo Pagliazzi
89d102aa1f do not show border on if habit has only + action 2013-09-13 18:23:02 +02:00
Tyler Renelle
d3ddbae767 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-12 16:43:18 -04:00
Tyler Renelle
d432397c27 [#1514] missing veteran achievement 2013-09-12 16:42:48 -04:00
Matteo Pagliazzi
0786fe90f9 add market prices, fix #1511 2013-09-12 19:16:01 +02:00
Tyler Renelle
bf032ce808 Merge branch 'origin-paglias-fix-guilds' into develop 
Conflicts:
	public/css/index.styl
 2013-09-11 17:18:36 -04:00
Matteo Pagliazzi
dc96df43cc add margin-right to all .btn, typo in stylus, add build to .nodemonignore 2013-09-11 20:36:57 +02:00
Matteo Pagliazzi
bf83291e0a add fix for joining guild 2013-09-11 16:32:56 +02:00
Matteo Pagliazzi
8e377d7343 fix various guilds issues 2013-09-11 16:28:14 +02:00
Tyler Renelle
01ac814b17 typo 2013-09-10 19:10:58 -04:00
Tyler Renelle
a7e99d0ac0 [#1396] add ability to show tour at any time. Also add ability to show 
Bailey at any time
 2013-09-10 18:36:10 -04:00
Tyler Renelle
598c4445ff [#1396] setup tour, using user.flags.showTour now instead of 
localStorage. double check with #1507
 2013-09-10 18:06:16 -04:00
Matteo Pagliazzi
21823564c2 add caching 2013-09-10 14:40:00 +02:00
Matteo Pagliazzi
9cc92ccb25 serve all css minimized & static files from /build 2013-09-10 12:29:43 +02:00
Tyler Renelle
a6590e7d84 [#1505] add memberServices into static. I'm adding way too many deps to the 
static page, I need to separate out authServices bare-bones & only use
that in static
 2013-09-09 21:25:45 -04:00
Tyler Renelle
23045fb72f formatting 2013-09-09 19:12:16 -04:00
Tyler Renelle
20354c7d8a member-since and last-logged-in 2013-09-09 19:04:46 -04:00