keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22234 commits 4 branches 0 tags 179 MiB
Commit graph

2574 commits

Author SHA1 Message Date
Michael
95c150ef28 Added to-do 2018-12-04 14:20:25 +00:00
Michael
5c20f21dd8 Improved fallback when the probing fails 2018-12-04 14:17:55 +00:00
Michael
491fc5f78a Issue 6168: "redir" now mostly use OWA 2018-12-04 07:12:55 +00:00
Hypolite Petovan
89f5a9c550
Merge pull request #6231 from annando/notice 
Fix for notice
 2018-12-03 15:08:36 -05:00
Michael
6733b77b73 Make it simpler 2018-12-03 19:29:06 +00:00
Michael
d76003797a Fix for notice 2018-12-03 16:32:03 +00:00
Michael
fb68b50139 Fix for exceptions on external redirects 2018-12-03 15:59:53 +00:00
Hypolite Petovan
bfe809f60d
Merge pull request #6229 from annando/issue-5911 
Issue 5911: Fix for fetching the correct user
 2018-12-03 07:40:14 -05:00
Michael
51bce11b69 Issue 5911: Fix for fetching the correct user 2018-12-03 06:16:25 +00:00
Hypolite Petovan
f7c9ed5108 Add DB connection status check in Update::check 2018-12-02 20:57:41 -05:00
Hypolite Petovan
3a9db3f637
Merge pull request #6222 from annando/long-uri 
Avoid problems with too long URI (should only happen with some RSS feeds)
 2018-12-02 19:18:45 -05:00
Hypolite Petovan
57695d48b4
Merge pull request #6223 from annando/ap-dba-error 
Fix for "Unknown column 'guid' in 'field list'"
 2018-12-02 19:18:36 -05:00
Hypolite Petovan
69a73678eb
Merge pull request #6226 from annando/oembed-array 
Ignoring OEmbed array values
 2018-12-02 19:16:13 -05:00
Michael
58b614bea1 Ignoring OEmbed array values 2018-12-02 21:36:46 +00:00
Hypolite Petovan
c5558cc459
Merge pull request #6224 from annando/dba-delete-contact 
Avoid duplicated contacts, improve contact deletion, avoid memory issues
 2018-12-02 16:16:59 -05:00
Hypolite Petovan
5e60fa8210
Merge pull request #6225 from annando/http-error 
Using the standard function to return http errors
 2018-12-02 16:15:04 -05:00
Michael
649228cd3d More detailled HTTP error explanations 2018-12-02 20:10:53 +00:00
Michael
066a040cc7 Avoid duplicated contacts, improve contact deletion, avoid memory issues 2018-12-02 16:25:25 +00:00
Hypolite Petovan
924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all 2018-12-02 10:24:50 -05:00
Michael
2fd65503da Avoid database error that the field "guid" is not present in the contact table 2018-12-02 15:01:08 +00:00
Michael
3d14977b73 Avoid problems with too long URI (should only happen some RSS feeds) 2018-12-02 14:49:28 +00:00
Michael Vogel
5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x 
Remove x()
 2018-12-01 23:40:51 +01:00
Hypolite Petovan
f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129 
Fixing permanent deletion counter
 2018-12-01 08:19:38 -05:00
AndyHee
14b4fac818 Fixing permanent deletion counter 2018-12-01 13:21:54 +07:00
Hypolite Petovan
458981f75c Replace x() by isset(), !empty() or defaults() 
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
 2018-11-30 09:06:22 -05:00
Michael
4a1f9a9bdd Improved url detection for redirects 2018-11-30 11:27:17 +00:00
Hypolite Petovan
663ba65f17 Remove "all" value for nets parameter 2018-11-30 05:43:07 -05:00
Hypolite Petovan
11a0dd4d4c Remove util directory 2018-11-28 23:10:21 -05:00
Hypolite Petovan
e02295e8e8 Move testargs to bin 2018-11-28 23:10:05 -05:00
Hypolite Petovan
9102a37b37 Move master translation file away from util 
- Rewrite translation documentation
- Delete unused util/strings.php
- Updated references to util/messages.po and util/strings.php
 2018-11-28 22:57:55 -05:00
