nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/owncloud/core into last_cron_log	kondou	2014-03-21	592	-6594/+7409
\|\
\| *	Merge pull request #7844 from owncloud/fix_7803_blizzz	blizzz	2014-03-21	3	-2/+58
\| \|\ \| \| \| \| \| \|	LDAP: create a new instance of Configuration on clone, fixes #7803
\| \| *	add test for cloning and keeping configuration seperate	Arthur Schiwon	2014-03-21	1	-0/+54
\| \| \|
\| \| *	Use array_key_exists instead of isset, because the latter returns false if ↵	Arthur Schiwon	2014-03-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	the assigned value is null
\| \| *	On clone create a new instance of the Configuration	Arthur Schiwon	2014-03-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avide effects on the original instance of Connection when the clone is modified, for instance on authentication checks.
\| * \|	Merge pull request #7820 from owncloud/core-macwarning	Morris Jobke	2014-03-21	2	-1/+31
\| \|\ \ \| \| \|/ \| \|/\|	Added warning for Mac OS on setup page
\| \| *	Added warning for Mac OS on setup page	Vincent Petry	2014-03-20	2	-1/+31
\| \| \|
\| * \|	Merge pull request #7655 from owncloud/shared-unencryptedsize	Vincent Petry	2014-03-21	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Fixed warning when browsing Shared folder
\| \| * \|	Fixed warning when browsing Shared folder	Vincent Petry	2014-03-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The virtual "Shared" folder doesn't have an unencrypted_size field. This fix adds a check to prevent warnings in the log.
\| * \| \|	Merge pull request #7611 from owncloud/fix-updater	Vincent Petry	2014-03-21	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Use $installedVersion instead of $currentVersion
\| \| * \| \|	Use $installedVersion instead of $currentVersion	Lukas Reschke	2014-03-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #7823 from owncloud/fix_7796	blizzz	2014-03-21	1	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add FreeIPA UUID compatibility, fixes #7796
\| \| * \| \| \|	Fix duplicate ipauniqueid	Robin McCorkell	2014-03-20	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add FreeIPA UUID compatibility, fixes #7796	Robin McCorkell	2014-03-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ability to use ipauniqueid for the UUID of a user
\| * \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2014-03-21	36	-99/+111
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords	Lukas Reschke	2014-03-20	6	-86/+495
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Obfuscate passwords in ext storage config
\| \| * \| \| \| \|	Removed comment	Vincent Petry	2014-03-20	1	-2/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Lazy load phpseclib in ext storage config	Vincent Petry	2014-03-20	1	-1/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix typo in mount loading	Robin Appelman	2014-03-20	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fixed ext storage password field order issue	Vincent Petry	2014-03-19	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The old password field is now preserved in the JSON structure to make sure that the order is preserved. This is a quick fix until the UI is fixed to not rely on the PHP array key order.
\| \| * \| \| \| \|	Fixed ext storage unit test for groups	Vincent Petry	2014-03-19	1	-30/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now creating real users and groups for testing external storage mounts
\| \| * \| \| \| \|	Added tests to check mount point list for a target user	Vincent Petry	2014-03-19	2	-7/+132
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Moved external storage mounting code to files_external app	Vincent Petry	2014-03-19	3	-74/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the mounting code for external storage from OC\Filesystem::initMountPoint to files_external using the post_initMountPoints hook
\| \| * \| \| \| \|	Added IV for ext storage password encryption	Vincent Petry	2014-03-19	2	-10/+42
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Added password obfuscation for external storage config	Vincent Petry	2014-03-19	3	-3/+148
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added obfuscation for all "password" options from external storages. Added unit tests for reading/writing the configuration.
\| \| * \| \| \| \|	Added ext storage unit tests for writing then reload the mount config	Vincent Petry	2014-03-19	1	-1/+73
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown	Vincent Petry	2014-03-20	2	-1/+26
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Still return quota value when free space is unknown
\| \| * \| \| \| \| \|	Still return quota value when free space is unknown	Vincent Petry	2014-03-19	2	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the quota storage wrapper to correctly return the quota value when the free space is not known (which usually happens when the disk_free_space function is disabled)
\| * \| \| \| \| \| \|	remove executable flag for file-upload.js	Morris Jobke	2014-03-20	1	-0/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #7814 from oskholl/master	Morris Jobke	2014-03-20	1	-0/+2
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|	Fix: 'Upload button tooltip doesn't disappear'
\| \| * \| \| \| \| \|	Comment moved to prevent 'Line is too long' warning.	Oskar Hollmann	2014-03-19	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix: 'Upload button tooltip doesn't disappear'	Oskar Hollmann	2014-03-19	1	-0/+1
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
\| * \| \| \| \| \|	Merge pull request #7732 from owncloud/datafolderexistence	Vincent Petry	2014-03-20	8	-5/+152
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added .ocdata file to check for data folder validity
\| \| * \| \| \| \| \|	Increase version to trigger upgrade related to .ocdata	Vincent Petry	2014-03-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Return 503 when a config/data dir error exists	Vincent Petry	2014-03-14	2	-0/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Added .ocdata file to check for data folder validity	Vincent Petry	2014-03-14	5	-4/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In environments where the data folder is mount from another partition, it is important to check that the data folder we see is actually the real one. If the mount failed for some reasons, this fix will make ownCloud temporarily unavailable instead of causing unpredictable behavior.
\| * \| \| \| \| \| \|	Merge pull request #7818 from owncloud/logException_undefined_variable	Morris Jobke	2014-03-20	1	-5/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'Undefined variable: message' in OCP\Util::logException
\| \| * \| \| \| \| \| \|	Fix 'Undefined variable: message' in OCP\Util::logException	Thomas Tanghus	2014-03-20	1	-5/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #7651 from owncloud/close-session-faster-master	Thomas Müller	2014-03-20	22	-15/+135
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Close session faster
\| \| * \| \| \| \| \| \|	Merge branch 'master' into close-session-faster-master	Thomas Müller	2014-03-19	65	-1016/+701
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: apps/files/ajax/upgrade.php
\| \| * \| \| \| \| \| \| \|	redefine reopen() in class \OC\Session\Internal to avoid accidental calls in ↵	Thomas Müller	2014-03-18	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	productive code
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into close-session-faster-master	Thomas Müller	2014-03-17	1502	-48396/+80967
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	introduce reopen() method to be used for unit test execution only - right ↵	Thomas Müller	2014-03-17	2	-5/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after a unit test has been executed the session will be reopened
\| \| * \| \| \| \| \| \| \| \|	in case of phpunit executions calling header() and exit() is too bad	Thomas Müller	2014-03-14	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	move session reset to endTest() - necessary because we need a valid session ↵	Thomas Müller	2014-03-14	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the next unit tests setUp() call
\| \| * \| \| \| \| \| \| \| \|	adding StartSessionListener which initializes the session before each test ↵	Thomas Müller	2014-03-13	3	-0/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	case execution
\| \| * \| \| \| \| \| \| \| \|	PHPDoc updated	Thomas Müller	2014-03-10	2	-2/+13
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into close-session-faster-master	Thomas Müller	2014-03-10	12	-170/+132
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	fix close() implementation in \OC\Session\Internal	Thomas Müller	2014-03-10	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	close the session for all DAV calls right after authentication - no need to ↵	Thomas Müller	2014-03-10	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	write to the session afterwards