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

4513 commits

Author SHA1 Message Date
VicDeo
feb01847e7 Merge pull request #4076 from owncloud/fix_typos_kondou 
Fix some typos
 2013-07-16 01:23:16 -07:00
kondou
d9c697534d Fix some typos 2013-07-16 06:01:26 +02:00
Bart Visscher
1a2db491af Merge pull request #3962 from owncloud/move-error-handlers 
Move error handlers from OC_Log to OC\Log\ErrorHandler
 2013-07-15 09:23:37 -07:00
Georg Ehrke
63791e2d8d return empty array instead of 0 2013-07-15 16:58:30 +02:00
Thomas Müller
6f5b0af67f Merge pull request #3487 from owncloud/basic_auth_hack 
Basic Auth is broken - again...
 2013-07-14 14:56:45 -07:00
Georg Ehrke
1303fe0f9f OC\Preview - set scale factor down to 2 and upscale cached preview - this got lost in a git stash ... 2013-07-14 00:00:10 +02:00
kondou
0d604a6c9a Include $defaults 2013-07-13 18:44:36 +02:00
Bart Visscher
5549c77ec5 Merge branch 'master' into doctrine 
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
 2013-07-13 12:01:14 +02:00
Georg Ehrke
21abebf96a OC\Preview - proper handling of a cached previews's filename 2013-07-12 11:50:24 +02:00
Georg Ehrke
33ac4d93d6 OC\Preview - use !== and === instead of != and == 2013-07-12 10:04:27 +02:00
Thomas Müller
24b4806af4 Merge branch 'master' into googledrive 2013-07-12 09:43:04 +02:00
icewind1991
3abe68176f Merge pull request #3270 from owncloud/convert-oc_config 
Convert OC_Config to object so it can be used for DI
 2013-07-11 18:21:08 -07:00
Georg Ehrke
14a35267c1 OC\Preview - outsource static methods 2013-07-11 20:35:55 +02:00
Georg Ehrke
1ffc42b4be OC\Preview - fix logic of two return values 2013-07-11 20:15:30 +02:00
Georg Ehrke
c6849bed9d OC\Preview - remove unneeded comment 2013-07-11 20:02:59 +02:00
Georg Ehrke
1e8a646f51 OC\Preview - improve documentation 2013-07-11 19:21:37 +02:00
Georg Ehrke
7b2aa5d830 OC\Preview - use camelCase 2013-07-11 19:03:21 +02:00
Jan-Christoph Borchardt
aacca494c5 introduce shortname themable string and split from title, use for image alt text 2013-07-11 16:38:07 +02:00
Georg Ehrke
ec75e1904d make jenkins happy 2013-07-11 12:28:41 +02:00
Georg Ehrke
53830f2f75 implement use of previews in sharing app 2013-07-11 11:58:52 +02:00
Georg Ehrke
06eca985ce use $root instead of $path 2013-07-11 11:57:46 +02:00
Georg Ehrke
4bbbba1dc8 fix typo 2013-07-11 11:43:53 +02:00
Georg Ehrke
7f71ae60b0 improve validation of oc\preview and implement preview of error icon if something went wrong 2013-07-11 10:10:07 +02:00
Thomas Müller
d18bd17eb7 - eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser 
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
 2013-07-11 00:27:21 +02:00
icewind1991
d134ba9a82 Merge pull request #3978 from owncloud/forwarding-emitter 
add forwarding emitter for agregating multiple emitters
 2013-07-10 10:38:28 -07:00
Morris Jobke
e2a5af4b9e Merge pull request #3985 from owncloud/cookie-past2 
apply @LukasReschke's cookie changes, hopefully finally fix #854
 2013-07-10 09:08:01 -07:00
Georg Ehrke
5c31b843fc fix typo 2013-07-10 18:04:13 +02:00
Georg Ehrke
f14b0fa6e0 update some comments in preview lib 2013-07-10 18:01:04 +02:00
Georg Ehrke
7091d7a6d2 clean up oc\preview 2013-07-10 17:57:04 +02:00
Robin Appelman
63df8f3500 reneme id to gid 2013-07-10 17:52:34 +02:00
Georg Ehrke
45d1691671 fix orientation before caching preview 2013-07-10 13:38:42 +02:00
Georg Ehrke
a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Georg Ehrke
cf449d42e8 properly encode path 2013-07-10 12:30:20 +02:00
Jörn Friedrich Dreyer
6a50848a6e Merge pull request #3994 from owncloud/fix_oracle_setup 
General setup fixes for Oracle
 2013-07-10 01:02:52 -07:00
Jenkins for ownCloud
7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
Robin Appelman
065bc96b02 more consistent naming 2013-07-10 02:17:24 +02:00
Robin Appelman
db14775536 consistent naming 2013-07-10 02:09:42 +02:00
Robin Appelman
4de5e292e5 search parameter is not optional 2013-07-10 02:01:34 +02:00
Robin Appelman
cc2818ba13 more consitency in hook names 2013-07-10 01:59:59 +02:00
Robin Appelman
c2bff656ff cant use private members from closure in php <5.4 2013-07-10 01:55:38 +02:00
Robin Appelman
912b151561 use new group api as backend for the old api 2013-07-10 00:07:46 +02:00
Robin Appelman
a735105a22 update group management 2013-07-10 00:06:22 +02:00
Victor Dubiniuk
194ab11322 General fixes 2013-07-10 00:49:05 +03:00
mvn23
40879c6327 Merge pull request #3787 from mvn23/patch-1 
Thanks @bartv2 and @bantu, merged and closed.
 2013-07-09 08:21:07 -07:00
