summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-257-14/+48
|
* adjust access constructor to masterArthur Schiwon2014-06-252-2/+10
|
* Port of LDAP Wizard: get correct total no of users, groups and complete ↵Arthur Schiwon2014-06-254-70/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list of groups on big setups #9002 fix PHPdoc Conflicts: apps/user_ldap/lib/connection.php add method to count groups on LDAP Conflicts: apps/user_ldap/lib/access.php LDAP Wizard: count users and groups with the power of paged search Conflicts: apps/user_ldap/lib/wizard.php consolidate requirement check fix PHPdoc Conflicts: apps/user_ldap/lib/access.php Wizard: get really all groups from LDAP by power of Paged Search Conflicts: apps/user_ldap/lib/wizard.php make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state. Conflicts: apps/user_ldap/lib/connection.php simplify two methods a bit, because they are not used for group search anymore Conflicts: apps/user_ldap/lib/wizard.php remove unused vars; increase scrutinizer happiness
* Merge pull request #9168 from owncloud/files-phpwarningondeleteVincent Petry2014-06-241-5/+2
|\ | | | | Remove warning when deleting all entries
| * Merge if statementsJoas Schilling2014-06-231-6/+2
| |
| * Remove warning when deleting all entriesVincent Petry2014-06-231-1/+2
| | | | | | | | | | When deleting all entries, only "allfiles" is defined but not "file" or "files", which caused a PHP warning to be logged.
* | add unit testsBjoern Schiessle2014-06-242-2/+30
| |
* | always use '/' as directory seperatorBjoern Schiessle2014-06-241-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-246-3/+34
| |
* | Merge pull request #9074 from geez0x1/masterMorris Jobke2014-06-231-1/+1
|\ \ | | | | | | Update the modified date in UI on file reversion
| * | Update the modified date in UI on file reversiongeez0x12014-06-171-1/+1
| | |
* | | Merge pull request #9170 from owncloud/files-renamevalidationblurLukas Reschke2014-06-232-4/+53
|\ \ \ | | | | | | | | Fix blurring of invalid file name on rename
| * | | Fix blurring of invalid file name on renameVincent Petry2014-06-232-4/+53
| | |/ | |/| | | | | | | | | | | | | | | | | | | When renaming to an existing file name, blurring the field should not remove it. This fix keeps the field until escape is pressed instead of replacing it with a broken empty space.
* | | Merge pull request #9124 from owncloud/move-permissionsVincent Petry2014-06-231-0/+6
|\ \ \ | | | | | | | | Fix moving files into read only public shares
| * | | Dont allow opening writable streams on a read only dav mountRobin Appelman2014-06-231-0/+6
| | | |
* | | | Merge pull request #8931 from owncloud/filelist-usepathforactionVincent Petry2014-06-234-4/+9
|\ \ \ \ | |_|/ / |/| | | [master] Use actual file path on rename/delete
| * | | Use actual file path on rename/deleteVincent Petry2014-06-064-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When renaming or deleting a file that is in a subdirectory, performing the action from the sharing overview or another file list view, the actual directory of the file must be used instead of the current directory.
* | | | Merge pull request #9153 from owncloud/files-unselectafterdeleteicewind19912014-06-232-1/+35
|\ \ \ \ | | | | | | | | | | Clear file selection when list is repopulated
| * | | | Clear file selection when list is repopulatedVincent Petry2014-06-232-1/+35
| | |/ / | |/| | | | | | | | | | | | | | When calling FileList.setFiles() the current selection needs to be cleared.
* / | | Setup the external share manager in a hookVincent Petry2014-06-232-9/+12
|/ / / | | | | | | | | | | | | | | | To make sure the external shares are initialized in the right order and make sure the session is correctly initialized before, the external share manager is now set up in a filesystem setup hook.
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-234-4/+12
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-224-8/+29
| | |
* | | Merge pull request #9120 from owncloud/fileactions-filelistfallbackMorris Jobke2014-06-211-1/+3
|\ \ \ | | | | | | | | Fixed file actions fallback
| * | | Fixed file actions fallbackVincent Petry2014-06-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps are calling FileActions.display() directly but omit the new fileList argument. This fix makes the fileList argument correctly fall back to the default file list (the one from the "All files" section)
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-212-2/+14
| | | |
* | | | Backport subset of #4179, re-established Oracle compatibility for LDAPArthur Schiwon2014-06-202-2/+3
| | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/lib/access.php
* | | | Merge pull request #9108 from owncloud/uploadintofolderfixMorris Jobke2014-06-205-69/+59
|\ \ \ \ | |/ / / |/| | | Fix many issues with drag and drop upload
| * | | Fix appending of rows after uploadVincent Petry2014-06-192-40/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files or folders, they only need to be appended or updated when their path or a section of their path is inside the current directory (which happens for folder upload) Fixes issue where file was appended when dragging on a parent directory onto the breadcrumb. Fixes appending issue when uploading folders.
| * | | Fixed uploading by drag and drop into folderVincent Petry2014-06-194-29/+26
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-203-3/+33
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1980-13/+254
| | | |
* | | | Merge pull request #9071 from owncloud/extstorage-list-unittestsMorris Jobke2014-06-192-0/+253
|\ \ \ \ | | | | | | | | | | Added JS unit tests for ext storage
| * | | | Added JS unit tests for ext storageVincent Petry2014-06-172-0/+253
| | | | | | | | | | | | | | | | | | | | Added JS unit tests for the external storage file list extension.
* | | | | Merge pull request #9093 from owncloud/remove_unused_codeMorris Jobke2014-06-197-12/+8
|\ \ \ \ \ | | | | | | | | | | | | remove unused code
| * | | | | remove unused codeBjoern Schiessle2014-06-186-12/+7
| | | | | |
| * | | | | initialize arrayBjoern Schiessle2014-06-181-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #9068 from owncloud/trashbin_unittests_masterBjörn Schießle2014-06-187-36/+391
|\ \ \ \ \ | |/ / / / |/| | | | fix trash bin expire operation and add unit tests
| * | | | adjust encryption tests to the trash bin changesBjoern Schiessle2014-06-181-1/+1
| | | | |
| * | | | add additional tests for the trash binBjoern Schiessle2014-06-182-9/+132
| | | | |
| * | | | make sure that we always use the right userBjoern Schiessle2014-06-186-26/+27
| | | | |
| * | | | fix trash bin expire operation and add unit testsBjoern Schiessle2014-06-172-22/+253
| | | | |
* | | | | fix rename of encryption keysBjoern Schiessle2014-06-182-8/+9
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-187-8/+15
| |_|_|/ |/| | |
* | | | Merge pull request #8399 from owncloud/server-server-sharingicewind19912014-06-1732-44/+1105
|\ \ \ \ | | | | | | | | | | Add server<->server sharing
| * | | | Fix moving movablemount over webdavRobin Appelman2014-06-173-3/+6
| | | | |
| * | | | organize js a bit betterRobin Appelman2014-06-172-47/+69
| | | | |
| * | | | Better error handeling in testremoteRobin Appelman2014-06-171-3/+7
| | | | |
| * | | | testremote is for public accessRobin Appelman2014-06-171-1/+0
| | | | |
| * | | | fix broken buttons for IE8-11Morris Jobke2014-06-171-0/+1
| | | | |
| * | | | fixing layout issue - mostly alignmentMorris Jobke2014-06-171-0/+20
| | | | |