ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 +07:00
d3d91ce347
revert debugging code which accidentially entered this pull request
2013-08-27 10:49:10 +07:00
c09cfe4fb9
Merge pull request #4585 from owncloud/fixing-4385-master
...
Fixing 4385 master
2013-08-27 01:40:50 +07:00
02b4ceed3c
Merge pull request #4584 from owncloud/fixing-4575-master
...
adding translations to update events
2013-08-27 01:26:16 +07:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +07:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +07:00
1e4ebf47e2
webdav quota now displays the same values as the web interface does
2013-08-27 00:57:28 +07:00
9909b8b726
adding translations to update events
2013-08-27 00:26:44 +07: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 +07:00
29c28a45ca
Merge pull request #4292 from owncloud/add_appconfig_unittest
...
Add \OC_Appconfig Unittest
2013-08-26 04:07:18 +07: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 +07:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 +07:00
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 +07:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 +07:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 +07:00
582b33bdf1
Merge pull request #4537 from owncloud/no-realpath
...
Do not use realpath() on includes.
2013-08-22 01:50:31 +07:00
fbc23c4a01
Merge branch 'master' of github.com:owncloud/core
2013-08-22 00:18:14 +07:00
f1eec74f70
additional readdir check in mappedlocal
2013-08-22 00:17:08 +07:00
101cfa2359
remove duplicate code
2013-08-22 00:09:43 +07:00
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +07:00
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +07:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +07:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 +07: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 +07:00
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +07: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 +07:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 +07: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 +07:00
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +07:00
9e5b721a0d
fix minor style issue in the app navigation
2013-08-19 15:42:51 +07: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
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
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +07:00
89c928c3be
replace ' ' with '%20' in urls for curl
2013-08-19 11:09:55 +07:00
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
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +07:00
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
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
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +07:00
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
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +07:00
141d2f67aa
Merge pull request #4496 from owncloud/fixing-error-page-layout-master
...
fixing error page layout
2013-08-18 06:46:48 +07:00
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +07:00
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +07:00
ba430a7dfa
Merge pull request #4485 from guruz/class_autoloader_optimization
...
Class Auto Loader: Cache paths in APC
2013-08-18 03:32:13 +07:00
Morris Jobke
Thomas Müller
Bart Visscher
Christopher
Arthur Schiwon
Andreas Fischer
Georg Ehrke
icewind1991
Robin Appelman
Jörn Friedrich Dreyer
Björn Schießle
Thomas Tanghus
Markus Goetz