Thomas Tanghus
9e9c323acd Set path in cookie. 2013-07-09 16:46:35 +02:00
Victor Dubiniuk
5a3fce12a4 Implement encodePath 2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt
d70d4f435e apply @LukasReschke's cookie changes, hopefully finally fix #854 2013-07-09 15:00:36 +02:00
Michael Gapczynski
4feff3456b Only emit permissions hook for files and and include path 2013-07-08 17:28:18 -04:00
icewind1991
af1c3dd4ce Merge pull request #3963 from owncloud/update-logic-split 
Move the upgrade logic to \OC\Updater
 2013-07-08 12:38:39 -07:00
Robin Appelman
a0d5ba1167 fix typo 2013-07-08 21:13:31 +02:00
Bart Visscher
e7b882a4fc stupid namespace 2013-07-08 18:29:43 +02:00
Bart Visscher
4a6803ef9d Check if logger is set, also no need to return true 2013-07-08 18:26:11 +02:00
Bart Visscher
abe9abab99 Add constructor documentation 2013-07-08 18:01:32 +02:00
Bart Visscher
52553c64ed Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
 2013-07-08 17:59:50 +02:00
Michael Gapczynski
5c2a0325ba Add update permissions hook to sharing 2013-07-08 11:40:10 -04:00
Robin Appelman
4a4e139c83 forward previously registerd hooks 2013-07-08 16:54:26 +02:00
Robin Appelman
925d09cb0e add forwarding emitter for agregating multiple emitters 2013-07-08 16:45:19 +02:00
Thomas Müller
02d2e41e04 Merge pull request #3954 from owncloud/update_insertifnotexist_and_test 
fix insertIfNotExist return value, update doc and corresponding test
 2013-07-08 07:17:45 -07:00
Thomas Müller
0365d244e0 Merge pull request #3946 from owncloud/fixing-3942-master 
handle anonymous upload to reshared folder
 2013-07-08 02:27:21 -07:00
Georg Ehrke
04292ff16c implement use of preview icons in thrashbin app 2013-07-08 10:53:53 +02:00
Björn Schießle
9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827 
Squashed commit of the following:

commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:03:23 2013 +0200

    initialize OC_Defaults only once

commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:02:48 2013 +0200

    link to doc in error messages

commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #3791

commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:10:21 2013 +0200

    link to docs in error messages, fix #3819
 2013-07-08 10:07:57 +02:00
Jenkins for ownCloud
3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jakob Sack
560839195e make l10n libs capable of handling plural translations 2013-07-07 20:06:14 +02:00
Robin Appelman
9cd7ecd502 Updater: pass update url as argument to update check 2013-07-06 17:05:38 +02:00
Robin Appelman
58f473d734 split upgrade logic from ajax file 2013-07-06 17:00:00 +02:00
Jenkins for ownCloud
c8ad3df1fa [tx-robot] updated from transifex 2013-07-06 02:08:38 +02:00
Thomas Müller
98da4bf704 removing unused getSharedItem() 2013-07-06 00:04:01 +02:00
Thomas Müller
dad91c156f Merge branch 'master' into fixing-3942-master 
Conflicts:
	apps/files/ajax/upload.php
 2013-07-06 00:02:11 +02:00
Thomas Müller
bc1c776642 Merge pull request #3951 from owncloud/fixing-3936-master 
get the real physical folder name for anonymous upload
 2013-07-05 14:43:47 -07:00
Bart Visscher
ab2037ab5d Only change integer type when the length is set 2013-07-05 22:05:16 +02:00
Bart Visscher
b8a7e97301 Add comment to column definition 2013-07-05 21:42:37 +02:00
Bart Visscher
2db839c4d3 Move error handlers from OC_Log to OC\Log\ErrorHandler 2013-07-05 19:28:10 +02:00
Thomas Müller
e159cbf527 on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function 2013-07-05 17:39:41 +02:00
Thomas Müller
f8dae11a23 Merge pull request #3957 from owncloud/config-glob-fail 
OC_Config: handle failure of glob('*.config.php')
 2013-07-05 07:38:04 -07:00
Jörn Friedrich Dreyer
212ea0508d update comment 2013-07-05 15:39:57 +02:00
Bart Visscher
22c29eb64b Fix renaming using parenthesis 2013-07-05 15:38:09 +02:00
Robin Appelman
c1cf829b9d OC_Config: handle failure of glob('*.config.php') 2013-07-05 15:07:15 +02:00
Jörn Friedrich Dreyer
00987feda1 fix insertIfNotExist return value, update doc and corresponding test 2013-07-05 14:05:42 +02:00
Thomas Müller
352c1415be proper fix for getting the shared item if no user is logged in 2013-07-05 13:45:21 +02:00
Bart Visscher
424ec94680 Make buildNotExistingFileName testable and write unittests 2013-07-05 13:03:01 +02:00
Jenkins for ownCloud
955646c461 [tx-robot] updated from transifex 2013-07-05 02:21:23 +02:00
Bart Visscher
ad9458e85d Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
 2013-07-04 18:23:47 +02:00
Björn Schießle
3c1308fb6d eddition string should be empty by default 2013-07-04 10:12:07 +02:00
Björn Schießle
6cfa016c39 add public api 2013-07-04 10:11:55 +02:00
Björn Schießle
3c691c9ec9 move to non-static OC_Defaults 
Conflicts:

	lib/mail.php
 2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Bart Visscher
20be58bfdc Merge pull request #3888 from owncloud/ocs_api_fixes 
Ocs api fixes
 2013-07-03 12:33:04 -07:00
