Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use DI | Roeland Jago Douma | 2015-08-10 | 4 | -17/+4 |
| | | | | | | | | * Register OCP\Capability\IManager at DIContainer * Add register capabilities to appframework * Register capabilities in DI way * Make unit test pass again * Remove CapabiltiesManager from OCP | ||||
* | Moved core apps to the capabilities manager | Roeland Jago Douma | 2015-08-10 | 15 | -86/+179 |
| | | | | | | | * Files * Files_Sharing * Files_Trashbin * Files_Versions | ||||
* | Merge pull request #14779 from owncloud/use-iterator-directory | Robin McCorkell | 2015-08-07 | 5 | -11/+12 |
|\ | | | | | Use the new IteratorDirectory instead of the fakedir wrapper | ||||
| * | Use the new IteratorDirectory instead of the fakedir wrapper | Robin Appelman | 2015-07-15 | 5 | -11/+12 |
| | | |||||
* | | Merge pull request #18125 from owncloud/filelist-emptycontentduringmask | Jan-Christoph Borchardt | 2015-08-07 | 1 | -0/+1 |
|\ \ | | | | | | | Make sure to hide empty content message when mask is shown | ||||
| * | | Make sure to hide empty content message when mask is shown | Vincent Petry | 2015-08-07 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #13641 from owncloud/cache-storage-status | Vincent Petry | 2015-08-07 | 1 | -2/+10 |
|\ \ \ | | | | | | | | | Store storage availability in database | ||||
| * | | | Store storage availability in database | Robin McCorkell | 2015-07-20 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage status is saved in the database. Failed storages are rechecked every 10 minutes, while working storages are rechecked every request. Using the files_external app will recheck all external storages when the settings page is viewed, or whenever an external storage is saved. | ||||
* | | | | Merge pull request #17680 from owncloud/ftp-rmdir-file | Vincent Petry | 2015-08-06 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | handle rmdir on files for ftp storages | ||||
| * | | | | handle rmdir on files for ftp storages | Robin Appelman | 2015-07-16 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Fix namespace conflict in OC.Encryption JS code | Vincent Petry | 2015-08-06 | 2 | -12/+4 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #18082 from owncloud/share-group-conflict | Vincent Petry | 2015-08-06 | 4 | -23/+50 |
|\ \ \ \ | | | | | | | | | | | Re-use the share entry we have for the shared storage instead of searching for it every time | ||||
| * | | | | just pass the share instead of searching for it | Robin Appelman | 2015-08-05 | 3 | -23/+11 |
| | | | | | |||||
| * | | | | add unit tests for share target conflict with group shares | Robin Appelman | 2015-08-05 | 1 | -0/+39 |
| | | | | | |||||
* | | | | | Merge pull request #16961 from owncloud/hardening-ldap | Jörn Friedrich Dreyer | 2015-08-06 | 3 | -1/+191 |
|\ \ \ \ \ | | | | | | | | | | | | | Hardening home folder retrieval in user_ldap | ||||
| * | | | | | integration tests for hardening user home retrieval | Arthur Schiwon | 2015-08-06 | 1 | -0/+159 |
| | | | | | | |||||
| * | | | | | Only throw exception if on new LDAP setups | Morris Jobke | 2015-07-29 | 2 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this is done by setting enforce_home_folder_naming_rule for the user_ldap app in the app settings | ||||
| * | | | | | Hardening home folder retrieval in user_ldap | Morris Jobke | 2015-07-29 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * if the home folder naming rule is specified it should not fallback to the "use owncloud username as home folder" scenario * this does not allow the mixed setup of users with the attribute and some users without the attribute (which then would fallback to "use owncloud username as home folder" rule) anymore | ||||
* | | | | | | Merge pull request #18077 from owncloud/fix_18055 | Morris Jobke | 2015-08-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Set proper mimetype for directories | ||||
| * | | | | | Set proper mimetype for directories | Roeland Jago Douma | 2015-08-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Use absolute namespace | Lukas Reschke | 2015-08-05 | 2 | -7/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #18024 from owncloud/phpseclib-2.0 | Thomas Müller | 2015-08-04 | 4 | -20/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update phpseclib to 2.0 for increased PHP7 compatibility | ||||
| * | | | | | | Update phpseclib to 2.0 | Andreas Fischer | 2015-08-03 | 4 | -20/+23 |
| | | | | | | | |||||
* | | | | | | | fix infinite loops with propagating etags on reshares | Robin Appelman | 2015-08-03 | 2 | -7/+16 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17989 from owncloud/enc_only_update_file_cache_once | Björn Schießle | 2015-08-03 | 2 | -7/+22 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | only update database on the first run | ||||
| * | | | | | | only update database on the first run (first run = we have a version number ↵ | Bjoern Schiessle | 2015-07-31 | 2 | -7/+22 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | from the old encryption app) | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-01 | 2 | -6/+6 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-31 | 4 | -6/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #17175 from owncloud/add-download-feedback | Morris Jobke | 2015-07-30 | 7 | -12/+116 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add loading spinner to download icon | ||||
| * | | | | | move updateFileActionSpinner to OCA.Files.FileActions | Morris Jobke | 2015-07-22 | 3 | -24/+24 |
| | | | | | | |||||
| * | | | | | refactor this to proper separation of concerns | Morris Jobke | 2015-07-15 | 3 | -19/+39 |
| | | | | | | |||||
| * | | | | | refactoring into proper methods | Morris Jobke | 2015-07-07 | 3 | -57/+34 |
| | | | | | | |||||
| * | | | | | Fix unit tests and introduce better mocks of the HTML | Morris Jobke | 2015-07-07 | 2 | -7/+7 |
| | | | | | | |||||
| * | | | | | Add proper download started feedback | Morris Jobke | 2015-07-07 | 3 | -12/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this code adds a cookie when a special get parameter is set * the content of this get parameter is used as value for the cookie * the cookie expires after 20 seconds * the JS code checks every 500 milliseconds for the cookie -> if the cookie is set the request returned and the download is started | ||||
| * | | | | | Make download status fully visible | Morris Jobke | 2015-07-07 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | Reduce timeout for download spinner to 2 seconds | Morris Jobke | 2015-07-07 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add loading spinner to multi select download button | Morris Jobke | 2015-07-07 | 1 | -0/+20 |
| | | | | | | |||||
| * | | | | | Fix layout of disabled links in the file list | Morris Jobke | 2015-07-07 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | * also disable download button after click | ||||
| * | | | | | Add loading spinner to download icon | Morris Jobke | 2015-07-07 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | * vanishes after 7 seconds | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-30 | 8 | -2/+30 |
| |/ / / / |/| | | | | |||||
* | | | | | use inline confirm button style for password-protected links, ref #15176 | Jan-Christoph Borchardt | 2015-07-29 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #17923 from owncloud/fix-17921 | blizzz | 2015-07-29 | 1 | -8/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove Log info when no group filter is set, fixes #17921 | ||||
| * | | | | | remove unused var | blizzz | 2015-07-29 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Remove Log info when no group filter is set, fixes #17921 | blizzz | 2015-07-28 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | The log message is superfluous and too noisy. If an admin decides not to use groups, he does not need to be reminded about it on almost every request. | ||||
* | | | | | | Merge pull request #17464 from owncloud/fix-17232 | blizzz | 2015-07-29 | 9 | -98/+340 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix uncaught exception on not permitted file types when setting avatar, fixes #17232 | ||||
| * | | | | | | fix test after rebasing | Arthur Schiwon | 2015-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix uncaught exception on not permitted file types when setting avatar, ↵ | Arthur Schiwon | 2015-07-27 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #17232 | ||||
| * | | | | | | add integration tests for avatar update | Arthur Schiwon | 2015-07-27 | 5 | -2/+144 |
| | | | | | | | |||||
| * | | | | | | refactor integration tests to make it easier to add new ones | Arthur Schiwon | 2015-07-27 | 4 | -95/+189 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-29 | 4 | -0/+6 |
| | | | | | | |