]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoIf a existing file in Shared/ with update permissions gets updated we need to write...
Bjoern Schiessle [Tue, 8 Oct 2013 09:26:49 +0000 (11:26 +0200)]
If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder

11 years agoMerge pull request #5181 from owncloud/fixing-chunked-upload-master
Morris Jobke [Mon, 7 Oct 2013 20:20:43 +0000 (13:20 -0700)]
Merge pull request #5181 from owncloud/fixing-chunked-upload-master

Fixing broken chunked upload due to #4974

11 years agoMerge pull request #4796 from owncloud/config-no-catch
Bart Visscher [Mon, 7 Oct 2013 18:45:13 +0000 (11:45 -0700)]
Merge pull request #4796 from owncloud/config-no-catch

Remove the exception catch in OC_Config, this should be handled by a higher layer

11 years agoMerge pull request #5184 from owncloud/fix-trash-bin-button
VicDeo [Mon, 7 Oct 2013 17:58:47 +0000 (10:58 -0700)]
Merge pull request #5184 from owncloud/fix-trash-bin-button

Fix trash bin button

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 7 Oct 2013 16:21:38 +0000 (12:21 -0400)]
[tx-robot] updated from transifex

11 years agoFix trash bin button
Morris Jobke [Mon, 7 Oct 2013 16:15:23 +0000 (18:15 +0200)]
Fix trash bin button

11 years agoMerge pull request #5179 from owncloud/userlist-avatar
Morris Jobke [Mon, 7 Oct 2013 15:47:39 +0000 (08:47 -0700)]
Merge pull request #5179 from owncloud/userlist-avatar

Fix new user avatar. Ref#5166

11 years agothe path for reassembling was created the wrong way
Thomas Müller [Mon, 7 Oct 2013 15:34:21 +0000 (17:34 +0200)]
the path for reassembling was created the wrong way

11 years agoMerge pull request #5178 from owncloud/sharing-ispublicflagintemplate
Vincent Petry [Mon, 7 Oct 2013 15:23:55 +0000 (08:23 -0700)]
Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate

Added isPublic flag in files_sharing template

11 years agoMerge pull request #4921 from owncloud/file_conflicts_dialog_fixes
VicDeo [Mon, 7 Oct 2013 15:19:40 +0000 (08:19 -0700)]
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes

File conflicts dialog fixes

11 years agoFix new user avatar. Ref#5166
Victor Dubiniuk [Mon, 7 Oct 2013 15:00:15 +0000 (18:00 +0300)]
Fix new user avatar. Ref#5166

11 years agoAdded isPublic flag in files_sharing template
Vincent Petry [Mon, 7 Oct 2013 14:59:57 +0000 (16:59 +0200)]
Added isPublic flag in files_sharing template

To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.

This is required to disable the editor app in public mode to fix #5059

11 years agoMerge pull request #5072 from owncloud/apache-auth-master
Thomas Müller [Mon, 7 Oct 2013 13:29:56 +0000 (06:29 -0700)]
Merge pull request #5072 from owncloud/apache-auth-master

OC6 Apache Authentication

11 years agoMerge pull request #5169 from owncloud/sharingdropdown-uxbugfixes
Morris Jobke [Mon, 7 Oct 2013 12:14:14 +0000 (05:14 -0700)]
Merge pull request #5169 from owncloud/sharingdropdown-uxbugfixes

Sharing dropdown bug fixes

11 years agoMerge pull request #5162 from owncloud/fixing-l10n-master-2
Morris Jobke [Mon, 7 Oct 2013 12:07:47 +0000 (05:07 -0700)]
Merge pull request #5162 from owncloud/fixing-l10n-master-2

Fixing l10n master 2

11 years agoMerge pull request #5165 from owncloud/files-dropontobreadcrumbfix
Morris Jobke [Mon, 7 Oct 2013 12:01:02 +0000 (05:01 -0700)]
Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix

Fix breadcrumb to reinit dnd after ajax nav #5064

11 years agoPrevent share dropdown to close too early with autocomplete
Vincent Petry [Mon, 7 Oct 2013 11:25:30 +0000 (13:25 +0200)]
Prevent share dropdown to close too early with autocomplete

When clicking on an autocomplete result in the sharing dropdown,
it will mistakenly be detected as being clicked outside and would
trigger the sharing dropdown closing.

This fix adds a check to detect clicks inside the autocomplete and
prevent closing the dropdown in that case.

This fixes #4142

11 years agoFixed label for sharing notification to be clickable
Vincent Petry [Mon, 7 Oct 2013 11:15:25 +0000 (13:15 +0200)]
Fixed label for sharing notification to be clickable

