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

2541 commits

Author SHA1 Message Date
Lucy Davies
c65fe65d4e Remove the + icon if this file is included in the Buy Gems popup 2014-12-26 00:34:48 +00:00
Lucy Davies
d29971695e Define the variable to control display of the + icon and the onClick functionality 2014-12-26 00:17:03 +00:00
Sabe Jones
1b4843ff58 fix(event): Better quest text placement 2014-12-25 17:42:09 -06:00
Sabe Jones
f4c582eb24 fix(event): quest syntax 2014-12-25 17:40:49 -06:00
Sabe Jones
597793e3ca feat(event): Quests and Bailey 2014-12-25 17:36:16 -06:00
Sabe Jones
1c90886548 fix(event): Better shop flow 2014-12-25 15:52:26 -06:00
Sabe Jones
0e28f04c90 feat(event): Implement Seasonal Shop 2014-12-25 14:33:11 -06:00
Blade Barringer
a8459c2f96 Changing button to a element fixed the delete on enter problem 2014-12-24 11:17:05 -06:00
Blade Barringer
0339bdf43f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-24 09:02:20 -06:00
Blade Barringer
fdcc22bde9 Closes #4361 2014-12-24 09:02:03 -06:00
benmanley
118ba88d3d fix(tasks): improve UI consistency and layout 
* Match UI elements with rest of site
* Tidy up layout
 2014-12-24 09:53:41 +00:00
breiste
e1eaefa943 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:14:08 +01:00
Blade Barringer
84db289957 Merge branch 'develop' into add-flag-to-chat 2014-12-23 10:07:42 -06:00
Sabe Jones
833ff90a59 chore(news): Wonderland Bailey 1 2014-12-21 15:41:32 -06:00
Sabe Jones
bb89a10356 feat(event): Wintery Hair Colors 2014-12-21 13:58:47 -06:00
thehindenburg
1675bb26b2 change link in gala page to gala wiki 2014-12-19 07:47:28 -08:00
Blade Barringer
7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 
Conflicts:
	views/options/social/chat-message.jade
 2014-12-18 21:55:50 -06:00
Sabe Jones
8ff0a4a4a4 fix(seasonal): Leslie link 2014-12-17 18:27:37 -06:00
Sabe Jones
eadedd5897 Merge pull request #4383 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:51:02 -06:00
Sabe Jones
dbe608bc3a fix(news): correct link and awkward image 2014-12-16 20:24:04 -06:00
Sabe Jones
58957118c0 chore(news): Bailey for Seasonal Shop 2014-12-16 20:18:55 -06:00
Tyler Renelle
2822ce233f fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231 2014-12-16 14:17:38 -07:00
Blade Barringer
d56eb1eeeb Added last guild link, corrected hall links 2014-12-14 20:10:42 -06:00
Blade Barringer
63c2248b38 Corrected guild links 2014-12-14 20:07:46 -06:00
Sabe Jones
071ac02ec2 chore(git): Resolve merge conflict 2014-12-14 14:55:37 -06:00
Sabe Jones
9f46e14cd6 fix(seasonal): missing bang 2014-12-14 14:18:57 -06:00
Sabe Jones
867f50b514 fix(seasonal): Add menu item 2014-12-14 14:12:20 -06:00
Sabe Jones
8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones
6dcbd329a5 fix(seasonal): Typo in string resource 2014-12-14 14:05:43 -06:00
Sabe Jones
7988dfcf82 fix(seasonal): Corrections for Shop 
Fix Jade indenting, add state control, add menu option
 2014-12-14 14:01:25 -06:00
Sabe Jones
29f693cd24 fix(I18N): Remove hardcoded text 2014-12-14 13:55:40 -06:00
Sabe Jones
506c396baf fix(I18N): Translate TT in menu 2014-12-14 13:53:00 -06:00
Sabe Jones
a98a685971 feat(seasonal): Seasonal Shop 
Initial commit of frontend for Seasonal Shop feature.
 2014-12-14 13:37:32 -06:00
Sabe Jones
35b02cfdd8 fix(I18N): Make Time Travel translatable 2014-12-14 12:59:45 -06:00
Sabe Jones
c287441cd9 Merge pull request #4378 from SabreCat/purchases 
Hide "2/locked" as appropriate
 2014-12-14 12:42:11 -06:00
