]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge pull request #5077 from owncloud/no-upgrade-if-there-is-no-fscache-table-master
Thomas Müller [Wed, 2 Oct 2013 21:24:38 +0000 (14:24 -0700)]
Merge pull request #5077 from owncloud/no-upgrade-if-there-is-no-fscache-table-master

only perform files upgrade in case there are actually entries in the old...

11 years agoMerge pull request #5093 from owncloud/file-actions
Jan-Christoph Borchardt [Wed, 2 Oct 2013 16:56:08 +0000 (09:56 -0700)]
Merge pull request #5093 from owncloud/file-actions

File Selected on Click instead of download.

11 years agoMerge pull request #5095 from owncloud/design-finetune
Raghu Nayyar [Wed, 2 Oct 2013 16:47:02 +0000 (09:47 -0700)]
Merge pull request #5095 from owncloud/design-finetune

Whitespace fix for share.css

11 years agoTakes nametext inside the anchor tag to fix the issue completely.
raghunayyar [Wed, 2 Oct 2013 16:41:03 +0000 (22:11 +0530)]
Takes nametext inside the anchor tag to fix the issue completely.

11 years agojust fix whitespace stuff
Morris Jobke [Wed, 2 Oct 2013 16:27:55 +0000 (18:27 +0200)]
just fix whitespace stuff

11 years agoMerge pull request #5092 from owncloud/design-finetune
Frank Karlitschek [Wed, 2 Oct 2013 16:27:29 +0000 (09:27 -0700)]
Merge pull request #5092 from owncloud/design-finetune

Design finetune

11 years agoCloses Label inside the a tag for not hiding the fileactions.
raghunayyar [Wed, 2 Oct 2013 16:10:34 +0000 (21:40 +0530)]
Closes Label inside the a tag for not hiding the fileactions.

11 years agoFile Selected on Click instead of download.
raghunayyar [Wed, 2 Oct 2013 15:43:07 +0000 (21:13 +0530)]
File Selected on Click instead of download.

11 years agosimplify From Link icon in New menu
Jan-Christoph Borchardt [Wed, 2 Oct 2013 15:27:39 +0000 (18:27 +0300)]
simplify From Link icon in New menu

11 years agoreduce rounded corners of New dropdown
Jan-Christoph Borchardt [Wed, 2 Oct 2013 15:04:08 +0000 (18:04 +0300)]
reduce rounded corners of New dropdown

11 years agoremove box-shadows for header, navigation and controls bar - looks sharper and less...
Jan-Christoph Borchardt [Wed, 2 Oct 2013 14:59:38 +0000 (17:59 +0300)]
remove box-shadows for header, navigation and controls bar - looks sharper and less washed out

11 years agoreduce rounded corners of Share and Versions dropdown
Jan-Christoph Borchardt [Wed, 2 Oct 2013 14:53:54 +0000 (17:53 +0300)]
reduce rounded corners of Share and Versions dropdown

11 years agoMerge pull request #5076 from owncloud/fix_filepicker_kondou
Morris Jobke [Wed, 2 Oct 2013 12:59:24 +0000 (05:59 -0700)]
Merge pull request #5076 from owncloud/fix_filepicker_kondou

Fix require in apps/files/ajax/rawlist.php

11 years agoonly perform files upgrade in case there are actually entries in the old fscache...
Thomas Müller [Wed, 2 Oct 2013 11:00:05 +0000 (13:00 +0200)]
only perform files upgrade in case there are actually entries in the old fscache table

11 years agoRemove require in rawlist.php
kondou [Wed, 2 Oct 2013 10:45:30 +0000 (12:45 +0200)]
Remove require in rawlist.php

Thanks @tanghus for pointing out the unneccessity of it.

11 years agoFix require in apps/files/ajax/rawlist.php
kondou [Wed, 2 Oct 2013 10:21:52 +0000 (12:21 +0200)]
Fix require in apps/files/ajax/rawlist.php

11 years agoMerge pull request #5071 from owncloud/fix-autoloader-master
Thomas Müller [Wed, 2 Oct 2013 10:10:10 +0000 (03:10 -0700)]
Merge pull request #5071 from owncloud/fix-autoloader-master

Fix autoloader regression

11 years agofix unit tests
Morris Jobke [Wed, 2 Oct 2013 09:25:44 +0000 (11:25 +0200)]
fix unit tests

11 years agoMerge pull request #4894 from owncloud/fixing-4620-master
Owen Winkler [Wed, 2 Oct 2013 00:51:33 +0000 (17:51 -0700)]
Merge pull request #4894 from owncloud/fixing-4620-master

Fixing broken layout in master due to APC enabled

11 years agoFix autoloader regression
Victor Dubiniuk [Tue, 1 Oct 2013 21:58:51 +0000 (00:58 +0300)]
Fix autoloader regression

