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

941 commits

Author SHA1 Message Date
Tyler Renelle
4a0a1f7a21 rewrite add bailey alerts 2013-08-27 22:37:56 -04:00
Tyler Renelle
34ec73877f rootCtrl fix 2013-08-27 22:01:29 -04:00
Tyler Renelle
c9d3f6247d rewrite2 add customizations options 2013-08-27 21:54:11 -04:00
Tyler Renelle
7bfaac80a7 rewrite2 big one: add ngRoute for /#/tasks & /#/options. requires 2 
/partial routes on server. code cleanup & reorganization, remove a lot
of return statements (coffeescript compiled)
 2013-08-27 21:13:05 -04:00
Tyler Renelle
bc57d070f7 rewrite2 use new habitrpg-shared script 2013-08-26 22:09:43 -04:00
Tyler Renelle
dddb0be9f3 rewrite2 move css files up a directory. Move *all* images to habitrpg-shared. moved a lot of spritesheet css to habitrpg-shared. still more to be moved, but this is a start 2013-08-26 21:34:33 -04:00
Tyler Renelle
9b25dc67ff rewrite2 add registration (thanks mobile app!) 2013-08-25 22:53:51 -04:00
Tyler Renelle
63ff9c4174 rewrite2 remove some uncessary bits, add footer mentioning roadmap 2013-08-25 22:42:44 -04:00
Tyler Renelle
4a372bfc98 rewrite2 add death 2013-08-25 21:40:14 -04:00
Tyler Renelle
a172214bf1 rewrite2 add logout 2013-08-25 21:27:47 -04:00
Tyler Renelle
d47e703434 rewrite2 fix stats bars 2013-08-25 21:04:54 -04:00
Tyler Renelle
a6d4b347e5 rewrite2 lots of task-saving cleanup 2013-08-25 20:59:08 -04:00
Tyler Renelle
f37c7b434a rewrite2 fix avatar, reroll, tooltips, etc 2013-08-25 20:39:47 -04:00
Tyler Renelle
67664f2a5f rewrite2 fix tabs 2013-08-25 19:47:18 -04:00
Tyler Renelle
8c3e50372e rewrite2 fix shop, fix checkboxes, delete tasks 2013-08-25 18:20:07 -04:00
Tyler Renelle
fefca2c372 rewwrite2 item store 2013-08-25 14:53:06 -04:00
Tyler Renelle
ee8fdc80fa rewrite2 save task 2013-08-25 13:56:19 -04:00
Tyler Renelle
9aa4a5a08a rewrite2 add in indivdual tasks 2013-08-25 12:29:53 -04:00
Tyler Renelle
99af649ea1 rewrite2: tasks-lists added 2013-08-25 10:57:19 -04:00
Tyler Renelle
176a5a3583 rewrite2: avatar working. need to revisit avatar:avater, make sure I got everything 2013-08-25 09:12:25 -04:00
Tyler Renelle
3c45220e1f rewrite2 WIP 2013-08-24 23:54:08 -04:00
Tyler Renelle
22265e9fac send error page to user 2013-08-21 00:44:28 -04:00
Tyler Renelle
0d208bae92 add bailey notif for fixed cron 2013-08-20 22:22:58 -04:00
Sabe Jones
3069c3baf9 Move red tasks explanation link inline 
Shortens up the message a bit.
 2013-08-18 20:42:21 -05:00
Sabe Jones
3299e9cddd Groups.html wording tweaks 
Fix English syntax in the Tavern for real this time
Mild wording update for new guild buy-in
 2013-08-18 20:35:15 -05:00
Sabe Jones
e94a3a8aec Spice up descriptions of death and rerolls 
Fleshes out the text in a couple of modals to be more informative and flavorful. ("Habiteer" is totally a thing, right?)
 2013-08-18 20:29:27 -05:00
Tyler Renelle
8ff7e83e6b reorder bailey notif 2013-08-18 17:28:50 -04:00
Tyler Renelle
c0123d506d @lemoness: merging the <li>s into a single <ul>, since they're part of 
the same date. <a> tags wrap the text, so `<a href="..">click this</a>`
instead of `click this<a href=".."></a>`. Other than that, great job and
I'll push up asap!
 2013-08-18 17:26:15 -04:00
