]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge pull request #3727 from owncloud/fix_glob_escaping
Björn Schießle [Mon, 17 Jun 2013 13:35:47 +0000 (06:35 -0700)]
Merge pull request #3727 from owncloud/fix_glob_escaping

only escape glob pattern

11 years agoMerge branch 'master' into fix_glob_escaping
Björn Schießle [Mon, 17 Jun 2013 12:51:08 +0000 (14:51 +0200)]
Merge branch 'master' into fix_glob_escaping

Conflicts:
apps/files_trashbin/lib/trash.php

11 years agodon't normalize absolute local path
Björn Schießle [Mon, 17 Jun 2013 12:42:18 +0000 (14:42 +0200)]
don't normalize absolute local path

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 17 Jun 2013 00:08:11 +0000 (02:08 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3621 from owncloud/path-mimetype
Thomas Müller [Sun, 16 Jun 2013 20:14:16 +0000 (13:14 -0700)]
Merge pull request #3621 from owncloud/path-mimetype

seperate mimetype guessing from filename

11 years agoBasic tests for getFileNameMimeType
Robin Appelman [Sun, 16 Jun 2013 18:19:37 +0000 (20:19 +0200)]
Basic tests for getFileNameMimeType

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 16 Jun 2013 00:07:45 +0000 (02:07 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder
Morris Jobke [Sat, 15 Jun 2013 08:31:32 +0000 (01:31 -0700)]
Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder

Fix inexisting trashbin's sub-folders

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 15 Jun 2013 00:07:18 +0000 (02:07 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3733 from owncloud/email_template
Jan-Christoph Borchardt [Fri, 14 Jun 2013 21:43:41 +0000 (14:43 -0700)]
Merge pull request #3733 from owncloud/email_template

E-mail templates (#3683)

11 years agoMerge pull request #3473 from opensaucesystems/master
Thomas Müller [Fri, 14 Jun 2013 18:31:23 +0000 (11:31 -0700)]
Merge pull request #3473 from opensaucesystems/master

Small update to user_webdavauth

11 years agoMerge pull request #3721 from owncloud/oracle_setup_fixes
Thomas Müller [Fri, 14 Jun 2013 18:21:02 +0000 (11:21 -0700)]
Merge pull request #3721 from owncloud/oracle_setup_fixes

Oracle setup fixes

11 years agoremove » and « from the text mail because they will be escaped
Thomas Mueller [Fri, 14 Jun 2013 18:04:20 +0000 (20:04 +0200)]
remove » and « from the text mail because they will be escaped

11 years agoDo no translate "ownCloud - "
Stephan Arts [Fri, 14 Jun 2013 16:02:35 +0000 (18:02 +0200)]
Do no translate "ownCloud - "

11 years agoUse templates to theme share e-mails (#3683)
Stephan Arts [Fri, 14 Jun 2013 15:38:56 +0000 (17:38 +0200)]
Use templates to theme share e-mails (#3683)

11 years agoMerge pull request #3726 from owncloud/remove-outlines
Jan-Christoph Borchardt [Fri, 14 Jun 2013 15:06:52 +0000 (08:06 -0700)]
Merge pull request #3726 from owncloud/remove-outlines

remove dotted outlines in Firefox, fix #3712

11 years agoremove default tablespace in parameter
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 13:54:45 +0000 (15:54 +0200)]
remove default tablespace in parameter

11 years agoNo coverage for tests
Thomas Müller [Fri, 14 Jun 2013 13:42:54 +0000 (15:42 +0200)]
No coverage for tests

11 years agoadding default to $hint within ctor of DatabaseSetupException
Thomas Mueller [Fri, 14 Jun 2013 13:38:09 +0000 (15:38 +0200)]
adding default to $hint within ctor of DatabaseSetupException

11 years agoNo coverage for settings/l10n
Thomas Müller [Fri, 14 Jun 2013 13:17:02 +0000 (15:17 +0200)]
No coverage for settings/l10n

11 years agofix indention
Björn Schießle [Fri, 14 Jun 2013 13:14:23 +0000 (15:14 +0200)]
fix indention

11 years agoonly escape glob pattern
Björn Schießle [Fri, 14 Jun 2013 13:07:06 +0000 (15:07 +0200)]
only escape glob pattern

11 years agoNo coverage for lib/l10n and core/l10n
Thomas Müller [Fri, 14 Jun 2013 12:24:58 +0000 (14:24 +0200)]
No coverage for lib/l10n and core/l10n

11 years agoremove dotted outlines in Firefox, fix #3712
Jan-Christoph Borchardt [Fri, 14 Jun 2013 12:08:04 +0000 (14:08 +0200)]
remove dotted outlines in Firefox, fix #3712

11 years agocoding style
Thomas Mueller [Fri, 14 Jun 2013 11:54:41 +0000 (13:54 +0200)]
coding style

11 years agouse executeAudited in sabredav lock
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 10:23:44 +0000 (12:23 +0200)]
use executeAudited in sabredav lock

11 years agoadd missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 10:18:20 +0000 (12:18 +0200)]
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup

11 years agofix oci dbschema test
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 10:12:32 +0000 (12:12 +0200)]
fix oci dbschema test

11 years agouse USERS tablespace whn none is given, only needed when we need to create a user...
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 10:09:49 +0000 (12:09 +0200)]
use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config

11 years agooracle does not need sequence suffix, manually set database name to allow fetching...
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 10:06:29 +0000 (12:06 +0200)]
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

