summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix infinite loops with propagating etags on resharesRobin Appelman2015-08-032-7/+16
* Merge pull request #17989 from owncloud/enc_only_update_file_cache_onceBjörn Schießle2015-08-032-7/+22
|\
| * only update database on the first run (first run = we have a version number f...Bjoern Schiessle2015-07-312-7/+22
* | [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
|\ \ | |/ |/|
| * 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
| * 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
| * Add loading spinner to download iconMorris Jobke2015-07-071-0/+8
* | [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 unused varblizzz2015-07-291-2/+0
| * | Remove Log info when no group filter is set, fixes #17921blizzz2015-07-281-6/+0
* | | Merge pull request #17464 from owncloud/fix-17232blizzz2015-07-299-98/+340
|\ \ \
| * | | fix test after rebasingArthur Schiwon2015-07-271-1/+1
| * | | fix uncaught exception on not permitted file types when setting avatar, fixes...Arthur Schiwon2015-07-271-1/+7
| * | | 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 compatibilityVincent Petry2015-07-282-1/+16
| |/ /
* | | Merge pull request #17910 from owncloud/fix-modified-tooltipMorris Jobke2015-07-281-1/+3
|\ \ \
| * | | 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
|\ \ \
| * | | add condition to update queryBjoern Schiessle2015-07-271-1/+1
| * | | Add an update script to reset the valueJoas Schilling2015-07-242-1/+97
* | | | 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 conside...Arthur Schiwon2015-07-094-2/+96
* | | | | [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
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \ \ \
| * | | | 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 and adjust it to the way the new encryption module w...Bjoern Schiessle2015-07-221-13/+8
* | | | | | 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
|\ \ \ \ \
| * | | | | use the correct user if we update the share tableBjoern Schiessle2015-07-031-4/+10