21272 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	0811b39e5f	[tx-robot] updated from transifex	2014-11-14 01:54:47 -05:00
Morris Jobke	c0d63680ed	Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup ... cleanup group admin(s) on deleteGroup	2014-11-13 22:39:40 +01:00
Vincent Petry	dfcf2059e1	Merge pull request #12157 from owncloud/fix-autotest-condition ... this allows a non-existant config/config.php for starting the autotest.s...	2014-11-13 16:35:01 +01:00
Morris Jobke	b564192ba2	Merge pull request #12158 from owncloud/drop-snapjs ... remove unneeded snap.js - followup to #11985 - ref #12156	2014-11-13 16:03:11 +01:00
Morris Jobke	e5d46d0d94	Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name ... removal of wrong/double implemented check	2014-11-13 15:39:07 +01:00
blizzz	559b34e53d	Merge pull request #12005 from owncloud/bower-multiselect ... Move multiselect to user_ldap	2014-11-13 14:43:06 +01:00
Morris Jobke	42793534d4	remove unneeded snap.js - followup to #11985 - ref #12156	2014-11-13 13:20:37 +01:00
michag86	7e70c4ee95	removal of wrong/double implemented check ... Check already implemented in core/settings/ajax/changedisplayname.php	2014-11-13 13:02:02 +01:00
Lukas Reschke	5f8fb8d1ee	Run preupdate before an update ... The update routine tries to test the database migration before actually performing the update. However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails. This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.	2014-11-13 12:07:49 +01:00
Morris Jobke	19346f4a27	this allows a non-existant config/config.php for starting the autotest.sh	2014-11-13 11:58:09 +01:00
Vincent Petry	5ca869c324	Merge pull request #9177 from owncloud/jsdocexperiment ... Improved JS Docs + added build script for JS Docs	2014-11-13 11:16:08 +01:00
Jenkins for ownCloud	a069171cda	[tx-robot] updated from transifex	2014-11-13 01:54:36 -05:00
Morris Jobke	f39cb3fbc9	Migrate multiselect to user_ldap	2014-11-13 00:47:14 +01:00
Morris Jobke	97a8fa418d	Merge pull request #12141 from owncloud/kill-dav-client ... OC_DAVClient is not longer used - no need to carry it around anymore	2014-11-12 21:20:52 +01:00
Vincent Petry	e0b797c43c	Merge pull request #12087 from AdamWill/google-touch ... google: fix touch() when $mtime is set (Google wants RFC3339) #11267	2014-11-12 18:24:57 +01:00
Thomas Müller	6e3a841652	Merge pull request #12139 from owncloud/DoNotTouchMe ... Try to read the file only instead of trying to touch	2014-11-12 17:29:56 +01:00
Thomas Müller	fede6b93e5	OC_DAVClient is not longer used - no need to carry it around anymore	2014-11-12 17:07:34 +01:00
Jan-Christoph Borchardt	d5796bbaf9	Merge pull request #12128 from owncloud/drop-formfactor ... Drop form_factor that is appended to JS, CSS and template filenames	2014-11-12 16:23:19 +01:00
Lukas Reschke	268906995d	Merge pull request #12126 from owncloud/remove-debug-statement ... Remove debug statement	2014-11-12 16:11:28 +01:00
Lukas Reschke	49ddaf9489	Try to read the file only instead of trying to touch ... The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening. Fixes https://github.com/owncloud/core/issues/12135	2014-11-12 15:57:19 +01:00
Morris Jobke	952abdc51a	Drop form_factor that is appended to JS, CSS and template filenames	2014-11-12 13:07:23 +01:00
Lukas Reschke	da31177a8f	Remove debug statement ... Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...	2014-11-12 11:32:48 +01:00
Thomas Müller	5aaea6961c	Merge pull request #12110 from owncloud/fix-12080 ... add 'namespace' for automatically created navigation divs, fixes #12080	2014-11-12 11:25:42 +01:00
Morris Jobke	710241f056	Merge pull request #12093 from AdamWill/storage-test-touch ... storage test: use new file for testTouchCreateFile()	2014-11-12 10:59:41 +01:00
Arthur Schiwon	c5c74792d1	add 'namespace' for automatically created navigation divs, fixes #12080	2014-11-12 10:42:44 +01:00
Thomas Müller	c998f620d0	Merge pull request #12105 from owncloud/dav-fixcleanpath ... Fix root path handling for WebDAV ext storage	2014-11-12 09:16:55 +01:00
Thomas Müller	9aef0421cf	Merge pull request #12107 from owncloud/dav-propfindmimetype ... Return real mime type on PROPFIND	2014-11-12 09:16:26 +01:00
Jenkins for ownCloud	1846fb0285	[tx-robot] updated from transifex	2014-11-12 01:55:24 -05:00
Morris Jobke	6f2da96698	Merge pull request #12114 from owncloud/fix-pimple ... Fix Pimple unset	2014-11-12 01:40:07 +01:00
Bernhard Posselt	6d5a239abf	Fix Pimple unset	2014-11-11 22:04:46 +01:00
Thomas Müller	4c1244f50c	Merge pull request #11917 from owncloud/fix-11909 ... Add checkbox to enforce SSL for subdomains	2014-11-11 20:37:50 +01:00
Jan-Christoph Borchardt	3ecb3f16bf	Merge pull request #11929 from owncloud/fix-db-center ... fixes not centered database chooser on setup page	2014-11-11 17:12:17 +01:00
Vincent Petry	0b2c24081f	Return real mime type on PROPFIND ... Return the real (insecure) mime type on PROPFIND	2014-11-11 15:42:50 +01:00
Vincent Petry	4b943a4810	Fix root path handling for WebDAV ext storage ... Added missing cleanPath() call that converts "/" to "" when calling SabreDAV. This is needed because SabreDAV will discard its base URL when passing "/".	2014-11-11 15:20:36 +01:00
Morris Jobke	0de9368ab2	Merge pull request #12100 from owncloud/fix-infinite-loop ... Fix infinite loop if count and limit is 0	2014-11-11 13:29:39 +01:00
Morris Jobke	081787d6ae	Fix infinite loop if count and limit is 0 ... * otherwise it will always think it hits the limit and need another round to fetch additional results	2014-11-11 12:15:30 +01:00
Morris Jobke	9368de5a8b	Merge pull request #11789 from owncloud/fix-11762 ... [LDAP] Login: dont fail with 500 if configured display name attribute is not set	2014-11-11 11:16:41 +01:00
Jenkins for ownCloud	664cc4ac0e	[tx-robot] updated from transifex	2014-11-11 01:55:23 -05:00
Adam Williamson	e0ae87051f	storage test: use new file for testTouchCreateFile() ... this test would never succeed, because the previous test - testFOpen() - creates the file 'foo', but testTouchCreateFile() starts out by asserting it doesn't exist. Change the test to use a file called 'touch' instead (which does not previously exist).	2014-11-10 17:49:35 -08:00
Adam Williamson	f76419d190	fix touch() when $mtime is set (Google wants RFC3339) #11267 ... ownCloud passes us a Unix time integer, but the GDrive API wants an RFC3339-formatted date. Actually it wants a single particular RFC3339 format, not just anything that complies will do - it requires the fractions to be specified, though RFC3339 doesn't. This resolves issue #11267 (and was also noted by PVince81 in reviewing PR #6989).	2014-11-10 11:56:01 -08:00
Morris Jobke	2023878d53	Merge pull request #10966 from owncloud/storage-root-share-permissions ... Dont' use mountpoint permissions as share permissions for external storages	2014-11-10 13:11:22 +01:00
Morris Jobke	8afb623f08	Merge pull request #12070 from owncloud/accessibility-fixes ... Accessibility fixes	2014-11-10 13:06:46 +01:00
Morris Jobke	3c030e5059	Merge pull request #12069 from owncloud/clean-l10n ... Remove *.pot	2014-11-10 12:59:56 +01:00
Vincent Petry	9b99c1d6f0	Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry ... Convert StorageNotAvailableException to SabreDAV exception	2014-11-10 12:52:52 +01:00
Vincent Petry	676b911b22	Merge pull request #12027 from owncloud/cleanup_exceptions ... [encryption] clean up encryption exceptions	2014-11-10 12:46:53 +01:00
Vincent Petry	cccedf6f30	Convert StorageNotAvailableException to SabreDAV exception ... Convert \OCP\Files\StorageNotAvailableException to \Sabre\DAV\Exception\ServiceUnavailable for every file/directory operation happening inside of SabreDAV. This is necessary to avoid having the exception bubble up to remote.php which would return an exception page instead of an appropriate response.	2014-11-10 12:01:24 +01:00
Thomas Müller	be212ce91e	Remove *.pot	2014-11-10 11:33:20 +01:00
Jan-Christoph Borchardt	0d00e247c3	Merge pull request #12065 from owncloud/loginname-username ... Login Name -> Username in user management	2014-11-10 11:16:10 +01:00
Morris Jobke	311566b96d	Login Name -> Username in user management	2014-11-10 10:52:47 +01:00
Jenkins for ownCloud	c3e3432662	[tx-robot] updated from transifex	2014-11-10 01:54:30 -05:00