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

4888 commits

Author SHA1 Message Date
kondou
8dd93c8c02 Fix some phpdoc and camelcase 2013-08-23 07:30:42 +02: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
1c258087c9 fixing typos 2013-08-22 01:20:28 +02: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
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
Thomas Müller
38f9df4293 introducing OCP\AppFramework\App 2013-08-21 01:02:15 +02:00
Thomas Müller
911bd3c16f moving response classes over to OCP 2013-08-21 01:00:26 +02:00
Thomas Müller
e39083c36f typo 2013-08-21 00:58:33 +02:00
Thomas Müller
ba029ef4b2 initial setup of the server container 2013-08-21 00:58:15 +02:00
Thomas Müller
395deacc67 reducing controller annotations to: 
@PublicPage - No user logon is expected
@NoAdminRequired - the login user requires no admin rights
@NoCSRFRequired - the incoming request will not check for CSRF token
 2013-08-20 21:21:21 +02:00
Thomas Müller
25ebe495b8 controller reuses IRequest methods 2013-08-20 21:05:55 +02:00
Thomas Müller
f115b94927 Introducing IRequest 2013-08-20 17:53:58 +02:00
Thomas Müller
6e1946ab00 Introducing IContainer into public api 2013-08-20 17:22:33 +02:00
Thomas Müller
93194bb396 Introducing IContainer into public api 2013-08-20 17:21:14 +02:00
Thomas Müller
cdada78aa4 typos & unused var fixed 2013-08-20 17:20:36 +02:00
kondou
f1518a54df Merge branch 'master' into clean_up_util 
Conflicts:
	lib/util.php
 2013-08-20 17:20:30 +02:00
Thomas Müller
0fa2e1b3d9 there is no HttpMiddleware 2013-08-20 12:48:45 +02:00
Thomas Müller
72e1a8d83b fixing require to Pimple 2013-08-20 12:47:23 +02: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
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
Georg Ehrke
48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02: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
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +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
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
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 +02: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
kondou
c741a25eaa Merge branch 'master' into improve_app-management 2013-08-18 12:15:22 +02:00
Robin Appelman
d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou
65d802329f Fix some naming and spacing in lib/util.php 2013-08-18 10:33:09 +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
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Thomas Müller
fde9cabe97 initial import of appframework 2013-08-17 11:16:48 +02:00
Robin Appelman
d43b4c52ae also emit hooks for views that are a subfolder of the user folder 2013-08-17 10:57:31 +02:00
Bart Visscher
a0b7bf78a6 Remove disconnect function from OC_DB 2013-08-16 19:05:07 +02:00
Robin Appelman
5c9aedac1b remove outdated quota proxy 2013-08-16 15:50:50 +02:00
Robin Appelman
8f10c9571f fix quota wrapper reporting negative free_space, breaking user interface 
return 0 instead
 2013-08-16 15:48:45 +02:00
Jan-Christoph Borchardt
1e8849b04e Merge pull request #4314 from owncloud/css-fixes 
Design fixes
 2013-08-16 01:05:29 -07:00
Jenkins for ownCloud
6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
399adf67b0 merge master into css-fixes 2013-08-16 00:29:43 +02:00
Thomas Müller
7279a07ca2 Merge branch 'master' into mimetype-defaults 
Conflicts:
	apps/files/ajax/newfile.php
 2013-08-16 00:13:10 +02:00
Georg Ehrke
4574c5cf5c check if ->resource is a resource 2013-08-15 16:13:01 +02:00
kondou
9c5416fe4a Clean up \OC\Util 
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
 2013-08-15 15:57:32 +02:00
Thomas Müller
ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Georg Ehrke
7a11911aea add comment to make @jancborchardt happy 2013-08-15 13:25:45 +02:00
Georg Ehrke
825d8610d0 fix svg and cache transparency issue 2013-08-15 13:22:05 +02:00
Georg Ehrke
7fe9320ffe improve unknown backend 2013-08-15 13:22:04 +02:00
Markus Goetz
3972198b61 Cache OC_Util::checkServer() result in session 
The return value almost never changes but this function
is called for every request.
 2013-08-15 11:58:09 +02:00