Blade Barringer
dde3f5ffef Adjusted tooltip wrapping so it would only affect long titles 2014-12-14 12:18:59 -06:00
Blade Barringer
396176f14f Quest completion screen floats to right on everything but xs 2014-12-14 08:32:05 -06:00
Blade Barringer
41e1f4c75f Conditionally allow completed quest image to be centered if no 
completion text is present
 2014-12-14 08:13:50 -06:00
Blade Barringer
195a8a5ca3 Merge pull request #4375 from thehindenburg/questimage 
Quest image added in the completion screen
 2014-12-14 07:39:16 -06:00
Sabe Jones
e4df3435e1 fix(avatar): Correct "Facial Hair" text 
Adjusts the text style of "Facial Hair" header in Avatar shop to follow the same scheme as Hair. Before, the text was less header-like than elements under it.
 2014-12-13 16:07:58 -06:00
Sabe Jones
4ded747b88 fix(purchases): Correct hair path 
Fixes https://github.com/HabitRPG/habitrpg/issues/4312.
 2014-12-13 15:53:39 -06:00
Sabe Jones
4adf95feb6 fix(purchases): Hide "2/locked" as appropriate 2014-12-13 12:05:17 -06:00
Tyler Renelle
e1ea1a24c8 feat(challenges): optional checkbox on group create/edit: 
restrict challenge-creation to leader. Commented-out code for similar
setup for member invites, shouldn't be hard
 2014-12-12 11:37:00 -07:00
thehindenburg
2db80c6841 changed to style sheet 2014-12-12 10:26:55 -08:00
thehindenburg
375253fb84 changing the reward text to clear the image 2014-12-12 09:38:13 -08:00
thehindenburg
d70de5972e added the image to the end screen and made adjustments to the line 2014-12-11 22:28:07 -08:00
Blade Barringer
a95947b2dc Made reset flag count button red 2014-12-11 21:49:42 -06:00
Blade Barringer
dff7a74135 Made flag number more helpful 2014-12-11 21:47:06 -06:00
Blade Barringer
a0a4378465 Admin can see flag on own message 2014-12-11 21:44:58 -06:00
Blade Barringer
3c2319b63c Made it impossible to flag own message in inbox 2014-12-11 21:42:39 -06:00
Blade Barringer
c67da1804a Changed transparent class for admin to only appear if it is hidden 2014-12-11 21:40:25 -06:00
Blade Barringer
6b8280ccbb Adjusted spacing of chat buttons 2014-12-11 17:41:54 -06:00
Blade Barringer
38cd0e8de1 Added method for letting an admin unhide a flagged message 2014-12-11 17:29:01 -06:00
Blade Barringer
f9c00003f3 Moved ng-class so it would update transparent class in real time after flaggging 2014-12-11 13:38:57 -06:00
Blade Barringer
db1f24e7b4 Added note about how many flags a message has 2014-12-11 13:12:50 -06:00
Blade Barringer
c8c64a1b81 Allow admin to see messages that have been flagged more than twice, but 
make them semi-transparent
 2014-12-11 13:09:00 -06:00
Blade Barringer
1fb73b35ab Always show message if admin 2014-12-11 13:05:48 -06:00
Blade Barringer
4718641d3e Hide message if flag count is 2 or higher 2014-12-11 13:01:50 -06:00
Blade Barringer
d24f6ad1ac Converted sent transparency to ng-class instead of style 2014-12-11 12:45:25 -06:00
Blade Barringer
564677340c User can only flag message after accepting community guidelines 2014-12-11 10:29:12 -06:00
Blade Barringer
9bd0304223 Updated message preview on flag abuse modal to use markdown interpretation 2014-12-11 10:23:29 -06:00
Blade Barringer
0cf7bba822 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-11 10:21:19 -06:00
Blade Barringer
6f459f33e4 Added fields for total pet/mount count as well as achievment progress 2014-12-11 10:09:09 -06:00
Blade Barringer
cea2879539 Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster 2014-12-11 08:15:18 -06:00
Blade Barringer
e79126bf59 Merge pull request #4372 from thehindenburg/optoutspace 
added space in Jade to the arrow and opt out text in the inbox
 2014-12-10 15:51:38 -06:00
