]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoAdded spinners in share dropdown
Vincent Petry [Thu, 25 Sep 2014 17:46:30 +0000 (19:46 +0200)]
Added spinners in share dropdown

Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password

10 years agofor whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname...
Jan-Christoph Borchardt [Fri, 26 Sep 2014 13:38:35 +0000 (15:38 +0200)]
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar

10 years agoFix dav permissions for folders without create permissions
Robin Appelman [Wed, 24 Sep 2014 15:50:33 +0000 (17:50 +0200)]
Fix dav permissions for folders without create permissions

10 years agoExpose creatable permissions trough fileinfo
Robin Appelman [Wed, 24 Sep 2014 15:49:52 +0000 (17:49 +0200)]
Expose creatable permissions trough fileinfo

10 years agoDon't keep the full info of all children in memory
Robin Appelman [Wed, 24 Sep 2014 13:44:56 +0000 (15:44 +0200)]
Don't keep the full info of all children in memory

10 years agoClarify possible preview providers for type Office
Lukas Reschke [Wed, 24 Sep 2014 19:16:14 +0000 (21:16 +0200)]
Clarify possible preview providers for type Office

a

Conflicts:
lib/private/preview.php

10 years agoMerge pull request #11245 from owncloud/backport-11211
Morris Jobke [Wed, 24 Sep 2014 21:57:23 +0000 (23:57 +0200)]
Merge pull request #11245 from owncloud/backport-11211

Add a configuration switch for enabled preview mimetypes

10 years agoShow a proper error message when trying to scan the filesystem for a non existing...
Robin Appelman [Wed, 24 Sep 2014 13:48:54 +0000 (15:48 +0200)]
Show a proper error message when trying to scan the filesystem for a non existing user

10 years agoUpdating 3rdparty - contains updated tar archive and getid3
Thomas Müller [Wed, 24 Sep 2014 12:30:00 +0000 (14:30 +0200)]
Updating 3rdparty - contains updated tar archive and getid3

10 years agofix filepicker home icon being partly hidden, fix #10169
Jan-Christoph Borchardt [Tue, 23 Sep 2014 12:28:51 +0000 (14:28 +0200)]
fix filepicker home icon being partly hidden, fix #10169

10 years agoCheck for blacklisted characters
Lukas Reschke [Tue, 23 Sep 2014 17:30:32 +0000 (19:30 +0200)]
Check for blacklisted characters

Fixes https://github.com/owncloud/core/issues/11264

(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))

10 years agoMoved WebDAV and internet checks to client side JS
Vincent Petry [Mon, 3 Feb 2014 11:48:17 +0000 (12:48 +0100)]
Moved WebDAV and internet checks to client side JS

- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server

Backport of e65ceb08fc4a56d0fb9e4be5d51ba04168cbb59a from master

10 years agoMerge branch 'stable7' into backport-11211
Lukas Reschke [Tue, 23 Sep 2014 12:48:16 +0000 (14:48 +0200)]
Merge branch 'stable7' into backport-11211

Conflicts:
config/config.sample.php

10 years agoPrevious commit was not based on master, retry. Removed broken tar cutter, double...
Remco Brenninkmeijer [Mon, 4 Aug 2014 12:10:09 +0000 (14:10 +0200)]
Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.

10 years agousing flush() here is pointless as we render the layout into a memory buffer and...
Thomas Müller [Fri, 8 Aug 2014 13:44:11 +0000 (15:44 +0200)]
using flush() here is pointless as we render the layout into a memory buffer and actually transmit the data later

10 years agoremove post setup check
Thomas Müller [Mon, 22 Sep 2014 17:43:55 +0000 (19:43 +0200)]
remove post setup check

Backport of 21412559df9461ae7395d8abe1a4c6850dadfad3 from master

10 years agoFix share key finding algorithm in various cases
Vincent Petry [Wed, 17 Sep 2014 16:50:29 +0000 (18:50 +0200)]
Fix share key finding algorithm in various cases

Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.

This covers the following cases:

- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin

Backport of 1e631754d78e98d74ba0d3fb477d5eb815e9dfb3 from master

