]>
source.dussan.org Git - nextcloud-server.git/log
Björn Schießle [Fri, 21 Jun 2013 08:37:51 +0000 (10:37 +0200)]
Squashed commit of the following:
commit
1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:27:46 2013 +0200
add l10n support
commit
bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:19:10 2013 +0200
only init session if openssl extension is loaded
commit
cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:25:40 2013 +0200
first disable app and than show error page
commit
55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:17:34 2013 +0200
typo fixed
commit
1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:15:40 2013 +0200
move dependency check to the encryption app
commit
c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 11:13:11 2013 +0200
make sure that openssl is installed and loaded
Jenkins for ownCloud [Fri, 21 Jun 2013 06:53:57 +0000 (08:53 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Thu, 20 Jun 2013 11:07:33 +0000 (04:07 -0700)]
Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test
skip teardown if cache has not been set up
Thomas Müller [Thu, 20 Jun 2013 11:02:10 +0000 (04:02 -0700)]
Merge pull request #3792 from owncloud/scanfolder-remove
remove deleted files when re-scanning a folder
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 09:41:07 +0000 (11:41 +0200)]
skip teardown if cache has not been set up
blizzz [Thu, 20 Jun 2013 09:37:12 +0000 (02:37 -0700)]
Merge pull request #3779 from shkdee/patch-1
Update user.php
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
Thomas Mueller [Thu, 20 Jun 2013 08:47:37 +0000 (10:47 +0200)]
adding unit test for folder remove: testRemovedFolder()
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
Jörn Friedrich Dreyer [Thu, 20 Jun 2013 08:18:29 +0000 (10:18 +0200)]
add missing backticks
guys, please ...
Thomas Mueller [Thu, 20 Jun 2013 06:17:31 +0000 (08:17 +0200)]
Merge branch 'rescan-all' into scanfolder-remove
Jenkins for ownCloud [Thu, 20 Jun 2013 00:43:39 +0000 (02:43 +0200)]
[tx-robot] updated from transifex
Robin Appelman [Wed, 19 Jun 2013 22:42:34 +0000 (00:42 +0200)]
remove deleted files when re-scanning a folder
Björn Schießle [Wed, 19 Jun 2013 14:55:31 +0000 (16:55 +0200)]
always have a defined return value
Michael Gapczynski [Wed, 19 Jun 2013 14:06:04 +0000 (07:06 -0700)]
Merge pull request #3783 from owncloud/improved_wording
fixed enghlish sentence
Björn Schießle [Wed, 19 Jun 2013 13:58:34 +0000 (15:58 +0200)]
some more error messages
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
Robin Appelman [Wed, 19 Jun 2013 13:02:18 +0000 (15:02 +0200)]
use json to encode user list
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
Björn Schießle [Wed, 19 Jun 2013 10:05:45 +0000 (12:05 +0200)]
fixed enghlish sentence, thanks to @MTGap
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
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
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
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...
Robin Appelman [Tue, 18 Jun 2013 23:26:08 +0000 (01:26 +0200)]
allow scanning files for multiple users
Robin Appelman [Tue, 18 Jun 2013 22:26:47 +0000 (00:26 +0200)]
fix updaters test cases
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
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.
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
Jörn Friedrich Dreyer [Tue, 18 Jun 2013 14:18:19 +0000 (16:18 +0200)]
remove dangling AND in SQL statement
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
Jenkins for ownCloud [Tue, 18 Jun 2013 00:11:10 +0000 (02:11 +0200)]
[tx-robot] updated from transifex
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
Robin Appelman [Mon, 17 Jun 2013 16:03:57 +0000 (18:03 +0200)]
add tests for reusing existing data in scanner
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
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
Björn Schießle [Mon, 17 Jun 2013 12:42:18 +0000 (14:42 +0200)]
don't normalize absolute local path
Jenkins for ownCloud [Mon, 17 Jun 2013 00:08:11 +0000 (02:08 +0200)]
[tx-robot] updated from transifex
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
Robin Appelman [Sun, 16 Jun 2013 18:19:37 +0000 (20:19 +0200)]
Basic tests for getFileNameMimeType
Jenkins for ownCloud [Sun, 16 Jun 2013 00:07:45 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
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
Jenkins for ownCloud [Sat, 15 Jun 2013 00:07:18 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
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)
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
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
Thomas Mueller [Fri, 14 Jun 2013 18:04:20 +0000 (20:04 +0200)]
remove » and « from the text mail because they will be escaped
Stephan Arts [Fri, 14 Jun 2013 16:02:35 +0000 (18:02 +0200)]
Do no translate "ownCloud - "
Stephan Arts [Fri, 14 Jun 2013 15:38:56 +0000 (17:38 +0200)]
Use templates to theme share e-mails (#3683)
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
Robin Appelman [Fri, 14 Jun 2013 15:04:17 +0000 (17:04 +0200)]
reuse etag when doing a forced rescan
Robin Appelman [Fri, 14 Jun 2013 14:53:08 +0000 (16:53 +0200)]
scanner: give more percision about what data is reused during scanning
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 13:54:45 +0000 (15:54 +0200)]
remove default tablespace in parameter
Thomas Müller [Fri, 14 Jun 2013 13:42:54 +0000 (15:42 +0200)]
No coverage for tests
Thomas Mueller [Fri, 14 Jun 2013 13:38:09 +0000 (15:38 +0200)]
adding default to $hint within ctor of DatabaseSetupException
Robin Appelman [Fri, 14 Jun 2013 13:30:41 +0000 (15:30 +0200)]
split of scanning the childs of a folder
Thomas Müller [Fri, 14 Jun 2013 13:17:02 +0000 (15:17 +0200)]
No coverage for settings/l10n
Björn Schießle [Fri, 14 Jun 2013 13:14:23 +0000 (15:14 +0200)]
fix indention
Björn Schießle [Fri, 14 Jun 2013 13:07:06 +0000 (15:07 +0200)]
only escape glob pattern
Thomas Müller [Fri, 14 Jun 2013 12:24:58 +0000 (14:24 +0200)]
No coverage for lib/l10n and core/l10n
Jan-Christoph Borchardt [Fri, 14 Jun 2013 12:08:04 +0000 (14:08 +0200)]
remove dotted outlines in Firefox, fix #3712
Thomas Mueller [Fri, 14 Jun 2013 11:54:41 +0000 (13:54 +0200)]
coding style
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 10:23:44 +0000 (12:23 +0200)]
use executeAudited in sabredav lock
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
Jörn Friedrich Dreyer [Fri, 14 Jun 2013 10:12:32 +0000 (12:12 +0200)]
fix oci dbschema test
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
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
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 '.'
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
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
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.
Morris Jobke [Fri, 14 Jun 2013 08:28:33 +0000 (11:28 +0300)]
improve comment
Thomas Mueller [Fri, 14 Jun 2013 08:06:13 +0000 (10:06 +0200)]
Merge branch 'master' into move-maint-start
Conflicts:
lib/util.php
Jenkins for ownCloud [Fri, 14 Jun 2013 00:52:34 +0000 (02:52 +0200)]
[tx-robot] updated from transifex
Florin Peter [Thu, 13 Jun 2013 23:14:33 +0000 (01:14 +0200)]
Merge branch 'master' into fixes_for_3641_3620
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
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
Morris Jobke [Thu, 13 Jun 2013 19:36:11 +0000 (12:36 -0700)]
Merge pull request #3586 from owncloud/contributing
Revise Contributing document
Morris Jobke [Thu, 13 Jun 2013 19:35:32 +0000 (22:35 +0300)]
Fix typo
Florin Peter [Thu, 13 Jun 2013 18:52:34 +0000 (20:52 +0200)]
fix for path_hash not unique as reported at #3641
Florin Peter [Thu, 13 Jun 2013 18:51:22 +0000 (20:51 +0200)]
fix memory problems as reported at #3620
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
Björn Schießle [Thu, 13 Jun 2013 14:10:33 +0000 (16:10 +0200)]
improved footer
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
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
Jörn Friedrich Dreyer [Thu, 13 Jun 2013 11:14:00 +0000 (13:14 +0200)]
PDOException has no previous(), oh the consistency ...
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
Björn Schießle [Thu, 13 Jun 2013 10:53:29 +0000 (12:53 +0200)]
Merge branch 'master' into files_encryption_upgrade_fix
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
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
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
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
Björn Schießle [Thu, 13 Jun 2013 08:44:05 +0000 (10:44 +0200)]
LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
Björn Schießle [Thu, 13 Jun 2013 08:35:30 +0000 (10:35 +0200)]
add comment to explain the helper function
Björn Schießle [Thu, 13 Jun 2013 08:11:23 +0000 (10:11 +0200)]
fix typo in var name
Jenkins for ownCloud [Thu, 13 Jun 2013 00:20:23 +0000 (02:20 +0200)]
[tx-robot] updated from transifex
Thomas Mueller [Wed, 12 Jun 2013 22:09:52 +0000 (00:09 +0200)]
restore Updater functionality on non-Windows platforms
Florin Peter [Wed, 12 Jun 2013 21:21:24 +0000 (23:21 +0200)]
update submodule
Jörn Friedrich Dreyer [Wed, 12 Jun 2013 21:01:52 +0000 (23:01 +0200)]
fix another double wrapped array
Morris Jobke [Wed, 12 Jun 2013 19:58:19 +0000 (21:58 +0200)]
TL;DR and remove link from "Report issue here"