Commit Graph

202 Commits

Author SHA1 Message Date
dave 997c99e45d #137 - add red heart emoji 2019-02-07 06:26:51 -05:00
Xiaofeng An 460976c6e5 #301 - add an option for default formatting 2019-02-06 14:26:46 -05:00
shpuld a8c6b3f538 Change video playing default without bothering making it an instance configurable 2019-01-31 21:19:41 +02:00
shpuld 676acdbf82 Add default config for new options, fix firefox inline playing 2019-01-26 17:59:59 +02:00
shpuld 0ab828bb30 Merge develop and fix conflict 2019-01-26 17:50:41 +02:00
Henry Jameson ac64e90898 fix custom nsfwCensorImage not working 2019-01-23 00:15:24 +03:00
shpuld 8761e039d0 Merge dev fix conflicts 2019-01-20 15:52:35 +02:00
shpuld 485a061287 Polish for videos, smaller sizes, remove gif-looping options 2019-01-20 12:46:11 +02:00
nik aed7c7096e update logo 2019-01-18 22:17:38 -06:00
HJ a974d2ab85 Merge branch 'scope-copy-default' into 'develop'
scopeCopy → true by default

See merge request pleroma/pleroma-fe!439
2018-12-30 15:12:03 +00:00
lambda 1555a5fef3 Merge branch 'restore-routes' into 'develop'
Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
Maxim Filippov 85c487b933 Make "noAttachmentLinks" configurable 2018-12-27 13:25:11 +03:00
scarlett f2f7e2e766 scopeCopy → true by default 2018-12-25 17:44:05 +00:00
Lambda 24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
Henry Jameson d0b47488fb default webPush to false, because having it at true leads to some problems with
local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
2018-12-20 09:17:51 +03:00
Maxim Filippov 2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Henry Jameson bd745543b6 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
* upstream/develop: (176 commits)
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  added condition to check for logined user
  fix gradients and minor artifacts
  keep track of new instance options
  fix old MR
  oof
  get rid of slots
  fix timeago font
  added hide_network option, fixed properties naming
  Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
  improve notification subscription
  Fix typo that prevented scope copy from working.
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  ...
2018-12-14 17:10:26 +03:00
Henry Jameson 8fcc4c6766 fix 2018-12-11 19:09:00 +03:00
Maxim Filippov ae8f0f36d8 Use "~" as a route namespace symbol 2018-12-10 01:21:52 +03:00
Maxim Filippov 7d5794b9fa Fix redirect paths 2018-12-06 22:10:46 +03:00
Henry Jameson 51cf4dc298 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop:
  Fix iOS Safari from making videos play fullscreen by default
  added PR comments
  resolved the lint
  used the deleted data param as condition in status template
  Switch to "timeline" when pressing user-settings
  Added user setting tooltip
  made links in user bio always open in new tabs
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
  Do not use underscore at the beginning of the method
  Logout user on password change
  Route user to the correct profile URL
  Typo
  Fix filetype detection
  Switch to settings when touching settings
  Switch to timeline on nav panel actions
2018-12-05 10:43:03 +03:00
Henry Jameson 7a13c530c7 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
* upstream/develop:
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
2018-12-04 09:56:45 +03:00
Henry Jameson 6b3489a4d3 search button for user finder 2018-12-03 08:03:11 +03:00
Henry Jameson b34097a5c1 Added option to auto-hide subject field when it's empty. 2018-12-03 06:47:35 +03:00
Henry Jameson 80c0745558 some more themes, fixes 2018-12-02 10:22:25 +03:00
Henry Jameson a806d43f05 Merge remote-tracking branch 'upstream/develop' into feature/theming2
* upstream/develop: (60 commits)
  whoops
  whoops
  DM timeline: stream new statuses
  update-japanese-translation
  Add actual user search.
  incorporate most translation changes from MR 368
  update french translation
  Always show dm panel.
  Add direct message tab.
  api service url
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  On logout switch to public timeline.
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Put oauth text into description.
  Display OAuth login on login form button.
  ...
2018-11-26 05:21:58 +03:00
Henry Jameson e06717fd0d Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop:
  DM timeline: stream new statuses
  update-japanese-translation
  Add actual user search.
  incorporate most translation changes from MR 368
  update french translation
  Always show dm panel.
  Add direct message tab.
  api service url
  On logout switch to public timeline.
  Put oauth text into description.
  Display OAuth login on login form button.
  Add login form back in.
  Linting.
  Re-activate registration, use oauth password flow to fetch token.
  Fix typo.
  Remove gonsole.logg :DD
  Fix linting.
  Move login to oauth.
2018-11-26 04:38:44 +03:00
Henry Jameson 0ca42bd3d6 Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop: (36 commits)
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Count spoiler text in the character count. Fixes #135.
  Added Irish (Gaeilge) Language
  Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
  simplify code
  adapt to destructive change of api
  Adds Occitan locale
  Updated italian translation
  Update oc.json
  Update oc.json
  Update of the oc.json file Actualizacion del fichièr oc.json
  Sort messages object by language code so that it's easier from the UI to browse them.
  explicitly set collapseMessageWithSubject to undefined
  Fall back to instance settings consistently
  ...
