wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12968 commits 157 branches 562 tags 714 MiB
Commit graph

12968 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04: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
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
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
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
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
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
Thomas Tanghus
3366bbeb8a Port DAV groupMemberSet fix to master #4458 2013-08-18 15:54:56 +02:00
Kondou
141d2f67aa Merge pull request #4496 from owncloud/fixing-error-page-layout-master 
fixing error page layout
 2013-08-18 06:46:48 -07:00
Markus Goetz
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
Markus Goetz
aba64a0b81 Class Auto Loader: Cache paths in APC 
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
 2013-08-18 12:29:43 +02: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
Bjoern Schiessle
d544a371bf revert changes to 3rdparty submodule reference 2013-08-18 11:31:25 +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
Owen Winkler
c427e256e1 Merge pull request #4493 from owncloud/fixing-initL10n-master 
fixing undefined js error
 2013-08-18 02:18:04 -07:00
Owen Winkler
1793ec1d5d Fixed inconsistent spacing. 2013-08-18 05:17:28 -04:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Owen Winkler
9840363488 Break long lines into smaller ones. 2013-08-18 05:03:20 -04: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
Thomas Müller
3d760222d4 fixing error page layout 2013-08-18 10:30:21 +02: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
4f462e9b6f Add trailing comma for all touched array lines. 2013-08-17 23:39:26 +02:00
Andreas Fischer
d38929fb10 Fix spacing of all touched lines. 2013-08-17 23:38:26 +02:00
Thomas Müller
15c9a0f405 fixing undefined js error 2013-08-17 19:24:06 +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