Thomas Mueller
32d69f6889 Merge branch 'master' into convert-oc_config 2013-07-03 17:03:47 +02:00
kondou
aa7d8edd14 Suppress warning in setup if config doesn't exist 2013-07-03 16:00:23 +02:00
Björn Schießle
690323092e don't run hooks for .part files 2013-07-03 10:11:50 +02:00
Björn Schießle
04e4d9580f if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal 2013-07-03 10:11:37 +02:00
Björn Schießle
4d4484fac1 Merge pull request #3870 from owncloud/reset_migration_status 
introduce pre-disable-app hook and first usage in files_encryption
 2013-07-02 07:26:48 -07:00
Thomas Müller
e789e05675 on unit test use @expectedException 
some phpdoc added
 2013-07-02 00:15:42 +02:00
Thomas Müller
fbdf46b76e Merge pull request #3748 from owncloud/fixing-3740-master 
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
 2013-07-01 15:08:08 -07:00
Thomas Müller
7d7a2ce317 use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set 2013-07-01 23:51:43 +02:00
Thomas Müller
bb07dde988 Merge branch 'master' into convert-oc_config 2013-07-01 23:43:00 +02:00
Thomas Müller
c777026506 Merge pull request #3775 from owncloud/test_fixes_for_dbschema 
use executeAudited, add table name to assert message, skip schema changi...
 2013-07-01 14:38:28 -07:00
Thomas Müller
bf901eb52f Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block 
remove unnecessary try catch blocks
 2013-07-01 14:37:09 -07:00
Björn Schießle
cb5811bcf5 backport from pull request #3863 2013-07-01 11:12:18 +02:00
Björn Schießle
d8b3aee24e set default logo claim to '' 2013-07-01 10:48:26 +02:00
Björn Schießle
d97d00fe0f add logo claim to defaults.php 2013-07-01 10:48:13 +02:00
Björn Schießle
f622f35a1a make mail footer aware of different themes 
Conflicts:

	lib/mail.php
 2013-07-01 10:47:44 +02:00
Björn Schießle
68369ebb86 remove unneeded if condition 2013-07-01 10:46:49 +02:00
Björn Schießle
996b1e80c6 lib/defaults.php should only contain the default strings and read the other strings directly from the theme 2013-07-01 10:46:27 +02:00
Björn Schießle
23cc69b816 construct the foother in defaults.php so that we use always the same footer 
Conflicts:

	settings/templates/admin.php
 2013-07-01 10:46:00 +02:00
Thomas Müller
121d3904c9 Merge pull request #3852 from owncloud/fixing-3830-master 
session life time is now configurable and set to the same value
 2013-06-30 14:41:51 -07:00
Robin Appelman
93750d2658 improved copy operation for objecttree 2013-06-30 19:41:38 +02:00
Robin Appelman
fe0de5fc10 improved move operation for sabre's objecttree 2013-06-30 18:37:47 +02:00
Robin Appelman
4e55d0ef9b make use of the fact that rmdir is already recursive 2013-06-30 18:37:47 +02:00
Robin Appelman
2d1c6ae726 overwrite Sabre_DAV_ObjectTree with a faster getNodeForPath 2013-06-30 18:37:46 +02:00
Thomas Müller
8beec2015a Merge pull request #3763 from owncloud/recursive-rmdir 
Make rmdir recursive for local storage
 2013-06-30 09:16:32 -07:00
Robin Appelman
d051d6f925 make rmdir recursive for mappellocal storage backend 2013-06-30 17:44:49 +02:00
Jenkins for ownCloud
4d74e8955f [tx-robot] updated from transifex 2013-06-30 02:13:07 +02:00
Bart Visscher
60eb63e35a Fix review items 2013-06-29 21:15:06 +02:00
Bart Visscher
e93ce26f27 Fix found errors 2013-06-29 21:15:06 +02:00
Bart Visscher
42c44d5165 Fix OCI setupDatabase parameter 2013-06-29 21:15:06 +02:00
Bart Visscher
bf30e03048 Remove unsued parameter 2013-06-29 21:15:05 +02:00
Bart Visscher
6831b78597 Use db setup class for option validation 2013-06-29 21:15:05 +02:00
Bart Visscher
2faccaee0d Change database creation to use array to select db setup class 2013-06-29 21:07:11 +02:00
Bart Visscher
e232907698 Convert database setup code to objects 2013-06-29 21:07:11 +02:00
Bart Visscher
a6d07cd512 Split database specific install/setup code to their own class 2013-06-29 21:07:11 +02:00
Bart Visscher
414b5f150e Merge pull request #2914 from Kondou-ger/label_overlapping_value 
Fix textfield label overlapping value.
 2013-06-29 04:09:50 -07:00
Bart Visscher
bd3e266408 Merge pull request #3688 from roha4000/fix_upload_max_filesize 
upload_max_filesize = 0 not possible if post_max_size is not 0
 2013-06-29 04:07:34 -07:00
Bart Visscher
d699ee9845 Merge pull request #3635 from owncloud/storage-wrapper 
Give apps the option to wrap storage backends
 2013-06-29 04:00:03 -07:00
Bart Visscher
68c0d54568 Merge pull request #3268 from owncloud/convert-oc_log 
Convert OC_Log to object so it can be used for DI
 2013-06-29 03:38:56 -07:00
icewind1991
30a403e327 Merge pull request #3892 from owncloud/static-streamwrapper 
Improvements for the static:// streamwrapper
 2013-06-28 12:24:33 -07:00
Bart Visscher
57370353ad Check if the app is enabled and the app path is found before trying to load the script file 2013-06-28 20:34:28 +02:00
Thomas Mueller
66e1eaac93 isError should detect a PEAR_Error even if the backend is PDO. 
This can happen on errors during schema migration - which is always done with MDB2
 2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer
