]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoalso return success if no shares are found.
Bjoern Schiessle [Mon, 30 Sep 2013 11:05:34 +0000 (13:05 +0200)]
also return success if no shares are found.

11 years agoadd testUpdateShareUpload()
Bjoern Schiessle [Mon, 30 Sep 2013 10:57:55 +0000 (12:57 +0200)]
add testUpdateShareUpload()

11 years agoadd getShareFromFolder() test
Bjoern Schiessle [Mon, 30 Sep 2013 10:38:36 +0000 (12:38 +0200)]
add getShareFromFolder() test

11 years agoMake sure that testDeleteShare() has some shares to delete
Bjoern Schiessle [Mon, 30 Sep 2013 10:23:44 +0000 (12:23 +0200)]
Make sure that testDeleteShare() has some shares to delete

11 years agoflipping arguments on assertEquals() - first argument contains the expected value...
Thomas Müller [Sun, 29 Sep 2013 20:20:42 +0000 (22:20 +0200)]
flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted

11 years ago- adding unit test testGetShareFromUnknownId()
Thomas Müller [Sun, 29 Sep 2013 20:16:48 +0000 (22:16 +0200)]
- adding unit test testGetShareFromUnknownId()
- fixing getShareFromId() for Oracle
- fixing error message

11 years agoadd some comments
Bjoern Schiessle [Fri, 27 Sep 2013 12:04:28 +0000 (14:04 +0200)]
add some comments

11 years agoadd test getShareFromId
Bjoern Schiessle [Fri, 27 Sep 2013 12:01:04 +0000 (14:01 +0200)]
add test getShareFromId

11 years agocheck if encryption app is enabled before trying to calculate file size
Bjoern Schiessle [Thu, 26 Sep 2013 14:27:14 +0000 (16:27 +0200)]
check if encryption app is enabled before trying to calculate file size

11 years agoMerge branch 'master' into ocs_share_api
Bjoern Schiessle [Thu, 26 Sep 2013 11:02:39 +0000 (13:02 +0200)]
Merge branch 'master' into ocs_share_api

11 years agoMerge pull request #4887 from owncloud/sharing_disable_public_upload
Björn Schießle [Thu, 26 Sep 2013 10:16:15 +0000 (03:16 -0700)]
Merge pull request #4887 from owncloud/sharing_disable_public_upload

check only permission from link-share to decide if public upload is enabled or disabled

11 years agoMerge pull request #4991 from owncloud/enc_fix_warning
Thomas Müller [Thu, 26 Sep 2013 10:15:14 +0000 (03:15 -0700)]
Merge pull request #4991 from owncloud/enc_fix_warning

check if key exists before reading it

11 years agofix check if app is enabled
Bjoern Schiessle [Wed, 25 Sep 2013 17:23:07 +0000 (19:23 +0200)]
fix check if app is enabled

11 years agocheck if key exists before reading it
Bjoern Schiessle [Wed, 25 Sep 2013 15:44:05 +0000 (17:44 +0200)]
check if key exists before reading it

11 years agofix check if app is enabled
Bjoern Schiessle [Wed, 25 Sep 2013 17:23:07 +0000 (19:23 +0200)]
fix check if app is enabled

11 years agoMerge pull request #4987 from owncloud/different_color_placeholder
Morris Jobke [Wed, 25 Sep 2013 17:11:52 +0000 (10:11 -0700)]
Merge pull request #4987 from owncloud/different_color_placeholder

Make it possible to have a different color than the username for placeholder

11 years agocheck if key exists before reading it
Bjoern Schiessle [Wed, 25 Sep 2013 15:44:05 +0000 (17:44 +0200)]
check if key exists before reading it

11 years agoShorten optional text-argument processing
kondou [Wed, 25 Sep 2013 15:19:38 +0000 (17:19 +0200)]
Shorten optional text-argument processing

11 years agoMerge pull request #4989 from owncloud/coverage-for-all-master
Thomas Müller [Wed, 25 Sep 2013 14:46:49 +0000 (07:46 -0700)]
Merge pull request #4989 from owncloud/coverage-for-all-master

