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

6585 commits

Author SHA1 Message Date
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
Bjoern Schiessle
57092e817f disable encryption app for share API tests 2013-09-19 20:14:34 +02:00
Jörn Friedrich Dreyer
6aeb0a99da same for search by mime 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
3b4020e811 add all results, sharing cache also returns entries for shared files in external storages 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
466fd8acda fix getAll(), refactor search by mime & search 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
392c6b6832 return fixed path, skip shared files outside of 'files' 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
27511d9187 divide ids into chunks of 1k 2013-09-19 21:08:32 +03:00
Jörn Friedrich Dreyer
e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Bart Visscher
a9ea99e93d Add copyright, remove starting blank line 2013-09-19 19:12:16 +02:00
Jörn Friedrich Dreyer
7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/filelist.js
 2013-09-19 17:00:54 +02:00
Bjoern Schiessle
39920955f2 set share id to 'unknown' if we can't retrive one 2013-09-19 16:52:44 +02:00
Jörn Friedrich Dreyer
bd5cb1d801 Merge pull request #4900 from owncloud/fixing-4488-master 
File permissions are part of the ajax response of file upload
 2013-09-19 07:46:37 -07:00
Bjoern Schiessle
c9f1538c1f extend API to get the shares from all files in a given folder 2013-09-19 16:41:29 +02:00
Jörn Friedrich Dreyer
9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto 
initial scrollto implementation
 2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer
98ff847830 fix race condition in lazy preview loading 2013-09-19 14:46:33 +02:00
Bjoern Schiessle
8cf8c0b161 remove some unused variables 2013-09-19 14:42:34 +02:00
Bjoern Schiessle
b947aab802 some unit test for the new ocs share api 2013-09-19 14:39:51 +02:00
Thomas Müller
4344c62f7e Merge branch 'master' into fixing-4488-master 2013-09-19 11:43:38 +02:00
Jörn Friedrich Dreyer
1bba800e47 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-19 11:33:34 +02:00
Jörn Friedrich Dreyer
ae97fad632 fix double translation of error message 2013-09-19 11:32:56 +02:00
Thomas Müller
eea02cee2f Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-19 11:15:20 +02:00
Thomas Müller
c30c153ea5 fixing typos and l10n 2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer
89ed0007c0 jsdoc types should go into {} 2013-09-19 11:11:22 +02:00
Bjoern Schiessle
199121134f return error if wrong shareType is given 2013-09-19 10:33:04 +02:00
Bjoern Schiessle
bc3b147396 remove spaces 2013-09-19 10:13:21 +02:00
Jörn Friedrich Dreyer
0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00
Thomas Müller
43a96621ea adding comma to get cleaner diffs in the future 2013-09-18 23:42:36 +02:00
Thomas Müller
3c0e93e220 no file actions during upload 2013-09-18 23:06:48 +02:00
Jenkins for ownCloud
6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Jörn Friedrich Dreyer
7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer
12ff268e60 move upload dialog css to separate file 2013-09-18 17:20:14 +02:00
Bjoern Schiessle
4edd8b8303 remove debug output 2013-09-18 16:08:29 +02:00
Bjoern Schiessle
5fb0e257a4 let user repeat the recovery key password to prevent typos 2013-09-18 16:03:53 +02:00
Jörn Friedrich Dreyer
715846626e hide excessive logging with a trace flag 2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer
17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-18 14:19:58 +02:00
Jörn Friedrich Dreyer
ec1949f5ed Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-18 14:15:28 +02:00
Jörn Friedrich Dreyer
c531b4ef5b Merge pull request #4872 from owncloud/refactor_upload_progress 
refactor upload progress
 2013-09-18 04:55:10 -07:00
Thomas Müller
20a43d1982 remove file action elements before recreating them 2013-09-18 13:09:47 +02:00
Thomas Müller
6ed2df11fc store the permissions retrieved via ajax within the dom element 2013-09-18 13:09:04 +02:00
Thomas Müller
370ed814f7 add permissions of the file to the json response 2013-09-18 11:22:29 +02:00
Björn Schießle
e0f18ec72b Merge pull request #4708 from owncloud/encryption_fixes 
make sure that initial encryption also starts for a fresh installation
 2013-09-18 01:33:52 -07:00
Bjoern Schiessle
171b7ebffe remove debug output 2013-09-18 10:11:20 +02:00
Jörn Friedrich Dreyer
86c4c83b86 use exists 2013-09-17 19:11:18 +02:00
Jörn Friedrich Dreyer
b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
 2013-09-17 19:10:46 +02:00
