summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5070 from owncloud/smb-streamwrapper-fixesThomas Müller2013-10-093-15/+40
|\
| * extend test caseRobin Appelman2013-10-021-0/+1
| * fix recursive delete for smbRobin Appelman2013-10-011-0/+8
| * fix using touch to create a file for smbRobin Appelman2013-10-011-12/+16
| * return the correct result when doing an smb renameRobin Appelman2013-10-012-2/+9
| * fix smb streamwrapper on non existing filesRobin Appelman2013-10-011-1/+6
* | Added filesApp flag as input field for files app detectionVincent Petry2013-10-082-0/+2
* | fix escapingMorris Jobke2013-10-081-1/+1
* | make sure that we only remove file/folder sharesBjoern Schiessle2013-10-082-3/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-083-2/+12
* | Merge pull request #5184 from owncloud/fix-trash-bin-buttonVicDeo2013-10-071-2/+4
|\ \
| * | Fix trash bin buttonMorris Jobke2013-10-071-2/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-076-0/+28
|/ /
* | Merge pull request #5178 from owncloud/sharing-ispublicflagintemplateVincent Petry2013-10-071-0/+1
|\ \
| * | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
* | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-075-41/+6
|\ \ \ | |/ / |/| |
| * | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| * | canceling individual uploads is currently impossible because there is no plac...Jörn Friedrich Dreyer2013-10-072-34/+1
| * | remove obsolete commentJörn Friedrich Dreyer2013-10-071-2/+0
| * | use !== comparisonJörn Friedrich Dreyer2013-10-071-1/+1
* | | Merge pull request #5165 from owncloud/files-dropontobreadcrumbfixMorris Jobke2013-10-071-6/+8
|\ \ \ | |/ / |/| |
| * | Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
* | | Merge pull request #5129 from owncloud/remove_deleted_shares_from_dbBjörn Schießle2013-10-073-7/+36
|\ \ \ | |/ / |/| |
| * | catch exception if db query execution failsBjoern Schiessle2013-10-071-1/+5
| * | Merge branch 'master' into remove_deleted_shares_from_dbBjoern Schiessle2013-10-0751-400/+2422
| |\ \
| * | | clean up oc_share table from files which are no longer existsBjoern Schiessle2013-10-072-7/+17
| * | | add commentsBjoern Schiessle2013-10-041-0/+5
| * | | remove deleted shares from the database table oc_shareBjoern Schiessle2013-10-021-0/+10
| | |/ | |/|
* | | Merge pull request #4662 from owncloud/fix-4129Frank Karlitschek2013-10-061-47/+78
|\ \ \
| * | | Update file to meet coding standartsLennart Rosam2013-10-071-47/+77
| * | | Actually test the connectionLennart Rosam2013-10-071-1/+1
| * | | Fixes #4129Lennart Rosam2013-10-071-2/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-0643-59/+71
* | | | Merge pull request #5088 from owncloud/fix_trashbin_buttonMorris Jobke2013-10-061-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | trash bin button needs to be an input fieldBjoern Schiessle2013-10-021-3/+1
| |/ /
* | | more elegant style for Personal and Admin settingsJan-Christoph Borchardt2013-10-053-4/+4
* | | Merge pull request #5136 from owncloud/design-fixesMorris Jobke2013-10-041-3/+1
|\ \ \
| * | | increase font size of file actions for better readabilityJan-Christoph Borchardt2013-10-041-3/+1
| | |/ | |/|
* | | Merge pull request #5102 from owncloud/input-simplifyMorris Jobke2013-10-042-6/+5
|\ \ \ | |/ / |/| |
| * | fix multiselect bar opacity, webrootJan-Christoph Borchardt2013-10-042-4/+4
| * | merge master into input-simplifyJan-Christoph Borchardt2013-10-0444-389/+1367
| |\ \
| * | | fix position of New and Deleted Files buttonsJan-Christoph Borchardt2013-10-031-2/+9
| * | | simplify input elements for less cognitive load. No box-shadow, no text-shado...Jan-Christoph Borchardt2013-10-031-3/+1
* | | | Merge pull request #4877 from owncloud/ocs_share_apiBjörn Schießle2013-10-045-2/+1036
|\ \ \ \ | |_|/ / |/| | |
| * | | update testsBjoern Schiessle2013-10-041-3/+3
| * | | use true/false instead of yes/no for publicUpload and subfiles parameterBjoern Schiessle2013-10-041-4/+4
| * | | use always path as parameter to specify a file/folderBjoern Schiessle2013-10-041-3/+3
| * | | also return success if no shares are found.Bjoern Schiessle2013-09-301-3/+4
| * | | add testUpdateShareUpload()Bjoern Schiessle2013-09-301-3/+62
| * | | add getShareFromFolder() testBjoern Schiessle2013-09-301-0/+37