wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14846 commits 157 branches 562 tags 714 MiB
Commit graph

6723 commits

Author SHA1 Message Date
Bjoern Schiessle
e7dc6b21c8 split up reset()['path'] to make it compatible with older PHP versions 2013-10-17 15:47:36 +02:00
Vincent Petry
b4bffad99a Fixed zip download button for unlimited filesize in public mode 
Added missing condition to check whenever allowed zip size is unlimited.

Fixes #3717
 2013-10-17 15:30:08 +02:00
Vincent Petry
467f864db4 Fixed sharing status update for new/uploaded files 
Creating new files, folders or uploading files now have their sharing
icon updated accordingly.

For this, the global share status list that is cached in
OC.Share.statuses is reused for new files.

Performance should improve as the sharing list is now only loaded once
per navigation session.

In OC.Share, split loadIcons into loadIcons + updateIcons.

Fixes #4977
 2013-10-17 12:55:10 +02:00
Morris Jobke
ea4f6e2431 Merge pull request #5378 from owncloud/files-permissionsafteruploadfix 
Fixed upload permissions distinction between public and logged in upload
 2013-10-17 03:50:26 -07:00
Bjoern Schiessle
99738ae0bc add test for the reshare option 2013-10-17 12:23:37 +02:00
Bjoern Schiessle
ab6ee79e11 adjust tests 2013-10-17 11:23:07 +02:00
Bjoern Schiessle
abf10ac9bd new option to add reshares to the result 2013-10-17 11:10:31 +02:00
Vincent Petry
9cfb438ff7 Fixed upload permissions distinction between public and logged in upload 
Fixes #5370
 2013-10-17 10:46:55 +02:00
Frank Karlitschek
d70a6c3f98 Merge pull request #4935 from owncloud/webdav-depth-fix-master 
WebDAV depth infinity support - the dirty way
 2013-10-17 01:37:38 -07:00
Morris Jobke
a132144eca Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix 
Fixed conflict dialog in IE8
 2013-10-16 12:52:41 -07:00
Morris Jobke
db31541fe1 Merge pull request #5353 from owncloud/files-dndtodirbroken 
Fixed drag and drop to subfolder and breadcrumb
 2013-10-16 04:52:35 -07:00
Björn Schießle
9f8d52ee44 Merge pull request #5329 from owncloud/enc_fix_unencrypted_size 
try to fix unencrypted file size if it doesn't look plausible
 2013-10-16 02:25:28 -07:00
Bjoern Schiessle
6bfd8bdf63 revert last changes 2013-10-16 11:24:56 +02:00
Morris Jobke
97905775b0 Merge pull request #5354 from owncloud/enc_tests 
added simple test for getFileSize proxy
 2013-10-16 02:14:35 -07:00
Jenkins for ownCloud
630be99ddf [tx-robot] updated from transifex 2013-10-16 00:31:48 -04:00
Bjoern Schiessle
0811d2e304 added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong 2013-10-15 17:52:06 +02:00
Bjoern Schiessle
beaed2195d fix comment 2013-10-15 17:36:52 +02:00
Bjoern Schiessle
0d4117f6d5 added simple test for getFileSize proxy 2013-10-15 17:33:31 +02:00
Morris Jobke
04ea419f50 Merge pull request #5334 from owncloud/files-sharing-actionsafterupload 
Files sharing actions + navigation fixes
 2013-10-15 08:11:17 -07:00
Vincent Petry
c6f14001bb Fixed drag and drop upload to breadcrumb 2013-10-15 16:14:23 +02:00
Vincent Petry
92e646413a Fixed drag and drop onto folders 
Fixes #5351
 2013-10-15 15:59:45 +02:00
Morris Jobke
52501d6ba3 Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files 
check if we are writing to user/files, otherwise skip encryption
 2013-10-15 02:44:14 -07:00
Björn Schießle
a6d9319328 Merge pull request #5269 from owncloud/ocs_share_api_add_received_from 
ocs share api: add "received_from" and "received_from_displayname" field
 2013-10-15 02:17:23 -07:00
