24866 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lukas Reschke	8ae8600b1f	Merge pull request #16342 from owncloud/fix_16338 ... fix preview hooks, enable_previews default is true	2015-05-15 08:48:12 +02:00
Jenkins for ownCloud	49c4ee98b4	[tx-robot] updated from transifex	2015-05-15 01:54:49 -04:00
Jenkins for ownCloud	1596a1fd32	[tx-robot] updated from transifex	2015-05-14 01:54:47 -04:00
Georg Ehrke	745c3c64fa	fix preview hooks, enable_previews default is true	2015-05-13 19:59:41 +02:00
Robin Appelman	4789e87a53	Merge pull request #16276 from owncloud/dav-quota-root ... fix webdav quota check for the root of the dav endpoint	2015-05-13 14:43:02 +02:00
Vincent Petry	1f7df3eba8	Added unit test to quota plugin for free_space argument	2015-05-13 13:58:01 +02:00
Lukas Reschke	5941e826b8	Merge pull request #16284 from owncloud/shared-storage-view ... dont go trough the view when renaming/copying on shared storages	2015-05-13 10:37:04 +02:00
Lukas Reschke	e753e8cc37	Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-apps ... Add info message for upgrade of an 3rdparty app	2015-05-13 08:32:42 +02:00
Jenkins for ownCloud	504586aec6	[tx-robot] updated from transifex	2015-05-13 01:55:14 -04:00
Lukas Reschke	b626de0b9f	Merge pull request #16289 from owncloud/fix-stupid-mistake ... Add NoAdminRequired annotation	2015-05-12 19:30:59 +02:00
Morris Jobke	dc362823e0	Merge pull request #16269 from owncloud/master-fix-16179 ... Check if cURL supports the desired features	2015-05-12 18:27:57 +02:00
Lukas Reschke	a7a2579c89	Subadmin permissions are also not required	2015-05-12 18:08:10 +02:00
Morris Jobke	cb909cda97	Add info message for upgrade of an 3rdparty app	2015-05-12 18:02:31 +02:00
Lukas Reschke	cdeb2052bb	Add NoAdminRequired annotation ... Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288	2015-05-12 17:49:34 +02:00
Robin Appelman	3b1dde7005	dont go trough the view when renaming/copying on shared storages	2015-05-12 17:09:37 +02:00
Morris Jobke	d4eff55342	Merge pull request #16283 from owncloud/fix-search-users ... fix user mgmt search box position, fix #15928	2015-05-12 16:21:31 +02:00
Morris Jobke	895a1a5efa	Merge pull request #16282 from owncloud/fix-multiselect-ellipsize ... ellipsize first item in multiselect, fix #16174	2015-05-12 16:08:13 +02:00
Jan-Christoph Borchardt	21a1995ad6	Merge pull request #16104 from owncloud/resize-filepicker ... Resize filepicker on window size change	2015-05-12 15:57:23 +02:00
Morris Jobke	44091a1a12	Merge pull request #16277 from owncloud/fix-15971 ... remove superflous button. fixes #15971	2015-05-12 15:54:49 +02:00
Jan-Christoph Borchardt	76f6f6b6bc	fix user mgmt search box position, fix #15928	2015-05-12 15:48:45 +02:00
Jan-Christoph Borchardt	58bce49037	ellipsize first item in multiselect, fix #16174	2015-05-12 15:39:18 +02:00
Jan-Christoph Borchardt	46e4d8818c	Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view ... Enable file icons & previews in "Shared ..." categories	2015-05-12 15:17:43 +02:00
Arthur Schiwon	acafc8ca46	remove superflous button. fixes #15971	2015-05-12 14:54:05 +02:00
Robin Appelman	11e1acd8ec	fix webdav quota check for the root of the dav endpoint	2015-05-12 14:02:27 +02:00
Jan-Christoph Borchardt	127b0d9edf	Merge pull request #16271 from owncloud/use-active ... Use active instead of non existing pressed	2015-05-12 13:16:50 +02:00
Björn Schießle	fbe4b77c49	Merge pull request #16228 from owncloud/enc_fix_restore ... use hooks to update encryption keys	2015-05-12 13:10:16 +02:00
Lukas Reschke	0a3bf3f963	Use active instead of non existing pressed ... Fixes https://github.com/owncloud/core/issues/16083	2015-05-12 12:20:28 +02:00
Lukas Reschke	4613456a8a	Check if cURL supports the desired features ... Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour. Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.	2015-05-12 12:00:56 +02:00
Morris Jobke	b11c0c533e	Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded ... fix check if a file is excluded from encryption	2015-05-12 09:12:38 +02:00
Jenkins for ownCloud	deeeca69fe	[tx-robot] updated from transifex	2015-05-12 01:55:10 -04:00
Vincent Petry	20d2d8d3dd	Merge pull request #15881 from owncloud/share-moveversionsproperly ... Fix version rename with files and folders	2015-05-11 18:24:34 +02:00
Morris Jobke	afcec88c6f	Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-insert ... Issue 16206 fix app config parallel insert	2015-05-11 16:05:30 +02:00
Morris Jobke	90d8e4bc00	Merge pull request #15815 from owncloud/unshare-etag-propagate ... Update etag of direct parent on unshare	2015-05-11 13:42:20 +02:00
Bjoern Schiessle	9dd517071e	fix check if file is excluded from encryption	2015-05-11 12:38:59 +02:00
Joas Schilling	dfed287dc0	Use insertIfNotExists to avoid problems with parallel calls	2015-05-11 12:38:33 +02:00
Joas Schilling	39497b9c3a	Add a test for parallel insert	2015-05-11 12:29:28 +02:00
Joas Schilling	2916b0ba76	Always test the object and the legacy class	2015-05-11 12:22:23 +02:00
Bjoern Schiessle	0d5c7a11e2	use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we ... are in the storage wrapper the file cache isn't up-to-date	2015-05-11 12:06:57 +02:00
Thomas Müller	7db994971e	Merge pull request #16208 from owncloud/fix-language-selection-sr-latin ... Some locales need to be converted to be compliant with CLDR	2015-05-11 11:21:28 +02:00
Morris Jobke	f057efc42e	Merge pull request #16213 from cmeh/patch-5 ... Grammar, removal of line break	2015-05-11 09:18:45 +02:00
Jenkins for ownCloud	a331f6b83e	[tx-robot] updated from transifex	2015-05-11 01:54:43 -04:00
Jenkins for ownCloud	52fc45e6e3	[tx-robot] updated from transifex	2015-05-10 01:56:13 -04:00
Christian Hoffmann	6441721626	Grammar, removal of line break ... * Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17. * Removed line break from line 17 to line 18.	2015-05-09 11:31:21 +02:00
Jenkins for ownCloud	6f5854a8de	[tx-robot] updated from transifex	2015-05-09 01:55:35 -04:00
Thomas Müller	57f3557486	Merge pull request #16203 from owncloud/add-warning-for-people-that-cant-read ... Add warning to OCC as well in case another PHP version is used there	2015-05-08 23:48:31 +02:00
Thomas Müller	9c57ae89d9	Some locales need to be converted to be compliant with CLDR	2015-05-08 23:45:07 +02:00
Lukas Reschke	4c0a8d327d	Add warning to OCC as well in case another PHP version is used there ... In regard to a recent rant on social media where users complained about us to have broken the command line tool. Guess reading the documentation is hard…	2015-05-08 16:08:21 +02:00
Lukas Reschke	c9921ec127	Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shared-folder ... Fix the share mail notification when the item is in a folder	2015-05-08 13:03:28 +02:00
Björn Schießle	bcbf9a9bb5	Merge pull request #16155 from owncloud/enc_admin_settings ... improved admin settings	2015-05-08 12:16:16 +02:00
Lukas Reschke	16a0de6314	Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exists-on-enable-app ... Avoid the log entry with the ModuleAlreadyExists exception when enabl…	2015-05-08 11:55:02 +02:00