summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add filter-empty class if no search result in current folderBjoern Schiessle2015-06-221-0/+2
* Merge pull request #16889 from owncloud/group-sorting-fixesJoas Schilling2015-06-197-11/+183
|\
| * Do not return backends but add a method to check for oneJoas Schilling2015-06-163-11/+23
| * Only sort by group name when LDAP is involvedJoas Schilling2015-06-167-11/+157
| * Always keep "Everyone" and "admin" at the top of the listJoas Schilling2015-06-161-0/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1936-70/+36
* | Merge pull request #16963 from owncloud/fileinfo-lockVincent Petry2015-06-183-29/+57
|\ \
| * | remove unneeded normalizeRobin Appelman2015-06-181-2/+0
| * | unlock the file if the file doesnt existsRobin Appelman2015-06-181-0/+2
| * | use old cache data when lockedRobin Appelman2015-06-171-28/+49
| * | handle locked exceptions when getting file/directory info in sabreRobin Appelman2015-06-172-1/+8
* | | Merge pull request #17017 from owncloud/cache-update-write-lockVincent Petry2015-06-184-34/+47
|\ \ \
| * | | dont update the cache on rename failRobin Appelman2015-06-181-1/+1
| * | | update noopscannerRobin Appelman2015-06-181-3/+3
| * | | extends phpdocRobin Appelman2015-06-181-3/+4
| * | | update the file cache within the write lockRobin Appelman2015-06-183-31/+43
| |/ /
* | | Merge pull request #16692 from owncloud/add_social_media_buttonsBjörn Schießle2015-06-1811-6/+650
|\ \ \
| * | | add id to urlBjoern Schiessle2015-06-182-7/+7
| * | | fix look of 'Share with me via ownCloud' button, fix wordingJan-Christoph Borchardt2015-06-173-51/+11
| * | | fix path to owncloud logoBjoern Schiessle2015-06-172-2/+4
| * | | make the click actions workBjoern Schiessle2015-06-172-7/+9
| * | | federated cloud ID: add icons, fix HTML & layout, fix wordingJan-Christoph Borchardt2015-06-1710-39/+382
| * | | add social media button for diaspora, twitter, facebook and google+Bjoern Schiessle2015-06-177-6/+343
* | | | Merge pull request #16890 from owncloud/fix-16588Thomas Müller2015-06-182-6/+10
|\ \ \ \
| * | | | delete user test to take getHome into account to ensure it is also deleted su...Arthur Schiwon2015-06-171-1/+4
| * | | | the user is gone, userExists will not bring him back. But the user's folder n...Arthur Schiwon2015-06-111-5/+6
* | | | | Merge pull request #16993 from owncloud/verify-if-path-existsLukas Reschke2015-06-181-0/+7
|\ \ \ \ \
| * | | | | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| * | | | | Verify if path existsLukas Reschke2015-06-171-0/+5
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1844-44/+288
* | | | | Merge pull request #16973 from owncloud/button-close-sidebarLukas Reschke2015-06-171-1/+1
|\ \ \ \ \
| * | | | | let buttons hide the sidebarHendrik Leppelsack2015-06-161-1/+1
* | | | | | Remove MSSQL completely from listLukas Reschke2015-06-171-2/+0
* | | | | | 8.1 RC1Frank Karlitschek2015-06-171-2/+2
* | | | | | Merge pull request #16995 from owncloud/fix-ocp-phpdocMorris Jobke2015-06-172-2/+2
|\ \ \ \ \ \
| * | | | | | Fix return value for OCP PHPDocMorris Jobke2015-06-172-2/+2
| | |/ / / / | |/| | | |
* | | | | | remove mssql from supported dbsCarla Schroder2015-06-171-1/+0
* | | | | | Merge pull request #16893 from owncloud/fixSlideToggleMorris Jobke2015-06-172-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove unneeded span around Settings text, fixes cursorJan-Christoph Borchardt2015-06-171-1/+1
| * | | | | fix childs of slideToggle not sliding the targetHendrik Leppelsack2015-06-111-1/+1
* | | | | | Merge pull request #16988 from owncloud/fix-avatar-failVincent Petry2015-06-173-4/+28
|\ \ \ \ \ \
| * | | | | | Fix testLukas Reschke2015-06-171-1/+1
| * | | | | | Fix PHPDoc annotationsLukas Reschke2015-06-171-0/+24
| * | | | | | Correc type annotationLukas Reschke2015-06-171-3/+3
* | | | | | | Merge pull request #16985 from owncloud/fix-public-api-phpdocThomas Müller2015-06-171-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix OCP PHPDocMorris Jobke2015-06-171-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #16729 from owncloud/scanner-read-lockThomas Müller2015-06-174-13/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | explain pre-hook scanRobin Appelman2015-06-151-0/+1
| * | | | | | ensure normalized path form when changing locksRobin Appelman2015-06-151-0/+1
| * | | | | | ensure we dont have to scan a file in the trash wrapperRobin Appelman2015-06-151-0/+10