]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoOracle compat: enable appconfig.configvalue to store empty strings (now working)
Arthur Schiwon [Tue, 23 Jul 2013 17:57:04 +0000 (19:57 +0200)]
Oracle compat: enable appconfig.configvalue to store empty strings (now working)

11 years agoRevert "Oracle compat: enable appconfig.configvalue to store empty strings"
Arthur Schiwon [Tue, 23 Jul 2013 17:55:47 +0000 (19:55 +0200)]
Revert "Oracle compat: enable appconfig.configvalue to store empty strings"

This reverts commit 6c1e68acd8fbb98f8fbd54a38860481b4971bc28.

11 years agoOracle compat: enable appconfig.configvalue to store empty strings
Arthur Schiwon [Tue, 23 Jul 2013 11:19:39 +0000 (13:19 +0200)]
Oracle compat: enable appconfig.configvalue to store empty strings

11 years agoLDAP: avoid PHP Warnings cause by passing empty values to implode
Arthur Schiwon [Mon, 22 Jul 2013 11:57:58 +0000 (13:57 +0200)]
LDAP: avoid PHP Warnings cause by passing empty values to implode

11 years agoLDAP: Oracle compat. fix, closes #4064
Arthur Schiwon [Mon, 22 Jul 2013 11:47:25 +0000 (13:47 +0200)]
LDAP:  Oracle compat. fix, closes #4064

11 years agoSquashed commit of the following:
Thomas Müller [Mon, 22 Jul 2013 11:08:59 +0000 (13:08 +0200)]
Squashed commit of the following:

commit 7e875ff47ae1a3e546c74fb12895b2bfbeedabdf
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Sun Jul 14 21:58:08 2013 +0200

    No admin option to enable public upload in case encryption is enabled
    No upload on pubic page if public upload is disabled

commit 4939d9a668c13cdd74e8bb8e305bdd7a59661c4d
Author: Thomas Mueller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 21:34:38 2013 +0200

    change anonymous to public

commit c3bda8654d911383ae0acf9e41adda7117cb79f8
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:51:01 2013 +0200

    fixing Undefined index: publicUploadEnabled

commit 98861afde443c12a2ef5290c83c63fd12b7b196d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:05:58 2013 +0200

    in case the encryption app is enabled we cannot yet allow anonymous upload

commit 974f09629d0e8bf5d90cf8546fa4a82738ebdebe
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:03:51 2013 +0200

    new admin setting added which allows to turn off anonymous uploads

11 years agoMerge pull request #4140 from sezuan/fix_wrong_found_http_code
Morris Jobke [Sun, 21 Jul 2013 08:33:47 +0000 (01:33 -0700)]
Merge pull request #4140 from sezuan/fix_wrong_found_http_code

changed HTTP FOUND code to the correct value 302

11 years agochanged HTTP FOUND code to the correct value 302
Matthias Rieber [Sat, 20 Jul 2013 17:08:51 +0000 (19:08 +0200)]
changed HTTP FOUND code to the correct value 302

11 years agodeactivate show password toggle for IE
Jan-Christoph Borchardt [Fri, 19 Jul 2013 13:17:28 +0000 (15:17 +0200)]
deactivate show password toggle for IE

Conflicts:

core/css/styles.css

11 years agoMerge pull request #3778 from owncloud/fix_3528
Bart Visscher [Fri, 19 Jul 2013 16:36:19 +0000 (09:36 -0700)]
Merge pull request #3778 from owncloud/fix_3528

LDAP: fix background job, resolves #3528

11 years agoBackport #3779, makes setuped backends are REALLY remembered and not instanciated...
shkdee [Tue, 18 Jun 2013 18:47:47 +0000 (21:47 +0300)]
Backport #3779, makes setuped backends are REALLY remembered and not instanciated many times

11 years agoMerge pull request #4072 from owncloud/non_ajax_upgrade_script
blizzz [Thu, 18 Jul 2013 20:31:57 +0000 (13:31 -0700)]
Merge pull request #4072 from owncloud/non_ajax_upgrade_script

