e45d8307e7
Subdocs & script templates. Migrate the API from User.tasks =>
...
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
2013-10-28 11:34:07 -07:00
e81193ef28
challenges: pull in updates from the old 0.5 branch
2013-10-28 11:34:07 -07:00
e0c95b3a86
port member modal to group members list, fix #1656
2013-10-28 18:27:03 +01:00
23c3bcfa32
add ability to group leader to remove members, fix #1639
2013-10-28 17:10:29 +01:00
c9ff96af6c
added small notice about password manager
2013-10-27 13:36:20 +01:00
a5af52a275
correctly award ultimategear achievement
2013-10-27 12:11:59 +01:00
5d14a1811f
Merge pull request #1637 from ozymandiasthegreat/manual-due-date
...
Manual due date
2013-10-24 12:45:42 -07:00
ef972bf70d
[ #1540 ] add restore option for streak achievement
2013-10-24 11:04:35 -07:00
c7c8338316
Merge pull request #1642 from Shaners/develop
...
Adds red hair option for web.
2013-10-24 10:10:27 -07:00
5fa398780f
Adds red hair option for web.
2013-10-24 00:03:09 -07:00
22b429242f
Merge remote-tracking branch 'upstream/develop' into manual-due-date
2013-10-23 14:34:36 -04:00
20f2d75bbf
add streak achievement notification
2013-10-23 17:57:02 +02:00
f56b76b5ae
Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop
2013-10-23 16:38:37 +02:00
0c7ba32c6b
fix #1635
2013-10-23 16:38:05 +02:00
5c4c4ae252
typo in donate page
2013-10-22 20:55:55 -07:00
619a15b316
gem icon for unlock-set as well
2013-10-22 19:33:55 -07:00
077850b172
halloween: explicit gems instead of 'G'
2013-10-22 19:22:32 -07:00
44cb797063
migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean
2013-10-22 18:50:50 -07:00
f59d5b056c
Merge branch 'halloween' into develop
2013-10-22 17:57:57 -07:00
e7886e00b4
halloween: highlght limited skins, add description about limited, rename
...
to "rainbow" and "spooky" @lemoness
2013-10-22 17:56:46 -07:00
b90aadf7ab
update bailey notif
2013-10-22 16:52:54 -07:00
2c7fc72419
better modal indenting
2013-10-22 16:33:06 -07:00
b3853800a3
remove Ultra Mega Update (since we've been live for a long time). Add
...
bailey notif for halloween, update contrib gear wording as per @lemoness recommendation
2013-10-22 16:28:13 -07:00
2c1d8e1688
halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe)
2013-10-22 14:32:51 -07:00
6f32ac2a24
halloween: purchase full set
2013-10-22 13:59:30 -07:00
d184237c79
halloween: begin adding mechanic for the special skins
2013-10-22 13:24:31 -07:00
c4882942d6
fix chart shown below task edit form
2013-10-21 20:41:19 +02:00
b55cb1ccdb
bailey update for skin tones, 0.0.10, selling drops. @lemoness this is
...
the new format (jade), hit me offline for a tour
2013-10-20 00:13:50 -07:00
2cf814acd6
drops: description on combining eggs/potions, selling to
...
alex. de-selectable drops. sell in a button of alex's dialog
2013-10-19 23:44:03 -07:00
c882525150
eggs: add ability to sell potions / eggs
2013-10-19 20:04:26 -07:00
017398eb83
eggs: some cleanup and passing around of $index so we can retrieve
...
egg/pot value
2013-10-19 19:58:11 -07:00
378d158a44
pegs: restructure inventory/market html so we market is aware of
...
inventory and we can sell items
2013-10-19 19:36:59 -07:00
be624a03b0
pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs
2013-10-19 19:30:39 -07:00
609499a4c9
front-page: update promo video
2013-10-19 16:24:20 -07:00
cef8431af0
charts: port toggleChart back in (functional, but it's not getting the
...
right width)
2013-10-19 16:15:48 -07:00
066364e3c9
fix refresh chat button sending message
2013-10-16 21:36:56 +02:00
a56242d1a7
working chat refresh button
2013-10-16 21:02:57 +02:00
3d777372a1
Merge pull request #1609 from Shaners/patch-1
...
Quick Fix - Task Editing Cancel
2013-10-15 19:53:29 -07:00
109d46b2ca
paypal: fix to #1615 , explicitly set rm variable to avoid POST / on
...
paypal redirect
2013-10-13 16:05:18 -07:00
68426c7ccb
profile edits saved only on click
2013-10-13 20:47:59 +02:00
4e56df0e82
restore values saved only when Save is clicked
2013-10-13 19:58:13 +02:00
c3086c6194
fix not showing veteran wolf
2013-10-13 19:40:07 +02:00
a53725da14
gems: add to tutorial on drop unlock
2013-10-12 20:22:56 -07:00
890e8bf8b3
gems: can click main gem button, doens't require [+]
2013-10-12 20:08:06 -07:00
81f9f9b4c5
gems: justin in gem-purchase dialog
2013-10-12 20:01:18 -07:00
b4e5a1925b
add donate button
2013-10-12 19:47:40 -07:00
4c018d84c1
Merge branch 'paypal' into develop
...
Conflicts:
bower.json
2013-10-12 19:23:44 -07:00
f8328d3eeb
paypal: add configurable merchant and sandbox/production environment
2013-10-12 19:22:06 -07:00
5de0c928fe
paypal: conslidate buy gems modals
2013-10-12 16:51:01 -07:00
09cd132420
paypal: begin adding paypal alternative to credit-card payments
2013-10-12 15:24:35 -07:00
Tyler Renelle