aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* remove debug outputBjoern Schiessle2013-10-111-1/+1
|
* Merge branch 'master' into versioning_preview_sharedBjoern Schiessle2013-10-11185-550/+245
|\
| * Merge pull request #5261 from owncloud/versioning_no_globBjörn Schießle2013-10-111-82/+58
| |\ | | | | | | versioning: don't use glob() and getLocalFile()
| | * some small fixesBjoern Schiessle2013-10-111-2/+1
| | |
| | * make files versions root a class constantBjoern Schiessle2013-10-101-3/+3
| | |
| | * some small changes/fixesBjoern Schiessle2013-10-101-9/+8
| | |
| * | Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlinesBjörn Schießle2013-10-112-10/+3
| |\ \ | | | | | | | | fix setting dialog headlines for the encryption app
| | * | fix setting dialog headlines for the encryption appBjoern Schiessle2013-10-112-10/+3
| | | |
| * | | Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missingBjörn Schießle2013-10-115-22/+57
| |\ \ \ | | |/ / | |/| | encryption: block file access if share keys are missing
| | * | fix another typoBjoern Schiessle2013-10-111-1/+1
| | | |
| | * | change error code to 403Bjoern Schiessle2013-10-111-1/+1
| | | |
| | * | fix typo in error message and change error code to 403Bjoern Schiessle2013-10-111-2/+2
| | | |
| | * | block file access if share keys are missingBjoern Schiessle2013-10-115-20/+55
| | | |
| * | | Fixed IE8 misaligned dateVincent Petry2013-10-111-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_usersBjörn Schießle2013-10-114-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 Schiessle2013-10-101-27/+1
| | | | | | | | | | | | | | | | unit testing
| | * | make sure that we are logged in ad user1 while performing the testsBjoern Schiessle2013-10-101-3/+4
| | | |
| | * | only encrypt file to users with encryption keysBjoern Schiessle2013-10-092-3/+2
| | | |
| * | | [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
* | | | | | make previews work for shared files in the versions drop-downBjoern Schiessle2013-10-102-5/+12
| |_|_|_|/ |/| | | |
* | | | | fix getVersions() for sub directoriesBjoern Schiessle2013-10-101-2/+3
| | | | |
* | | | | add missing preview linkBjoern Schiessle2013-10-101-0/+1
| | | | |
* | | | | don't use glob() and getLocalFile(), this can lead to problems on windows ↵Bjoern Schiessle2013-10-101-81/+57
|/ / / / | | | | | | | | | | | | servers
* | | | 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
| | | | |