non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 404...

11 years agoMerge pull request #4047 from owncloud/backport_3617
blizzz [Thu, 18 Jul 2013 20:30:07 +0000 (13:30 -0700)]
Merge pull request #4047 from owncloud/backport_3617

Backport 3963

11 years agofixing UNIX_TIMESTAMP() for mssql
Thomas Mueller [Wed, 17 Jul 2013 11:18:46 +0000 (13:18 +0200)]
fixing UNIX_TIMESTAMP() for mssql

Conflicts:
lib/db.php

11 years agoAdd message about completed update
Arthur Schiwon [Wed, 17 Jul 2013 15:32:43 +0000 (17:32 +0200)]
Add message about completed update

11 years agoAdjust to latest changes in PR #4047
Arthur Schiwon [Wed, 17 Jul 2013 15:30:47 +0000 (17:30 +0200)]
Adjust to latest changes in PR #4047

11 years agoRerename \OC\Updater to OC_Updater, fixes broken admin page
Arthur Schiwon [Wed, 17 Jul 2013 15:19:59 +0000 (17:19 +0200)]
Rerename \OC\Updater to OC_Updater, fixes broken admin page

11 years agoWebDAV Auth Connector: Check if already logged in
Markus Goetz [Fri, 12 Jul 2013 11:42:01 +0000 (13:42 +0200)]
WebDAV Auth Connector: Check if already logged in

11 years agoUse transifex.com on link to translations
rolandgeider [Sun, 14 Jul 2013 09:54:39 +0000 (11:54 +0200)]
Use transifex.com on link to translations
Conflicts:
settings/templates/personal.php

11 years agonon-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047.
Arthur Schiwon [Mon, 15 Jul 2013 16:07:43 +0000 (18:07 +0200)]
non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047.

11 years agoOnly emit permissions hook for files and and include path
Michael Gapczynski [Mon, 8 Jul 2013 21:28:18 +0000 (17:28 -0400)]
Only emit permissions hook for files and and include path

Conflicts:
lib/public/share.php

11 years ago5.0.9 v5.0.9
Frank Karlitschek [Sun, 14 Jul 2013 11:36:22 +0000 (13:36 +0200)]
5.0.9

11 years agoMerge pull request #4039 from owncloud/webdav_create_new_file
Thomas Müller [Sun, 14 Jul 2013 20:42:18 +0000 (13:42 -0700)]
Merge pull request #4039 from owncloud/webdav_create_new_file

[webdav client] if the file doesn't exists; create a new one

11 years agoMerge pull request #4044 from owncloud/more_ie8_fixes
Thomas Müller [Sun, 14 Jul 2013 20:10:46 +0000 (13:10 -0700)]
Merge pull request #4044 from owncloud/more_ie8_fixes

More ie8 fixes

11 years agoRemoved the preview warning. This is only a simple text change
Frank Karlitschek [Sat, 13 Jul 2013 11:28:22 +0000 (13:28 +0200)]
Removed the preview warning. This is only a simple text change

11 years agoStable5 adjustements (incl copy of lib/hooks/ from master) to make backport of #3963...
Arthur Schiwon [Fri, 12 Jul 2013 19:42:46 +0000 (21:42 +0200)]
Stable5 adjustements (incl copy of lib/hooks/ from master) to make backport of #3963 work

11 years agofix typo
Robin Appelman [Mon, 8 Jul 2013 19:13:23 +0000 (21:13 +0200)]
fix typo

11 years agobackport: Updater: pass update url as argument to update check
Robin Appelman [Sat, 6 Jul 2013 15:05:38 +0000 (17:05 +0200)]
backport: Updater: pass update url as argument to update check

Conflicts:
lib/updater.php

11 years agobackport: split upgrade logic from ajax file
Robin Appelman [Sat, 6 Jul 2013 15:00:00 +0000 (17:00 +0200)]
backport: split upgrade logic from ajax file

Conflicts:
core/ajax/update.php
lib/updater.php