Jonny Tischbein
f0d290eb18 Fix Term exists check on link which isn't stored for hashtags anymore to check on term. 2018-11-27 22:54:16 +01:00
Michael Vogel
ea4e772b1e
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array 
Move config to PHP array
 2018-11-26 23:57:56 +01:00
Michael
4f9f86e310 We are now escaping many template fields 2018-11-25 18:56:26 +00:00
Hypolite Petovan
c964e193b9 Replace *.ini.php by *.config.php in comments 2018-11-25 01:44:51 -05:00
Hypolite Petovan
98d90e131d Update install to generate config/local.config.php 2018-11-25 01:44:09 -05:00
Hypolite Petovan
d6eb1135e5 Add support for PHP array config files 
- Add new base config files
- Remove useless DIRECTORY_SEPARATOR instances
 2018-11-25 01:42:05 -05:00
Hypolite Petovan
6eb6cc94c7 Move config/dbstructure.php to config/dbstructure.config.php 2018-11-25 01:14:44 -05:00
Hypolite Petovan
92556e5161 Fix user account removal expiration delay 2018-11-24 20:59:18 -05:00
Hypolite Petovan
54f4ac6ae0 Remove redirection from User::remove 2018-11-24 20:58:41 -05:00
Hypolite Petovan
0dd120bb06 Normalize quotes in User::remove 2018-11-24 20:58:11 -05:00
Hypolite Petovan
0bae80a2d3 Update deprecated calls in Model\user and mod/removeme 2018-11-24 20:56:38 -05:00
Hypolite Petovan
9d2f474c07 Fix open registration email 2018-11-24 20:55:18 -05:00
Michael Vogel
3f4636d490
Merge pull request #6183 from MrPetovan/bug/6135-hide-follower-only-birthdays 
Hide follower-only birthday reminders
 2018-11-24 15:55:43 +01:00
Hypolite Petovan
6b845b35d3
Merge pull request #6197 from annando/hide-short-groups 
Don't show the group filter where there is only one
 2018-11-24 08:22:43 -05:00
Hypolite Petovan
19053141a2
Merge pull request #6193 from annando/redirection 
Fixing redirection problems with parameters
 2018-11-24 08:13:35 -05:00
Michael Vogel
42a3610a79
Merge pull request #6184 from MrPetovan/task/normalize-bbcode-hashtags 
Normalize BBCode hashtags links
 2018-11-24 13:14:50 +01:00
Michael
a3a2147def Don't show the group filter where there is only one 2018-11-24 12:10:30 +00:00
Michael
167ff0eb71 Making the tests happy 2018-11-24 09:01:10 +00:00
Michael
586c7fb29a Fixing redirection problems with parameters 2018-11-24 00:27:00 +00:00
Michael Vogel
96a43d0db9
Merge pull request #6191 from MrPetovan/task/urlencode-file-param 
URL encode /network file query parameter
 2018-11-23 21:37:31 +01:00
Hypolite Petovan
4b8af10561 Fix display of Connect/Disconnect links on contact page 2018-11-23 11:09:43 -05:00
Hypolite Petovan
9774fd8be9 Remove unused parameter $save in HTML::search 
- Remove unused variables in saved_search()
 2018-11-23 09:53:14 -05:00
Tobias Diekershoff
902ade9891
Merge pull request #6189 from MrPetovan/bug/5737-hide-ignore-anonymous 
Fix ignore link showing for anonymous users
 2018-11-23 10:01:56 +01:00
