icewind1991
|
d7dde3cfbc
|
Merge pull request #4467 from owncloud/storage-wrapper-quota
Move quota logic from filesystem proxy to storage wrapper
|
2013-08-19 03:38:55 -07:00 |
Georg Ehrke
|
48f0c54261
|
style fixes for preview lib
|
2013-08-19 12:16:55 +02:00 |
Robin Appelman
|
c5402f4575
|
use strict equals in readdir loops to prevent issues with '0' files
|
2013-08-19 12:04:53 +02:00 |
|
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
Jörn Friedrich Dreyer
|
89c928c3be
|
replace ' ' with '%20' in urls for curl
|
2013-08-19 11:09:55 +02:00 |
Thomas Müller
|
0890a915b3
|
adding file templates for ods, odt and odp
|
2013-08-18 21:11:11 +02:00 |
|
Thomas Müller
|
6c518797ef
|
fixing require path
|
2013-08-18 19:14:14 +02:00 |
Björn Schießle
|
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 |
Christopher
|
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 |
|
Kondou
|
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 |
Bart Visscher
|
eb97818519
|
Merge pull request #4483 from owncloud/compare-true-false
Compare result are already true/false
|
2013-08-18 03:26:35 -07:00 |
|
Bart Visscher
|
dda5eb2530
|
Merge pull request #4486 from owncloud/ldap_adjust_cache
LDAP: use memcache if available
|
2013-08-18 02:50:41 -07:00 |
|
Robin Appelman
|
d8c71ba734
|
merge master in storage-wrapper-quota
|
2013-08-18 11:34:56 +02:00 |
Jan-Christoph Borchardt
|
dce7cdaaec
|
remove unneeded extra ID selectors
|
2013-08-18 11:27:51 +02:00 |
Bjoern Schiessle
|
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 |
|
Jan-Christoph Borchardt
|
bf4efd5290
|
move upload progress bar near upload button, more contextual
|
2013-08-18 11:18:16 +02:00 |
|
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
|
Jan-Christoph Borchardt
|
ce9103d522
|
Merge pull request #4426 from owncloud/ldap_settings_design
Ldap settings design
|
2013-08-18 01:52:51 -07:00 |
|
kondou
|
edd92e4c09
|
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
|
2013-08-18 00:38:52 +02:00 |
Andreas Fischer
|
4bb0e1567b
|
Use boolean casting for bitwise and result.
|
2013-08-17 23:41:37 +02:00 |
|
Andreas Fischer
|
d38929fb10
|
Fix spacing of all touched lines.
|
2013-08-17 23:38:26 +02:00 |
|
Thomas Müller
|
7575186fa6
|
moving Dropbox and smb4php 3rdparty code over to the apps
|
2013-08-17 18:20:20 +02:00 |
|
Thomas Müller
|
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 |
Arthur Schiwon
|
f41c4312ff
|
LDAP: use memcache if available
|
2013-08-17 17:22:54 +02:00 |
Morris Jobke
|
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 |
|
Bjoern Schiessle
|
f28f528431
|
switched to dirname()
|
2013-08-17 13:49:42 +02:00 |
|
Bjoern Schiessle
|
db8fdd5032
|
added missing parameter documentation
|
2013-08-17 13:46:33 +02:00 |
|
Björn Schießle
|
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 |
|
Bjoern Schiessle
|
f71794f0d5
|
added createMissingDirectories() method
|
2013-08-17 13:28:35 +02:00 |
|
Bjoern Schiessle
|
cabe92ef12
|
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
|
2013-08-17 13:15:22 +02:00 |
|
Björn Schießle
|
d3e2f31ada
|
Merge pull request #4352 from owncloud/encryption_clean_up
crypt.php clean up
|
2013-08-17 04:10:15 -07:00 |
|
Bart Visscher
|
29b6dd53a0
|
Compare result are already true/false
|
2013-08-17 12:58:10 +02:00 |
|
Arthur Schiwon
|
c538ac3081
|
LDAP: only connect to LDAP once on login
|
2013-08-17 12:16:51 +02:00 |
|
Thomas Müller
|
e761cba808
|
Merge pull request #4480 from owncloud/remove-ru_RU-master
remove ru_RU - fixes #3135
|
2013-08-17 03:10:42 -07:00 |
|
Morris Jobke
|
50147bfbd1
|
Merge pull request #4193 from owncloud/versions_fix_css
Versions fix css
|
2013-08-17 03:01:24 -07:00 |
|
Bjoern Schiessle
|
16efd81a0e
|
first check if file exists before checking the files size
|
2013-08-17 11:57:50 +02:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
|
Bjoern Schiessle
|
137cd2ca89
|
increase width of versions dialog
|
2013-08-17 11:01:43 +02:00 |
|
Jan-Christoph Borchardt
|
7e4dcd268f
|
vertically center rename input box
|
2013-08-17 10:46:03 +02:00 |
|
Georg Ehrke
|
164502477d
|
use jQuery.get instead of jQuery.ajax
|
2013-08-16 17:25:38 +02:00 |
|
Jörn Friedrich Dreyer
|
64d09452f5
|
remove editor div in filelist
|
2013-08-16 17:19:48 +02:00 |
|
Morris Jobke
|
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 |
|
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
|
Jan-Christoph Borchardt
|
d2767faf61
|
Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
|
2013-08-15 15:31:42 -07:00 |
|
Thomas Müller
|
57f7ff2dbd
|
communicate size of newly created file back and update UI
|
2013-08-16 00:31:27 +02:00 |
|
Thomas Müller
|
7279a07ca2
|
Merge branch 'master' into mimetype-defaults
Conflicts:
apps/files/ajax/newfile.php
|
2013-08-16 00:13:10 +02:00 |
|
Thomas Müller
|
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 |
|
Jan-Christoph Borchardt
|
e7c0693570
|
checkstyle double quotes in HTML
|
2013-08-15 19:40:39 +02:00 |
|
Arthur Schiwon
|
42fc2295e4
|
LDAP: Update Host in configuration chooser on Save
|
2013-08-15 16:10:49 +02:00 |
|
Arthur Schiwon
|
479f893f6d
|
LDAP: Show Host name in configuration drop down
|
2013-08-15 15:55:06 +02:00 |
|
Thomas Müller
|
ada13a4d40
|
fixing all broken translation files
|
2013-08-15 15:41:45 +02:00 |
|
Bjoern Schiessle
|
7adfc27caf
|
remove whitespaces and some leftover code from testing
|
2013-08-15 13:13:16 +02:00 |
|
Jan-Christoph Borchardt
|
2fd5178a00
|
adjust New file dialog for new styles
|
2013-08-15 12:50:26 +02:00 |
|
Arthur Schiwon
|
cbfee81068
|
LDAP: slightly smaller input fields
|
2013-08-15 12:45:37 +02:00 |
|
Thomas Müller
|
05549884c6
|
no files external for SMB on windows
|
2013-08-15 12:00:02 +02:00 |
|
Jenkins for ownCloud
|
680ac48856
|
[tx-robot] updated from transifex
|
2013-08-15 04:53:54 -04:00 |
|
Morris Jobke
|
de89c31f5a
|
Merge pull request #4302 from synchrone/master
Fixing owncloud/core#4301
|
2013-08-14 17:11:30 -07:00 |
|
Jan-Christoph Borchardt
|
b2f666c98f
|
fix file summary position
|
2013-08-14 21:26:06 +02:00 |
|
Andreas Fischer
|
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 |
|
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
|
Bjoern Schiessle
|
a3d009e3b5
|
also create root dir if it doesn't exist yet
|
2013-08-14 20:51:36 +02:00 |
|
Jan-Christoph Borchardt
|
137d644963
|
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
|
2013-08-14 20:41:49 +02:00 |
|
Jan-Christoph Borchardt
|
cba0f69622
|
increase row height to 50px, properly position everything, checkboxes, actions etc
|
2013-08-14 20:41:20 +02:00 |
|
Jörn Friedrich Dreyer
|
8f3f47e868
|
Merge pull request #4376 from owncloud/use_plurals
Use plural translations
|
2013-08-14 10:23:19 -07:00 |
|
Georg Ehrke
|
a255cc6007
|
fix adding preview-icon to clss attribute
|
2013-08-14 18:52:53 +02:00 |
|
Thomas Müller
|
b3b2b2d64c
|
Merge pull request #4363 from owncloud/fix-4355
Send mime-type for new files
|
2013-08-14 09:46:10 -07:00 |
|
Bjoern Schiessle
|
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 |
|
Bjoern Schiessle
|
7d0e9cc685
|
use __DIR__ instead of realpath
|
2013-08-14 17:15:01 +02:00 |
|
Arthur Schiwon
|
7b17fd2f17
|
LDAP: move small info text strings into tooltips
|
2013-08-14 16:51:38 +02:00 |
|
Arthur Schiwon
|
a4fc9bbe8c
|
LDAP: right align labels on settings page
|
2013-08-14 16:38:25 +02:00 |
|
Jan-Christoph Borchardt
|
320bf0e8c1
|
fix breaking error due to ... a wrong icon link. Seriously?
|
2013-08-14 16:19:02 +02:00 |
|
Georg Ehrke
|
4f525c864d
|
lazy load preview icons
|
2013-08-14 13:27:01 +02:00 |
|
Georg Ehrke
|
e704c8e4dc
|
use web.svg instead of web.png
|
2013-08-14 11:51:54 +02:00 |
|
Georg Ehrke
|
3cbbe395eb
|
don't use hardcoded size for preview
|
2013-08-14 11:38:52 +02:00 |
|
kondou
|
4002491947
|
Reword a phrase
|
2013-08-14 06:29:19 +02:00 |
|
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
|
Bjoern Schiessle
|
eb0fdc8380
|
provide correct path for require_once
|
2013-08-12 17:38:57 +02:00 |
|
Bjoern Schiessle
|
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 |
|
Bjoern Schiessle
|
7b1067c2a0
|
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
|
2013-08-12 16:19:08 +02:00 |
|
Bjoern Schiessle
|
0bab8935c9
|
preserve mtime if file gets encrypted/decrypted
|
2013-08-12 14:30:43 +02:00 |
|
Bjoern Schiessle
|
b982868c14
|
fix array declaration
|
2013-08-12 13:59:49 +02:00 |
|
Jenkins for ownCloud
|
5ebff8cfc4
|
[tx-robot] updated from transifex
|
2013-08-11 08:11:03 -04:00 |
|
kondou
|
9549bd3e68
|
Use plural translations
|
2013-08-09 20:37:18 +02:00 |
|
Bjoern Schiessle
|
44d201a526
|
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
|
2013-08-09 15:57:07 +02:00 |
|
Bjoern Schiessle
|
5ba8d38b7f
|
remove old comments, TODos, etc.
|
2013-08-09 15:55:17 +02:00 |
|
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
|
Andreas Fischer
|
beb27168de
|
Use multiple lines for the JSON data array.
|
2013-08-08 22:14:21 +02:00 |
|
Andreas Fischer
|
0ab8850478
|
Adjust JSON code to stable5.
|
2013-08-08 22:14:21 +02:00 |
|
Andreas Fischer
|
1ed049a682
|
Do not repeat JSON success code.
|
2013-08-08 22:14:21 +02:00 |
|
Andreas Fischer
|
0718c92dc8
|
Do not repeat definition of $target.
|
2013-08-08 22:13:53 +02:00 |
|
Jan-Christoph Borchardt
|
8652137ad6
|
Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
|
2013-08-08 07:31:01 -07:00 |
|
Thomas Müller
|
c458e785a1
|
fixing typos and PHPDoc
|
2013-08-08 15:08:58 +02:00 |
|
Jörn Friedrich Dreyer
|
ff67f115d4
|
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-08 13:50:04 +02:00 |
|
Bjoern Schiessle
|
512f98cac9
|
remove todo item
|
2013-08-08 13:38:15 +02:00 |
|
Bjoern Schiessle
|
023121aed0
|
adapt tests to the changes in crypt.php
|
2013-08-08 13:35:01 +02:00 |
|
Björn Schießle
|
c2f40d2495
|
Merge pull request #4243 from owncloud/no_empty_versions
don't create empty versions
|
2013-08-08 03:57:43 -07:00 |
|
Thomas Müller
|
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 |
|
Bjoern Schiessle
|
b39d2d1938
|
more error messages which might be useful for the user to debug his server config
|
2013-08-08 08:39:11 +02:00 |
|
Bjoern Schiessle
|
7ce03ba37c
|
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
|
2013-08-08 08:39:01 +02:00 |
|
Bjoern Schiessle
|
7aeb0068be
|
also write error message to the log
|
2013-08-08 08:38:52 +02:00 |
|
Bjoern Schiessle
|
cfbdad9cdb
|
catch broken server config and disable encryption app.
|
2013-08-08 08:38:37 +02:00 |
|
Bjoern Schiessle
|
97e910e087
|
make methods private which are not used from outside
|
2013-08-08 08:37:39 +02:00 |
|
Robin Appelman
|
d91104e120
|
actually register html template
|
2013-08-07 23:48:44 +02:00 |
|
Andreas Fischer
|
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 |
|
Robin Appelman
|
9321eceed6
|
add the option to have templates for newly created files
|
2013-08-07 16:53:09 +02:00 |
|
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
|
Georg Ehrke
|
41ba155a14
|
fix js error
|
2013-08-07 11:58:49 +02:00 |
|
Georg Ehrke
|
91bd4dd67b
|
implement previews of single shared files
|
2013-08-07 11:48:08 +02:00 |
|
Georg Ehrke
|
af983b843d
|
fix merge conflicts
|
2013-08-05 14:27:38 +02:00 |
|
Jenkins for ownCloud
|
0fce89308e
|
[tx-robot] updated from transifex
|
2013-08-05 07:54:38 -04:00 |
|
Thomas Müller
|
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 |
|
Jenkins for ownCloud
|
9923fe655b
|
[tx-robot] updated from transifex
|
2013-08-04 02:01:28 -04:00 |
|
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
|
Thomas Müller
|
010c4e0b83
|
remove cli check
|
2013-08-02 21:28:04 +02:00 |
|
Thomas Müller
|
5e1a775016
|
adjust usage text
|
2013-08-02 21:23:26 +02:00 |
Alexander Bogdanov
|
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 |
|
Bart Visscher
|
a7a05b321a
|
Use console.php entry point for file scanning from console
|
2013-08-02 15:36:54 +02:00 |
|
Jörn Friedrich Dreyer
|
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 |
|
Jenkins for ownCloud
|
16726ab793
|
[tx-robot] updated from transifex
|
2013-08-02 02:00:45 -04:00 |
|
kondou
|
1348330c7d
|
Fix a syntax error & have if-conds in an own line
|
2013-08-01 18:44:01 +02:00 |
|
Björn Schießle
|
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 |
|
Jörn Friedrich Dreyer
|
77dad7070d
|
Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
added @var tags
|
2013-08-01 07:40:01 -07:00 |
|
Jörn Friedrich Dreyer
|
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 |
|
Bjoern Schiessle
|
69173c2a6b
|
fix test and make warning translatable
|
2013-08-01 14:19:33 +02:00 |
|
Bjoern Schiessle
|
9253627327
|
cancel sharing if some users doesn't have a working encryption set-up.
|
2013-08-01 13:04:55 +02:00 |
Christian Berendt
|
5a4c39207e
|
write all catched exception messages to the log
|
2013-08-01 10:08:41 +02:00 |
|
Christian Berendt
|
3e53e25cd1
|
added @var tags
|
2013-08-01 10:05:01 +02:00 |
|
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
|
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
|
Bjoern Schiessle
|
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 |
|
Bjoern Schiessle
|
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 |
|
Bjoern Schiessle
|
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 |
|
Bjoern Schiessle
|
58233033c1
|
this test works locally, let's see what out build server says...
|
2013-07-31 12:03:50 +02:00 |
|
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 -04:00 |
|
Thomas Müller
|
d3e610f589
|
Merge pull request #4225 from owncloud/better-404
More verbose 404, closes #3225
|
2013-07-30 13:20:28 -07:00 |
Victor Dubiniuk
|
15e9e95817
|
Use default cursor for list items
|
2013-07-30 20:58:21 +03:00 |
|
Bjoern Schiessle
|
6c96a5273b
|
fixing some unit tests
|
2013-07-30 18:21:23 +02:00 |
|
Bjoern Schiessle
|
2549322763
|
we need to use the path relative to data/
|
2013-07-30 18:17:33 +02:00 |
|
Bjoern Schiessle
|
853b106bb2
|
don't create empty versions
|
2013-07-30 16:01:27 +02:00 |
|
Bjoern Schiessle
|
a212c98125
|
handle error if we can't handle the given path
|
2013-07-30 15:27:59 +02:00 |
|
Bjoern Schiessle
|
a6ced6b53f
|
remove unused method, the right one is in util.php
|
2013-07-30 14:28:24 +02:00 |
|
Bjoern Schiessle
|
aca7fbe2c8
|
adapt unit tests to the modified stream wrapper
|
2013-07-30 14:18:01 +02:00 |
|
Georg Ehrke
|
93cdfc3e8a
|
Merge branch 'master' into oc_preview
|
2013-07-30 13:52:53 +02:00 |
|
Bjoern Schiessle
|
6f20e081e4
|
added missing isEmpty ajax file
|
2013-07-30 12:48:41 +02:00 |
|
Georg Ehrke
|
ac6a3133ec
|
style fixes
|
2013-07-30 12:33:54 +02:00 |
|
Bjoern Schiessle
|
3640c99462
|
encrypt/decrypt file versions
|
2013-07-30 12:19:04 +02:00 |
|
Bjoern Schiessle
|
22b8967031
|
check if app is enabled
|
2013-07-30 12:19:01 +02:00 |
|
Jan-Christoph Borchardt
|
1a1c100719
|
fix loading.gif size for both upload and deletion, force visiblity
|
2013-07-30 10:44:01 +02:00 |
|
Bjoern Schiessle
|
ba18452eda
|
only write keyfiles if it was a new file, otherwise nothing changed
|
2013-07-30 10:43:16 +02:00 |
|
Bjoern Schiessle
|
223d3c91d6
|
use path relative to data/
|
2013-07-30 10:14:17 +02:00 |