Commit Graph

6596 Commits

Author SHA1 Message Date
Bjoern Schiessle 7ab4fef7a9 update file summary after group delete/restore 2013-10-09 16:17:43 +02:00
Bjoern Schiessle 38e5da05af only encrypt file to users with encryption keys 2013-10-09 15:56:21 +02:00
Bjoern Schiessle 46bce8e540 fix checkbox 2013-10-09 13:15:53 +02:00
Bjoern Schiessle 51cfdb32b1 fix indention 2013-10-09 12:43:56 +02:00
Bjoern Schiessle 31a91ef892 fix group delete/restore 2013-10-09 12:35:15 +02:00
Thomas Müller 9637ca3ae8 Merge pull request #5070 from owncloud/smb-streamwrapper-fixes
Various fixes for the streamwrapper based SMB backend
2013-10-09 03:05:51 -07:00
Bjoern Schiessle 9e3d28871e fix delete/restore individual files 2013-10-09 12:01:25 +02:00
Bjoern Schiessle 4404963918 fix trashbin layout 2013-10-09 11:11:55 +02:00
Thomas Müller 8a06f2e128 php 5.3 compatibility for Test_Files_Sharing_Api 2013-10-08 23:05:19 +02:00
Vincent Petry cddb85c588 Added filesApp flag as input field for files app detection
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.
2013-10-08 17:19:58 +02:00
Morris Jobke 6284ab31de fix escaping 2013-10-08 16:00:26 +02:00
Bjoern Schiessle 68e1dd1f23 make sure that we only remove file/folder shares 2013-10-08 16:00:18 +02:00
Thomas Müller 7c6ed6ab33 catch exceptions while uploading and pass on the error message 2013-10-08 15:03:24 +02:00
Jenkins for ownCloud 209392587f [tx-robot] updated from transifex 2013-10-08 07:24:19 -04:00
VicDeo 372a73d43a Merge pull request #5184 from owncloud/fix-trash-bin-button
Fix trash bin button
2013-10-07 10:58:47 -07:00
Jenkins for ownCloud c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Morris Jobke 980fc9cc7e Fix trash bin button 2013-10-07 18:15:23 +02:00
Morris Jobke 4af220d09e Fix password screen for public shares
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
 * Credits to Julian Müller @Julian1998
2013-10-07 17:38:27 +02:00
Vincent Petry a3d0e29aa5 Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
Added isPublic flag in files_sharing template
2013-10-07 08:23:55 -07:00
VicDeo d8b7e42fc1 Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
Vincent Petry 6a36d7fa86 Added isPublic flag in files_sharing template
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
2013-10-07 16:59:57 +02:00
Morris Jobke 193e815133 Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix
Fix breadcrumb to reinit dnd after ajax nav #5064
2013-10-07 05:01:02 -07:00
Jörn Friedrich Dreyer 4ccbace68d remove double uri encoding 2013-10-07 11:15:58 +02:00
Jörn Friedrich Dreyer 0683372200 canceling individual uploads is currently impossible because there is no placeholder 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer 3be8e3f8d3 remove obsolete comment 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer 8899543b7f use !== comparison 2013-10-07 11:14:10 +02:00
Vincent Petry 6a4563f203 Fix breadcrumb to reinit dnd after ajax nav #5064
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.