Hypolite Petovan
03de5c018f Fix ignore link showing for anonymous users 2018-11-23 01:25:38 -05:00
Michael
ea5ba309dc Some more AP blocking 2018-11-22 22:31:48 +00:00
Michael
2f7b138b09 Block AP delivery 2018-11-22 22:23:31 +00:00
Michael
ba1e385f86 Don't deliver to blocked domains 2018-11-22 22:09:22 +00:00
Michael
fb0140a62b Checking for blocked user does now check for blocked domain as well 2018-11-22 21:43:16 +00:00
Hypolite Petovan
ee88de1ef9 Normalize BBCode Hashtag replacement 2018-11-22 09:34:17 -05:00
Hypolite Petovan
81f89ccae8 Remove stored URL from hashtag terms 2018-11-22 09:33:42 -05:00
Hypolite Petovan
4874f7f8ab Remove useless rawurlencode calls for building hashtag bbcode 
- Fix some formatting
 2018-11-22 09:32:41 -05:00
Hypolite Petovan
14df030f44 Add contact conditions to getBirthdays/updateBirthdays 2018-11-22 00:15:44 -05:00
Hypolite Petovan
de5ee56d2f Move DFRN::birthdayEvent() to Event::createBirthday 2018-11-22 00:15:09 -05:00
Hypolite Petovan
d71e856535 Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE 2018-11-21 23:53:45 -05:00
Tobias Diekershoff
cf1c63fcc2
Merge pull request #6176 from annando/ap-security 
AP: Security check against forged "create" activities
 2018-11-21 18:10:45 +01:00
Michael
aa1882fd99 Sanitize the OEmbed data before processing it 2018-11-21 07:07:24 +00:00
Michael
27d1da0468 One space too much 2018-11-20 20:49:06 +00:00
Michael
5c39779b45 AP: Security check against forged "create" activities 2018-11-20 20:40:47 +00:00
Jonny Tischbein
9aea59d4e3 Change Worker to use only MemFree in isMinMemoryReached 2018-11-19 23:21:40 +01:00
Michael
43079bfaf8 Several default features are now in the core 2018-11-18 20:13:46 +00:00
Hypolite Petovan
75398b96d5
Merge pull request #6164 from annando/network-protocols 
Networks are now protocols
 2018-11-18 07:47:10 -05:00
Michael
0ad71ebbbc Networks are now protocols 2018-11-18 12:44:01 +00:00
Michael Vogel
9dfc970bd6
Merge pull request #6144 from Alkarex/ATOM-self 
Correct self attribute in ATOM feeds
 2018-11-18 12:31:15 +01:00
Michael
e2ea4a3dc3 Allow to delete every post, even public ones 2018-11-17 22:56:28 +00:00
Hypolite Petovan
807afa3059
Merge pull request #6158 from tobiasd/20181117-contactedittab 
Add link to user groups from /contact
 2018-11-17 14:12:30 -05:00
Tobias Diekershoff
6be831fd32 Add link to user groups from /contact 
There was no way to get to the contact group editor from the contact overview.

Additionally the documentation about the used accesskeys was updated.
 2018-11-17 18:33:12 +01:00
Hypolite Petovan
22fedc9a1a
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder 
Fix deleting last element and displaying empty saved folder
 2018-11-17 11:59:24 -05:00
Jonny Tischbein
458b0f3545 Change how to decide between empty update and not called field file 2018-11-17 16:04:54 +01:00
Jonny Tischbein
56406b9910 Fix SQL Error if no items where found + Fix setting to null 2018-11-17 13:22:32 +01:00
Hypolite Petovan
9e25270699
Merge pull request #6145 from Alkarex/ATOM-title-encoding 
Fix ATOM feed entry titles encoding
 2018-11-17 07:01:53 -05:00
Jonny Tischbein
52eb2281e4 Fix deleting last element from saved folder + Fix displaying empty saved folder 2018-11-17 12:41:00 +01:00
fabrixxm
c13e078c42 dbstructure: check for comment value or use default 
fix #6119
 2018-11-17 11:43:01 +01:00
Alexandre Alapetite
bd19e93c09 Minor code relocation 
https://github.com/friendica/friendica/pull/6144/files#r234385033
 2018-11-17 01:36:54 +01:00
