29054 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	ee5b9de6ad	Reverting RINO crypto code to php-encryption version 1.2	2017-11-09 03:20:18 -05:00
Hypolite Petovan	ccf4dcf270	Reverting php-encryption to version 1.2	2017-11-09 03:19:26 -05:00
Michael Vogel	67e32ce859	Merge pull request #3888 from MrPetovan/issue/#3878-hotfix ... Issue #3878 hotfix	2017-11-09 09:11:56 +01:00
Hypolite Petovan	1262d6bfee	Function name typo	2017-11-09 03:01:53 -05:00
Hypolite Petovan	918f2e8593	Fix another php-encryption version migration error	2017-11-09 03:01:02 -05:00
Hypolite Petovan	d5aff9ac31	Fix php-encryption version 2 compatibility issues	2017-11-09 02:35:11 -05:00
Hypolite Petovan	b4ce07bdc5	Remove old library defuse/php-encryption	2017-11-09 02:21:54 -05:00
Hypolite Petovan	acd65aade1	Switch to new php-encryption library version ... - Remove references to library/ files - Add namespace to library classes	2017-11-09 02:21:37 -05:00
Hypolite Petovan	3b2cd85483	Add defuse/php-encryption 2.0 to Composer dependencies	2017-11-09 02:13:02 -05:00
Hypolite Petovan	ede20ac95a	Updated Composer to version 1.5.2	2017-11-09 02:11:33 -05:00
Hypolite Petovan	2ad162f991	Merge pull request #3883 from zeroadam/Issue-#3878 ... Relocate class files from /include to /src/	2017-11-09 01:29:58 -05:00
Adam Magness	cfd8ae389c	Review updates ... changes based on review comments.	2017-11-08 20:08:42 -05:00
Adam Magness	d7dc51ecc1	Coding Standards ... Guess who got phpcs configured. Updated phpcs.xml based on Developer_Intro document.	2017-11-08 17:02:50 -05:00
Adam Magness	ca5d5acb7e	Another use ... use Cache	2017-11-08 08:51:01 -05:00
Adam Magness	30d2e765fd	Merge remote-tracking branch 'origin/Issue-#3878' into Issue-#3878	2017-11-08 08:38:04 -05:00
Adam Magness	aa13302bbc	Review updates ... Documentation and yet another use statement	2017-11-08 08:37:03 -05:00
Adam Magness	a307991ee5	Use more ... More use statements based on error logs.	2017-11-08 08:37:03 -05:00
Adam Magness	d857473026	Use Statements ... More use statements based on error logs	2017-11-08 08:37:03 -05:00
Adam Magness	3581889fbd	DFRN Update ... missing use statement	2017-11-08 08:37:03 -05:00
Adam Magness	4ca68c7af0	Class file relocations ... Issue #3878	2017-11-08 08:37:03 -05:00
Adam Magness	6189f6c8e7	Relocate class files from /include to /src/ ... dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.	2017-11-08 08:36:48 -05:00
Hypolite Petovan	2a814623d8	Merge pull request #3882 from annando/config-null ... Still some more places with config stuff	2017-11-08 08:21:23 -05:00
Hypolite Petovan	34554133f7	Merge pull request #3886 from annando/boot-worker ... Missing "use" in boot.php	2017-11-08 08:21:04 -05:00
Michael	063358301f	One space more	2017-11-08 13:08:26 +00:00
Hypolite Petovan	d5730e3b3d	Merge pull request #3885 from tobiasd/20171108-faq ... updated client list in FAQ	2017-11-08 08:07:57 -05:00
Michael	737cc6f101	Missing "use" in boot.php	2017-11-08 13:03:41 +00:00
Adam Magness	a61ffa9200	Use more ... More use statements based on error logs.	2017-11-08 07:48:31 -05:00
Adam Magness	4e7268950d	Use Statements ... More use statements based on error logs	2017-11-08 07:02:55 -05:00
Tobias Diekershoff	ea4fb53f80	updated client list in FAQ	2017-11-08 09:20:20 +01:00
Michael	76caf7a9cf	Small corrections	2017-11-08 06:43:20 +00:00
Adam Magness	222696d648	DFRN Update ... missing use statement	2017-11-08 00:10:47 -05:00
Adam Magness	9e99066fd7	Class file relocations ... Issue #3878	2017-11-07 22:57:46 -05:00
Adam Magness	f234691216	Relocate class files from /include to /src/ ... dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.	2017-11-07 19:37:53 -05:00
Michael	76f73c7236	And some more places	2017-11-07 22:15:59 +00:00
Hypolite Petovan	6feec66979	Merge pull request #3881 from annando/config-null ... null is not false	2017-11-07 16:53:11 -05:00
Michael	5a6fa4ae87	Some more	2017-11-07 21:53:11 +00:00
Michael	ab73dbf346	Here as well	2017-11-07 21:48:41 +00:00
Michael	9860488eec	null is not false	2017-11-07 21:41:38 +00:00
Hypolite Petovan	2c40fc4a02	Merge pull request #3880 from zeroadam/BugFix-#3873 ... BugFix	2017-11-07 15:55:34 -05:00
Adam Magness	df1b2c91e6	BugFix ... remove duplicate use statement	2017-11-07 15:55:10 -05:00
Hypolite Petovan	1ff217cc13	Merge pull request #3879 from zeroadam/Remove-Includes-#3873 ... Remove Includes	2017-11-07 13:37:51 -05:00
Adam Magness	a782ab50f9	Correct deletion ... Bring back mod/probe.php and delete include/probe.php as intended.	2017-11-07 12:31:32 -05:00
Adam Magness	8522c47353	Remove Includes ... Removed references to include/config.php and include/probe.php and deleted the respective files.	2017-11-07 12:14:03 -05:00
Hypolite Petovan	cd1724eb9e	Merge pull request #3875 from zeroadam/Issue-#3873 ... Replace deprecated (P)Config functions with new syntax	2017-11-07 11:07:54 -05:00
Adam Magness	59d6ae63b1	Spelling correction ... delete is not spelled delele!	2017-11-07 11:05:16 -05:00
Adam Magness	b995e858e6	Review changes ... Replacements for ::delete() as well as changes to include use statements.	2017-11-07 09:12:01 -05:00
Adam Magness	1a83b80dbd	Review Updates ... Reverted changes made to .sql file and Errant use statement in Probe class.	2017-11-07 06:43:34 -05:00
Adam Magness	957c7a246c	Merge remote-tracking branch 'origin/Issue-#3873' into Issue-#3873	2017-11-07 06:24:58 -05:00
Adam Magness	0dfa57948f	Issue-#3873 ... Replace deprecated functions with new syntax.	2017-11-07 06:24:39 -05:00
Michael Vogel	9eb1f4b9c3	Merge pull request #3877 from tobiasd/20171107-messages ... regenerated master messages.po file	2017-11-07 09:20:24 +01:00