e62eb2e8d1 correctly handle error results of PDO and MDB2 backends 2013-06-28 20:16:01 +02:00
Robin Appelman
dc0ebe9007 fix is_file and is_dir for the static streamwrapper 2013-06-28 19:54:16 +02:00
Robin Appelman
156e72a0c4 add option to clear the files in the static streamwrapper 2013-06-28 19:41:28 +02:00
Jörn Friedrich Dreyer
f3c4a37a78 Merge pull request #3832 from owncloud/oracle_sql_fixes 
for oracle use BITAND() instead of & in sharing permissions sql
 2013-06-28 10:22:59 -07:00
Robin Appelman
a7c70915d5 fix storage wrapper namespaces 2013-06-28 18:18:12 +02:00
Bart Visscher
8ca0a957ad Allow setting defaults and requirements for the api route 2013-06-28 17:25:10 +02:00
Jörn Friedrich Dreyer
7d3490036c Merge pull request #3838 from rgeber/master 
Public Upload Feature
 2013-06-28 07:30:41 -07:00
Bart Visscher
b1a2ddd149 Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification 
Fix pdo statement wrapper numrows on modification
 2013-06-28 07:15:38 -07:00
Thomas Müller
3bedb09753 Merge pull request #3843 from owncloud/sabre-exceptions 
Sabre: throw exceptions when delete/create/write operations are not permitted
 2013-06-28 07:05:09 -07:00
Bart Visscher
6ad7a0336f Oracle doesn't know & as bitwise AND 
Conflicts:
	lib/public/share.php
 2013-06-28 15:48:49 +02:00
Robin Appelman
125f9f4221 move storage wrappers to their own namespace 2013-06-28 15:34:25 +02:00
Bart Visscher
6ddfe2029c Merge pull request #3865 from owncloud/fix_test_for_oracle 
Fix sharing test for oracle
 2013-06-28 06:18:56 -07:00
Thomas Mueller
3b91ce695f session_life_time -> session_lifetime 
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
 2013-06-28 15:17:54 +02:00
Bart Visscher
df9e56efd0 Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle 
manually calculate unix_timestamp for oracle
 2013-06-28 06:11:28 -07:00
Bart Visscher
b04e09a901 Move DoctrineStatementWrapper to its own file 2013-06-28 11:48:38 +02:00
Bart Visscher
6145e61718 Remove deadcode 2013-06-28 11:42:23 +02:00
Bart Visscher
1edf01d09f Fix usage of non existent consts 2013-06-28 11:15:25 +02:00
Thomas Mueller
10951f9bd5 adding PHPDoc 2013-06-27 23:34:36 +02:00
Thomas Mueller
de93b21505 missing $ 2013-06-27 23:14:32 +02:00
Bart Visscher
12976fb2e1 Set debugMode after reading the config file 2013-06-27 22:50:28 +02:00
Bart Visscher
194b61b4c5 Revert "Can't determine if debug mode is defined until we read the config" 
This reverts commit 969e43c87b.
 2013-06-27 22:24:17 +02:00
Bart Visscher
ae2b3732de Use file_exists to fix the unittests 2013-06-27 22:23:53 +02:00
Bart Visscher
fb80cbd499 Fix review points 2013-06-27 22:01:52 +02:00
Bart Visscher
64f16f1db1 Fix stupid namespace separator 2013-06-27 21:57:59 +02:00
Bart Visscher
2eaad58922 Make the object drive the logging backend 
This is the other way around then it was.
 2013-06-27 20:10:54 +02:00
Bart Visscher
c6bbccc776 Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
	lib/setup.php
 2013-06-27 17:54:17 +02:00
Jörn Friedrich Dreyer
77dc3964f8 check item id is set 2013-06-27 17:39:44 +02:00
Björn Schießle
c4aef89278 introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled 2013-06-27 14:09:22 +02:00
Jörn Friedrich Dreyer
45c897acf3 one if less 2013-06-27 13:13:49 +02:00
Jenkins for ownCloud
29caae3491 [tx-robot] updated from transifex 2013-06-27 02:12:00 +02:00
Bart Visscher
3b31afb2a7 Oracle doesn't know & as bitwise AND 2013-06-26 21:40:31 +02:00
Bart Visscher
a9ee15cf40 Use Doctrine platform to add limit and offset to query 2013-06-26 20:48:01 +02:00
Jörn Friedrich Dreyer
5d51118cb2 fix type of numeric columns 2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b check item id is set 2013-06-26 19:57:28 +02:00
Georg Ehrke
806f3bddec increase size of preview to size of row 2013-06-26 18:19:13 +02:00
Georg Ehrke
39c387eed4 implement server side use of previews 2013-06-26 18:04:22 +02:00
Georg Ehrke
9b7efef39d improve Image Provider 2013-06-26 14:28:40 +02:00
Georg Ehrke
a98391b976 some minor improvements to preview lib 2013-06-26 11:18:53 +02:00
Thomas Mueller
794c189650 session life time is now configurable and set to the same value 2013-06-26 09:21:38 +02:00
Robin Appelman
6208780332 Sabre: throw exceptions when delete/create/write operations are not permitted 2013-06-25 17:04:25 +02:00
Thomas Müller
39cca72964 Merge pull request #3750 from owncloud/dummy_session_for_errors 
Init dummy session to render error pages
 2013-06-25 03:34:49 -07:00