Alexandre Alapetite
dd65c5d150 Apply correct title encoding to all cases 2018-11-17 01:30:53 +01:00
Alexandre Alapetite
af38d22d38 Fix ATOM feed title encoding 
Was HTML-encoded instead of plain Unicode.
Fixed only for feed_mode. Probably wrong as well for non_feed mode (not
sure how to test)
 2018-11-16 23:52:36 +01:00
Alexandre Alapetite
d85e26d314 Refactor header with feed_mode 
https://github.com/friendica/friendica/pull/6140#issuecomment-439475027
 2018-11-16 23:29:26 +01:00
Alexandre Alapetite
97d164f69e Correct self attribute in ATOM feeds 
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
Special case for DFRN to reduce the risk of unintended side effects
 2018-11-16 18:54:06 +01:00
Hypolite Petovan
58e35f037b
Merge pull request #6136 from annando/delete-locally 
Improved delete text to clarify AP comment delete behaviour
 2018-11-15 18:26:12 -05:00
Michael
c3b6727fad Some more feed simplification 2018-11-15 16:21:37 +00:00
Michael
5f258dac22 Make feeds look more like feeds 2018-11-15 13:21:58 +00:00
Michael
6ad082a710 Improved delete text to clarify AP comment delete behaviour 2018-11-15 06:36:06 +00:00
Tobias Diekershoff
921094017c
Merge pull request #6134 from annando/6128-again 
We now use our regular feed that allows anonymous polling
 2018-11-15 06:19:13 +01:00
Michael
08433873f5 Issue 6128 again: We now use our regular feed that allows anonymous polling 2018-11-14 19:26:23 +00:00
Michael
268862dd7c Just some notice again 2018-11-14 10:54:42 +00:00
Michael
88a4733e5f Forgotten "use" 2018-11-14 06:00:01 +00:00
Michael
9271b21d51 Create a new GUID on user import 2018-11-14 05:58:03 +00:00
Hypolite Petovan
e6557ca9c5
Merge pull request #6126 from annando/notice-return-path 
Fixes notice "PHP Notice:  Undefined index: return_path"
 2018-11-13 13:58:10 -05:00
Michael
e1875cf206 Fixes notice "PHP Notice: Undefined index: return_path" 2018-11-13 18:10:37 +00:00
fabrixxm
972775e58e
Fix Notice in LegacyModule 
Notice: Only variables should be passed by reference in src/LegacyModule.php on line 68
 2018-11-13 14:37:51 +01:00
Michael
b5fa518998 Don't suggest hidden contacts / Added AP to the suggestions 2018-11-13 05:52:21 +00:00
Michael
109204032c Execute database update before post update is called 2018-11-12 10:36:10 +00:00
Hypolite Petovan
6e39b93eb9
Merge pull request #6114 from annando/server-discovery 
Fix wrong server detecting / improved Pleroma version numbers
 2018-11-12 00:12:13 -05:00
Michael
1e873a2815 Avoid a blocked workerqueue due to removed users 2018-11-12 05:03:12 +00:00
Michael
0937c66484 A redirect is not an error 2018-11-12 04:12:36 +00:00
Michael
de0ddfa0d8 Fix wromg server detecting / improved Pleroma version numbers 2018-11-11 21:54:50 +00:00
Michael
7458d793ed Removing some notices again 2018-11-11 12:15:17 +00:00
Hypolite Petovan
094e5becca
Merge pull request #6110 from annando/issue-6100 
Issue 6100: The AS object should be fetchable for every original post
 2018-11-10 20:57:07 -05:00
Hypolite Petovan
a30876977d
Merge pull request #6108 from annando/fork-check 
Add some hook to check if hook should be forked
 2018-11-10 20:56:42 -05:00