2018-11-26 04:33:41 +03:00
Henry Jameson 08838774e4 redmond update 2018-11-26 03:51:12 +03:00
Henry Jameson 572c874f5c theme separation 2018-11-26 02:29:08 +03:00
Henry Jameson 91ea9b7b0e checkbox radius 2018-11-23 07:28:53 +03:00
Henry Jameson d2f3b6d244 more styles, temporarily in one file, fix for panel header box-shadow affecting
the user-card one
2018-11-23 01:45:08 +03:00
Henry Jameson 8fd1b87e87 more authentic redmond theme 2018-11-23 01:13:57 +03:00
Henry Jameson 631b8433c0 bundling v2 themes works 2018-11-22 04:37:49 +03:00
Henry Jameson a5b4f31c12 shadow control initial stuff. not done yet tho 2018-11-19 04:40:25 +03:00
Henry Jameson 75cdcc40db fix accidentally removed icon 2018-11-15 17:09:25 +03:00
lambda 11f8a4f312 Merge branch 'oauth' into 'develop'
Move login to oauth.

See merge request pleroma/pleroma-fe!367
2018-11-13 18:42:07 +00:00
Henry Jameson 1723f427f5 updates 2018-11-13 16:30:01 +03:00
lambda be8a4a9745 Merge branch 'patch-1' into 'develop'
[i18] Correction Occitan file

See merge request pleroma/pleroma-fe!369
2018-11-13 12:54:04 +00:00
Roger Braun 50264410f5 Add login form back in. 2018-11-07 16:56:12 +01:00
dgold 4f258b4940
Added Irish (Gaeilge) Language
All translations checked with tearma.ie & acmhainn.ie for language use
and technical accuracy.
2018-11-02 20:08:11 +00:00
Exilat 6dd675566e Copy-Paste too fast from the Catalan file apparently.
Now it's in good Occitan.
2018-10-28 12:38:40 +00:00
Exilat 0a261d2a7d Adds Occitan locale 2018-10-25 17:19:31 +00:00
Henry d81887e34f Merge branch 'catalan' into 'develop'
Create catalan translation