Vincent Petry
4ae1d08241 Merge pull request #5330 from owncloud/files-removedfileactionsbkg 
Removed extra bkg color on file actions when row is selected/hovered on
 2013-10-14 09:23:06 -07:00
Vincent Petry
fab4102c51 Disabled ajax mode for public files view 
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
 2013-10-14 17:47:38 +02:00
Vincent Petry
09b084dfed Fixed file permissions after public upload 
Fixes #5328
 2013-10-14 17:28:53 +02:00
Bjoern Schiessle
d3af7a9aa4 check if we are writing to user/files, otherwise skip encryption 2013-10-14 17:13:14 +02:00
Vincent Petry
e79d853867 Removed extra bkg color on file actions when row is selected/hovered on 2013-10-14 17:05:24 +02:00
Bjoern Schiessle
58196304b8 fix array key 2013-10-14 16:43:18 +02:00
Bjoern Schiessle
4151fd3ed9 try to fix unencrypted file size if it doesn't look plausible 2013-10-14 16:34:14 +02:00
Vincent Petry
b8285ca316 Added missing "grid" class on external storage's table 2013-10-14 14:02:39 +02:00
Jenkins for ownCloud
f3336f8877 [tx-robot] updated from transifex 2013-10-13 20:33:30 -04:00
Morris Jobke
a021a12b3b Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator 
Fixed external storage status indicator in admin page
 2013-10-13 13:03:02 -07:00
kondou
f828b51ede Hide files list header, when theres no files to see 2013-10-12 17:28:20 +02:00
Thomas Müller
bff6ca212a Merge pull request #5301 from owncloud/versioning_preview_shared 
versioning preview also for shared files
 2013-10-12 01:32:25 -07:00
Morris Jobke
22bb9762fd Merge pull request #5304 from owncloud/files-deleteiconpositionfix 
Fixed position of "delete" icon in files app
 2013-10-11 12:39:33 -07:00
Thomas Müller
dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master 
[OC6] file upload exception handling
 2013-10-11 10:35:17 -07:00
Vincent Petry
a4a52733f9 Fixed position of "delete" icon in files app 
There was an issue where only Chrome allows setting position: relative
on a td element.

This fix now works in IE8, Firefox and Chrome.

Fixes #5056
 2013-10-11 18:01:15 +02:00
Vincent Petry
067475a907 Merge pull request #5302 from owncloud/files-missingfileactionsafteradd 
File actions are now updated after create/upload file
 2013-10-11 08:45:42 -07:00
Vincent Petry
b2986e1994 Merge pull request #5274 from owncloud/files-ie8-deletecheckbox 
Fixed delete icon alignment in IE8
 2013-10-11 08:24:57 -07:00
Vincent Petry
e98ea06890 File actions are now updated after create/upload file 
The file actions must explicitly be updated by calling
FileActions.display() on the file element after creating or uploading a
file.

Fixes #4971 and #4993
 2013-10-11 17:07:48 +02:00
Bjoern Schiessle
9baedb4102 remove debug output 2013-10-11 17:06:43 +02:00
Bjoern Schiessle
c32c5979d8 Merge branch 'master' into versioning_preview_shared 2013-10-11 17:00:21 +02:00
Björn Schießle
5c664704a3 Merge pull request #5261 from owncloud/versioning_no_glob 
versioning: don't use glob() and getLocalFile()
 2013-10-11 07:57:14 -07:00
Björn Schießle
9a15aa8ee9 Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines 
fix setting dialog headlines for the encryption app
 2013-10-11 07:15:58 -07:00
Bjoern Schiessle
57beef1e36 fix setting dialog headlines for the encryption app 2013-10-11 15:56:08 +02:00
Björn Schießle
034968c612 Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing 
encryption: block file access if share keys are missing
 2013-10-11 06:37:53 -07:00
Bjoern Schiessle
3ee7711284 fix another typo 2013-10-11 15:26:30 +02:00
Bjoern Schiessle
2d79a79202 change error code to 403 2013-10-11 15:24:49 +02:00
Bjoern Schiessle
83c78bc7a8 fix typo in error message and change error code to 403 2013-10-11 15:23:12 +02:00
Vincent Petry
2b2a548610 Fixed IE8 misaligned date 
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
 2013-10-11 14:23:37 +02:00