collect coverage for all databases again - ci.owncloud.org has more RAM ...

11 years agoadd some additional assertions to the tests
Bjoern Schiessle [Wed, 25 Sep 2013 13:05:23 +0000 (15:05 +0200)]
add some additional assertions to the tests

11 years agocollect coverage for all databases again - ci.owncloud.org has more RAM available
Thomas Müller [Wed, 25 Sep 2013 12:41:03 +0000 (14:41 +0200)]
collect coverage for all databases again - ci.owncloud.org has more RAM available

11 years agoMerge pull request #4968 from owncloud/user_checkpwd
Thomas Müller [Wed, 25 Sep 2013 12:28:42 +0000 (05:28 -0700)]
Merge pull request #4968 from owncloud/user_checkpwd

User: move checkPassword from User to Manager to not break API

11 years agoMake it possible to have a different color than the username for placeholder
kondou [Wed, 25 Sep 2013 10:57:41 +0000 (12:57 +0200)]
Make it possible to have a different color than the username for placeholder

11 years agoadd error message to the assert
Thomas Müller [Wed, 25 Sep 2013 07:43:16 +0000 (09:43 +0200)]
add error message to the assert

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 24 Sep 2013 16:59:48 +0000 (12:59 -0400)]
[tx-robot] updated from transifex

11 years agoAdjust Tests and satisfy them
Arthur Schiwon [Tue, 24 Sep 2013 15:10:01 +0000 (17:10 +0200)]
Adjust Tests and satisfy them

11 years agoFix doc
Arthur Schiwon [Tue, 24 Sep 2013 12:12:44 +0000 (14:12 +0200)]
Fix doc

11 years agoFix return value from User object to User ID
Arthur Schiwon [Tue, 24 Sep 2013 12:11:47 +0000 (14:11 +0200)]
Fix return value from User object to User ID

11 years ago=== not ==
Arthur Schiwon [Tue, 24 Sep 2013 11:51:33 +0000 (13:51 +0200)]
=== not ==

11 years agoUser: move checkPassword from User to Manager to not break API
Arthur Schiwon [Mon, 16 Sep 2013 12:15:35 +0000 (14:15 +0200)]
User: move checkPassword from User to Manager to not break API

11 years agoMerge pull request #4963 from cyberb/patch-1
Christopher [Tue, 24 Sep 2013 11:45:13 +0000 (04:45 -0700)]
Merge pull request #4963 from cyberb/patch-1

fixing typo

11 years agoMerge pull request #4930 from owncloud/fix-apps-settings
Thomas Müller [Tue, 24 Sep 2013 08:02:50 +0000 (01:02 -0700)]
Merge pull request #4930 from owncloud/fix-apps-settings

Fix the apps enabling/disabling in settings

11 years agoMerge pull request #4917 from owncloud/scan-clear-permissions
Thomas Müller [Tue, 24 Sep 2013 07:50:33 +0000 (00:50 -0700)]
Merge pull request #4917 from owncloud/scan-clear-permissions

clear permissions cache when scanning a file

11 years agofixing typo
Boris Rybalkin [Tue, 24 Sep 2013 01:08:58 +0000 (21:08 -0400)]
fixing typo

Typo in comment "feature" => "future"

11 years agoDo not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
Andreas Fischer [Mon, 23 Sep 2013 22:59:23 +0000 (00:59 +0200)]
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).

11 years agoclear permissions cache when scanning a file
Robin Appelman [Thu, 19 Sep 2013 19:37:52 +0000 (21:37 +0200)]
clear permissions cache when scanning a file

11 years agoMerge pull request #4956 from owncloud/fix_not_displaying_emptycontent
Thomas Müller [Mon, 23 Sep 2013 20:09:47 +0000 (13:09 -0700)]
Merge pull request #4956 from owncloud/fix_not_displaying_emptycontent

Fix not displaying "Upload something!" message

11 years agoFix not displaying "Upload something!" message
kondou [Mon, 23 Sep 2013 14:39:42 +0000 (16:39 +0200)]
Fix not displaying "Upload something!" message

Fix #4940