This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02:00
Björn Schießle 981608cf6b Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
remove deleted files from oc_share
2013-10-07 02:07:11 -07:00
Bjoern Schiessle 288f01bf62 catch exception if db query execution fails 2013-10-07 11:06:24 +02:00
Bjoern Schiessle 4f67b7a6c3 Merge branch 'master' into remove_deleted_shares_from_db 2013-10-07 11:00:56 +02:00
Bjoern Schiessle 0346167bb2 clean up oc_share table from files which are no longer exists 2013-10-07 10:59:09 +02:00
Frank Karlitschek 46fdb449a4 Merge pull request #4662 from owncloud/fix-4129
Fix 4129
2013-10-06 23:42:44 -07:00
Jenkins for ownCloud 3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Lennart Rosam 5470700c9a Update file to meet coding standarts 2013-10-07 01:08:39 +02:00
Lennart Rosam 72ad309920 Actually test the connection 2013-10-07 01:08:38 +02:00
Lennart Rosam b9a948b597 Fixes #4129 2013-10-07 01:08:38 +02:00
Morris Jobke e1e16ec3b0 Merge pull request #5088 from owncloud/fix_trashbin_button
trash bin button needs to be an input field
2013-10-06 14:51:08 -07:00
Jan-Christoph Borchardt 2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Morris Jobke cc1e69c190 Merge pull request #5136 from owncloud/design-fixes
Design fixes
2013-10-04 14:56:09 -07:00
Morris Jobke a927c145be Merge pull request #5102 from owncloud/input-simplify
Input simplify
2013-10-04 10:40:32 -07:00
Jan-Christoph Borchardt fcb9b49d1f increase font size of file actions for better readability 2013-10-04 20:25:18 +03:00
Vincent Petry 0736bfb43a Do not call changeDirectory() when no dir set on breadcrumb
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.
2013-10-04 17:49:42 +02:00
Bjoern Schiessle 401740166b add comments 2013-10-04 16:50:53 +02:00
Jan-Christoph Borchardt da0db7bcb2 fix multiselect bar opacity, webroot 2013-10-04 17:32:06 +03:00
Björn Schießle 2cdf54b77d Merge pull request #4877 from owncloud/ocs_share_api
OCS Share API
2013-10-04 07:10:21 -07:00
Jan-Christoph Borchardt 041837de2c merge master into input-simplify 2013-10-04 17:08:34 +03:00
Björn Schießle 7337b34110 Merge pull request #5085 from owncloud/versioning_preview
add previews to versions dialog
2013-10-04 06:13:54 -07:00
Bjoern Schiessle 54dd91b859 remove hover effect from preview image 2013-10-04 15:13:05 +02:00
Bjoern Schiessle 2e7f481e6b update tests 2013-10-04 14:32:15 +02:00
Vincent Petry ba0f2f10a7 Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug
Replace plus sign with space in files app URL #4932
2013-10-04 05:30:30 -07:00
Morris Jobke 2cfb5fb2d2 vertical align versions text 2013-10-04 14:13:48 +02:00
Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
Bjoern Schiessle dd2bf69152 use true/false instead of yes/no for publicUpload and subfiles parameter 2013-10-04 12:16:47 +02:00
Bjoern Schiessle a1fe5148b5 use always path as parameter to specify a file/folder 2013-10-04 12:10:11 +02:00
Arthur Schiwon 0c837cefb6 LDAP: allow different UUID attributes for groups and users 2013-10-04 11:47:40 +02:00
Morris Jobke c38638fdf4 Merge pull request #4815 from owncloud/ldap_improve_testing
LDAP modularization and tests
2013-10-04 02:41:06 -07:00
Björn Schießle 5b7f76e702 Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
Encryption improved error messages
2013-10-04 02:28:18 -07:00
Björn Schießle 1992450b32 Merge pull request #4902 from owncloud/repeat_recovery_password
let user repeat the recovery key password to prevent typos
2013-10-04 02:23:01 -07:00
Vincent Petry 9d2595a7c5 Shortened notification message that was too long
The message for invalid private key was too long and didn't fit in the
notification box. This fix reduces the message to fit properly by
removing the extra information.
2013-10-04 11:11:24 +02:00
Bjoern Schiessle b7c3af11bf fix hidden fieled name 2013-10-04 10:46:55 +02:00
Bjoern Schiessle 47f59d2e42 we don't know \OCA\Encryption\Session if the encryption app is not enabled, so we have to set the status manually 2013-10-04 10:37:58 +02:00
Jan-Christoph Borchardt c335169f6d increase height of controls bar and elements to more clickable 44px 2013-10-04 08:41:16 +03:00
Jan-Christoph Borchardt 13218ec689 remove duplicate upload CSS from files.css 2013-10-03 17:08:29 +03:00
Jan-Christoph Borchardt f3e0cbdeed fix position of New and Deleted Files buttons 2013-10-03 16:49:49 +03:00
Jan-Christoph Borchardt 308d4383a3 simplify input elements for less cognitive load. No box-shadow, no text-shadow, smaller border-radius 2013-10-03 16:35:42 +03:00
Morris Jobke 5501dd623e add/remove specific CSS class - not all classes 2013-10-03 12:22:25 +02:00
Thomas Müller 9c23c3449b Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	core/css/share.css
2013-10-02 23:33:50 +02:00
Robin Appelman 51c34777c4 extend test case 2013-10-02 22:28:19 +02:00
Jan-Christoph Borchardt f8093699f7 Merge pull request #5093 from owncloud/file-actions
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
raghunayyar 0d5653c6b1 Takes nametext inside the anchor tag to fix the issue completely. 2013-10-02 22:11:03 +05:30
raghunayyar 4a5f3442b5 Closes Label inside the a tag for not hiding the fileactions. 2013-10-02 21:40:34 +05:30
raghunayyar 81b4904c78 File Selected on Click instead of download. 2013-10-02 21:13:07 +05:30
Jan-Christoph Borchardt 5feaa55779 simplify From Link icon in New menu 2013-10-02 18:27:39 +03:00
Jan-Christoph Borchardt 9853b33420 reduce rounded corners of New dropdown 2013-10-02 18:04:08 +03:00
Bjoern Schiessle b0a71bde15 maxX and maxY should be a integer 2013-10-02 16:34:05 +02:00
Bjoern Schiessle 9be6114a52 trash bin button needs to be an input field 2013-10-02 16:13:08 +02:00
Bjoern Schiessle eb1216f949 add previews to versions dialog 2013-10-02 15:23:51 +02:00
Bjoern Schiessle aa660a3475 remove deleted shares from the database table oc_share 2013-10-02 13:26:38 +02:00
kondou feb7028a78 Remove require in rawlist.php
Thanks @tanghus for pointing out the unneccessity of it.
2013-10-02 12:45:30 +02:00
kondou 013e9c27d2 Fix require in apps/files/ajax/rawlist.php 2013-10-02 12:21:52 +02:00
Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/private/util.php
2013-10-02 10:11:18 +02:00
Robin Appelman de43515cfa fix recursive delete for smb 2013-10-01 22:33:58 +02:00
Robin Appelman 29deef38b2 fix using touch to create a file for smb 2013-10-01 22:31:22 +02:00
Robin Appelman ea566868a8 return the correct result when doing an smb rename 2013-10-01 22:29:33 +02:00
Robin Appelman ea6115bfaa fix smb streamwrapper on non existing files 2013-10-01 22:18:03 +02:00
Thomas Müller b58a464b86 Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
Jenkins for ownCloud a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Bjoern Schiessle 4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00
Thomas Müller ecfde5faa1 Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the handling of depth infinity
The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released.