thehindenburg
799934c31b added space in Jade to the arrow and opt out text in the inbox 2014-12-10 12:31:09 -08:00
Blade Barringer
7fb1e69927 Changed inbox text to use an env.t var 2014-12-10 10:47:05 -06:00
Blade Barringer
4af70a2a0f Made invite button for guild invitations part of an input-group 2014-12-10 09:47:58 -06:00
Sabe Jones
dc034e4ab5 fix(quest): Add penguin to shop 2014-12-09 20:48:08 -06:00
Sabe Jones
2d9d8fe209 chore(Bailey): Announce Penguin 2014-12-09 20:20:17 -06:00
Blade Barringer
1511002a08 Fixed styling of invitation to guild page 2014-12-08 17:03:11 -06:00
Blade Barringer
5230883015 Adjusted styling of select box used for ordering party 2014-12-08 16:57:37 -06:00
Blade Barringer
2a3bd8a9cb No longer displays an extra popover that says true. Closes #4362 2014-12-08 12:44:37 -06:00
Blade Barringer
72fbe6a8a7 Removed yellow background from join public guild page 2014-12-07 20:58:42 -06:00
Blade Barringer
bd21c93b36 Fixed weirdness on create guild page. Elements were overflowing out of 
their boxes
 2014-12-07 20:52:49 -06:00
Blade Barringer
46cb38660e Fixed padding on challenges filter box 2014-12-07 20:20:42 -06:00
Matteo Pagliazzi
ae6e0255c6 feat(flag-message): add server methods 2014-12-07 14:35:09 +01:00
Blade Barringer
aafda2dad1 Added text of message to make sure user clicked the right flag 2014-12-07 13:50:47 +01:00
Blade Barringer
8537c96eb6 Converted heading to paragraph 2014-12-07 13:50:47 +01:00
Blade Barringer
2f506ce0e0 Give flag text danger class and already reported message if already 
reproted
 2014-12-07 13:50:47 +01:00
Blade Barringer
74b94e6764 Removed flag from system notifications 2014-12-07 13:50:46 +01:00
Blade Barringer
c44c607ae7 Renamed flagChat to flagChatMessage 2014-12-07 13:50:46 +01:00
Blade Barringer
62d92db332 Added buttons to footer, cleaned up functions 2014-12-07 13:50:46 +01:00
Blade Barringer
c90ea166d4 Corrected tooltip name 2014-12-07 13:50:46 +01:00
Blade Barringer
01c0ce1722 Added text-danger span on username 2014-12-07 13:50:46 +01:00
Blade Barringer
6fcf1846b3 Renamed everything from flag to abuseFlag 2014-12-07 13:50:46 +01:00
Blade Barringer
00abb168a1 Added heading and body of flag modal 2014-12-07 13:50:46 +01:00
Blade Barringer
5e1e1b2c13 Flag icon opens blank modal 2014-12-07 13:50:46 +01:00
Andy Mantell
58359f1e89 Link for Tyler and Vicky's names #4351 2014-12-06 15:42:12 +00:00
Blade Barringer
024e606f5c Merge pull request #4348 from crookedneighbor/fix-transparent-challenge-buttons 
Adjust transparent class of challenge buttons.
 2014-12-05 22:17:38 -06:00
Blade Barringer
ae62a04497 Converted planId to customerId on whether or not gems can be purchased. 
Closes #4340
 2014-12-05 15:53:53 -06:00
Blade Barringer
ea869a4487 Adjust trasnparent class of challenge buttons. Closes #4346 2014-12-05 15:13:34 -06:00
Matteo Pagliazzi
0450e2b924 Revert "Revert "Tranlsate mystic items"" 2014-12-05 16:07:27 +01:00
Matteo Pagliazzi
1d1de38956 Revert "Tranlsate mystic items" 2014-12-05 16:03:41 +01:00
Matteo Pagliazzi
a1075a5193 Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items 
Tranlsate mystic items
 2014-12-05 16:02:34 +01:00
Sabe Jones
7dd16a06e6 Revert "fix(style): Make pet key a SPAN" 
This reverts commit 63ea851fdb.
 2014-12-04 20:26:50 -06:00
