Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-09-23 05:05:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
20793 commits 2 branches 64 tags 236 MiB
Commit graph

20793 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff
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
Tobias Diekershoff
2660882f1e NL translation update THX Jeroen 2018-09-17 19:43:39 +02:00
Tobias Diekershoff
9927e7a7bf update to the zh-cn translation THX tomacat 2018-09-17 19:43:06 +02:00
Tobias Diekershoff
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
Michael
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
Michael
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
Michael
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
Michael
7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
Michael
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
Michael
f566db52d3 And more notices ... 2018-09-11 08:04:14 +00:00
Michael
8b96a53fba Burn notices, burn 2018-09-11 04:10:11 +00:00
Michael Vogel
aa2ab3d0e7
Merge pull request #5753 from MrPetovan/bug/5752-fix-warning-count 
Fix count being called on the wrong variable in mod/notes
 2018-09-10 05:05:39 +00:00
Hypolite Petovan
e461474290 Fix count being called on the wrong variable in mod/notes 2018-09-09 18:34:05 -04:00
Michael Vogel
dcb9bf4136
Merge pull request #5750 from MrPetovan/bug/5723-frio-fix-new-event-acl 
[frio] Fix new event ACL
 2018-09-09 16:40:31 +00:00
Hypolite Petovan
11a3b45957 [frio] Fix ACL selection in new event modal 
- Fix this.allow_cid.push isn't a function error
 2018-09-09 10:10:17 -04:00
Hypolite Petovan
4edbea3ed0 Fix JS error when no acl is defined 2018-09-09 09:54:54 -04:00
Hypolite Petovan
071aff223a Format source of mod/events 2018-09-09 09:51:59 -04:00
Hypolite Petovan
f4e0ab55c7
Merge pull request #5749 from annando/again 
Notices come, notices go ...
 2018-09-09 09:12:02 -04:00
Michael
d581318c7c Notices come, notices go ... 2018-09-09 06:32:01 +00:00
Michael Vogel
21341eb32c
Merge pull request #5748 from MrPetovan/bug/fix-addon-config-overwrite 
Add overwrite parameter to App->loadConfigFile
 2018-09-08 13:15:15 +00:00
Hypolite Petovan
791a77f441 Add overwrite parameter to App->loadConfigFile 2018-09-08 02:37:53 -04:00
Michael Vogel
05567b9866
Merge pull request #5746 from MrPetovan/bug/fix-empty-notifications 
Restore template choice by notification label
 2018-09-07 15:45:10 +00:00
Benjamin Lorteau
71215115eb Restore template choice by notification label 2018-09-07 11:15:23 -04:00
Tobias Diekershoff
c18da1444d
Merge pull request #5744 from annando/fix-preview 
Fix for #5732 - too much links had been detected as photos
 2018-09-07 09:01:14 +02:00
Michael
99244d33f5 Fix for #5732 - too much links had been detected as photos 2018-09-07 06:10:33 +00:00
Tobias Diekershoff
55f72b5767
Merge pull request #5743 from MrPetovan/bug/fix-empty-notifications 
Fix empty notifications
 2018-09-07 07:33:47 +02:00
Hypolite Petovan
480d792356
Merge pull request #5732 from annando/fix-picture-posts 
Fix: Posts with pictures will now look good again on connector networks
 2018-09-06 19:00:44 -04:00