10 years agoUse non-empty defaults
Victor Dubiniuk [Mon, 22 Sep 2014 20:27:41 +0000 (23:27 +0300)]
Use non-empty defaults

10 years agoDo only follow HTTP and HTTPS redirects
Lukas Reschke [Thu, 11 Sep 2014 17:21:56 +0000 (19:21 +0200)]
Do only follow HTTP and HTTPS redirects

We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests

Conflicts:
apps/files/ajax/newfile.php
lib/private/files/storage/dav.php
lib/private/server.php
lib/private/util.php
lib/public/iservercontainer.php

10 years agoAppend port to trusted domain in case it's not 80 or 443
Lukas Reschke [Mon, 8 Sep 2014 14:15:31 +0000 (16:15 +0200)]
Append port to trusted domain in case it's not 80 or 443

Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059

Backport of 2590a4dc85cb23311a9000770bf506c3953d0b04 from master

10 years agofirst check if a private key exists, if not it is always a recovery szenario
Bjoern Schiessle [Mon, 22 Sep 2014 13:04:55 +0000 (15:04 +0200)]
first check if a private key exists, if not it is always a recovery szenario

10 years agoAdd a configuration switch for enabled preview mimetypes
Lukas Reschke [Tue, 23 Sep 2014 08:42:45 +0000 (10:42 +0200)]
Add a configuration switch for enabled preview mimetypes

Backport of https://github.com/owncloud/core/pull/11211 to stable7

10 years agoWebDAV now throws 403 when deletion did not work
Vincent Petry [Mon, 22 Sep 2014 10:19:34 +0000 (12:19 +0200)]
WebDAV now throws 403 when deletion did not work

Assume a permission issue whenever a file could not be deleted.

This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.

10 years agoMerge pull request #11230 from owncloud/fix-failing-mountconfig-tests-stable7
Morris Jobke [Mon, 22 Sep 2014 22:45:35 +0000 (00:45 +0200)]
Merge pull request #11230 from owncloud/fix-failing-mountconfig-tests-stable7

Load apps in test situations

10 years agoLog unsuccessful temp file creation and return false
Victor Dubiniuk [Tue, 29 Jul 2014 15:18:15 +0000 (18:18 +0300)]
Log unsuccessful temp file creation and return false

10 years agoAdded extra check to avoid deleting key folders
Vincent Petry [Fri, 19 Sep 2014 17:01:02 +0000 (19:01 +0200)]
Added extra check to avoid deleting key folders

Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.

Backport of 8aca127e52f965871bea82cb27c6ea103baf34bb from master

10 years agodate printed in the admin section regarding last execution time is already displayed...
Thomas Müller [Mon, 22 Sep 2014 12:06:51 +0000 (14:06 +0200)]
date printed in the admin section regarding last execution time is already displayed in the users timezone - no need to append UTC

10 years agoReenable file proxy when renaming between mount points
Vincent Petry [Thu, 18 Sep 2014 17:21:04 +0000 (19:21 +0200)]
Reenable file proxy when renaming between mount points

When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.

In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.

10 years agoin quota wrapper use === instead of ! for better readability and as in other wrappers
Jörn Friedrich Dreyer [Mon, 22 Sep 2014 09:35:42 +0000 (11:35 +0200)]
in quota wrapper use === instead of ! for better readability and as in other wrappers

10 years agoreturn boolean in Ciose::stream_seek
Jörn Friedrich Dreyer [Mon, 22 Sep 2014 09:33:55 +0000 (11:33 +0200)]
return boolean in Ciose::stream_seek

10 years agoreturn boolean in OC::stream_seek
Jörn Friedrich Dreyer [Sun, 21 Sep 2014 20:48:35 +0000 (22:48 +0200)]
return boolean in OC::stream_seek

10 years agoadd seek and tell to streamwrapper test
Jörn Friedrich Dreyer [Sun, 21 Sep 2014 20:47:40 +0000 (22:47 +0200)]
add seek and tell to streamwrapper test

10 years agoLoad apps in test situations
Robin McCorkell [Thu, 17 Jul 2014 09:46:57 +0000 (10:46 +0100)]
Load apps in test situations

