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
deda583fad
wait methods are probably not working, just wait
2013-07-08 15:56:56 +02:00
8d8f99fbc4
Merge pull request #3757 from owncloud/icon-cleanup
...
Icon cleanup
2013-07-08 06:56:29 -07:00
83a1fce1a3
make tests workable with Amazon S3
2013-07-08 15:25:49 +02:00
d699135c5e
fix for previews in trashbin app
2013-07-08 15:14:25 +02:00
882d5ad728
added exception messages
2013-07-08 15:10:10 +02:00
fdeb21ba5b
wait until bucket exists after the creation
2013-07-08 15:00:07 +02:00
911e947fd7
check if used bucket name is valid
2013-07-08 14:59:09 +02:00
dc8ca00f1e
fixed syntax error
2013-07-08 13:26:41 +02:00
0365d244e0
Merge pull request #3946 from owncloud/fixing-3942-master
...
handle anonymous upload to reshared folder
2013-07-08 02:27:21 -07:00
d59291a8e7
remove needless check
2013-07-08 11:16:58 +02:00
0bc28dcb95
replaced substr with trim
2013-07-08 11:14:47 +02:00
adf0fe880c
removed aws.phar and added extracted zip instead
2013-07-08 11:11:07 +02:00
04292ff16c
implement use of preview icons in thrashbin app
2013-07-08 10:53:53 +02:00
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
096d7674fc
[tx-robot] updated from transifex
2013-07-07 02:06:06 +02:00
c8ad3df1fa
[tx-robot] updated from transifex
2013-07-06 02:08:38 +02:00
c956a08d22
fixing check if public share is a folder or not
2013-07-06 00:12:29 +02:00
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
bc1c776642
Merge pull request #3951 from owncloud/fixing-3936-master
...
get the real physical folder name for anonymous upload
2013-07-05 14:43:47 -07:00
d14c5a3fa7
Merge pull request #3958 from owncloud/fixing-3933-master
...
adding tipsy to the upload button showing the max upload and restoring c...
2013-07-05 08:45:12 -07:00
e159cbf527
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
2013-07-05 17:39:41 +02:00
c8d700c713
Merge pull request #3948 from owncloud/fixing-3934-master
...
no anonymous upload on files only folders
2013-07-05 08:21:45 -07:00
87063918f2
remove wrong closing bracket
2013-07-05 16:05:05 +02:00
9575c2f37c
added helper function to escape glob pattern
...
Conflicts:
apps/files_encryption/lib/helper.php
2013-07-05 16:03:20 +02:00
ec6350079f
fix getUidAndFilename() test
2013-07-05 16:00:43 +02:00
15cb8e4efd
only check for external mount points if the external storage app is enabled
2013-07-05 16:00:34 +02:00
ae30eb48f2
make trash bin aware of system wide mounts with respect to encryption keys
2013-07-05 16:00:25 +02:00
f9c337dd21
only escape glob pattern
2013-07-05 16:00:17 +02:00
93730a090b
del share keys from correct location
2013-07-05 16:00:08 +02:00
af2cd6f541
always return normalized path
2013-07-05 15:59:57 +02:00
3043dbfb95
delete file keys from the correct location
2013-07-05 15:59:46 +02:00
abc2ee2e07
handle rename correctly for system wide mounts
2013-07-05 15:59:38 +02:00
eb2587a08f
move isSystemWideMountPoint() to util.php
2013-07-05 15:59:29 +02:00
f2de4cb342
some performance improvements, check for system wide mounts only once while writing share keys
2013-07-05 15:59:19 +02:00
2e56f0e2f8
fix path to OC_Mount_Config
2013-07-05 15:59:06 +02:00
3e4dcafa89
handle system wide mount points
2013-07-05 15:58:55 +02:00
0c2ebb984e
adding tipsy to the upload button showing the max upload and restoring client side upload size validation
2013-07-05 15:07:05 +02:00
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
d1d6885585
php 5.3 compliant now
2013-07-05 13:22:38 +02:00
0c32f66899
get the real physical folder name for anonymous upload
2013-07-05 12:15:47 +02:00
0202d47f7a
fixing Notice: Undefined index: isPublic
2013-07-05 11:30:53 +02:00
13991be5ce
no anonymous upload on files only folders
2013-07-05 10:53:59 +02:00
6c868a9b5c
Update authenticate.php
...
Fix 'Undefined index: wrongpw' error
2013-07-05 10:37:24 +02:00
11172db55b
handle anonymous upload to reshared folder
2013-07-05 09:58:41 +02:00
955646c461
[tx-robot] updated from transifex
2013-07-05 02:21:23 +02:00
47058b1904
Merge pull request #3932 from owncloud/fix_label_position
...
fix position of 'user shared the folder foldername with you' label
2013-07-04 11:03:42 -07:00
f67fc78531
Merge pull request #3899 from owncloud/encryption_check_php_version
...
check php version, the encryption app needs php >= 5.3.3
2013-07-04 06:53:17 -07:00
f30dd1557e
more verbose error message
2013-07-04 14:50:07 +02:00
63c83ff50b
Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw
...
Add a "Wrong password." message, if the password for the public share was wrong.
2013-07-04 03:12:51 -07:00
8d59893e90
fix position of 'user shared the folder foldername with you' label
2013-07-04 10:32:26 +02:00
6cfa016c39
add public api
2013-07-04 10:11:55 +02:00
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
51cfacd789
[tx-robot] updated from transifex
2013-07-04 09:33:58 +02:00
65bcedfbbe
Use better wording.
2013-07-03 20:13:10 +02:00
b3d6517c62
use us-west-1 as default region for Amazon S3
2013-07-03 18:56:51 +02:00
839ab7f2e6
fixing rmdir in \OC\Files\Storage\AmazonS3
2013-07-03 18:33:15 +02:00
5a5a0e82f5
added commented new parameters
2013-07-03 18:06:27 +02:00
71ef30ea30
reworking testclass for \OC\Files\Storage\AmazonS3
2013-07-03 18:03:23 +02:00
8e5474394e
reworking and extending \OC\Files\Storage\AmazonS3
2013-07-03 18:01:14 +02:00
32597c380a
adding several new parameters
2013-07-03 17:58:44 +02:00
6653c2e9cb
adding AWS SDK for PHP 2.4.0
2013-07-03 17:54:17 +02:00
56e91aa7b3
Merge pull request #3915 from owncloud/summary_as_last_filelist_entry
...
Show a summary as the last filelist entry
2013-07-03 04:17:17 -07:00
811cf02675
[tx-robot] updated from transifex
2013-07-03 02:04:16 +02:00
4c1820a2a1
Merge pull request #3858 from owncloud/more_ssl_error_messages
...
add openssl_error_string() output to the owncloud.log
2013-07-02 07:58:22 -07:00
6e864e6599
fix size of icons in 'new' dropdown menu - I hope @jancborchardt knows a better solution coz this won't work in most IE versions ...
2013-07-02 16:30:58 +02:00
4d4484fac1
Merge pull request #3870 from owncloud/reset_migration_status
...
introduce pre-disable-app hook and first usage in files_encryption
2013-07-02 07:26:48 -07:00
cec8384b1a
[tx-robot] updated from transifex
2013-07-02 15:35:55 +02:00
3fc5b34247
Merge branch 'master' into encryption_check_php_version
...
Conflicts:
apps/files_encryption/files/error.php
2013-07-02 13:54:31 +02:00
38ed00398f
Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version
2013-07-02 13:49:49 +02:00
063b0a2d17
Don't escape filesize (can contain a '<')
2013-07-02 13:09:07 +02:00
d332b1d4a2
implement preview loading after upload
2013-07-02 11:13:22 +02:00
40e6ede6a2
improved error message
2013-07-02 10:14:33 +02:00
29dd7eda2d
improved error message
2013-07-02 10:11:42 +02:00
b1d0de95a9
Show a summary as the last filelist entry
...
Fix #993
2013-07-02 04:28:52 +02:00
2c4a9e0776
Add a "Wrong password." message, if the password
...
for the public share was wrong.
Fix #2725
2013-07-02 03:16:42 +02:00
5fff4e0d08
Merge pull request #3903 from owncloud/nonpublic-uploading
...
Fix upload regressions
2013-07-01 12:35:32 -07:00
3b1018ec00
no ?> at the end of a file
...
missing .
2013-07-01 21:13:04 +02:00
a7f2563990
typo
2013-07-01 21:12:21 +02:00
d5c4854708
cast result to bool
2013-07-01 17:18:16 +02:00
492c0571a0
fix detection of public upload in filelist.js
2013-07-01 15:47:40 +02:00
86342224da
fix uploading when ['dirtoken'] is not set
2013-07-01 15:39:11 +02:00
e55ed10b0d
code style
2013-07-01 15:37:52 +02:00
9512382ae0
fix error string
2013-07-01 12:24:21 +02:00
16a719173f
add correct php version
2013-07-01 12:23:26 +02:00
adcee5b695
check php version, the encryption app needs php >= 5.3.3
2013-07-01 12:16:36 +02:00
d97d00fe0f
add logo claim to defaults.php
2013-07-01 10:48:13 +02:00
aead759f47
logo claim added
2013-07-01 10:48:02 +02:00
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
b19033b353
Merge pull request #3223 from owncloud/fix-2820
...
if rename of file fails, the rename is undone in the view - fix 2820
2013-07-01 01:28:17 -07:00
80a8b9c995
[tx-robot] updated from transifex
2013-07-01 03:28:25 +02:00
1e0810e807
use new ObjectTree in sabredav
2013-06-30 18:37:47 +02:00
4d74e8955f
[tx-robot] updated from transifex
2013-06-30 02:13:07 +02:00
d2f50bc089
[tx-robot] updated from transifex
2013-06-29 02:09:10 +02:00
dfa6aa25c3
Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
...
for now we disable public upload in case encryption is enabled
2013-06-28 13:59:33 -07:00
e3df2b8c87
Merge pull request #1044 from owncloud/fix_extra_slash
...
Remove duplicate / for first folder in root
2013-06-28 12:00:35 -07:00
89dc8be9f5
update to !==
2013-06-28 21:00:09 +02:00
f726de3cab
for now we disable public upload in case encryption is enabled
2013-06-28 16:49:25 +02:00
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
e7d50617d7
Merge branch 'master' into ext-fs-irods-master
2013-06-28 09:22:48 +02:00
6127fee5aa
[tx-robot] updated from transifex
2013-06-28 02:04:58 +02:00
2e6ebe1ab4
fix function documentation
2013-06-27 14:14:25 +02:00
c4aef89278
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
2013-06-27 14:09:22 +02:00
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
da0caadf4e
Added file-upload to GIT repo
...
Optimized CSS identifiers
2013-06-26 22:51:38 +02:00
806f3bddec
increase size of preview to size of row
2013-06-26 18:19:13 +02:00
39c387eed4
implement server side use of previews
2013-06-26 18:04:22 +02:00
5a20c8b66f
add openssl_error_string() output to the owncloud.log
2013-06-26 15:51:22 +02:00
afc3d9314a
[tx-robot] updated from transifex
2013-06-26 02:07:04 +02:00
1a8e4399b0
increase Files row height to tappable 44px, more breathing space
2013-06-25 15:09:48 +02:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
c79f7f4f3c
fix numRows usage in files_encryption
2013-06-24 16:29:59 +02:00
88fc410c19
fix numRows usage in user_ldap
2013-06-24 16:29:58 +02:00
909d279e55
Add a CLI script for manually triggering checking a folder for updates
2013-06-23 17:49:38 +02:00
aaecfa18ed
[tx-robot] updated from transifex
2013-06-23 02:05:39 +02:00
52ba86678a
[tx-robot] updated from transifex
2013-06-22 02:11:35 +02:00
65de0a5831
Merge pull request #3810 from owncloud/improve_webdavauth
...
improve error handling of webdavauth
2013-06-21 11:28:00 -07:00
f40f49851c
fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key'
2013-06-21 14:49:01 +02:00
b0e1259295
improve error handling of webdavauth
2013-06-21 14:39:04 +02:00
76369b7424
encryption is LDAP compatible
2013-06-21 13:08:31 +02:00
d10ad0d603
Squashed commit of the following:
...
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:27:46 2013 +0200
add l10n support
commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:19:10 2013 +0200
only init session if openssl extension is loaded
commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:25:40 2013 +0200
first disable app and than show error page
commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:17:34 2013 +0200
typo fixed
commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:15:40 2013 +0200
move dependency check to the encryption app
commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 11:13:11 2013 +0200
make sure that openssl is installed and loaded
2013-06-21 10:37:51 +02:00
8c923a85de
[tx-robot] updated from transifex
2013-06-21 08:53:57 +02:00
c4aa3fac7e
Merge pull request #3788 from owncloud/more_error_messages
...
add some more error messages, in case something went wrong
2013-06-20 02:12:01 -07:00
5aaf807366
Merge pull request #3784 from owncloud/rescan-all
...
Give admins the ability to rescan the filesystem for multiple users at once
2013-06-20 01:41:49 -07:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
0f32c5ec34
Merge branch 'master' into ext-fs-irods-master
2013-06-19 22:14:58 +02:00
fe61230cc1
always have a defined return value
2013-06-19 16:55:31 +02:00
e2e370f199
some more error messages
2013-06-19 15:58:34 +02:00
83d98e2d8b
add some more error messages, in case something went wrong
2013-06-19 15:52:33 +02:00
6778a45d45
use json to encode user list
2013-06-19 15:02:18 +02:00
cb41b88520
Merge pull request #3764 from owncloud/scanfolder-existing
...
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
85585ede02
allow scanning files for multiple users
2013-06-19 01:26:08 +02:00
d991a9372b
[tx-robot] updated from transifex
2013-06-18 02:11:10 +02:00
99c62dfd76
Merge branch 'master' into fix_glob_escaping
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-06-17 14:51:08 +02:00
efb026c664
don't normalize absolute local path
2013-06-17 14:42:18 +02:00
2a57763542
use history icon in Deleted Files template as well
2013-06-17 13:30:57 +02:00
d9dcba9a39
remove unused loading spinners, just have one
2013-06-17 12:35:25 +02:00
257ebc2830
use consistent icon for 'restore'/versions/history, also SVG
2013-06-17 12:18:45 +02:00
6156d71832
[tx-robot] updated from transifex
2013-06-17 02:08:11 +02:00
8243d19050
[tx-robot] updated from transifex
2013-06-16 02:07:45 +02:00
c99e7e97a3
Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder
...
Fix inexisting trashbin's sub-folders
2013-06-15 01:31:32 -07:00
e0547a25ab
if rename of file fails, the rename is undone in the view - #fix 2820
...
Changes:
* OC.dialog -> OC.Notification
* Added test
* Fixed OC.Notification.show() issue for queued items
* Highlight failed item and show notification
2013-06-15 09:58:27 +02:00
ab411d2700
[tx-robot] updated from transifex
2013-06-15 02:07:18 +02:00
126a0cac8d
Merge pull request #3473 from opensaucesystems/master
...
Small update to user_webdavauth
2013-06-14 11:31:23 -07:00
398fe8bf32
reuse etag when doing a forced rescan
2013-06-14 17:05:52 +02:00
c3371812a0
fix indention
2013-06-14 15:14:23 +02:00
f91b02e9b6
only escape glob pattern
2013-06-14 15:07:06 +02:00
a8a60d761b
Merge pull request #3715 from owncloud/fixes_for_3641_3620
...
files_encryption: bug fixes for reported problems.
2013-06-14 01:38:15 -07:00
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +02:00
8566881758
fix for path_hash not unique as reported at #3641
2013-06-13 20:52:34 +02:00
35da408222
fix memory problems as reported at #3620
2013-06-13 20:51:22 +02:00
7889f2ef5c
Merge pull request #3687 from owncloud/template_updates
...
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
15eda53215
improved footer
2013-06-13 16:10:33 +02:00
7cfb0dc406
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
2013-06-13 13:17:35 +02:00
bc2862fcb9
Merge branch 'master' into files_encryption_upgrade_fix
2013-06-13 12:53:29 +02:00
2b179ccff0
Merge pull request #3668 from owncloud/encryption_migrate_only_once
...
make sure that only one process can enter the migration mode
2013-06-13 03:31:31 -07:00
2f1005f05f
LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
2013-06-13 10:44:05 +02:00
6394fedb33
add comment to explain the helper function
2013-06-13 10:35:30 +02:00
77944cf7b8
fix typo in var name
2013-06-13 10:11:23 +02:00
27fcdb3af5
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/tests/crypt.php
2013-06-12 20:53:45 +02:00
2df8468b2f
Revert "FIX: Download of files named "true" or "false" impossible"
...
This reverts commit d2d71c8797
2013-06-12 18:30:28 +02:00
d2d71c8797
FIX: Download of files named "true" or "false" impossible
...
It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.
Hotfix provided by Herbert Pophal
2013-06-12 17:25:21 +02:00
7273f38af6
make pub link share footer aware of different owncloud editions
2013-06-12 16:28:47 +02:00
df78085171
adapt test to the code changes
2013-06-12 14:00:53 +02:00
c78a90fd54
use number of manipulated rows as idicator if it was possible to enter the migration mode
2013-06-12 12:21:11 +02:00
519508736d
disable proxys during ssl root cert upload to avoid encryption
2013-06-12 10:37:09 +02:00
506c9de5cd
backport of 1fa76e53dc
2013-06-12 10:30:54 +02:00
20ddd6e1c7
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
apps/files_encryption/tests/crypt.php
2013-06-11 15:19:02 +02:00
5d4ff0e537
better contrast for files list, darker greys for selection and hover
2013-06-11 14:49:34 +02:00
0872f641dd
darker low threshold color for file size and age fading, better contrast
2013-06-11 14:30:13 +02:00
3ec6b19cdf
use constants for different migration status
2013-06-11 13:07:39 +02:00
5fafd55108
make sure that only one process can enter the migration mode
2013-06-11 12:03:50 +02:00
74b1f7d448
Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
...
add timeouts 3/30/90 to phpunit tests
2013-06-11 01:52:10 -07:00
4f0f537b42
[tx-robot] updated from transifex
2013-06-11 02:02:44 +02:00
c70a0f791d
allow 30 sec for testDeleteFile
2013-06-10 14:45:39 +02:00
1da112750e
Merge pull request #3647 from owncloud/missing_backticks
...
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
13017ce9e1
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
b6f8d2b859
raise failed tests from first commit to size @medium
2013-06-10 10:17:47 +02:00
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
73fb722a9e
add timeouts 3/30/90 to phpunit tests
2013-06-10 09:31:22 +02:00
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
058c15a9f4
Read configuratons for external filesystem test from a private place.
...
This will help not to accidentially push private data and enable testing on our ci server.
2013-06-07 00:04:46 +02:00
2772b1dd95
update to latest master
2013-06-06 23:28:08 +02:00
3170e3511b
- implement touch() to at least create a file which doesn't exist
...
- implement a work around for folder mtimes - irods doesn't provide updated mtimes
2013-06-06 23:23:53 +02:00
d7a9852f7b
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
2013-06-06 13:32:02 +02:00
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
7fc5151d95
add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set
2013-06-05 18:53:02 +02:00
036732c249
allow to press enter to update the password
2013-06-05 14:51:51 +02:00
be324fad1c
tell the user what he can do to regain access to his files
2013-06-05 14:19:26 +02:00
57bda411d1
only show personal settings if the recovery feature is enabled or if no private key is set
2013-06-05 13:51:28 +02:00
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
8793acfb4e
substr storage id to prevent problems with storing the change id in appconfig
2013-06-04 18:07:14 -04:00
055c901091
improved error msg and removed duplicate string
2013-06-04 22:31:36 +02:00
7bbd85b6e5
improved label for the password recovery feature
2013-06-04 21:19:42 +02:00
4ee7a428ae
link directly to the encryption settings
2013-06-04 10:49:58 +02:00
4976f2e0d3
LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600
2013-06-04 10:32:54 +02:00
14ac4fab05
better handling for http post
2013-06-04 00:41:47 +02:00
ef97481a0d
changed redirect handling
2013-06-03 23:41:57 +02:00
b46e7323ec
fixed typo
2013-06-03 19:10:55 +02:00
dc8bcf0688
reformat code
2013-06-03 18:42:13 +02:00
1e601cd6f1
use generated private key fro m setUp()
2013-06-03 17:43:06 +02:00
35c91ff901
added test for decryptPrivateKey()
2013-06-03 17:34:43 +02:00
Georg Ehrke
Jenkins for ownCloud
Jörn Friedrich Dreyer
Arthur Schiwon
Andreas Fischer
Christopher
icewind1991
Robin Appelman
Björn Schießle
Bart Visscher
Jan-Christoph Borchardt
Bjoern Schiessle
Morris Jobke
Alexander Bogdanov
Christian Berendt
Victor Dubiniuk
Michael Gapczynski
Frank Karlitschek
runky
VicDeo
Roman Geber
Georg Ehrke
Florin Peter
Roland Hager