Tom Needham
f14ce1efdc
Add quota to core api
2013-08-27 15:39:43 +02:00
Jörn Friedrich Dreyer
13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
blizzz
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07: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
d3d91ce347
revert debugging code which accidentially entered this pull request
2013-08-27 10:49:10 +02:00
Morris Jobke
c09cfe4fb9
Merge pull request #4585 from owncloud/fixing-4385-master
...
Fixing 4385 master
2013-08-27 01:40:50 -07:00
Morris Jobke
02b4ceed3c
Merge pull request #4584 from owncloud/fixing-4575-master
...
adding translations to update events
2013-08-27 01:26:16 -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
Thomas Müller
1e4ebf47e2
webdav quota now displays the same values as the web interface does
2013-08-27 00:57:28 +02:00
Thomas Müller
9909b8b726
adding translations to update events
2013-08-27 00:26:44 +02:00
Thomas Müller
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
Morris Jobke
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
Arthur Schiwon
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
Bart Visscher
29c28a45ca
Merge pull request #4292 from owncloud/add_appconfig_unittest
...
Add \OC_Appconfig Unittest
2013-08-26 04:07:18 -07:00
Morris Jobke
653bc9a477
Merge pull request #4281 from owncloud/ie8-multiselect
...
Better ie8 multiselect
2013-08-26 02:59:31 -07:00
Morris Jobke
a5873a96fa
Merge pull request #4542 from owncloud/fixing-4504-master
...
remove duplicate code
2013-08-26 02:19:32 -07:00
Morris Jobke
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
Morris Jobke
ec0808ce75
fix reviewers concerns
2013-08-26 09:44:21 +02:00
Jenkins for ownCloud
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
Christopher
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
Jenkins for ownCloud
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
Thomas Müller
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +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
fbc23c4a01
Merge branch 'master' of github.com:owncloud/core
2013-08-22 00:18:14 +02:00
Thomas Müller
f1eec74f70
additional readdir check in mappedlocal
2013-08-22 00:17:08 +02:00
Thomas Müller
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +02:00
Arthur Schiwon
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
Arthur Schiwon
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +02:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +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
Morris Jobke
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
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
Arthur Schiwon
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02:00
Morris Jobke
9e5b721a0d
fix minor style issue in the app navigation
2013-08-19 15:42:51 +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
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
Robin Appelman
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
Arthur Schiwon
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
Jörn Friedrich Dreyer
89c928c3be
replace ' ' with '%20' in urls for curl
2013-08-19 11:09:55 +02:00
Morris Jobke
a1d5aba5fd
Merge pull request #4509 from owncloud/add-odf-templates-master
...
adding file templates for ods, odt and odp
2013-08-19 01:54:54 -07:00
Thomas Müller
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +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