This will and has to follow!
2013-09-30 13:12:51 +02:00
Thomas Müller 480aeb804f Merge pull request #4459 from owncloud/appframework-master
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
Bjoern Schiessle 513dc20d4b also return success if no shares are found. 2013-09-30 13:05:34 +02:00
Bjoern Schiessle 6d830087db add testUpdateShareUpload() 2013-09-30 12:57:55 +02:00
Bjoern Schiessle 03db954e1a add getShareFromFolder() test 2013-09-30 12:38:36 +02:00
Bjoern Schiessle 9a2e82c3c5 Make sure that testDeleteShare() has some shares to delete 2013-09-30 12:23:44 +02:00
Thomas Müller 952433eae6 Merge branch 'master' into move-aborted-upload-detection-into-plugin-master 2013-09-30 09:21:37 +02:00
Thomas Müller 258e8d58da flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted 2013-09-29 22:20:42 +02:00
Thomas Müller 63ea6844e8 - adding unit test testGetShareFromUnknownId()
- fixing getShareFromId() for Oracle
- fixing error message
2013-09-29 22:16:48 +02:00
Thomas Müller 5462e199d3 Merge branch 'master' into appframework-master 2013-09-29 20:07:56 +02:00
Jenkins for ownCloud 59e4ff7d24 [tx-robot] updated from transifex 2013-09-29 00:03:26 -04:00
Morris Jobke 0f5fed5409 fix license header line breaks 2013-09-27 17:02:57 +02:00
Thomas Müller 687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Thomas Müller 735608f513 Merge pull request #4207 from owncloud/search_shared_files
add initial search in shared files
2013-09-27 05:18:12 -07:00
Bjoern Schiessle f935a38559 add some comments 2013-09-27 14:04:28 +02:00
Bjoern Schiessle 5b4f515e7b add test getShareFromId 2013-09-27 14:01:04 +02:00
Arthur Schiwon 3e1bdd8a04 remove outdated (thus failing) and anyway insufficient group tests - for now 2013-09-27 13:34:16 +02:00
Arthur Schiwon 05ee6606f1 give test file a proper name 2013-09-27 13:34:16 +02:00
Arthur Schiwon 2cebd8b92e added user_ldap tests via public api calls 2013-09-27 13:34:16 +02:00
Arthur Schiwon a1aff3e8a1 LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors 2013-09-27 13:34:16 +02:00
Arthur Schiwon 81cf4a22ef LDAP: coding style 2013-09-27 13:34:15 +02:00
Arthur Schiwon 84f522f406 LDAP: simple tests for the user backend 2013-09-27 13:34:15 +02:00
Arthur Schiwon bb162b1f94 LDAP: get rid of some PHP Warnings 2013-09-27 13:34:15 +02:00
Arthur Schiwon d4f92494a2 LDAP: make Access be a dependency to the user and group backend instead of inheriting it. 2013-09-27 13:34:15 +02:00
Arthur Schiwon b9cc2ad660 Whitespaces 2013-09-27 13:34:15 +02:00
Arthur Schiwon f04aa1af5d LDAP: don't check var type when you can specify the type in the parameter list 2013-09-27 13:34:15 +02:00
Arthur Schiwon b9cd22cf78 LDAP: use wrapper, not direct function call 2013-09-27 13:34:15 +02:00
Arthur Schiwon 5090ca3eb4 LDAP: add phpdoc 2013-09-27 13:34:15 +02:00
Arthur Schiwon 6e850e0bee LDAP: establish wrapper interface to allow proper mocking 2013-09-27 13:34:15 +02:00
Arthur Schiwon 52454e39b7 LDAP: move is_resource check to ldap wrapper to make it mockable 2013-09-27 13:34:15 +02:00
Arthur Schiwon d34fbf3a86 LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing 2013-09-27 13:34:15 +02:00
Arthur Schiwon 1a020e0696 Resolve merge conflict 2013-09-27 13:34:15 +02:00
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Bjoern Schiessle 7e54e8831e set rememberlogin to false for the encryption app 2013-09-26 19:34:50 +02:00
Bjoern Schiessle 62b8c36a40 check if encryption app is enabled before trying to calculate file size 2013-09-26 16:27:14 +02:00
Bjoern Schiessle b9d6539d76 Merge branch 'master' into ocs_share_api 2013-09-26 13:02:39 +02:00
Bjoern Schiessle 663009f895 fix check if app is enabled 2013-09-26 11:08:02 +02:00
Bjoern Schiessle 4d2dfa98c0 check if key exists before reading it 2013-09-26 11:06:58 +02:00
Bjoern Schiessle 0b98427536 fix check if app is enabled 2013-09-25 19:23:07 +02:00
Bjoern Schiessle 71bbb2ea8b check if key exists before reading it 2013-09-25 17:44:05 +02:00
Thomas Müller 09b64535a9 fixing copyright and add class documentation 2013-09-25 17:05:14 +02:00
Bjoern Schiessle 4077ed6ddb add some additional assertions to the tests 2013-09-25 15:05:23 +02:00
Thomas Müller db39fede97 Merge branch 'master' into appframework-master
Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Thomas Müller 333d3eda99 add error message to the assert 2013-09-25 09:43:16 +02:00
Jenkins for ownCloud 2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Thomas Müller cd2421c7ee adding PHPDoc comments to getBackend
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
kondou d7409547aa Fix not displaying "Upload something!" message
Fix #4940
2013-09-23 16:39:42 +02:00
Bjoern Schiessle 259f03bee2 remove debug output 2013-09-23 14:10:09 +02:00
Georg Ehrke 8a1618bce5 implement previews for public upload 2013-09-23 12:27:05 +02:00
Bjoern Schiessle fc76a13c52 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/public/share.php
2013-09-23 11:18:00 +02:00
Bjoern Schiessle f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
	settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
Georg Ehrke edd38e5948 fix previews in shared folders 2013-09-23 10:26:46 +02:00
Jenkins for ownCloud 28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Thomas Müller 2a0c51a8bf Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
Vincent Petry 1962bed261 Replace plus sign with space in files app URL #4932
Some apps create URLs to the files app and encode the spaces of a
directory using plus signs.

This fix ensures that plus signs are properly converted back to spaces
when parsing the URL on the JS side.
2013-09-20 22:08:57 +02:00
Jenkins for ownCloud 5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Jörn Friedrich Dreyer 4b3e56bcf9 remove unneccessary lib in namespace 2013-09-20 16:46:33 +02:00
Jörn Friedrich Dreyer 9e39118b52 namespaces use upcasefirst parts
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
Bjoern Schiessle 7626540679 make sure that files are shared correctly before each test and unshared again after the test 2013-09-20 12:38:23 +02:00
Bjoern Schiessle bd09910f67 disable encrpytion app before performing tests 2013-09-20 11:24:18 +02:00
Bjoern Schiessle 96c27ead92 check if encryption app is enabled 2013-09-20 11:21:34 +02:00
Bart Visscher 8e26f291a7 Merge pull request #4684 from owncloud/improved-console
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00