summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | drop useless "!!! No reuse of etag" - fixes #13187Morris Jobke2015-01-131-3/+0
| | | | | | | |
* | | | | | | | Merge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encodeRobin McCorkell2015-01-131-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Use json_encode on string
| * | | | | | | Use json_encode on stringLukas Reschke2015-01-131-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's better to encode the string to prevent possible (yet unknown) bugs in combination with PHP's type juggling. Previously the boolean statements evaluated to either an empty string (false) or a not empty one (true, then it was 1). Not it always evaluates to false or true. This also removes a stray - that was not intended there but shouldn't have produced any bugs. Just to increase readability. Thanks @nickvergessen for spotting. Addresses https://github.com/owncloud/core/pull/13235/files#r22852319
* | | | | | | Merge pull request #13271 from owncloud/fix-table-prefix-oracle-masterMorris Jobke2015-01-136-9/+32
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use a special filter expression for Oracle to filter the prefix - fixes ...
| * | | | | | Use a special filter expression for Oracle to filter the prefix - fixes #13220Thomas Müller2015-01-126-9/+32
| | | | | | |
* | | | | | | Merge pull request #13299 from owncloud/fix-ie8Thomas Müller2015-01-131-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | usage of const in JS is supported in IE11+
| * | | | | | | usage of const in JS is supported in IE11+Morris Jobke2015-01-131-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #13278 from owncloud/repair-step-missing-etagsMorris Jobke2015-01-132-1/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Adding repair step to fix missing etags - fixes #12172
| * | | | | | | | Adding repair step to fix missing etags - fixes #12172Thomas Müller2015-01-122-1/+44
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #13289 from owncloud/fav-keepfavoncancelrenameMorris Jobke2015-01-132-6/+41
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Properly update internal file info with updated tags
| * | | | | | | Properly update internal file info with updated tagsVincent Petry2015-01-122-6/+41
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever tags are updated, they need to be updated in the file list's file info array as well. This commit also adds unit tests and makes sure that whichever tags are sent back by the server after update are used when updating attributes/fileinfo.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-13214-270/+442
| | | | | | |
* | | | | | | Merge pull request #13293 from owncloud/occ-required-posixLukas Reschke2015-01-121-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Check for the posix extension
| * | | | | | | Check for the posix extension - refs ↵Thomas Müller2015-01-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/pull/13282#issuecomment-69602645
* | | | | | | | Merge pull request #13154 from owncloud/fix13141Thomas Müller2015-01-122-7/+122
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | don't show no files yet when mask is in place, fixes #13141
| * | | | | | | | add js tests for filelist filteringJörn Friedrich Dreyer2015-01-092-6/+119
| | | | | | | | |
| * | | | | | | | don't show no files yet when mask is in place, fixes #13141Jörn Friedrich Dreyer2015-01-071-1/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #13272 from owncloud/fav-renamekeepfavJoas Schilling2015-01-122-2/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixes issues when renaming favorite file
| * | | | | | | | | Return path attribute for ajax rename operationsVincent Petry2015-01-122-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue when renaming files from a flat list view like "Favorites" or "Shared with you", in which case the path needs to be present in the response to make sure the data-path attribute is properly set in the JS side.
| * | | | | | | | | Return tags after renameVincent Petry2015-01-122-2/+72
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it possible for the web UI to correctly display the tag/favorite information after a rename, this information is now returned in the rename response
* | | | | | | | | Merge pull request #13285 from owncloud/fix-encryption-check-number-of-partsMorris Jobke2015-01-121-0/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Check array size, before using the 3rd element from it
| * | | | | | | | | Check array size, before using the 3rd element from itJoas Schilling2015-01-121-0/+9
| | | | | | | | | |
* | | | | | | | | | Merge pull request #13282 from owncloud/occ-user-warningMorris Jobke2015-01-121-0/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | Check for current user to have the same id then the owner of the config ...
| * | | | | | | | | Check for current user to have the same id then the owner of the config file ↵Thomas Müller2015-01-121-0/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixes #12307
* | | | | | | | | Merge pull request #13279 from owncloud/upload-original-nameMorris Jobke2015-01-121-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Send the proper original name for uploaded files
| * | | | | | | | | Send the proper original name for uploaded filesRobin Appelman2015-01-121-2/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13280 from owncloud/fix-12306Morris Jobke2015-01-122-2/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | fix retrieval of user groups
| * | | | | | | | fix retrieval of user groupsArthur Schiwon2015-01-122-2/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #13210 from owncloud/use-issetMorris Jobke2015-01-121-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Check for existence of $_GET keys
| * | | | | | | Check for existence of $_GET keysLukas Reschke2015-01-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise PHP errors are thrown in the error log.
* | | | | | | | Merge pull request #13268 from owncloud/dnd-files-containerLukas Reschke2015-01-121-1/+10
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Allow dropping files on the table container
| * | | | | | | Allow dropping files on the table containerVincent Petry2015-01-121-1/+10
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to drop files below the table even if the table is smaller than the window height. Added a check to make sure upload is not triggered on invisible lists.
* | | | | | | Merge pull request #13182 from owncloud/download_versionsBjörn Schießle2015-01-1210-146/+396
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | make versions of shared files downloadable
| * | | | | | make versions of shared files downloadableBjoern Schiessle2015-01-0910-146/+396
| | | | | | |
* | | | | | | Merge pull request #13254 from owncloud/fixsharel10nThomas Müller2015-01-122-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | make Share/Download buttons localized again
| * | | | | | | make Share button localized againVolkan Gezer2015-01-112-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | it seems we have forgotten to use named FileAction
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-12326-398/+290
| | | | | | |
* | | | | | | Merge pull request #13257 from owncloud/fixrmpermThomas Müller2015-01-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | l10n: delete permanently fix
| * | | | | | | l10n: delete permanently fixVolkan Gezer2015-01-111-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #13256 from owncloud/versionupThomas Müller2015-01-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | version up
| * | | | | | | version upVolkan Gezer2015-01-111-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #13251 from owncloud/spaceoutsideVolkan Gezer2015-01-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | keep spaces out of translation
| * | | | | | | keep spaces out of translationVolkan Gezer2015-01-111-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | otherwise translators cannot notice it on Transifex
* | | | | | | Merge pull request #13250 from owncloud/bittypoVolkan Gezer2015-01-111-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 32-bit typo fix
| * | | | | | | 32-bit typo fixVolkan Gezer2015-01-111-3/+3
| |/ / / / / /
* / / / / / / suggestion by transifex translatorVolkan Gezer2015-01-111-1/+1
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1132-54/+98
| | | | | |
* | | | | | 8.0.0 alpha 2v8.0.0alpha2Frank Karlitschek2015-01-111-2/+2
| | | | | |
* | | | | | Merge pull request #13226 from owncloud/fix-encodingVolkan Gezer2015-01-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't double encode string
| * | | | | | Don't double encode stringLukas Reschke2015-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already use `.text()` here which automatically properly encodes the string. Thus the string will be double-encoded and look ugly. (i.e. when you search for ">" you will see "No results found for >") Fixes itself.