Roman Geber
ddb0ff346d Public upload feature 2013-06-25 12:24:14 +02:00
Jörn Friedrich Dreyer
7273b43cd5 manuall calculate unix_timestamp for oracle 2013-06-25 09:52:04 +02:00
Jenkins for ownCloud
c3b8f2bf64 [tx-robot] updated from transifex 2013-06-25 02:13:40 +02:00
Jörn Friedrich Dreyer
b32d6d8487 for oracle use BITAND() instead of & in sharing permissions sql 2013-06-24 22:52:01 +02:00
Bart Visscher
fae3cf1a87 Always quote db identifiers in OC_DB_MDB2SchemaReader 2013-06-24 22:38:19 +02:00
Bart Visscher
144a8eb01f Quote tablenames 2013-06-24 22:38:19 +02:00
Bart Visscher
9fa4b78ba4 Use Doctrines Oracle sequence suffix 2013-06-24 22:38:19 +02:00
Bart Visscher
159efa8bd4 OCI doesn't have a queryString 2013-06-24 22:38:19 +02:00
Bart Visscher
6300b95896 UNIX_TIMESTAMP replace for Oracle 2013-06-24 22:38:19 +02:00
Bart Visscher
dca8c1cbc1 Fixes connecting to Oracle without port set 2013-06-24 22:38:19 +02:00
Bart Visscher
d1b76f1b88 Fix not null with empty default 2013-06-24 22:37:07 +02:00
Jörn Friedrich Dreyer
c223bee6df fix numRows usage in core lib 2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
643c8d3088 make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query 2013-06-24 16:29:58 +02:00
Jörn Friedrich Dreyer
3e3b66bd0d use to_char when comparing clob to string on oracle, use execute audited 2013-06-24 16:12:21 +02:00
Bart Visscher
377e9a8677 Merge branch 'master' into doctrine 2013-06-24 08:27:25 +02:00
Roland Hager
a06d901e37 Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0. 
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
 2013-06-21 09:33:06 +02:00
mvn23
59fa3055e1 Reviewed code for X-Sendfile2 
Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
 2013-06-20 17:46:36 +03:00
Thomas Müller
4232ccbc6d Merge pull request #3792 from owncloud/scanfolder-remove 
remove deleted files when re-scanning a folder
 2013-06-20 04:02:10 -07:00
blizzz
c41f11a821 Merge pull request #3779 from shkdee/patch-1 
Update user.php
 2013-06-20 02:37:12 -07:00
mvn23
3f20a080fe Revert most changes for testing 2013-06-20 12:23:25 +03:00
Jörn Friedrich Dreyer
372f261fe3 remove unnecessary exception handling 2013-06-20 10:50:53 +02:00
Jörn Friedrich Dreyer
91c0b81130 add missing backticks 
guys, please ...
 2013-06-20 10:18:29 +02:00
Jenkins for ownCloud
01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Robin Appelman
ff7e903f82 remove deleted files when re-scanning a folder 2013-06-20 00:42:34 +02:00
mvn23
a25bfa9291 Update files.php 2013-06-19 23:44:45 +02:00
mvn23
46f97f4c38 Implement X-Sendfile2 for resume support in LigHTTPd 
LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files.
To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect.
 2013-06-19 15:36:48 +02:00
Georg Ehrke
fb67b45841 comment out old code 2013-06-19 13:41:01 +02:00
icewind1991
cb41b88520 Merge pull request #3764 from owncloud/scanfolder-existing 
Improve re-using existing data in the filescanner
 2013-06-19 04:30:55 -07:00
Björn Schießle
8406d3f7b1 also use the default theme if the theme is set to an empty string in the config.php 2013-06-19 11:58:29 +02:00
Jörn Friedrich Dreyer
904227a0e4 Merge pull request #3661 from owncloud/fixing-windows-server-master 
Fixing windows server master
 2013-06-19 02:42:18 -07:00
Georg Ehrke
1fcbf8dd7a implemenet getNoCoverThumbnail 2013-06-19 10:21:55 +02:00
shkdee
4a480e4f53 Update user.php 
Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.
 2013-06-18 21:47:47 +03:00
Jörn Friedrich Dreyer
78678be2b6 remove dangling AND in SQL statement 2013-06-18 16:18:19 +02:00
Georg Ehrke
cc478d2f48 use ppt icon instead of preview 2013-06-18 13:53:02 +02:00
Georg Ehrke
bea4376fd4 remove opendocument.php 2013-06-18 11:04:08 +02:00
Victor Dubiniuk
fbbb6ef8ef Init dummy session first 2013-06-17 23:41:07 +03:00
Robin Appelman
2ed0e6e915 add tests for reusing existing data in scanner 2013-06-17 18:03:57 +02:00
Robin Appelman
63c898c064 Make rmdir recursive for local storage 2013-06-17 17:34:09 +02:00
Georg Ehrke
1a933a9173 Merge branch 'master' into oc_preview 2013-06-17 12:31:02 +02:00
Georg Ehrke
6082a0649c stream first mb of movie to create preview 2013-06-17 12:27:26 +02:00
Thomas Mueller
383e4c62b5 in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing 2013-06-17 00:02:42 +02:00
Thomas Müller
e013e7adea Merge pull request #3621 from owncloud/path-mimetype 
seperate mimetype guessing from filename
 2013-06-16 13:14:16 -07:00
Thomas Müller
0ac7c5712a Merge pull request #3721 from owncloud/oracle_setup_fixes 
Oracle setup fixes
 2013-06-14 11:21:02 -07:00
