4481 commits

Author	SHA1	Message	Date
redmatrix	1b3e046cd2	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-06 17:54:29 -07:00
Mario Vavti	05b231b087	fix word wrapping in tagblock and dirtagblock and possibly other places	2015-07-06 10:36:57 +02:00
redmatrix	8fad0187ec	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-07-05 21:38:21 -07:00
Mario Vavti	2011784faf	schema focus: adjust default width	2015-07-05 22:37:52 +02:00
Paolo Tacconi	7d4615e319	Updated Italian localization	2015-07-03 12:01:30 +02:00
redmatrix	1a5898bf80	sync abook entries from redmatrix ... Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php	2015-07-02 21:58:28 -07:00
Mario Vavti	f54688a547	since we can now use plain upstream justifiedGallery library - switch to minified version	2015-07-01 11:42:17 +02:00
Mario Vavti	9c4e9f8759	update justifiedGallery to versio 3.6.0	2015-07-01 11:34:36 +02:00
redmatrix	97e8275dc2	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-29 22:19:44 -07:00
redmatrix	0b347ccc14	turn the connection filter into a feature.	2015-06-29 20:35:56 -07:00
redmatrix	6e8ad5089e	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: view/nl/messages.po view/nl/strings.php	2015-06-29 18:01:51 -07:00
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	63f2e9b412	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: include/zot.php mod/connedit.php util/messages.po	2015-06-28 22:33:13 -07: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
redmatrix	b06b6f798f	localise event calendar	2015-06-25 18:23:48 -07:00
Mario Vavti	9406c5a55c	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-25 12:54:42 +02:00
redmatrix	5f3edabd45	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php	2015-06-24 16:34:52 -07: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
redmatrix	833098e346	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: include/items.php mod/item.php	2015-06-23 17:30:35 -07: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	ae6612025d	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: include/items.php util/messages.po	2015-06-21 20:51:07 -07: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
redmatrix	2963be60e5	more photos work	2015-06-17 18:26:56 -07:00
redmatrix	6ab20eb1b5	lots of work on merging photo and file albums/folders	2015-06-17 17:44:31 -07:00
redmatrix	8c7472c6c3	Merge branch 'master' of https://github.com/redmatrix/redmatrix ... Conflicts: view/nl/messages.po view/nl/strings.php	2015-06-15 17:30:08 -07: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
redmatrix	5733491ac8	more work on items ... and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php	2015-06-11 17:56:56 -07: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
redmatrix	2128d5a256	Merge branch 'master' of https://github.com/redmatrix/redmatrix	2015-06-10 15:47:23 -07: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