Jenkins for ownCloud
680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Thomas Tanghus
ca495758bd Fix octemplate string escaping. 2013-08-14 23:06:43 +02:00
Georg Ehrke
623f9ec817 don't generate previews of empty txt files 2013-08-14 21:20:31 +02:00
Georg Ehrke
4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Georg Ehrke
e5761d90ef fix deleting old previews after file changed 2013-08-14 20:49:47 +02:00
Jörn Friedrich Dreyer
8f3f47e868 Merge pull request #4376 from owncloud/use_plurals 
Use plural translations
 2013-08-14 10:23:19 -07:00
Georg Ehrke
f9b2815767 remove \OC\Preview::showErrorPreview 2013-08-14 12:21:27 +02:00
Bjoern Schiessle
6c3efaf26c throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files 2013-08-14 09:44:29 +02:00
Bjoern Schiessle
53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
Robin Appelman
f22719b1ee Scanner: correctly pass trough reuse options when doing a recursive scan 2013-08-12 15:37:39 +02:00
Jenkins for ownCloud
5ebff8cfc4 [tx-robot] updated from transifex 2013-08-11 08:11:03 -04:00
Andreas Fischer
43be3eb4d0 Changing elseif statement to what the PEAR coding guidelines say. 2013-08-09 22:32:38 +02:00
Andreas Fischer
9c22046bff Do not pass numeric strings to strtotime() when formatting dates. 
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
 2013-08-09 22:32:38 +02:00
kondou
b24b208dce Throw exceptions instead of only logging in \OC_Installer::installApp() 2013-08-09 21:57:01 +02:00
kondou
9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
kondou
80e9744da0 Merge branch 'master' into improve_app-management 2013-08-09 18:02:40 +02:00
kondou
605050df9b Log exception at the catching code 2013-08-09 18:01:49 +02:00
Jan-Christoph Borchardt
4c0ec974b9 Merge pull request #4344 from owncloud/appmgmt-in-navigation 
show 'More apps' link to app administration directly in app navigation
 2013-08-09 08:49:41 -07:00
Jenkins for ownCloud
98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Georg Ehrke
1c9d52774e update indexes of oc_permissions 2013-08-09 09:31:53 +02:00
Valerio Ponte
881e362f93 final fix for xsendfile zip generation race condition 2013-08-08 23:34:04 +02:00
Owen Winkler
a2ac5e0163 Merge pull request #4271 from owncloud/plural_translations 
Plural translations
 2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer
e38025ba67 Merge pull request #4151 from owncloud/doctrine-object 
Move dbtype depending logic into object per type
 2013-08-08 08:46:30 -07:00
Björn Schießle
c24bf47db8 Merge pull request #4349 from owncloud/oc_cache_fix 
oc_cache needs to disable file proxys for read/write operation.
 2013-08-08 08:19:14 -07:00
Morris Jobke
062769ab61 Remove noisy Log/Debug message 2013-08-08 16:39:33 +02:00
Bjoern Schiessle
df358dfef5 fix function call for searUsers() 2013-08-08 13:41:04 +02:00
Thomas Müller
fed1792510 adding unit tests for quota checks 2013-08-08 13:33:00 +02:00
Thomas Müller
d3a69bf4c6 adding unit tests to determine length 2013-08-08 11:04:40 +02:00
Bjoern Schiessle
ab6e47b44a oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work. 2013-08-08 09:44:19 +02:00
Thomas Müller
fb890eee67 fixes #4343 2013-08-08 00:42:28 +02:00
Bart Visscher
d563367b0f More style fixes 2013-08-07 22:22:33 +02:00
Bart Visscher
83988a5906 Fix stupid bug 2013-08-07 21:01:31 +02:00
Bart Visscher
0783267e2c Move query processing after the check for prepared statement cache 2013-08-07 18:21:49 +02:00
Jan-Christoph Borchardt
367b248bc0 show 'More apps' link to app administration directly in app navigation 2013-08-07 18:18:09 +02:00
Bart Visscher
2cc94cbc73 Style fixes 2013-08-07 18:17:37 +02:00
Robin Appelman
a0243e03ef use === 2013-08-07 17:17:30 +02:00
Robin Appelman
9321eceed6 add the option to have templates for newly created files 2013-08-07 16:53:09 +02:00
Robin Appelman
fc332acf8a split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings 2013-08-07 16:38:57 +02:00
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Georg Ehrke
dcc92445a0 allow permissions.user to be null as suggested by @butonic 2013-08-07 11:51:08 +02:00
kondou
1a4465f41d Improve app-management 
- Better error messages