Michael
8844bb690d Issue 6100: The AS object should be fetchable for every original post 2018-11-10 23:56:11 +00:00
Michael Vogel
67f9458ba6
Merge pull request #6107 from MrPetovan/bug/5996-fix-toggle-mobile-call 
Add URL encoding to toggle_mobile parameter
 2018-11-10 17:27:04 +01:00
Michael
033bf65f2c Some redesign 2018-11-10 15:20:23 +00:00
Michael
4a59a7ae7f Logger is not needed anymore 2018-11-10 15:16:48 +00:00
Michael
e30d7cfc03 Add some hook to check if hook should be forked 2018-11-10 15:15:46 +00:00
Hypolite Petovan
09c94dba86 Add URL encoding to toggle_mobile parameter 2018-11-10 08:55:48 -05:00
Hypolite Petovan
1892462920 Fix formatting in Probe::uri 2018-11-10 08:24:53 -05:00
Hypolite Petovan
a6a3c268bb Use atom:author/atom:uri as profile-link in Feed::import 
- Use atom:author/atom:id as profile-id
 2018-11-10 08:24:10 -05:00
Hypolite Petovan
94a71d9ffc Honor preference order in webfinger links 2018-11-10 08:23:11 -05:00
Hypolite Petovan
10a8be7943 Accept URLs with no trailing slash in Probe::uri 2018-11-10 08:22:47 -05:00
Hypolite Petovan
aaae7b56df Replace obsolete Addon::callHooks call with Hook::callAll in Model\Contact 2018-11-10 08:18:16 -05:00
Hypolite Petovan
8703fe4032 Accept data structure in Logger::devLog 2018-11-10 08:17:33 -05:00
Adam Magness
218f0734be Rename removeTags to escapeTags 
rename function and update calls.
 2018-11-09 13:29:42 -05:00
Adam Magness
063f0e9cb0 Rename escapeTags to escapeHtml 
rename function and update calls.
 2018-11-09 13:27:58 -05:00
Adam Magness
b5a97c1abe Move getTags to BBCode 
move getTags function to BBCode class and update calls.
 2018-11-09 13:24:19 -05:00
Adam Magness
e4354a0d7b Update and Remove isValidEmail 
change function calls, and remove unneeded function.
 2018-11-09 13:18:42 -05:00
Adam Magness
6827dbf734 bug fix 
Strings not String
 2018-11-08 12:59:00 -05:00
Adam Magness
087f50d820 Missing Use statements 
missing use
 2018-11-08 11:58:42 -05:00
Adam Magness
ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness
5276c28a78 link_compare calls 
implement compareLink function.
 2018-11-08 10:46:50 -05:00
Adam Magness
6fc9c6de3b base64url calls 
implement base64UrlEncode and base64UrlDecode functions
 2018-11-08 10:37:08 -05:00
Adam Magness
0efcbe5d15 protect_sprintf calls 
implement protectSprintf function
 2018-11-08 10:30:45 -05:00
Adam Magness
b73af72deb deindent calls 
implement function in new class
 2018-11-08 10:26:49 -05:00
Adam Magness
916b3e551e format_network_name calls 
implement formatNetworkName function
 2018-11-08 10:24:47 -05:00
Adam Magness
b99925060a autoname calls 
implement getRandomName function
 2018-11-08 10:22:20 -05:00
Adam Magness
0e01568ccd escape_tags calls 
implement escapeTags function
 2018-11-08 10:20:03 -05:00
Adam Magness
a0f65ca7a1 notags calls 
implement removeTags function
 2018-11-08 10:14:37 -05:00
Adam Magness
991f259ecb random_string calls 
implement getRandomHex function
 2018-11-08 08:45:46 -05:00
Adam Magness
fd597472f1 Split text.php to Strings class 
move functions to new strings class
Split text.php to Strings class

move functions to new Strings class
 2018-11-08 08:33:28 -05:00
Hypolite Petovan
1a3c88b042
Merge pull request #6097 from nupplaphil/refactor_user_identities 
Refactoring identities to Model\User::identities
 2018-11-08 06:54:48 -05:00
