715846626e
hide excessive logging with a trace flag
2013-09-18 14:39:39 +02:00
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
ec1949f5ed
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-18 14:15:28 +02:00
c531b4ef5b
Merge pull request #4872 from owncloud/refactor_upload_progress
...
refactor upload progress
2013-09-18 04:55:10 -07:00
20a43d1982
remove file action elements before recreating them
2013-09-18 13:09:47 +02:00
6ed2df11fc
store the permissions retrieved via ajax within the dom element
2013-09-18 13:09:04 +02:00
370ed814f7
add permissions of the file to the json response
2013-09-18 11:22:29 +02:00
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
171b7ebffe
remove debug output
2013-09-18 10:11:20 +02:00
86c4c83b86
use exists
2013-09-17 19:11:18 +02:00
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
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
72eaf2894a
performance improvement, check configuration only if no private key exists
2013-09-17 16:53:52 +02:00
e52639e4e6
use share ID as REST resource
2013-09-17 15:27:46 +02:00
9b420e8660
use \OC::$server->getPreviewManager() instead of \OCP\Preview
2013-09-17 13:33:47 +02:00
86dbb13823
more rest-style API
2013-09-17 11:53:38 +02:00
ef3307f099
return error if public upload is disabled
2013-09-16 17:42:56 +02:00
5cf12888ad
[tx-robot] updated from transifex
2013-09-16 11:38:45 -04:00
7aed24fa6c
allow to set a different permission during initial share operation
2013-09-16 17:28:17 +02:00
14437ffd15
ocs api for file sharing
2013-09-16 17:04:49 +02:00
d41e722629
refactor upload progress
2013-09-16 14:14:46 +02:00
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
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
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
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
c117e719da
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-14 14:35:23 +02:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
ec2f20f720
Fixed files_trashbin to also use hash URL part for IE8
2013-09-13 21:00:15 +02:00
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
4d38441e72
Fixed loading mask/spinner to stay fixed on scroll
2013-09-13 19:59:15 +02:00
611075bf20
Fixed JS error in trashbin app
2013-09-13 19:59:15 +02:00
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
364e7991a4
Fixed ajax support to also update the current dir permissions
2013-09-13 19:59:15 +02:00
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
4ab5e58e02
update file summary on ajax file list load
2013-09-13 19:59:15 +02:00
4e751cbb47
fixing breadcrumbs on ajax loading of files
2013-09-13 19:59:15 +02:00
ef955bae56
calling replaceSVG() to display breadcrumb images correctly on IE8
2013-09-13 19:59:15 +02:00
e6f21927d6
fixing no-repeat for IE8
2013-09-13 19:59:15 +02:00
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
666bbbe060
Use appinfo/register_command.php to add commands to the console command
2013-09-13 18:10:04 +02:00
7854cf04ee
refactor upload js & html to always use only js to fill form data
2013-09-13 17:07:52 +02:00
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
c7ca86799b
Merge pull request #4816 from owncloud/fixing-723-master
...
Fixing 723 master
2013-09-12 07:48:00 -07:00
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
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
2013-09-12 00:40:35 +02:00
5af111b0de
added determineIcon to \OCA\files\lib\Helper
2013-09-12 00:39:52 +02:00
3066b44928
remove unused $relativePath
2013-09-12 00:39:03 +02:00
4d62f747fa
Clean up rawlist.php and fix non-array request
2013-09-12 00:21:01 +02:00
b49f43c3ae
move icon generation logic out of the template
2013-09-12 00:13:19 +02:00
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
83d3df4111
Split some lines, use ===, avoid unnecessary operation
2013-09-11 12:12:40 +02:00
4ab8dc9c08
Merge pull request #4788 from owncloud/fixin-irods-session-master
...
Fixing session handling in iRODS
2013-09-11 00:01:55 -07:00
3b835ea1b6
never hack late night
2013-09-11 01:11:57 +02:00
ec255b52be
fixing boolean handling
2013-09-11 00:49:45 +02:00
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
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
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
d63ca25a94
proper test for use_logon_credentials
2013-09-10 12:35:14 +02:00
36e7a7c29b
use \OC::$session instead of $_SESSION
2013-09-10 12:34:41 +02:00
21e5daa218
removing all ?> jutt in case
2013-09-10 11:25:40 +02:00
c32c116957
removing ?> followed by whitespaces
2013-09-10 11:16:43 +02:00
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
2cdde7a56a
Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
...
Fixed missing checkboxes in IE8
2013-09-09 18:25:37 -07:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
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
03c90e968f
whitespace and indentation fixes
2013-09-08 17:29:43 +02:00
577e3f22b2
remove unused hooks
2013-09-08 10:43:52 +02:00
8828fafd36
cleanup comments
2013-09-08 10:41:20 +02:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
ce03501646
fine ie8 compatability
2013-09-06 23:44:40 +02:00
673e0c01a7
fix page leaving checks
2013-09-06 22:40:10 +02:00
796e137e82
fix upload to folder
2013-09-06 18:51:27 +02:00
e2c0fe8296
fix upload of multiple files
2013-09-06 18:16:40 +02:00
238d92b11c
refactor replace and autorename resolution in upload.php
2013-09-06 17:53:58 +02:00
b2dde14dbc
coding style fixes
2013-09-06 16:07:18 +02:00
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
f6830e7462
check shares for the real file and not for the .part file
2013-09-06 16:05:11 +02:00
404e36323a
first check if a extension exists before comparing it
2013-09-06 16:05:03 +02:00
597a3cf1ad
handle part files correctly
2013-09-06 16:04:56 +02:00
3861c9bce1
some more OCS calls for sharing
2013-09-06 16:00:01 +02:00
4d04dd9c4c
Merge branch 'master' into fix_3728_with_file_exists_dialog
2013-09-06 13:42:05 +02:00
1558cb860c
remove test code
2013-09-06 13:16:48 +02:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
69b1625f0e
re-added error.php
2013-09-06 12:27:25 +02:00
83afba5070
prefix #filestable to tbody tr
2013-09-06 10:01:11 +01:00
b6ee727399
intermediate result ocs api
2013-09-06 10:49:21 +02:00
226c205631
Use usort() instead of uasort() to not maintain keys
2013-09-06 06:45:16 +02:00
85e41d9500
Sort files by name, not by mimetype
2013-09-05 23:17:53 +02:00
f84fe479a5
Only use mimetype_list and clean up a bit
2013-09-05 18:40:55 +02:00
8a7e26b268
cleanup dead code
2013-09-05 17:46:19 +02:00
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
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
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
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
bbf8acb383
separate uploading code from progress code, add progress capability detection
2013-09-05 10:19:54 +02:00
3b25babe35
Merge pull request #4683 from owncloud/publicuploadjserror
...
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
21a0a96e43
intermediate results, share api
2013-09-04 17:25:15 +02:00
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
985758305f
initial commit, start implementing the ocs share api
2013-09-04 14:32:05 +02:00
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
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
4dbc787055
check if stream wrapper is already registered to avoid warning
2013-09-03 15:56:25 +02:00
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
3d49631b8d
make sure that initial encryption also starts for a fresh installation
2013-09-03 13:24:30 +02:00
449fe8c75e
Revert "remove editor div in filelist", add "is deprecated" comment
...
This reverts commit 64d09452f5
2013-09-03 13:20:20 +02:00
cafc8cb223
Change Files Scan command to use OC\User\Manager
2013-09-02 18:18:12 +02:00
39f4538e0f
This function doesn't cache anymore. Adjusted PHPDoc to suit.
2013-09-02 09:59:01 -04:00
df7bfa4bf0
Don't cache the pkey, skip generation if the keyfile exists
2013-09-02 09:59:00 -04:00
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
fb34f49913
Start a branch for easier OpenSSL configuration.
2013-09-02 09:58:19 -04:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
88c4ac9b98
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-02 14:39:45 +02:00
6572ca811f
error.php no longer needed
2013-09-02 11:36:20 +02:00
5e508f1ccb
improved documentation of the methods
2013-09-02 11:34:28 +02:00
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
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
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
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
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -04:00
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04:00
668c4c2652
fix issue with filetable background
2013-08-30 22:05:44 +02:00
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
40cee5639e
use gerMimeTypeDetector detectPath instead of getMimeType
2013-08-30 18:07:49 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
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
d7dca966a2
improved error messaging, initial commit
2013-08-30 10:17:50 +02:00
f4ec5182bd
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-08-29 12:06:07 -04:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
81cab5ada8
Merge pull request #3926 from owncloud/improve_filesummary
...
Improve filelist summary
2013-08-28 15:11:09 -07:00
aed71bb420
also move empty folders to the trash bin as discussed here #4590
2013-08-28 15:46:44 +02:00
ada15a2b8e
Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
...
Clean 3rdparty mess master
2013-08-28 06:12:58 -07:00
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
5a03707184
Merge pull request #4601 from owncloud/fixing-4341-master
...
backport of #4357 to master
2013-08-28 04:42:50 -07:00
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
3eed060ec9
backport of #4357 to master
2013-08-27 23:53:04 +02:00
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
321c514782
LDAP: case insensitive replace for more robustness
2013-08-27 22:23:48 +02:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
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
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
b16a018da9
use random string as id for checkbox
2013-08-26 16:33:51 +02:00
d538a566ac
fix background size in filelist.js
2013-08-26 14:36:18 +02:00
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
46cbd7cd3b
fix preview issue when uploading a file with parentheses
2013-08-26 12:16:51 +02:00
a5873a96fa
Merge pull request #4542 from owncloud/fixing-4504-master
...
remove duplicate code
2013-08-26 02:19:32 -07:00
cd41de839f
Fix "select all" checkbox displacement when checked
2013-08-26 10:57:14 +08:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
13e34649bf
move path generation for previews to dedicated function
2013-08-23 23:19:21 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
7c9d999243
reduced complexity, added listing conflicts to dialog
2013-08-22 14:29:00 +02:00
582b33bdf1
Merge pull request #4537 from owncloud/no-realpath
...
Do not use realpath() on includes.
2013-08-22 01:50:31 -07:00
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +02:00
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +02:00
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
bf04daff82
architecture too complex
2013-08-21 14:58:28 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
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
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +02:00
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
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
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
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
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
d9e8ebabdc
outsource sharing and deleted files previews to apps
2013-08-19 13:24:07 +02:00
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
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
89c928c3be
replace ' ' with '%20' in urls for curl
2013-08-19 11:09:55 +02:00
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
6c518797ef
fixing require path
2013-08-18 19:14:14 +02:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
c620c5840a
Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
...
move upload progress bar near upload button, more contextual
2013-08-18 09:30:47 -07:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
eb97818519
Merge pull request #4483 from owncloud/compare-true-false
...
Compare result are already true/false
2013-08-18 03:26:35 -07:00
dda5eb2530
Merge pull request #4486 from owncloud/ldap_adjust_cache
...
LDAP: use memcache if available
2013-08-18 02:50:41 -07:00
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
dce7cdaaec
remove unneeded extra ID selectors
2013-08-18 11:27:51 +02:00
1be11bb03d
don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again
2013-08-18 11:21:01 +02:00
bf4efd5290
move upload progress bar near upload button, more contextual
2013-08-18 11:18:16 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
ce9103d522
Merge pull request #4426 from owncloud/ldap_settings_design
...
Ldap settings design
2013-08-18 01:52:51 -07:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
4bb0e1567b
Use boolean casting for bitwise and result.
2013-08-17 23:41:37 +02:00
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
7575186fa6
moving Dropbox and smb4php 3rdparty code over to the apps
2013-08-17 18:20:20 +02:00
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
f41c4312ff
LDAP: use memcache if available
2013-08-17 17:22:54 +02:00
6ae6dc00e5
Merge pull request #4427 from owncloud/fix_4425
...
use OC files API to create missing directory
2013-08-17 08:09:07 -07:00
f28f528431
switched to dirname()
2013-08-17 13:49:42 +02:00
db8fdd5032
added missing parameter documentation
2013-08-17 13:46:33 +02:00
1af2ec1724
Merge pull request #4481 from owncloud/fix_versioning_size_check
...
first check if file exists before checking the files size
2013-08-17 04:37:09 -07:00
f71794f0d5
added createMissingDirectories() method
2013-08-17 13:28:35 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
d3e2f31ada
Merge pull request #4352 from owncloud/encryption_clean_up
...
crypt.php clean up
2013-08-17 04:10:15 -07:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
c538ac3081
LDAP: only connect to LDAP once on login
2013-08-17 12:16:51 +02:00
e761cba808
Merge pull request #4480 from owncloud/remove-ru_RU-master
...
remove ru_RU - fixes #3135
2013-08-17 03:10:42 -07:00
50147bfbd1
Merge pull request #4193 from owncloud/versions_fix_css
...
Versions fix css
2013-08-17 03:01:24 -07:00
16efd81a0e
first check if file exists before checking the files size
2013-08-17 11:57:50 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
137cd2ca89
increase width of versions dialog
2013-08-17 11:01:43 +02:00
7e4dcd268f
vertically center rename input box
2013-08-17 10:46:03 +02:00
164502477d
use jQuery.get instead of jQuery.ajax
2013-08-16 17:25:38 +02:00
64d09452f5
remove editor div in filelist
2013-08-16 17:19:48 +02:00
837cefd8a3
Merge pull request #4442 from owncloud/no-smb-client-on-windows-master
...
no files external for SMB on windows
2013-08-16 02:48:42 -07:00
f94e603698
progress fixes
2013-08-16 11:40:55 +02:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07:00
57f7ff2dbd
communicate size of newly created file back and update UI
2013-08-16 00:31:27 +02:00
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
bd1895bdf8
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
...
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
e7c0693570
checkstyle double quotes in HTML
2013-08-15 19:40:39 +02:00
42fc2295e4
LDAP: Update Host in configuration chooser on Save
2013-08-15 16:10:49 +02:00
479f893f6d
LDAP: Show Host name in configuration drop down
2013-08-15 15:55:06 +02:00
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
7adfc27caf
remove whitespaces and some leftover code from testing
2013-08-15 13:13:16 +02:00
2fd5178a00
adjust New file dialog for new styles
2013-08-15 12:50:26 +02:00
cbfee81068
LDAP: slightly smaller input fields
2013-08-15 12:45:37 +02:00
05549884c6
no files external for SMB on windows
2013-08-15 12:00:02 +02:00
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
de89c31f5a
Merge pull request #4302 from synchrone/master
...
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
b2f666c98f
fix file summary position
2013-08-14 21:26:06 +02:00
75e9015b54
Merge pull request #4393 from owncloud/fix_4326
...
provide correct path for require_once
* owncloud/fix_4326:
use __DIR__ instead of realpath
provide correct path for require_once
2013-08-14 21:20:53 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
a3d009e3b5
also create root dir if it doesn't exist yet
2013-08-14 20:51:36 +02:00
137d644963
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
2013-08-14 20:41:49 +02:00
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
a255cc6007
fix adding preview-icon to clss attribute
2013-08-14 18:52:53 +02:00
b3b2b2d64c
Merge pull request #4363 from owncloud/fix-4355
...
Send mime-type for new files
2013-08-14 09:46:10 -07:00
d314729cea
use OC files API to create missing directory which should handle special chars in every environment correctly
2013-08-14 17:58:41 +02:00
9da49264ea
change filelist ui updates
2013-08-14 17:49:45 +02:00
7d0e9cc685
use __DIR__ instead of realpath
2013-08-14 17:15:01 +02:00
7b17fd2f17
LDAP: move small info text strings into tooltips
2013-08-14 16:51:38 +02:00
a4fc9bbe8c
LDAP: right align labels on settings page
2013-08-14 16:38:25 +02:00
320bf0e8c1
fix breaking error due to ... a wrong icon link. Seriously?
2013-08-14 16:19:02 +02:00
4f525c864d
lazy load preview icons
2013-08-14 13:27:01 +02:00
e704c8e4dc
use web.svg instead of web.png
2013-08-14 11:51:54 +02:00
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +02:00
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +02:00
4002491947
Reword a phrase
2013-08-14 06:29:19 +02:00
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
eb0fdc8380
provide correct path for require_once
2013-08-12 17:38:57 +02:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
7b1067c2a0
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
2013-08-12 16:19:08 +02:00
0bab8935c9
preserve mtime if file gets encrypted/decrypted
2013-08-12 14:30:43 +02:00
b982868c14
fix array declaration
2013-08-12 13:59:49 +02:00
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
44d201a526
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
2013-08-09 15:57:07 +02:00
5ba8d38b7f
remove old comments, TODos, etc.
2013-08-09 15:55:17 +02:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
beb27168de
Use multiple lines for the JSON data array.
2013-08-08 22:14:21 +02:00
0ab8850478
Adjust JSON code to stable5.
2013-08-08 22:14:21 +02:00
1ed049a682
Do not repeat JSON success code.
2013-08-08 22:14:21 +02:00
0718c92dc8
Do not repeat definition of $target.
2013-08-08 22:13:53 +02:00
8652137ad6
Merge pull request #3912 from owncloud/css_cleanup_kondou
...
General CSS cleanup
2013-08-08 07:31:01 -07:00
c458e785a1
fixing typos and PHPDoc
2013-08-08 15:08:58 +02:00
ff67f115d4
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-08 13:50:04 +02:00
512f98cac9
remove todo item
2013-08-08 13:38:15 +02:00
023121aed0
adapt tests to the changes in crypt.php
2013-08-08 13:35:01 +02:00
c2f40d2495
Merge pull request #4243 from owncloud/no_empty_versions
...
don't create empty versions
2013-08-08 03:57:43 -07:00
f7915d745a
Merge pull request #4340 from owncloud/true-false-as-filename
...
Allow true and false as filenames.
2013-08-08 00:03:50 -07:00
b39d2d1938
more error messages which might be useful for the user to debug his server config
2013-08-08 08:39:11 +02:00
7ce03ba37c
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
2013-08-08 08:39:01 +02:00
7aeb0068be
also write error message to the log
2013-08-08 08:38:52 +02:00
cfbdad9cdb
catch broken server config and disable encryption app.
2013-08-08 08:38:37 +02:00
97e910e087
make methods private which are not used from outside
2013-08-08 08:37:39 +02:00
d91104e120
actually register html template
2013-08-07 23:48:44 +02:00
67df0a60fb
Check expected type after JSON decode instead of checking what is not expected.
...
This will also allow "true" and "false" as filenames instead of only "null".
2013-08-07 17:01:14 +02:00
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
41ba155a14
fix js error
2013-08-07 11:58:49 +02:00
91bd4dd67b
implement previews of single shared files
2013-08-07 11:48:08 +02:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
0fce89308e
[tx-robot] updated from transifex
2013-08-05 07:54:38 -04:00
bf1a9dfae3
Merge pull request #4285 from owncloud/scan-files-script-master
...
adding new cli script to rescan files
2013-08-05 01:09:15 -07:00
9923fe655b
[tx-robot] updated from transifex
2013-08-04 02:01:28 -04:00
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04:00
010c4e0b83
remove cli check
2013-08-02 21:28:04 +02:00
5e1a775016
adjust usage text
2013-08-02 21:23:26 +02:00
72ad843203
Fixing owncloud/core#4301
...
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
2013-08-02 23:18:29 +04:00
a7a05b321a
Use console.php entry point for file scanning from console
2013-08-02 15:36:54 +02:00
895d9ba1b9
Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
...
Use !== and === in files_trashbin app
2013-08-02 03:14:24 -07:00
16726ab793
[tx-robot] updated from transifex
2013-08-02 02:00:45 -04:00
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
930f0e4c18
Merge pull request #4270 from owncloud/fix_4253
...
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 07:43:50 -07:00
77dad7070d
Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
...
added @var tags
2013-08-01 07:40:01 -07:00
43c6d82825
Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging
...
write all catched exception messages to the log
2013-08-01 07:38:45 -07:00
69173c2a6b
fix test and make warning translatable
2013-08-01 14:19:33 +02:00
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
5a4c39207e
write all catched exception messages to the log
2013-08-01 10:08:41 +02:00
3e53e25cd1
added @var tags
2013-08-01 10:05:01 +02:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
d7dd2ee465
don't know why it works locally but not on the build server... let's keep it out for the moment
2013-07-31 16:44:43 +02:00
23e9721644
use OC\Files\View to read encrypted file, so that it also works with external storages
2013-07-31 16:35:14 +02:00
fe2937e3cd
this hopefully fixes testRecoveryForUser(), works locally
...
for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
2013-07-31 16:15:49 +02:00
58233033c1
this test works locally, let's see what out build server says...
2013-07-31 12:03:50 +02:00
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
d3e610f589
Merge pull request #4225 from owncloud/better-404
...
More verbose 404, closes #3225
2013-07-30 13:20:28 -07:00
15e9e95817
Use default cursor for list items
2013-07-30 20:58:21 +03:00
6c96a5273b
fixing some unit tests
2013-07-30 18:21:23 +02:00
2549322763
we need to use the path relative to data/
2013-07-30 18:17:33 +02:00
853b106bb2
don't create empty versions
2013-07-30 16:01:27 +02:00
a212c98125
handle error if we can't handle the given path
2013-07-30 15:27:59 +02:00
a6ced6b53f
remove unused method, the right one is in util.php
2013-07-30 14:28:24 +02:00
aca7fbe2c8
adapt unit tests to the modified stream wrapper
2013-07-30 14:18:01 +02:00
93cdfc3e8a
Merge branch 'master' into oc_preview
2013-07-30 13:52:53 +02:00
6f20e081e4
added missing isEmpty ajax file
2013-07-30 12:48:41 +02:00
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
3640c99462
encrypt/decrypt file versions
2013-07-30 12:19:04 +02:00
22b8967031
check if app is enabled
2013-07-30 12:19:01 +02:00
1a1c100719
fix loading.gif size for both upload and deletion, force visiblity
2013-07-30 10:44:01 +02:00
ba18452eda
only write keyfiles if it was a new file, otherwise nothing changed
2013-07-30 10:43:16 +02:00
223d3c91d6
use path relative to data/
2013-07-30 10:14:17 +02:00
a7a7ef2b3a
improved error handling
2013-07-30 09:48:30 +02:00
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
33fe24dc3d
Replace delete icon with spinner
2013-07-29 19:27:11 +03:00
a10a17f818
Rewording
2013-07-29 18:25:17 +03:00
7f9795cc3d
Merge pull request #4203 from owncloud/trashbin_improvements
...
Trashbin improvements
2013-07-29 08:15:53 -07:00
4a9f5f64da
remove whitespaces
2013-07-29 17:15:20 +02:00
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
dec7b2fa40
Move styles from core to app
2013-07-29 17:36:59 +03:00
2ea8ee6139
add class='preview-icon' in trashbin app as well
2013-07-29 16:27:40 +02:00
97f2c393c1
Allow apps to have own 404 content, closes #3225
2013-07-29 16:54:19 +03:00
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
0fde473cb7
[tx-robot] updated from transifex
2013-07-29 01:57:04 -04:00
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
0a9bb8ba73
reduce time for auto expire to 30 days by default
2013-07-26 15:15:47 +02:00
efd8ad6696
found some more places where we can disable buttons while performing a action
2013-07-26 14:54:27 +02:00
9d24b9c7e8
Hide Delete Permanently button when Restore happens
2013-07-26 13:17:09 +02:00
a5d9b985c3
make 'restored' extension translatable
2013-07-26 12:01:45 +02:00
3354249691
fix typo
2013-07-26 11:51:18 +02:00
0182a503a6
expire trash bin if trash bin exceeds max size after a new file was added to ownCloud
2013-07-26 11:45:38 +02:00
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
96e175ffbf
don't move empty folders to the trash bin
2013-07-25 16:27:40 +02:00
bf668eb14f
nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored'
2013-07-25 16:20:06 +02:00
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02:00
62f84ff79c
css for button no longer needed
2013-07-25 12:29:39 +02:00
e5b0c1e78b
remove unused code; use jquery
2013-07-25 11:15:24 +02:00
16d8074d77
fix css
2013-07-25 11:15:01 +02:00
9394fc5d4a
new version drop down
...
Squashed commit of the following:
commit 0dc404a557fa8253e3a87c7babefba6de8e6dab5
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 25 10:26:48 2013 +0200
fix 'more versions' button for IE8
commit 5836e652857204d68dfdfa8b3318de8e2fe02493
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:56:46 2013 +0200
clean-up some unused code
commit ac83e53fa24073783a165796fc3016dc7beca293
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:49:03 2013 +0200
fix order of the versions, newest version should come first
commit f150a88843af316ff505728941287406f25a0751
Merge: bc713c7 b8e399b
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 16:19:36 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit bc713c7b0c3207d00d2f19b10a905a82724c0709
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 16:11:07 2013 +0200
fix position of more versions button
commit b8e399b1754ae7656c3cb8cef2c53f6976a83d61
Merge: 24825b0 7b6e39d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:04:08 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit 24825b02004efa953197e72b470b9b033030aeee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 16:02:53 2013 +0200
umark previous row if a new row gets selected
commit 7b6e39d2939f1b3bba4fff37ca9087dbc7795f03
Merge: 5bfb0ac 7b54644
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:37:19 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit 5bfb0ac5c102bdfd3b27a37cea8c792f69b3b803
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:37:09 2013 +0200
more style adjustments for version dropdown
commit 7b54644d3036ffba448f0525ca09f6e8898b9950
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 15:12:53 2013 +0200
remove debug output
commit a75662bcfdce34d4f14020a539172c7ef1b894d3
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 15:12:26 2013 +0200
reword Revert to Restore
commit e784644daeac12bc6fa6844f24214a039266ae86
Merge: d07abfd 9978c96
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 15:00:11 2013 +0200
Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown
commit d07abfdbb49778a8be30b2a6adbe326e1b1f238f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 14:59:17 2013 +0200
if another drop-down is already open, always close it first
commit 9978c967a6ecbd2d0e5003df3cf4cdba09dab468
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:49:47 2013 +0200
more style improvements for versions
commit a13355f16e6172c02069930a60a49aba4ebfa227
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:44:13 2013 +0200
position fixes for versioning
commit 02c1d6b5eabc4075749c2a7a852c9ed7bbb3644d
Merge: c5a9462 203f544
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:31:16 2013 +0200
merge versions style changes
commit c5a946231a3d011748248db13b6b95ce51eb3e4c
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:29:56 2013 +0200
bigger clickable area for versions
commit 203f544825bd49b168f2316cf2a04caca75438c8
Author: Björn Schießle <schiessle@owncloud.com>
Date: Wed Jul 24 14:15:38 2013 +0200
changes visual changes, as suggested by Jan
commit 90b1e93676d235a61f318768661b25e5815a9784
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed Jul 24 14:12:23 2013 +0200
remove superfluous selector from ID
commit 9768254fe3b2469293fca23151e54cde69bd4661
Merge: c961278 b91c682a94c55b
2013-07-25 10:35:19 +02:00
92af840a51
Merge branch 'master' into css_cleanup_kondou
...
Conflicts:
core/css/styles.css
settings/templates/personal.php
2013-07-24 20:35:00 +02:00
1986416248
Merge pull request #3898 from owncloud/sabre-objecttree
...
WebDAV performance improvements
2013-07-24 10:46:27 -07:00
79832e9382
use output buffering when including the irods libraries
2013-07-24 16:10:14 +02:00
ad266a4253
Merge branch 'master' into sabre-objecttree
2013-07-24 15:53:48 +02:00
003ae7b916
use OC_Defaults directly from the template
2013-07-24 12:04:18 +02:00
d70bb55e1b
Merge branch 'master' into move_defaults_to_template_constructor
2013-07-24 11:58:11 +02:00
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
9d91ceade4
fix php syntax
2013-07-24 10:49:33 +02:00
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
...
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
7242480049
use $defaults->getName() as webdav REALM
2013-07-23 18:14:05 +02:00
c904504365
Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing
2013-07-23 10:50:14 -04:00
2a42021815
Merge branch 'master' into delete-fix
...
Conflicts:
core/css/styles.css
2013-07-23 16:24:34 +02:00
a94c55be98
[tx-robot] updated from transifex
2013-07-23 02:03:19 -04:00
6ddad8dc49
Merge pull request #4126 from owncloud/parallel-autotest.sh-master
...
Parallel autotest.sh master
2013-07-22 14:48:49 -07:00
57d178274d
Merge pull request #3142 from owncloud/ext-fs-irods-master
...
Ext fs irods master
2013-07-22 05:16:49 -07:00
840e96cda3
Merge branch 'master' into disable-anon-upload-master
...
Conflicts:
settings/templates/admin.php
2013-07-22 11:55:20 +02:00
7b28f5a82c
Merge branch 'master' into ext-fs-irods-master
2013-07-22 11:40:28 +02:00
6e2418141d
Merge branch 'master' into parallel-autotest.sh-master
2013-07-22 11:39:27 +02:00
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
a2cdf8b91e
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
...
reworking of \OC\Files\Storage\AmazonS3
2013-07-22 02:19:27 -07:00
dba4111aa0
fix delete button not showing in IE8
2013-07-22 11:18:51 +02:00
da892d69ab
if the file doesn't exists; create a new one. We use this to create new text files in the web interface
2013-07-22 09:15:19 +02:00
01f3f8e0cc
[tx-robot] updated from transifex
2013-07-22 02:03:23 -04:00
37a731bcad
Merge pull request #4131 from owncloud/scanner-split
...
Remove scanner logic from ajax file and place it in it's own class
2013-07-21 11:32:11 -07:00
f54f203e56
mark test as incomplete because I can't reproduce jenkins failure
2013-07-21 11:28:06 +02:00
647e0a0cba
Merge pull request #4118 from owncloud/remove-size-experiment
...
finally remove the file size obfuscation as it had more disadvantages.
2013-07-21 01:25:39 -07:00
9a13b687cc
[tx-robot] updated from transifex
2013-07-21 02:02:41 -04:00
ae9b60ba61
Merge pull request #4119 from owncloud/external-storage-status
...
replace external storage status images with CSS, also use form to distinguish
2013-07-19 13:54:19 -07:00
f6d133955e
LDAP: fix background job, resolves #3528
2013-07-19 18:41:29 +02:00
2b89b7c880
Split scanning logic from ajax file
2013-07-19 16:44:47 +02:00
20ee9945d1
don't rely on admin user but create a test user for Test_Encryption_Keymanager
2013-07-19 14:54:10 +02:00
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
2c38c2a70e
Merge pull request #3947 from runky/patch-1
...
* runky/patch-1:
Update authenticate.php
2013-07-19 02:19:14 +02:00
100eb2b611
replace external storage status images with CSS, also use form to distinguish, fix #3910
2013-07-18 23:00:04 +02:00
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
4bfd61fb7f
use new delete icon for deleted files as well
2013-07-18 18:46:37 +02:00
8a25d1ad06
remove unnecessary tipsy for Files delete
2013-07-18 18:41:01 +02:00
197c979d26
use background image instead of img for Files delete icon
2013-07-18 18:40:09 +02:00
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
210006c4a6
[tx-robot] updated from transifex
2013-07-17 02:28:02 -04:00
5cba09e931
fixing / adding comments
2013-07-16 11:35:48 +02:00
9c0bf5c41a
Merge branch 'master' into ext-fs-irods-master
2013-07-16 11:30:56 +02:00
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
79d23463f8
No admin option to enable public upload in case encryption is enabled
...
No upload on pubic page if public upload is disabled
2013-07-14 21:58:08 +02:00
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
00e2b46017
Fix 'most' Google Drive tests
2013-07-13 11:02:07 -04:00
ccb3c5b428
Removed the preview warning. This is only a simple text change
2013-07-13 13:31:55 +02:00
583addaea1
[tx-robot] updated from transifex
2013-07-13 02:07:35 +02:00
c3e16a7388
fixing Undefined index: publicUploadEnabled
2013-07-12 17:51:01 +02:00
5f5700e353
in case the encryption app is enabled we cannot yet allow anonymous upload
2013-07-12 17:05:58 +02:00
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
d1c0564711
Merge branch 'master' into ext-fs-irods-master
2013-07-12 15:30:01 +02:00
ca16c08ba1
update copy right
2013-07-12 15:28:01 +02:00
01378e1907
incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp
2013-07-12 15:08:13 +02:00
8ae2066b20
Merge pull request #4037 from owncloud/add_new_file_above_summary
...
add new file above summary if it is the first file in the list
2013-07-12 03:45:45 -07:00
b16c5a6df7
fix array access and change variable names according to the coding style
2013-07-12 11:25:40 +02:00
15f7bb296c
continue cleaning-up old versions if availableSpace=0. It's not necessary but gives us some additional free space, especially in the case of a hard quota
2013-07-12 11:25:31 +02:00
fbf34f3bf6
fix some var names according to our style guide
2013-07-12 11:25:23 +02:00
2f0d88cae4
adjust comments
2013-07-12 11:25:12 +02:00
e7959d3da0
fix typo in comment
2013-07-12 11:25:04 +02:00
e8760d7284
also expire versions on rename, to update the history more regularly
2013-07-12 11:24:52 +02:00
d6c1e5490d
it is enough to call the expire function once
2013-07-12 11:24:31 +02:00
e159143165
call expire function before writing the new version to make sure to have enough free space
2013-07-12 11:24:19 +02:00
cb81ceb31d
add new file above summary if it is the first file in the list
2013-07-12 10:40:24 +02:00
481bb831bb
Merge branch 'master' into ext-fs-irods-master
2013-07-12 09:54:39 +02:00
24b4806af4
Merge branch 'master' into googledrive
2013-07-12 09:43:04 +02:00
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
83b2411b81
reword LDAP config and use themable strings, fix rest of #3791
2013-07-11 17:45:13 +02:00
30ab6580f6
reword WebDAV auth to not have 'ownCloud' anymore
2013-07-11 17:42:16 +02:00
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
a9072056a0
Merge pull request #3990 from owncloud/size-mb
...
add MB indicator to size heading, fix #3987
2013-07-10 08:42:05 -07:00
c772a6479d
stripping services from AWS SDK
2013-07-10 16:38:34 +02:00
9965eb0295
fixing style issues
2013-07-10 16:12:48 +02:00
4fdf279395
use === instead of ==
2013-07-10 16:09:22 +02:00
a8b2aa34a4
remove uneeded calls to touch
2013-07-10 16:07:41 +02:00
3fb3a7baa8
add MB indicator to size heading, fix #3987
2013-07-10 13:52:55 +02:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
cf449d42e8
properly encode path
2013-07-10 12:30:20 +02:00
8eefaba719
some style adjustments
2013-07-10 12:30:11 +02:00
5387e5c354
LDAP: even better check for emptiness, fixes #3815
2013-07-10 11:39:47 +02:00
203df66c00
rewrote initialisation, added testing workaround
2013-07-10 07:47:15 +02:00
70b4f85911
Use isIgnoredDir()
2013-07-10 02:36:43 +02:00
2f11f56d32
Use !== and === in files_trashbin-app
2013-07-10 02:34:00 +02:00
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
257096f1d4
Encode current trashbin directory
2013-07-09 17:46:11 +03:00
582631323a
Migrate to encodePath
2013-07-09 17:46:11 +03:00
4818e0062e
General CSS cleanup
2013-07-09 16:08:32 +02:00
439cad07b5
[tx-robot] updated from transifex
2013-07-09 02:12:22 +02:00
020803aa7e
minimize waiting time
2013-07-08 16:06:08 +02:00
Jörn Friedrich Dreyer
Thomas Müller
Björn Schießle
Bjoern Schiessle
kondou
Vincent Petry
Vincent Petry
Bart Visscher
Jan-Christoph Borchardt
Thomas Tanghus
Pete McFarlane
Arthur Schiwon
ringmaster
Bernhard Posselt
Alessandro Cosentino
Georg Ehrke
Morris Jobke
Pellaeon Lin
Andreas Fischer
icewind1991
Robin Appelman
Alexander Bogdanov
Christian Berendt
Victor Dubiniuk
Michael Gapczynski
Frank Karlitschek