11 years agoIE8 Show delete icon
Victor Dubiniuk [Fri, 12 Jul 2013 14:51:20 +0000 (17:51 +0300)]
IE8 Show delete icon

11 years agoSome styling to user list
Victor Dubiniuk [Fri, 12 Jul 2013 14:29:08 +0000 (17:29 +0300)]
Some styling to user list

11 years agoIe8 specific multiselect
Victor Dubiniuk [Fri, 12 Jul 2013 14:13:50 +0000 (17:13 +0300)]
Ie8 specific multiselect

11 years agoif the file doesn't exists; create a new one. We use this to create new text files...
Björn Schießle [Fri, 12 Jul 2013 11:25:37 +0000 (13:25 +0200)]
if the file doesn't exists; create a new one. We use this to create new text files in the web interface

11 years agoMerge pull request #3859 from owncloud/versioning_improved_expire_function
Björn Schießle [Fri, 12 Jul 2013 09:22:31 +0000 (02:22 -0700)]
Merge pull request #3859 from owncloud/versioning_improved_expire_function

call expire function before writing the new version to make sure to have...

11 years agoMerge pull request #3965 from dphi/fix_2846
Thomas Müller [Fri, 12 Jul 2013 09:00:14 +0000 (02:00 -0700)]
Merge pull request #3965 from dphi/fix_2846

speedup for propfinds on shared folders

11 years agoMerge pull request #4014 from owncloud/fixing-4005-stable5
Thomas Müller [Thu, 11 Jul 2013 21:00:31 +0000 (14:00 -0700)]
Merge pull request #4014 from owncloud/fixing-4005-stable5

EventSource and update fixes

11 years agoMerge pull request #3984 from owncloud/enable_oci_testing_stable5
Thomas Müller [Thu, 11 Jul 2013 09:40:17 +0000 (02:40 -0700)]
Merge pull request #3984 from owncloud/enable_oci_testing_stable5

Enable oci testing stable5

11 years agoupdate.php: remove event type 'error' as it's unused
Thomas Müller [Wed, 10 Jul 2013 22:26:40 +0000 (00:26 +0200)]
update.php: remove event type 'error' as it's unused
eventsource.js: fixing typos and JSDoc comment

11 years agomissing file
Thomas Müller [Wed, 10 Jul 2013 22:04:43 +0000 (00:04 +0200)]
missing file

11 years ago- eventsource.php: in case of potential CSRF attack we send an error message from...
Thomas Müller [Wed, 10 Jul 2013 22:00:01 +0000 (00:00 +0200)]
- 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

11 years ago5.0.8 v5.0.8
Frank Karlitschek [Wed, 10 Jul 2013 06:54:03 +0000 (08:54 +0200)]
5.0.8

11 years agoFallback to border instead of box-shadow
Victor Dubiniuk [Tue, 2 Jul 2013 15:46:37 +0000 (18:46 +0300)]
Fallback to border instead of box-shadow

11 years agoFix lazy styles loading in IE8
Victor Dubiniuk [Tue, 2 Jul 2013 15:44:10 +0000 (18:44 +0300)]
Fix lazy styles loading in IE8

11 years agoenable oci in autotest.sh
Jörn Friedrich Dreyer [Tue, 9 Jul 2013 10:52:40 +0000 (12:52 +0200)]
enable oci in autotest.sh

11 years agoGoing from text to clob is not something we do.
Bart Visscher [Fri, 28 Jun 2013 14:07:22 +0000 (16:07 +0200)]
Going from text to clob is not something we do.

Also Oracle DB has problems with this, see
http://abhijitbashetti.blogspot.de/2011/10/converting-varchar2-to-clob-and-clob-to.html

Conflicts:
tests/lib/dbschema.php

11 years agoMerge pull request #3893 from owncloud/backport_1872
Bart Visscher [Mon, 8 Jul 2013 18:28:33 +0000 (11:28 -0700)]
Merge pull request #3893 from owncloud/backport_1872

Backport #1872