10 years agoUse afterBind to send fileId header for files and directories
Vincent Petry [Mon, 18 Aug 2014 16:39:16 +0000 (18:39 +0200)]
Use afterBind to send fileId header for files and directories

afterBind is called for both files and directories and is now used to
send the OC-FileId headers.

10 years agoupdate 3rdparty submodule to its stable7 commit
Morris Jobke [Mon, 22 Sep 2014 11:05:36 +0000 (13:05 +0200)]
update 3rdparty submodule to its stable7 commit

10 years agoBackport of #9225
voxsim [Thu, 26 Jun 2014 10:38:33 +0000 (12:38 +0200)]
Backport of #9225

fix in displayNamesInGroup: when specified limit N, we did complex search only in the first N users

change logic in displayNamesInGroup and add some unit tests

add more logic in displayNamesInGroup for big user bases

1. remove sizeof($filteredUsers) > 0 as condition
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;

10 years agoAlso setup the filesystem when matching routes
Robin Appelman [Thu, 28 Aug 2014 15:58:23 +0000 (17:58 +0200)]
Also setup the filesystem when matching routes

10 years agoRemove unneeded file initialization in encryption, already handled in a hook
Robin Appelman [Thu, 28 Aug 2014 15:00:35 +0000 (17:00 +0200)]
Remove unneeded file initialization in encryption, already handled in a hook

10 years agoDon't automatically setup the filesystem the moment we load OC\Files\FileSystem
Robin Appelman [Thu, 28 Aug 2014 14:59:56 +0000 (16:59 +0200)]
Don't automatically setup the filesystem the moment we load OC\Files\FileSystem

10 years agoAdd select2 cache for complete group list
Vincent Petry [Thu, 11 Sep 2014 09:12:44 +0000 (11:12 +0200)]
Add select2 cache for complete group list

To avoid making a server request every time the dropdown opens, the
whole list of groups are cached (from the last request):

Whenever the user types in a search term it will still send server
requests.

10 years agofit select2 to ownCloud input style
Jan-Christoph Borchardt [Wed, 10 Sep 2014 16:09:22 +0000 (18:09 +0200)]
fit select2 to ownCloud input style

10 years agoFixed select2 for admin and apps page
Vincent Petry [Wed, 10 Sep 2014 12:30:02 +0000 (14:30 +0200)]
Fixed select2 for admin and apps page

Added explicit escaping.
Now internally using a pipe symbol as separator for select2, to make it
possible to use group names containing commas.

10 years agoAdded select2 on the apps page
Vincent Petry [Tue, 9 Sep 2014 16:00:53 +0000 (18:00 +0200)]
Added select2 on the apps page

Moved setupGroupsSelect() from admin.js to a common settings.js
as OC.Settings.setupGoupsSelect().

Now using select2 as well on the apps page.

10 years agoRemove excludegroup.php
Vincent Petry [Tue, 9 Sep 2014 15:18:24 +0000 (17:18 +0200)]
Remove excludegroup.php

The ajax call is now using ajax/appconfig.php instead

10 years agoLoad select2 on admin page
Vincent Petry [Tue, 9 Sep 2014 15:18:12 +0000 (17:18 +0200)]
Load select2 on admin page

10 years agoNow using select2 for the groups excluded from sharing
Vincent Petry [Tue, 9 Sep 2014 15:06:50 +0000 (17:06 +0200)]
Now using select2 for the groups excluded from sharing

10 years agoMove select2 from files_external to core
Vincent Petry [Tue, 9 Sep 2014 13:45:56 +0000 (15:45 +0200)]
Move select2 from files_external to core

Backport of 412da87e6583375f98ef1bdd755c56caab14b8ac from master

10 years agomake sure that we really catch the files folder only
Bjoern Schiessle [Wed, 17 Sep 2014 08:40:41 +0000 (10:40 +0200)]
make sure that we really catch the files folder only

10 years agocreate backup from all keys before recovery
Bjoern Schiessle [Tue, 16 Sep 2014 13:16:27 +0000 (15:16 +0200)]
create backup from all keys before recovery

