]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge branch 'stable5' of github.com:owncloud/core into stable5
Bjoern Schiessle [Tue, 8 Oct 2013 15:22:20 +0000 (17:22 +0200)]
Merge branch 'stable5' of github.com:owncloud/core into stable5

11 years agorevert backport from here: https://github.com/owncloud/core/pull/5088
Bjoern Schiessle [Tue, 8 Oct 2013 15:21:12 +0000 (17:21 +0200)]
revert backport from here: https://github.com/owncloud/core/pull/5088
This shouldn't have been backported.

11 years agoMerge pull request #5211 from owncloud/sharing_search_users_fix-stable5
Björn Schießle [Tue, 8 Oct 2013 15:09:40 +0000 (08:09 -0700)]
Merge pull request #5211 from owncloud/sharing_search_users_fix-stable5

find users which are in the same group

11 years agofind users which are in the same group
Bjoern Schiessle [Tue, 8 Oct 2013 15:04:12 +0000 (17:04 +0200)]
find users which are in the same group

11 years agoMerge pull request #5206 from owncloud/cleanup_share_table
Björn Schießle [Tue, 8 Oct 2013 13:58:12 +0000 (06:58 -0700)]
Merge pull request #5206 from owncloud/cleanup_share_table

share table clean-up: make sure that we only remove files/folders

11 years agofix escaping
Morris Jobke [Tue, 8 Oct 2013 13:45:52 +0000 (15:45 +0200)]
fix escaping

11 years agomake sure that we only remove file/folder shares
Bjoern Schiessle [Tue, 8 Oct 2013 13:16:33 +0000 (15:16 +0200)]
make sure that we only remove file/folder shares

11 years agoMerge pull request #5112 from owncloud/backport-4969-stable5
Thomas Müller [Tue, 8 Oct 2013 11:39:13 +0000 (04:39 -0700)]
Merge pull request #5112 from owncloud/backport-4969-stable5

[backport-stable5] adding privilege check on move and rename operations

11 years agoMerge branch 'stable5' of github.com:owncloud/core into stable5
Bjoern Schiessle [Mon, 7 Oct 2013 14:21:33 +0000 (16:21 +0200)]
Merge branch 'stable5' of github.com:owncloud/core into stable5

11 years agotrash bin button needs to be an input field
Bjoern Schiessle [Wed, 2 Oct 2013 14:13:08 +0000 (16:13 +0200)]
trash bin button needs to be an input field

11 years agoMerge pull request #5164 from owncloud/share-autofocus
Morris Jobke [Mon, 7 Oct 2013 13:23:03 +0000 (06:23 -0700)]
Merge pull request #5164 from owncloud/share-autofocus

Share autofocus

11 years agoFix autofocus
Morris Jobke [Mon, 7 Oct 2013 09:34:46 +0000 (11:34 +0200)]
Fix autofocus

fix #4465
fix #4941
backport of 4803 to stable5

11 years agocatch exception if db query execution fails
Bjoern Schiessle [Mon, 7 Oct 2013 09:06:24 +0000 (11:06 +0200)]
catch exception if db query execution fails

11 years agoclean up oc_share table from files which are no longer exists
Bjoern Schiessle [Mon, 7 Oct 2013 08:59:09 +0000 (10:59 +0200)]
clean up oc_share table from files which are no longer exists

11 years agoadd comments
Bjoern Schiessle [Fri, 4 Oct 2013 14:50:53 +0000 (16:50 +0200)]
add comments

11 years agoremove deleted shares from the database table oc_share
Bjoern Schiessle [Wed, 2 Oct 2013 11:26:38 +0000 (13:26 +0200)]
remove deleted shares from the database table oc_share

11 years agoMerge pull request #5110 from owncloud/pg_install_db
Bart Visscher [Fri, 4 Oct 2013 11:31:40 +0000 (04:31 -0700)]
Merge pull request #5110 from owncloud/pg_install_db