11 years agoMerge pull request #3970 from owncloud/backport-3946-stable5
Thomas Müller [Mon, 8 Jul 2013 13:51:39 +0000 (06:51 -0700)]
Merge pull request #3970 from owncloud/backport-3946-stable5

Backport 3946 to stable5

11 years agoMerge pull request #3940 from owncloud/stable5_oracle_testsuite_fixes
Jörn Friedrich Dreyer [Mon, 8 Jul 2013 10:43:21 +0000 (03:43 -0700)]
Merge pull request #3940 from owncloud/stable5_oracle_testsuite_fixes

Stable5 oracle testsuite fixes

11 years agoSquashed commit of the following:
Thomas Müller [Mon, 8 Jul 2013 09:55:22 +0000 (11:55 +0200)]
Squashed commit of the following:

commit 70e6ad56ed5d00aeea8fe82b45047998dac92f80
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Sat Jul 6 00:11:42 2013 +0200

    fixing check if public share is a folder or not

commit 8e74ecec3f43a52a9a55871954171ef4073eab9d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Sat Jul 6 00:04:01 2013 +0200

    removing unused getSharedItem()

commit 60ac0f274bbaa926dcec1800e952f2e0b1f05a50
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 17:39:41 2013 +0200

    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

    Conflicts:
     apps/files/ajax/upload.php

commit f071f7439568ffd8b785cd96035cc2e616f61b01
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 11:30:53 2013 +0200

    fixing Notice: Undefined index: isPublic

commit d2f2c7e9b896fd0ac57fb8047501205fc37b2abc
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 09:58:41 2013 +0200

    handle anonymous upload to reshared folder

11 years agoMerge https://github.com/owncloud/core/pull/3827
Björn Schießle [Mon, 8 Jul 2013 08:07:57 +0000 (10:07 +0200)]
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

Conflicts:

lib/config.php

11 years agoImplement getDirectoryPermissions() in Shared Permissions, fixes #2846
Michael Gapczynski [Wed, 29 May 2013 22:22:54 +0000 (18:22 -0400)]
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846

11 years agoOnly retrieve the current user's permissions
Michael Gapczynski [Wed, 29 May 2013 22:08:18 +0000 (18:08 -0400)]
Only retrieve the current user's permissions

11 years agoCache: provide a function to get the permissions of all files in a folder with one...
Robin Appelman [Wed, 29 May 2013 13:25:42 +0000 (15:25 +0200)]
Cache: provide a function to get the permissions of all files in a folder with one query

Conflicts:
lib/files/view.php

11 years ago5.0.8 RC
Frank Karlitschek [Fri, 5 Jul 2013 15:06:34 +0000 (17:06 +0200)]
5.0.8 RC

11 years agoBackport of #3951 to stable5
Thomas Müller [Fri, 5 Jul 2013 21:47:18 +0000 (23:47 +0200)]
Backport of #3951 to stable5

Squashed commit of the following:

commit 46c1280e4f2ac61f0b3c5fed9d2a516cb000c009
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 13:45:21 2013 +0200

    proper fix for getting the shared item if no user is logged in

commit 99e32baec4464444a1a46ae47321e0378e367c3e
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 13:22:38 2013 +0200

    php 5.3 compliant now

commit 227e5f10016e362ed1302acb4426de391d4d9b4b
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 5 12:15:47 2013 +0200

    get the real physical folder name for anonymous upload

11 years agoBackport of #3948 to stable5
Thomas Müller [Fri, 5 Jul 2013 21:32:23 +0000 (23:32 +0200)]
Backport of #3948 to stable5

11 years agofor now we disable public upload in case encryption is enabled
Thomas Mueller [Fri, 28 Jun 2013 14:49:25 +0000 (16:49 +0200)]
for now we disable public upload in case encryption is enabled

11 years agoadding tipsy to the upload button showing the max upload and restoring client side...
Thomas Müller [Fri, 5 Jul 2013 13:07:05 +0000 (15:07 +0200)]
adding tipsy to the upload button showing the max upload and restoring client side upload size validation

