summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-10169-464/+132
|
* Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbrokenMorris Jobke2013-10-101-1/+1
|\ | | | | Fixed files view regular file actions in IE8
| * Fixed files view regular file actions in IE8Vincent Petry2013-10-101-1/+1
| | | | | | | | | | | | | | Fixes #5256 A missing closing span broken the container in IE8 which prevented the file actions to be appended properly.
* | Merge pull request #5182 from owncloud/fix-sharring-with-password-screenMorris Jobke2013-10-103-2/+33
|\ \ | | | | | | Fix password screen for public shares
| * | Fix password screen for public sharesMorris Jobke2013-10-073-2/+33
| | | | | | | | | | | | | | | * Works in IE8, 9, 10, Firefox 24 and Chromium 30 * Credits to Julian Müller @Julian1998
* | | Merge pull request #5114 from owncloud/ldap_uuid_attr_groupsblizzz2013-10-106-152/+107
|\ \ \ | | | | | | | | LDAP: allow different UUID attributes for groups and users
| * | | LDAP: allow different UUID attributes for groups and usersArthur Schiwon2013-10-046-152/+107
| | | |
* | | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-101-2/+4
|\ \ \ \ | |_|_|/ |/| | | fixing php 5.3 compatibility
| * | | php 5.3 compatibility for Test_Files_Sharing_ApiThomas Müller2013-10-081-2/+4
| | | |
* | | | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \ \ \ | | | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumb
| * | | | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps like the files_trashbin app do not set a directory on its "home" breadcrumb link. This fix makes sure that the click event doesn't do anything in that case and lets the browser open the link. This fixes the "home" icon in the trashbin app which now correctly reopens the files app.
* | | | | Merge pull request #5230 from owncloud/trashbin_fixesBjörn Schießle2013-10-093-149/+128
|\ \ \ \ \ | | | | | | | | | | | | Trashbin fixes
| * | | | | update file summary after group delete/restoreBjoern Schiessle2013-10-091-0/+2
| | | | | |
| * | | | | fix checkboxBjoern Schiessle2013-10-091-37/+15
| | | | | |
| * | | | | fix indentionBjoern Schiessle2013-10-091-99/+99
| | | | | |
| * | | | | fix group delete/restoreBjoern Schiessle2013-10-092-19/+18
| | | | | |
| * | | | | fix delete/restore individual filesBjoern Schiessle2013-10-091-26/+23
| | | | | |
| * | | | | fix trashbin layoutBjoern Schiessle2013-10-091-0/+3
| | | | | |
* | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixesThomas Müller2013-10-093-15/+40
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Various fixes for the streamwrapper based SMB backend
| * | | | | 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
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the files app can be reached under multiple URLs, either root, files.php or public.php, a flag has been added to the DOM to help apps (like file viewers) to detect whether they are currently in the files app.
* | | | | 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 button
| * | | | | 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 template
| * | | | | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it possible for apps to find out whether they are running in public mode, the flag "isPublic" will now be present in the DOM. This is required to disable the editor app in public mode to fix #5059
* | | | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-075-41/+6
|\ \ \ \ \ | |/ / / / |/| | | | File conflicts dialog fixes
| * | | | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| | | | |
| * | | | canceling individual uploads is currently impossible because there is no ↵Jörn Friedrich Dreyer2013-10-072-34/+1
| | | | | | | | | | | | | | | | | | | | placeholder
| * | | | 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 #5064
| * | | | Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now correctly reinitializing the breadcrumb drop zone after ajax navigation. This also fixes dropping onto the "files" app icon.
* | | | | Merge pull request #5129 from owncloud/remove_deleted_shares_from_dbBjörn Schießle2013-10-073-7/+36
|\ \ \ \ \ | |/ / / / |/| | | | remove deleted files from oc_share
| * | | | 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
|\ \ \ \ | | | | | | | | | | Fix 4129
| * | | | 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
| | | | |