Jörn Friedrich Dreyer
b40925ae17 initial scrollto implementation: 
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
 2013-09-17 18:40:51 +02:00
Bjoern Schiessle
72eaf2894a performance improvement, check configuration only if no private key exists 2013-09-17 16:53:52 +02:00
Bjoern Schiessle
e52639e4e6 use share ID as REST resource 2013-09-17 15:27:46 +02:00
Thomas Müller
9b420e8660 use \OC::$server->getPreviewManager() instead of \OCP\Preview 2013-09-17 13:33:47 +02:00
Bjoern Schiessle
86dbb13823 more rest-style API 2013-09-17 11:53:38 +02:00
Bjoern Schiessle
ef3307f099 return error if public upload is disabled 2013-09-16 17:42:56 +02:00
Jenkins for ownCloud
5cf12888ad [tx-robot] updated from transifex 2013-09-16 11:38:45 -04:00
Bjoern Schiessle
7aed24fa6c allow to set a different permission during initial share operation 2013-09-16 17:28:17 +02:00
Bjoern Schiessle
14437ffd15 ocs api for file sharing 2013-09-16 17:04:49 +02:00
Jörn Friedrich Dreyer
d41e722629 refactor upload progress 2013-09-16 14:14:46 +02:00
Bjoern Schiessle
82cbbb8ab8 Merge branch 'master' into encryption_improved_error_messages_4617 
Conflicts:
	apps/files/index.php
 2013-09-16 10:42:37 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00
Thomas Müller
46f59b165e Merge pull request #4838 from owncloud/refactor_upload_js 
refactor upload js & html to always use only js to fill form data
 2013-09-16 01:06:24 -07:00
Thomas Müller
db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons 
Use external and shared icons in OC.Dialogs.filepicker()
 2013-09-15 02:42:14 -07:00
Thomas Müller
a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist 
Ajax calls for "files" and "files_trashbin" apps
 2013-09-14 12:51:16 -07:00
kondou
c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
Jenkins for ownCloud
556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Vincent Petry
ec2f20f720 Fixed files_trashbin to also use hash URL part for IE8 2013-09-13 21:00:15 +02:00
Vincent Petry
30a2f2f352 Use hash part of URL for IE8 in files app 
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.

This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.

From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.

In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.

When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
 2013-09-13 20:48:35 +02:00
Vincent Petry
4d38441e72 Fixed loading mask/spinner to stay fixed on scroll 2013-09-13 19:59:15 +02:00
Vincent Petry
611075bf20 Fixed JS error in trashbin app 2013-09-13 19:59:15 +02:00
Vincent Petry
3cf0820d35 Changed breadcrumb event handling to not use delegate 
Using delegate might break apps that embed themselves in the files
container. When an app embeds itself and the user clicks a breadcrumb,
it will simply reload the whole browser page.
 2013-09-13 19:59:15 +02:00
Vincent Petry
364e7991a4 Fixed ajax support to also update the current dir permissions 2013-09-13 19:59:15 +02:00
Vincent Petry
4549cf519e Added missing "files" JS to files_trashbin module 
The recent refactoring for the breadcrumb resizing relies on the "Files"
object which is in the "files" Javascript file.

This fix includes it here as well.
 2013-09-13 19:59:15 +02:00
Thomas Müller
4ab5e58e02 update file summary on ajax file list load 2013-09-13 19:59:15 +02:00
Thomas Müller
4e751cbb47 fixing breadcrumbs on ajax loading of files 2013-09-13 19:59:15 +02:00
Thomas Müller
ef955bae56 calling replaceSVG() to display breadcrumb images correctly on IE8 2013-09-13 19:59:15 +02:00
Thomas Müller
e6f21927d6 fixing no-repeat for IE8 2013-09-13 19:59:15 +02:00
Vincent Petry
1304b511e9 Ajax calls for "files" and "files_trashbin" apps 
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list

Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
  functions
- Fixed some file paths in trashbin app to be similar to the files app
 2013-09-13 19:59:14 +02:00
Bart Visscher
666bbbe060 Use appinfo/register_command.php to add commands to the console command 2013-09-13 18:10:04 +02:00
Jörn Friedrich Dreyer
7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
Thomas Müller
d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master 
Always check variable type before using readdir to avoid surprises
 2013-09-12 15:44:20 -07:00
Jan-Christoph Borchardt
c7ca86799b Merge pull request #4816 from owncloud/fixing-723-master 
Fixing 723 master
 2013-09-12 07:48:00 -07:00
Thomas Tanghus
b7205d97d7 Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist 
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
 2013-09-11 17:18:04 -07:00