11 years agoMerge pull request #3684 from owncloud/pg_install_db_master
Morris Jobke [Fri, 14 Jun 2013 09:50:01 +0000 (02:50 -0700)]
Merge pull request #3684 from owncloud/pg_install_db_master

Try connection with specified db when postgres does not work

11 years agoMerge pull request #2835 from owncloud/move-maint-start
Thomas Müller [Fri, 14 Jun 2013 09:13:18 +0000 (02:13 -0700)]
Merge pull request #2835 from owncloud/move-maint-start

Move maintenance start to ajax call

11 years agoMerge pull request #3715 from owncloud/fixes_for_3641_3620
Björn Schießle [Fri, 14 Jun 2013 08:38:15 +0000 (01:38 -0700)]
Merge pull request #3715 from owncloud/fixes_for_3641_3620

files_encryption: bug fixes for reported problems.

11 years agoimprove comment
Morris Jobke [Fri, 14 Jun 2013 08:28:33 +0000 (11:28 +0300)]
improve comment

11 years agoMerge branch 'master' into move-maint-start
Thomas Mueller [Fri, 14 Jun 2013 08:06:13 +0000 (10:06 +0200)]
Merge branch 'master' into move-maint-start

Conflicts:
lib/util.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 14 Jun 2013 00:52:34 +0000 (02:52 +0200)]
[tx-robot] updated from transifex

11 years agoMerge branch 'master' into fixes_for_3641_3620
Florin Peter [Thu, 13 Jun 2013 23:14:33 +0000 (01:14 +0200)]
Merge branch 'master' into fixes_for_3641_3620

11 years agoMerge pull request #3690 from owncloud/use_execute_audited_in_filecache
Thomas Müller [Thu, 13 Jun 2013 20:55:55 +0000 (13:55 -0700)]
Merge pull request #3690 from owncloud/use_execute_audited_in_filecache

use executeAudited in files cache

11 years agoMerge pull request #3686 from owncloud/minor_exception_cleanup
Thomas Müller [Thu, 13 Jun 2013 20:50:31 +0000 (13:50 -0700)]
Merge pull request #3686 from owncloud/minor_exception_cleanup

minor cleanup for exception handling

11 years agoMerge pull request #3586 from owncloud/contributing
Morris Jobke [Thu, 13 Jun 2013 19:36:11 +0000 (12:36 -0700)]
Merge pull request #3586 from owncloud/contributing

Revise Contributing document

11 years agoFix typo
Morris Jobke [Thu, 13 Jun 2013 19:35:32 +0000 (22:35 +0300)]
Fix typo

