Commit graph

20720 commits

Author SHA1 Message Date
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
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
Hypolite Petovan
f85af78097 Source format mod/notifications
- Add array alignment
- Convert remaining double quotes to quotes
- Replace x() with defaults()
- Add missing spaces
2018-09-06 18:55:06 -04:00
Hypolite Petovan
2f7ba13702 Restore display when there aren't unread notifications 2018-09-06 18:42:57 -04:00
Michael
2592c3891c forgotten $ 2018-09-06 21:10:48 +00:00
Michael
1d4a5402ff Picture posts do work again - everything else should work as well 2018-09-06 20:30:16 +00:00
Hypolite Petovan
e735a14db9
Merge pull request #5736 from annando/issue-5733
Issue 5733: Changing relationship values does work now again with DFRN
2018-09-06 13:19:24 -04:00
Hypolite Petovan
d27cf0cb60
Merge pull request #5740 from annando/fix-fatal
Fix fatal error due to missing "use"
2018-09-06 11:58:07 -04:00
Michael
e9a73e4480 Fix fatal error due to missing "use" 2018-09-06 13:27:03 +00:00
Michael Vogel
9c0b80142d
Merge pull request #5739 from rabuzarus/20180906_-_fix_non_present_element
Frio - bugfix - don't show new event button if the button isn't available
2018-09-06 13:23:58 +00:00
rabuzarus
26607d4a27 Frio - bugfix - don't show new event button if the button isn't available 2018-09-06 14:40:34 +02:00
Michael Vogel
39d35025b5
Merge pull request #5735 from Aditoo17/patch-1
Fix iframe address in QuickStart-groupsandpages
2018-09-06 09:22:32 +00:00
Michael
6113fdc940 Issue 5733: Changing relationship values does work now again with DFRN 2018-09-06 09:20:45 +00:00
Aditoo17
f84b39be0b
Fix iframe address 2018-09-06 10:43:15 +02:00
Michael
04fb885857 Fix: Posts with pictures will now look good again on connector networks 2018-09-06 04:24:34 +00:00
Hypolite Petovan
8ac018813c
Merge pull request #5731 from rabuzarus/20180906_-_magicLinks_for_event
use magic links for event view
2018-09-05 20:04:28 -04:00