Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1554 commits 59 branches 16 tags 15 MiB
Commit graph

1554 commits

This branch
This branch
All branches
Author SHA1 Message Date
rinpatch
cddb173089 Fix filetype detection 2018-11-27 18:44:49 +03:00
Henry
91272dc555 Merge branch 'feature/scope_preferences' into 'develop' 
Make visibility copying and subject copying configurable

Closes #135

See merge request pleroma/pleroma-fe!353
 2018-11-26 01:50:54 +00:00
Henry Jameson
b948234aec whoops 2018-11-26 04:44:54 +03:00
Henry Jameson
2dbc5f757d whoops 2018-11-26 04:42:25 +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
f1a23f2b6e Merge branch 'update-japanese-translation' into 'develop' 
Update Japanese translation

See merge request pleroma/pleroma-fe!378
 2018-11-25 22:53:21 +00:00
eal
2d48292683 Switch to settings when touching settings 2018-11-25 19:18:16 +02:00
eal
668087a29e Switch to timeline on nav panel actions 2018-11-25 19:00:24 +02:00
lambda
47403a055d Merge branch 'fix/dm-timeline-streaming' into 'develop' 
DM timeline: stream new statuses

Closes #170

See merge request pleroma/pleroma-fe!379
 2018-11-25 16:30:02 +00:00
eal
3ed05693de DM timeline: stream new statuses 2018-11-25 18:11:57 +02:00
lambda
3263aa323c Merge branch 'feature/user-search' into 'develop' 
Add actual user search.

See merge request pleroma/pleroma-fe!376
 2018-11-16 18:14:16 +00:00
Hakaba Hitoyo
7044bf2bd7 update-japanese-translation 2018-11-15 11:39:08 +09:00
Roger Braun
c34eebff6c Add actual user search. 2018-11-14 20:31:06 +01:00
kaniini
609ad40736 Merge branch 'french-translation' into 'develop' 
French translation update

See merge request pleroma/pleroma-fe!375
 2018-11-14 15:48:37 +00:00
William Pitcock
1ad642c598 incorporate most translation changes from MR 368 2018-11-14 15:43:27 +00:00
William Pitcock
d0a4152f3c update french translation 2018-11-14 15:36:55 +00:00
lambda
be6ebc176b Merge branch 'dm-tab' into 'develop' 
Direct Message tab

See merge request pleroma/pleroma-fe!374
 2018-11-14 10:28:54 +00:00
Roger Braun
c7d469249e Always show dm panel. 2018-11-13 22:30:00 +01:00
Roger Braun
b37a0f4f23 Add direct message tab. 2018-11-13 20:34:56 +01:00
Roger Braun
7f13cbc493 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tab 2018-11-13 20:21:04 +01:00
Roger Braun
ffb9d4faf5 api service url 2018-11-13 20:20:46 +01: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
Roger Braun
e9b68b8c97 remove deploy stage 2018-11-13 14:16:02 +01:00
Roger Braun
ee29bca60a remove deploy stage 2018-11-13 14:14:48 +01: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
lambda
2a61f2b24c Merge branch 'i18n/irish' into 'develop' 
Added Irish (Gaeilge) Language

See merge request pleroma/pleroma-fe!370
 2018-11-13 06:59:46 +00:00
lambda
c1f518882e Merge branch 'develop' into 'develop' 
updated and completed German translation

See merge request pleroma/pleroma-fe!373
 2018-11-13 06:59:11 +00:00
Vinzenz Vietzke
ae927f8628 updated and completed German translation 2018-11-12 22:39:55 +01:00
lambda
70e01c6ec3 Merge branch 'develop' into 'develop' 
Added Chinese Language

See merge request pleroma/pleroma-fe!372
 2018-11-10 10:17:40 +00:00
Roger Braun
9f64c96721 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauth 2018-11-10 11:00:09 +01:00
Roger Braun
cf581b7d5a On logout switch to public timeline. 2018-11-10 10:43:25 +01:00
Starmancer
4c5073a66c minor modification of Chinese translation 2018-11-09 14:29:14 +08:00
Starmancer
819e9ce6a3 update Chinese translation 2018-11-09 14:15:55 +08:00
Nebula
e1d21512a9 Add Chinese language 2018-11-09 05:42:32 +00:00
Roger Braun
2c2c4452b9 Fix posting. 2018-11-08 19:34:59 +01:00
Roger Braun
1de382f026 Put oauth text into description. 2018-11-08 19:27:19 +01:00
Roger Braun
a04795d723 Display OAuth login on login form button. 2018-11-08 16:12:05 +01:00
lambda
a1962a610a Merge branch '153-count-cw' into 'develop' 
Resolve "PleromaFE does not count the Content Warning into Post length"

Closes #153 and #135

See merge request pleroma/pleroma-fe!371
 2018-11-07 22:15:47 +00:00
Roger Braun
6f668df697 Count spoiler text in the character count. Fixes #135. 2018-11-07 17:20:33 +01:00
Roger Braun
50264410f5 Add login form back in. 2018-11-07 16:56:12 +01:00
Roger Braun
bcbaf5d7ee Linting. 2018-11-06 21:51:22 +01:00
Roger Braun
4d9680e797 Re-activate registration, use oauth password flow to fetch token. 2018-11-06 21:48:05 +01:00
Roger Braun
b6cd4ff32a Fix typo. 2018-11-06 21:47:11 +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
Roger Braun
fbe30b4922 Merge remote-tracking branch 'origin/develop' into oauth 2018-10-26 16:13:05 +02:00
Roger Braun
0aa5fe9d0d Remove gonsole.logg :DD 2018-10-26 16:05:27 +02:00
Henry
2f11ec296e Merge branch 'fix-features-panel' into 'develop' 
Fix Features panel

See merge request pleroma/pleroma-fe!366
 2018-10-26 13:53:37 +00:00
Roger Braun
60b3e4f40f Fix linting. 2018-10-26 15:20:39 +02:00