11 years agoMerge branch 'master' into fixing-4620-master
Thomas Müller [Tue, 1 Oct 2013 20:57:46 +0000 (22:57 +0200)]
Merge branch 'master' into fixing-4620-master

11 years agoMerge pull request #5039 from owncloud/lib-private-master-2
Morris Jobke [Tue, 1 Oct 2013 16:15:24 +0000 (09:15 -0700)]
Merge pull request #5039 from owncloud/lib-private-master-2

Public API OC6 - introduce lib/private

11 years agoMerge branch 'master' into lib-private-master-2
Thomas Müller [Tue, 1 Oct 2013 14:11:59 +0000 (16:11 +0200)]
Merge branch 'master' into lib-private-master-2

11 years agoMerge pull request #5026 from owncloud/channels
Thomas Müller [Tue, 1 Oct 2013 12:36:00 +0000 (05:36 -0700)]
Merge pull request #5026 from owncloud/channels

put the current version and edition into a seperate file to simplify

11 years agoadd explanation
Frank Karlitschek [Tue, 1 Oct 2013 12:28:59 +0000 (14:28 +0200)]
add explanation

11 years agouse a 4 digit number
Frank Karlitschek [Tue, 1 Oct 2013 10:37:19 +0000 (12:37 +0200)]
use a 4 digit number

11 years agoMerge branch 'master' into lib-private-master-2
Thomas Müller [Mon, 30 Sep 2013 19:29:58 +0000 (21:29 +0200)]
Merge branch 'master' into lib-private-master-2

11 years agouse public api for session access from server container
Thomas Müller [Mon, 30 Sep 2013 18:28:00 +0000 (20:28 +0200)]
use public api for session access from server container

11 years agoMerge branch 'master' into channels
Thomas Müller [Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)]
Merge branch 'master' into channels

Conflicts:
lib/util.php

11 years agoput the current version and edition into a seperate file to simplify packaging. intro...
Frank Karlitschek [Fri, 27 Sep 2013 21:41:24 +0000 (23:41 +0200)]
put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later

Conflicts:
lib/ocsclient.php
lib/util.php

11 years agouse ===
Frank Karlitschek [Sat, 28 Sep 2013 00:15:18 +0000 (02:15 +0200)]
use ===
Shoudn't make a difference in this case but just in case

Conflicts:
lib/ocsclient.php

11 years agoprepare the updater for the new update channels
Frank Karlitschek [Sat, 28 Sep 2013 15:43:14 +0000 (17:43 +0200)]
prepare the updater for the new update channels

11 years agoMerge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
Thomas Müller [Mon, 30 Sep 2013 17:53:41 +0000 (10:53 -0700)]
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled

don't remember login if the encrypion app is enabled

11 years agoreorganize file in lib
Thomas Müller [Mon, 30 Sep 2013 14:39:03 +0000 (16:39 +0200)]
reorganize file in lib

11 years agomove the private namespace OC into lib/private - OCP will stay in lib/public
Thomas Müller [Wed, 25 Sep 2013 11:36:30 +0000 (13:36 +0200)]
move the private namespace OC into lib/private - OCP will stay in lib/public

Conflicts:
lib/private/vcategories.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 30 Sep 2013 14:19:22 +0000 (10:19 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #5012 from owncloud/check_keyfiles_exists
Morris Jobke [Mon, 30 Sep 2013 13:55:56 +0000 (06:55 -0700)]
Merge pull request #5012 from owncloud/check_keyfiles_exists

check not only if the keyfile folder exists but also if it contains keyfiles

11 years agoMerge pull request #4459 from owncloud/appframework-master
Thomas Müller [Mon, 30 Sep 2013 11:11:28 +0000 (04:11 -0700)]
Merge pull request #4459 from owncloud/appframework-master

Public API for OC6+ (includes AppFramework)

11 years agoMerge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin...
Thomas Müller [Mon, 30 Sep 2013 09:31:51 +0000 (02:31 -0700)]
Merge pull request #4995 from owncloud/move-aborted-upload-detection-into-plugin-master

Move aborted upload detection into it's own sabedav plugin

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Mon, 30 Sep 2013 08:42:05 +0000 (10:42 +0200)]
Merge branch 'master' into appframework-master

11 years agofixing PHPDoc & typo
Thomas Müller [Mon, 30 Sep 2013 08:03:07 +0000 (10:03 +0200)]
fixing PHPDoc & typo

11 years agoMerge branch 'master' into move-aborted-upload-detection-into-plugin-master
Thomas Müller [Mon, 30 Sep 2013 07:21:37 +0000 (09:21 +0200)]
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master

11 years agoMerge pull request #4969 from owncloud/fixing-4043-master
Thomas Müller [Mon, 30 Sep 2013 07:20:34 +0000 (00:20 -0700)]
Merge pull request #4969 from owncloud/fixing-4043-master