Bjoern Schiessle
39d710e737 block file access if share keys are missing 2013-10-11 14:20:46 +02:00
Vincent Petry
39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Vincent Petry
bced346c3b Now using smaller spinner image for status indicator 
To make the status indicator appear smaller, even in IE8 that doesn't
support background-size, there is no a smaller animated gif
"loading-small" for that purpose.
 2013-10-11 12:36:30 +02:00
Björn Schießle
4336d42ab0 Merge pull request #5233 from owncloud/enc_filter_users 
only encrypt file to users with encryption keys
 2013-10-11 01:48:02 -07:00
Bjoern Schiessle
a0de5dd325 some small fixes 2013-10-11 10:34:34 +02:00
Bjoern Schiessle
7a1705d28e fix api tests 2013-10-11 10:28:01 +02:00
Jenkins for ownCloud
44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
Vincent Petry
75629a1f00 Fixed delete icon alignment in IE8 
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)
 2013-10-11 00:16:41 +02:00
Bjoern Schiessle
f4e86045de make files versions root a class constant 2013-10-10 20:09:38 +02:00
Bjoern Schiessle
87cccb2e32 some small changes/fixes 2013-10-10 20:06:42 +02:00
Bjoern Schiessle
3dd313dca2 add "received_from" and "received_from_displayname" field in case of a reshared file to the output 2013-10-10 19:46:45 +02:00
Bjoern Schiessle
4c2e3919de make previews work for shared files in the versions drop-down 2013-10-10 17:23:27 +02:00
Bjoern Schiessle
92009c5d8e fix getVersions() for sub directories 2013-10-10 16:58:11 +02:00
Vincent Petry
e2a4417079 Fixed conflict dialog in IE8 
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
 2013-10-10 15:54:00 +02:00
Bjoern Schiessle
909af2b62e don't cache if the encryption is enabled, this can lead to problems during unit testing 2013-10-10 15:02:52 +02:00
Bjoern Schiessle
bb3b38947d add missing preview link 2013-10-10 14:57:25 +02:00
Bjoern Schiessle
e56947255e don't use glob() and getLocalFile(), this can lead to problems on windows servers 2013-10-10 14:43:40 +02:00
Morris Jobke
e276ffedd3 Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken 
Fixed files view regular file actions in IE8
 2013-10-10 05:14:09 -07:00
Morris Jobke
cf554fd804 Merge pull request #5182 from owncloud/fix-sharring-with-password-screen 
Fix password screen for public shares
 2013-10-10 04:49:47 -07:00
blizzz
666e52a46b Merge pull request #5114 from owncloud/ldap_uuid_attr_groups 
LDAP: allow different UUID attributes for groups and users
 2013-10-10 03:27:28 -07:00
Vincent Petry
bf00ccd1d6 Fixed files view regular file actions in IE8 
Fixes #5256

A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
 2013-10-10 12:21:02 +02:00
Vincent Petry
e88b493136 Fixed external storage status indicator in admin page 
- Fixes #5241
- Fixed indicator to appear, its selector was wrong
- Added spinner while saving an entry's settings
- Removed ajax "async: false" that blocked the browser while saving
 2013-10-10 11:12:21 +02:00
VicDeo
1cb47bf777 Merge pull request #5221 from owncloud/fixing-5217-master 
fixing php 5.3 compatibility
 2013-10-10 01:55:18 -07:00
Bjoern Schiessle
a1719deabe make sure that we are logged in ad user1 while performing the tests 2013-10-10 10:47:35 +02:00
Vincent Petry
3a3819b303 Merge pull request #5134 from owncloud/trashbin-homeiconbroken 
Do not call changeDirectory() when no dir set on breadcrumb
 2013-10-09 09:01:43 -07:00
Björn Schießle
223adc3167 Merge pull request #5230 from owncloud/trashbin_fixes 
Trashbin fixes
 2013-10-09 08:27:54 -07:00
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