Hypolite Petovan
c464ec33e1
Merge pull request #6099 from annando/ap-emojis 
Using CSS for custom emojis
 2018-11-08 06:54:05 -05:00
Michael
077a96fb28 Using CSS for custom emojis 2018-11-08 07:42:19 +00:00
Hypolite Petovan
97b6d70825
Merge pull request #6096 from annando/ap-emojis 
We now directly support the custom emojis from Mastodon
 2018-11-07 20:10:16 -05:00
Philipp Holzer
8ad721988b
Refactoring identities to Model\User::identities 2018-11-08 00:38:55 +01:00
Michael
cd2c7f782f We now directly support the custom emojis from Mastodon 2018-11-07 20:34:03 +00:00
Adam Magness
003eee5912 Standards 
fix indentation level, replace x() with !empty()
 2018-11-07 14:16:59 -05:00
Adam Magness
7cb9138201 Move another function 
move get_plink to Item class, and also fix up getApp since we extend BaseObject
 2018-11-07 07:19:39 -05:00
Adam Magness
e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00
Adam Magness
d50a1edef4 Split text to Item 
move functions from text.php to Item class
 2018-11-06 21:12:41 -05:00
Hypolite Petovan
dc669fa736
Merge pull request #6090 from zeroadam/TextToL10n 
Split functions to L10n
 2018-11-06 13:44:30 -05:00
Hypolite Petovan
dd35cd0701
Merge pull request #6086 from friendica/fabrixxm-patch-1 
Fix Friendica node info json
 2018-11-06 10:48:00 -05:00
fabrixxm
0441a169a9 Fix code style 2018-11-06 16:37:58 +01:00
Adam Magness
301cdd23dc coding standards 2018-11-06 10:28:18 -05:00
Adam Magness
dfd48596d3 Add use statement 
add use for core class
 2018-11-06 09:55:14 -05:00
Adam Magness
352da9bcf3 Update function calls 
update function calls for moved functions
 2018-11-06 09:52:58 -05:00
Adam Magness
1d571a527b Split text.php to L10n 
move functions from text.php to L10n class
 2018-11-06 09:52:58 -05:00
Michael
ffb03517b6 Fixes PR 6085 2018-11-06 14:00:31 +00:00
Adam Magness
4f07ebb52f Rename properly 
rename function properly this time!
 2018-11-06 06:34:32 -05:00
Adam Magness
3eecd108c5 rename function 
rename function and update calls.
 2018-11-06 06:31:48 -05:00
fabrixxm
1858204cbd
Stop PortableContacts to raise warning on malformed register_policy 2018-11-06 12:10:23 +01:00
Adam Magness
237fc30b4e Missed use 
fix missing use statement
 2018-11-05 21:45:44 -05:00
Adam Magness
591c00dd5c bug fix 
fix variable
 2018-11-05 21:26:58 -05:00
Adam Magness
a71eb1d127 functions moved to HTML class 
update function calls to moved class.
 2018-11-05 21:06:26 -05:00
Adam Magness
e31dde6084 Split text.php to HTML class 
move functions from text.php to src/Content/Text/HTML
 2018-11-05 20:27:22 -05:00
Hypolite Petovan
e8891e9ba4
Merge pull request #6082 from annando/diasppora-delivery 
Improved delivery
 2018-11-05 16:26:02 -05:00
Michael
3b565e80b6 Improved logger text 2018-11-05 20:35:17 +00:00
Philipp Holzer
049cd963f3
Using random_int directly 2018-11-05 21:15:30 +01:00
Philipp Holzer
6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
Michael
59d8cae805 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-05 19:46:59 +00:00
Adam Magness
186cd1d415 Revert "Move methods to new Util/Strings class" 
This reverts commit 97fcf23371.
 2018-11-05 13:07:15 -05:00
Adam Magness
9e51be7554 Revert "Update function calls" 
This reverts commit 748fb8b946.
 2018-11-05 13:07:07 -05:00