adding privilege check on move and rename operations

11 years agoMerge pull request #3563 from evgeni/curl-no-timeout
Thomas Müller [Mon, 30 Sep 2013 07:08:32 +0000 (00:08 -0700)]
Merge pull request #3563 from evgeni/curl-no-timeout

cURL does not honour default_socket_timeout

11 years agocURL does not honour default_socket_timeout
Evgeni Golov [Fri, 31 May 2013 16:21:31 +0000 (18:21 +0200)]
cURL does not honour default_socket_timeout

SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.

One has to use
 curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
 curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.

11 years agoMerge pull request #4966 from owncloud/text_preview_blacklist
Andreas Fischer [Sun, 29 Sep 2013 21:20:34 +0000 (23:20 +0200)]
Merge pull request #4966 from owncloud/text_preview_blacklist

add blacklist to txt preview backend

* owncloud/text_preview_blacklist:
  rename variable in testIsTransparent
  rename testTxtBlacklist to txtBlacklist
  move fileView object initialization to testIsTransparent
  use dataProvider for txt blacklist test
  add test for txt blacklist
  add test data for cal and contact preview
  add blacklist to txt preview backend

11 years agoMerge pull request #4960 from owncloud/fixing-mirall-1014-master
Thomas Müller [Sun, 29 Sep 2013 19:49:10 +0000 (12:49 -0700)]
Merge pull request #4960 from owncloud/fixing-mirall-1014-master

handle error situation of rename proper

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Sun, 29 Sep 2013 18:07:56 +0000 (20:07 +0200)]
Merge branch 'master' into appframework-master

11 years agoMerge pull request #5031 from zimba12/master
Thomas Müller [Sun, 29 Sep 2013 16:26:47 +0000 (09:26 -0700)]
Merge pull request #5031 from zimba12/master

followup of #4032 - makes the settings-button bigger...

11 years agofollowup of #4032 - makes the settings-button bigger and adds again padding at bottom...
Alessandro Cosentino [Sun, 29 Sep 2013 05:46:23 +0000 (01:46 -0400)]
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 29 Sep 2013 04:03:26 +0000 (00:03 -0400)]
[tx-robot] updated from transifex

11 years agoinitialize $middleWares
Thomas Müller [Sat, 28 Sep 2013 18:40:25 +0000 (20:40 +0200)]
initialize $middleWares

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Sat, 28 Sep 2013 18:39:19 +0000 (20:39 +0200)]
Merge branch 'master' into appframework-master

11 years agoMerge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
Morris Jobke [Sat, 28 Sep 2013 15:52:22 +0000 (08:52 -0700)]
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname

Base defaultavatar text on displayname

11 years agoHave uniform (wrong) indention
kondou [Sat, 28 Sep 2013 15:49:07 +0000 (17:49 +0200)]
Have uniform (wrong) indention

11 years agoBase defaultavatar text on displayname
kondou [Sat, 28 Sep 2013 14:46:53 +0000 (16:46 +0200)]
Base defaultavatar text on displayname

Fix #4876

11 years agoMerge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
Morris Jobke [Sat, 28 Sep 2013 13:50:34 +0000 (06:50 -0700)]
Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes

phpunit.xml: Port code coverage excludes from autotest to dist.

11 years agodelay middleware registrations
Thomas Müller [Fri, 27 Sep 2013 15:15:26 +0000 (17:15 +0200)]
delay middleware registrations

11 years agofixing error in initialization of TagManager
Thomas Müller [Fri, 27 Sep 2013 15:08:48 +0000 (17:08 +0200)]
fixing error in initialization of TagManager

11 years agorename variable in testIsTransparent
Georg Ehrke [Fri, 27 Sep 2013 12:55:37 +0000 (14:55 +0200)]
rename variable in testIsTransparent

11 years agoMerge branch 'master' into appframework-master
Thomas Müller [Fri, 27 Sep 2013 12:25:47 +0000 (14:25 +0200)]
Merge branch 'master' into appframework-master

11 years agoMerge pull request #4207 from owncloud/search_shared_files
Thomas Müller [Fri, 27 Sep 2013 12:18:12 +0000 (05:18 -0700)]
Merge pull request #4207 from owncloud/search_shared_files

add initial search in shared files

11 years agocode cleanup
Thomas Müller [Fri, 27 Sep 2013 11:41:23 +0000 (13:41 +0200)]
code cleanup

11 years agocheck not only if the keyfile folder exists but also if it contains keyfiles
Bjoern Schiessle [Fri, 27 Sep 2013 11:34:48 +0000 (13:34 +0200)]
check not only if the keyfile folder exists but also if it contains keyfiles

11 years agoMerge pull request #5001 from owncloud/fixing-user-external-backends-master
Morris Jobke [Fri, 27 Sep 2013 09:34:59 +0000 (02:34 -0700)]
Merge pull request #5001 from owncloud/fixing-user-external-backends-master

