sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5967 commits 1 branch 0 tags 1.6 GiB
Commit graph

1127 commits

Author SHA1 Message Date
Blade Barringer
6fcf1846b3 Renamed everything from flag to abuseFlag 2014-12-07 13:50:46 +01:00
Blade Barringer
5e1e1b2c13 Flag icon opens blank modal 2014-12-07 13:50:46 +01:00
Blade Barringer
60f3e0032e Adjusted margin for markdown list in tast-text. Closes #2721 2014-12-06 16:41:59 -06:00
Blade Barringer
66f913e833 closes #4353. If time on chat would break onto new line, just puts whole 
time statment on new line
 2014-12-05 23:51:07 -06:00
Blade Barringer
ea869a4487 Adjust trasnparent class of challenge buttons. Closes #4346 2014-12-05 15:13:34 -06:00
Sabe Jones
aa346c9271 Merge pull request #4328 from SabreCat/gems 
Add available Gems counter to Market
 2014-12-04 20:30:46 -06:00
Sabe Jones
c9b0898499 fix(style): help emoji line up with task text 
Adds a `vertical-align` property to `span.emoji` so adding an emoji to a task doesn't cause it to bounce out of alignment with the rest of the task's text.
 2014-12-04 16:32:00 -06:00
Blade Barringer
6b8a4f966b Merge pull request #4321 from sbreiler/develop 
Fix #2879 (Check-Icons)
 2014-12-04 08:15:38 -06:00
Sabe Jones
ce8b6d2901 fix(style): Give room for badge 2014-12-03 22:22:21 -06:00
Tyler Renelle
3423e9857d fix(gifts): $rootScope => Payments 2014-12-03 19:38:09 -07:00
Tyler Renelle
d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07: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
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
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
66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space 2014-12-03 13:49:24 -07:00
Steffen Breiler
ffb073102f Fix #2879 (Check-Icons) 
IE11 shows checkmark in wierd position. It seems that IE does size the "checkmark" differently than firefox, which make them appear to be more to the right and bottom. I'm using glyphicons to fix that. The look is constistent in different browser. Though its kind of thicker than the original was.
 2014-12-03 18:51:17 +01: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
8794adde69 Updated function to go to correct options pane. Closes # 4319 2014-12-03 08:01:23 -06:00
benmanley
9c2c08c03d fix(.task-filter): force long words to wrap 
Fixes #4308 Task tabs cut off long words

Prevents long words from overflowing outside of tab width in button
bars by forcing them to break.
 2014-12-01 13:31:15 +00:00
Blade Barringer
0c675f704b Simplified styles for locked and unlocked backgrounds 2014-11-30 18:57:01 -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
pollockjj
6520caed7d Modified to 15px border and lock icon based on feedback from dev team 2014-11-29 21:56:10 -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
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
Tyler Renelle
1539c35d29 fix(private-messages): clear newMessages both when leaving and entering inbox 2014-11-21 08:34:08 -07:00
Tyler Renelle
31fdc866c3 fix(members): add a callback so members modal doesn't popup until after 
member is fetched
 2014-11-21 08:15:19 -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
cb3ebccbbf feat(invite-friends): obfuscated invite 2014-11-18 16:38:43 -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
Matteo Pagliazzi
45845228d0 fix(invite-friends): generate correct link on the client 2014-11-16 11:39:56 +01: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
8f633e81db fix(sharing): add phantomjs buildpack to heroku (for pageres), proper use of nested nconf keys 2014-11-12 14:30:17 -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
3a415a45a9 feat(sharing): add download link 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
cd2d861860 fet(analytics): track individually for cohort 2014-11-11 13:00:41 -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
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
Alice Harris
b79118c976 fix decapitated mount head 2014-11-02 18:54:33 +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
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
7d817f1298 change Heroic to Guardian for non-staff moderators 2014-10-28 11:33:50 +10: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
Tyler Renelle
b5fe46155b Merge pull request #4188 from tylerdmace/develop 
removed broken img tag and added quotes to malformed a tags
 2014-10-27 13:57:49 -06:00
Tyler Mace
5a4aee90ed removed broken img tag and added quotes to malformed a tags 2014-10-26 06:14:31 -06:00
hospect
76de909683 Minor bug: In challenges area, Join button has a yellow background 2014-10-22 01:45:37 +03:00
Alice Harris
5e89d07e07 add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills) 2014-10-21 15:39:46 +10:00
Alice Harris
739e7d3d76 Merge pull request #4157 from crookedneighbor/add-setting-for-due-view 
Added setting for making the due tab default on dailies
 2014-10-20 05:34:40 +10:00
Matteo Pagliazzi
b1fc435c9a feat(emails): add new images 2014-10-19 17:02:25 +02:00
Alice Harris
d8ff2b6181 Merge pull request #4155 from crookedneighbor/fix-bootstrap-width-errors 
Changed margin .row under .container-fluid to match padding
 2014-10-19 18:44:39 +10:00
Matteo Pagliazzi
31d0c970fe Merge pull request #4159 from crookedneighbor/update-landing-page-img 
Set tags to default tags
 2014-10-17 17:17:12 +02:00