See merge request pleroma/pleroma-fe!355
2018-10-17 18:36:35 +00:00
fadelkon bf3e3f8b9a Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text. 2018-10-16 18:11:49 +02:00
fadelkon 59dec1b43f Finish general and timeago catalan strings. Glossary:
* bio: presentació
* timeline: flux [d'entrades]
* post/status: entrada
* settings: configuració
* user: usuari/a
* users: usuàries
* background: fons de pantalla
* banner: fons de perfil
* follower: seguidor/a
* follow: contacte/a qui segueixo
* avatar: avatar
* [visibility] scope: abast de la publicació

Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ .
2018-10-13 18:17:00 +02:00
Henry Jameson 455cd0d028 settings for scope/subject 2018-09-25 14:47:02 +03:00
scarlett 699ee0891d Changeable defaults for hideUserStats and hidePostStats 2018-09-04 00:48:14 +01:00
Henry Jameson 17f30190e0 Made showing format selection optional and default to false 2018-08-31 17:00:41 +03:00
Henry Jameson e99534ef71 added option for logo in navbar to follow color scheme of the rest of the site
also fixed potential mess-up between api/static configs
2018-08-31 04:06:00 +03:00
hakabahitoyo 7fc4506d29 remove-unused-settings 2018-08-26 17:32:58 +09:00
ensra 3ec8e43a97 Rename expandCW to collapseMessageWithSubject.
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +01:00
Henry Jameson 3fa9d90712 using custom ascend value as suggested here:
https://github.com/fontello/fontello/issues/513#issuecomment-237551101 helped.
2018-08-15 14:08:47 +03:00
Henry Jameson f2b996cd46 disable hinting because it breaks alignment on some icons (namely - locks) 2018-08-15 13:59:22 +03:00
Henry Jameson 4d112b70fd fixed custom emoji in nickname. changed icons on right side to be more
streamlined. adjusted CSS so that all text in header of post is on same
baseline and all icons/images are middle-aligned.
2018-08-13 14:46:28 +03:00
Henry Jameson 398eaaf79b fixed the UI 2018-07-06 20:12:09 +03:00
Roger Braun d64293506c Make scope options optional, refactoring. 2018-06-08 15:25:48 +02:00
Roger Braun f06fef26b1 Display visibility if available. 2018-05-20 18:28:01 +02:00
Hakaba Hitoyo 2471b71aab osa-compatible who to follow provider 2018-05-05 00:53:40 +09:00
Hakaba Hitoyo 2ade177d5a configurable who to follow panel 2018-05-05 00:20:19 +09:00
Hakaba Hitoyo 77ffa89464 Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable 2018-05-04 23:50:14 +09:00
Hakaba Hitoyo df486e18c2 add redirectRootNoLogin and redirectRootLogin configuration 2018-04-29 17:31:47 +09:00
Hakaba Hitoyo 033170212f merge 2018-04-22 00:48:06 +09:00
shpuld 96692454a0 change external link icon, move chat from side panel to floating, hide own bio, prevent body/app from scrolling horizontally. 2018-04-14 10:19:09 +03:00
Henry Jameson 65f82cf294 <select> styling (abeit somewhat not pretty code-wise), default colors for
default schemes.
2018-04-07 21:58:29 +03:00
Roger Braun fb3b7ffd39 Use less busy default background. 2018-03-31 12:50:51 +02:00
Hakaba Hitoyo b32573138b Add who-to-follow-panel 2018-02-24 23:04:44 +09:00
Hakaba Hitoyo ebd8300e36 slove conflict 2018-02-10 10:17:58 +09:00
dtluna e2248bcf4f Use `name` and `closed` from the backend 2018-02-09 16:02:26 +03:00
Hakaba Hitoyo 013f11497f slove-conflict 2018-02-04 08:36:10 +09:00
hakabahitoyo 95cba854f3 add instance specific panel 2018-02-04 00:27:33 +09:00
eal b67c506062 Merge branch 'develop' into feature/normal-emoji-completion 2017-12-23 19:52:16 +02:00
eal 612fb18367 Add option for disabling chat. 2017-12-07 18:20:44 +02:00
Roger Braun 2691579ab7 Make default path configurable. 2017-11-22 16:28:05 +01:00
eal 581e3e836a Add completion for normal emoji. 2017-11-20 20:32:51 +02:00
shpuld d65d6e5da4 Clean up, use translations, persist theme, add more presets. 2017-11-18 13:13:51 +02:00
shpuld 21b31cf599 Move custom theming from settings to style-switcher, remove usage of custom .css files, use styles.json instead. 2017-11-17 17:24:42 +02:00
eal 26416ed15c Revert to English timeago for latin script languages. 2017-11-09 09:45:02 +02:00
eal ceb13a6405 Add timeago locales. 2017-11-08 22:20:50 +02:00
eal 5e6ffc0e45 Make user finder more pleasant. 2017-09-10 20:46:42 +03:00
eal 43f416297f Change better specifier for months. 2017-08-29 23:15:20 +03:00
Roger Braun 7d59051fc5 Add logout button. 2017-07-02 12:25:34 +02:00
Shpuld Shpuldson 1a5ee95ee4 Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled. 2017-06-20 10:37:51 +03:00
Shpuld Shpuldson bfbc94d697 Move customizable terms-of-service into its separate .html file. 2017-06-19 16:35:35 +03:00
Shpuld Shpuldson bac1d3bd57 Move user-finder into navbar and hide it behind a toggle button, update fontello icons with user-plus and menu. 2017-06-03 23:42:54 +03:00
Shpuld Shpuldson 3a1ae3a30e Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago' 2017-05-31 12:45:03 +03:00
Shpuld Shpuldson 446de1c623 Potential new default dark and light themes added (base16-pleroma-dark, base16-pleroma-light). The new dark one set as the default. 2017-04-13 02:05:31 +03:00
Roger Braun 0be2051588 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-16 22:27:10 +01:00
Roger Braun 6de2dd041d Update font. 2017-02-16 22:25:20 +01:00
Roger Braun ce5b3d4c92 Add logo. 2017-02-16 17:44:36 +01:00
Roger Braun a3b2be09b3 Add /cyb/ background by sonyam. 2017-02-16 16:59:06 +01:00
Roger Braun 1d64b76211 Add basic configuration module, make it work for title and theme. 2017-02-14 22:21:23 +01:00
Roger Braun c402478cca Update font. 2017-02-14 21:46:26 +01:00
Roger Braun d644887d4c Add styleSwitcher. 2017-01-16 18:57:03 +01:00
Roger Braun b65a29aa07 Dynamic style setting. 2017-01-16 17:44:26 +01:00
Roger Braun 65c7ad1269 Use solarized-light by default. 2017-01-15 15:50:34 +01:00
Roger Braun fc7e13e7bb Add styling with base16.
Solarized-dark for now.
2017-01-15 15:44:56 +01:00
dtluna 01edb7dbe4 Add remove attachment button 2016-11-26 05:00:06 +03:00
Alexander Gitter 30ead13db3 Add spinner/reload glyphs 2016-11-13 17:58:08 +01:00
Roger Braun dcb7fd1440 Add upload image to icon font. 2016-11-06 19:28:02 +01:00
Roger Braun ba09e05036 Add image font. 2016-10-30 16:12:08 +01:00
Roger Braun 191c02af1e Basic skeleton 2016-10-26 16:46:32 +02:00