summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17680 from owncloud/ftp-rmdir-fileVincent Petry2015-08-061-1/+4
|\
| * handle rmdir on files for ftp storagesRobin Appelman2015-07-161-1/+4
* | Fix namespace conflict in OC.Encryption JS codeVincent Petry2015-08-062-12/+4
* | Merge pull request #18082 from owncloud/share-group-conflictVincent Petry2015-08-064-23/+50
|\ \
| * | just pass the share instead of searching for itRobin Appelman2015-08-053-23/+11
| * | add unit tests for share target conflict with group sharesRobin Appelman2015-08-051-0/+39
* | | Merge pull request #16961 from owncloud/hardening-ldapJörn Friedrich Dreyer2015-08-063-1/+191
|\ \ \
| * | | integration tests for hardening user home retrievalArthur Schiwon2015-08-061-0/+159
| * | | Only throw exception if on new LDAP setupsMorris Jobke2015-07-292-2/+30
| * | | Hardening home folder retrieval in user_ldapMorris Jobke2015-07-291-1/+4
* | | | Merge pull request #18077 from owncloud/fix_18055Morris Jobke2015-08-051-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Set proper mimetype for directoriesRoeland Jago Douma2015-08-051-1/+1
* | | | Use absolute namespaceLukas Reschke2015-08-052-7/+7
* | | | Merge pull request #18024 from owncloud/phpseclib-2.0Thomas Müller2015-08-044-20/+23
|\ \ \ \
| * | | | Update phpseclib to 2.0Andreas Fischer2015-08-034-20/+23
* | | | | 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