13947 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
redmatrix	5146e6e76b	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-20 19:35:00 -07:00
redmatrix	d87c7ceeb0	there is no stricmp() in php, use strcasecmp() - also only detect language if we plan to use it.	2015-07-20 19:33:42 -07:00
redmatrix	9495d2c701	indicate where progress has been made	2015-07-20 17:13:47 -07:00
Mario Vavti	4d45bc9da1	Fixes regarding the new default profile photo size. The default profile photos are just renamed. People which provided the originals are invited to reproduce them in the new 300 by 300 px format.	2015-07-20 21:01:11 +02:00
Mario Vavti	464625cd91	show icons instead of disabled checkboxes	2015-07-20 15:03:55 +02:00
redmatrix	6645846ad3	allow per-connection content filter to specify a detected language to include/exclude (in addition to text, tags, and regexes)	2015-07-20 02:04:51 -07:00
redmatrix	736db4992b	string update	2015-07-19 13:20:04 -07:00
redmatrix	fd16de335c	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-16 20:21:20 -07:00
redmatrix	ec249d465b	provide a way to export a single year of items (to potentially keep from exhausting resources either on export or import)	2015-07-16 20:19:20 -07:00
Mario Vavti	39a09eb525	fix missing div and a regression introduced in ec23a94b6d which broke tag removal for photos	2015-07-16 22:04:52 +02:00
Paolo T	5506f178a5	Merge pull request #376 from tuscanhobbit/master ... Updated Italian strings	2015-07-16 11:51:50 +02:00
Paolo Tacconi	c9b5046fc0	Updated Italian strings	2015-07-16 11:33:49 +02:00
redmatrix	964e461e09	allow plugins to provide module handlers for arbitrary modules that haven't been installed on the system.	2015-07-15 21:01:18 -07:00
redmatrix	7db515b77c	fix for empty recip array resulting from a mangled xchan	2015-07-15 18:31:37 -07:00
redmatrix	59b67d52e6	clone sync fixes across red/hz	2015-07-15 18:14:19 -07:00
redmatrix	bfcdf5bd9e	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-15 16:51:01 -07:00
redmatrix	86ad41a2db	revision update	2015-07-15 16:50:37 -07:00
redmatrix	99dfd2f5b1	Merge pull request #375 from zzottel/master ... change sh to bash in shebang to make scripts work	2015-07-16 09:46:16 +10:00
zottel	ba7acf88ad	also change the update_ scripts	2015-07-15 15:40:23 +02:00
zottel	f4a1ca0692	change sh to bash in shebang to make scripts work	2015-07-15 15:29:08 +02:00
Mario Vavti	ca1f6f8c5b	provide info text for automatic permissions	2015-07-15 14:14:10 +02:00
Mario Vavti	5fcf1256bd	whitespace	2015-07-15 14:07:35 +02:00
Mario Vavti	0c77a127f2	show inherited state in Connection Default Permissions	2015-07-15 14:03:34 +02:00
redmatrix	5487b22dd7	fix import of group members	2015-07-14 22:19:21 -07:00
redmatrix	46aacfe64d	stream_perms_xchans() set to empty quoted string when no results rather than return an empty string	2015-07-14 17:15:53 -07:00
redmatrix	3687fef53c	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-14 16:55:58 -07:00
redmatrix	a5989b0f31	coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.	2015-07-14 16:54:16 -07:00
Mario Vavti	104cbcab72	make strings translateable	2015-07-14 21:32:18 +02:00
Mario Vavti	4fe64179c8	disable the inherited checkboxes for notself	2015-07-14 19:29:49 +02:00
Mario Vavti	cc1764989f	fix mod_connedit.js after cleanup	2015-07-14 17:37:33 +02:00
Mario Vavti	f267bd55d6	revert this until further investigation	2015-07-14 14:20:23 +02:00
Mario Vavti	dd57864867	revert provide inherited perms for connection default permissions	2015-07-14 13:46:22 +02:00
Mario Vavti	d8edb66287	remove dbg	2015-07-14 13:21:39 +02:00
Mario Vavti	711dd1468d	provide inherited perms for connection default permissions	2015-07-14 13:16:08 +02:00
Mario Vavti	a28da40fa8	css fixes	2015-07-14 12:52:50 +02:00
Mario Vavti	7f71297383	cleanup connedit	2015-07-14 12:46:40 +02:00
redmatrix	86633bda48	Merge pull request #373 from zzottel/master ... change account_default_channel if default channel is removed	2015-07-14 09:01:02 +10:00
zottel	a07be48017	change account_default_channel if default channel is removed	2015-07-13 17:30:04 +02:00
redmatrix	b7d3eb1605	Only let local logins install webpage elements	2015-07-11 16:36:58 -07:00
redmatrix	3ec2dc81f2	allow sys editing of menu	2015-07-11 16:30:06 -07:00
Mario Vavti	04c794da10	whitespace and comment out info again	2015-07-12 01:12:20 +02:00
Mario Vavti	f81874ca49	fix sys channel menu in a morre standard way	2015-07-12 01:04:57 +02:00
Mario Vavti	6ca4240d96	menu_id is still needed	2015-07-12 00:49:03 +02:00
Mario Vavti	dd32c3053c	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-12 00:40:29 +02:00
Mario Vavti	d8f03450e7	make menu creation for sys channel work	2015-07-12 00:40:12 +02:00
redmatrix	8f9895f26a	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-07-11 15:02:08 -07:00
redmatrix	bc6efba68a	revision update	2015-07-11 15:01:41 -07:00
Mario Vavti	138e0fe445	fix issue with profile photo	2015-07-11 13:25:06 +02:00
Mario Vavti	d3581d8562	more revert	2015-07-11 12:52:06 +02:00
Mario Vavti	d8e7f36c74	revert moving section and aside padding to style.css - it brings trouble to other layouts	2015-07-11 12:42:11 +02:00