Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove debug output | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into versioning_preview_shared | Bjoern Schiessle | 2013-10-11 | 185 | -550/+245 |
|\ | |||||
| * | Merge pull request #5261 from owncloud/versioning_no_glob | Björn Schießle | 2013-10-11 | 1 | -82/+58 |
| |\ | | | | | | | versioning: don't use glob() and getLocalFile() | ||||
| | * | some small fixes | Bjoern Schiessle | 2013-10-11 | 1 | -2/+1 |
| | | | |||||
| | * | make files versions root a class constant | Bjoern Schiessle | 2013-10-10 | 1 | -3/+3 |
| | | | |||||
| | * | some small changes/fixes | Bjoern Schiessle | 2013-10-10 | 1 | -9/+8 |
| | | | |||||
| * | | Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines | Björn Schießle | 2013-10-11 | 2 | -10/+3 |
| |\ \ | | | | | | | | | fix setting dialog headlines for the encryption app | ||||
| | * | | fix setting dialog headlines for the encryption app | Bjoern Schiessle | 2013-10-11 | 2 | -10/+3 |
| | | | | |||||
| * | | | Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing | Björn Schießle | 2013-10-11 | 5 | -22/+57 |
| |\ \ \ | | |/ / | |/| | | encryption: block file access if share keys are missing | ||||
| | * | | fix another typo | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | change error code to 403 | Bjoern Schiessle | 2013-10-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix typo in error message and change error code to 403 | Bjoern Schiessle | 2013-10-11 | 1 | -2/+2 |
| | | | | |||||
| | * | | block file access if share keys are missing | Bjoern Schiessle | 2013-10-11 | 5 | -20/+55 |
| | | | | |||||
| * | | | Fixed IE8 misaligned date | Vincent Petry | 2013-10-11 | 1 | -4/+0 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Removed display: block to let the element be displayed inline and let itself aligned by vertical-align: middle of the parent This works in IE8 and other browsers. Fixes #5288 | ||||
| * | | Merge pull request #5233 from owncloud/enc_filter_users | Björn Schießle | 2013-10-11 | 4 | -33/+7 |
| |\ \ | | | | | | | | | only encrypt file to users with encryption keys | ||||
| | * | | don't cache if the encryption is enabled, this can lead to problems during ↵ | Bjoern Schiessle | 2013-10-10 | 1 | -27/+1 |
| | | | | | | | | | | | | | | | | unit testing | ||||
| | * | | make sure that we are logged in ad user1 while performing the tests | Bjoern Schiessle | 2013-10-10 | 1 | -3/+4 |
| | | | | |||||
| | * | | only encrypt file to users with encryption keys | Bjoern Schiessle | 2013-10-09 | 2 | -3/+2 |
| | | | | |||||
| * | | | [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 | ||||
* | | | | | | make previews work for shared files in the versions drop-down | Bjoern Schiessle | 2013-10-10 | 2 | -5/+12 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | fix getVersions() for sub directories | Bjoern Schiessle | 2013-10-10 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | add missing preview link | Bjoern Schiessle | 2013-10-10 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | don't use glob() and getLocalFile(), this can lead to problems on windows ↵ | Bjoern Schiessle | 2013-10-10 | 1 | -81/+57 |
|/ / / / | | | | | | | | | | | | | servers | ||||
* | | | | 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 |
| | | | | |