Robin Appelman
f10a4db889 scanner: give more percision about what data is reused during scanning 2013-06-14 16:58:14 +02:00
Jörn Friedrich Dreyer
9498cf959f remove default tablespace in parameter 2013-06-14 15:54:45 +02:00
Thomas Mueller
1ef66941a7 adding default to $hint within ctor of DatabaseSetupException 2013-06-14 15:38:09 +02:00
Robin Appelman
30c09d0c8b split of scanning the childs of a folder 2013-06-14 15:35:06 +02:00
Thomas Mueller
5c7d7549ea coding style 2013-06-14 13:54:41 +02:00
Jörn Friedrich Dreyer
471b9c055a use executeAudited in sabredav lock 2013-06-14 12:23:44 +02:00
Jörn Friedrich Dreyer
961a001af3 add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup 2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer
e5d3cd59ac use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config 2013-06-14 12:09:49 +02:00
Jörn Friedrich Dreyer
dcdabac04d oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect 2013-06-14 12:06:29 +02:00
Thomas Mueller
87521f6c6e dirname('/test.txt') returns '\' on windows whereas on linux we get back '.' 2013-06-14 11:59:30 +02:00
Morris Jobke
8d62bb3aab Merge pull request #3684 from owncloud/pg_install_db_master 
Try connection with specified db when postgres does not work
 2013-06-14 02:50:01 -07:00
Morris Jobke
7093b0829f improve comment 2013-06-14 11:28:33 +03:00
Thomas Mueller
c8564c0795 Merge branch 'master' into move-maint-start 
Conflicts:
	lib/util.php
 2013-06-14 10:06:13 +02:00
Jenkins for ownCloud
6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Thomas Müller
8edb56de05 Merge pull request #3690 from owncloud/use_execute_audited_in_filecache 
use executeAudited in files cache
 2013-06-13 13:55:55 -07:00
Thomas Müller
2a58cf8117 Merge pull request #3686 from owncloud/minor_exception_cleanup 
minor cleanup for exception handling
 2013-06-13 13:50:31 -07:00
Björn Schießle
7889f2ef5c Merge pull request #3687 from owncloud/template_updates 
Make templates aware of different owncloud editions
 2013-06-13 07:32:41 -07:00
Jörn Friedrich Dreyer
31f7afe56a PDOException has no previous(), oh the consistency ... 2013-06-13 13:14:00 +02:00
Thomas Müller
54f3174665 Merge pull request #3640 from infoneo/master 
Folders with multiple periods problem fix
 2013-06-13 03:34:36 -07:00
Georg Ehrke
25981a079a some whitespace fixes 2013-06-13 09:52:39 +02:00
Thomas Mueller
84a8aea410 restore Updater functionality on non-Windows platforms 2013-06-13 00:09:52 +02:00
Jörn Friedrich Dreyer
54f9477f34 fix another double wrapped array 2013-06-12 23:01:52 +02:00
Jörn Friedrich Dreyer
6d55a062be remove additional array wrapping 2013-06-12 21:23:34 +02:00
Jörn Friedrich Dreyer
d3eadcde56 use executeAudited in files cache 2013-06-12 20:11:53 +02:00
Björn Schießle
7a575cc2d7 short explanation about OC_Defaults 2013-06-12 16:33:09 +02:00
Björn Schießle
839bce80c6 make main menu aware of the different owncloud editions 2013-06-12 16:20:23 +02:00
Björn Schießle
5c6a854489 add default doc url 2013-06-12 16:19:28 +02:00
Georg Ehrke
f89a23b463 implement unknown preview backend 2013-06-12 16:18:16 +02:00
Jörn Friedrich Dreyer
f7dc07602b minor cleanup for exception handling 2013-06-12 15:48:22 +02:00
Björn Schießle
e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +02:00
Björn Schießle
b29e01d5cf keep all strings in one place to make it easier to change them 2013-06-12 15:15:08 +02:00
eMerzh
e33f68ecb6 Correct escaping 2013-06-12 14:36:28 +02:00
Brice Maron
edc255421c Try connection with specified db when postgres does not work 
Conflicts:

	lib/setup.php
 2013-06-12 14:36:07 +02:00
Georg Ehrke
1f52ad0363 work on powerpoint fallback 2013-06-12 13:20:59 +02:00
Thomas Müller
1abce78cb8 Merge pull request #3654 from owncloud/clean_up_exceptions 
Introduce more robust SQL execution and exception handling
 2013-06-12 04:13:12 -07:00
Georg Ehrke
228e084e65 finish implementation of Excel preview fallback 2013-06-12 11:40:01 +02:00
Jörn Friedrich Dreyer
0eed1c980d Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2 
fix fetchRow checks to also work with MDB2
 2013-06-11 06:20:27 -07:00
Jörn Friedrich Dreyer
e238eeef6f Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons 
use to_char to allow comparing string to CLOB cloumns in oracle
 2013-06-11 05:34:55 -07:00
Björn Schießle
118f2b3283 createUser() needs to return something; the user object or false 2013-06-11 13:48:17 +02:00
Georg Ehrke
67816da0bf save current work state of office fallback 2013-06-11 13:15:24 +02:00
Georg Ehrke
28cf63d37d check if imagick is loaded in office.php, not in libreoffice-cl.php 2013-06-11 11:00:44 +02:00
Georg Ehrke
2ff97917e9 code optimization 2013-06-11 10:56:16 +02:00
Georg Ehrke
0e4f5001d5 don't crop Y axis 2013-06-11 10:45:50 +02:00
Thomas Mueller
74a170f2a5 [Fixing unit tests in Windows] 
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below
 2013-06-10 19:28:55 +02:00
Thomas Mueller
c0b25a4375 [Fixing Updater Unit Tests on Windows] 
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
 2013-06-10 18:47:36 +02:00
Thomas Mueller
073306eaa2 [Fixing Updater Unit Tests on Windows] 
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
error logging has been added  in case the given 4path is not found within self::correctFolder
 2013-06-10 18:35:47 +02:00