- Translate untranslated strings

Basically picks non-app-dependency related stuff from #4017
 2013-08-06 17:19:18 +02:00
Robin Appelman
3e7a86c6ec remove deleted files while scanning 2013-08-06 15:59:06 +02:00
Robin Appelman
95a959b10b merge master into doctrine-object 2013-08-06 15:43:58 +02:00
Bart Visscher
9b6357e6aa Merge pull request #4291 from owncloud/schema 
update DB Schema class
 2013-08-05 11:29:52 -07:00
Georg Ehrke
af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Georg Ehrke
554b1990e2 suppress is_file error msg 2013-08-05 14:23:30 +02:00
Thomas Müller
464afb5eca use isset to prevent undefined index 2013-08-05 13:51:45 +02:00
Thomas Müller
d1a39ab01c Merge pull request #4293 from owncloud/config-date 
make log date configurable, default to iso 8601
 2013-08-04 15:18:05 -07:00
Thomas Müller
b5f18111f4 Merge pull request #4308 from owncloud/fix-4194 
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
 2013-08-04 15:16:32 -07:00
Thomas Müller
0ae2bb77ba Merge pull request #4228 from owncloud/fix-3836 
app migrate: Use = instead of LIKE as described in the comment above.
 2013-08-04 15:00:24 -07:00
Thomas Müller
33d78ab9c7 fixing PHPDoc 2013-08-04 23:13:34 +02:00
Thomas Müller
b716d035c3 fixing PHPDoc 2013-08-04 22:58:40 +02:00
Jan-Christoph Borchardt
5a77b67147 change long couldn't be determined string to question mark again 2013-08-04 16:27:17 +02:00
Andreas Fischer
e03d9e3aa0 Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog. 2013-08-04 02:48:00 +02:00
Thomas Müller
b229381dda initialize $plural_form_string with English default 2013-08-03 23:29:31 +02:00
Robin Appelman
3534c3b373 add reveal mimetype 2013-08-03 21:59:44 +02:00
Thomas Müller
e04bf0aaeb unit tests for plural translations added 2013-08-02 23:08:41 +02:00
Thomas Müller
35a42da3ca PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction 2013-08-02 21:46:25 +02:00
Thomas Müller
afc8ee721d Merge pull request #4299 from owncloud/simplify-db-transaction 
Simplify OC_DB transaction functions
 2013-08-02 12:32:41 -07:00
Robin Appelman
2af27434a4 merge master into doctrine-object 2013-08-02 19:53:04 +02:00
Bart Visscher
fd317f599b Simplify OC_DB transaction functions 2013-08-02 16:12:34 +02:00
Bart Visscher
5ffb8fac24 Use function to create schema manager 2013-08-02 16:02:33 +02:00
Thomas Müller
821a99b937 Merge pull request #4287 from Takuto88/language-config 
Make default language configurable via config.php
 2013-08-02 06:49:54 -07:00
Robin Appelman
258e54182a remove invalid type hinting and cleanup namespaces a bit 2013-08-02 15:09:50 +02:00
Bernhard Posselt
f5c3a346b0 make log date configurable, default to iso 8601 2013-08-02 13:34:20 +02:00
Bart Visscher
59c5529a2b Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager 2013-08-02 13:19:27 +02:00
Bart Visscher
9432885428 Change OC_DB_Schema to use DI for db connection object 2013-08-02 13:14:18 +02:00
Lennart Rosam
79351d064f Make default language configurable via config.php 2013-08-02 09:41:31 +02:00
Jakob Sack
2f17dcdba8 Fix syntax error. 2013-08-01 21:46:52 +02:00
Jakob Sack
eee2c369d9 Fix copy and paste errors in l10n.php 2013-08-01 21:36:33 +02:00
Jakob Sack
9673a563b5 Create plural functions on the fly 2013-08-01 21:25:14 +02:00
kondou
1b567b2ad1 Don't throw a fatal, if is_file() parameter isn't 
a 'valid path', but only a data/base64-string.

Related to #4283
 2013-08-01 21:01:26 +02:00
Jakob Sack
495e44e76c Update l10n.php to read plural_forms string 2013-08-01 19:54:51 +02:00
Jörn Friedrich Dreyer
eed63ae512 Merge pull request #4221 from owncloud/fix-3698 
Fix calculating size for empty folders
 2013-08-01 08:05:19 -07:00
