Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Files app navigation can now switch | Vincent Petry | 2014-05-15 | 7 | -7/+118 |
| | | | | | | | | | - added new OCA.Files namespace for files classes - the sidebar can now switch between views/containers - the trashbin renders in its own container but currently doesn't work due to overrides - added app.js as entry point for JS code (ideally all other files should only contain classes and not trigger anything) | ||||
* | Added navigation manager in files app for the sidebar | Vincent Petry | 2014-05-15 | 7 | -60/+70 |
| | | | | | | | Apps can now register navigation items into the sidebar of the files app. For every sidebar item there is a container. The container's content is rendered based on the script name given at registration time. | ||||
* | Added app navigation for files app | Vincent Petry | 2014-05-15 | 7 | -3/+52 |
| | | | | | | - Added links to trashbin and shared dir - Moved "WebDAV" settings block to the app nav's settings section - Added sidebar support in trashbin app as well | ||||
* | Fixed trashbin to use correct class | Vincent Petry | 2014-05-15 | 1 | -1/+1 |
| | | | | | It seems that \OC_Filesystemview has been removed. Now using the correct class \OC\Files\View() | ||||
* | Merge pull request #8589 from fibsifan/files_external_sftp_port | Robin McCorkell | 2014-05-15 | 1 | -4/+4 |
|\ | | | | | rename URL-fields to Host for SFTP/FTP and SMB external Storage backends | ||||
| * | changing label "URL" to "Host" | fibsifan | 2014-05-15 | 1 | -4/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-15 | 4 | -1/+19 |
|/ | |||||
* | Merge pull request #8584 from Bagera/master | jbtbnl | 2014-05-14 | 1 | -1/+1 |
|\ | | | | | avoid row resize on filename edit | ||||
| * | Set row height in files table | Bagera | 2014-05-14 | 1 | -2/+2 |
| | | | | | | | | Sets row height to avoid resize when name is edited | ||||
| * | fixes #7949 | Bagera | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | Sets height to form to avoid resizing when filename link is not shown | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-14 | 3 | -8/+93 |
| | | |||||
* | | Merge pull request #8582 from owncloud/remove-outdated-update-sc | Lukas Reschke | 2014-05-14 | 1 | -46/+0 |
|\ \ | | | | | | | We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0 | ||||
| * | | We do not support updates from 4.5 > 7.0 | Lukas Reschke | 2014-05-13 | 1 | -46/+0 |
| |/ | |||||
* | | @returns -> @return | Thomas Müller | 2014-05-13 | 3 | -12/+12 |
| | | |||||
* | | @breif -> @brief | Thomas Müller | 2014-05-13 | 2 | -3/+3 |
|/ | |||||
* | Merge pull request #8398 from owncloud/enc_backup_keys | Björn Schießle | 2014-05-13 | 2 | -2/+13 |
|\ | | | | | backup the encryption key after the encryption was disabled | ||||
| * | backup the encryption key after the encryption was disabled so that the user | Bjoern Schiessle | 2014-05-13 | 2 | -2/+13 |
| | | | | | | | | can restore them if needed | ||||
* | | Extract mount point merging logic into separate function | Robin McCorkell | 2014-05-13 | 1 | -11/+25 |
| | | |||||
* | | Merge pull request #8556 from owncloud/kill-legacy-code-master | Thomas Müller | 2014-05-12 | 27 | -94/+94 |
|\ \ | | | | | | | Kill legacy code master | ||||
| * | | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 24 | -86/+86 |
| | | | |||||
| * | | remove legacy aka deprecated code: OC_Cache | Thomas Müller | 2014-05-12 | 2 | -2/+2 |
| | | | |||||
| * | | remove legacy aka deprecated code: OC_Filesystem | Thomas Müller | 2014-05-12 | 4 | -6/+6 |
| | | | |||||
* | | | Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap | Lukas Reschke | 2014-05-12 | 13 | -384/+689 |
|\ \ \ | |/ / |/| | | Use proper PHPDoc and variable names in the LDAP lib | ||||
| * | | Use array as type | Lukas Reschke | 2014-05-12 | 1 | -1/+1 |
| | | | |||||
| * | | That's bool and not always true | Lukas Reschke | 2014-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | Use WizardResult|false instead of mixed | Lukas Reschke | 2014-05-11 | 1 | -2/+2 |
| | | | |||||
| * | | Use @return instead of @returns | Lukas Reschke | 2014-05-11 | 3 | -9/+9 |
| | | | |||||
| * | | Fix Typo | Lukas Reschke | 2014-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | I guess that should be `default` and not `defautl`, wondering how this ever worked. | ||||
| * | | Use proper PHPDoc and variable names in the LDAP lib | Lukas Reschke | 2014-05-11 | 12 | -378/+683 |
| | | | | | | | | | | | | My IDE was so sad about this that it marked the whole file in red and yellow and forced me to fix this. | ||||
* | | | Merge pull request #8041 from owncloud/files-sortcolumns | Vincent Petry | 2014-05-12 | 12 | -74/+507 |
|\ \ \ | | | | | | | | | File list sorting by clicking on column headers | ||||
| * | | | Clear selection on reload (when changing sort) | Vincent Petry | 2014-04-29 | 2 | -2/+9 |
| | | | | |||||
| * | | | typos, indentation and remove of unused code | Thomas Müller | 2014-04-28 | 3 | -7/+7 |
| | | | | |||||
| * | | | html input tag has no closing tag | Thomas Müller | 2014-04-28 | 1 | -2/+3 |
| | | | | |||||
| * | | | $RUNTIME_APPTYPES is no longer used - left over from pre OC4 | Thomas Müller | 2014-04-28 | 1 | -5/+0 |
| | | | | |||||
| * | | | Added unit test in files app for sort function in helper class | Vincent Petry | 2014-04-28 | 2 | -6/+113 |
| | | | | | | | | | | | | | | | | | | | | Added unit test for the Helper class in the files app that tests the different sort orders. | ||||
| * | | | Set default sort of trashbin to timestamp descending | Vincent Petry | 2014-04-28 | 2 | -4/+2 |
| | | | | |||||
| * | | | Add sorting to files list, trashbin and public files | Vincent Petry | 2014-04-28 | 10 | -57/+382 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-12 | 7 | -4/+29 |
| | | | | |||||
* | | | | $owner is not defined here | Lukas Reschke | 2014-05-11 | 1 | -1/+1 |
| |/ / |/| | | | | | Fixes https://github.com/owncloud/core/issues/8539 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-11 | 4 | -5/+8 |
| | | | |||||
* | | | Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload | Lukas Reschke | 2014-05-10 | 1 | -45/+61 |
|\ \ \ | | | | | | | | | polish jslint for files-upload.js | ||||
| * | | | polish jslint for files-upload.js | Jörn Friedrich Dreyer | 2014-05-09 | 1 | -45/+61 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-10 | 14 | -0/+104 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-09 | 4 | -1/+38 |
| | | | |||||
* | | | Merge pull request #8499 from owncloud/shareextstoragemountpointfix | Vincent Petry | 2014-05-08 | 2 | -6/+61 |
|\ \ \ | | | | | | | | | Fix sharing of ext storage mount points | ||||
| * | | | Added unit test for sharing ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -2/+55 |
| | | | | |||||
| * | | | Fix sharing of ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -4/+6 |
| | |/ | |/| | | | | | | | | | | When sharing an ext storage mount point, it will now use the name of the mount point instead of an empty string for the target path. | ||||
* | | | Merge pull request #8293 from owncloud/files_external_fix_readData | Vincent Petry | 2014-05-08 | 1 | -19/+18 |
|\ \ \ | | | | | | | | | Fix issue with personal mount points and sharing | ||||
| * | | | Permit personal mount points to be used for sharing | Robin McCorkell | 2014-04-21 | 1 | -19/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An issue existed where `readData` used `OCP\User::getUser()` to get the user for personal mount points, which worked in all situations apart from when a personal mount point was used for sharing, so the return from `getUser()` is not the user that owns the share. As such, any personal mount points would not work correctly when shared. `readData` and `writeData` have been changed from using a `$isPersonal` boolean to using a `$user` string|null. `$isPersonal = false` can now be written as `$user = NULL` (or left out in the case of `readData`), and `$isPersonal = true` can be written as `$user = OCP\User::getUser()`. | ||||
* | | | | Merge pull request #8221 from owncloud/type-hinting-sharing | Vincent Petry | 2014-05-08 | 3 | -2/+13 |
|\ \ \ \ | | | | | | | | | | | Type hinting fixes for sharing |