summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-14168-12/+410
|
* Fix PHP doc and enforce typeLukas Reschke2015-01-131-3/+3
|
* Merge pull request #13277 from owncloud/pasteurlJoas Schilling2015-01-131-1/+1
|\ | | | | add https:// placeholder for From Link feature. closes #13255
| * add https:// placeholder for From Link feature. closes #13255Volkan Gezer2015-01-121-1/+1
| |
* | 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-13186-246/+326
| | |
* | | 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 #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-12272-270/+250
| | | | |
* | | | | l10n: delete permanently fixVolkan 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
* / / / / suggestion by transifex translatorVolkan Gezer2015-01-111-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1112-26/+38
| | | |
* | | | 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.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1028-18/+84
|/ / / /
* | | | Merge pull request #13204 from owncloud/enc_fix_key_lostVincent Petry2015-01-092-630/+714
|\ \ \ \ | |_|/ / |/| | | Encryption fix key lost if group share gets renamed
| * | | unit testsBjoern Schiessle2015-01-091-4/+86
| | | |
| * | | don't move encryption keys if a mount point was renamedBjoern Schiessle2015-01-091-626/+628
| | | |
* | | | Merge pull request #13188 from owncloud/add-check-if-user-is-logged-inThomas Müller2015-01-092-0/+3
|\ \ \ \ | |/ / / |/| | | Add check if user is logged-in
| * | | Add check if user is logged-inLukas Reschke2015-01-092-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise a fatal PHP error is thrown since the filesystem is not setup: ``` ( ! ) Fatal error: Call to a member function getOwner() on null in /Users/lreschke/Programming/core/lib/private/files/filesystem.php on line 817 Call Stack 1 0.0004 247792 {main}( ) ../index.php:0 2 0.0946 5088776 OC::handleRequest( ) ../index.php:28 3 0.1423 7491280 OC\Route\Router->match( ) ../base.php:748 4 0.1664 8592152 call_user_func:{/Users/lreschke/Programming/core/lib/private/route/router.php:250} ( ) ../router.php:250 5 0.1664 8592216 __lambda_func( ) ../router.php:250 6 0.1665 8599064 require_once( '/Users/lreschke/Programming/core/apps/files_versions/ajax/getVersions.php' ) ../route.php(135) : runtime-created function:1 7 0.1801 9061096 OCA\Files_Versions\Storage::getUidAndFilename( ) ../getVersions.php:7 8 0.1801 9061144 OC\Files\Filesystem::getOwner( ) ../storage.php:45 ``` Furthermore this adds the CSRF check as a nice-to-have addition, the requests accessing this are done via the jQuery AJAX methods and thus the header is automatically added to all requests already.
* | | fix rename field position, fix #12927Jan-Christoph Borchardt2015-01-091-2/+6
| | |
* | | Merge pull request #12984 from owncloud/ldap-user-cleanup-masterLukas Reschke2015-01-0936-190/+1411
|\ \ \ | | | | | | | | Ldap user cleanup master
| * | | fix order of initalizing instance properties, and paremeter order in a ↵Arthur Schiwon2015-01-081-10/+12
| | | | | | | | | | | | | | | | method call
| * | | fix table name for getListArthur Schiwon2015-01-081-2/+2
| | | |
| * | | doc fixes and removal of unnecessary use statementsArthur Schiwon2015-01-075-10/+6
| | | |
| * | | add test for mapping's getList methodArthur Schiwon2015-01-071-0/+24
| | | |
| * | | inject DB Connection to user managerArthur Schiwon2015-01-0710-87/+94
| | | |
| * | | inject IDateTimeFormatter to show-remnants commandArthur Schiwon2015-01-062-4/+11
| | | |
| * | | inject oc config to User_LDAPArthur Schiwon2015-01-069-53/+89
| | | |