Thomas Müller
9d661eab23 adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing 2013-09-12 00:40:35 +02:00
Thomas Müller
5af111b0de added determineIcon to \OCA\files\lib\Helper 2013-09-12 00:39:52 +02:00
Thomas Müller
3066b44928 remove unused $relativePath 2013-09-12 00:39:03 +02:00
kondou
4d62f747fa Clean up rawlist.php and fix non-array request 2013-09-12 00:21:01 +02:00
Thomas Müller
b49f43c3ae move icon generation logic out of the template 2013-09-12 00:13:19 +02:00
Jenkins for ownCloud
68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
kondou
83d3df4111 Split some lines, use ===, avoid unnecessary operation 2013-09-11 12:12:40 +02:00
Bart Visscher
4ab8dc9c08 Merge pull request #4788 from owncloud/fixin-irods-session-master 
Fixing session handling in iRODS
 2013-09-11 00:01:55 -07:00
Thomas Müller
3b835ea1b6 never hack late night 2013-09-11 01:11:57 +02:00
Thomas Müller
ec255b52be fixing boolean handling 2013-09-11 00:49:45 +02:00
Jörn Friedrich Dreyer
2c9b3d32ef unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack 2013-09-10 17:34:28 +02:00
Jörn Friedrich Dreyer
cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Jenkins for ownCloud
72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Thomas Müller
d63ca25a94 proper test for use_logon_credentials 2013-09-10 12:35:14 +02:00
Thomas Müller
36e7a7c29b use \OC::$session instead of $_SESSION 2013-09-10 12:34:41 +02:00
Thomas Müller
21e5daa218 removing all ?> jutt in case 2013-09-10 11:25:40 +02:00
Thomas Müller
c32c116957 removing ?> followed by whitespaces 2013-09-10 11:16:43 +02:00
Thomas Müller
956a2335ad Merge pull request #4647 from owncloud/fix_4619 
Workaround for IE 9 & 10 for clicking filelist after adding new item
 2013-09-10 01:22:25 -07:00
Thomas Tanghus
2cdde7a56a Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes 
Fixed missing checkboxes in IE8
 2013-09-09 18:25:37 -07:00
Jenkins for ownCloud
92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Vincent Petry
5f67ccba00 Fixed missing checkboxes in IE8 
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.

Replace it with a more compatible selector.
 2013-09-08 22:21:07 +02:00
Jörn Friedrich Dreyer
03c90e968f whitespace and indentation fixes 2013-09-08 17:29:43 +02:00
Jörn Friedrich Dreyer
577e3f22b2 remove unused hooks 2013-09-08 10:43:52 +02:00
Jörn Friedrich Dreyer
8828fafd36 cleanup comments 2013-09-08 10:41:20 +02:00
Jenkins for ownCloud
e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jörn Friedrich Dreyer
ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer
673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer
796e137e82 fix upload to folder 2013-09-06 18:51:27 +02:00
Jörn Friedrich Dreyer
e2c0fe8296 fix upload of multiple files 2013-09-06 18:16:40 +02:00
Jörn Friedrich Dreyer
238d92b11c refactor replace and autorename resolution in upload.php 2013-09-06 17:53:58 +02:00
Bjoern Schiessle
b2dde14dbc coding style fixes 2013-09-06 16:07:18 +02:00
Bjoern Schiessle
93f4dec798 fix part file handling and real size calculation, this should also solve #4581 
Conflicts:
	apps/files_encryption/lib/stream.php
 2013-09-06 16:06:34 +02:00
Bjoern Schiessle
f6830e7462 check shares for the real file and not for the .part file 2013-09-06 16:05:11 +02:00
Bjoern Schiessle
404e36323a first check if a extension exists before comparing it 2013-09-06 16:05:03 +02:00
Bjoern Schiessle
597a3cf1ad handle part files correctly 2013-09-06 16:04:56 +02:00
Bjoern Schiessle
3861c9bce1 some more OCS calls for sharing 2013-09-06 16:00:01 +02:00
Jörn Friedrich Dreyer
4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
Bjoern Schiessle
1558cb860c remove test code 2013-09-06 13:16:48 +02:00
Bjoern Schiessle
fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Bjoern Schiessle
69b1625f0e re-added error.php 2013-09-06 12:27:25 +02:00
Pete McFarlane
83afba5070 prefix #filestable to tbody tr 2013-09-06 10:01:11 +01:00
Bjoern Schiessle
b6ee727399 intermediate result ocs api 2013-09-06 10:49:21 +02:00
kondou
226c205631 Use usort() instead of uasort() to not maintain keys 2013-09-06 06:45:16 +02:00
kondou
85e41d9500 Sort files by name, not by mimetype 2013-09-05 23:17:53 +02:00
kondou
f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer
8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
kondou
992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Bjoern Schiessle
f8563ec583 Merge branch 'master' into sharing_mail_notification_master 
increased version number to trigger db update