Bjoern Schiessle
9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Morris Jobke
30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans 
Fix boolean support for xml schema definitions
 2013-08-01 02:09:01 -07:00
Morris Jobke
0d69feb12e Merge pull request #4208 from owncloud/scanner-php53 
Fix scanner hooks throwing errors
 2013-08-01 00:05:56 -07:00
Jenkins for ownCloud
b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Bjoern Schiessle
99354f9a28 fix searchUsers() call in group.php 2013-07-31 11:34:22 +02:00
Morris Jobke
50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid 
test lastinsertid
 2013-07-31 00:03:29 -07:00
Jenkins for ownCloud
761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Thomas Müller
f35aadb576 Merge pull request #4227 from owncloud/fixing-testGetById-master 
implement a platform independent version of basename
 2013-07-30 08:39:53 -07:00
Georg Ehrke
93cdfc3e8a Merge branch 'master' into oc_preview 2013-07-30 13:52:53 +02:00
Georg Ehrke
640253fa31 fix code style of try catch blocks 2013-07-30 13:43:15 +02:00
Georg Ehrke
d84d8f7108 fix merge conflicts 2013-07-30 12:35:39 +02:00
Georg Ehrke
ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Thomas Müller
17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Jenkins for ownCloud
88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller
f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Thomas Müller
085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
icewind1991
7c6246fa45 Merge pull request #4213 from owncloud/scanning-performance 
Cache: don't check if the parent exists in the cache if we are already sure it does
 2013-07-29 13:08:23 -07:00
Andreas Fischer
89f8f8e42d app migrate: Use = instead of LIKE as described in the comment above. 
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
 2013-07-29 18:41:22 +02:00
Robin Appelman
74c54587ec better variable naming 2013-07-29 18:27:19 +02:00
Thomas Mueller
e2d3225e5a implement a platform independent version of basename 2013-07-29 18:24:05 +02:00
Robin Appelman
dea3472ad7 remove unneeded 'use' 2013-07-29 17:04:28 +02:00
Robin Appelman
64774f30ba dont need to explicitly pass by reference 2013-07-29 17:03:57 +02:00
Robin Appelman
d6c56b584a make MDB2Schema reader non static 2013-07-29 16:33:00 +02:00
Robin Appelman
fbbe0ebe77 add function to get config object from OC_Config 2013-07-29 16:32:37 +02:00
Michael Gapczynski
1faac6108c Use query to calculate folder size 2013-07-29 10:22:44 -04:00
Georg Ehrke
1e4ec2ac27 add class='preview-icon' to rows in file app that make use of previews 2013-07-29 15:47:17 +02:00
Georg Ehrke
e01bc7de98 Revert "OC\Preview - outsource static methods" 
This reverts commit 14a35267c1.
 2013-07-29 14:51:06 +02:00
Georg Ehrke
65affdc9b3 make previews in files app smaller 2013-07-29 14:40:26 +02:00
Thomas Müller
954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache 
Also clean PHP 5.5 opcache
 2013-07-29 04:40:01 -07:00
Jörn Friedrich Dreyer
05fa55f2eb always return int 2013-07-29 02:17:09 +02:00
Michael Gapczynski
dd4e33fe6b Fix calculating size for empty folders 2013-07-28 16:14:49 -04:00
Michael Gapczynski
c8e60900fc Move check so the variable will never be undefined 2013-07-28 15:32:48 -04:00
kondou
8cd671c207 Also clean PHP 5.5 opcache 2013-07-28 16:33:03 +02:00
Jenkins for ownCloud
48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Robin Appelman
e1e7b6a940 Cache: don't check if the parent exists in the cache if we are already sure it does 2013-07-27 11:36:27 +02:00
Jenkins for ownCloud
fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Bart Visscher
d7916363e1 Make DB connection available to use for dependency injection 2013-07-26 20:36:48 +02:00
Robin Appelman
59bdba9bac fix scanner hooks, cant use inside closures in php 5.3 2013-07-26 15:43:10 +02:00
Robin Appelman
88cc2ccb3b use renamed constants 2013-07-25 16:14:46 +02:00
Robin Appelman
e2f04b3b42 use storage wrapper for quota instead of a filesystem proxy 2013-07-25 16:01:37 +02:00
Robin Appelman
5209cff371 add conveince function to wrap all storages 2013-07-25 16:01:05 +02:00
Robin Appelman
d042c8f166 use renamed constants 2013-07-25 16:00:48 +02:00
Robin Appelman
f4b6a8aa08 add option to wrap existing mounts 2013-07-25 16:00:24 +02:00
Robin Appelman
4e490b0688 fix getPermissionsCache for storage wrapper 2013-07-25 15:59:57 +02:00
Robin Appelman
1b50154c95 functions in OCP should be static 2013-07-25 15:25:17 +02:00
Andreas Fischer
75e93d041d Merge pull request #3887 from owncloud/apc_user_cache 
The APC User Cache doesn't return the cache_list anymore