Fixed the sharing notification checkbox label in the file sharing
dropdown, which makes it possible to click on the label directly.

11 years agoPrevent scroll up when click on links in sharing dropdown
Vincent Petry [Mon, 7 Oct 2013 11:11:34 +0000 (13:11 +0200)]
Prevent scroll up when click on links in sharing dropdown

When clicking on a link that points to "#" in the sharing dropdown, and
the current view is scrolled down, the browser will scroll the page up
to the top (anchor behavior).

This fix cancels the click event when clicking on "unshare" link or
"show crud" link.

11 years agoMerge pull request #5142 from owncloud/fix_version_cache_expire
Frank Karlitschek [Mon, 7 Oct 2013 10:48:29 +0000 (03:48 -0700)]
Merge pull request #5142 from owncloud/fix_version_cache_expire

correctly expire cache if version file changed.

11 years agoa few styleguide fixes
Frank Karlitschek [Mon, 7 Oct 2013 10:27:02 +0000 (12:27 +0200)]
a few styleguide fixes

11 years agoMove backend finding into its own method.
Andreas Fischer [Wed, 2 Oct 2013 13:31:46 +0000 (15:31 +0200)]
Move backend finding into its own method.

11 years agoMerge pull request #4974 from owncloud/fixing-4011-master
Thomas Müller [Mon, 7 Oct 2013 09:58:00 +0000 (02:58 -0700)]
Merge pull request #4974 from owncloud/fixing-4011-master

error handling added in case file_put_contents is failing

11 years agomove call to print_unescaped() to template
Thomas Müller [Mon, 7 Oct 2013 09:49:43 +0000 (11:49 +0200)]
move call to print_unescaped() to template

11 years agoremove double uri encoding
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 12:59:17 +0000 (14:59 +0200)]
remove double uri encoding

11 years agocanceling individual uploads is currently impossible because there is no placeholder
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 12:58:52 +0000 (14:58 +0200)]
canceling individual uploads is currently impossible because there is no placeholder

11 years agouse correct property for mimetype of existing files
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 12:29:45 +0000 (14:29 +0200)]
use correct property for mimetype of existing files

11 years agoremove obsolete comment
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 12:28:59 +0000 (14:28 +0200)]
remove obsolete comment

11 years agouse !== comparison
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 12:28:33 +0000 (14:28 +0200)]
use !== comparison

11 years agoFix breadcrumb to reinit dnd after ajax nav #5064
Vincent Petry [Mon, 7 Oct 2013 09:07:33 +0000 (11:07 +0200)]
Fix breadcrumb to reinit dnd after ajax nav #5064

Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.

This also fixes dropping onto the "files" app icon.

11 years agoMerge pull request #5129 from owncloud/remove_deleted_shares_from_db
Björn Schießle [Mon, 7 Oct 2013 09:07:11 +0000 (02:07 -0700)]
Merge pull request #5129 from owncloud/remove_deleted_shares_from_db

remove deleted files from oc_share

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 agoMerge branch 'master' into remove_deleted_shares_from_db
Bjoern Schiessle [Mon, 7 Oct 2013 09:00:56 +0000 (11:00 +0200)]
Merge branch 'master' into remove_deleted_shares_from_db

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 agoupdate version to 6.0.0 and adding comment option
Thomas Müller [Mon, 7 Oct 2013 07:34:55 +0000 (09:34 +0200)]
update version to 6.0.0 and adding comment option

11 years agomove l10n factory into private
Thomas Müller [Mon, 7 Oct 2013 07:38:35 +0000 (09:38 +0200)]
move l10n factory into private

11 years agoremove outdated translation files
Thomas Müller [Mon, 7 Oct 2013 07:59:15 +0000 (09:59 +0200)]
remove outdated translation files

11 years agoMerge pull request #4662 from owncloud/fix-4129
Frank Karlitschek [Mon, 7 Oct 2013 06:42:44 +0000 (23:42 -0700)]
Merge pull request #4662 from owncloud/fix-4129

Fix 4129

11 years agoMerge pull request #5148 from owncloud/cache-gc-legacy
Morris Jobke [Sun, 6 Oct 2013 23:25:38 +0000 (16:25 -0700)]
Merge pull request #5148 from owncloud/cache-gc-legacy

Fix loading legacy global filecache gc backgroundjobs

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 6 Oct 2013 23:16:10 +0000 (19:16 -0400)]
[tx-robot] updated from transifex

