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

2360 commits

Author SHA1 Message Date
Sabe Jones
2ee6f0ed61 feat(Bailey): November subscription reminder 2014-11-30 11:50:31 -06:00
Blade Barringer
44baa822c8 Adjusted ng-hide so users cannot block themeselves 2014-11-30 10:50:39 -06:00
pollockjj
6520caed7d Modified to 15px border and lock icon based on feedback from dev team 2014-11-29 21:56:10 -06:00
negue
0f3070e334 Allow send messages to yourself - see #4295 2014-11-30 01:52:46 +01:00
pollockjj
9abaedc7c5 Modified two-line solution for ticket #4261 to one-line based on feedback/solution from B. Barringer 2014-11-29 13:17:54 -06:00
Blade Barringer
e4b2351b42 Removed extraneous space 2014-11-29 12:53:19 -06:00
Blade Barringer
223cac838e Added one time binding to ng-if 2014-11-29 12:52:34 -06:00
Blade Barringer
3a29eef799 Removed pm symbol if sent by own user 2014-11-29 12:30:15 -06:00
Blade Barringer
e0f09cd468 Removed option to send private message if it would go to system. Closes 2014-11-29 12:26:28 -06:00
pollockjj
1a567ce82f Changes to address github ticket: Differentiate Locked and Unlocked Backgrounds (#4261). Added two new background-specific styles to customizer.styl and utilized them in profile.jade by checking for ownership of the asset and displaying a border or not, as appropriate 2014-11-29 12:25:21 -06:00
Tyler Renelle
3204418af1 Revert #4291 
This reverts commit a1ea6869b7.
 2014-11-29 09:16:44 -07:00
Tyler Renelle
e63f2b6d97 Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop 
Conflicts:
	database_reports/count_users_who_own_specified_gear.js
 2014-11-29 08:33:28 -07:00
Blade Barringer
9a1b209da1 Corrected indentation error 2014-11-28 19:41:11 -06:00
Matteo Pagliazzi
607c72049c Merge pull request #4291 from sbreiler/develop 
Fix #4259
 2014-11-28 20:51:04 +01:00
Steffen Breiler
28b25c6b89 Fix #4259 (always 100% long bars in IE11) 
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
 2014-11-27 22:55:01 +01:00
Steffen Breiler
64a76566a0 Fix #4259 (always 100% long bars in IE11) 
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
 2014-11-27 22:52:03 +01:00
Steffen Breiler
a1ea6869b7 Fix #4259 (always 100% long bars in IE11) 
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
Fixes health, level and mana bar.
 2014-11-27 22:47:52 +01:00
benmanley
50b1cba0a6 refactor(tasks) improve UI consistency 
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
 2014-11-27 10:32:57 +00:00
Sabe Jones
be3342cb26 feat(event): Thanksgiving Bailey 2014-11-26 19:34:16 -06:00
Taldin
212868010c bugfix: all-market-poptop breaks on the left side 
Right side popovers have been switched to 'top', but left side popovers
need to remain 'right'.
 2014-11-26 14:17:42 -08:00
Taldin
4a6cd9c2f3 Fixes market to have popover-placement="top' 
Market fixed to have popover-placement="top' instead of 'left', which
was causing some problems, and 'right' for consistency.
 2014-11-26 14:03:31 -08:00
Tyler Renelle
1e5b7e6f2d fix(#4282): refactor for DRY unlock/hide paths 2014-11-26 10:49:49 -07:00
Tyler Renelle
0278caca76 fix(#4282): fix $parse errors in avatar customize screens 2014-11-26 10:49:49 -07:00
Matteo Pagliazzi
c0a3fc887a fix(costume): better fix for #4274 2014-11-26 12:26:41 +01:00
Matteo Pagliazzi
43fa461a67 fix(costume): fixes #4274 2014-11-26 12:19:33 +01:00
Matteo Pagliazzi
afbd2199e8 fix(datepicker): fixes #4273 2014-11-26 11:51:44 +01:00
Tyler Renelle
d24ece973b fix(food): popover-placement='top' in foodtray, fixes #4278 2014-11-25 15:26:42 -07:00
Alice Harris
f0b3da295c re-enable +1 button, add spaces before delete button, add "quick reply" to Tavern/guilds/party chat 2014-11-25 14:50:01 +10:00
Tyler Renelle
0f7f30aa12 bailey: private messages & november mysteries 2014-11-24 19:36:44 -07:00
Tyler Renelle
5f654c4dad fix(private-messages): move PM buttons to bottom-left of modal 2014-11-24 19:11:49 -07:00
Tyler Renelle
478cba9a5a feat(members): add options: $modal.open({size, windowClass}). Use those 
to make avatar modal wider, and "100% window height" (see code, it's kinda hacky)
 2014-11-24 18:59:27 -07:00
Tyler Renelle
36ffd8a8b2 fix(quick-reply): only show quick-reply in inbox (cc @crookedneighbor) 2014-11-24 18:14:17 -07:00
Tyler Renelle
c309cb2342 Merge pull request #4267 from crookedneighbor/quick-reply 
Quick reply
 2014-11-24 18:11:43 -07:00
Blade Barringer
7ea8ff70ae Added additional env.t declarations for pm modal 2014-11-23 21:33:14 -06:00
Blade Barringer
d8c30fc885 Added env.t for member modal to allow for translations 2014-11-23 21:19:40 -06:00
Blade Barringer
bf586cbc17 Added env.t declarations for translations 2014-11-23 21:16:32 -06:00
Blade Barringer
f16d9d609e Added quick reply button (doesn't load in the correct parameters for 
sending a msg)
 2014-11-23 20:29:27 -06:00
Alice Harris
19fb81aafd Merge pull request #4248 from crookedneighbor/add-uuid-to-user-data-link 
Added uuid parameter to data link
 2014-11-22 12:08:51 +10:00
Tyler Renelle
ecef457d2b fix(private-messages): glyphicon-ban-circle (@Alys @crookedneighbor) 2014-11-21 10:40:57 -07:00
Tyler Renelle
743df194c7 feat(private-messages): add a "clear all" button 2014-11-21 08:42:24 -07:00
Tyler Renelle
f5415ac6c5 feat(private-messages): start implementing private messaging (includes blocking). Start experimenting with reflists for PMs, instead of arrays 2014-11-20 19:03:01 -07:00
Tyler Renelle
ebebcea34b fix(webhooks): sort webhooks by created, use angular-filter for sorting object 2014-11-19 15:42:14 -08:00
Tyler Renelle
2023cf852e chore(bower): upgrade angular to 1.3.3. Remove 
bindonce (incompatible). Note, bindonce="..." attrs still need to be
converted to their {{::}} equiv for better performance, but this is
functional for now
 2014-11-19 14:32:45 -08:00
Tyler Renelle
f922a0337f bailey(owl) 2014-11-18 23:18:53 -08:00
Sabe Jones
bf8882e8f5 feat(quest): Add owl to purchasable quest eggs 2014-11-18 19:37:57 -06:00
Tyler Renelle
cb3ebccbbf feat(invite-friends): obfuscated invite 2014-11-18 16:38:43 -08:00
Tyler Renelle
487f8afe30 feat(help): add tour to help menu 2014-11-18 12:00:33 -08:00
Tyler Renelle
f7f4473590 fix(payments): allow resubscription after unsubscribe 2014-11-17 19:51:03 -08:00
Tyler Renelle
6ef838cf1a feat(webhooks): move webhooks from array to object (everything should 
really be stored as objects). Add to API routes (see
HabitRPG/habitrpg-shared#83a22b8). Note, sorting doesn't work. Meh.
 2014-11-16 20:03:56 -08:00
Tyler Renelle
21d6b71d37 Merge branch 'webhooks' into develop 
Conflicts:
	src/controllers/user.js
 2014-11-16 15:24:15 -08:00
Blade Barringer
4d08bb9206 Added uuid parameter to data link 2014-11-16 16:05:32 -06:00
Matteo Pagliazzi
45845228d0 fix(invite-friends): generate correct link on the client 2014-11-16 11:39:56 +01:00
Tyler Renelle
64fd6c02f7 fix(mods): restricted projected fields for mods-listing. Also, 
static-bind for perf
 2014-11-13 23:00:22 -07:00
Tyler Renelle
1d85bcd14e bailey(invite-friends) 2014-11-13 16:38:32 -07:00
Tyler Renelle
5fab3881a2 feat(invite-friends): allow specifying inveter's name (#4238 @lemoness) 2014-11-13 16:33:09 -07:00
Tyler Renelle
524e0514a1 feat(invite-friends): update wording on invitations. Add commented-out 
sample code on copy-link (it's not working)
 2014-11-13 12:57:04 -07:00
Tyler Renelle
2166321572 feat(invite-friends): add inviting friends via email. URL parsed, session holds invitation. If user joins party (new user or existing), the inviter is rewarded 2014-11-12 19:24:47 -07:00
Tyler Renelle
114cbe2760 Merge pull request #4236 from HabitRPG/share-avatar 
Share avatar
 2014-11-12 14:42:48 -07:00
Alice Harris
65ec6bcf2c Merge pull request #4230 from ShilohT/develop 
create 'Data' menu item
 2014-11-12 20:15:04 +10:00
Tyler Renelle
cf66383a94 bailey(goldenknight) 2014-11-11 21:05:06 -07:00
Tyler Renelle
15f318ccc2 feat(sharing): screw it, social links + img + text aint working, just 
redirect to homepage + show member modal
 2014-11-11 19:12:02 -07:00
Tyler Renelle
3e21e1f448 feat(sharing): implement caching of avatar img. img as image/png instead 
of octet/stream
 2014-11-11 19:12:02 -07:00
Tyler Renelle
69da58503a feat(sharing): move avatar-sharing to herobox, use addthis instead of 
custom solution. refactor from pages/* to export/*
 2014-11-11 19:11:49 -07:00
Tyler Renelle
e6a99f33a9 feat(sharing): add ability to share avatar. adds static page with avatar 
screen, and generates image from it
 2014-11-11 16:07:12 -07:00
ShilohT
54c913a5a8 Update menu.jade 
Added 'Data' menu item
 2014-11-10 02:21:49 -05:00
Tyler Renelle
c08ad60200 bailey: community guidelines, facebook login 2014-11-09 15:17:29 -07:00
Alice Harris
f80da293ce fix bug that was causing empty pet paws to appear for rare mounts 2014-11-10 06:00:01 +10:00
Alice Harris
00b9e0d6ac Merge pull request #4205 from Alys/commGuide-accept-before-post-2014-11-01 
block chat until user agrees to Community Guidelines
 2014-11-08 12:02:59 +10:00
Alice Harris
7ebc4763d3 Merge pull request #4206 from Alys/fetch-recent-messages-2014-11-01 
change Fetch Recent Messages from tooltip to button text
 2014-11-08 07:20:46 +10:00
Alice Harris
1f9cb90d2d Merge pull request #4225 from Alys/beeminderDeleteWarning-2014-11-06 
add warning text for Beeminder users about deleting To-Dos
 2014-11-07 19:29:43 +10:00
Tyler Renelle
a8d4a7545c bailey(costumes) 2014-11-06 16:24:48 -07:00
Tyler Renelle
6304dd2e15 feat(auth): move to hello.js for social auth, paves the way for multiple 
connectors. Prettier buttons via zocial
 2014-11-06 14:45:06 -07:00
Alice Harris
551e5d4e83 add warning text for Beeminder users about deleting To-Dos 2014-11-06 12:24:57 +10:00
Tyler Renelle
8651f0da25 fix(facebook): move from passport-facebook to Facebook JS SDK. Better 
security on FB login by validating accessToken. Create user from FB
profile if none exists, allows 3rd-party apps to. Fixes #4221
 2014-11-05 18:23:10 -07:00
Tyler Renelle
94a813fc6b bailey: backgrounds, beeminder 2014-11-04 19:50:56 -07:00
Alice Harris
62f71fbdb8 merge strings to ease translations 2014-11-04 16:43:27 +10:00
Tyler Renelle
51a850c766 fix(bailey) 2014-11-01 13:32:50 -06:00
Tyler Renelle
5e0f4e7823 bailey(mystery) 2014-11-01 13:31:08 -06:00
Tyler Renelle
89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Matteo Pagliazzi
b858aece51 Merge pull request #4201 from crookedneighbor/href-to-nghref 
Updated href with angular expression to ng-href
 2014-11-01 10:19:38 +01:00
Alice Harris
876d1d435d change Fetch Recent Messages from tooltip to button text 2014-11-01 11:42:48 +10:00
Alice Harris
372869d709 enable feature to block chat until user agrees to guidelines 2014-11-01 11:03:01 +10:00
Alice Harris
0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop 
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
 2014-11-01 10:25:38 +10:00
Tyler Renelle
d9cfe3c370 bailey(halloween) 2014-10-31 13:05:33 -06:00
Blade Barringer
416058ffcf Updated href with angular expression to ng-href 2014-10-31 14:03:57 -05:00
Tyler Renelle
9efaf39b2b feat(webhooks): add webhooks to user.preferences (API settings) so we can post to external services (eg, Beeminder) 2014-10-29 15:27:39 -06:00
Tyler Renelle
d45f40ca1f refactor(tags): simplify with ui-keyup, see #4141 2014-10-29 14:28:09 -06:00
Tyler Renelle
c3a62096ad Merge pull request #4141 from gjoyner/tags 
Tags (filters) saves when pressing Enter instead of deleting
 2014-10-29 14:27:21 -06:00
Tyler Renelle
8423de287e Merge pull request #4142 from gjoyner/tasks 
Popovers now disappear when clicking Save & Close
 2014-10-29 14:22:21 -06:00
Tyler Renelle
d11dd852c5 Merge pull request #4144 from gjoyner/front 
Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json
 2014-10-29 14:19:38 -06:00
Alice Harris
0da873308d adjust last-updated date in Community Guidelines; add quick-and-dirty fix to allow staff/moderator names to wrap in message above Tavern chat 2014-10-28 11:05:18 +10:00
Alice Harris
354e8a8167 change mods@habitrpg.com to leslie@habitrpg.com 2014-10-27 18:07:15 -06:00
Tyler Renelle
edc9382e99 bailey(communityGuidelines): -breadstrings x1 2014-10-27 17:43:36 -06:00
Tyler Renelle
a394a1bc42 baily(communityGuidelines) 2014-10-27 16:51:42 -06:00
Tyler Renelle
b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Tyler Renelle
5d67995458 Merge pull request #4177 from holyspecter/challenge-action-bacground-bug 
Minor bug: In challenges area, Join button has a yellow background
 2014-10-27 13:58:26 -06:00
Alice Harris
3d0f9c09bd Merge pull request #4167 from Alys/task-column-Habits-Rewards-tabs 
new tabs for Habits and Rewards columns on task page
 2014-10-27 18:46:08 +10:00
Matteo Pagliazzi
f8a975d4ea Merge pull request #4180 from jklein/fixing_alignment 
Fixing alignment for invited party members
 2014-10-26 12:44:53 +01:00
Tyler Renelle
fd18232187 bailey(): mystery, costume challenge 2014-10-24 20:33:51 -06:00
Tyler Renelle
87273ec680 bailey(quests): moonstone chain quest 2014-10-23 10:57:09 -06:00