10 years agoMerge pull request #11202 from owncloud/stable_l10n_backport
Thomas Müller [Mon, 22 Sep 2014 07:16:34 +0000 (09:16 +0200)]
Merge pull request #11202 from owncloud/stable_l10n_backport

backport server2server strings

10 years agoMerge pull request #11201 from owncloud/fix-button-text
Thomas Müller [Mon, 22 Sep 2014 07:16:00 +0000 (09:16 +0200)]
Merge pull request #11201 from owncloud/fix-button-text

fix button text l10n

10 years agomake sure preview prop is instanceof OC_Image before using it in showPreview
Georg Ehrke [Sun, 21 Sep 2014 15:30:29 +0000 (17:30 +0200)]
make sure preview prop is instanceof OC_Image before using it in showPreview

10 years agodelete old previews
Georg Ehrke [Sun, 21 Sep 2014 15:16:21 +0000 (17:16 +0200)]
delete old previews

10 years agobackport server2server strings
Volkan Gezer [Sun, 21 Sep 2014 15:34:39 +0000 (17:34 +0200)]
backport server2server strings

10 years agofix button text l10n
Volkan Gezer [Sun, 21 Sep 2014 15:32:37 +0000 (17:32 +0200)]
fix button text l10n

10 years agoMerge pull request #11195 from owncloud/stable_l10n_backport
Morris Jobke [Sun, 21 Sep 2014 09:16:08 +0000 (11:16 +0200)]
Merge pull request #11195 from owncloud/stable_l10n_backport

backport stable translations

10 years agoadding 'smallint unsigned' to type mapping for sqlite
Thomas Müller [Sat, 20 Sep 2014 18:06:44 +0000 (20:06 +0200)]
adding 'smallint unsigned' to type mapping for sqlite

10 years agobackport stable translations
Volkan Gezer [Sat, 20 Sep 2014 16:50:17 +0000 (18:50 +0200)]
backport stable translations

10 years agoMerge pull request #11190 from owncloud/fix-unit-test-sort-order-stable7
Robin McCorkell [Sat, 20 Sep 2014 11:09:50 +0000 (12:09 +0100)]
Merge pull request #11190 from owncloud/fix-unit-test-sort-order-stable7

Don't rely on the sorting the database gives us for tests

10 years agoDon't rely on the sorting the database gives us for tests
Robin Appelman [Fri, 6 Jun 2014 08:24:28 +0000 (10:24 +0200)]
Don't rely on the sorting the database gives us for tests

10 years agoPrevent updates between multiple major versions
Lukas Reschke [Thu, 18 Sep 2014 15:45:30 +0000 (17:45 +0200)]
Prevent updates between multiple major versions

Ref https://github.com/owncloud/core/issues/11078

10 years agoMove BasicAuth check to "isLoggedIn()"
Lukas Reschke [Thu, 18 Sep 2014 14:02:18 +0000 (16:02 +0200)]
Move BasicAuth check to "isLoggedIn()"

Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.

10 years agoupdate encryption doc link
Volkan Gezer [Wed, 17 Sep 2014 18:53:19 +0000 (20:53 +0200)]
update encryption doc link

I don't know how we missed to update this :/

update ldap doc link

10 years agoMove basic auth check
Lukas Reschke [Wed, 17 Sep 2014 14:04:12 +0000 (16:04 +0200)]
Move basic auth check

At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.

Fixes https://github.com/owncloud/core/issues/11129

10 years agoAdd timeout to user and group deletion notification
Vincent Petry [Thu, 11 Sep 2014 13:56:00 +0000 (15:56 +0200)]
Add timeout to user and group deletion notification

Added timeout in DeleteHandler to auto-delete after a delay.

Fixed issue where OC.Notification.hide() was called twice in a row when
deleting multiple entries, causing the second notification to disappear.
Fixed issue where "undo" click event handler was registered multiple
times when calling setNotifications() twice.
Added JS unit tests for the DeleteHandler class.

Refix undo users, groups feature

Timeout is now cleared in cancel().

