summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18175 from owncloud/automatic-db-prefix-query-builderThomas Müller2015-08-104-22/+22
|\
| * Remove unnecessary DB prefixes from existing query builder usagesJoas Schilling2015-08-104-22/+22
* | Merge pull request #15093 from rullzer/capabilities_managerRoeland Douma2015-08-1015-86/+166
|\ \ | |/ |/|
| * Use DIRoeland Jago Douma2015-08-104-17/+4
| * Moved core apps to the capabilities managerRoeland Jago Douma2015-08-1015-86/+179
* | Merge pull request #17656 from owncloud/files-rightsidebarVincent Petry2015-08-1018-25/+1086
|\ \ | |/ |/|
| * Fix unit test for tipsy->tooltip changeVincent Petry2015-08-101-3/+3
| * replace tipsy with tooltipHendrik Leppelsack2015-08-071-1/+1
| * fix tipsy gravity after rebaseArthur Schiwon2015-08-071-1/+1
| * fix timezone issue with unittestArthur Schiwon2015-08-071-1/+2
| * Fix sidebar mtime display unit testVincent Petry2015-08-071-2/+2
| * fix position of elements in right sidebarJan-Christoph Borchardt2015-08-072-8/+18
| * fix right sidebar position and first styleJan-Christoph Borchardt2015-08-071-1/+1
| * Use own tabs impl in files sidebarVincent Petry2015-08-074-26/+75
| * rename sidebar element and use css and js utility functions to coreArthur Schiwon2015-08-073-56/+14
| * sidebar shall not overlap but shrink the contnetArthur Schiwon2015-08-073-6/+15
| * extend MainFileInfoDetailView JS testsArthur Schiwon2015-08-071-3/+29
| * Main view does not commands detail and tab views to render. Fixes JS tests.Arthur Schiwon2015-08-073-5/+20
| * More work on right sidebar unit testsVincent Petry2015-08-071-3/+3
| * Added unit tests for right sidebarVincent Petry2015-08-077-7/+222
| * Improve layout, fix mime iconVincent Petry2015-08-074-17/+35
| * Disable right sidebar in public file list pageVincent Petry2015-08-072-6/+14
| * Right sidebar now has its own scrollbarVincent Petry2015-08-073-5/+25
| * Remove horizontal scroll caused by right sidebarVincent Petry2015-08-071-0/+4
| * Styling fixes + hightlight in files sidebarVincent Petry2015-08-077-3/+17
| * More fixes to the right sidebarVincent Petry2015-08-077-133/+85
| * Improved right sidebarVincent Petry2015-08-079-74/+328
| * Basic work for right sidebarVincent Petry2015-08-077-0/+508
* | Merge pull request #14779 from owncloud/use-iterator-directoryRobin McCorkell2015-08-075-11/+12
|\ \
| * | Use the new IteratorDirectory instead of the fakedir wrapperRobin Appelman2015-07-155-11/+12
* | | Merge pull request #18125 from owncloud/filelist-emptycontentduringmaskJan-Christoph Borchardt2015-08-071-0/+1
|\ \ \
| * | | Make sure to hide empty content message when mask is shownVincent Petry2015-08-071-0/+1
* | | | Merge pull request #13641 from owncloud/cache-storage-statusVincent Petry2015-08-071-2/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Store storage availability in databaseRobin McCorkell2015-07-201-2/+10
* | | | 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