Adam Magness
748fb8b946 Update function calls 
update function calls to new class
 2018-11-05 07:40:18 -05:00
Adam Magness
97fcf23371 Move methods to new Util/Strings class 
move string methods from xml to strings class.
 2018-11-05 07:31:45 -05:00
Adam Magness
b07d47b0f7 Update function calls 
update function calls to new names
 2018-11-05 07:24:14 -05:00
Adam Magness
6cc339031a Rename functions 
rename functions
 2018-11-05 07:24:14 -05:00
Adam Magness
ae4aab872f forgotten self 
forgotten self references
 2018-11-05 07:24:14 -05:00
Adam Magness
61bc9facc8 Implement functions 
implement functions relocated to xml class
 2018-11-05 07:24:14 -05:00
Adam Magness
84e900d96f Move to XML 
move functions from text to xml
 2018-11-05 07:24:14 -05:00
Michael
dc4a2aeab8 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-04 23:19:34 +00:00
Michael
ef205878b6 Cleaned up the notifier 2018-11-04 23:17:41 +00:00
Michael
bd97215147 Merge remote-tracking branch 'upstream/develop' into diasppora-delivery 2018-11-04 18:54:49 +00:00
Michael
e759497af3 Fix small typo / Workerqueue count now only counts non deferred entries 2018-11-04 10:51:01 +00:00
Michael
ec3cec37eb Fixes #6071: We should use the correct variable ... 2018-11-04 09:18:36 +00:00
Michael
8f27e3aeb1 Support for fetching non-public content / preparations for forum posts 2018-11-03 21:37:08 +00:00
Michael
1395bdc188 Preparations for a relocation message / fix for notice 2018-11-02 21:57:06 +00:00
Michael
1b43d459b6 Fix for delivering forum posts again 2018-11-01 23:52:06 +00:00
Philipp Holzer
83ead5ec48
Test enhancements 2018-11-01 13:44:47 +01:00
Tobias Diekershoff
e12942ce7f
Merge pull request #6058 from JonnyTischbein/issue_contact_batch_archive 
[frio] Fix unarchive contact batch action
 2018-11-01 06:41:05 +01:00
Jonny Tischbein
76c9d37006 Fix not working unarchive contact batch action 2018-10-31 21:20:44 +01:00
vinzv
fc2b81d0dd
Update Install.php 
Please update messages.po at Transifex as well.
 2018-10-31 21:03:32 +01:00
Jonny Tischbein
b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Hypolite Petovan
8a46c786f3
Merge pull request #6053 from zeroadam/CoreRenderer 
Core Renderer Class
 2018-10-31 13:57:12 -04:00
Adam Magness
70f01d6c00 Template Engine and props to Renderer 
move methods and props from App to Renderer
 2018-10-31 13:25:38 -04:00
Philipp Holzer
2a0a7cd42a
Add missing Logger::log() 2018-10-31 17:52:41 +01:00
Adam Magness
3f74ba88c2 Move delimiter props and functions 
move left and right delimiter functions and properties to Render class.
 2018-10-31 12:12:15 -04:00
Adam Magness
35abc4bb64 get markup template 
implement getMarkupTemplate function
 2018-10-31 10:44:06 -04:00
Adam Magness
91facd2d0a replace macros 
implement new replaceMacros function
 2018-10-31 10:35:50 -04:00
Philipp Holzer
bf878d2ebb
Adding more Logger entries in case of update process 2018-10-31 15:22:44 +01:00
Adam Magness
f6c86649c2 Create Core\Renderer Class 
create new class and redirect old functions
 2018-10-31 10:03:42 -04:00
Philipp Holzer
3f813d853b
introducing Logger::log 2018-10-31 14:48:19 +01:00
Philipp Holzer
e5530dfa63
refactoring query 2018-10-31 14:44:43 +01:00
Philipp Holzer
9690dfc54e
Renamed Cache flag 2018-10-31 14:44:42 +01:00