0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
3b25babe35
Merge pull request #4683 from owncloud/publicuploadjserror
...
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
449fe8c75e
Revert "remove editor div in filelist", add "is deprecated" comment
...
This reverts commit 64d09452f5
2013-09-03 13:20:20 +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
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
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
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
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
Jenkins for ownCloud
Jörn Friedrich Dreyer
ringmaster
Bernhard Posselt
Vincent Petry
Alessandro Cosentino
Georg Ehrke
petemcfarlane
Bjoern Schiessle
Bart Visscher
kondou
Morris Jobke
Arthur Schiwon
Pellaeon Lin