4431 commits

Author	SHA1	Message	Date
jeroenpraat	aad8fc1946	Update NL + 1 revert css, see comment here: 22b9e97ae2	2015-06-30 00:26:16 +02:00
jeroenpraat	abb153e711	Probably a ugly hack, but it's the only way I could found that cuts off very long channel names in the admin area. If there's a better alternative, be my guest.	2015-06-29 23:09:36 +02:00
Mario Vavti	7ef4397634	fix directory location	2015-06-29 14:25:04 +02:00
redmatrix	090dae46e5	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-06-28 21:19:28 -07:00
redmatrix	de13497333	no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.	2015-06-28 21:16:56 -07:00
Mario Vavti	22b9e97ae2	css fixes	2015-06-27 22:27:17 +02:00
Mario Vavti	9406c5a55c	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-25 12:54:42 +02:00
Mario Vavti	e9cc06dc11	directory: only provide connect button if we are not already connected	2015-06-24 21:12:20 +02:00
zottel	50de9325b6	update to German strings	2015-06-24 16:53:46 +02:00
Mario Vavti	05c7022ff8	Add a new redbasic scheme called focus - It is supposed to focus on the main content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px.	2015-06-24 13:05:33 +02:00
Mario Vavti	b6c4601d8f	some work on directory	2015-06-23 13:06:22 +02:00
Mario Vavti	a4775aab9b	Bring /help in line with the rest of the app	2015-06-22 14:02:14 +02:00
redmatrix	f59edbb48f	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-06-21 17:31:09 -07:00
redmatrix	68534fd5dc	some diaspora import issues uncovered during dry-run tests	2015-06-21 17:30:23 -07:00
Klaus Weidenbach	c3fa0a3ca7	Compatible update for .htaccess. ... This should hopefully work in Apache 2.2 and 2.4.	2015-06-22 00:45:29 +02:00
Klaus Weidenbach	5a96f3331a	Compatible update for .htaccess. ... This should hopefully work in Apache 2.2 and 2.4.	2015-06-21 23:58:19 +02:00
Mario Vavti	c1e0987b88	do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly.	2015-06-21 17:53:44 +02:00
Mario Vavti	8b563951ff	more generic-content-wrapper and some css fixes	2015-06-19 15:49:06 +02:00
Mario Vavti	1432b1e83f	cloud.tpl	2015-06-19 12:45:18 +02:00
Mario Vavti	de84f48e2f	bring some more generic-content-wrappers and fix some of them	2015-06-19 12:44:11 +02:00
Mario Vavti	e0779e32b4	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-15 21:48:07 +02:00
Mario Vavti	7e3aac6d18	update spin.js	2015-06-15 21:47:29 +02:00
jeroenpraat	caf0cd3dbb	Update Dutch language strings	2015-06-15 16:41:03 +02:00
Mario Vavti	905cd1da5b	do not allow/show acl button on photo edit if not owner	2015-06-15 13:04:16 +02:00
Paolo T	aac9d60f2d	Merge pull request #347 from tuscanhobbit/dev ... updated italian strings	2015-06-11 15:54:35 +02:00
Paolo Tacconi	98b0cfb413	updated italian strings	2015-06-11 15:47:15 +02:00
Mario Vavti	8c4b337918	set width for region_3 only if center page content is set	2015-06-11 13:07:45 +02:00
Mario Vavti	c8fe408a62	fix rendering of affinity slider	2015-06-11 11:35:21 +02:00
Mario Vavti	50ac9378e3	assign right aside the same width as we have in left aside but hide it on small and xs screens. make aside width a variablee for easier handling.	2015-06-10 13:08:17 +02:00
redmatrix	9592f7f3e6	put mirror_frontpage setting into admin/site	2015-06-09 19:37:12 -07:00
redmatrix	d08c43d80c	toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled.	2015-06-09 18:50:11 -07:00
Mario Vavti	a6cedf0953	css regression fixes	2015-06-08 19:27:16 +02:00
redmatrix	10e88a3e45	Merge branch 'frontpage'	2015-06-07 21:38:11 -07:00
redmatrix	3c5a5a9ebf	more frontpage tweaks	2015-06-07 18:59:14 -07:00
redmatrix	60cfea5d1f	reverse logic of homepage login setting	2015-06-07 18:27:05 -07:00
redmatrix	0537ff1e4a	frontpage tweaks	2015-06-07 18:15:26 -07:00
redmatrix	65bea5e02c	frontpage changes	2015-06-07 16:19:59 -07:00
jeroenpraat	fd73ffe291	Upd NL	2015-06-07 16:39:00 +02:00
Mario Vavti	f5e439236c	missing comma	2015-06-06 20:23:00 +02:00
jeroenpraat	93237f8d0a	Added translatable strings to the Display Settings page and refreshed util/messages.po.	2015-06-06 19:49:30 +02:00
Mario Vavti	2c52be8780	css fixes	2015-06-06 17:05:38 +02:00
Mario Vavti	d60c2b1621	whitespace	2015-06-06 15:51:15 +02:00
Mario Vavti	dff402293f	some cleanup after scheme transition	2015-06-06 15:06:27 +02:00
jeroenpraat	f51cfa6960	More schemas in new format	2015-06-05 21:15:21 +02:00
jeroenpraat	6e336d680d	Schemas: should be ok now.	2015-06-03 22:53:48 +02:00
jeroenpraat	03361acce5	2 more schemas in new format	2015-06-03 15:45:50 +02:00
jeroenpraat	76d7278c0a	empty php schema back	2015-06-03 13:57:10 +02:00
jeroenpraat	89fbd5c0f6	First schema completely to the new format. git-marijus: Can you please quickly check if I'm doing it right?	2015-06-02 23:22:12 +02:00
Mario Vavti	d11d130021	add some yes/no labels and minor template fixes	2015-05-29 15:23:51 +02:00
Mario Vavti	b8d3280763	some fixes to make menu sharing work and expose it in the ui.	2015-05-29 13:08:01 +02:00