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

2268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle ff2fedda48 add ability to restore lost streaks, also add int() view helper 
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)
 2013-05-21 14:33:31 +01:00
Tyler Renelle e21bc9869d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-21 12:57:40 +01:00
Tyler Renelle cc097c32f7 clean up of preen_cron, which I'm re-enstating 2013-05-21 12:54:06 +01:00
Philip How b77a62e915 Merge pull request #1002 from MrConcept/master 
Merge Master
 2013-05-20 11:09:37 -07:00
Philip How 105087c823 Removes +4 Gems on Reset exploit 2013-05-20 19:52:37 +02:00
Tyler Renelle 5776bec545 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-20 10:28:49 +01:00
Tyler Renelle ed057799a3 put coin_single_[silver|gold].png back in (thought we weren't using 
anymore, i was wrong)
 2013-05-20 10:27:53 +01:00
Stan Lindsey 9c173e3a08 HP potion description clarify. 
People getting confused about its use.
 2013-05-20 11:08:04 +02:00
Slappybag d870325169 Margin on Buttons for #996 & 128eb8a 2013-05-20 09:59:36 +01:00
Tyler Renelle 128eb8adb7 tavern: add submit bug / feature buttons up top, fixes #996 2013-05-19 20:43:48 +01:00
Tyler Renelle 6a6a75edda Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-19 15:02:50 +01:00
Tyler Renelle ae4c5723e0 chat: allow admins to remove other people's messages 2013-05-19 15:02:04 +01:00
Tyler Renelle 9b46805452 Merge pull request #989 from Shaners/develop 
Bacon Bacon
 2013-05-18 01:09:05 -07:00
Shane Lister 5cff970947 Bacon Bacon 
Putting some bacon into the tavern NPC graphic. The people demand bacon.
 2013-05-17 16:42:26 -07:00
Shane Lister 081b5be657 Merge pull request #17 from lefnire/develop 
Update my Develop
 2013-05-17 16:36:30 -07:00
Tyler Renelle 92e8e5b597 done trying to futz with user-menu css for maintaining visibility when 
header hidden. Instead, just put it elsewhere in html if header
hidden. fixes #981
 2013-05-17 12:09:43 +01:00
Tyler Renelle 4c0fe42d4e only hide header bits with preferences.hideHeader, fixes #979 2013-05-17 10:22:21 +01:00
Tyler Renelle a6973e9ae2 back to websockets 2013-05-17 09:58:37 +01:00
Tyler Renelle 9946495564 Merge branch 'develop' 2013-05-17 09:57:32 +01:00
Tyler Renelle 636e7aa4c0 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-16 17:58:49 +01:00
Tyler Renelle f1767191d3 Merge pull request #977 from Shaners/patch-1 
Update npcs.styl
 2013-05-16 09:28:42 -07:00
Shane Lister 0c6a71a581 Update npcs.styl 
Should fix Bailey's full body graphic.
 2013-05-16 10:22:37 -06:00
Tyler Renelle f6df9a610a get rid of some old unused images 2013-05-16 12:16:24 +01:00
Tyler Renelle af8dbb9f1a Use @Shaners new NPCs sprites instead of images 2013-05-16 12:00:04 +01:00
Tyler Renelle 85018568e4 Merge pull request #973 from Shaners/develop 
Backer-Gear Tweaks, matt tweak, add NPCs
 2013-05-16 03:12:14 -07:00
Shane Lister 2cebbb93e5 NPC Sprite Sheet and CSS 2013-05-15 21:44:39 -07:00
Shane Lister 8bb0718cea Backer-Gear Tweaks, NPCs 2013-05-15 17:22:32 -07:00
Shane Lister c9cfd2c30b Merge pull request #16 from lefnire/develop 
Update my develop branch
 2013-05-15 17:07:14 -07:00
Tyler Renelle eca7b1b53b Merge branch 'develop' 2013-05-15 12:47:58 +01:00
Tyler Renelle 149961c07d z-index fix on NPC popover dialogs 2013-05-15 12:23:18 +01:00
Tyler Renelle 4aeb7c5635 better "level: 1" positioning, add stats to party members 2013-05-15 11:51:16 +01:00
Tyler Renelle 5a01963c1f back to xhr-polling or a bit, will figure out why websockets having 
This reverts commit d59f1f6925.
 2013-05-15 09:58:38 +01:00
Tyler Renelle aef76ae969 pets: bug fix for users who haven't been properly converted to pets array system 2013-05-15 09:14:42 +01:00
Tyler Renelle d59f1f6925 Revert "back to xhr-polling or a bit, will figure out why websockets having" 
This reverts commit e5549d0501.
 2013-05-14 23:53:59 +01:00
Tyler Renelle e5549d0501 back to xhr-polling or a bit, will figure out why websockets having 
issues soon
 2013-05-14 23:42:36 +01:00
Tyler Renelle 950be4daf2 cron: better solution to testing "due today" for tasks with repeat 
options, and user with custom dayStart. Still not sure if this is the
ideal solution, but addresses #963
 2013-05-14 19:01:05 +01:00
Tyler Renelle 3ae295c9a3 don't include 'disabled' shading for todos 2013-05-14 18:20:19 +01:00
Tyler Renelle 19016cc895 fix #958 2013-05-14 18:17:19 +01:00
Tyler Renelle 02215aeda0 Merge branch 'master' of github.com:lefnire/habitrpg 2013-05-14 18:10:47 +01:00
Tyler Renelle 0a0cf1d94e cron: fix repeat, for old users without default task.repeat={} 2013-05-14 18:10:24 +01:00
Tyler Renelle 5d421bdbd4 Merge pull request #962 from Celtis/patch-1 
Minor grammatical fix
 2013-05-14 10:05:44 -07:00
Celtis 0b8960470a Minor grammatical fix 2013-05-14 18:51:38 +02:00
Tyler Renelle 92b178b4a4 huge cron fixes which should solve streak, dayStart, "timezone" issues 2013-05-14 17:39:42 +01:00
Tyler Renelle 2c7492709c tags: make tag-selection checkboxes for now, peopel aren't 
understanding combobox
 2013-05-14 16:07:37 +01:00
Tyler Renelle 4d5b87351f misspelled matt boch 2013-05-14 00:07:40 +01:00
Tyler Renelle a8f9cc972f fix up stables / matt for smaller screens 2013-05-13 23:17:54 +01:00
Tyler Renelle 4a23ad4856 Merge branch 'develop' 
Conflicts:
	locales/en/app.json
 2013-05-13 21:31:18 +01:00
Tyler Renelle be08568c3b npcs: matt stable-master in the the pets tab (bravo @Shaners!). also 
include link to the pets spritesheet, and some info on mounts
 2013-05-13 21:29:27 +01:00
Tyler Renelle dc7f80ceb9 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-13 11:02:20 +01:00
Daniel Saewitz d6b312eb13 Fix borked translations 2013-05-12 15:18:16 -04:00