Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-25 | 7 | -14/+48 |
| | |||||
* | adjust access constructor to master | Arthur Schiwon | 2014-06-25 | 2 | -2/+10 |
| | |||||
* | Port of LDAP Wizard: get correct total no of users, groups and complete ↵ | Arthur Schiwon | 2014-06-25 | 4 | -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-phpwarningondelete | Vincent Petry | 2014-06-24 | 1 | -5/+2 |
|\ | | | | | Remove warning when deleting all entries | ||||
| * | Merge if statements | Joas Schilling | 2014-06-23 | 1 | -6/+2 |
| | | |||||
| * | Remove warning when deleting all entries | Vincent Petry | 2014-06-23 | 1 | -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 tests | Bjoern Schiessle | 2014-06-24 | 2 | -2/+30 |
| | | |||||
* | | always use '/' as directory seperator | Bjoern Schiessle | 2014-06-24 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-24 | 6 | -3/+34 |
| | | |||||
* | | Merge pull request #9074 from geez0x1/master | Morris Jobke | 2014-06-23 | 1 | -1/+1 |
|\ \ | | | | | | | Update the modified date in UI on file reversion | ||||
| * | | Update the modified date in UI on file reversion | geez0x1 | 2014-06-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9170 from owncloud/files-renamevalidationblur | Lukas Reschke | 2014-06-23 | 2 | -4/+53 |
|\ \ \ | | | | | | | | | Fix blurring of invalid file name on rename | ||||
| * | | | Fix blurring of invalid file name on rename | Vincent Petry | 2014-06-23 | 2 | -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-permissions | Vincent Petry | 2014-06-23 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | Fix moving files into read only public shares | ||||
| * | | | Dont allow opening writable streams on a read only dav mount | Robin Appelman | 2014-06-23 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #8931 from owncloud/filelist-usepathforaction | Vincent Petry | 2014-06-23 | 4 | -4/+9 |
|\ \ \ \ | |_|/ / |/| | | | [master] Use actual file path on rename/delete | ||||
| * | | | Use actual file path on rename/delete | Vincent Petry | 2014-06-06 | 4 | -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-unselectafterdelete | icewind1991 | 2014-06-23 | 2 | -1/+35 |
|\ \ \ \ | | | | | | | | | | | Clear file selection when list is repopulated | ||||
| * | | | | Clear file selection when list is repopulated | Vincent Petry | 2014-06-23 | 2 | -1/+35 |
| | |/ / | |/| | | | | | | | | | | | | | | When calling FileList.setFiles() the current selection needs to be cleared. | ||||
* / | | | Setup the external share manager in a hook | Vincent Petry | 2014-06-23 | 2 | -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 transifex | Jenkins for ownCloud | 2014-06-23 | 4 | -4/+12 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-22 | 4 | -8/+29 |
| | | | |||||
* | | | Merge pull request #9120 from owncloud/fileactions-filelistfallback | Morris Jobke | 2014-06-21 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fixed file actions fallback | ||||
| * | | | Fixed file actions fallback | Vincent Petry | 2014-06-20 | 1 | -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 transifex | Jenkins for ownCloud | 2014-06-21 | 2 | -2/+14 |
| | | | | |||||
* | | | | Backport subset of #4179, re-established Oracle compatibility for LDAP | Arthur Schiwon | 2014-06-20 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/lib/access.php | ||||
* | | | | Merge pull request #9108 from owncloud/uploadintofolderfix | Morris Jobke | 2014-06-20 | 5 | -69/+59 |
|\ \ \ \ | |/ / / |/| | | | Fix many issues with drag and drop upload | ||||
| * | | | Fix appending of rows after upload | Vincent Petry | 2014-06-19 | 2 | -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 folder | Vincent Petry | 2014-06-19 | 4 | -29/+26 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-20 | 3 | -3/+33 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-19 | 80 | -13/+254 |
| | | | | |||||
* | | | | Merge pull request #9071 from owncloud/extstorage-list-unittests | Morris Jobke | 2014-06-19 | 2 | -0/+253 |
|\ \ \ \ | | | | | | | | | | | Added JS unit tests for ext storage | ||||
| * | | | | Added JS unit tests for ext storage | Vincent Petry | 2014-06-17 | 2 | -0/+253 |
| | | | | | | | | | | | | | | | | | | | | Added JS unit tests for the external storage file list extension. | ||||
* | | | | | Merge pull request #9093 from owncloud/remove_unused_code | Morris Jobke | 2014-06-19 | 7 | -12/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | remove unused code | ||||
| * | | | | | remove unused code | Bjoern Schiessle | 2014-06-18 | 6 | -12/+7 |
| | | | | | | |||||
| * | | | | | initialize array | Bjoern Schiessle | 2014-06-18 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #9068 from owncloud/trashbin_unittests_master | Björn Schießle | 2014-06-18 | 7 | -36/+391 |
|\ \ \ \ \ | |/ / / / |/| | | | | fix trash bin expire operation and add unit tests | ||||
| * | | | | adjust encryption tests to the trash bin changes | Bjoern Schiessle | 2014-06-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add additional tests for the trash bin | Bjoern Schiessle | 2014-06-18 | 2 | -9/+132 |
| | | | | | |||||
| * | | | | make sure that we always use the right user | Bjoern Schiessle | 2014-06-18 | 6 | -26/+27 |
| | | | | | |||||
| * | | | | fix trash bin expire operation and add unit tests | Bjoern Schiessle | 2014-06-17 | 2 | -22/+253 |
| | | | | | |||||
* | | | | | fix rename of encryption keys | Bjoern Schiessle | 2014-06-18 | 2 | -8/+9 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-18 | 7 | -8/+15 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #8399 from owncloud/server-server-sharing | icewind1991 | 2014-06-17 | 32 | -44/+1105 |
|\ \ \ \ | | | | | | | | | | | Add server<->server sharing | ||||
| * | | | | Fix moving movablemount over webdav | Robin Appelman | 2014-06-17 | 3 | -3/+6 |
| | | | | | |||||
| * | | | | organize js a bit better | Robin Appelman | 2014-06-17 | 2 | -47/+69 |
| | | | | | |||||
| * | | | | Better error handeling in testremote | Robin Appelman | 2014-06-17 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | testremote is for public access | Robin Appelman | 2014-06-17 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | fix broken buttons for IE8-11 | Morris Jobke | 2014-06-17 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fixing layout issue - mostly alignment | Morris Jobke | 2014-06-17 | 1 | -0/+20 |
| | | | | |