Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-10 | 169 | -464/+132 |
| | |||||
* | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken | Morris Jobke | 2013-10-10 | 1 | -1/+1 |
|\ | | | | | Fixed files view regular file actions in IE8 | ||||
| * | Fixed files view regular file actions in IE8 | Vincent Petry | 2013-10-10 | 1 | -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-screen | Morris Jobke | 2013-10-10 | 3 | -2/+33 |
|\ \ | | | | | | | Fix password screen for public shares | ||||
| * | | Fix password screen for public shares | Morris Jobke | 2013-10-07 | 3 | -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_groups | blizzz | 2013-10-10 | 6 | -152/+107 |
|\ \ \ | | | | | | | | | LDAP: allow different UUID attributes for groups and users | ||||
| * | | | LDAP: allow different UUID attributes for groups and users | Arthur Schiwon | 2013-10-04 | 6 | -152/+107 |
| | | | | |||||
* | | | | Merge pull request #5221 from owncloud/fixing-5217-master | VicDeo | 2013-10-10 | 1 | -2/+4 |
|\ \ \ \ | |_|_|/ |/| | | | fixing php 5.3 compatibility | ||||
| * | | | php 5.3 compatibility for Test_Files_Sharing_Api | Thomas Müller | 2013-10-08 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbroken | Vincent Petry | 2013-10-09 | 1 | -3/+6 |
|\ \ \ \ | | | | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumb | ||||
| * | | | | Do not call changeDirectory() when no dir set on breadcrumb | Vincent Petry | 2013-10-04 | 1 | -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_fixes | Björn Schießle | 2013-10-09 | 3 | -149/+128 |
|\ \ \ \ \ | | | | | | | | | | | | | Trashbin fixes | ||||
| * | | | | | update file summary after group delete/restore | Bjoern Schiessle | 2013-10-09 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | fix checkbox | Bjoern Schiessle | 2013-10-09 | 1 | -37/+15 |
| | | | | | | |||||
| * | | | | | fix indention | Bjoern Schiessle | 2013-10-09 | 1 | -99/+99 |
| | | | | | | |||||
| * | | | | | fix group delete/restore | Bjoern Schiessle | 2013-10-09 | 2 | -19/+18 |
| | | | | | | |||||
| * | | | | | fix delete/restore individual files | Bjoern Schiessle | 2013-10-09 | 1 | -26/+23 |
| | | | | | | |||||
| * | | | | | fix trashbin layout | Bjoern Schiessle | 2013-10-09 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixes | Thomas Müller | 2013-10-09 | 3 | -15/+40 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Various fixes for the streamwrapper based SMB backend | ||||
| * | | | | | extend test case | Robin Appelman | 2013-10-02 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | fix recursive delete for smb | Robin Appelman | 2013-10-01 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | fix using touch to create a file for smb | Robin Appelman | 2013-10-01 | 1 | -12/+16 |
| | | | | | | |||||
| * | | | | | return the correct result when doing an smb rename | Robin Appelman | 2013-10-01 | 2 | -2/+9 |
| | | | | | | |||||
| * | | | | | fix smb streamwrapper on non existing files | Robin Appelman | 2013-10-01 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | Added filesApp flag as input field for files app detection | Vincent Petry | 2013-10-08 | 2 | -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 escaping | Morris Jobke | 2013-10-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | make sure that we only remove file/folder shares | Bjoern Schiessle | 2013-10-08 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-08 | 3 | -2/+12 |
| | | | | | |||||
* | | | | | Merge pull request #5184 from owncloud/fix-trash-bin-button | VicDeo | 2013-10-07 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix trash bin button | ||||
| * | | | | | Fix trash bin button | Morris Jobke | 2013-10-07 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-07 | 6 | -0/+28 |
|/ / / / / | |||||
* | | | | | Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate | Vincent Petry | 2013-10-07 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Added isPublic flag in files_sharing template | ||||
| * | | | | | Added isPublic flag in files_sharing template | Vincent Petry | 2013-10-07 | 1 | -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_fixes | VicDeo | 2013-10-07 | 5 | -41/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | File conflicts dialog fixes | ||||
| * | | | | remove double uri encoding | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | canceling individual uploads is currently impossible because there is no ↵ | Jörn Friedrich Dreyer | 2013-10-07 | 2 | -34/+1 |
| | | | | | | | | | | | | | | | | | | | | placeholder | ||||
| * | | | | remove obsolete comment | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | use !== comparison | Jörn Friedrich Dreyer | 2013-10-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix | Morris Jobke | 2013-10-07 | 1 | -6/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix breadcrumb to reinit dnd after ajax nav #5064 | ||||
| * | | | | Fix breadcrumb to reinit dnd after ajax nav #5064 | Vincent Petry | 2013-10-07 | 1 | -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_db | Björn Schießle | 2013-10-07 | 3 | -7/+36 |
|\ \ \ \ \ | |/ / / / |/| | | | | remove deleted files from oc_share | ||||
| * | | | | catch exception if db query execution fails | Bjoern Schiessle | 2013-10-07 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Merge branch 'master' into remove_deleted_shares_from_db | Bjoern Schiessle | 2013-10-07 | 51 | -400/+2422 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | clean up oc_share table from files which are no longer exists | Bjoern Schiessle | 2013-10-07 | 2 | -7/+17 |
| | | | | | |||||
| * | | | | add comments | Bjoern Schiessle | 2013-10-04 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | remove deleted shares from the database table oc_share | Bjoern Schiessle | 2013-10-02 | 1 | -0/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #4662 from owncloud/fix-4129 | Frank Karlitschek | 2013-10-06 | 1 | -47/+78 |
|\ \ \ \ | | | | | | | | | | | Fix 4129 | ||||
| * | | | | Update file to meet coding standarts | Lennart Rosam | 2013-10-07 | 1 | -47/+77 |
| | | | | | |||||
| * | | | | Actually test the connection | Lennart Rosam | 2013-10-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixes #4129 | Lennart Rosam | 2013-10-07 | 1 | -2/+3 |
| | | | | |