prelogin apps have to be loaded within setupBackend() otherwise required...

11 years agorename testTxtBlacklist to txtBlacklist
Georg Ehrke [Fri, 27 Sep 2013 09:33:37 +0000 (11:33 +0200)]
rename testTxtBlacklist to txtBlacklist

11 years agomove fileView object initialization to testIsTransparent
Georg Ehrke [Fri, 27 Sep 2013 09:01:47 +0000 (11:01 +0200)]
move fileView object initialization to testIsTransparent

11 years agouse dataProvider for txt blacklist test
Georg Ehrke [Fri, 27 Sep 2013 07:59:04 +0000 (09:59 +0200)]
use dataProvider for txt blacklist test

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 27 Sep 2013 04:02:30 +0000 (00:02 -0400)]
[tx-robot] updated from transifex

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 agophpunit.xml: Port code coverage excludes from autotest to dist.
Andreas Fischer [Thu, 26 Sep 2013 17:05:47 +0000 (19:05 +0200)]
phpunit.xml: Port code coverage excludes from autotest to dist.

11 years agoMerge pull request #4999 from owncloud/run-unit-tests-for-apps-master
Morris Jobke [Thu, 26 Sep 2013 14:09:32 +0000 (07:09 -0700)]
Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master

run unit tests for apps as well

11 years agoRemove $RUNTIME_NOAPPS - setting to false was not enough
Thomas Müller [Thu, 26 Sep 2013 12:03:04 +0000 (14:03 +0200)]
Remove $RUNTIME_NOAPPS - setting to false was not enough

11 years agoprelogin apps have to be loaded within setupBackend() otherwise required classes...
Thomas Müller [Thu, 26 Sep 2013 11:34:47 +0000 (13:34 +0200)]
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded

11 years agoMerge pull request #4990 from owncloud/user_fix_manager
blizzz [Thu, 26 Sep 2013 11:03:20 +0000 (04:03 -0700)]
Merge pull request #4990 from owncloud/user_fix_manager

manager checkPassword now returns User object, adjust internal user clas...

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 agorun unit tests for apps as well
Thomas Müller [Thu, 26 Sep 2013 10:02:06 +0000 (12:02 +0200)]
run unit tests for apps as well

11 years agoadding unit tests for ObjectTree::move()
Thomas Müller [Thu, 26 Sep 2013 08:50:15 +0000 (10:50 +0200)]
adding unit tests for ObjectTree::move()

11 years agoMerge pull request #4892 from owncloud/vcategories_public
Thomas Müller [Wed, 25 Sep 2013 21:24:37 +0000 (14:24 -0700)]
Merge pull request #4892 from owncloud/vcategories_public

OC_VCategories => OC\Tags. Public interface and getter in server container

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 agoMissing Test for the previous commit
Arthur Schiwon [Wed, 25 Sep 2013 17:15:27 +0000 (19:15 +0200)]
Missing Test for the previous commit

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 agoMerge branch 'master' into move-aborted-upload-detection-into-plugin-master
Thomas Müller [Wed, 25 Sep 2013 15:43:25 +0000 (17:43 +0200)]
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master

11 years agoexpect unlinkto be called
Thomas Müller [Wed, 25 Sep 2013 15:41:16 +0000 (17:41 +0200)]
expect unlinkto be called

11 years agoadding unit tests
Thomas Müller [Wed, 25 Sep 2013 15:34:28 +0000 (17:34 +0200)]
adding unit tests

11 years agoremove unneccessary code
Thomas Müller [Wed, 25 Sep 2013 15:28:45 +0000 (17:28 +0200)]
remove unneccessary code

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 ago$path already contains the full path to the file
Thomas Müller [Wed, 25 Sep 2013 15:17:29 +0000 (17:17 +0200)]
$path already contains the full path to the file

11 years agofixing copyright and add class documentation
Thomas Müller [Wed, 25 Sep 2013 15:00:20 +0000 (17:00 +0200)]
fixing copyright and add class documentation

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 agomanager checkPassword now returns User object, adjust internal user class accordingly.
Arthur Schiwon [Wed, 25 Sep 2013 13:03:22 +0000 (15:03 +0200)]
manager checkPassword now returns User object, adjust internal user class accordingly.

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 agostripos return value check
Thomas Müller [Wed, 25 Sep 2013 09:05:59 +0000 (11:05 +0200)]
stripos return value check

11 years agoclass API decommissioning part 1
Thomas Müller [Wed, 25 Sep 2013 09:05:24 +0000 (11:05 +0200)]
class API decommissioning part 1

11 years agoAppFramework:
Thomas Müller [Wed, 25 Sep 2013 08:30:48 +0000 (10:30 +0200)]
AppFramework:
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container