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
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
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
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
Bart Visscher
ringmaster
Bernhard Posselt
Jenkins for ownCloud
Vincent Petry
Alessandro Cosentino
Georg Ehrke
petemcfarlane
Bjoern Schiessle
kondou
Morris Jobke
Arthur Schiwon
Pellaeon Lin
Jörn Friedrich Dreyer
Andreas Fischer
icewind1991
Robin Appelman
Björn Schießle
Jan-Christoph Borchardt
Alexander Bogdanov
Christian Berendt
Victor Dubiniuk