11 years agoMerge pull request #4869 from owncloud/fixing-4866-master
Thomas Müller [Mon, 23 Sep 2013 14:13:12 +0000 (07:13 -0700)]
Merge pull request #4869 from owncloud/fixing-4866-master

recreate an etag within the scanner if the cache contains an empty etag

11 years agoMerge pull request #4950 from owncloud/fix_preview_shared_folder
Thomas Müller [Mon, 23 Sep 2013 13:31:50 +0000 (06:31 -0700)]
Merge pull request #4950 from owncloud/fix_preview_shared_folder

Fix preview for shared folder and public upload

11 years agoMerge pull request #4856 from owncloud/fix-link-expiration
Andreas Fischer [Mon, 23 Sep 2013 13:12:38 +0000 (15:12 +0200)]
Merge pull request #4856 from owncloud/fix-link-expiration

Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)

* owncloud/fix-link-expiration:
  Perform expiration date checking before returning share data for token.
  Tests whether expired/valid link share is still accessible.

11 years agoremove debug output
Bjoern Schiessle [Mon, 23 Sep 2013 12:10:09 +0000 (14:10 +0200)]
remove debug output

11 years agoMove setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
Andreas Fischer [Mon, 23 Sep 2013 10:45:02 +0000 (12:45 +0200)]
Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.

11 years agoMerge remote-tracking branch 'owncloud/master' into fixing-4866-master
Andreas Fischer [Mon, 23 Sep 2013 10:44:11 +0000 (12:44 +0200)]
Merge remote-tracking branch 'owncloud/master' into fixing-4866-master

* owncloud/master: (98 commits)
  [tx-robot] updated from transifex
  files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
  setting a default on filecache column unencrypted_size
  [tx-robot] updated from transifex
  remove unneccessary lib in namespace
  namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
  initialize variable
  calculate correct permissions while toggle the password protection
  make sure that both $permissions and $oldPermissions have the same type
  Add copyright, remove starting blank line
  update inherit docs comment
  Fix insert/update/delete helper functions for oracle
  Add missing return true statements to legacy preferences functions
  Add missing static
  Convert OC_Preference to object interface
  fix race condition in lazy preview loading
  use {count} instead of 'One' for more versatile translation
  fix double translation of error message
  use n to translate title
  fixing typos and l10n
  ...

Conflicts:
tests/lib/files/cache/scanner.php

11 years agoimplement previews for public upload
Georg Ehrke [Mon, 23 Sep 2013 10:27:05 +0000 (12:27 +0200)]
implement previews for public upload

11 years agofix previews in shared folders
Georg Ehrke [Mon, 23 Sep 2013 08:26:46 +0000 (10:26 +0200)]
fix previews in shared folders

11 years agoMerge pull request #4896 from owncloud/sharing_allow_disable_password
Björn Schießle [Mon, 23 Sep 2013 08:20:09 +0000 (01:20 -0700)]
Merge pull request #4896 from owncloud/sharing_allow_disable_password

sharing, allow user to disable password protection

11 years agoMerge pull request #4327 from owncloud/scanfile-remove
Thomas Müller [Mon, 23 Sep 2013 05:40:13 +0000 (22:40 -0700)]
Merge pull request #4327 from owncloud/scanfile-remove

remove deleted files while scanning

11 years agoMerge pull request #4623 from owncloud/convert-oc_preferences
Bart Visscher [Sun, 22 Sep 2013 17:45:56 +0000 (10:45 -0700)]
Merge pull request #4623 from owncloud/convert-oc_preferences

Convert OC_Preference to object interface

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 22 Sep 2013 16:58:42 +0000 (12:58 -0400)]
[tx-robot] updated from transifex

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

Fixing 4416 master

11 years agoMerge pull request #4938 from owncloud/scan-filter-outside-view
Jörn Friedrich Dreyer [Sun, 22 Sep 2013 08:01:59 +0000 (01:01 -0700)]
Merge pull request #4938 from owncloud/scan-filter-outside-view

When filtering search results, ensure results are children of the...

11 years agofiles: when filtering search results, ensure results are children of the fakeroot...
Robin Appelman [Sat, 21 Sep 2013 23:23:18 +0000 (01:23 +0200)]
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same