lemoness
336404e2d7 Adding two Bailey alerts! @lefnire 2013-08-18 13:40:42 -07:00
Tyler Renelle
2644e575ee html typo fix 2013-08-13 00:07:15 -04:00
Sabe Jones
f3982670fd Answer cron FAQ in settings text 
Update custom day start label to mention it works off user's time zone
 2013-08-01 08:17:50 -05:00
Tyler Renelle
4f948d401b Move exp progress button to right of numbers, css rollover was 
covering it before
 2013-06-15 13:28:24 -04:00
Tyler Renelle
c797ea5999 charts: fix exp & todos charts 2013-06-15 12:41:12 -04:00
MoofinSeeker
8855766829 Update terms.html 
Added spaces before line breaks in text body.
 2013-06-13 00:53:14 +02:00
MoofinSeeker
3a8f6086ad Update privacy.html 
Added spacing before line breaks in body of text.
 2013-06-13 00:34:59 +02:00
Tyler Renelle
ab57243315 Merge branch 'master' of github.com:lefnire/habitrpg 2013-06-11 17:18:10 -04:00
Tim Ullrich
3af13e69af fix rounding discrepancy between header hp meter and profile hp 2013-06-10 23:37:09 -05:00
Andre Casey
7c680af368 Fixes #1028: weird inventory item spacing for eggs and potions. 
My test instance would only generate 1 dropped potion (after so much clicking!), so perfect alignment of dropped potions is not guaranteed with this commit.
 2013-06-07 08:04:25 -07:00
Tyler Renelle
ef39dd8a0f groups: can assign new leader 2013-06-05 14:45:05 -04:00
Tyler Renelle
6480be63eb groups: highlight leader in member list 2013-06-05 14:44:59 -04:00
Tyler Renelle
d944dc1687 groups: can't ban self. rename to "boot" (since i ahven't implemented full-ban) 2013-06-05 14:18:09 -04:00
Tyler Renelle
fcf02d33d9 groups: add "ban" feature for group leaders. unfortunately not 
updating dom, so require a refresh for now
 2013-06-05 11:55:09 -04:00
Tyler Renelle
ac83126772 grammar 2013-06-04 13:10:55 -04:00
Tyler Renelle
fe5e0f1464 Merge pull request #1061 from MagicMicky/develop 
Adding a QRCode with the user's information
 2013-06-04 09:18:03 -07:00
