Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | allow admin to disable sharing for specific groups of users | Bjoern Schiessle | 2014-05-22 | 7 | -15/+121 |
* | Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible | Björn Schießle | 2014-05-21 | 9 | -78/+421 |
|\ | |||||
| * | move the mount point up if a share is mounted to a subfolder and the subfolde... | Bjoern Schiessle | 2014-05-21 | 9 | -78/+421 |
* | | Merge pull request #8612 from owncloud/share-updateshareiconsafterrename | Björn Schießle | 2014-05-21 | 2 | -35/+73 |
|\ \ | |/ |/| | |||||
| * | Fixed issues with renaming | Vincent Petry | 2014-05-16 | 2 | -35/+73 |
* | | Merge pull request #8646 from owncloud/publicshare-fixes | Björn Schießle | 2014-05-21 | 3 | -24/+31 |
|\ \ | |||||
| * | | Fixed JS issues in public page | Vincent Petry | 2014-05-20 | 2 | -23/+30 |
| * | | Fixed download URL in public page | Vincent Petry | 2014-05-20 | 1 | -1/+1 |
* | | | Merge pull request #8637 from owncloud/enc_improved_error_handling | Vincent Petry | 2014-05-21 | 2 | -3/+49 |
|\ \ \ | |/ / |/| | | |||||
| * | | only start migration if the encryption was initialized; allow to overwrite ke... | Bjoern Schiessle | 2014-05-19 | 2 | -3/+49 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-20 | 10 | -7/+48 |
* | | | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 52 | -365/+365 |
* | | | Merge pull request #8435 from owncloud/fix-8322-master | Thomas Müller | 2014-05-19 | 2 | -13/+15 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix broken unit test | Thomas Müller | 2014-05-02 | 1 | -1/+11 |
| * | | - Introduce isShared() and isMounted() on FileInfo class | Thomas Müller | 2014-05-02 | 1 | -13/+4 |
* | | | Merge pull request #8585 from owncloud/phpdoc-improvements-apps | Andreas Fischer | 2014-05-19 | 43 | -342/+338 |
|\ \ \ | |||||
| * | | | Fix whitespace issues | Robin McCorkell | 2014-05-16 | 16 | -69/+69 |
| * | | | Reduce double-space with single-space. | Andreas Fischer | 2014-05-16 | 1 | -1/+1 |
| * | | | Remove spaces around | operator in doc block. | Andreas Fischer | 2014-05-16 | 1 | -1/+1 |
| * | | | Fix more missing or broken PHPDoc | Robin McCorkell | 2014-05-16 | 10 | -22/+20 |
| * | | | PHPDoc fixes for user_ldap | Robin McCorkell | 2014-05-16 | 7 | -29/+29 |
| * | | | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 31 | -241/+239 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-19 | 4 | -0/+11 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-18 | 59 | -0/+115 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-17 | 165 | -158/+130 |
|/ / / | |||||
* | | | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links | Björn Schießle | 2014-05-16 | 1 | -0/+54 |
|\ \ \ | |||||
| * | | | use default expire date only for link shares | Bjoern Schiessle | 2014-05-16 | 1 | -0/+54 |
* | | | | 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 |
|/ / |