11 years agoMerge pull request #4927 from owncloud/fix_namespaces_and_autoloading
Thomas Müller [Sat, 21 Sep 2013 18:54:06 +0000 (11:54 -0700)]
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading

namespaces use upcasefirst parts

11 years agoMove bool to int conversion to buildParts(), so it also happens for update().
Andreas Fischer [Sat, 21 Sep 2013 00:20:01 +0000 (02:20 +0200)]
Move bool to int conversion to buildParts(), so it also happens for update().

11 years agoDo not convert boolean to integer in tests. put() already does this.
Andreas Fischer [Fri, 20 Sep 2013 22:12:13 +0000 (00:12 +0200)]
Do not convert boolean to integer in tests. put() already does this.

11 years agoOnly update the etag. Do not re-submit any other unchanged data.
Andreas Fischer [Fri, 20 Sep 2013 21:53:02 +0000 (23:53 +0200)]
Only update the etag. Do not re-submit any other unchanged data.

11 years agoUse update() instead of put().
Andreas Fischer [Fri, 20 Sep 2013 21:52:05 +0000 (23:52 +0200)]
Use update() instead of put().

11 years agosetting a default on filecache column unencrypted_size
Thomas Müller [Fri, 20 Sep 2013 18:47:24 +0000 (20:47 +0200)]
setting a default on filecache column unencrypted_size

11 years agowhen storing back the data field 'encrypted' it is necessary to cast the boolean...
Thomas Müller [Fri, 20 Sep 2013 18:34:17 +0000 (20:34 +0200)]
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy

11 years agoFix the apps enabling/disabling in settings
Bart Visscher [Fri, 20 Sep 2013 18:29:15 +0000 (20:29 +0200)]
Fix the apps enabling/disabling in settings

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 20 Sep 2013 14:50:14 +0000 (10:50 -0400)]
[tx-robot] updated from transifex

11 years agoremove unneccessary lib in namespace
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 14:46:33 +0000 (16:46 +0200)]
remove unneccessary lib in namespace

11 years agonamespaces use upcasefirst parts
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 14:37:07 +0000 (16:37 +0200)]
namespaces use upcasefirst parts
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!

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 agomake sure that files are shared correctly before each test and unshared again after...
Bjoern Schiessle [Fri, 20 Sep 2013 10:38:23 +0000 (12:38 +0200)]
make sure that files are shared correctly before each test and unshared again after the test

11 years agodisable encrpytion app before performing tests
Bjoern Schiessle [Fri, 20 Sep 2013 09:24:18 +0000 (11:24 +0200)]
disable encrpytion app before performing tests

11 years agocheck if encryption app is enabled
Bjoern Schiessle [Fri, 20 Sep 2013 09:21:34 +0000 (11:21 +0200)]
check if encryption app is enabled

11 years agoMerge pull request #4684 from owncloud/improved-console
Bart Visscher [Thu, 19 Sep 2013 21:22:32 +0000 (14:22 -0700)]
Merge pull request #4684 from owncloud/improved-console

Use more object oriented way for console commands

11 years agodisable encryption app for share API tests
Bjoern Schiessle [Thu, 19 Sep 2013 18:14:34 +0000 (20:14 +0200)]
disable encryption app for share API tests

11 years agoMerge pull request #4908 from owncloud/fix_css_selector
Bart Visscher [Thu, 19 Sep 2013 17:59:45 +0000 (10:59 -0700)]
Merge pull request #4908 from owncloud/fix_css_selector

css selectors never have a : before []

11 years agoAdd copyright, remove starting blank line
Bart Visscher [Thu, 19 Sep 2013 17:12:16 +0000 (19:12 +0200)]
Add copyright, remove starting blank line

11 years agoupdate inherit docs comment
Bart Visscher [Wed, 18 Sep 2013 14:38:59 +0000 (16:38 +0200)]
update inherit docs comment

11 years agoFix insert/update/delete helper functions for oracle
Bart Visscher [Sun, 1 Sep 2013 10:35:20 +0000 (12:35 +0200)]
Fix insert/update/delete helper functions for oracle

