Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent loading apps in remote when an upgrade is due | Vincent Petry | 2014-06-25 | 1 | -0/+9 |
| | |||||
* | Merge pull request #9145 from owncloud/everyonecount | blizzz | 2014-06-24 | 2 | -1/+4 |
|\ | | | | | Enhancement: Displays users and admin count in the Users Management. | ||||
| * | Better Logic to display user count for everyone. | raghunayyar | 2014-06-24 | 2 | -1/+4 |
| | | |||||
* | | 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. | ||||
* | | | Merge pull request #9180 from owncloud/fix-error-on.update-page | Vincent Petry | 2014-06-24 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | fixes the layout for error messages on the update page | ||||
| * | | | fixes the layout for error messages on the update page | Morris Jobke | 2014-06-24 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #9181 from owncloud/enc_recursive_mkdir | Morris Jobke | 2014-06-24 | 2 | -3/+31 |
|\ \ \ \ | |/ / / |/| | | | always use '/' as directory seperator | ||||
| * | | | 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 | 34 | -325/+382 |
| | | | |||||
* | | | 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 #9158 from owncloud/no-recursion-on-rmdirr-master | Thomas Müller | 2014-06-23 | 2 | -6/+35 |
|\ \ \ \ | | | | | | | | | | | fix recursion on rmdirr | ||||
| * | | | | update PHPDoc $fileInfo is a SplFileInfo | Thomas Müller | 2014-06-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added unit test for the helper's rmdirr | Vincent Petry | 2014-06-23 | 1 | -0/+24 |
| | | | | | |||||
| * | | | | dir itself has to be removed as well | Thomas Müller | 2014-06-23 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fix recursion on rmdirr | Thomas Müller | 2014-06-23 | 1 | -7/+11 |
| | | | | | |||||
* | | | | | 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 #9159 from owncloud/enabledapp-cache-loggedin | Joas Schilling | 2014-06-23 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Only cache enabled apps when logged in | ||||
| * | | | | | Add comment | Robin Appelman | 2014-06-23 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Only cache enabled apps when logged in | Robin Appelman | 2014-06-23 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | 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 #8974 from owncloud/router-preventloadappsonupgrade | Vincent Petry | 2014-06-23 | 4 | -14/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Prevent loadApps on upgrade | ||||
| * | | | | | | Prevent loadApps on upgrade | Vincent Petry | 2014-06-18 | 4 | -14/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible form the router. Moved maintenance + upgrade check to the router. | ||||
* | | | | | | | 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. | ||||
* | | | | | | Merge pull request #9150 from owncloud/remoteshare-fixsetuporder | Frank Karlitschek | 2014-06-23 | 2 | -9/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Setup the external share manager in a hook | ||||
| * | | | | | 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. | ||||
* | | | | | trusted domains shall not be ignored on autosetup | Arthur Schiwon | 2014-06-23 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | Merge pull request #9138 from owncloud/fix-documentation | Vincent Petry | 2014-06-23 | 1 | -1/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Add explanation about the current implementation of updateApp | ||||
| * | | | | | Add explanation about the current implementation of updateApp | Bart Visscher | 2014-06-22 | 1 | -1/+5 |
| | |_|_|/ | |/| | | | |||||
* / | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-23 | 30 | -155/+175 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-22 | 29 | -137/+173 |
| | | | | |||||
* | | | | 7.0.0 alpha 2v7.0.0alpha2 | Frank Karlitschek | 2014-06-21 | 1 | -2/+2 |
| | | | | |||||
* | | | | 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 | 21 | -132/+146 |
| | | | | | |||||
* | | | | | Merge pull request #9121 from owncloud/filepicker-avoidtwice | Morris Jobke | 2014-06-20 | 1 | -0/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Prevent showing the file picker twice | ||||
| * | | | | | Prevent showing the file picker twice | Vincent Petry | 2014-06-20 | 1 | -0/+7 |
| |/ / / / | | | | | | | | | | | | | | | | In case the filepicker function is called twice, only show it once. | ||||
* | | | | | Merge pull request #9102 from owncloud/viewermode-controls | Morris Jobke | 2014-06-20 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed controls bar in viewer mode | ||||
| * | | | | | Fixed controls bar in viewer mode | Vincent Petry | 2014-06-18 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | 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. |