11 years agofix for path_hash not unique as reported at #3641
Florin Peter [Thu, 13 Jun 2013 18:52:34 +0000 (20:52 +0200)]
fix for path_hash not unique as reported at #3641

11 years agofix memory problems as reported at #3620
Florin Peter [Thu, 13 Jun 2013 18:51:22 +0000 (20:51 +0200)]
fix memory problems as reported at #3620

11 years agoMerge pull request #3687 from owncloud/template_updates
Björn Schießle [Thu, 13 Jun 2013 14:32:41 +0000 (07:32 -0700)]
Merge pull request #3687 from owncloud/template_updates

Make templates aware of different owncloud editions

11 years agoimproved footer
Björn Schießle [Thu, 13 Jun 2013 14:10:33 +0000 (16:10 +0200)]
improved footer

11 years agoMerge pull request #3558 from owncloud/files_encryption_check_private_key
Björn Schießle [Thu, 13 Jun 2013 11:18:32 +0000 (04:18 -0700)]
Merge pull request #3558 from owncloud/files_encryption_check_private_key

check if the decrypted private key is valid on login and on read/write files

11 years agoMerge branch 'master' into files_encryption_check_private_key
Björn Schießle [Thu, 13 Jun 2013 11:17:35 +0000 (13:17 +0200)]
Merge branch 'master' into files_encryption_check_private_key

Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php

11 years agoPDOException has no previous(), oh the consistency ...
Jörn Friedrich Dreyer [Thu, 13 Jun 2013 11:14:00 +0000 (13:14 +0200)]
PDOException has no previous(), oh the consistency ...

11 years agoMerge pull request #3552 from owncloud/files_encryption_upgrade_fix
Björn Schießle [Thu, 13 Jun 2013 10:54:19 +0000 (03:54 -0700)]
Merge pull request #3552 from owncloud/files_encryption_upgrade_fix

Fix files_encryption app upgrade from 4.5 to 5.0

11 years agoMerge branch 'master' into files_encryption_upgrade_fix
Björn Schießle [Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)]
Merge branch 'master' into files_encryption_upgrade_fix

11 years agoMerge pull request #3640 from infoneo/master
Thomas Müller [Thu, 13 Jun 2013 10:34:36 +0000 (03:34 -0700)]
Merge pull request #3640 from infoneo/master

Folders with multiple periods problem fix

11 years agoMerge pull request #3668 from owncloud/encryption_migrate_only_once
Björn Schießle [Thu, 13 Jun 2013 10:31:31 +0000 (03:31 -0700)]
Merge pull request #3668 from owncloud/encryption_migrate_only_once

make sure that only one process can enter the migration mode

11 years agoMerge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_en...
Björn Schießle [Thu, 13 Jun 2013 08:49:23 +0000 (10:49 +0200)]
Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix

11 years agoMerge pull request #3677 from owncloud/apps-buttons
Jan-Christoph Borchardt [Thu, 13 Jun 2013 08:44:48 +0000 (01:44 -0700)]
Merge pull request #3677 from owncloud/apps-buttons

remove App management top bar and move buttons more contextually in the interface

11 years agoLegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
Björn Schießle [Thu, 13 Jun 2013 08:44:05 +0000 (10:44 +0200)]
LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed

11 years agoadd comment to explain the helper function
Björn Schießle [Thu, 13 Jun 2013 08:35:30 +0000 (10:35 +0200)]
add comment to explain the helper function

11 years agofix typo in var name
Björn Schießle [Thu, 13 Jun 2013 08:11:23 +0000 (10:11 +0200)]
fix typo in var name

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 13 Jun 2013 00:20:23 +0000 (02:20 +0200)]
[tx-robot] updated from transifex

11 years agoupdate submodule
Florin Peter [Wed, 12 Jun 2013 21:21:24 +0000 (23:21 +0200)]
update submodule

11 years agofix another double wrapped array
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 21:01:52 +0000 (23:01 +0200)]
fix another double wrapped array

11 years agoTL;DR and remove link from "Report issue here"
Morris Jobke [Wed, 12 Jun 2013 19:58:19 +0000 (21:58 +0200)]
TL;DR and remove link from "Report issue here"