11 years agoAdd missing return true statements to legacy preferences functions
Bart Visscher [Sat, 31 Aug 2013 13:52:11 +0000 (15:52 +0200)]
Add missing return true statements to legacy preferences functions

11 years agoAdd missing static
Bart Visscher [Sat, 31 Aug 2013 13:50:47 +0000 (15:50 +0200)]
Add missing static

11 years agoConvert OC_Preference to object interface
Bart Visscher [Sun, 3 Mar 2013 11:04:29 +0000 (12:04 +0100)]
Convert OC_Preference to object interface

11 years agoMerge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
Thomas Müller [Thu, 19 Sep 2013 15:23:07 +0000 (08:23 -0700)]
Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog

file upload conflicts dialog

11 years agoMerge branch 'master' into fix_3728_with_file_exists_dialog
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 15:00:54 +0000 (17:00 +0200)]
Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
apps/files/js/filelist.js

11 years agoset share id to 'unknown' if we can't retrive one
Bjoern Schiessle [Thu, 19 Sep 2013 14:52:44 +0000 (16:52 +0200)]
set share id to 'unknown' if we can't retrive one

11 years agoMerge pull request #4900 from owncloud/fixing-4488-master
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 14:46:37 +0000 (07:46 -0700)]
Merge pull request #4900 from owncloud/fixing-4488-master

File permissions are part of the ajax response of file upload

11 years agoextend API to get the shares from all files in a given folder
Bjoern Schiessle [Thu, 19 Sep 2013 14:41:29 +0000 (16:41 +0200)]
extend API to get the shares from all files in a given folder

11 years agoMerge pull request #4263 from owncloud/search_scrollto
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 12:49:45 +0000 (05:49 -0700)]
Merge pull request #4263 from owncloud/search_scrollto

initial scrollto implementation

11 years agofix race condition in lazy preview loading
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 12:46:33 +0000 (14:46 +0200)]
fix race condition in lazy preview loading

11 years agoremove some unused variables
Bjoern Schiessle [Thu, 19 Sep 2013 12:42:34 +0000 (14:42 +0200)]
remove some unused variables

11 years agosome unit test for the new ocs share api
Bjoern Schiessle [Thu, 19 Sep 2013 12:39:51 +0000 (14:39 +0200)]
some unit test for the new ocs share api

11 years agouse {count} instead of 'One' for more versatile translation
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 10:05:30 +0000 (12:05 +0200)]
use {count} instead of 'One' for more versatile translation

11 years agoMerge branch 'master' into fixing-4488-master
Thomas Müller [Thu, 19 Sep 2013 09:43:38 +0000 (11:43 +0200)]
Merge branch 'master' into fixing-4488-master

11 years agoMerge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into...
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:33:34 +0000 (11:33 +0200)]
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog

11 years agofix double translation of error message
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:32:56 +0000 (11:32 +0200)]
fix double translation of error message

11 years agouse n to translate title
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:25:41 +0000 (11:25 +0200)]
use n to translate title

11 years agoMerge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into...
Thomas Müller [Thu, 19 Sep 2013 09:15:20 +0000 (11:15 +0200)]
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog

Conflicts:
apps/files/js/file-upload.js

11 years agofixing typos and l10n
Thomas Müller [Thu, 19 Sep 2013 09:13:11 +0000 (11:13 +0200)]
fixing typos and l10n

11 years agojsdoc types should go into {}
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 09:11:22 +0000 (11:11 +0200)]
jsdoc types should go into {}

11 years agoreturn error if wrong shareType is given
Bjoern Schiessle [Thu, 19 Sep 2013 08:33:04 +0000 (10:33 +0200)]
return error if wrong shareType is given

11 years agocss selectors never have a : before []
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 08:14:07 +0000 (10:14 +0200)]
css selectors never have a : before []

11 years agouse 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe...
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 08:00:42 +0000 (10:00 +0200)]
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there

11 years agofix 'event is not defined' error
Jörn Friedrich Dreyer [Thu, 19 Sep 2013 07:47:51 +0000 (09:47 +0200)]
fix 'event is not defined' error