Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update phpseclib to 2.0 | Andreas Fischer | 2015-08-03 | 4 | -20/+23 |
| | |||||
* | [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 |
| | | | | |||||
* | | | | Merge pull request #17922 from owncloud/smb-storageiddoubleslash | Robin McCorkell | 2015-07-28 | 2 | -1/+16 |
|\ \ \ \ | |_|/ / |/| | | | Double slash for SMB storage id for compatibility | ||||
| * | | | Double slash for SMB storage id for compatibility | Vincent Petry | 2015-07-28 | 2 | -1/+16 |
| |/ / | |||||
* | | | Merge pull request #17910 from owncloud/fix-modified-tooltip | Morris Jobke | 2015-07-28 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fix tooltip for modification time | ||||
| * | | | fixed tooltip for modified date | Hendrik Leppelsack | 2015-07-27 | 1 | -1/+3 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-28 | 14 | -6/+130 |
| |/ / |/| | | |||||
* | | | Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption | Thomas Müller | 2015-07-27 | 2 | -1/+97 |
|\ \ \ | | | | | | | | | Only set is encrypted when encryption is enabled | ||||
| * | | | add condition to update query | Bjoern Schiessle | 2015-07-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add an update script to reset the value | Joas Schilling | 2015-07-24 | 2 | -1/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case encryption was not enabled, we accidently set encrypted = 1 for files inside mount points, since 8.1.0. This breaks opening the files in 8.1.1 because we fixed the code that checks if a file is encrypted. In order to fix the file, we need to reset the flag of the file. However, the flag might be set because the file is in fact encrypted because it was uploaded at a time where encryption was enabled. So we can only do this when: - Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2) - Encryption is disabled - files_encryption is not known in the app config If the first two are not the case, we are save. However, if files_encryption values exist in the config, we might have a false negative here. Now if there is no file with unencrypted size greater 0, that means there are no files that are still encrypted with "files_encryption" encryption. So we can also safely reset the flag here. If this is not the case, we go with "better save then sorry" and don't change the flag but write a message to the ownCloud log file. | ||||
* | | | | Merge pull request #17526 from owncloud/fix-17516 | Morris Jobke | 2015-07-27 | 4 | -2/+96 |
|\ \ \ \ | | | | | | | | | | | LDAP: when checking group for matching filter, also take base DN into… | ||||
| * | | | | LDAP: when checking group for matching filter, also take base DN into ↵ | Arthur Schiwon | 2015-07-09 | 4 | -2/+96 |
| | | | | | | | | | | | | | | | | | | | | consideration. Fixes #17516 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-27 | 4 | -0/+10 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-25 | 2 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #17075 from owncloud/bootstrap-tooltip | Bernhard Posselt | 2015-07-23 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | Replace jQuery tipsy with bootstrap tooltip | ||||
| * | | | fix tipsy dependency | Hendrik Leppelsack | 2015-07-08 | 1 | -2/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-23 | 6 | -4/+76 |
| | | | | |||||
* | | | | Merge pull request #17413 from owncloud/public-api-querybuilder | Morris Jobke | 2015-07-22 | 4 | -79/+85 |
|\ \ \ \ | | | | | | | | | | | Add public api for Doctrine QueryBuilder and ExpressionBuilder | ||||
| * | | | | Fix existing usages by removing the quotes | Joas Schilling | 2015-07-21 | 4 | -54/+60 |
| | | | | | |||||
| * | | | | Use the public interface and our method instead of the doctrine thing | Joas Schilling | 2015-07-21 | 4 | -25/+25 |
| | | | | | |||||
* | | | | | Merge pull request #17806 from owncloud/enc_improved_app_description | Robin McCorkell | 2015-07-22 | 1 | -13/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | improved app description for the default encryption module | ||||
| * | | | | | improved app description and adjust it to the way the new encryption module ↵ | Bjoern Schiessle | 2015-07-22 | 1 | -13/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | works | ||||
* | | | | | | Fixing line comments and indentation | Viktor Szépe | 2015-07-21 | 2 | -24/+25 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #17381 from owncloud/fix_sharing_add_to_group | Morris Jobke | 2015-07-21 | 1 | -4/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | [sharing] fix addToGroup hook | ||||
| * | | | | | use the correct user if we update the share table | Bjoern Schiessle | 2015-07-03 | 1 | -4/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection | Joas Schilling | 2015-07-21 | 2 | -4/+81 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix system wide mount point detection on migration | ||||
| * | | | | | | fix mount point detection | Bjoern Schiessle | 2015-07-20 | 2 | -4/+81 |
| | |/ / / / | |/| | | | |