summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix root path handling for WebDAV ext storageVincent Petry2014-11-111-0/+2
* Merge pull request #11789 from owncloud/fix-11762Morris Jobke2014-11-112-3/+29
|\
| * dont fail with 500 if configured display name attribute is not setArthur Schiwon2014-10-272-3/+29
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-11142-350/+228
* | Merge pull request #10966 from owncloud/storage-root-share-permissionsMorris Jobke2014-11-102-0/+90
|\ \
| * | Add unit testsRobin Appelman2014-10-311-0/+85
| * | Keep the share permissions from mountpointsRobin Appelman2014-10-311-1/+2
| * | Dont' use mountpoint permissions as share permissions for external storagesRobin Appelman2014-10-311-0/+4
* | | Merge pull request #12070 from owncloud/accessibility-fixesMorris Jobke2014-11-108-31/+95
|\ \ \
| * | | use proper tabindex order: 1. app menu, 2. search, 3. user menuJan-Christoph Borchardt2014-11-081-3/+3
| * | | add relevant focus styles to the existing hover stylesJan-Christoph Borchardt2014-11-063-23/+81
| * | | add alt text for file actions, but leave empty since text is directly next to itJan-Christoph Borchardt2014-11-061-1/+1
| * | | introduce h1, use either ownCloud name or current app nameJan-Christoph Borchardt2014-11-063-3/+8
| * | | add missing alt attribute to spinnerJan-Christoph Borchardt2014-11-061-1/+2
* | | | Merge pull request #12069 from owncloud/clean-l10nMorris Jobke2014-11-1013-5078/+1
|\ \ \ \
| * | | | Remove *.potThomas Müller2014-11-1013-5078/+1
* | | | | Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexcep...Vincent Petry2014-11-104-114/+156
|\ \ \ \ \
| * | | | | Convert StorageNotAvailableException to SabreDAV exceptionVincent Petry2014-11-104-114/+156
| |/ / / /
* | | | | Merge pull request #12027 from owncloud/cleanup_exceptionsVincent Petry2014-11-109-95/+157
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | clean up encryption exceptionsBjoern Schiessle2014-11-079-95/+157
* | | | | Merge pull request #12065 from owncloud/loginname-usernameJan-Christoph Borchardt2014-11-101-1/+1
|\ \ \ \ \
| * | | | | Login Name -> Username in user managementMorris Jobke2014-11-101-1/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1032-22/+42
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0944-64/+284
* | | | | Merge pull request #12050 from owncloud/use-proper-array-nameLukas Reschke2014-11-081-1/+1
|\ \ \ \ \
| * | | | | Use proper array keyLukas Reschke2014-11-081-1/+1
* | | | | | Merge pull request #12038 from sebomoto/fix-user-dropdownLukas Reschke2014-11-081-1/+1
|\ \ \ \ \ \
| * | | | | | changed default dropdown contentSebastian Bolt2014-11-071-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0850-34/+122
|/ / / / / /
* | | | | | logging changesCraig Morrissey2014-11-071-0/+3
* | | | | | Merge pull request #11736 from owncloud/enc_get_fileinfo_from_real_fileBjörn Schießle2014-11-074-10/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | only set the values we need and make sure that we write the file info for bothBjoern Schiessle2014-11-071-3/+7
| * | | | | don't scan part filesBjoern Schiessle2014-11-072-5/+5
| * | | | | also try to get file info from part fileBjoern Schiessle2014-11-071-2/+2
|/ / / / /
* | | | | Merge pull request #11575 from owncloud/cache-watcher-propagateRobin Appelman2014-11-073-0/+38
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Also propagate etag changes when the watcher finds a changed fileRobin Appelman2014-11-073-0/+38
|/ / / /
* | | | Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_...Lukas Reschke2014-11-075-3/+22
|\ \ \ \
| * | | | throw exception if private key is missingBjoern Schiessle2014-11-054-1/+21
| * | | | still try to encrypt files, even if the session is not initialized. The strea...Bjoern Schiessle2014-11-041-2/+1
* | | | | Merge pull request #12019 from owncloud/fix-template-shortcutsThomas Müller2014-11-071-2/+2
|\ \ \ \ \
| * | | | | second parameter in template shortcuts script() and style() is optionalMorris Jobke2014-11-061-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-07118-128/+162
* | | | | | Merge pull request #12003 from owncloud/password-migrationLukas Reschke2014-11-062-33/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Load PHPAss via autoloaderLukas Reschke2014-11-061-1/+2
| * | | | | Use new hashing API for OC_User_DatabaseLukas Reschke2014-11-061-32/+7
* | | | | | Merge pull request #12009 from owncloud/make-optionalMorris Jobke2014-11-061-2/+2
|\ \ \ \ \ \
| * | | | | | Make second argument optionalLukas Reschke2014-11-061-2/+2
* | | | | | | Merge pull request #11945 from owncloud/share-setup-other-userRobin Appelman2014-11-067-14/+71
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix sharing testsRobin Appelman2014-11-063-2/+15
| * | | | | | Support displaynames for dummy user backendRobin Appelman2014-11-061-3/+18