postgresql connect with specify db if 'postgres' does not work

11 years agoadding privilege check on move and rename operations
Thomas Müller [Tue, 24 Sep 2013 11:26:12 +0000 (13:26 +0200)]
adding privilege check on move and rename operations

Conflicts:
lib/connector/sabre/objecttree.php

11 years agoMerge pull request #5096 from owncloud/backport-4960-stable5
Thomas Müller [Fri, 4 Oct 2013 08:09:00 +0000 (01:09 -0700)]
Merge pull request #5096 from owncloud/backport-4960-stable5

Backport of #4960 to stable5

11 years agoTry connection with specified db when postgres does not work
Morris Jobke [Fri, 4 Oct 2013 05:54:22 +0000 (07:54 +0200)]
Try connection with specified db when postgres does not work

11 years ago5.0.12 v5.0.12
Frank Karlitschek [Thu, 3 Oct 2013 12:26:01 +0000 (14:26 +0200)]
5.0.12

11 years agoduplicate code :sigh: - will fix this in a second pr
Thomas Müller [Tue, 24 Sep 2013 11:54:18 +0000 (13:54 +0200)]
duplicate code :sigh: - will fix this in a second pr

11 years agoadding file_exists check just to be on the save side
Thomas Müller [Tue, 24 Sep 2013 11:53:32 +0000 (13:53 +0200)]
adding file_exists check just to be on the save side

11 years agohandle error situation of rename proper
Thomas Müller [Mon, 23 Sep 2013 20:04:37 +0000 (22:04 +0200)]
handle error situation of rename proper

11 years agoset rememberlogin to false for the encryption app
Bjoern Schiessle [Thu, 26 Sep 2013 17:34:50 +0000 (19:34 +0200)]
set rememberlogin to false for the encryption app

11 years agocheck every enabled app if the remember login feature needs to be disabled
Bjoern Schiessle [Thu, 26 Sep 2013 17:34:28 +0000 (19:34 +0200)]
check every enabled app if the remember login feature needs to be disabled

11 years agointroduce OC_Util::rememberLoginAllowed()
Bjoern Schiessle [Tue, 24 Sep 2013 16:01:34 +0000 (18:01 +0200)]
introduce OC_Util::rememberLoginAllowed()

Conflicts:
core/templates/login.php
lib/util.php

11 years agodon't remember login if the encrypion app is enabled because the user
Bjoern Schiessle [Tue, 24 Sep 2013 11:08:55 +0000 (13:08 +0200)]
don't remember login if the encrypion app is enabled because the user
needs to log-in again in order to decrypt his private key with his password

Conflicts:
core/templates/login.php
lib/util.php

11 years ago5.0.12 RC1
Frank Karlitschek [Fri, 27 Sep 2013 14:47:10 +0000 (16:47 +0200)]
5.0.12 RC1

11 years agoMerge pull request #4948 from owncloud/fix-inputfields
VicDeo [Thu, 26 Sep 2013 13:39:05 +0000 (06:39 -0700)]
Merge pull request #4948 from owncloud/fix-inputfields

fix visual glitch, do not use black border for input fields

11 years agowe can leave the loop if the permission of the link share was checked
Bjoern Schiessle [Tue, 17 Sep 2013 16:18:23 +0000 (18:18 +0200)]
we can leave the loop if the permission of the link share was checked

11 years agocheck only permission from link-share to decide if public upload is enabled or disabled
Bjoern Schiessle [Tue, 17 Sep 2013 16:11:43 +0000 (18:11 +0200)]
check only permission from link-share to decide if public upload is enabled or disabled

11 years agoMerge pull request #4954 from owncloud/fix-link-expiration-stable5
Andreas Fischer [Tue, 24 Sep 2013 21:36:34 +0000 (23:36 +0200)]
Merge pull request #4954 from owncloud/fix-link-expiration-stable5

Backport of sharing fixes to stable5