11 years agoremove additional array wrapping
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 19:23:34 +0000 (21:23 +0200)]
remove additional array wrapping

11 years agoMerge branch 'master' into files_encryption_upgrade_fix
Björn Schießle [Wed, 12 Jun 2013 18:53:45 +0000 (20:53 +0200)]
Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
apps/files_encryption/tests/crypt.php

11 years agouse executeAudited in files cache
Jörn Friedrich Dreyer [Fri, 7 Jun 2013 12:11:05 +0000 (14:11 +0200)]
use executeAudited in files cache

11 years agoMerge pull request #3679 from owncloud/multiselect-fixes
Thomas Tanghus [Wed, 12 Jun 2013 16:52:15 +0000 (09:52 -0700)]
Merge pull request #3679 from owncloud/multiselect-fixes

Multiselect fixes

11 years agoRevert "FIX: Download of files named "true" or "false" impossible"
Roland Hager [Wed, 12 Jun 2013 16:30:28 +0000 (18:30 +0200)]
Revert "FIX: Download of files named "true" or "false" impossible"

This reverts commit d2d71c8797f7e7b51e55bec4217738faaf6a08ca.
which was accidentally commited

11 years agoMerge pull request #3676 from owncloud/move-storage-bar
Frank Karlitschek [Wed, 12 Jun 2013 16:02:16 +0000 (09:02 -0700)]
Merge pull request #3676 from owncloud/move-storage-bar

move storage bar below clients showcase to make it more visible

11 years agoMerge branch 'template_updates' of github.com:owncloud/core into template_updates
Björn Schießle [Wed, 12 Jun 2013 15:26:38 +0000 (17:26 +0200)]
Merge branch 'template_updates' of github.com:owncloud/core into template_updates

11 years agoFIX: Download of files named "true" or "false" impossible
Roland Hager [Fri, 7 Jun 2013 11:44:17 +0000 (13:44 +0200)]
FIX: Download of files named "true" or "false" impossible

It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.

Hotfix provided by Herbert Pophal

11 years agoadd logo-claim
Björn Schießle [Wed, 12 Jun 2013 15:20:09 +0000 (17:20 +0200)]
add logo-claim

11 years agodon't show translation hints in enterprise edition
Björn Schießle [Wed, 12 Jun 2013 15:07:43 +0000 (17:07 +0200)]
don't show translation hints in enterprise edition

11 years agomove common settings footer fieldset out of conditional
Jan-Christoph Borchardt [Wed, 12 Jun 2013 14:59:23 +0000 (16:59 +0200)]
move common settings footer fieldset out of conditional

11 years agoshort explanation about OC_Defaults
Björn Schießle [Wed, 12 Jun 2013 14:33:09 +0000 (16:33 +0200)]
short explanation about OC_Defaults

11 years agomake pub link share footer aware of different owncloud editions
Björn Schießle [Wed, 12 Jun 2013 14:28:47 +0000 (16:28 +0200)]
make pub link share footer aware of different owncloud editions

11 years agomake main menu aware of the different owncloud editions
Björn Schießle [Wed, 12 Jun 2013 14:20:23 +0000 (16:20 +0200)]
make main menu aware of the different owncloud editions

11 years agoadd default doc url
Björn Schießle [Wed, 12 Jun 2013 14:19:28 +0000 (16:19 +0200)]
add default doc url

11 years agominor cleanup for exception handling
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 13:48:22 +0000 (15:48 +0200)]
minor cleanup for exception handling

11 years agomake footer and urls aware of ownCloud editions
Björn Schießle [Wed, 12 Jun 2013 13:44:11 +0000 (15:44 +0200)]
make footer and urls aware of ownCloud editions

11 years agokeep all strings in one place to make it easier to change them
Björn Schießle [Wed, 12 Jun 2013 13:15:08 +0000 (15:15 +0200)]
keep all strings in one place to make it easier to change them

11 years agomake footer aware of ownCloud editions
Björn Schießle [Wed, 12 Jun 2013 12:49:30 +0000 (14:49 +0200)]
make footer aware of ownCloud editions

