]>
source.dussan.org Git - nextcloud-server.git/log
kondou [Tue, 2 Jul 2013 01:16:42 +0000 (03:16 +0200)]
Add a "Wrong password." message, if the password
for the public share was wrong.
Fix #2725
Thomas Müller [Mon, 1 Jul 2013 22:08:08 +0000 (15:08 -0700)]
Merge pull request #3748 from owncloud/fixing-3740-master
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
Thomas Müller [Mon, 1 Jul 2013 21:51:43 +0000 (23:51 +0200)]
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
Thomas Müller [Mon, 1 Jul 2013 21:38:28 +0000 (14:38 -0700)]
Merge pull request #3775 from owncloud/test_fixes_for_dbschema
use executeAudited, add table name to assert message, skip schema changi...
Thomas Müller [Mon, 1 Jul 2013 21:37:09 +0000 (14:37 -0700)]
Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
remove unnecessary try catch blocks
Thomas Müller [Mon, 1 Jul 2013 19:35:32 +0000 (12:35 -0700)]
Merge pull request #3903 from owncloud/nonpublic-uploading
Fix upload regressions
Thomas Müller [Mon, 1 Jul 2013 18:57:29 +0000 (11:57 -0700)]
Merge pull request #3894 from owncloud/ie8_compatibility_fixes
Ie8 compatibility fixes
Robin Appelman [Mon, 1 Jul 2013 13:47:17 +0000 (15:47 +0200)]
fix detection of public upload in filelist.js
Robin Appelman [Mon, 1 Jul 2013 13:39:11 +0000 (15:39 +0200)]
fix uploading when ['dirtoken'] is not set
Robin Appelman [Mon, 1 Jul 2013 13:37:52 +0000 (15:37 +0200)]
code style
Björn Schießle [Mon, 1 Jul 2013 09:12:18 +0000 (11:12 +0200)]
backport from pull request #3863
Björn Schießle [Mon, 1 Jul 2013 08:48:58 +0000 (10:48 +0200)]
Merge branch 'master' of github.com:owncloud/core
Björn Schießle [Mon, 1 Jul 2013 08:22:05 +0000 (10:22 +0200)]
set default logo claim to ''
Björn Schießle [Fri, 28 Jun 2013 08:06:57 +0000 (10:06 +0200)]
add logo claim to defaults.php
Björn Schießle [Thu, 27 Jun 2013 17:53:49 +0000 (19:53 +0200)]
logo claim added
Björn Schießle [Thu, 27 Jun 2013 16:28:53 +0000 (18:28 +0200)]
make mail footer aware of different themes
Conflicts:
lib/mail.php
Björn Schießle [Thu, 27 Jun 2013 14:28:45 +0000 (16:28 +0200)]
remove unneeded if condition
Björn Schießle [Thu, 27 Jun 2013 14:24:03 +0000 (16:24 +0200)]
lib/defaults.php should only contain the default strings and read the other strings directly from the theme
Björn Schießle [Wed, 26 Jun 2013 16:05:37 +0000 (18:05 +0200)]
check for updates only in the community edition
Björn Schießle [Wed, 26 Jun 2013 15:56:19 +0000 (17:56 +0200)]
construct the foother in defaults.php so that we use always the same footer
Conflicts:
settings/templates/admin.php
Morris Jobke [Mon, 1 Jul 2013 08:42:39 +0000 (01:42 -0700)]
Merge pull request #3857 from owncloud/enable_single_autotest
enable testing individual tests
Morris Jobke [Mon, 1 Jul 2013 08:28:17 +0000 (01:28 -0700)]
Merge pull request #3223 from owncloud/fix-2820
if rename of file fails, the rename is undone in the view - fix 2820
Jenkins for ownCloud [Mon, 1 Jul 2013 01:28:25 +0000 (03:28 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Sun, 30 Jun 2013 21:41:51 +0000 (14:41 -0700)]
Merge pull request #3852 from owncloud/fixing-3830-master
session life time is now configurable and set to the same value
Thomas Müller [Sun, 30 Jun 2013 16:16:32 +0000 (09:16 -0700)]
Merge pull request #3763 from owncloud/recursive-rmdir
Make rmdir recursive for local storage
Robin Appelman [Sun, 30 Jun 2013 15:44:49 +0000 (17:44 +0200)]
make rmdir recursive for mappellocal storage backend
Jenkins for ownCloud [Sun, 30 Jun 2013 00:13:07 +0000 (02:13 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Sat, 29 Jun 2013 21:48:34 +0000 (14:48 -0700)]
Merge pull request #3897 from bantu/gitignore
gitignore: Make paths relative to repository root.
Thomas Müller [Sat, 29 Jun 2013 21:47:29 +0000 (14:47 -0700)]
Merge pull request #2703 from owncloud/cleanup-setup
Cleanup OC_Setup
Bart Visscher [Thu, 27 Jun 2013 18:19:51 +0000 (20:19 +0200)]
Fix review items
Bart Visscher [Wed, 10 Apr 2013 22:08:53 +0000 (00:08 +0200)]
Fix found errors
Bart Visscher [Wed, 10 Apr 2013 18:03:54 +0000 (20:03 +0200)]
Fix OCI setupDatabase parameter
Bart Visscher [Wed, 10 Apr 2013 15:57:58 +0000 (17:57 +0200)]
Remove unsued parameter
Bart Visscher [Wed, 3 Apr 2013 15:52:18 +0000 (17:52 +0200)]
Use db setup class for option validation
Bart Visscher [Wed, 3 Apr 2013 06:31:47 +0000 (08:31 +0200)]
Change database creation to use array to select db setup class
Bart Visscher [Tue, 2 Apr 2013 20:01:23 +0000 (22:01 +0200)]
Convert database setup code to objects
Bart Visscher [Fri, 29 Mar 2013 15:28:48 +0000 (16:28 +0100)]
Split database specific install/setup code to their own class
Andreas Fischer [Sat, 29 Jun 2013 14:31:04 +0000 (16:31 +0200)]
gitignore: Make paths relative to repository root.
Paths without the leading slash apply to all subdirectories, which especially
means that /tests/data is ignored, making it unnecessarily hard to add test
data.
Bart Visscher [Sat, 29 Jun 2013 11:38:18 +0000 (04:38 -0700)]
Merge pull request #3896 from owncloud/fix-dropdown-because-no-one-fixes-3241
Escape dropdown
Lukas Reschke [Sat, 29 Jun 2013 11:24:05 +0000 (13:24 +0200)]
Escape dropdown
Fixes #3241
Bart Visscher [Sat, 29 Jun 2013 11:09:50 +0000 (04:09 -0700)]
Merge pull request #2914 from Kondou-ger/label_overlapping_value
Fix textfield label overlapping value.
Bart Visscher [Sat, 29 Jun 2013 11:07:34 +0000 (04:07 -0700)]
Merge pull request #3688 from roha4000/fix_upload_max_filesize
upload_max_filesize = 0 not possible if post_max_size is not 0
Bart Visscher [Sat, 29 Jun 2013 11:00:03 +0000 (04:00 -0700)]
Merge pull request #3635 from owncloud/storage-wrapper
Give apps the option to wrap storage backends
Bart Visscher [Sat, 29 Jun 2013 10:38:56 +0000 (03:38 -0700)]
Merge pull request #3268 from owncloud/convert-oc_log
Convert OC_Log to object so it can be used for DI
Jenkins for ownCloud [Sat, 29 Jun 2013 00:09:10 +0000 (02:09 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 28 Jun 2013 20:59:33 +0000 (13:59 -0700)]
Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
for now we disable public upload in case encryption is enabled
Morris Jobke [Fri, 28 Jun 2013 20:41:18 +0000 (13:41 -0700)]
Merge pull request #3881 from owncloud/archive_tar_php5.5
Skip Test_Archive_TAR in php 5.5 for now
Morris Jobke [Fri, 28 Jun 2013 20:38:44 +0000 (13:38 -0700)]
Merge pull request #3884 from owncloud/fixing-unittests-master
Fixing unittests master
Victor Dubiniuk [Fri, 28 Jun 2013 20:18:11 +0000 (23:18 +0300)]
Use svg to png fallback on demand only
Victor Dubiniuk [Fri, 28 Jun 2013 20:10:40 +0000 (23:10 +0300)]
Add fallback for svg app icons
icewind1991 [Fri, 28 Jun 2013 19:24:33 +0000 (12:24 -0700)]
Merge pull request #3892 from owncloud/static-streamwrapper
Improvements for the static:// streamwrapper
Bart Visscher [Fri, 28 Jun 2013 19:00:35 +0000 (12:00 -0700)]
Merge pull request #1044 from owncloud/fix_extra_slash
Remove duplicate / for first folder in root
Bart Visscher [Fri, 28 Jun 2013 19:00:09 +0000 (21:00 +0200)]
update to !==
Victor Dubiniuk [Fri, 28 Jun 2013 18:53:56 +0000 (21:53 +0300)]
Hide a ghost image on the apps management page
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
Thomas Mueller [Thu, 27 Jun 2013 14:48:09 +0000 (16:48 +0200)]
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
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 14:58:49 +0000 (16:58 +0200)]
remove wrong check here
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 09:31:23 +0000 (12:31 +0300)]
correctly handle error results of PDO and MDB2 backends
Jörn Friedrich Dreyer [Tue, 18 Jun 2013 16:24:48 +0000 (18:24 +0200)]
use executeAudited, add table name to assert message, skip schema changing test on oracle
Robin Appelman [Fri, 28 Jun 2013 17:59:04 +0000 (19:59 +0200)]
better unit tests for static stream wrapper
Robin Appelman [Fri, 28 Jun 2013 17:54:16 +0000 (19:54 +0200)]
fix is_file and is_dir for the static streamwrapper
Robin Appelman [Fri, 28 Jun 2013 17:41:28 +0000 (19:41 +0200)]
add option to clear the files in the static streamwrapper
Jörn Friedrich Dreyer [Fri, 28 Jun 2013 17:22:59 +0000 (10:22 -0700)]
Merge pull request #3832 from owncloud/oracle_sql_fixes
for oracle use BITAND() instead of & in sharing permissions sql
Robin Appelman [Fri, 28 Jun 2013 16:18:12 +0000 (18:18 +0200)]
fix storage wrapper namespaces
Thomas Mueller [Fri, 28 Jun 2013 14:49:25 +0000 (16:49 +0200)]
for now we disable public upload in case encryption is enabled
Jörn Friedrich Dreyer [Fri, 28 Jun 2013 14:30:41 +0000 (07:30 -0700)]
Merge pull request #3838 from rgeber/master
Public Upload Feature
Bart Visscher [Fri, 28 Jun 2013 14:15:38 +0000 (07:15 -0700)]
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
Thomas Müller [Fri, 28 Jun 2013 14:05:09 +0000 (07:05 -0700)]
Merge pull request #3843 from owncloud/sabre-exceptions
Sabre: throw exceptions when delete/create/write operations are not permitted
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
Robin Appelman [Fri, 28 Jun 2013 13:34:25 +0000 (15:34 +0200)]
move storage wrappers to their own namespace
Bart Visscher [Fri, 28 Jun 2013 13:18:56 +0000 (06:18 -0700)]
Merge pull request #3865 from owncloud/fix_test_for_oracle
Fix sharing test for oracle
Thomas Mueller [Fri, 28 Jun 2013 13:17:54 +0000 (15:17 +0200)]
session_life_time -> session_lifetime
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
Thomas Mueller [Fri, 28 Jun 2013 13:13:57 +0000 (15:13 +0200)]
make phpunit happy - adding asserts
Bart Visscher [Fri, 28 Jun 2013 13:11:28 +0000 (06:11 -0700)]
Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
manually calculate unix_timestamp for oracle
Thomas Mueller [Fri, 28 Jun 2013 12:37:52 +0000 (14:37 +0200)]
make PHPUnit happy and add asserts
Thomas Mueller [Fri, 28 Jun 2013 11:24:24 +0000 (13:24 +0200)]
TimedJob: make PhpUnit happy with asserts
Bart Visscher [Mon, 24 Jun 2013 20:38:05 +0000 (22:38 +0200)]
Skip Test_Archive_TAR in php 5.5 for now
Bart Visscher [Fri, 28 Jun 2013 09:15:08 +0000 (11:15 +0200)]
Fix usage of non existent consts
Jenkins for ownCloud [Fri, 28 Jun 2013 00:04:58 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
Thomas Mueller [Thu, 27 Jun 2013 21:14:32 +0000 (23:14 +0200)]
missing $
Jörn Friedrich Dreyer [Thu, 27 Jun 2013 20:07:42 +0000 (13:07 -0700)]
Merge pull request #3872 from bantu/phpunit-xml-dist
Use phpunit.xml.dist instead of phpunit.xml ...
Bart Visscher [Thu, 27 Jun 2013 20:01:52 +0000 (22:01 +0200)]
Fix review points
Bart Visscher [Thu, 27 Jun 2013 18:10:45 +0000 (20:10 +0200)]
Make the object drive the logging backend
This is the other way around then it was.
Thomas Tanghus [Thu, 27 Jun 2013 14:50:47 +0000 (07:50 -0700)]
Merge pull request #3576 from owncloud/jquery.multiselect-1.13
Update to jquery.multiselect 1.13
Andreas Fischer [Thu, 27 Jun 2013 14:50:17 +0000 (16:50 +0200)]
gitignore: Fix typo + adjust comment format.
Andreas Fischer [Thu, 27 Jun 2013 14:44:55 +0000 (16:44 +0200)]
PHPUnit: Add tests/phpunit.xml to gitignore.
Andreas Fischer [Thu, 27 Jun 2013 14:31:31 +0000 (16:31 +0200)]
PHPUnit: Allow developers to use their own custom phpunit.xml file.
The order of precedence of configuration files for PHPUnit is:
- phpunit.xml (allowing custom user defined configuration)
- phpunit.xml.dist (configuration distributed with the software)
Jörn Friedrich Dreyer [Thu, 27 Jun 2013 11:13:49 +0000 (13:13 +0200)]
one if less
Thomas Müller [Thu, 27 Jun 2013 08:55:57 +0000 (01:55 -0700)]
Merge pull request #3847 from bantu/phpunit-json-listener-removal
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console
Jenkins for ownCloud [Thu, 27 Jun 2013 00:12:00 +0000 (02:12 +0200)]
[tx-robot] updated from transifex
Roman Geber [Wed, 26 Jun 2013 20:51:38 +0000 (22:51 +0200)]
Added file-upload to GIT repo
Optimized CSS identifiers
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 18:03:24 +0000 (20:03 +0200)]
fix type of numeric columns
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 17:57:28 +0000 (19:57 +0200)]
check item id is set
Jörn Friedrich Dreyer [Wed, 26 Jun 2013 13:33:35 +0000 (15:33 +0200)]
enable testing individual tests
VicDeo [Wed, 26 Jun 2013 11:42:32 +0000 (04:42 -0700)]
Merge pull request #3855 from owncloud/fixing-3853-master
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js....
Thomas Mueller [Wed, 26 Jun 2013 09:23:21 +0000 (11:23 +0200)]
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
Thomas Mueller [Wed, 26 Jun 2013 07:19:19 +0000 (09:19 +0200)]
session life time is now configurable and set to the same value
Jenkins for ownCloud [Wed, 26 Jun 2013 00:07:04 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Andreas Fischer [Tue, 25 Jun 2013 19:57:00 +0000 (21:57 +0200)]
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console.
Robin Appelman [Tue, 25 Jun 2013 15:04:25 +0000 (17:04 +0200)]
Sabre: throw exceptions when delete/create/write operations are not permitted