* owncloud/fix-link-expiration-stable5:
  Calculate dateInPast and dateInFuture.
  Compare objects directly. Also use $expected and $actual.
  Add database tests for INSERT/SELECT date format.
  Add comment explaining how $dateInFuture was picked.
  Coding style: { for methods start are supposed to be on the same line.
  Expiration tests for sharing with groups.
  Do not repeat shareUserOneTestFileWithUserTwo() code.
  Make dates test class properties.
  Try to make Oracle happy by also specifying seconds.
  Test whether a still-valid user share is still accessible.
  Test whether an expired user share is still accessible.

11 years agoCalculate dateInPast and dateInFuture.
Andreas Fischer [Thu, 12 Sep 2013 21:37:43 +0000 (23:37 +0200)]
Calculate dateInPast and dateInFuture.

11 years agoCompare objects directly. Also use $expected and $actual.
Andreas Fischer [Thu, 12 Sep 2013 20:52:14 +0000 (22:52 +0200)]
Compare objects directly. Also use $expected and $actual.

11 years agoAdd database tests for INSERT/SELECT date format.
Andreas Fischer [Thu, 12 Sep 2013 20:36:28 +0000 (22:36 +0200)]
Add database tests for INSERT/SELECT date format.

11 years agoAdd comment explaining how $dateInFuture was picked.
Andreas Fischer [Mon, 9 Sep 2013 23:30:48 +0000 (01:30 +0200)]
Add comment explaining how $dateInFuture was picked.

11 years agoCoding style: { for methods start are supposed to be on the same line.
Andreas Fischer [Thu, 5 Sep 2013 00:45:52 +0000 (02:45 +0200)]
Coding style: { for methods start are supposed to be on the same line.

11 years agoExpiration tests for sharing with groups.
Andreas Fischer [Thu, 5 Sep 2013 00:41:24 +0000 (02:41 +0200)]
Expiration tests for sharing with groups.

11 years agoDo not repeat shareUserOneTestFileWithUserTwo() code.
Andreas Fischer [Thu, 5 Sep 2013 00:31:54 +0000 (02:31 +0200)]
Do not repeat shareUserOneTestFileWithUserTwo() code.

11 years agoMake dates test class properties.
Andreas Fischer [Thu, 5 Sep 2013 00:27:29 +0000 (02:27 +0200)]
Make dates test class properties.

11 years agoTry to make Oracle happy by also specifying seconds.
Andreas Fischer [Wed, 4 Sep 2013 22:15:58 +0000 (00:15 +0200)]
Try to make Oracle happy by also specifying seconds.

11 years agoTest whether a still-valid user share is still accessible.
Andreas Fischer [Wed, 4 Sep 2013 15:26:30 +0000 (17:26 +0200)]
Test whether a still-valid user share is still accessible.

11 years agoTest whether an expired user share is still accessible.
Andreas Fischer [Wed, 4 Sep 2013 15:15:08 +0000 (17:15 +0200)]
Test whether an expired user share is still accessible.

11 years agoremove deleted files while scanning
Robin Appelman [Tue, 6 Aug 2013 13:59:06 +0000 (15:59 +0200)]
remove deleted files while scanning

11 years agoinitialize variable
Bjoern Schiessle [Fri, 20 Sep 2013 13:47:33 +0000 (15:47 +0200)]
initialize variable

11 years agocalculate correct permissions while toggle the password protection
Bjoern Schiessle [Fri, 20 Sep 2013 11:11:05 +0000 (13:11 +0200)]
calculate correct permissions while toggle the password protection

11 years agomake sure that both $permissions and $oldPermissions have the same type
Bjoern Schiessle [Fri, 20 Sep 2013 10:40:21 +0000 (12:40 +0200)]
make sure that both $permissions and $oldPermissions have the same type

11 years agoonly remember password if the user changes the permissions, otherwise the user disabl...
Bjoern Schiessle [Wed, 18 Sep 2013 09:49:02 +0000 (11:49 +0200)]
only remember password if the user changes the permissions, otherwise the user disabled the password protection

Conflicts:
lib/public/share.php

11 years agofix visual glitch, do not use black border for input fields
Jan-Christoph Borchardt [Sun, 22 Sep 2013 22:41:43 +0000 (00:41 +0200)]
fix visual glitch, do not use black border for input fields

11 years agoMerge pull request #4924 from owncloud/fixing-4416-stable5
Morris Jobke [Sun, 22 Sep 2013 15:40:03 +0000 (08:40 -0700)]
Merge pull request #4924 from owncloud/fixing-4416-stable5

Fixing 4416 stable5

11 years agopublic.php - check if maintenance mode is enabled
Georg Ehrke [Mon, 3 Jun 2013 10:57:47 +0000 (12:57 +0200)]
public.php - check if maintenance mode is enabled

11 years agosetting a default on filecache column unencrypted_size
Thomas Müller [Fri, 20 Sep 2013 14:31:46 +0000 (16:31 +0200)]
setting a default on filecache column unencrypted_size

11 years agoadding comma to get cleaner diffs in the future
Thomas Müller [Wed, 18 Sep 2013 21:42:36 +0000 (23:42 +0200)]
adding comma to get cleaner diffs in the future

11 years agono file actions during upload
Thomas Müller [Wed, 18 Sep 2013 21:06:48 +0000 (23:06 +0200)]
no file actions during upload

11 years agoremove file action elements before recreating them
Thomas Müller [Wed, 18 Sep 2013 11:09:47 +0000 (13:09 +0200)]
remove file action elements before recreating them

11 years agostore the permissions retrieved via ajax within the dom element
Thomas Müller [Wed, 18 Sep 2013 11:09:04 +0000 (13:09 +0200)]
store the permissions retrieved via ajax within the dom element

11 years agoadd permissions of the file to the json response
Thomas Müller [Wed, 18 Sep 2013 09:22:29 +0000 (11:22 +0200)]
add permissions of the file to the json response

11 years agoperformance improvement, check configuration only if no private key exists
Bjoern Schiessle [Wed, 18 Sep 2013 08:40:52 +0000 (10:40 +0200)]
performance improvement, check configuration only if no private key exists

backport from https://github.com/owncloud/core/commit/72eaf2894a540bc9280e144ba493db7fcde07eac

11 years agocheck if stream wrapper is already registered to avoid warning
Bjoern Schiessle [Tue, 3 Sep 2013 13:56:25 +0000 (15:56 +0200)]
check if stream wrapper is already registered to avoid warning

11 years agoMerge pull request #4827 from owncloud/backport-4719-stable5
Thomas Müller [Fri, 13 Sep 2013 19:08:32 +0000 (12:08 -0700)]
Merge pull request #4827 from owncloud/backport-4719-stable5

some is_resource tests have been missing in #4701

11 years agoMerge pull request #4821 from owncloud/fix_user_management
Frank Karlitschek [Fri, 13 Sep 2013 10:07:42 +0000 (03:07 -0700)]
Merge pull request #4821 from owncloud/fix_user_management

Fix user management

11 years agosome is_resource tests have been missing in #4701
Thomas Müller [Thu, 12 Sep 2013 23:00:43 +0000 (01:00 +0200)]
some is_resource tests have been missing in #4701

11 years agoAllow numeric group names
ringmaster [Thu, 12 Sep 2013 14:50:26 +0000 (10:50 -0400)]
Allow numeric group names

11 years agoEnsure creation of a JSON array, not an object.
ringmaster [Thu, 12 Sep 2013 14:49:36 +0000 (10:49 -0400)]
Ensure creation of a JSON array, not an object.

11 years agoImprove IE Compatibility
Jörn Friedrich Dreyer [Wed, 11 Sep 2013 09:50:36 +0000 (11:50 +0200)]
Improve IE Compatibility
Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.

11 years agonever hack late night
Thomas Müller [Tue, 10 Sep 2013 23:11:57 +0000 (01:11 +0200)]
never hack late night

Conflicts:
apps/files_external/lib/irods.php

11 years agotest case for hooks send from a non-default view
Robin Appelman [Thu, 29 Aug 2013 13:25:38 +0000 (15:25 +0200)]
test case for hooks send from a non-default view

11 years agoalso emit hooks for views that are a subfolder of the user folder
Robin Appelman [Sat, 17 Aug 2013 08:57:31 +0000 (10:57 +0200)]
also emit hooks for views that are a subfolder of the user folder

11 years agoMerge branch 'stable5' of github.com:owncloud/core into stable5
Thomas Müller [Tue, 10 Sep 2013 11:55:06 +0000 (13:55 +0200)]
Merge branch 'stable5' of github.com:owncloud/core into stable5

11 years agoremoving all ?> jutt in case
Thomas Müller [Tue, 10 Sep 2013 09:25:40 +0000 (11:25 +0200)]
removing all ?> jutt in case

11 years agoremoving ?> followed by whitespaces
Thomas Müller [Tue, 10 Sep 2013 09:16:43 +0000 (11:16 +0200)]
removing ?> followed by whitespaces

11 years agoWorkaround for IE 9 & 10 for clicking filelist after adding new item
Thomas Müller [Tue, 10 Sep 2013 08:55:02 +0000 (10:55 +0200)]
Workaround for IE 9 & 10 for clicking filelist after adding new item
manual backport of f4ec5182bdeaa611d13648b50d24f80501d92acd

11 years ago5.0.11 v5.0.11
Frank Karlitschek [Fri, 6 Sep 2013 18:31:11 +0000 (20:31 +0200)]
5.0.11

11 years agoMerge pull request #4551 from owncloud/fix_4533
Björn Schießle [Fri, 6 Sep 2013 13:57:45 +0000 (06:57 -0700)]
Merge pull request #4551 from owncloud/fix_4533

Handle part files correctly

11 years agoremove some more debug output
Bjoern Schiessle [Fri, 6 Sep 2013 08:58:42 +0000 (10:58 +0200)]
remove some more debug output

11 years agoMerge branch 'stable5' into fix_4533
Bjoern Schiessle [Fri, 6 Sep 2013 08:51:27 +0000 (10:51 +0200)]
Merge branch 'stable5' into fix_4533

11 years agoremove some error_logs
Bjoern Schiessle [Thu, 5 Sep 2013 09:50:36 +0000 (11:50 +0200)]
remove some error_logs

11 years agoremove error logs
Bjoern Schiessle [Thu, 5 Sep 2013 09:45:36 +0000 (11:45 +0200)]
remove error logs

11 years agocoding style fixes
Bjoern Schiessle [Thu, 5 Sep 2013 08:11:09 +0000 (10:11 +0200)]
coding style fixes

11 years agoif the files doesn't exist yet we start with the parent to search for shares
Bjoern Schiessle [Thu, 5 Sep 2013 08:08:13 +0000 (10:08 +0200)]
if the files doesn't exist yet we start with the parent to search for shares

11 years agofix part file handling and real size calculation, this should also solve #4581
Bjoern Schiessle [Wed, 4 Sep 2013 19:15:06 +0000 (21:15 +0200)]
fix part file handling and real size calculation, this should also solve #4581

11 years ago5.0.11 RC2
Frank Karlitschek [Sun, 1 Sep 2013 14:59:38 +0000 (16:59 +0200)]
5.0.11 RC2

11 years agoMerge pull request #4701 from owncloud/fix_4667
blizzz [Wed, 4 Sep 2013 10:28:12 +0000 (03:28 -0700)]
Merge pull request #4701 from owncloud/fix_4667

Always check variable type before using readdir to avoid surprises, fixes #4667 #4658 and #4613

11 years agoone check is enough
Arthur Schiwon [Wed, 4 Sep 2013 09:19:58 +0000 (11:19 +0200)]
one check is enough

11 years agoMerge pull request #4700 from owncloud/stable5_ocp_files_searchbymime
Bart Visscher [Tue, 3 Sep 2013 15:56:50 +0000 (08:56 -0700)]
Merge pull request #4700 from owncloud/stable5_ocp_files_searchbymime

Stable5 ocp files searchbymime

11 years agoMerge pull request #4699 from owncloud/stable5_autoloader_try_lib_folder
Jörn Friedrich Dreyer [Tue, 3 Sep 2013 11:04:35 +0000 (04:04 -0700)]
Merge pull request #4699 from owncloud/stable5_autoloader_try_lib_folder

Stable5 autoloader try lib folder

11 years agoMerge pull request #4693 from owncloud/encryption_improved_error_messages_stable5
blizzz [Mon, 2 Sep 2013 21:31:37 +0000 (14:31 -0700)]
Merge pull request #4693 from owncloud/encryption_improved_error_messages_stable5

Encryption improved error messages for Stable5

11 years agofix unknown var in if clause
Arthur Schiwon [Mon, 2 Sep 2013 20:13:11 +0000 (22:13 +0200)]
fix unknown var in if clause

11 years agoCheck variable type before using readdir to avoid surprises and fix #4667 #4658 and...
Arthur Schiwon [Mon, 2 Sep 2013 16:58:25 +0000 (18:58 +0200)]
Check variable type before using readdir to avoid surprises and fix #4667 #4658 and #4613

11 years agoadd searchByMime to public api
Jörn Friedrich Dreyer [Mon, 2 Sep 2013 16:09:00 +0000 (18:09 +0200)]
add searchByMime to public api

11 years agobackport autoloader magic trying to find class in lib folder
Jörn Friedrich Dreyer [Mon, 2 Sep 2013 16:05:10 +0000 (18:05 +0200)]
backport autoloader magic trying to find class in lib folder

11 years agoimproved error message to reflect the case when the app was re-eanbled during the...
Bjoern Schiessle [Mon, 2 Sep 2013 11:00:41 +0000 (13:00 +0200)]
improved error message to reflect the case when the app was re-eanbled during the session

11 years agoMerge branch 'stable5' into fix_4533
Bjoern Schiessle [Fri, 30 Aug 2013 12:27:40 +0000 (14:27 +0200)]
Merge branch 'stable5' into fix_4533

11 years agoMerge pull request #4654 from owncloud/fix_4616
blizzz [Fri, 30 Aug 2013 09:43:44 +0000 (02:43 -0700)]
Merge pull request #4654 from owncloud/fix_4616

Fix 4616

11 years agoMerge pull request #4633 from owncloud/backport-4610-stable5
Raghu Nayyar [Fri, 30 Aug 2013 07:59:59 +0000 (00:59 -0700)]
Merge pull request #4633 from owncloud/backport-4610-stable5

Backport 4610 to stable5

11 years agoUse the real username in preferences and magic cookie instead of case-insensitive...
Arthur Schiwon [Thu, 29 Aug 2013 22:33:48 +0000 (00:33 +0200)]
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.

11 years agowhitespaces
Arthur Schiwon [Thu, 29 Aug 2013 22:31:10 +0000 (00:31 +0200)]
whitespaces

11 years agoMerge pull request #4539 from owncloud/fix_4201
Thomas Müller [Thu, 29 Aug 2013 15:52:20 +0000 (08:52 -0700)]
Merge pull request #4539 from owncloud/fix_4201

Fix 4201, Group Search in Share Dialog only half-working

11 years agoMerge pull request #4634 from owncloud/backport-4360-stable5
Owen Winkler [Thu, 29 Aug 2013 11:47:17 +0000 (04:47 -0700)]
Merge pull request #4634 from owncloud/backport-4360-stable5

Backport 4360 stable5