summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Update phpseclib to 2.0Andreas Fischer2015-08-034-20/+23
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-08-012-6/+6
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-314-6/+6
|
* Merge pull request #17175 from owncloud/add-download-feedbackMorris Jobke2015-07-307-12/+116
|\ | | | | Add loading spinner to download icon
| * move updateFileActionSpinner to OCA.Files.FileActionsMorris Jobke2015-07-223-24/+24
| |
| * refactor this to proper separation of concernsMorris Jobke2015-07-153-19/+39
| |
| * refactoring into proper methodsMorris Jobke2015-07-073-57/+34
| |
| * Fix unit tests and introduce better mocks of the HTMLMorris Jobke2015-07-072-7/+7
| |
| * Add proper download started feedbackMorris Jobke2015-07-073-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 visibleMorris Jobke2015-07-071-0/+8
| |
| * Reduce timeout for download spinner to 2 secondsMorris Jobke2015-07-072-2/+2
| |
| * Add loading spinner to multi select download buttonMorris Jobke2015-07-071-0/+20
| |
| * Fix layout of disabled links in the file listMorris Jobke2015-07-072-3/+27
| | | | | | | | * also disable download button after click
| * Add loading spinner to download iconMorris Jobke2015-07-071-0/+8
| | | | | | | | * vanishes after 7 seconds
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-308-2/+30
| |
* | use inline confirm button style for password-protected links, ref #15176Jan-Christoph Borchardt2015-07-292-2/+2
| |
* | Merge pull request #17923 from owncloud/fix-17921blizzz2015-07-291-8/+0
|\ \ | | | | | | Remove Log info when no group filter is set, fixes #17921
| * | remove unused varblizzz2015-07-291-2/+0
| | |
| * | Remove Log info when no group filter is set, fixes #17921blizzz2015-07-281-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-17232blizzz2015-07-299-98/+340
|\ \ \ | | | | | | | | fix uncaught exception on not permitted file types when setting avatar, fixes #17232
| * | | fix test after rebasingArthur Schiwon2015-07-271-1/+1
| | | |
| * | | fix uncaught exception on not permitted file types when setting avatar, ↵Arthur Schiwon2015-07-271-1/+7
| | | | | | | | | | | | | | | | fixes #17232
| * | | add integration tests for avatar updateArthur Schiwon2015-07-275-2/+144
| | | |
| * | | refactor integration tests to make it easier to add new onesArthur Schiwon2015-07-274-95/+189
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-294-0/+6
| | | |
* | | | Merge pull request #17922 from owncloud/smb-storageiddoubleslashRobin McCorkell2015-07-282-1/+16
|\ \ \ \ | |_|/ / |/| | | Double slash for SMB storage id for compatibility
| * | | Double slash for SMB storage id for compatibilityVincent Petry2015-07-282-1/+16
| |/ /
* | | Merge pull request #17910 from owncloud/fix-modified-tooltipMorris Jobke2015-07-281-1/+3
|\ \ \ | | | | | | | | Fix tooltip for modification time
| * | | fixed tooltip for modified dateHendrik Leppelsack2015-07-271-1/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-2814-6/+130
| |/ / |/| |
* | | Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryptionThomas Müller2015-07-272-1/+97
|\ \ \ | | | | | | | | Only set is encrypted when encryption is enabled
| * | | add condition to update queryBjoern Schiessle2015-07-271-1/+1
| | | |
| * | | Add an update script to reset the valueJoas Schilling2015-07-242-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-17516Morris Jobke2015-07-274-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 Schiwon2015-07-094-2/+96
| | | | | | | | | | | | | | | | | | | | consideration. Fixes #17516
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-274-0/+10
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-252-0/+4
| | | |
* | | | Merge pull request #17075 from owncloud/bootstrap-tooltipBernhard Posselt2015-07-231-2/+2
|\ \ \ \ | |_|/ / |/| | | Replace jQuery tipsy with bootstrap tooltip
| * | | fix tipsy dependencyHendrik Leppelsack2015-07-081-2/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-236-4/+76
| | | |
* | | | Merge pull request #17413 from owncloud/public-api-querybuilderMorris Jobke2015-07-224-79/+85
|\ \ \ \ | | | | | | | | | | Add public api for Doctrine QueryBuilder and ExpressionBuilder
| * | | | Fix existing usages by removing the quotesJoas Schilling2015-07-214-54/+60
| | | | |
| * | | | Use the public interface and our method instead of the doctrine thingJoas Schilling2015-07-214-25/+25
| | | | |
* | | | | Merge pull request #17806 from owncloud/enc_improved_app_descriptionRobin McCorkell2015-07-221-13/+8
|\ \ \ \ \ | | | | | | | | | | | | improved app description for the default encryption module
| * | | | | improved app description and adjust it to the way the new encryption module ↵Bjoern Schiessle2015-07-221-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | works
* | | | | | Fixing line comments and indentationViktor Szépe2015-07-212-24/+25
| |/ / / / |/| | | |
* | | | | Merge pull request #17381 from owncloud/fix_sharing_add_to_groupMorris Jobke2015-07-211-4/+10
|\ \ \ \ \ | | | | | | | | | | | | [sharing] fix addToGroup hook
| * | | | | use the correct user if we update the share tableBjoern Schiessle2015-07-031-4/+10
| | | | | |
* | | | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detectionJoas Schilling2015-07-212-4/+81
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix system wide mount point detection on migration
| * | | | | | fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| | |/ / / / | |/| | | |