28164 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	bd619f3741	Merge pull request #4553 from tobiasd/20160305-enzh ... updates to the ZH CN, EN GB and EN US translations	2018-03-05 19:15:08 +01:00
Michael Vogel	dfbcacf833	Merge pull request #4552 from tobiasd/20180305-messagespo ... regenerated master messages.po file	2018-03-05 19:14:31 +01:00
Tobias Diekershoff	a8baa65f63	updates to the ZH CN, EN GB and EN US translations	2018-03-05 16:48:21 +01:00
Tobias Diekershoff	a2860023db	regenerated master messages.po file	2018-03-05 16:38:01 +01:00
Michael Vogel	c181f234a9	Merge pull request #4548 from MrPetovan/task/3878-move-bb2diaspora-to-src ... [develop] Move include/bb2diaspora to src/	2018-03-05 07:28:04 +01:00
Hypolite Petovan	f94134f556	Update database.sql according to process	2018-03-04 23:41:14 -05:00
Hypolite Petovan	47b1e4b3ee	Improve default values in htconfig documentation	2018-03-04 23:41:01 -05:00
Hypolite Petovan	059b1f63f8	Add support for multiple Memcached servers ... - Updated htconfig documentation	2018-03-04 23:28:49 -05:00
Hypolite Petovan	95752b79e8	Add cache performance to API and worker	2018-03-04 23:13:19 -05:00
Hypolite Petovan	22fd2409ca	Add cache to performance arrays	2018-03-04 23:13:19 -05:00
Hypolite Petovan	4954c4b9aa	Add cache timing points	2018-03-04 23:13:19 -05:00
Hypolite Petovan	3df34d33d5	Fix DatabaseCacheDriver::get SQL select ... - Fix typo - Fix wrong usage of NOW()	2018-03-04 23:13:19 -05:00
Hypolite Petovan	41d5c7d4c7	Restore deprecated constants in boot	2018-03-04 23:13:19 -05:00
Hypolite Petovan	1a18220059	Remove unused global cache constants	2018-03-04 23:13:19 -05:00
Hypolite Petovan	4e6dd7dd5f	Update db cache table documentation	2018-03-04 23:13:19 -05:00
Hypolite Petovan	e749e8ef4c	Update htconfig documentation	2018-03-04 23:13:19 -05:00
Hypolite Petovan	4b361747a0	Update SQL scripts for cache table	2018-03-04 23:13:19 -05:00
Hypolite Petovan	3628b62aeb	Add support for Memcached/Improve database cache ... - Create Cache Driver interface - Update cache table fields - Add CacheSessionHandler	2018-03-04 23:13:19 -05:00
Hypolite Petovan	26f693fb80	Merge pull request #4547 from annando/multiple-accounts ... Fix: Multiple accounts per mail address are allowed	2018-03-04 17:59:51 -05:00
Hypolite Petovan	6447a45a06	Remove include/bb2diaspora.php	2018-03-04 17:43:51 -05:00
Hypolite Petovan	bb7f459b47	Remove references to include/bb2diaspora.php	2018-03-04 17:43:41 -05:00
Hypolite Petovan	26ea6f69d7	Update references to bb2diaspora and diaspora2bb	2018-03-04 17:39:41 -05:00
Hypolite Petovan	fe5ce67ef8	Move bb2diaspora() content to Content\Text\BBCode::toMarkdown ... - Use self where appropriate - Add BaseObject extension	2018-03-04 17:34:59 -05:00
Michael	cd79ce3a57	Fix: Multiple accounts per mail address are allowed when not explicit forbidden	2018-03-04 22:23:52 +00:00
Hypolite Petovan	a141730e8d	Merge pull request #4546 from annando/twidere-crash ... Bugfix: Avoid that Twidere is crashing	2018-03-04 14:58:08 -05:00
Michael	506f851b23	Bugfix: Avoid that Twidere is crashing	2018-03-04 19:25:02 +00:00
Hypolite Petovan	3f739d53c8	Merge pull request #4545 from rabuzarus/20180304_-_localize_datepicker ... localize the datepicker	2018-03-04 09:07:31 -05:00
rabuzarus	2c7e8f35d4	localize the datepicker	2018-03-04 14:56:51 +01:00
Hypolite Petovan	49f99d94f6	Replace disapora2bb function content with Markdown::toBBCode call	2018-03-04 08:31:40 -05:00
Hypolite Petovan	a233ce1658	Create Markdown::toBBCode() method ... - Create private callback Markdown::diasporaMention2BBCodeCallback	2018-03-04 08:31:05 -05:00
Hypolite Petovan	c9d403bcb5	Merge pull request #4544 from annando/no-cache-maintenance ... Bugfix: Don't cache when looking for maintenance mode	2018-03-04 08:29:33 -05:00
Michael	13df527d62	Bugfix: Don't cache when looking for maintenance mode	2018-03-04 13:01:46 +00:00
Tobias Diekershoff	5ff90c0971	Merge pull request #4542 from AndyHee/3.6-rc ... Corrected typo	2018-03-04 10:05:41 +01:00
AndyHee	8500bed8cc	Corrected typo	2018-03-04 15:07:34 +07:00
Hypolite Petovan	7bd4a52156	Merge pull request #4532 from annando/dba-array ... [develop] We now accept array as condition parameters	2018-03-03 18:14:19 -05:00
Michael	74f6dc5373	Renamed functions / each is replaced	2018-03-03 23:02:45 +00:00
Michael Vogel	ace0200b8c	Merge pull request #4517 from MrPetovan/task/3878-move-acl_selectors-to-src ... [develop] Move include/acl_selectors to src/ (redux)	2018-03-03 22:32:08 +01:00
Hypolite Petovan	716747cc77	Merge pull request #4541 from rabuzarus/20180303_-_fix_directory_search ... fix page counter in directory module	2018-03-03 14:13:51 -05:00
rabuzarus	d572738e95	directory - use dba::select_first()	2018-03-03 20:08:41 +01:00
rabuzarus	e18f3844da	fix page counter in directory module	2018-03-03 19:31:15 +01:00
Hypolite Petovan	861904e051	Merge pull request #4539 from tobiasd/20180303-docsDeadkinks ... removed dead link	2018-03-03 10:29:06 -05:00
Tobias Diekershoff	04e6b32d4f	removed dead link	2018-03-03 15:47:36 +01:00
Tobias Diekershoff	2e02e88cf8	Merge pull request #4536 from MrPetovan/bug/fix-countable-warning ... [PHP 7.2] Fix missing Countable warning	2018-03-03 15:39:28 +01:00
Tobias Diekershoff	8004a1bd93	Merge pull request #4538 from MrPetovan/bug/4535-user-not-found ... Fix missing logical not in admin/users	2018-03-03 15:36:54 +01:00
Hypolite Petovan	9a13e67943	Fix missing logical not in admin/users	2018-03-03 09:34:48 -05:00
Hypolite Petovan	9cf2183524	Merge pull request #4537 from rabuzarus/20180303_-_fix_directory_search ... Bugfix: search in local directory didn't work	2018-03-03 09:18:41 -05:00
Hypolite Petovan	b8fca5efe7	[PHP 7.2] Fix missing Countable warning	2018-03-03 08:48:30 -05:00
rabuzarus	c78572bf47	directory.php - code beautification (PSR)	2018-03-03 14:40:16 +01:00
Michael	194da423e0	An array with fieldnames as keys is important for the "insert" in the "update" function	2018-03-03 13:26:23 +00:00
rabuzarus	2efd4ba780	fix local directory search	2018-03-03 14:06:42 +01:00