Commit Graph

6251 Commits

Author SHA1 Message Date
kondou f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
kondou 992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Thomas Müller 3b25babe35 Merge pull request #4683 from owncloud/publicuploadjserror
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
Arthur Schiwon ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
Jörn Friedrich Dreyer 85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
2013-09-03 05:38:59 -07:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Jörn Friedrich Dreyer 449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment
This reverts commit 64d09452f5.
2013-09-03 13:20:20 +02:00
ringmaster 39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 2013-09-02 09:59:01 -04:00
ringmaster df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 2013-09-02 09:59:00 -04:00
Owen Winkler 9a263a500a Employ config option for OpenSSL config file, if provided.
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
Owen Winkler fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
Bernhard Posselt f038cb9aea Merge pull request #4671 from owncloud/emptycontent
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
Jenkins for ownCloud e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
Vincent Petry 307b673b79 Fixed public upload error that prevents upload
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.

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

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