summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9259 from owncloud/fix-rename-iconMorris Jobke2014-06-271-2/+2
|\
| * fix rename icon, fix #9257Jan-Christoph Borchardt2014-06-271-2/+2
* | Merge pull request #8383 from owncloud/object_storageVincent Petry2014-06-27139-8074/+117
|\ \ | |/ |/|
| * update files_external swift to php-opencloud v1.9.2Jörn Friedrich Dreyer2014-06-252-116/+113
| * remove rackspace opencloud libs from files_external 3rdpartyJörn Friedrich Dreyer2014-06-25136-7958/+0
| * Allow adding object stores with the files_external mount configRobin Appelman2014-06-241-0/+4
* | Merge pull request #9254 from owncloud/fileactions-deferredMorris Jobke2014-06-2711-6/+168
|\ \
| * | Sync file list with file actionsVincent Petry2014-06-2711-6/+168
* | | Merge pull request #9174 from owncloud/breadcrumbfixJan-Christoph Borchardt2014-06-275-128/+155
|\ \ \ | |/ / |/| |
| * | Breadcrumb width calculation fixVincent Petry2014-06-275-128/+155
* | | Merge pull request #9247 from owncloud/move-webdav-class-to-core-masterThomas Müller2014-06-273-456/+0
|\ \ \
| * | | remove pointless require - we should kill all require_once like that in our t...Thomas Müller2014-06-271-2/+0
| * | | fix autoloaderThomas Müller2014-06-271-1/+0
| * | | Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependenciesThomas Müller2014-06-271-453/+0
* | | | Merge pull request #9215 from owncloud/officemimetypesupdatefixVincent Petry2014-06-271-57/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Moved office mimetype update to a repair stepVincent Petry2014-06-251-57/+0
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2734-31/+87
* | | | Merge pull request #9051 from owncloud/Bagera-masterFrank Karlitschek2014-06-263-23/+36
|\ \ \ \
| * | | | fix padding for last cell in summary of trashbinMorris Jobke2014-06-261-0/+4
| * | | | Aligning in the table header as wellBagera2014-06-162-15/+26
| * | | | Aligning with line heightBagera2014-06-161-10/+5
| * | | | Fix delete action heightBagera2014-06-161-5/+8
* | | | | Merge pull request #9236 from owncloud/sharing-settingswordingicewind19912014-06-261-1/+1
|\ \ \ \ \
| * | | | | Fix wording for remote shares in settings pageVincent Petry2014-06-261-1/+1
* | | | | | Merge pull request #9234 from owncloud/fix-ellipsis-for-foldersRaghu Nayyar2014-06-261-2/+2
|\ \ \ \ \ \
| * | | | | | Fix ellipsis for folders on mobile screensMorris Jobke2014-06-261-2/+2
* | | | | | | Merge pull request #9206 from owncloud/occ-scan-userVincent Petry2014-06-261-13/+18
|\ \ \ \ \ \ \
| * | | | | | | Prevent running the files:scan command as the wrong userRobin Appelman2014-06-251-13/+18
* | | | | | | | Merge pull request #9223 from owncloud/occ-scan-argumentsicewind19912014-06-261-0/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add error message when no users specified to files:scan commandVincent Petry2014-06-261-0/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #9171 from owncloud/enc_always_use_oc_viewBjörn Schießle2014-06-265-109/+98
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix unit testsBjoern Schiessle2014-06-251-2/+2
| * | | | | | always use a \OC\Files\ViewBjoern Schiessle2014-06-254-77/+59
| * | | | | | always use oc filesystem for rename operationBjoern Schiessle2014-06-252-34/+41
* | | | | | | Merge pull request #9193 from owncloud/sharing_etag_propagationBjörn Schießle2014-06-264-10/+191
|\ \ \ \ \ \ \
| * | | | | | | make sure that hooks are registered for the testsBjoern Schiessle2014-06-253-14/+23
| * | | | | | | make sure that during share and unshare the etags get propagated correctlyBjoern Schiessle2014-06-253-0/+172
| |/ / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-263-10/+19
* | | | | | | Merge pull request #9205 from owncloud/remoteshare-fixurlpathVincent Petry2014-06-252-2/+93
|\ \ \ \ \ \ \
| * | | | | | | Fix parsing of remote URL when mounting remote sharesVincent Petry2014-06-252-2/+93
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #9202 from owncloud/urlhashfixMorris Jobke2014-06-251-23/+23
|\ \ \ \ \ \ \
| * | | | | | | Do not clear URL hash when no external mount params givenVincent Petry2014-06-251-23/+23
| |/ / / / / /
* | | | | | | Merge pull request #9189 from owncloud/sharing_fix_permissionsicewind19912014-06-253-6/+36
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | add/update unit testsBjoern Schiessle2014-06-242-3/+33
| * | | | | | make sure that we always return the correct permissionsBjoern Schiessle2014-06-241-3/+3
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-257-14/+48
| |_|/ / / / |/| | | | |
* | | | | | adjust access constructor to masterArthur Schiwon2014-06-252-2/+10
* | | | | | Port of LDAP Wizard: get correct total no of users, groups and complete list...Arthur Schiwon2014-06-254-70/+130
| |/ / / / |/| | | |
* | | | | Merge pull request #9168 from owncloud/files-phpwarningondeleteVincent Petry2014-06-241-5/+2
|\ \ \ \ \
| * | | | | Merge if statementsJoas Schilling2014-06-231-6/+2