Fixed click handler name for "undo" to be able to work with multiple
DeleteHandler instances (in our case one for users and one for groups)
so that there is no conflict.

Backport of 0d9f24a0efef20b9041e40817b10822a4700532d from master

10 years agoMake 404 page easier to understand
Lukas Reschke [Wed, 17 Sep 2014 20:49:37 +0000 (22:49 +0200)]
Make 404 page easier to understand

Fixes https://github.com/owncloud/core/issues/11133

10 years agoversion bump
Frank Karlitschek [Sat, 13 Sep 2014 20:56:07 +0000 (22:56 +0200)]
version bump

10 years agoadding unit test to truncate the table
Thomas Müller [Tue, 16 Sep 2014 14:17:25 +0000 (16:17 +0200)]
adding unit test to truncate the table

10 years agoUse Doctrine Platform to generate SQL query for table truncation.
Andreas Fischer [Fri, 29 Aug 2014 18:53:51 +0000 (20:53 +0200)]
Use Doctrine Platform to generate SQL query for table truncation.

10 years agoMerge pull request #11053 from owncloud/baskport-11041-stable7
Vincent Petry [Tue, 16 Sep 2014 14:46:47 +0000 (16:46 +0200)]
Merge pull request #11053 from owncloud/baskport-11041-stable7

content size checks are not valid for LOCK

10 years agoReword the description
Lukas Reschke [Tue, 16 Sep 2014 13:51:48 +0000 (15:51 +0200)]
Reword the description

The old one was just horrible wrong.

10 years agoDisable database migrations for MSSQL - scripts have to be applied manually
Thomas Müller [Mon, 15 Sep 2014 12:26:00 +0000 (14:26 +0200)]
Disable database migrations for MSSQL - scripts have to be applied manually

10 years agoalso expire file if timestamp = limit, happens if trashbin_retention_obligation is...
Bjoern Schiessle [Mon, 15 Sep 2014 11:00:04 +0000 (13:00 +0200)]
also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero

10 years agoPreserve transparency when loading from a file
kondou [Tue, 12 Aug 2014 09:00:00 +0000 (11:00 +0200)]
Preserve transparency when loading from a file

Fix #7148 - again :)

10 years agoUse secure mimetype for content delivery
Lukas Reschke [Mon, 8 Sep 2014 13:57:39 +0000 (15:57 +0200)]
Use secure mimetype for content delivery

Adds some hardening against potential CSP bypassed.

10 years agoRemove passing by reference to allow for proper GC
Vincent Petry [Fri, 12 Sep 2014 17:51:47 +0000 (19:51 +0200)]
Remove passing by reference to allow for proper GC

The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.

This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.

10 years agoSet overwritewebroot when installing owncloud to avoid problems
Joas Schilling [Mon, 8 Sep 2014 12:22:43 +0000 (14:22 +0200)]
Set overwritewebroot when installing owncloud to avoid problems

Backport of 249558966e6a144cf0fb873a3fac5a3664cfdd9d to stable7

10 years agoif only one attribute is requested, the returned array has 0 as key instead of attrib...
Arthur Schiwon [Fri, 5 Sep 2014 12:05:37 +0000 (14:05 +0200)]
if only one attribute is requested, the returned array has 0 as key instead of attribute name. fixes #10888

10 years agoDo not double decode values
Lukas Reschke [Thu, 11 Sep 2014 13:34:57 +0000 (15:34 +0200)]
Do not double decode values

Fixes https://github.com/owncloud/core/issues/11012

10 years agocontent size checks are not valid for LOCK
Thomas Müller [Fri, 12 Sep 2014 20:02:42 +0000 (22:02 +0200)]
content size checks are not valid for LOCK

10 years agocontent size checks are not valid for LOCK
Thomas Müller [Fri, 12 Sep 2014 19:53:28 +0000 (21:53 +0200)]
content size checks are not valid for LOCK

10 years agofix nojavascript message alignment
Jan-Christoph Borchardt [Thu, 11 Sep 2014 14:12:43 +0000 (16:12 +0200)]
fix nojavascript message alignment