Michael Gapczynski
969e43c87b Can't determine if debug mode is defined until we read the config 2013-06-10 12:07:25 -04:00
Jörn Friedrich Dreyer
875c18b115 fix fetchRow checks to also work with MDB2 2013-06-10 17:43:09 +02:00
Michael Gapczynski
b7b6075d55 Fix potential glob error 2013-06-10 11:42:20 -04:00
Thomas Mueller
988b539dd7 Let's just use '/' as we do almost everywhere - this change fixes two failing unit tests 2013-06-10 17:27:21 +02:00
Morris Jobke
1da112750e Merge pull request #3647 from owncloud/missing_backticks 
add missing backticks all over the place
 2013-06-10 05:15:07 -07:00
Jörn Friedrich Dreyer
86c5243be5 remove duplicate logging from db.php, now happens in entrypoints 2013-06-10 14:03:12 +02:00
Jörn Friedrich Dreyer
8dc6bdd96b clean up usage of DatabaseSetupException and catch Exceptions in entrypoints 2013-06-10 13:45:19 +02:00
Jörn Friedrich Dreyer
c0bdbd9d81 introduce and use executeAudited in db.php 2013-06-10 12:56:45 +02:00
Jörn Friedrich Dreyer
d264d0a79d Merge pull request #3648 from owncloud/sql_limit_as_param 
convert LIMIT to parameter
 2013-06-10 02:48:15 -07:00
Björn Schießle
db06b906e5 Merge pull request #3610 from owncloud/encryption_recovery_for_ldap 
recover encryption keys if ownCloud can't change the log-in password
 2013-06-10 02:03:56 -07:00
Georg Ehrke
25e8ac1c2f implement previews for single shared files 2013-06-10 11:01:12 +02:00
Jörn Friedrich Dreyer
5ec13742b3 use to_char to allow comparing string to CLOB cloumns in oracle 2013-06-10 10:33:02 +02:00
Georg Ehrke
a2bb0faec6 Merge branch 'master' into oc_preview 2013-06-10 10:15:53 +02:00
Jörn Friedrich Dreyer
307f1626e8 convert LIMIT to parameter 2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer
124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
infoneo
b39113ae3e Update mapper.php 
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
 2013-06-08 18:39:25 +03:00
Jenkins for ownCloud
3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Robin Appelman
94ca576c9a use a getter for the storage loader to ensure the instance is created 2013-06-07 17:50:10 +02:00
Robin Appelman
2708ab09ab storage loader needs to be accessible by apps 2013-06-07 17:40:19 +02:00
Robin Appelman
85a9b7f094 Storage wrapper: provide access to the wrapped storage 2013-06-07 17:12:45 +02:00
Robin Appelman
f35578ec54 merge master into storage-wrapper 2013-06-07 17:12:16 +02:00
Robin Appelman
bd67512409 manage creating and wrapping storages in it's own class 2013-06-07 17:07:13 +02:00
Michael Gapczynski
9ef989f917 Merge pull request #2919 from owncloud/hook-improvements 
Hook improvements
 2013-06-07 06:35:50 -07:00
Georg Ehrke
8114537310 Merge branch 'master' into oc_preview 2013-06-07 09:46:13 +02:00
Jenkins for ownCloud
67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Robin Appelman
85abede9bf actually return result 2013-06-07 00:22:05 +02:00
Robin Appelman
0470a5ba94 fix variable name 2013-06-07 00:17:51 +02:00
Robin Appelman
cf7321915d seperate mimetype guessing from filename 2013-06-06 23:51:44 +02:00
Björn Schießle
fdaab7372e always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not 2013-06-06 13:30:18 +02:00
Georg Ehrke
85ecec8b01 Merge branch 'master' into oc_preview 2013-06-06 11:13:55 +02:00
Jenkins for ownCloud
81b6cab94f [tx-robot] updated from transifex 2013-06-06 02:21:31 +02:00
Georg Ehrke
f80aba4893 use tmpdir var instead of hardcoded /tmp 2013-06-05 12:58:39 +02:00
Georg Ehrke
21cc4f6960 make libreoffice preview backend work :D 2013-06-05 12:45:20 +02:00
Georg Ehrke
8c5fceba29 fix syntax error 2013-06-05 11:13:13 +02:00
Georg Ehrke
bab8b20cbd use ->cmd instead of hardcoded libreoffice 2013-06-05 11:06:36 +02:00
Georg Ehrke
f437673f1a update require_once block in preview.php 2013-06-05 10:55:57 +02:00
Georg Ehrke
749c33f39d escape tmppath shell arg 2013-06-05 10:53:16 +02:00
Georg Ehrke
bcc4fca257 save current work state of libreoffice preview backend 2013-06-05 10:50:20 +02:00
Jenkins for ownCloud
666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Thomas Tanghus
9cd6645037 Move comment and set requesttoken. 2013-06-05 00:38:08 +02:00
Michael Gapczynski
cb9fe475c4 Merge branch 'master' into hook-improvements 
Conflicts:
	lib/files/view.php
 2013-06-04 18:19:08 -04:00
Michael Gapczynski
e0359b0b24 One more style fix 2013-06-03 18:17:32 -04:00
Michael Gapczynski
1c61732193 Merge branch 'master' into convert-oc_config 2013-06-03 18:06:13 -04:00
Michael Gapczynski
d50d663928 Style and comment fixes 2013-06-03 18:05:38 -04:00
Arthur Schiwon
c8a2beccb0 Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374 2013-06-03 22:36:36 +02:00
Jörn Friedrich Dreyer
96b1e54d4a Merge pull request #3444 from owncloud/share-fix 
Fix undefined index for share mount point retrieval
 2013-06-03 11:35:06 -07:00
icewind1991
8c991d97aa Merge pull request #3561 from owncloud/user 
Refactor of user management
 2013-06-03 08:13:40 -07:00