* owncloud/apc_user_cache:
  Add ACPu memory cache
 2013-07-25 03:48:26 +02:00
Robin Appelman
cd8f0c21ce add quota storage wrapper 2013-07-25 00:31:51 +02:00
Robin Appelman
10d3e63ce5 add quota streamwrapper that limits the amount of data that can be written to a stream 2013-07-25 00:31:51 +02:00
Robin Appelman
94560c68ba rename constants 2013-07-25 00:29:27 +02:00
Bart Visscher
25003fb213 Add ACPu memory cache 2013-07-24 21:50:15 +02:00
icewind1991
ff86b6f134 Merge pull request #4183 from owncloud/fix-group-id 
Fix group id naming fid->gid
 2013-07-24 11:09:47 -07:00
icewind1991
1986416248 Merge pull request #3898 from owncloud/sabre-objecttree 
WebDAV performance improvements
 2013-07-24 10:46:27 -07:00
Bart Visscher
4e3bfd8ddd Fix group id naming fid->gid 2013-07-24 17:54:31 +02:00
Jan-Christoph Borchardt
9b1866f1ac merge master 2013-07-24 16:31:01 +02:00
Robin Appelman
ad266a4253 Merge branch 'master' into sabre-objecttree 2013-07-24 15:53:48 +02:00
Björn Schießle
651479322b Merge pull request #4177 from owncloud/move_defaults_to_template_constructor 
Move defaults to template constructor
 2013-07-24 06:42:52 -07:00
icewind1991
98858e6f00 Merge pull request #3995 from owncloud/groups 
Refactoring of group management code
 2013-07-24 06:13:05 -07:00
Björn Schießle
75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Morris Jobke
2622839fcf Merge pull request #4171 from owncloud/fix-config 
Fix config
 2013-07-24 00:48:43 -07:00
Thomas Müller
1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Thomas Müller
60ce492fac Merge branch 'master' into groups 2013-07-24 01:11:12 +02:00
Thomas Müller
5fc0535f1b Merge pull request #4090 from owncloud/cleanup-some-template-functions 
Cleanup some template functions
 2013-07-23 15:53:43 -07:00
Bart Visscher
793ff0fec9 Fix lastInsertId for OCI8 adapter 2013-07-23 22:16:04 +02:00
Robin Appelman
fb40d9e1e6 Merge branch 'master' into groups 2013-07-23 22:06:03 +02:00
Bart Visscher
7ad38535e5 Merge pull request #3392 from owncloud/googledrive 
Switch to using Google Drive SDK, closes #2047
 2013-07-23 12:23:08 -07:00
Jan-Christoph Borchardt
93b227d803 shorten wording on config directory errors 2013-07-23 18:41:00 +02:00
Bart Visscher
3eb5fff02a Add documentation to OC\DB\adapter class 2013-07-23 18:09:42 +02:00
Bart Visscher
485e8ab0a5 ignore config read failures 2013-07-23 17:38:37 +02:00
Bart Visscher
5caa7576d4 Revert "fix failing master branch - Test_Config::testWriteData" 
This reverts commit 8f93490ac4.
 2013-07-23 17:36:08 +02:00
Jörn Friedrich Dreyer
f7422ad132 Merge pull request #4150 from owncloud/better-error-handling 
Better error handling
 2013-07-23 08:30:02 -07:00
Jenkins for ownCloud
a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Bart Visscher
179b42c56d Fixed review issues 2013-07-22 23:04:14 +02:00
Robin Appelman
499a01f179 use === 2013-07-22 17:41:33 +02:00
Jörn Friedrich Dreyer
cb4cf3e2f7 need to use \OC_Image to escape OCP namespace 2013-07-22 17:25:55 +02:00
Kondou
bc86ce00cf Merge pull request #4154 from owncloud/return-ocl10n 
return result from getL10N
 2013-07-22 08:05:32 -07:00
