]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge pull request #3779 from shkdee/patch-1
blizzz [Thu, 20 Jun 2013 09:37:12 +0000 (02:37 -0700)]
Merge pull request #3779 from shkdee/patch-1

Update user.php

11 years agoMerge pull request #3788 from owncloud/more_error_messages
Björn Schießle [Thu, 20 Jun 2013 09:12:01 +0000 (02:12 -0700)]
Merge pull request #3788 from owncloud/more_error_messages

add some more error messages, in case something went wrong

11 years agoMerge pull request #3784 from owncloud/rescan-all
Thomas Müller [Thu, 20 Jun 2013 08:41:49 +0000 (01:41 -0700)]
Merge pull request #3784 from owncloud/rescan-all

Give admins the ability to rescan the filesystem for multiple users at once

11 years agoadd missing backticks
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 08:18:29 +0000 (10:18 +0200)]
add missing backticks

guys, please ...

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

11 years agoalways have a defined return value
Björn Schießle [Wed, 19 Jun 2013 14:55:31 +0000 (16:55 +0200)]
always have a defined return value

11 years agoMerge pull request #3783 from owncloud/improved_wording
Michael Gapczynski [Wed, 19 Jun 2013 14:06:04 +0000 (07:06 -0700)]
Merge pull request #3783 from owncloud/improved_wording

fixed enghlish sentence

11 years agosome more error messages
Björn Schießle [Wed, 19 Jun 2013 13:58:34 +0000 (15:58 +0200)]
some more error messages

11 years agoadd some more error messages, in case something went wrong
Björn Schießle [Wed, 19 Jun 2013 13:52:33 +0000 (15:52 +0200)]
add some more error messages, in case something went wrong

11 years agouse json to encode user list
Robin Appelman [Wed, 19 Jun 2013 13:02:18 +0000 (15:02 +0200)]
use json to encode user list

11 years agoMerge pull request #3764 from owncloud/scanfolder-existing
icewind1991 [Wed, 19 Jun 2013 11:30:55 +0000 (04:30 -0700)]
Merge pull request #3764 from owncloud/scanfolder-existing

Improve re-using existing data in the filescanner

11 years agofixed enghlish sentence, thanks to @MTGap
Björn Schießle [Wed, 19 Jun 2013 10:05:45 +0000 (12:05 +0200)]
fixed enghlish sentence, thanks to @MTGap

11 years ago also use the default theme if the theme is set to an empty string in the config.php
Björn Schießle [Wed, 19 Jun 2013 09:58:29 +0000 (11:58 +0200)]
 also use the default theme if the theme is set to an empty string in the config.php

11 years agofix lost password page, don't show checkbox is encryption is not enabled
Björn Schießle [Tue, 18 Jun 2013 09:43:11 +0000 (11:43 +0200)]
fix lost password page, don't show checkbox is encryption is not enabled

11 years agoMerge pull request #3661 from owncloud/fixing-windows-server-master
Jörn Friedrich Dreyer [Wed, 19 Jun 2013 09:42:18 +0000 (02:42 -0700)]
Merge pull request #3661 from owncloud/fixing-windows-server-master

Fixing windows server master

11 years agoMerge pull request #3773 from owncloud/port_3596
Thomas Müller [Wed, 19 Jun 2013 08:02:15 +0000 (01:02 -0700)]
Merge pull request #3773 from owncloud/port_3596

Users page: username instead of login name as col header to avoid confus...

11 years agoallow scanning files for multiple users
Robin Appelman [Tue, 18 Jun 2013 23:26:08 +0000 (01:26 +0200)]
allow scanning files for multiple users

11 years agofix updaters test cases
Robin Appelman [Tue, 18 Jun 2013 22:26:47 +0000 (00:26 +0200)]
fix updaters test cases

11 years agoMerge pull request #3765 from owncloud/hide-logo-claim
Frank Karlitschek [Tue, 18 Jun 2013 21:14:34 +0000 (14:14 -0700)]
Merge pull request #3765 from owncloud/hide-logo-claim

hide the logo claim in case the theme is not loaded

11 years agoUpdate user.php
shkdee [Tue, 18 Jun 2013 18:47:47 +0000 (21:47 +0300)]
Update user.php

Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.

11 years agoMerge pull request #3774 from owncloud/fix_sql_in_vcategories
Thomas Müller [Tue, 18 Jun 2013 15:14:55 +0000 (08:14 -0700)]
Merge pull request #3774 from owncloud/fix_sql_in_vcategories

remove dangling AND in SQL statement

11 years agoremove dangling AND in SQL statement
Jörn Friedrich Dreyer [Tue, 18 Jun 2013 14:18:19 +0000 (16:18 +0200)]
remove dangling AND in SQL statement

11 years agoUsers page: username instead of login name as col header to avoid confusion with...
Arthur Schiwon [Tue, 4 Jun 2013 17:16:30 +0000 (19:16 +0200)]
Users page: username instead of login name as col header to avoid confusion with other backends

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

11 years agohide the logo claim in case the theme is not loaded
Jan-Christoph Borchardt [Mon, 17 Jun 2013 18:35:08 +0000 (20:35 +0200)]
hide the logo claim in case the theme is not loaded

11 years agoadd tests for reusing existing data in scanner
Robin Appelman [Mon, 17 Jun 2013 16:03:57 +0000 (18:03 +0200)]
add tests for reusing existing data in scanner

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 agoreuse etag when doing a forced rescan
Robin Appelman [Fri, 14 Jun 2013 15:04:17 +0000 (17:04 +0200)]
reuse etag when doing a forced rescan

11 years agoscanner: give more percision about what data is reused during scanning
Robin Appelman [Fri, 14 Jun 2013 14:53:08 +0000 (16:53 +0200)]
scanner: give more percision about what data is reused during scanning

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 agosplit of scanning the childs of a folder
Robin Appelman [Fri, 14 Jun 2013 13:30:41 +0000 (15:30 +0200)]
split of scanning the childs of a folder

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 agodirname('/test.txt') returns '\' on windows whereas on linux we get back '.'
Thomas Mueller [Fri, 14 Jun 2013 09:59:30 +0000 (11:59 +0200)]
dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'

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 agorestore Updater functionality on non-Windows platforms
Thomas Mueller [Wed, 12 Jun 2013 22:09:52 +0000 (00:09 +0200)]
restore Updater functionality on non-Windows platforms

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 agoAdd tests for the updater with mount points
Michael Gapczynski [Wed, 12 Jun 2013 19:32:00 +0000 (15:32 -0400)]
Add tests for the updater with mount points

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