Sabe Jones
63ea851fdb fix(style): Make pet key a SPAN 2014-12-04 20:13:26 -06:00
Blade Barringer
5986643f1e Corrected strings so they only use one variable 2014-12-04 20:03:31 -06:00
Blade Barringer
532f5d1c53 Converted strings to be able to use links 2014-12-04 19:49:36 -06:00
Blade Barringer
21ca49345d Moved time travelers and hourglass strings to shared 2014-12-04 19:49:36 -06:00
Sabe Jones
f2c6c07ff8 fix(Gems): Clarify badge count 2014-12-04 19:04:47 -06:00
Blade Barringer
efcf9099f4 Adjusted count for remaining gem count 2014-12-04 18:47:28 -06:00
Sabe Jones
b017623621 fix(subscriptions): Fix to Gems badge 2014-12-03 21:39:26 -06:00
Sabe Jones
62e526f8dc feat(subscriptions): Show count of purchasable Gems 2014-12-03 20:55:22 -06:00
Tyler Renelle
bd5f8d79ea fix(bailey): mystery 3014 promo 2014-12-03 19:24:42 -07:00
Tyler Renelle
d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07:00
Tyler Renelle
e1492809fd bailey(plans): Gifting Subscriptions And Gems, New Subscription 
Benefits, Mysterious Time Travelers, Steampunk Item Sets, And Block Subscriptions
 2014-12-03 16:31:38 -07:00
Blade Barringer
754fb549ea Merge pull request #4320 from crookedneighbor/show-full-time-on-hover-in-chat 
Added tooltip to show chat time in date format with minutes and seconds
 2014-12-03 17:03:44 -06:00
Tyler Renelle
30c1ac4b1e fix(plans): lots of bug fixes & cleanup 2014-12-03 16:01:57 -07:00
Tyler Renelle
0a53a5717e refactor(payments): move payments into it's own service, out of rootCtrl 2014-12-03 14:17:08 -07:00
Tyler Renelle
8c5842eb52 feat(plans): cleanup plans' perks page, rename Time Trinket => Mystic Hourglass 2014-12-03 14:17:08 -07:00
Tyler Renelle
0fffd66588 feat(plans): time travelers tab, 1 trinket to buy 1 set 2014-12-03 14:17:08 -07:00
Tyler Renelle
7f2b6b5cfb feat(plans): allow block subscriptions from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle
5fd805db88 feat(plans): consectuive-month subscription perks (gifting) 2014-12-03 14:17:07 -07:00
Tyler Renelle
5b01fff700 feat(gifts): allow gifting subscriptions 2014-12-03 14:17:07 -07:00
Tyler Renelle
e8dbd5ca1a feat(gifts): allow gifting gems from paypal/stripe 2014-12-03 14:17:07 -07:00
Tyler Renelle
7e9b92fcad feat(gifts): allow gifting from balance 2014-12-03 14:17:07 -07:00
Tyler Renelle
57bfee02cf feat(plans): consecutive months & extra months (like a time-card) 2014-12-03 14:17:07 -07:00
Tyler Renelle
66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space 2014-12-03 13:49:24 -07:00
benmanley
073b338bde fix(tasks): stop reward values overflowing 
Fixes #1993

* Restyle reward cost area to fit three digit rewards into default view
* Apply custom styles to rewards with higher values to prevent them
from overflowing
 2014-12-03 15:40:08 +00:00
Blade Barringer
c7c5aee6a0 Added tooltip to show chat time in date format with minutes and seconds 2014-12-03 07:49:06 -06:00
Sabe Jones
3cf6e84451 chore(Bailey): Outage announcement 2014-12-01 21:05:36 -06:00
Tyler Renelle
985171f856 fix(tavern): jade fix 2014-12-01 17:45:50 -07:00
Alice Harris
9bc38b0b2e Merge pull request #4287 from taldin/market-poptop 
Market poptop fix
 2014-12-01 17:58:12 +10:00
Sabe Jones
1713843067 fix(Bailey): correct date 2014-11-30 23:06:00 -06:00
Sabe Jones
452b459d69 chore(Bailey): Announce December 2014-11-30 23:03:08 -06:00
Blade Barringer
632d0fdf5d Merge pull request #4299 from pollockjj/develop 
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261)
 2014-11-30 18:41:51 -06:00
Tyler Renelle
96f8f2cdd5 refactor(inventory): move all special items into single category 
"special" (cleaner)
 2014-11-30 13:12:28 -07:00
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