Blade Barringer
40585bf977 Set tags to default tags 2014-10-17 09:46:11 -05:00
Alice Harris
817e7b8686 replace original challenge fix with negue's suggestion 2014-10-17 19:37:35 +10:00
Blade Barringer
ed15d0b1c7 Added setting for making the due tab default on dailies 2014-10-16 21:04:23 -05:00
Blade Barringer
ee0e8efa9d Changed margin .row under .container-fluid to match padding 
Since the default is padding: 0 15px, changing it to 0 5px
also requires a change to the row right after it
 2014-10-16 16:13:33 -05:00
Blade Barringer
9b67c4a78e Removed extra layer mistakenly left on 2014-10-16 15:08:52 -05:00
Blade Barringer
c8efc166ba Corrected mobile view stats 2014-10-16 15:07:57 -05:00
Blade Barringer
e584d7caf9 Updated look of landing page image 2014-10-16 14:57:48 -05:00
gjoyner
5e87b42af3 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-13 23:47:34 -07:00
gjoyner
4ab19ac225 Popovers now disappear when clicking Save and Close 2014-10-13 14:10:59 -07:00
gjoyner
feb55324ba Tags (filters) saves when pressing Enter instead of deleting the current tag 2014-10-13 01:57:59 -07:00
Tyler Renelle
56e2ec1bc4 Merge pull request #4140 from gjoyner/checklists 
Adding checklist item drag and drop feature
 2014-10-12 18:27:06 -06:00
Matteo Pagliazzi
cd4626ec06 fix(moment): use new syntax, remove deprecation warning 2014-10-12 20:40:58 +02:00
gjoyner
9afbe42dbf Fixing indentions in taskCtrl.js 2014-10-12 03:15:28 -07:00
gjoyner
36bf09d984 Adding checklist item drag and drop feature 2014-10-12 01:48:51 -07:00
Alice Harris
13b12b830c allow a task to stay visible while being edited, regardless of other parameters 2014-10-10 22:14:43 +10:00
Alice Harris
9669fbcbf9 make All the default tab for Dailies (instead of Due) 2014-10-09 21:20:19 +10:00
Alice Harris
43d2d1355e renamed Daily tabs to save space, removed To-Dos from new code because compled/all tabs were blank, decoupled To-Do code from Dailes code to allow future changes (e.g., "Dated" tab for To-Dos) 2014-10-09 20:04:03 +10:00
Bob Example
c4a2e720fd Add ability to hide completed dailies. 
While I was at it, I also did a bit of refactoring in general around the hiding
of completed todos/dailies.
 2014-10-09 14:49:04 +10:00
Matteo Pagliazzi
96b41448cd Merge pull request #4112 from betaveros/unallocated-notification 
Notification for Unallocated Attribute Points (fixes #4109)
 2014-10-08 19:53:50 +02:00
Matteo Pagliazzi
37971ffceb upgrade code to support moment 2.8.x 2014-10-07 21:30:01 +02:00
Alice Harris
e5700a35e2 make whitespace consistent (tabs changed to spaces) - yes this IS pedantic, sorry :) 2014-10-06 11:53:24 +10:00
Alice Harris
7e0022817f remove unused menu.mounts style (probably best anyway to keep using menu.pets in both pets and mounts pages for consistency of appearance) 2014-10-06 11:52:15 +10:00
Alice Harris
e53dd0da20 add padding-top: -30px --> vertical-align: top fix from a previous PR 2014-10-06 11:44:53 +10:00
Alice Harris
ecd61ee602 Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop 
Conflicts:
	views/options/inventory/stable.jade
 2014-10-06 11:36:32 +10:00
Brian Chen
5809e52fe9 Make attribute referencing in notification logic more robust 2014-10-04 20:56:13 +08:00
Brian Chen
9ecbe9d48f Add unallocated attribute points notification 
* Uses i18n "haveUnallocated" string, to come in another commit
 2014-10-04 19:57:30 +08:00
Brian Chen
74be4b211b DRY-refactor notification display conditions 
* Condense the different notification icons into one span with a
  dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
  there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
  helper function.
 2014-10-04 17:56:56 +08:00
Matteo Pagliazzi
64b19ed090 Merge pull request #4101 from betaveros/betaveros/meter-text-nowrap 
Make .meter-text nowrap to prevent truncation
 2014-10-03 17:12:36 +02:00
Tyler Renelle
e666d2f837 fix(spookDust): user serverside method for spookdust as it's path-protected 2014-10-03 00:33:39 -06:00
Tyler Renelle
0841cafd1f feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:18:13 -06:00
Tyler Renelle
e759dbe951 Merge pull request #4045 from Verabird/guildreject 
fixing guild reject error (issue #2886)-correcting syntax
 2014-10-02 17:22:36 -06:00
Brian Chen
42c4096be7 Make .meter-text nowrap to prevent truncation 
* Add white-space: nowrap to .meter-text to prevent the meter text from
  being cut off when the meter is very short and its content is long
  (mainly an issue with the experience bar, which can easily have a bar
  graph symbol plus one four-digit number over another e.g. 1,234 /
  5,678)
 2014-10-02 19:47:48 +08:00
Negue
bf662ff119 fix rootCtrl.js ; forgot a comma while merging... 2014-10-01 20:53:29 +02:00
Negue
b1a34a25a8 - add popoverHtml to enable Markdown in Popovers 
- add markdown filter to get Task Notes as Markdown
 2014-10-01 20:30:13 +02:00
negue
a595880568 Merge pull request #4044 from negue/apiUrlService 
Use ApiUrlService in all services
 2014-10-01 19:58:26 +02:00