Robin Appelman
b073a34e77 add support for the <primary/> element within field definitions 2013-07-22 16:25:07 +02:00
Robin Appelman
dc272e6e20 db: cast default values for boolean fields to booleans 2013-07-22 16:24:46 +02:00
Robin Appelman
d509a0c403 return result from getL10N 2013-07-22 15:52:02 +02:00
Georg Ehrke
f1e939e1a3 Merge branch 'master' into fix_return_value_search_principals 2013-07-22 15:30:57 +02:00
Bart Visscher
be7c613993 Fix errors from unit tests 2013-07-21 23:17:37 +02:00
Bart Visscher
b66c9098bd Correct namespace of OC_ classes 2013-07-21 23:17:37 +02:00
Bart Visscher
000b5a801f Move building error string to connection 2013-07-21 23:17:37 +02:00
Bart Visscher
de83bf98c7 Group database connection and schema function 2013-07-21 23:17:37 +02:00
Bart Visscher
013333fe6a Cleanup: remove code for multiple database backends 2013-07-21 23:17:37 +02:00
Bart Visscher
3e0e2cfa19 Use $connection for schema changes 2013-07-21 23:17:37 +02:00
Bart Visscher
8a332cdc94 Simplify OC_DB transaction functions 2013-07-21 23:17:37 +02:00
Bart Visscher
19b9c89634 Move insertIfNotExist to Connection wrapper 
Real implementation is in DB\Adapter* classes
 2013-07-21 23:17:37 +02:00
Bart Visscher
58991150ab Move query statement fixup handling to Connection wrapper 2013-07-21 23:17:37 +02:00
Bart Visscher
1d5d23a1de Move limit/offset handling to Connection wrapper 2013-07-21 23:17:37 +02:00
Bart Visscher
a48e9c488b Move prepared query cache handling to Connection wrapper 2013-07-21 23:17:36 +02:00
Bart Visscher
e3c5fea989 Move lastInsertId to adapter classes 2013-07-21 23:17:36 +02:00
Bart Visscher
cd98ff1eaf Move db prefix handling to Connection wrapper 2013-07-21 23:17:36 +02:00
Bart Visscher
66a215651b Create DB Connection wrapper and DB\Adapter* classes 2013-07-21 23:17:36 +02:00
Bart Visscher
62ce3a5613 Only close db connection when disconnecting, keep the connection object 2013-07-21 23:17:36 +02:00
Bart Visscher
25e3c9cbeb Only display call trace in debug mode 2013-07-21 22:56:21 +02:00
Bart Visscher
aa22194a09 In debug mode uncaught exceptions should display a nice page 2013-07-21 22:40:35 +02:00
Bart Visscher
8c5df31c49 DRY use OC_Template::printErrorPage 2013-07-21 22:30:32 +02:00
Bart Visscher
df8ad46dae Change exit calls to throwing an exception 
This way the error won't be fatal in a unit test
 2013-07-21 22:29:50 +02:00
Bart Visscher
6d39e0ad6f Change to use !== and === 2013-07-21 21:42:42 +02:00
Thomas Müller
01c39cf2be fixing typos, PHPDoc and missing namespace \ 2013-07-21 21:42:42 +02:00
Bart Visscher
3de8570e35 Move basic template functions to their own class 2013-07-21 21:42:42 +02:00
Bart Visscher
2593395561 Move template functions to there own file 2013-07-21 21:37:25 +02:00
Bart Visscher
5965f3ecea Split locating JS and CSS files to their own class 2013-07-21 21:36:15 +02:00
Bart Visscher
37a731bcad Merge pull request #4131 from owncloud/scanner-split 
Remove scanner logic from ajax file and place it in it's own class
 2013-07-21 11:32:11 -07:00
Bart Visscher
639097db59 Merge pull request #4092 from owncloud/base-better-errors 
Generate better errors in base.php
 2013-07-21 11:20:30 -07:00
Bart Visscher
9bf12da750 Merge pull request #3880 from owncloud/code-checker 
Add classes replaced by the public api to the code checker
 2013-07-21 11:19:20 -07:00