Conflicts:
	lib/util.php
 2013-09-05 13:39:45 +02:00
Jenkins for ownCloud
0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon
c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Jörn Friedrich Dreyer
03ddf8da80 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-05 10:31:43 +02:00
Jörn Friedrich Dreyer
bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
Thomas Müller
3b25babe35 Merge pull request #4683 from owncloud/publicuploadjserror 
Fixed public upload error that prevents upload
 2013-09-04 11:50:38 -07:00
Bjoern Schiessle
21a0a96e43 intermediate results, share api 2013-09-04 17:25:15 +02:00
Jörn Friedrich Dreyer
49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Bjoern Schiessle
985758305f initial commit, start implementing the ocs share api 2013-09-04 14:32:05 +02:00
Jörn Friedrich Dreyer
4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-09-04 14:11:40 +02:00
Arthur Schiwon
ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
Bjoern Schiessle
4dbc787055 check if stream wrapper is already registered to avoid warning 2013-09-03 15:56:25 +02:00
Jörn Friedrich Dreyer
85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing 
Texteditor polishing
 2013-09-03 05:38:59 -07:00
Jenkins for ownCloud
fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Bjoern Schiessle
3d49631b8d make sure that initial encryption also starts for a fresh installation 2013-09-03 13:24:30 +02:00
Jörn Friedrich Dreyer
449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment 
This reverts commit 64d09452f5.
 2013-09-03 13:20:20 +02:00
Bart Visscher
cafc8cb223 Change Files Scan command to use OC\User\Manager 2013-09-02 18:18:12 +02:00
ringmaster
39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 2013-09-02 09:59:01 -04:00
ringmaster
df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 2013-09-02 09:59:00 -04:00
Owen Winkler
9a263a500a Employ config option for OpenSSL config file, if provided. 
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
 2013-09-02 09:59:00 -04:00
Owen Winkler
fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
Bjoern Schiessle
b918c06be6 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/util.php
 2013-09-02 14:41:46 +02:00
Bjoern Schiessle
88c4ac9b98 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-02 14:39:45 +02:00
Bjoern Schiessle
6572ca811f error.php no longer needed 2013-09-02 11:36:20 +02:00
Bjoern Schiessle
5e508f1ccb improved documentation of the methods 2013-09-02 11:34:28 +02:00
Bjoern Schiessle
bab63c22ee encryption error messages, distinguish between a re-enabled encryption app and a password change from outside 2013-09-02 11:26:11 +02:00
Bernhard Posselt
f038cb9aea Merge pull request #4671 from owncloud/emptycontent 
centers text message in empty-content page (files and files_trashbin apps)
 2013-09-01 17:47:55 -07:00
Jenkins for ownCloud
e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
Bart Visscher
0aba549e7f Use more object oriented way for console commands 2013-09-01 16:40:50 +02:00
Vincent Petry
307b673b79 Fixed public upload error that prevents upload 
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.

This fix sets the variable scope to the window to make it accessible
outside.
 2013-09-01 16:14:46 +02:00
Alessandro Cosentino
b10a646bc8 rename emptyfolder to emptycontent 2013-08-31 11:25:11 -04:00
Alessandro Cosentino
4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Georg Ehrke
668c4c2652 fix issue with filetable background 2013-08-30 22:05:44 +02:00
Georg Ehrke
8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Georg Ehrke
40cee5639e use gerMimeTypeDetector detectPath instead of getMimeType 2013-08-30 18:07:49 +02:00
Jenkins for ownCloud
dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
petemcfarlane
ab1f78eac3 prefix 'tbody tr' to separate app/core css errors 
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
 2013-08-30 10:48:04 +01:00
Bjoern Schiessle
d7dca966a2 improved error messaging, initial commit 2013-08-30 10:17:50 +02:00
ringmaster
f4ec5182bd Workaround for IE 9 & 10 for clicking filelist after adding new item 2013-08-29 12:06:07 -04:00
Georg Ehrke
b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Thomas Müller
81cab5ada8 Merge pull request #3926 from owncloud/improve_filesummary 
Improve filelist summary
 2013-08-28 15:11:09 -07:00
Bjoern Schiessle
aed71bb420 also move empty folders to the trash bin as discussed here #4590 2013-08-28 15:46:44 +02:00
Bart Visscher
ada15a2b8e Merge pull request #4489 from owncloud/clean-3rdparty-mess-master 
Clean 3rdparty mess master
 2013-08-28 06:12:58 -07:00
