Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #8604 from owncloud/sharing_encforce_password | Björn Schießle | 2014-05-16 | 2 | -7/+66 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | allow admin to enforce passwords for public link shares | Bjoern Schiessle | 2014-05-16 | 2 | -7/+66 | |
* | | | | Merge pull request #8610 from owncloud/ie8-filesdndbug | Vincent Petry | 2014-05-16 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix drag and drop in IE8 | Vincent Petry | 2014-05-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #6260 from owncloud/jan-navigation-filesidebar | Vincent Petry | 2014-05-16 | 38 | -3022/+4198 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fixed many issues, clean up | Vincent Petry | 2014-05-15 | 28 | -276/+535 | |
| * | | | | Namespacing for FileList, FileActions and trashbin app | Vincent Petry | 2014-05-15 | 35 | -2940/+3687 | |
| * | | | | Files app navigation can now switch | Vincent Petry | 2014-05-15 | 7 | -7/+118 | |
| * | | | | Added navigation manager in files app for the sidebar | Vincent Petry | 2014-05-15 | 7 | -60/+70 | |
| * | | | | Added app navigation for files app | Vincent Petry | 2014-05-15 | 7 | -3/+52 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-16 | 73 | -66/+167 | |
|/ / / / | ||||||
* | / / | Fixed trashbin to use correct class | Vincent Petry | 2014-05-15 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #8589 from fibsifan/files_external_sftp_port | Robin McCorkell | 2014-05-15 | 1 | -4/+4 | |
|\ \ \ | ||||||
| * | | | 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 | |
|\ \ | ||||||
| * | | Set row height in files table | Bagera | 2014-05-14 | 1 | -2/+2 | |
| * | | fixes #7949 | Bagera | 2014-05-13 | 1 | -1/+1 | |
* | | | [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 | 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 so that the user | Bjoern Schiessle | 2014-05-13 | 2 | -2/+13 | |
* | | | 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 | |
|\ \ \ | ||||||
| * | | | 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 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 | |
| * | | | Use proper PHPDoc and variable names in the LDAP lib | Lukas Reschke | 2014-05-11 | 12 | -378/+683 | |
* | | | | Merge pull request #8041 from owncloud/files-sortcolumns | Vincent Petry | 2014-05-12 | 12 | -74/+507 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
| * | | | | 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 | |
| |/ / / |/| | | | ||||||
* | | | | [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 | Jörn Friedrich Dreyer | 2014-05-09 | 1 | -45/+61 |