11 years agoUpdate file to meet coding standarts
Lennart Rosam [Fri, 30 Aug 2013 12:14:38 +0000 (14:14 +0200)]
Update file to meet coding standarts

11 years agoActually test the connection
Lennart Rosam [Fri, 30 Aug 2013 10:16:46 +0000 (12:16 +0200)]
Actually test the connection

11 years agoFixes #4129
Lennart Rosam [Fri, 30 Aug 2013 10:10:10 +0000 (12:10 +0200)]
Fixes #4129

11 years agoRemove the exception catch, this should be handled by a higher layer
Bart Visscher [Tue, 10 Sep 2013 06:04:33 +0000 (08:04 +0200)]
Remove the exception catch, this should be handled by a higher layer

And is when using index.php as entry point

11 years agoMerge pull request #5088 from owncloud/fix_trashbin_button
Morris Jobke [Sun, 6 Oct 2013 21:51:08 +0000 (14:51 -0700)]
Merge pull request #5088 from owncloud/fix_trashbin_button

trash bin button needs to be an input field

11 years agoMerge pull request #5144 from owncloud/public_middleware
Bernhard Posselt [Sun, 6 Oct 2013 21:12:35 +0000 (14:12 -0700)]
Merge pull request #5144 from owncloud/public_middleware

Make abstract Middleware class public

11 years agoMerge pull request #5154 from owncloud/fix-appimages
Morris Jobke [Sun, 6 Oct 2013 19:31:54 +0000 (12:31 -0700)]
Merge pull request #5154 from owncloud/fix-appimages

fix mobile and desktop app images looking different

11 years agoOptimize images with optipng
kondou [Sun, 6 Oct 2013 19:20:49 +0000 (21:20 +0200)]
Optimize images with optipng

11 years agoMerge pull request #4982 from syncloud/master
Owen Winkler [Sat, 5 Oct 2013 23:13:46 +0000 (16:13 -0700)]
Merge pull request #4982 from syncloud/master

Automatic config can set some of parameters or all of them

11 years agoFix loading legacy global filecache gc backgroundjobs
Robin Appelman [Sat, 5 Oct 2013 21:19:12 +0000 (23:19 +0200)]
Fix loading legacy global filecache gc backgroundjobs

11 years agoRemove misleading IMiddleware interface
Thomas Tanghus [Sat, 5 Oct 2013 17:13:12 +0000 (19:13 +0200)]
Remove misleading IMiddleware interface

11 years agoMerge pull request #5116 from owncloud/interfaces2
Thomas Tanghus [Sat, 5 Oct 2013 15:35:50 +0000 (08:35 -0700)]
Merge pull request #5116 from owncloud/interfaces2

More Interfaces for the public api

11 years agoMake abstract Middleware class public
Thomas Tanghus [Sat, 5 Oct 2013 14:59:06 +0000 (16:59 +0200)]
Make abstract Middleware class public

It doesn't make sense for subclasses to have to implement
all methods.

11 years agofix mobile and desktop app images looking different
Jan-Christoph Borchardt [Sat, 5 Oct 2013 12:40:00 +0000 (15:40 +0300)]
fix mobile and desktop app images looking different

11 years agocorrectly expire cache if version file changed. Fixes problem that ownCloud only...
Frank Karlitschek [Sat, 5 Oct 2013 10:50:36 +0000 (12:50 +0200)]
correctly expire cache if version file changed. Fixes problem that ownCloud only starts upgrading during login

11 years agoMerge pull request #5131 from owncloud/fix-5130
VicDeo [Sat, 5 Oct 2013 09:32:28 +0000 (02:32 -0700)]
Merge pull request #5131 from owncloud/fix-5130

Allow "Finishing..." button on setup page to be translated.

11 years agoMerge pull request #5140 from owncloud/settings-beautify
Frank Karlitschek [Sat, 5 Oct 2013 09:26:08 +0000 (02:26 -0700)]
Merge pull request #5140 from owncloud/settings-beautify

more elegant style for Personal and Admin settings

11 years agoMerge pull request #5125 from owncloud/fixing-5122-master
Frank Karlitschek [Sat, 5 Oct 2013 09:25:45 +0000 (02:25 -0700)]
Merge pull request #5125 from owncloud/fixing-5122-master

upload abortion detection only for PUT

11 years agoMerge pull request #5123 from owncloud/cache_mimetypes
Frank Karlitschek [Sat, 5 Oct 2013 09:24:38 +0000 (02:24 -0700)]
Merge pull request #5123 from owncloud/cache_mimetypes

Load all mimetypes in one go

