9909b8b726
adding translations to update events
2013-08-27 00:26:44 +02:00
d1a6d2bc8f
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
2013-08-26 20:21:16 +02:00
7d141656ee
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
...
Conflicts:
lib/helper.php
2013-08-26 18:04:49 +02:00
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
b16a018da9
use random string as id for checkbox
2013-08-26 16:33:51 +02:00
81a45cfcf1
fixes #4574
2013-08-26 15:16:41 +02:00
d538a566ac
fix background size in filelist.js
2013-08-26 14:36:18 +02:00
29c28a45ca
Merge pull request #4292 from owncloud/add_appconfig_unittest
...
Add \OC_Appconfig Unittest
2013-08-26 04:07:18 -07: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
653bc9a477
Merge pull request #4281 from owncloud/ie8-multiselect
...
Better ie8 multiselect
2013-08-26 02:59:31 -07:00
a5873a96fa
Merge pull request #4542 from owncloud/fixing-4504-master
...
remove duplicate code
2013-08-26 02:19:32 -07:00
438e816941
Merge pull request #4519 from owncloud/style-fixes
...
fix minor style issue in the app navigation
2013-08-26 00:47:34 -07:00
ec0808ce75
fix reviewers concerns
2013-08-26 09:44:21 +02: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
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
fbe7a68ce8
Use personal-password for the password name in personal.php
...
Fix #4491
2013-08-24 14:31:32 +02:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
58c727a495
fix return value of method
2013-08-23 23:27:36 +02: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
1dab076750
make it possible to disable previews
2013-08-23 23:05:44 +02:00
8dd93c8c02
Fix some phpdoc and camelcase
2013-08-23 07:30:42 +02:00
87c3f34a93
Make group suffix in share dialog translatable
2013-08-22 19:52:08 +02:00
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +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
1c258087c9
fixing typos
2013-08-22 01:20:28 +02:00
fbc23c4a01
Merge branch 'master' of github.com:owncloud/core
2013-08-22 00:18:14 +02:00
f1eec74f70
additional readdir check in mappedlocal
2013-08-22 00:17:08 +02:00
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +02:00
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +02:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +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
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
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -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
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02:00
9e5b721a0d
fix minor style issue in the app navigation
2013-08-19 15:42:51 +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
Thomas Müller
Morris Jobke
Arthur Schiwon
Georg Ehrke
Stephane Martin
Bart Visscher
Pellaeon Lin
Christopher
dampfklon
Andreas Fischer