30177 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	5db1717f46	Re-added missing RINO admin setting values	2018-01-19 11:27:53 -05:00
Hypolite Petovan	2e58120bbb	Fix RINO admin setting values	2018-01-19 11:27:53 -05:00
Hypolite Petovan	cadf8c5e5d	Bump new users RSA key strength	2018-01-19 11:27:53 -05:00
Hypolite Petovan	de70007a46	Update RINO settings	2018-01-19 11:27:53 -05:00
Hypolite Petovan	7af6cc8454	Add RINO version 3 encrypt/decrypt ... - Add legacy decrypt of RINO2 - Add fallback to RINO1 to encrypt	2018-01-19 11:27:53 -05:00
Hypolite Petovan	6857392067	[Composer] Upgrade defuse/php-encryption to version ^2.0	2018-01-19 11:27:53 -05:00
Tobias Diekershoff	5e42577944	Merge pull request #4266 from MrPetovan/task/4116-move-chartjs-to-composer ... Move Chart.js to Composer	2018-01-19 15:52:25 +01:00
Hypolite Petovan	8c47df474d	Merge pull request #4277 from annando/item-permissions ... Ensure that the user id in a thread always stays the same	2018-01-19 08:18:37 -05:00
Michael	d22adc98b2	Just some precaution	2018-01-19 07:50:11 +00:00
Michael	a07670ac30	Ensure that the user id in a thread always stays the same	2018-01-19 07:02:43 +00:00
Hypolite Petovan	910fda2383	Fix formatting in federation.tpl	2018-01-18 16:38:23 -05:00
Hypolite Petovan	b963e7cc38	Revert tabs into space in federation.tpl	2018-01-18 16:38:23 -05:00
Hypolite Petovan	269b3ee2a4	Delete library/Chart.js	2018-01-18 16:38:23 -05:00
Hypolite Petovan	383641f58f	Migrate federation page to latest version of Chart.js	2018-01-18 16:38:23 -05:00
Hypolite Petovan	ffa240dfde	Add Chart.js to Composer	2018-01-18 16:38:23 -05:00
Michael Vogel	4f43d9e501	Merge pull request #4267 from MrPetovan/task/4116-move-colorbox-to-composer ... Move JQuery/colorbox to Composer	2018-01-18 22:34:20 +01:00
Hypolite Petovan	380ae224a0	Merge pull request #4275 from annando/like-dislike ... Liking of your own stuff wasn't possible/enable dislike for Diaspora	2018-01-18 16:30:18 -05:00
Michael	7b3e334f06	"save to folder" and "mark" can't work on global items	2018-01-18 20:54:40 +00:00
Michael	2df44eb084	Liking of your own stuff wasn't possible/enable dislike for Diaspora	2018-01-18 20:16:14 +00:00
Hypolite Petovan	271f0629f0	Merge pull request #4274 from annando/signature-atuff ... Bugfix: The Diaspora signature wasn't stored by nested comments	2018-01-18 14:50:23 -05:00
Michael	b6f15ec5ce	Bugfix: The Diaspora signature wasn't stored by nested comments	2018-01-18 19:38:51 +00:00
Hypolite Petovan	e210fdc625	Updated composer.lock	2018-01-18 11:29:00 -05:00
Hypolite Petovan	c76fc26206	Remove js/jquery.js	2018-01-18 11:27:51 -05:00
Hypolite Petovan	e531219e7a	Downgrade jquery to 1.12.4	2018-01-18 11:27:51 -05:00
Hypolite Petovan	b432a17538	Update references to jquery	2018-01-18 11:27:14 -05:00
Hypolite Petovan	a948e06391	Remove colorbox from library	2018-01-18 11:27:14 -05:00
Hypolite Petovan	9ee1b14b2b	Update references to colorbox css and js files ... - Remove commented out references to other css/js files	2018-01-18 11:27:14 -05:00
Hypolite Petovan	61238d5e23	Add jquery and jquery-colorbox to Composer ... - Fix selector syntax issue with newer version of JQuery	2018-01-18 11:27:14 -05:00
Hypolite Petovan	7eb637c6ea	Merge pull request #4271 from annando/last-child ... "last-child" is not used anymore	2018-01-18 08:09:46 -05:00
Hypolite Petovan	c69d60644f	Merge pull request #4264 from annando/item-delete ... There is now a new delete function in the item class	2018-01-18 08:02:50 -05:00
Michael	034d46196f	"last-child" is not used anymore	2018-01-18 06:54:44 +00:00
Michael Vogel	13059f5396	Merge pull request #4269 from MrPetovan/task/4265-move-base64-to-composer ... Move base64 to Composer	2018-01-18 07:04:18 +01:00
Michael Vogel	9196b098c2	Merge pull request #4270 from tobiasd/20180118-fixDEdocs ... added link to update documentation to DE index. Followup on #4259	2018-01-18 06:44:59 +01:00
Tobias Diekershoff	573f64db2d	added link to update documentation to DE index. Followup on #4259	2018-01-18 05:59:44 +01:00
Hypolite Petovan	8704a36682	Remove js/webtoolkit.base64	2018-01-17 21:24:04 -05:00
Hypolite Petovan	0d9595d80a	Update all references to webtoolkit.base64	2018-01-17 21:23:51 -05:00
Hypolite Petovan	f32eb02929	Add bower/base64 to Composer	2018-01-17 21:23:03 -05:00
Hypolite Petovan	b7a3b320e5	Remove unused jquery.htmlstream Javascript library	2018-01-17 21:22:42 -05:00
Michael Vogel	a13ad278ef	Merge pull request #4259 from MrPetovan/task/4116-remove-vendor-from-git ... Remove vendor from git	2018-01-18 01:02:55 +01:00
Michael	2d66242b4f	The delete function is now changed to the new function	2018-01-17 23:22:01 +00:00
Michael	000e6457b4	Merge remote-tracking branch 'upstream/develop' into item-delete	2018-01-17 21:54:17 +00:00
Hypolite Petovan	12de1f9569	Remove orphan documentation pages	2018-01-17 15:31:25 -05:00
Hypolite Petovan	f1e96a358d	Update GitHub documentation page ... - Add composer install part - Fix GitHub name capitalization	2018-01-17 15:31:11 -05:00
Hypolite Petovan	379f93831f	Add documentation about new array syntax	2018-01-17 15:30:47 -05:00
Hypolite Petovan	2b5bffecf4	Add Update documentation page	2018-01-17 15:30:34 -05:00
Hypolite Petovan	ab90bd2dd1	Merge pull request #4262 from fabrixxm/frio-login ... Frio: restyle login page episode II • Attack of the Clones	2018-01-17 11:28:53 -05:00
fabrixxm	f51fda7911	fix for coding standars	2018-01-17 17:27:27 +01:00
Hypolite Petovan	ca0a261e08	Merge pull request #4261 from annando/bugfix-process ... Avoid sql error in process handling	2018-01-17 10:45:16 -05:00
Hypolite Petovan	4034daca08	Updated installer dependency to PHP 5.6 and ext-xml ... - Updated doc	2018-01-17 10:35:54 -05:00
fabrixxm	fc8e8feec1	Frio: add login background color admin option	2018-01-17 16:33:27 +01:00