Morris Jobke
8f93490ac4 fix failing master branch - Test_Config::testWriteData 2013-07-21 11:13:29 +02:00
Morris Jobke
05c83a163a add proper deprecated tag 2013-07-21 10:30:00 +02:00
Morris Jobke
647e0a0cba Merge pull request #4118 from owncloud/remove-size-experiment 
finally remove the file size obfuscation as it had more disadvantages.
 2013-07-21 01:25:39 -07:00
Jan-Christoph Borchardt
48267b6e6c add back public API function, but mark as deprecated 2013-07-20 01:15:12 +02:00
Bart Visscher
11f28d7880 Result of && if not the part 2013-07-19 17:37:42 +02:00
Bart Visscher
cbe1c22b5f Correct casing of OC_User and pass through the params to getUsers 2013-07-19 17:32:31 +02:00
Robin Appelman
2b89b7c880 Split scanning logic from ajax file 2013-07-19 16:44:47 +02:00
Robin Appelman
b397df2022 add option to get the mountmanager from the filesystem 2013-07-19 16:33:00 +02:00
Robin Appelman
02cdd52fb0 Make Cache\Scanner an emitter 2013-07-19 16:32:43 +02:00
Bart Visscher
a22940d3cd Add OC_L10N to public api 2013-07-19 11:40:11 +02:00
Bart Visscher
9379cbf602 Add OC_Image to public api 2013-07-19 11:23:47 +02:00
Jenkins for ownCloud
ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Robin Appelman
a945ce908b style fix 2013-07-19 02:23:57 +02:00
Bart Visscher
084cf0c202 Merge pull request #2221 from owncloud/doctrine 
OC6: Implement Doctrine as the backend for OC_DB
 2013-07-18 14:24:27 -07:00
Jan-Christoph Borchardt
48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Bart Visscher
e2b6781cf9 Tweaks to the MDB2SchemaReader 2013-07-18 21:07:56 +02:00
Robin Appelman
e3ea3ed3c5 group: only pass backends that hold that specific group to the group constructor 2013-07-18 12:15:34 +02:00
Thomas Müller
3c6b205e37 Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master 
fixing UNIX_TIMESTAMP() for mssql
 2013-07-17 13:57:43 -07:00
Markus Goetz
3fd4ff79ee Merge pull request #4042 from guruz/webdav_auth_check_existing 
WebDAV Auth Connector: Check if already logged in
 2013-07-17 05:00:59 -07:00
Markus Goetz
bf7514f76a WebDAV Auth Connector: Check if already logged in 2013-07-17 13:51:15 +02:00
Thomas Mueller
24283425a6 fixing UNIX_TIMESTAMP() for mssql 2013-07-17 13:18:46 +02:00
Bart Visscher
5b60fad467 Display the exception error backtrace preformatted 2013-07-16 22:42:09 +02:00
Bart Visscher
971a3fd124 Early errors (in base.php) don't have session available 2013-07-16 22:37:32 +02:00
Bart Visscher
49fca86f3c Cleanup error generation in base.php 2013-07-16 22:36:39 +02:00
Bart Visscher
7d86e262e1 Use autoloader for Patchwork/PHP/Shim/Normalizer 2013-07-16 22:32:04 +02:00
Jakob Sack
fb97600091 Fix an error jenkins found 2013-07-16 22:27:55 +02:00
icewind1991
e09ffb6f57 Merge pull request #2395 from owncloud/cache 
Seperate the memory based cache and file based cache in OC_Cache
 2013-07-16 13:25:07 -07:00
Jakob Sack
bb0c5bff5f Add multiple plural forms to the php part 2013-07-16 22:16:53 +02:00
Bart Visscher
285f288cf3 Merge pull request #3959 from owncloud/buildNotExistingFileNameForView 
Fix renaming using parenthesis
 2013-07-16 12:06:53 -07:00
Robin Appelman
dc1a17b6f4 memcache: also switch factory to prefix 2013-07-16 16:08:37 +02:00
Robin Appelman
504089940d mamcache: implement the ArrayAccess interface 2013-07-16 16:06:00 +02:00
Robin Appelman
69048ab71f memchache: use prefix string instead of global flag 2013-07-16 15:42:40 +02:00
Robin Appelman
d82c1dfcab split out memcache factory from base class 2013-07-16 15:34:22 +02:00
Robin Appelman
0ae8eb4f5e Merge branch 'master' into cache 2013-07-16 15:22:47 +02:00
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