1
0
Fork 0
Commit graph

20760 commits

Author SHA1 Message Date
Ralf Thees
306688057d Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-09-23 14:06:17 +02:00
rabuzarus
fe0856e794
Merge pull request #5777 from JonnyTischbein/issue3870
[frio] Formatbar in new Post and Share Button for Preview Post
2018-09-21 18:51:35 +02:00
Jonny Tischbein
b7e7850b75 disable formatbar in xs screens 2018-09-21 17:46:39 +02:00
Jonny Tischbein
08879298ea unique html id for share button in preview 2018-09-21 11:12:20 +02:00
Jonny Tischbein
fedaf08bd1 remove old TODO 2018-09-20 17:26:19 +02:00
Jonny Tischbein
763ed35bc3 correct textarea id in insertFormattingToPost 2018-09-20 17:23:29 +02:00
Jonny Tischbein
9bc6238b59 Make formatbar work 2018-09-20 17:20:57 +02:00
Jonny Tischbein
f590d31b4b Add format bar in new post jot 2018-09-20 17:14:32 +02:00
Jonny Tischbein
5edb124660 make share button visivle via theme js. Avoid illegal multiple use of html id 2018-09-20 17:09:39 +02:00
Jonny Tischbein
4c56724715 make share button visible in preview 2018-09-20 16:50:58 +02:00
Jonny Tischbein
b1720c07ec Add Share button for preview new post 2018-09-20 16:20:33 +02:00
Hypolite Petovan
be93676894
Merge pull request #5775 from JonnyTischbein/form_return_path
mod/editpost fix return fallback to SESSION Variable
2018-09-20 10:04:25 -04:00
Jonny Tischbein
0f63a62761 fix return fallback to SESSION Variable 2018-09-20 15:55:24 +02:00
Hypolite Petovan
d039d95106
Merge pull request #5774 from JonnyTischbein/form_return_path
Calculate form return_url for post and message instead of using SESSION Variable
2018-09-20 09:41:03 -04:00
Jonny Tischbein
58f26d195f adjust argc check in mod/editpost + relative path in mod/message 2018-09-20 14:41:52 +02:00
Jonny Tischbein
807ad14521 calculate form return_url for post and message instead of using SESSION var 2018-09-19 23:55:29 +02:00
Ralf Thees
91f405bac4 test
Merge branch '2018.08-rc' of https://github.com/friendica/friendica into develop
2018-09-19 21:10:00 +02:00
Michael Vogel
6e77d4799e
Merge pull request #5769 from tobiasd/20150819-credits
regen credits
2018-09-19 13:08:33 +00:00
d5f00569f0 regen credits 2018-09-19 11:16:47 +02:00
Michael Vogel
bd0515714c
Merge pull request #5765 from MrPetovan/bug/php7-remove-pear-text_highlighter
[php7] Remove PHP code highlighting
2018-09-18 18:34:46 +00:00
Michael Vogel
1fa37586ca
Merge pull request #5764 from MrPetovan/task/update-mrpetovan-email-address
Update "mrpetovan" email address
2018-09-18 14:26:58 +00:00
Hypolite Petovan
71575671a5 [Composer] Update league/html-to-markdown to version 4.8.0 2018-09-18 08:58:31 -04:00
Hypolite Petovan
d6985baaed Improve mod/babel
- Handle multiple line endings
- Conserve HTML special chars in input box on submit
- Add new result panel with HTML::toMarkdown result
2018-09-17 23:18:34 -04:00
Hypolite Petovan
382a7f5acd Create new HTML::toMarkdown wrapper 2018-09-17 23:17:41 -04:00
Hypolite Petovan
6500d40f58
Merge pull request #5766 from tobiasd/20180917-lng
translation updates CS, NL, ZH CN
2018-09-17 14:26:22 -04:00
2660882f1e NL translation update THX Jeroen 2018-09-17 19:43:39 +02:00
9927e7a7bf update to the zh-cn translation THX tomacat 2018-09-17 19:43:06 +02:00
ee0fc167c9 CS translation update THX Aditoo 2018-09-17 19:42:12 +02:00
Michael Vogel
e68c48e88f
Merge pull request #5763 from MrPetovan/task/improve-getsiteinfo
Use OEmbed data when available no matter the type
2018-09-17 06:40:04 +00:00
Hypolite Petovan
c4ea3bfb3e
Merge pull request #5728 from rabuzarus/20180905_-_fix_lockview
lockview - prevent notices
2018-09-16 23:02:23 -04:00
Hypolite Petovan
102adf86ae Restore partial condition in OEmbed block of ParseUrl::getSiteInfo 2018-09-16 09:18:31 -04:00
Hypolite Petovan
87c425e388 Improve whitespace display in mod/babel
- Add a couple more result panels for Markdown input
- Remove \x28/\x29 parentheses encoding
- Convert remaining double quotes
2018-09-16 09:07:17 -04:00
Hypolite Petovan
96ed7525b7 Improve whitespace display from/to BBCode/HTML 2018-09-16 09:05:54 -04:00
Hypolite Petovan
a5bf37fd98 [Composer] Remove pear/Text_Highlighter dependency 2018-09-16 09:05:30 -04:00
Hypolite Petovan
ba4f368b45 Remove references to pear/Text_Highlighter 2018-09-16 09:05:00 -04:00
Hypolite Petovan
d6adcb9734 Remove text highlighting from BBCode::convert
- Move code blocks escaping from BBCode::toMarkdown to BBCode::convert
- Use "language-" class prefix for expected syntax highlighting
2018-09-16 09:04:25 -04:00
Ralf Thees
0bc2fe66f5 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-09-16 15:01:29 +02:00
Hypolite Petovan
9d0a6f90b6 Update "mrpetovan" email address
- Fix Tobias' email address
- Fix copypasted doc block in Console/PostUpdate
2018-09-15 19:28:38 -04:00
Hypolite Petovan
79d36b932b
Merge pull request #5761 from annando/endless
The endless saga of the fight against notices continues
2018-09-14 00:36:42 -04:00
Hypolite Petovan
5b5e5ef4db Use OEmbed data when available no matter the type 2018-09-13 21:50:52 -04:00
8c00e88f79 The endless saga of the fight against notices continues 2018-09-13 21:11:52 +00:00
rabuzarus
4079524f78
Merge pull request #5760 from annando/issue-5721
Issue 5721: Temporarily deactivate the picture upload from private mails
2018-09-13 18:35:00 +02:00
63b5cb4fc6 Issue 5721: Temporarily deactivate the picture upload from private mails 2018-09-13 15:46:37 +00:00
Hypolite Petovan
70c94abd8e
Merge pull request #5759 from annando/issue-5733
Issue 5733: Removing contacts does work now on the same machine as well
2018-09-12 19:40:03 -04:00
c4825a8b53 Fixing parentheses 2018-09-12 18:49:36 +00:00
Michael Vogel
f3a97a0828
Merge pull request #5758 from MrPetovan/bug/fix-empty-notifications
Fix introductions notifications links
2018-09-12 06:14:51 +00:00
7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
96d10c25e3 Issue 5733: Removing contacts does work now on the same machine as well 2018-09-12 06:05:14 +00:00
Hypolite Petovan
7529fc61dd Fix introductions notifications links 2018-09-11 19:54:45 -04:00
Hypolite Petovan
18fd86f51e
Merge pull request #5756 from annando/more-notices
Burn notices, burn
2018-09-11 07:36:02 -04:00