kondou
6bd0f3cba7 Reimplement filesummary in JS 
Fix #993
 2013-08-28 15:10:17 +02:00
Morris Jobke
5a03707184 Merge pull request #4601 from owncloud/fixing-4341-master 
backport of #4357 to master
 2013-08-28 04:42:50 -07:00
Jenkins for ownCloud
3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Thomas Müller
3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
Morris Jobke
34a32d862c Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement 
Fix "select all" checkbox displacement when checked, fix #4571
 2013-08-27 14:21:34 -07:00
Arthur Schiwon
321c514782 LDAP: case insensitive replace for more robustness 2013-08-27 22:23:48 +02:00
Jenkins for ownCloud
d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Bjoern Schiessle
316d9bfed6 the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not 2013-08-27 14:39:43 +02:00
Morris Jobke
ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master 
kill zh_CN.GB2312
 2013-08-27 02:00:48 -07:00
Thomas Müller
c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller
8cf9336bcb storage information is path specific 2013-08-27 00:59:58 +02:00
Georg Ehrke
b16a018da9 use random string as id for checkbox 2013-08-26 16:33:51 +02:00
Georg Ehrke
d538a566ac fix background size in filelist.js 2013-08-26 14:36:18 +02:00
Georg Ehrke
6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Georg Ehrke
46cbd7cd3b fix preview issue when uploading a file with parentheses 2013-08-26 12:16:51 +02:00
Morris Jobke
a5873a96fa Merge pull request #4542 from owncloud/fixing-4504-master 
remove duplicate code
 2013-08-26 02:19:32 -07:00
Pellaeon Lin
cd41de839f Fix "select all" checkbox displacement when checked 2013-08-26 10:57:14 +08:00
Jenkins for ownCloud
d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
Jenkins for ownCloud
596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04:00
Georg Ehrke
13e34649bf move path generation for previews to dedicated function 2013-08-23 23:19:21 +02:00
Georg Ehrke
6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Jenkins for ownCloud
02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
Jörn Friedrich Dreyer
7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
Thomas Müller
582b33bdf1 Merge pull request #4537 from owncloud/no-realpath 
Do not use realpath() on includes.
 2013-08-22 01:50:31 -07:00
Thomas Müller
101cfa2359 remove duplicate code 2013-08-22 00:09:43 +02:00
Arthur Schiwon
c482512e23 LDAP: fix wrong hook name 2013-08-22 00:00:33 +02:00
Georg Ehrke
224b80f906 move isMimeSupported out of template files 2013-08-21 15:55:59 +02:00
Jörn Friedrich Dreyer
bf04daff82 architecture too complex 2013-08-21 14:58:28 +02:00
Jenkins for ownCloud
a89199cc7b [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
Andreas Fischer
83afb46205 Use __DIR__ instead of dirname(__FILE__). 
This is possible because we require PHP 5.3 or higher.
 2013-08-21 11:01:24 +02:00
Andreas Fischer
85ac9572ce Also remove other unnecessary realpath() calls. 2013-08-21 10:53:18 +02:00
Andreas Fischer
9753e44ac2 Do not use realpath() on includes. 
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.

'include' works just fine with symlinks, "./" and "../".
 2013-08-21 10:52:22 +02:00
Christopher
90da518e3e Merge pull request #4262 from owncloud/fix_jslint_kondou 
Fix some JSLint warnings
 2013-08-20 12:45:10 -07:00
Thomas Müller
884c6b5a82 Merge pull request #4512 from owncloud/readdir-strict-equals 
use strict equals in readdir loops to prevent issues with '0' files
 2013-08-20 01:17:25 -07:00
Jenkins for ownCloud
e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Georg Ehrke
cbeccb2fcd Merge branch 'master' into readdir-strict-equals 2013-08-19 17:30:56 +02:00
Thomas Müller
95e1b62940 Merge pull request #4510 from owncloud/f_e_webdav_urlencoding 
Fix files_external webdav up and download when path contains ' '
 2013-08-19 05:13:20 -07:00
Georg Ehrke
d9e8ebabdc outsource sharing and deleted files previews to apps 2013-08-19 13:24:07 +02:00
icewind1991
d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota 
Move quota logic from filesystem proxy to storage wrapper
 2013-08-19 03:38:55 -07:00
Georg Ehrke
48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02:00
Robin Appelman
c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 2013-08-19 12:04:53 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Jörn Friedrich Dreyer
89c928c3be replace ' ' with '%20' in urls for curl 2013-08-19 11:09:55 +02:00