Conflicts:
apps/files_sharing/templates/public.php

11 years agoremove unneeded bracket, was introduced by the last merge
Björn Schießle [Fri, 5 Jul 2013 14:18:17 +0000 (16:18 +0200)]
remove unneeded bracket, was introduced by the last merge

11 years agoadded helper function to escape glob pattern
Björn Schießle [Fri, 5 Jul 2013 12:58:33 +0000 (14:58 +0200)]
added helper function to escape glob pattern

Conflicts:

apps/files_encryption/lib/helper.php

11 years agofix getUidAndFilename() test
Björn Schießle [Tue, 25 Jun 2013 16:03:05 +0000 (18:03 +0200)]
fix getUidAndFilename() test

11 years agoonly check for external mount points if the external storage app is enabled
Björn Schießle [Tue, 25 Jun 2013 15:46:04 +0000 (17:46 +0200)]
only check for external mount points if the external storage app is enabled

11 years agomake trash bin aware of system wide mounts with respect to encryption keys
Björn Schießle [Tue, 25 Jun 2013 15:17:41 +0000 (17:17 +0200)]
make trash bin aware of system wide mounts with respect to encryption keys

11 years agoonly escape glob pattern
Björn Schießle [Tue, 25 Jun 2013 14:50:10 +0000 (16:50 +0200)]
only escape glob pattern

11 years agodel share keys from correct location
Björn Schießle [Tue, 25 Jun 2013 14:41:51 +0000 (16:41 +0200)]
del share keys from correct location

11 years agoalways return normalized path
Björn Schießle [Tue, 25 Jun 2013 14:41:24 +0000 (16:41 +0200)]
always return normalized path

11 years agodelete file keys from the correct location
Björn Schießle [Tue, 25 Jun 2013 14:03:03 +0000 (16:03 +0200)]
delete file keys from the correct location

11 years agohandle rename correctly for system wide mounts
Björn Schießle [Tue, 25 Jun 2013 12:42:49 +0000 (14:42 +0200)]
handle rename correctly for system wide mounts

11 years agomove isSystemWideMountPoint() to util.php
Björn Schießle [Tue, 25 Jun 2013 12:25:00 +0000 (14:25 +0200)]
move isSystemWideMountPoint() to util.php

11 years agosome performance improvements, check for system wide mounts only once while writing...
Björn Schießle [Tue, 25 Jun 2013 12:15:53 +0000 (14:15 +0200)]
some performance improvements, check for system wide mounts only once while writing share keys

11 years agofix path to OC_Mount_Config
Björn Schießle [Tue, 25 Jun 2013 11:36:43 +0000 (13:36 +0200)]
fix path to OC_Mount_Config

11 years agohandle system wide mount points
Björn Schießle [Tue, 25 Jun 2013 10:21:54 +0000 (12:21 +0200)]
handle system wide mount points

11 years agofix insertIfNotExist return value, update doc and corresponding test
Jörn Friedrich Dreyer [Fri, 5 Jul 2013 13:41:16 +0000 (15:41 +0200)]
fix insertIfNotExist return value, update doc and corresponding test

11 years agono anonymous upload on read-only folders
Thomas Müller [Fri, 5 Jul 2013 09:23:08 +0000 (11:23 +0200)]
no anonymous upload on read-only folders

11 years agoDo not add groups if user has no groups
Victor Dubiniuk [Wed, 3 Jul 2013 19:06:09 +0000 (22:06 +0300)]
Do not add groups if user has no groups

11 years agofix position of 'user shared the folder foldername with you' label
Georg Ehrke [Thu, 4 Jul 2013 08:32:26 +0000 (10:32 +0200)]
fix position of 'user shared the folder foldername with you' label

11 years agoadd correct check if table exists for oracle
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 16:20:56 +0000 (18:20 +0200)]
add correct check if table exists for oracle

11 years agoOracle doesn't know & as bitwise AND
Bart Visscher [Wed, 26 Jun 2013 19:40:31 +0000 (21:40 +0200)]
Oracle doesn't know & as bitwise AND