11 years agomore elegant style for Personal and Admin settings
Jan-Christoph Borchardt [Fri, 4 Oct 2013 15:35:46 +0000 (18:35 +0300)]
more elegant style for Personal and Admin settings

11 years agoMoving Advanced button out of datadirField fieldset
vsapronov [Sat, 5 Oct 2013 00:46:00 +0000 (20:46 -0400)]
Moving Advanced button out of datadirField fieldset

11 years agoMerge pull request #5136 from owncloud/design-fixes
Morris Jobke [Fri, 4 Oct 2013 21:56:09 +0000 (14:56 -0700)]
Merge pull request #5136 from owncloud/design-fixes

Design fixes

11 years agoCheck result only once
Victor Dubiniuk [Fri, 4 Oct 2013 20:24:38 +0000 (23:24 +0300)]
Check result only once

11 years agoupload abortion detection only for PUT
Thomas Müller [Fri, 4 Oct 2013 14:09:07 +0000 (16:09 +0200)]
upload abortion detection only for PUT
e.g. LOCK would break with this approach

11 years agoMerge pull request #5102 from owncloud/input-simplify
Morris Jobke [Fri, 4 Oct 2013 17:40:32 +0000 (10:40 -0700)]
Merge pull request #5102 from owncloud/input-simplify

Input simplify

11 years agoadd useful icon from News app to core
Jan-Christoph Borchardt [Fri, 4 Oct 2013 17:27:01 +0000 (20:27 +0300)]
add useful icon from News app to core

11 years agoincrease font size of file actions for better readability
Jan-Christoph Borchardt [Fri, 4 Oct 2013 17:25:18 +0000 (20:25 +0300)]
increase font size of file actions for better readability

11 years agoprevent hover effect when settings are open
Jan-Christoph Borchardt [Fri, 4 Oct 2013 17:24:07 +0000 (20:24 +0300)]
prevent hover effect when settings are open

11 years agofix disabled buttons not showing icons
Jan-Christoph Borchardt [Fri, 4 Oct 2013 17:21:36 +0000 (20:21 +0300)]
fix disabled buttons not showing icons

11 years agopassesCSRFCheck added to OCP\IRequest
Bart Visscher [Fri, 27 Sep 2013 13:16:34 +0000 (15:16 +0200)]
passesCSRFCheck added to OCP\IRequest

11 years agoAdd Helper and URLGenerator interfaces to server container
Bart Visscher [Thu, 26 Sep 2013 16:41:19 +0000 (18:41 +0200)]
Add Helper and URLGenerator interfaces to server container

11 years agoOC_Defaults is only used in error reporting
Bart Visscher [Wed, 25 Sep 2013 16:34:50 +0000 (18:34 +0200)]
OC_Defaults is only used in error reporting

11 years agoAdd L10N interface to server container
Bart Visscher [Wed, 25 Sep 2013 16:34:01 +0000 (18:34 +0200)]
Add L10N interface to server container

11 years agoMerge pull request #5068 from owncloud/improved_request
Bart Visscher [Fri, 4 Oct 2013 16:05:20 +0000 (09:05 -0700)]
Merge pull request #5068 from owncloud/improved_request

Improved request

11 years agoincrease version number to trigger db update
Bjoern Schiessle [Fri, 4 Oct 2013 15:41:23 +0000 (17:41 +0200)]
increase version number to trigger db update

11 years agoAllow "Finishing..." button on setup page to be translated.
ringmaster [Fri, 4 Oct 2013 15:09:59 +0000 (11:09 -0400)]
Allow "Finishing..." button on setup page to be translated.
Fixes #5130.

11 years agoMake mimetypes static. Jenkis will be happy
Victor Dubiniuk [Fri, 4 Oct 2013 15:09:42 +0000 (18:09 +0300)]
Make mimetypes static. Jenkis will be happy

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

11 years agoremove specific border-radius for .primary button as it should be specific to log...
Jan-Christoph Borchardt [Fri, 4 Oct 2013 14:37:20 +0000 (17:37 +0300)]
remove specific border-radius for .primary button as it should be specific to log in instead

11 years agofix multiselect bar opacity, webroot
Jan-Christoph Borchardt [Fri, 4 Oct 2013 14:32:06 +0000 (17:32 +0300)]
fix multiselect bar opacity, webroot

11 years agoMerge pull request #4877 from owncloud/ocs_share_api
Björn Schießle [Fri, 4 Oct 2013 14:10:21 +0000 (07:10 -0700)]
Merge pull request #4877 from owncloud/ocs_share_api

OCS Share API