10 years agoConverted an array to PHP5.3 compatible version
Johan Björk [Wed, 9 Jul 2014 12:54:03 +0000 (14:54 +0200)]
Converted an array to PHP5.3 compatible version

10 years agoFixes #8326: deletion of directories on S3
Johan Björk [Tue, 8 Jul 2014 20:28:12 +0000 (22:28 +0200)]
Fixes #8326: deletion of directories on S3

10 years agofix folder icon alignment, fix #10866
Jan-Christoph Borchardt [Thu, 11 Sep 2014 13:52:12 +0000 (15:52 +0200)]
fix folder icon alignment, fix #10866

10 years agofix svg of calendar filetype icon
Jan-Christoph Borchardt [Thu, 11 Sep 2014 13:51:24 +0000 (15:51 +0200)]
fix svg of calendar filetype icon

10 years agofix size of toggle icon, make container square
Jan-Christoph Borchardt [Thu, 11 Sep 2014 13:39:01 +0000 (15:39 +0200)]
fix size of toggle icon, make container square

10 years agoimprove style of checkmark icon, less bold, fitting ownCloud style
Jan-Christoph Borchardt [Thu, 11 Sep 2014 13:38:39 +0000 (15:38 +0200)]
improve style of checkmark icon, less bold, fitting ownCloud style

10 years agorepair search lucene before installing
Jörn Friedrich Dreyer [Tue, 9 Sep 2014 13:18:57 +0000 (15:18 +0200)]
repair search lucene before installing

10 years agoAdd X-UA-Compatible to all templates
Lukas Reschke [Thu, 11 Sep 2014 08:28:52 +0000 (10:28 +0200)]
Add X-UA-Compatible to all templates

Replaces https://github.com/owncloud/core/pull/10850

10 years agoMerge pull request #10998 from owncloud/use-section-in-form
Vincent Petry [Thu, 11 Sep 2014 10:07:31 +0000 (12:07 +0200)]
Merge pull request #10998 from owncloud/use-section-in-form

Use section in first element in user_ldap

10 years agoUse section in first element
Lukas Reschke [Wed, 10 Sep 2014 16:47:29 +0000 (18:47 +0200)]
Use section in first element

10 years agoMerge pull request #10973 from owncloud/stable7-issue/10847
Vincent Petry [Wed, 10 Sep 2014 12:57:32 +0000 (14:57 +0200)]
Merge pull request #10973 from owncloud/stable7-issue/10847

[Stable7] Use correct language package so the subject is correctly translated

10 years agoDo not load extra user backends when an upgrade is due
Vincent Petry [Mon, 8 Sep 2014 10:30:04 +0000 (12:30 +0200)]
Do not load extra user backends when an upgrade is due

Whenever an upgrade is due, do not load extra user backends

Backport of d6bfd90bf804f6d8bb4c651e6bcf8374dc6b94b4 from master

10 years agoMerge pull request #10884 from owncloud/stable7_backport_issue_10674
Lukas Reschke [Wed, 10 Sep 2014 08:31:26 +0000 (10:31 +0200)]
Merge pull request #10884 from owncloud/stable7_backport_issue_10674

Backport issue 10764

10 years agoUse correct language package so the subject is correctly translated
Joas Schilling [Thu, 4 Sep 2014 09:23:23 +0000 (11:23 +0200)]
Use correct language package so the subject is correctly translated

Fix #10847

Conflicts:
lib/private/share/mailnotifications.php

10 years agoFix broken new lines in plain text mail template
Joas Schilling [Thu, 4 Sep 2014 09:30:54 +0000 (11:30 +0200)]
Fix broken new lines in plain text mail template

10 years agomore sugar for including lists of templates
Bernhard Posselt [Tue, 9 Sep 2014 13:47:42 +0000 (15:47 +0200)]
more sugar for including lists of templates

10 years agoappend .html since componets always use html files
Bernhard Posselt [Mon, 8 Sep 2014 19:37:18 +0000 (21:37 +0200)]
append .html since componets always use html files

10 years agoadd template functions for html imports
Bernhard Posselt [Mon, 8 Sep 2014 19:19:44 +0000 (21:19 +0200)]
add template functions for html imports