Conflicts:
lib/public/share.php

11 years agofor oracle use BITAND() instead of & in sharing permissions sql
Jörn Friedrich Dreyer [Mon, 24 Jun 2013 20:52:01 +0000 (22:52 +0200)]
for oracle use BITAND() instead of & in sharing permissions sql

11 years agofix type of numeric columns
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 18:03:24 +0000 (20:03 +0200)]
fix type of numeric columns

11 years agocheck item id is set
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 17:57:28 +0000 (19:57 +0200)]
check item id is set

11 years agostable5 does not have execute audited yet
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 15:08:24 +0000 (17:08 +0200)]
stable5 does not have execute audited yet

11 years agoadd missing backticks
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 15:07:18 +0000 (17:07 +0200)]
add missing backticks

11 years agomanuall calculate unix_timestamp for oracle
Jörn Friedrich Dreyer [Tue, 25 Jun 2013 07:52:04 +0000 (09:52 +0200)]
manuall calculate unix_timestamp for oracle

11 years agomore verbose error message
Björn Schießle [Thu, 4 Jul 2013 12:50:07 +0000 (14:50 +0200)]
more verbose error message

11 years agoimproved error message
Björn Schießle [Tue, 2 Jul 2013 08:14:33 +0000 (10:14 +0200)]
improved error message

11 years agono ?> at the end of a file
Thomas Müller [Mon, 1 Jul 2013 19:13:04 +0000 (21:13 +0200)]
no ?> at the end of a file
missing .

Conflicts:

apps/files_encryption/files/error.php

11 years agotypo
Thomas Müller [Mon, 1 Jul 2013 19:12:21 +0000 (21:12 +0200)]
typo

11 years agocast result to bool
Björn Schießle [Mon, 1 Jul 2013 15:18:16 +0000 (17:18 +0200)]
cast result to bool

11 years agofix error string
Björn Schießle [Mon, 1 Jul 2013 10:24:21 +0000 (12:24 +0200)]
fix error string

11 years agoadd correct php version
Björn Schießle [Mon, 1 Jul 2013 10:23:26 +0000 (12:23 +0200)]
add correct php version

11 years agocheck php version, the encryption app needs php >= 5.3.3
Björn Schießle [Mon, 1 Jul 2013 10:16:36 +0000 (12:16 +0200)]
check php version, the encryption app needs php >= 5.3.3

Conflicts:

apps/files_encryption/appinfo/app.php

11 years agoone if less
Jörn Friedrich Dreyer [Thu, 27 Jun 2013 11:13:49 +0000 (13:13 +0200)]
one if less

11 years agouse assertEquals number of rows in db tests
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 13:38:02 +0000 (15:38 +0200)]
use assertEquals number of rows in db tests

11 years agofix numRows usage in files_encryption
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:49:10 +0000 (14:49 +0200)]
fix numRows usage in files_encryption

11 years agofix numRows usage in core lib
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:47:42 +0000 (14:47 +0200)]
fix numRows usage in core lib

11 years agofix numRows usage in user_ldap
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:47:12 +0000 (14:47 +0200)]
fix numRows usage in user_ldap

Conflicts:
apps/user_ldap/lib/access.php
apps/user_ldap/lib/helper.php

11 years agomake PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE...
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 12:46:22 +0000 (14:46 +0200)]
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query

11 years agoMerge pull request #3931 from owncloud/backport_selectRange
Jörn Friedrich Dreyer [Thu, 4 Jul 2013 12:39:08 +0000 (05:39 -0700)]
Merge pull request #3931 from owncloud/backport_selectRange

Fixing renaming for stable5

11 years agoMerge pull request #3921 from owncloud/init_default_strings
Björn Schießle [Thu, 4 Jul 2013 08:04:19 +0000 (01:04 -0700)]
Merge pull request #3921 from owncloud/init_default_strings

Add init funtion to OC_Defaults to be able to wrap translatable strings