Tyler Renelle
59f4c88940 groups: guild bank is in gems, not balance 2013-06-03 21:28:03 -04:00
Tyler Renelle
35e0e404c7 groups: don't show gems for tavern 2013-06-03 20:18:11 -04:00
Tyler Renelle
c5bdf1bbe6 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-06-03 19:16:21 -04:00
Tyler Renelle
bba008bd61 guild: add guild bank popover 2013-06-03 19:15:05 -04:00
Slappybag
81297823da Added gem explanation text 2013-06-03 23:08:58 +01:00
Tyler Renelle
b52888f491 fix bailey date 2013-06-03 16:58:19 -04:00
Tyler Renelle
42b7848a60 guilds: now costs 4G to create a guild, as per http://community.habitrpg.com/content/charge-gems-guild-creation 2013-06-03 16:55:57 -04:00
Tyler Renelle
7c829afb09 guilds: bug fix for inconsistently invisible public guilds 2013-06-03 15:45:49 -04:00
Tyler Renelle
d6069e7174 guilds: bailey. 2013-06-03 14:51:58 -04:00
Tyler Renelle
2bb7ed37b9 challenges: hide challenges tab for now 2013-06-03 14:41:48 -04:00
Tyler Renelle
f91427b112 groups: small html modifications 2013-06-03 14:36:11 -04:00
Tyler Renelle
f8e546ae2a groups: bug fixes: {#if _party} dynamic binding, subscription allowed 
for either party or guild with out requiring the other
 2013-06-03 14:08:54 -04:00
Tyler Renelle
4bd6246e75 change "report a problem" link to go to FAQ, to cut back on all these duplicates 2013-06-02 23:57:59 -04:00
Tyler Renelle
e565659ef3 change "report a problem" link to go to FAQ, to cut back on all these duplicates 2013-06-02 23:56:33 -04:00
Tyler Renelle
9be6f1a0dd groups: static-binding of _party, was causing "Uncaught 
TypeError:Cannot read property '0' of undefined" since
groups[_party.id] doesn't exist pre-subcription
 2013-06-02 23:35:36 -04:00
Tyler Renelle
33ac1788fd groups: add group leader message 2013-06-02 23:12:31 -04:00
Tyler Renelle
c6df323b07 challenges: graph rendering now dynamic 2013-06-02 22:57:07 -04:00
Tyler Renelle
c47291fe7c challenges: fix dynamic user-challenge score 2013-06-02 22:37:59 -04:00
Tyler Renelle
f92ef99355 groups: show groups as striped table instead of accordion. cleaner 
this way
 2013-06-02 19:03:03 -04:00
Tyler Renelle
47453d6133 challenges: simply display names of challenges in groups, with "visit 
the challenges tab for more info".
 2013-06-02 18:28:33 -04:00
Tyler Renelle
e4c7275201 groups: move title above info box 2013-06-02 14:58:19 -04:00
Tyler Renelle
770af3c4d4 groups: group-leave bug fixes (most things have to be static-bound, when somethign is deleted it causes errors on dom listeners). also make second-most-recent-member the new leader if the leaver is leader 2013-06-02 13:27:05 -04:00
Tyler Renelle
ad2b37fe50 groups: some join / leave bug fixes 2013-06-02 11:49:56 -04:00
Tyler Renelle
01b9a420b8 groups: only show invitations if there are any (was previously 
iterating empty array)
 2013-06-02 11:23:02 -04:00
Tyler Renelle
38781cc012 groups: some static bindings where possible 2013-06-02 11:22:33 -04:00
Tyler Renelle
dc36651029 groups: only add privacy field on guilds 2013-06-02 11:21:25 -04:00
Tyler Renelle
8fdeccf43c challenges: fix disappearing repeat bug 2013-06-02 10:07:15 -04:00
Tyler Renelle
363a77cbe7 guilds: add public guilds 2013-06-01 12:50:06 -04:00
Tyler Renelle
178d3846a4 challenges: html bug 2013-06-01 10:57:38 -04:00
Tyler Renelle
2ab5772c0a groups: make edit button consistent too 2013-05-31 19:44:29 -04:00
Tyler Renelle
780e3ccabc challenges: move challenge specs to accordion header, add subscribers count 2013-05-31 19:27:22 -04:00
Tyler Renelle
5f78d801a8 challenges: make @editable dynamic so we can add tasks when in edit mode 2013-05-31 18:59:20 -04:00
Tyler Renelle
cc3a1213a6 challenges: more html futzing 2013-05-31 18:47:49 -04:00
Tyler Renelle
0fd74680c2 challenges: float-right edit button, us icons for consistency 2013-05-31 18:42:02 -04:00
Tyler Renelle
28f45baf7b challenges: can delete challenge 2013-05-31 18:31:46 -04:00
Tyler Renelle
a4e6025185 challenges: slightly prettier graphs (i'm still not satisfied, but later) 2013-05-31 18:31:37 -04:00
Tyler Renelle
fa0813dc9e challenges: use tags fix (268157c) to allow guild info editing (not 
working for _party for some reason)
 2013-05-31 17:53:17 -04:00
Tyler Renelle
fd7ae42a43 Merge branch 'develop' into challenges 
Conflicts:
	views/app/filters.html
	views/app/tasks.html
 2013-05-31 17:18:26 -04:00
Tyler Renelle
268157ca24 tags: use explicit {#each users[_userId].tags} instead of model.ref private path {#each _user.tags}. fixed many tags issues. see https://github.com/codeparty/derby/issues/267 2013-05-31 16:25:59 -04:00
Tyler Renelle
39d29f50f4 challenge: don't allow to create new challenge unless in group 2013-05-31 09:36:00 -04:00
Tyler Renelle
1411d04518 challenges: add basic task stats for challenge subscribers 2013-05-31 09:35:50 -04:00
Tyler Renelle
6e67207835 groups: fix leave button 2013-05-30 18:42:27 -04:00
Tyler Renelle
91c5331a28 challenges: couple bug fixes 2013-05-30 08:41:07 +01:00
Tyler Renelle
9ec369ea7a challenges: add in challenge prize, just for show-purposes for now 2013-05-29 23:40:13 +01:00
Tyler Renelle
ea8f245b84 challenges: edit challenge title & description 2013-05-29 23:33:47 +01:00
Tyler Renelle
64a99e734f challenges: use bootstrap accordiong, much cleaner 2013-05-29 23:18:44 +01:00
Tyler Renelle
8ad2bf5687 groups: don't show websites twice when editing 2013-05-29 22:55:20 +01:00
Tyler Renelle
a213d6e997 groups: accordion information on left side, more edit options for 
group information
 2013-05-29 22:47:07 +01:00
Tyler Renelle
88ff245aec challenges: add taskInChallenge() view helper and broken task.challenge link 2013-05-29 20:53:57 +01:00
Tyler Renelle
cce03c8312 guilds: prettier group-creation 2013-05-29 18:19:38 +01:00
Tyler Renelle
bd18667420 convert task-editing state to private path so we don't have 
conflicting ids
 2013-05-28 16:43:16 +01:00
Tyler Renelle
21b6cd952d challenges: guild listings in tabs, just like guilds-groups 2013-05-28 12:47:41 +01:00
Tyler Renelle
12fccbc99d challenges: move challenge-creation to their respective tabs, instead of separate "create" tab 2013-05-28 12:42:42 +01:00
Tyler Renelle
21a6ea19f5 challenges: remove "mine" challenges tab 2013-05-28 11:59:09 +01:00
Tyler Renelle
2fbff2a0bc challenges: lock down editing capabilities on certain task properties, 
instead showing the challenge's properties (in case they change
challenge-side).This includes editing the tag name
 2013-05-28 11:52:32 +01:00
Tyler Renelle
2666ebb1fc guilds: generic handling of invitations (incl. accept, reject, invite, etc) 2013-05-28 00:48:35 +01:00
Tyler Renelle
e9eb509682 challenges: generalized listings for groups/parties/public 2013-05-27 21:14:04 +01:00
Mickael
4d6ca749af double bracket on user id and token 
for the qrcode
 2013-05-27 20:52:09 +01:00
Tyler Renelle
1a0d9772a7 Merge branch 'develop' into challenges 2013-05-27 18:54:51 +01:00
Mickael
695bb301f4 Adding a QRCode with the user's information 
QRCode retrieved from Google APIs, and parsed with json like that:
{address:"",user:"",key:""}
 2013-05-27 18:40:26 +01:00
Tyler Renelle
89160919f4 achievements: add "Helped Habit Grow" badge, including bailey notify 2013-05-27 16:10:55 +01:00
Tyler Renelle
d3dd20cdf8 guilds: allow clicking guild-members for stats. needed to include 
_membersArray in model ref
 2013-05-26 22:36:30 +01:00
Tyler Renelle
d4275867cc guilds: html & store.coffee bug fixes 2013-05-26 22:26:25 +01:00
Tyler Renelle
ff35cbf1e7 guilds: generalize more groups stuff, creation invitation leaving, 
etc. also fixes party invite bugs
 2013-05-26 21:32:21 +01:00
Tyler Renelle
0f8dbd044e guilds: got all groups html generalized (using same party html as 
tavern, will add guilds soon)
 2013-05-26 20:21:07 +01:00
Tyler Renelle
e32ee04baa guilds: bug fix on _tavern => _habitRPG 2013-05-26 15:38:49 +01:00
Tyler Renelle
9dfdb52c98 challenges: rename party.html to groups.html 2013-05-26 15:33:01 +01:00
Tyler Renelle
35049f7752 Merge branch 'develop' into challenges-tmp 
Conflicts:
	src/app/helpers.coffee
	src/app/index.coffee
 2013-05-26 15:29:59 +01:00
Tyler Renelle
079e7eb30f challenges: fix up htmls to use new party-member subscription methods 2013-05-26 15:09:41 +01:00
Tyler Renelle
a141a02000 add bailey for habitrpg-shared 2013-05-25 19:01:43 +01:00
Tyler Renelle
258cf55abb fix int() view helper (restore streak) 2013-05-22 11:30:17 +01:00
Tyler Renelle
bc49e4668c only show restore-streak on dailies 2013-05-21 14:39:23 +01:00
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
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
ae4c5723e0 chat: allow admins to remove other people's messages 2013-05-19 15:02:04 +01:00
Tyler Renelle
e7558139e6 challenges: require challenge title, when user subscribe add new tag of challenge name. unsubscribe deletes tasks 2013-05-18 00:09:52 +01:00
Tyler Renelle
9b41712ca6 challenges: fix to not apply user's active tags to new challenge 
tasks, but also not apply filters except to main user's list
 2013-05-17 23:32:24 +01:00
Tyler Renelle
6507795d99 challenges: prevent some task options (such as scoring, check-marking, 
tags, etc) for challenge edits
 2013-05-17 20:59:29 +01:00
Tyler Renelle
0a291bf892 challenges: add challenge.id to task so we can get the icon-bullhorn 2013-05-17 14:06:27 +01:00
Tyler Renelle
ae8a283d0e challenges: chevron in collapsing title 2013-05-17 14:06:27 +01:00
Tyler Renelle
57f51048a1 challenges: basics for challenge subscription 2013-05-17 14:06:27 +01:00
Tyler Renelle
b8ef0789df challneges: semi-functional challenge creation for parties 2013-05-17 14:06:27 +01:00
Tyler Renelle
5ea6e55e11 challenges: add assignTo option on challenge-creation 2013-05-17 14:06:27 +01:00
Tyler Renelle
d28edaf30d challenges: list taken dynamically from scope so we can push/unshift to various task lists depending on location of add-task form. be careful with this commit, not the {{}} instead of {} - seems to be required otherwise things get weird 2013-05-17 14:06:27 +01:00
Tyler Renelle
0a37637daf challenges: fix up lists to use new list templates 2013-05-17 14:06:26 +01:00
Tyler Renelle
836787906d bstart building challenges 2013-05-17 14:06:26 +01: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
af8dbb9f1a Use @Shaners new NPCs sprites instead of images 2013-05-16 12:00:04 +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
19016cc895 fix #958 2013-05-14 18:17:19 +01:00
Celtis
0b8960470a Minor grammatical fix 2013-05-14 18:51:38 +02: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
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
Slappybag
367c860ac8 syntax error on my part 2013-05-12 14:34:49 +01:00
Slappybag
ae0dfa9ffe Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-05-12 13:33:40 +01:00
Tyler Renelle
bb1ea755f1 tasks / rewards.html - pass in the actual list, and whether booleans 
@editable and @main, which will allow for challenges lists & mngr
accounts / public lists
 2013-05-12 13:12:13 +01:00
Slappybag
a287160d3b Changed Tavern message to be less threatening & simplier. 2013-05-12 12:41:00 +01:00
Tyler Renelle
f28a542aa4 small cleanup 2013-05-12 12:40:06 +01:00
Tyler Renelle
912b716a28 fix the reroll buy-button bug 2013-05-12 12:29:00 +01:00
Tyler Renelle
4347ba52ba overhaul tasks.html so we can start generalizing task-lists, 
ground-work for challenges
 2013-05-12 11:33:05 +01:00
Tyler Renelle
f7145bb951 cleanup of the show-completed / show-remaining. That context-dependant 
/ display-context-for stuff was bugging me out, and wasn't using Derby
to it's potential. also some tags & habit-wide cleanup in helpers:taskClasses()
 2013-05-12 10:52:32 +01:00