11 years agoapps management: change misleading + to ...
Jan-Christoph Borchardt [Wed, 12 Jun 2013 12:49:23 +0000 (14:49 +0200)]
apps management: change misleading + to ...

11 years agoCorrect escaping
eMerzh [Fri, 14 Dec 2012 10:10:53 +0000 (11:10 +0100)]
Correct escaping

11 years agoTry connection with specified db when postgres does not work
Brice Maron [Thu, 13 Dec 2012 19:37:23 +0000 (19:37 +0000)]
Try connection with specified db when postgres does not work

Conflicts:

lib/setup.php

11 years agomage page title aware of ownCloud edition
Björn Schießle [Wed, 12 Jun 2013 12:33:24 +0000 (14:33 +0200)]
mage page title aware of ownCloud edition

11 years agoadapt test to the code changes
Björn Schießle [Wed, 12 Jun 2013 12:00:53 +0000 (14:00 +0200)]
adapt test to the code changes

11 years agoremove App management top bar and move buttons more contextually in the interface
Jan-Christoph Borchardt [Tue, 11 Jun 2013 15:24:47 +0000 (17:24 +0200)]
remove App management top bar and move buttons more contextually in the interface

11 years agoMerge pull request #3681 from owncloud/fix_ajax_removeuser.php
Morris Jobke [Wed, 12 Jun 2013 11:23:52 +0000 (04:23 -0700)]
Merge pull request #3681 from owncloud/fix_ajax_removeuser.php

Init language object before using it

11 years agoMerge pull request #3654 from owncloud/clean_up_exceptions
Thomas Müller [Wed, 12 Jun 2013 11:13:12 +0000 (04:13 -0700)]
Merge pull request #3654 from owncloud/clean_up_exceptions

Introduce more robust SQL execution and exception handling

11 years agoevery test now has 15min to execute
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 10:58:25 +0000 (13:58 +0300)]
every test now has 15min to execute

we don't want to check performance just yet. we just want to make jenkins end more reliably.

11 years agoMerge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload
Björn Schießle [Wed, 12 Jun 2013 10:55:10 +0000 (03:55 -0700)]
Merge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload

disable proxys during ssl root cert upload to avoid encryption

11 years agouse number of manipulated rows as idicator if it was possible to enter the migration...
Björn Schießle [Wed, 12 Jun 2013 10:21:11 +0000 (12:21 +0200)]
use number of manipulated rows as idicator if it was possible to enter the migration mode

11 years agodisable proxys during ssl root cert upload to avoid encryption
Björn Schießle [Wed, 12 Jun 2013 08:37:09 +0000 (10:37 +0200)]
disable proxys during ssl root cert upload to avoid encryption

11 years agoMerge branch 'master' of github.com:owncloud/core
Björn Schießle [Wed, 12 Jun 2013 08:31:39 +0000 (10:31 +0200)]
Merge branch 'master' of github.com:owncloud/core

11 years agobackport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f39882055...
Björn Schießle [Wed, 12 Jun 2013 08:30:54 +0000 (10:30 +0200)]
backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6

11 years agoinit language object before using it
Georg Ehrke [Wed, 12 Jun 2013 07:40:13 +0000 (09:40 +0200)]
init language object before using it

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 12 Jun 2013 01:05:58 +0000 (03:05 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3672 from owncloud/files-contrast
Jan-Christoph Borchardt [Tue, 11 Jun 2013 18:11:55 +0000 (11:11 -0700)]
Merge pull request #3672 from owncloud/files-contrast

Contrast fixes

11 years agomultiselect: up min-width of group multiselect to 150px
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:23:29 +0000 (18:23 +0200)]
multiselect: up min-width of group multiselect to 150px

11 years agomultiselect: fixed 'add group' interface a bit
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:21:13 +0000 (18:21 +0200)]
multiselect: fixed 'add group' interface a bit

11 years agomultiselect: more breathing space for entries
Jan-Christoph Borchardt [Tue, 11 Jun 2013 16:08:47 +0000 (18:08 +0200)]
multiselect: more breathing space for entries