Thomas Tanghus
2572c9a6b7 Merge pull request #3578 from owncloud/ocdialog 
Replacement for jquery.dialog to fit better with ownCloud design.
 2013-06-03 06:37:27 -07:00
Robin Appelman
0ce2b2708c also clear cached users when removing a single backend 2013-06-03 14:19:17 +02:00
Robin Appelman
2a82964830 use caching for userExists 2013-06-03 13:46:05 +02:00
Robin Appelman
83fbdc903f cast result to bool 2013-06-03 13:39:34 +02:00
Robin Appelman
eb2a1e0f8a move phpdoc comments 2013-06-03 13:33:56 +02:00
Robin Appelman
1a4021a0fe User: return backend result 2013-06-03 13:19:01 +02:00
Robin Appelman
fbe3213fec User: consisten variable naming 2013-06-03 13:17:03 +02:00
Robin Appelman
00b4bfcbf5 User: remove determineDisplayName 2013-06-03 13:15:42 +02:00
Jörn Friedrich Dreyer
b76725c1fa Merge pull request #3560 from owncloud/init-order-session 
initialize the session earlier
 2013-06-03 03:21:05 -07:00
Georg Ehrke
34decf3576 save current work state 2013-06-03 11:24:37 +02:00
Robin Appelman
38bd234686 make sure the filesystem is setup before doing mount operations 2013-06-02 22:09:44 +02:00
Thomas Tanghus
901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +02:00
Robin Appelman
b5e817d638 fix clearing mounts when filesystem isn't initialized yet 2013-06-02 21:44:24 +02:00
Robin Appelman
251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Thomas Müller
1b3c9fe5ae Merge pull request #3454 from owncloud/fix_hasInternetConnection 
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
 2013-05-31 17:05:45 -07:00
Thomas Mueller
3e00a3603c adding PHPDoc comment to getManager() 
adding PHPDoc comment for $user within the hooks callbacks
fixing PHPDoc comment on isLoggedIn()
 2013-06-01 00:49:06 +02:00
Robin Appelman
2c69403fd6 fix namespacing error 2013-06-01 00:39:59 +02:00
Robin Appelman
82fd15706e fix undefined variables 2013-06-01 00:39:59 +02:00
Robin Appelman
e430f442b5 use single quotes 2013-06-01 00:39:59 +02:00
Thomas Mueller
dd4a07321a fix method naming 2013-05-31 23:24:09 +02:00
icewind1991
94a6622bcd Merge pull request #3459 from owncloud/fix_for_2377 
fix problems with german "Umlaut" in folder name
 2013-05-31 14:00:02 -07:00
Florin Peter
b840de4e01 user should set into session before postLogin hook otherwise it will break not only the files_encryption app 2013-05-31 21:30:13 +02:00
Robin Appelman
cdb2f559a8 Fix postLogin hook 2013-05-31 19:58:31 +02:00
Robin Appelman
473f3c6916 fix typo 2013-05-31 18:18:13 +02:00
Robin Appelman
f00844a003 fix caching of user objects 2013-05-31 17:42:51 +02:00
Robin Appelman
b8b0b7606a initialize the session earlier 2013-05-31 17:31:52 +02:00
Robin Appelman
a8fb803319 cache instances of \OC\User\User 2013-05-31 17:31:27 +02:00
Robin Appelman
542bcf9156 Merge branch 'master' into user 2013-05-31 16:35:51 +02:00
Georg Ehrke
a11a40d9a9 add backend for microsoft office 2007 documents 2013-05-31 12:23:51 +02:00
FlorinPeter
d636e168a6 Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes 
File encryption external storage fixes
 2013-05-31 03:21:46 -07:00
Thomas Tanghus
ad5c4bf771 Cleanup hacke v.2 2013-05-31 00:53:57 +02:00
Thomas Tanghus
e21649ccff Revert "Clean up hack." 
This reverts commit 138c7f615b.
 2013-05-31 00:53:15 +02:00
Thomas Tanghus
138c7f615b Clean up hack. 2013-05-31 00:28:03 +02:00
Michael Gapczynski
bd0d189f6f Merge branch 'master' into googledrive 2013-05-30 11:20:22 -04:00
Georg Ehrke
f7c80a391d load getID3 only if needed 2013-05-30 15:29:38 +02:00
Jörn Friedrich Dreyer
476747ee89 Merge pull request #3509 from owncloud/update_jquery_to_1_10 
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
 2013-05-30 06:00:52 -07:00
icewind1991
aa1c5a5d63 Merge pull request #3529 from owncloud/folder-permissions 
Cache: provide a function to get the permissions of all files in a folder with one query
 2013-05-30 05:54:29 -07:00
Georg Ehrke
b944b1c5d2 add javascript preview backend 2013-05-30 11:12:12 +02:00
Georg Ehrke
a014662c52 improve imagick error handling 2013-05-30 11:06:52 +02:00
Georg Ehrke
5433a50461 validate size of file 2013-05-30 10:44:27 +02:00
Jenkins for ownCloud
8e1d9261aa [tx-robot] updated from transifex 2013-05-30 02:34:14 +02:00
Florin Peter
313631edf6 Merge branch 'master' into file_encryption_external_storage_fixes 
Conflicts:
	apps/files_encryption/hooks/hooks.php
 2013-05-30 00:45:29 +02:00
Michael Gapczynski
dbbf195727 Only retrieve the current user's permissions 2013-05-29 18:08:18 -04:00
Florin Peter
1337f48d64 fixes for pgsql 2013-05-29 20:41:07 +02:00
Morris Jobke
5c04b3a63a fix wrong signature delimiter - fix #3523 2013-05-29 20:21:48 +02:00