6380 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Appelman	33dc617d9d	Merge branch 'master' into gallery	2012-11-07 17:19:52 +01:00
Robin Appelman	3c638ded9d	Merge branch 'master' into filesystem	2012-11-07 17:19:36 +01:00
Jenkins for ownCloud	79733bd0ef	[tx-robot] updated from transifex	2012-11-07 00:04:41 +01:00
Jenkins for ownCloud	d2c76213e4	[tx-robot] updated from transifex	2012-11-06 00:03:22 +01:00
Alessandro Cosentino	a4d88f696a	[News] substitutes modals with notification in importopml	2012-11-04 22:27:09 -05:00
Robin Appelman	304babc092	merge master into filesystem	2012-11-04 21:08:15 +01:00
Robin Appelman	5fa254a16d	Merge branch 'master' into gallery	2012-11-04 21:05:40 +01:00
Jenkins for ownCloud	4e905c5e10	[tx-robot] updated from transifex	2012-11-04 00:03:02 +01:00
Jenkins for ownCloud	3379dddf8a	[tx-robot] updated from transifex	2012-11-03 00:02:23 +01:00
Bernhard Posselt	ded22aaf4b	removed unforseen overwrite of controller classes	2012-11-02 22:17:06 +01:00
Robin Appelman	313d3d28e9	Merge branch 'master' into gallery	2012-11-02 21:44:57 +01:00
Robin Appelman	d5f5eb6c2a	Merge branch 'master' into filesystem	2012-11-02 21:43:44 +01:00
Alessandro Cosentino	9112586eec	[News] import opml from local filesystem now works	2012-11-02 15:30:32 -04:00
Alessandro Cosentino	6682d2e55d	[News] make the import opml interface slimmer	2012-11-02 15:30:32 -04:00
Jan-Christoph Borchardt	cac98cd27a	Merge branch 'master' into navigation	2012-11-02 13:36:08 +01:00
Jenkins for ownCloud	58c838feda	[tx-robot] updated from transifex	2012-11-02 00:03:14 +01:00
Jan-Christoph Borchardt	018a1d1079	Merge branch 'master' into navigation	2012-11-01 16:57:35 +01:00
Robin Appelman	249615222f	Merge branch 'master' into gallery	2012-11-01 16:45:23 +01:00
Robin Appelman	3001300c44	Merge branch 'master' into filesystem	2012-11-01 16:45:10 +01:00
Jenkins for ownCloud	c32dfe9802	[tx-robot] updated from transifex	2012-11-01 00:03:46 +01:00
Bernhard Posselt	77ce8c29ad	deleted renamed file	2012-10-31 22:02:19 +01:00
Bernhard Posselt	e7b0267dc7	added docstrings to the changes	2012-10-31 22:02:19 +01:00
Bernhard Posselt	323dd4c9b1	added request object, added url function that does all the security checks, improved controller object	2012-10-31 22:02:19 +01:00
Bernhard Posselt	bb092e1545	made folder names uppercase	2012-10-31 17:18:50 +01:00
Bernhard Posselt	16e1be9742	removed borders from unread counter	2012-10-31 13:53:04 +01:00
Bernhard Posselt	c52c93f1e5	added unreadcounter for folders	2012-10-31 01:46:33 +01:00
Bernhard Posselt	3d5f0835bb	show border for feeds in a folder	2012-10-31 01:37:46 +01:00
Jan-Christoph Borchardt	e101bc07bc	News: notifications more elegant, less obtrusive	2012-10-31 01:27:47 +01:00
Jan-Christoph Borchardt	05f92e2842	News: change highlight to not display text slanted	2012-10-31 01:26:44 +01:00
Bernhard Posselt	e7d7d483b4	center unreadcounter vertically	2012-10-31 01:20:02 +01:00
Bernhard Posselt	1378ff21ce	set unread items correctly for new items and starred items	2012-10-31 01:17:37 +01:00
Bernhard Posselt	e00bc4b65f	added unreadcounter back	2012-10-31 01:05:58 +01:00
Jenkins for ownCloud	e04dca9be3	[tx-robot] updated from transifex	2012-10-31 00:03:12 +01:00
Bernhard Posselt	a7723e0b25	split share class	2012-10-30 23:51:52 +01:00
Bernhard Posselt	47401d8f65	added sharing link style and made bottom utils bold	2012-10-30 23:27:55 +01:00
Robin Appelman	02c4e3297a	Merge branch 'master' into filesystem	2012-10-30 23:00:10 +01:00
Robin Appelman	ac1caceacf	Merge branch 'master' into gallery	2012-10-30 22:46:51 +01:00
Alessandro Cosentino	00ba1348ff	[News] SimplePie library updated to 1.3.1	2012-10-30 15:16:22 -04:00
Jenkins for ownCloud	e20c374195	[tx-robot] updated from transifex	2012-10-30 00:03:08 +01:00
Alessandro Cosentino	8a68d95f3b	Merge branch 'master' of github.com:owncloud/apps	2012-10-28 19:27:25 -04:00
Alessandro Cosentino	4299b35e82	[News] fix bugs in feedById	2012-10-28 19:26:59 -04:00
Jenkins for ownCloud	d47dd1254e	[tx-robot] updated from transifex	2012-10-29 00:02:59 +01:00
Alessandro Cosentino	a7f7f04052	sharing items in the News app	2012-10-28 10:57:35 -04:00
Robin Appelman	cdf4e772e3	merge master into gallery	2012-10-28 12:58:16 +01:00
Robin Appelman	f3fbd82849	Revert "[tx-robot] updated from transifex" due to merge conflicts ... This reverts commit a468d47dfb2ca740e25edfac3b11a6ea21ee1546.	2012-10-28 12:53:13 +01:00
Robin Appelman	563c495909	Merge branch 'master' into filesystem	2012-10-28 10:29:03 +01:00
Jenkins for ownCloud	ff6bee25f0	[tx-robot] updated from transifex	2012-10-28 00:02:30 +02:00
Jan-Christoph Borchardt	a77ab8799c	first step to update icons for changes in core navigation, still needs sprited hover state	2012-10-27 17:46:14 +02:00
Robin Appelman	b92a94d283	merge master into filesystem	2012-10-27 14:30:30 +02:00
Jan-Christoph Borchardt	7683d55104	remove highlight of currently selected item	2012-10-26 20:30:19 +02:00