11 years agomerge master into input-simplify
Jan-Christoph Borchardt [Fri, 4 Oct 2013 14:08:34 +0000 (17:08 +0300)]
merge master into input-simplify

11 years agoLoad all mimetypes in one go
Victor Dubiniuk [Fri, 4 Oct 2013 13:17:19 +0000 (16:17 +0300)]
Load all mimetypes in one go

11 years agoMerge pull request #5085 from owncloud/versioning_preview
Björn Schießle [Fri, 4 Oct 2013 13:13:54 +0000 (06:13 -0700)]
Merge pull request #5085 from owncloud/versioning_preview

add previews to versions dialog

11 years agoremove hover effect from preview image
Bjoern Schiessle [Fri, 4 Oct 2013 13:13:05 +0000 (15:13 +0200)]
remove hover effect from preview image

11 years agoMerge pull request #5087 from owncloud/templatefunction-relativedate
Vincent Petry [Fri, 4 Oct 2013 12:53:13 +0000 (05:53 -0700)]
Merge pull request #5087 from owncloud/templatefunction-relativedate

Added dateOnly argument to relative_modified_date

11 years agoRemoved $fromTime argument from public template API
Vincent Petry [Fri, 4 Oct 2013 12:45:12 +0000 (14:45 +0200)]
Removed $fromTime argument from public template API

11 years agoMerge pull request #5121 from owncloud/shareapi-syntaxerror
Björn Schießle [Fri, 4 Oct 2013 12:32:56 +0000 (05:32 -0700)]
Merge pull request #5121 from owncloud/shareapi-syntaxerror

Fixed array syntax to work with PHP 5.3

11 years agoupdate tests
Bjoern Schiessle [Fri, 4 Oct 2013 12:32:15 +0000 (14:32 +0200)]
update tests

11 years agoMerge pull request #4933 from owncloud/1376-filesappplussigninurlbug
Vincent Petry [Fri, 4 Oct 2013 12:30:30 +0000 (05:30 -0700)]
Merge pull request #4933 from owncloud/1376-filesappplussigninurlbug

Replace plus sign with space in files app URL #4932

11 years agoFixed array syntax to work with PHP 5.3
Vincent Petry [Fri, 4 Oct 2013 12:28:11 +0000 (14:28 +0200)]
Fixed array syntax to work with PHP 5.3

It seems that array brackets are only supported starting with PHP 5.4.
Fixed the array brackets to be compatible and not cause a syntax error
in PHP 5.3.

11 years agovertical align versions text
Morris Jobke [Fri, 4 Oct 2013 12:13:48 +0000 (14:13 +0200)]
vertical align versions text

11 years agoMerge branch 'master' into fixing-4011-master
Thomas Müller [Fri, 4 Oct 2013 12:06:42 +0000 (14:06 +0200)]
Merge branch 'master' into fixing-4011-master

11 years agoMerge pull request #5091 from guruz/webdav_connector_use_cache_for_etag
Markus Goetz [Fri, 4 Oct 2013 11:27:28 +0000 (04:27 -0700)]
Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag

DAV: Use fileinfo_cache for ETag

11 years agoMerge pull request #4689 from owncloud/sharing_mail_notification_master
Björn Schießle [Fri, 4 Oct 2013 11:06:37 +0000 (04:06 -0700)]
Merge pull request #4689 from owncloud/sharing_mail_notification_master

send mail notification if a file was shared to a user/group

11 years agoMerge branch 'master' into sharing_mail_notification_master
Bjoern Schiessle [Fri, 4 Oct 2013 10:30:49 +0000 (12:30 +0200)]
Merge branch 'master' into sharing_mail_notification_master

Conflicts:
apps/files/index.php
apps/files/templates/index.php

11 years agoMerge branch 'sharing_mail_notification_master' of github.com:owncloud/core into...
Bjoern Schiessle [Fri, 4 Oct 2013 10:27:18 +0000 (12:27 +0200)]
Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master

Conflicts:
core/ajax/share.php

11 years agofix array_diff call
Bjoern Schiessle [Fri, 4 Oct 2013 10:23:40 +0000 (12:23 +0200)]
fix array_diff call

11 years agouse true/false instead of yes/no for publicUpload and subfiles parameter
Bjoern Schiessle [Fri, 4 Oct 2013 10:16:47 +0000 (12:16 +0200)]
use true/false instead of yes/no for publicUpload and subfiles parameter

11 years agouse always path as parameter to specify a file/folder
Bjoern Schiessle [Fri, 4 Oct 2013 10:10:11 +0000 (12:10 +0200)]
use always path as parameter to specify a file/folder