]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoMerge pull request #11023 from owncloud/users-fixundo
Lukas Reschke [Mon, 15 Sep 2014 19:55:03 +0000 (21:55 +0200)]
Merge pull request #11023 from owncloud/users-fixundo

Add timeout to user and group deletion notification.

10 years agoMerge pull request #11060 from owncloud/rmobslang
Lukas Reschke [Mon, 15 Sep 2014 15:31:10 +0000 (17:31 +0200)]
Merge pull request #11060 from owncloud/rmobslang

remove obsolete language files

10 years agoMerge pull request #10109 from owncloud/issue_#9793_guestlayout
Morris Jobke [Mon, 15 Sep 2014 13:15:41 +0000 (15:15 +0200)]
Merge pull request #10109 from owncloud/issue_#9793_guestlayout

Step one, open guest layout for different styles.

10 years agoMerge pull request #11026 from owncloud/apps-styles-update
Morris Jobke [Mon, 15 Sep 2014 12:45:23 +0000 (14:45 +0200)]
Merge pull request #11026 from owncloud/apps-styles-update

Apps styles update

10 years agoMerge pull request #10960 from owncloud/use-intl-module-master
Lukas Reschke [Mon, 15 Sep 2014 12:13:30 +0000 (14:13 +0200)]
Merge pull request #10960 from owncloud/use-intl-module-master

use intl's native normalizer_normalize() in case the module is available

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.

10 years agoMerge pull request #11021 from owncloud/do-not-double-decode
Andreas Fischer [Mon, 15 Sep 2014 05:58:45 +0000 (07:58 +0200)]
Merge pull request #11021 from owncloud/do-not-double-decode

Do not double decode values

* owncloud/do-not-double-decode:
  Do not double decode values

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 15 Sep 2014 05:54:26 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11050 from owncloud/enc-flockfix
Lukas Reschke [Sun, 14 Sep 2014 22:31:10 +0000 (00:31 +0200)]
Merge pull request #11050 from owncloud/enc-flockfix

Remove passing by reference to allow for proper GC

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 14 Sep 2014 05:54:35 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11054 from owncloud/fix-unit-tests-11041-master
Thomas Müller [Sat, 13 Sep 2014 18:00:46 +0000 (20:00 +0200)]
Merge pull request #11054 from owncloud/fix-unit-tests-11041-master

content size checks are not valid for LOCK

10 years agoremove obsolete language files
Volkan Gezer [Sat, 13 Sep 2014 13:29:11 +0000 (15:29 +0200)]
remove obsolete language files

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 13 Sep 2014 09:17:34 +0000 (05:17 -0400)]
[tx-robot] updated from transifex

10 years agoDon't terminate the script if the pgsql database could not be deleted
Thomas Müller [Fri, 12 Sep 2014 20:41:22 +0000 (22:41 +0200)]
Don't terminate the script if the pgsql database could not be deleted

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 agoMerge pull request #11041 from owncloud/no-size-check-on-lock-master
Raghu Nayyar [Fri, 12 Sep 2014 19:18:52 +0000 (00:48 +0530)]
Merge pull request #11041 from owncloud/no-size-check-on-lock-master

content size checks are not valid for LOCK

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 agoMerge pull request #10974 from owncloud/fix-app-content-overflow
Bernhard Posselt [Fri, 12 Sep 2014 16:41:43 +0000 (18:41 +0200)]
Merge pull request #10974 from owncloud/fix-app-content-overflow

This fixes the double scrollbars issue

10 years agoremove 'set -e' - causes issues during ci execution
Thomas Müller [Fri, 12 Sep 2014 13:42:50 +0000 (15:42 +0200)]
remove 'set -e' - causes issues during ci execution

10 years agoMerge pull request #11043 from owncloud/test-againstNull
Clark Tomlinson [Fri, 12 Sep 2014 13:42:42 +0000 (09:42 -0400)]
Merge pull request #11043 from owncloud/test-againstNull

Return false in case the passed values are not of type string

10 years agoReturn false in case one of the values is null
Lukas Reschke [Fri, 12 Sep 2014 11:32:59 +0000 (13:32 +0200)]
Return false in case one of the values is null

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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 12 Sep 2014 07:28:56 +0000 (03:28 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11024 from owncloud/fix-nojavascript
Jan-Christoph Borchardt [Thu, 11 Sep 2014 21:06:17 +0000 (23:06 +0200)]
Merge pull request #11024 from owncloud/fix-nojavascript

fix nojavascript message alignment

10 years agoMerge pull request #11022 from owncloud/icons-fix
Jan-Christoph Borchardt [Thu, 11 Sep 2014 14:58:32 +0000 (16:58 +0200)]
Merge pull request #11022 from owncloud/icons-fix

Fix icons

10 years agouse same shade of grey for active navigation items and hovering
Jan-Christoph Borchardt [Thu, 11 Sep 2014 14:34:29 +0000 (16:34 +0200)]
use same shade of grey for active navigation items and hovering

10 years agoremove icon styles from apps.css as they are in icons.css
Jan-Christoph Borchardt [Thu, 11 Sep 2014 14:30:24 +0000 (16:30 +0200)]
remove icon styles from apps.css as they are in icons.css

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 agoMerge pull request #11018 from owncloud/fix-notification-layer
Lukas Reschke [Thu, 11 Sep 2014 14:07:23 +0000 (16:07 +0200)]
Merge pull request #11018 from owncloud/fix-notification-layer

fix notification visibility, fix #11016

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 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 agoMerge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporti...
Thomas Müller [Thu, 11 Sep 2014 13:05:36 +0000 (15:05 +0200)]
Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys

Add custom hex2bin implementation for 5.3

10 years agofix notification visibility, fix #11016
Jan-Christoph Borchardt [Thu, 11 Sep 2014 12:12:29 +0000 (14:12 +0200)]
fix notification visibility, fix #11016

10 years agoMerge pull request #11007 from owncloud/replaces-10850
Thomas Müller [Thu, 11 Sep 2014 10:34:44 +0000 (12:34 +0200)]
Merge pull request #11007 from owncloud/replaces-10850

Add X-UA-Compatible to all templates

10 years agoStep one, open guest layout for different styles.
Lukas Reschke [Thu, 11 Sep 2014 09:39:50 +0000 (11:39 +0200)]
Step one, open guest layout for different styles.

Conflicts:
core/templates/layout.guest.php

Step one, open guest layout for different styles.

10 years agoMerge pull request #3937 from owncloud/refresh_if_maintenance_is_over
Lukas Reschke [Thu, 11 Sep 2014 09:34:39 +0000 (11:34 +0200)]
Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over

Refresh if maintenance mode is over

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 agouse intl's native normalizer_normalize() in case the module is available
Thomas Müller [Tue, 9 Sep 2014 12:41:45 +0000 (14:41 +0200)]
use intl's native normalizer_normalize() in case the module is available

10 years agoMerge pull request #10962 from owncloud/repair_search_lucene
Lukas Reschke [Thu, 11 Sep 2014 08:09:43 +0000 (10:09 +0200)]
Merge pull request #10962 from owncloud/repair_search_lucene

repair search lucene before installing

10 years agoAdd custom hex2bin implementation for 5.3
Lukas Reschke [Thu, 11 Sep 2014 07:51:45 +0000 (09:51 +0200)]
Add custom hex2bin implementation for 5.3

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

10 years agoMerge pull request #9698 from owncloud/fix-9666
Thomas Müller [Thu, 11 Sep 2014 06:05:00 +0000 (08:05 +0200)]
Merge pull request #9698 from owncloud/fix-9666

Load apps in tests, fixes #9666

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 11 Sep 2014 05:54:41 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #10992 from oparoz/patch-3
Robin McCorkell [Wed, 10 Sep 2014 17:05:28 +0000 (18:05 +0100)]
Merge pull request #10992 from oparoz/patch-3

Create .user.ini for PHP-FPM

10 years agoFix contructor in test
Robin Appelman [Wed, 10 Sep 2014 15:22:10 +0000 (17:22 +0200)]
Fix contructor in test

10 years agoFix mkdir error in mountconfig.php
Robin McCorkell [Thu, 28 Aug 2014 14:08:18 +0000 (15:08 +0100)]
Fix mkdir error in mountconfig.php

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 agoMerge pull request #10988 from owncloud/usetransactions-wrong-name
Thomas Müller [Wed, 10 Sep 2014 15:27:23 +0000 (17:27 +0200)]
Merge pull request #10988 from owncloud/usetransactions-wrong-name

Fix method name useTransactions

10 years agoCreate .user.ini for PHP-FPM
Olivier Paroz [Wed, 10 Sep 2014 14:08:40 +0000 (16:08 +0200)]
Create .user.ini for PHP-FPM

PHP-FPM can't read .htaccess PHP settings unless a PECL extension is installed.
From version 5.3+ of PHP, settings can be set in .user.ini files

This is a .user.ini file mirroring what is included in the .htaccess file
TODO: Update the documentation if there are sections documenting how to change some PHP limits

10 years agoMerge pull request #10990 from owncloud/fix-testCallRegister-master
Lukas Reschke [Wed, 10 Sep 2014 14:04:44 +0000 (16:04 +0200)]
Merge pull request #10990 from owncloud/fix-testCallRegister-master

requesttoken has now a length of 30 chars

10 years agoFix method name
Robin Appelman [Wed, 10 Sep 2014 12:47:03 +0000 (14:47 +0200)]
Fix method name

10 years agorequesttoken has now a length of 30 chars
Thomas Müller [Wed, 10 Sep 2014 13:35:21 +0000 (15:35 +0200)]
requesttoken has now a length of 30 chars

10 years agoMerge pull request #10929 from owncloud/issue/10514
Vincent Petry [Wed, 10 Sep 2014 13:07:57 +0000 (15:07 +0200)]
Merge pull request #10929 from owncloud/issue/10514

Set overwritewebroot when installing owncloud to avoid problems

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 ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 10 Sep 2014 05:54:54 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #9512 from libasys/patch-2
Lukas Reschke [Tue, 9 Sep 2014 21:58:24 +0000 (23:58 +0200)]
Merge pull request #9512 from libasys/patch-2

Fix use Sharing Api with calendar

10 years agoMerge pull request #10844 from owncloud/acceptance-enableapps
Lukas Reschke [Tue, 9 Sep 2014 21:44:06 +0000 (23:44 +0200)]
Merge pull request #10844 from owncloud/acceptance-enableapps

Added acceptance tests for enabling apps

10 years agoMerge pull request #10972 from ppaysant/routes-defaults
Bernhard Posselt [Tue, 9 Sep 2014 21:40:46 +0000 (23:40 +0200)]
Merge pull request #10972 from ppaysant/routes-defaults

Allow default values for route parameters.

10 years agoMerge pull request #10922 from owncloud/explicit-scan-transactions
Lukas Reschke [Tue, 9 Sep 2014 21:32:32 +0000 (23:32 +0200)]
Merge pull request #10922 from owncloud/explicit-scan-transactions

Use bigger transactions when doing explicit file system scans

10 years agoAllow default values for route parameters.
Patrick Paysant [Sun, 7 Sep 2014 10:20:48 +0000 (12:20 +0200)]
Allow default values for route parameters.

10 years agoThis fixes the double scrollbars issue
Bernhard Posselt [Tue, 9 Sep 2014 20:59:16 +0000 (22:59 +0200)]
This fixes the double scrollbars issue

10 years agoMerge pull request #10969 from owncloud/set-e
Vincent Petry [Tue, 9 Sep 2014 18:08:48 +0000 (20:08 +0200)]
Merge pull request #10969 from owncloud/set-e

terminate script execution in case of failure

10 years agoMerge pull request #10964 from owncloud/static-array-functions
Bernhard Posselt [Tue, 9 Sep 2014 16:56:48 +0000 (18:56 +0200)]
Merge pull request #10964 from owncloud/static-array-functions

More sugar for including lists of files in templates

10 years agoRefresh if maintenance mode is over
kondou [Thu, 4 Jul 2013 12:28:12 +0000 (14:28 +0200)]
Refresh if maintenance mode is over

Using status.php for this.
I modified status.php to also show, whether we're in maintenance.

Checks every 20 seconds if maintenance is over, if yes: reload.

10 years agoterminate script execution in case of failure
Thomas Müller [Tue, 9 Sep 2014 15:12:20 +0000 (17:12 +0200)]
terminate script execution in case of failure

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 agoMerge pull request #10948 from owncloud/fix-zindex
Lukas Reschke [Tue, 9 Sep 2014 12:23:28 +0000 (14:23 +0200)]
Merge pull request #10948 from owncloud/fix-zindex

fix z-index of header and dropdowns, fix user menu not showing on mobile

10 years agoMerge pull request #10947 from owncloud/html-imports
Bernhard Posselt [Tue, 9 Sep 2014 12:07:46 +0000 (14:07 +0200)]
Merge pull request #10947 from owncloud/html-imports

add template functions for html imports

10 years agoMerge pull request #9753 from owncloud/filepath-css
Thomas Müller [Tue, 9 Sep 2014 11:59:19 +0000 (13:59 +0200)]
Merge pull request #9753 from owncloud/filepath-css

Remove special case for css in OC.filePath

10 years agoAdd beforeeach and aftereach
Lukas Reschke [Tue, 9 Sep 2014 11:08:50 +0000 (13:08 +0200)]
Add beforeeach and aftereach

10 years agoAdd unittest for filePath
Lukas Reschke [Tue, 9 Sep 2014 10:05:19 +0000 (12:05 +0200)]
Add unittest for filePath

10 years agoMerge pull request #10949 from owncloud/allow_prefilling_login
Jörn Friedrich Dreyer [Tue, 9 Sep 2014 09:42:14 +0000 (11:42 +0200)]
Merge pull request #10949 from owncloud/allow_prefilling_login

allow prefilling login

10 years agoMerge pull request #7323 from owncloud/Jonny007-MKD-master
Lukas Reschke [Tue, 9 Sep 2014 09:31:50 +0000 (11:31 +0200)]
Merge pull request #7323 from owncloud/Jonny007-MKD-master

Update adapter.php

10 years agoMerge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore
Jörn Friedrich Dreyer [Tue, 9 Sep 2014 08:25:10 +0000 (10:25 +0200)]
Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore

Keep fileid on move in objectstore, fixes #10848

10 years agoMerge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install
Lukas Reschke [Tue, 9 Sep 2014 07:36:16 +0000 (09:36 +0200)]
Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install

allow . in dbname on web install

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 9 Sep 2014 05:55:47 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled
VicDeo [Mon, 8 Sep 2014 22:50:33 +0000 (01:50 +0300)]
Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled

Add new check_for_working_internet configuration switch

10 years agoMerge pull request #10858 from owncloud/issue/10847
VicDeo [Mon, 8 Sep 2014 22:11:34 +0000 (01:11 +0300)]
Merge pull request #10858 from owncloud/issue/10847

Use correct language package so the subject is correctly translated

10 years agoMerge pull request #10927 from owncloud/update-nosetupbackends
Vincent Petry [Mon, 8 Sep 2014 20:57:15 +0000 (22:57 +0200)]
Merge pull request #10927 from owncloud/update-nosetupbackends

Do not load extra user backends when an upgrade is due

10 years agoMerge pull request #10944 from owncloud/fix-nojavascript-style
Jan-Christoph Borchardt [Mon, 8 Sep 2014 19:58:54 +0000 (21:58 +0200)]
Merge pull request #10944 from owncloud/fix-nojavascript-style

fix no-JS message, and add it to log in and shared as well cause they don’t work without JS

10 years agoallow prefilling login
Jörn Friedrich Dreyer [Mon, 8 Sep 2014 19:44:13 +0000 (21:44 +0200)]
allow prefilling login

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 agofix z-index of header and dropdowns, fix user menu not showing on mobile
Jan-Christoph Borchardt [Mon, 8 Sep 2014 15:43:36 +0000 (17:43 +0200)]
fix z-index of header and dropdowns, fix user menu not showing on mobile

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

10 years agoMerge pull request #10739 from owncloud/eventsource-public
Lukas Reschke [Mon, 8 Sep 2014 16:46:27 +0000 (18:46 +0200)]
Merge pull request #10739 from owncloud/eventsource-public

Add EventSource to the public API

10 years agoMerge pull request #10740 from owncloud/fix-everyone-group-count
Lukas Reschke [Mon, 8 Sep 2014 16:29:11 +0000 (18:29 +0200)]
Merge pull request #10740 from owncloud/fix-everyone-group-count

Using countUsers method to return true count of users

10 years agoMerge pull request #10885 from owncloud/swift-hasupdated
Lukas Reschke [Mon, 8 Sep 2014 16:19:59 +0000 (18:19 +0200)]
Merge pull request #10885 from owncloud/swift-hasupdated

Fix hasUpdated for folders in openstack swift

10 years agoalso add no-JavaScript notice to log in and sharing pages because they do not work...
Jan-Christoph Borchardt [Mon, 8 Sep 2014 16:07:20 +0000 (18:07 +0200)]
also add no-JavaScript notice to log in and sharing pages because they do not work without JS either

10 years agofix styling and wording of no-JavaScript message
Jan-Christoph Borchardt [Mon, 8 Sep 2014 15:55:53 +0000 (17:55 +0200)]
fix styling and wording of no-JavaScript message

10 years agoMerge pull request #10755 from owncloud/shorter_sharing_links
Lukas Reschke [Mon, 8 Sep 2014 15:26:20 +0000 (17:26 +0200)]
Merge pull request #10755 from owncloud/shorter_sharing_links

Shorter sharing links

10 years agoMerge pull request #10930 from owncloud/use-admincheck
Lukas Reschke [Mon, 8 Sep 2014 15:25:30 +0000 (17:25 +0200)]
Merge pull request #10930 from owncloud/use-admincheck

Check for admin user instead of subadmin

10 years agoMerge pull request #10451 from k4k/login_logo_alignment_fix
Volkan Gezer [Mon, 8 Sep 2014 15:21:33 +0000 (17:21 +0200)]
Merge pull request #10451 from k4k/login_logo_alignment_fix

improve logo flexibility to fix wide custom logo alignment, fix #9339

10 years agoMerge pull request #10938 from owncloud/useSecureMimetype
Lukas Reschke [Mon, 8 Sep 2014 15:13:54 +0000 (17:13 +0200)]
Merge pull request #10938 from owncloud/useSecureMimetype

Use secure mimetype for content delivery

10 years agoMerge pull request #10827 from oparoz/patch-2
Lukas Reschke [Mon, 8 Sep 2014 14:41:26 +0000 (16:41 +0200)]
Merge pull request #10827 from oparoz/patch-2

Libreoffice config folder needs to be set

10 years agoMerge pull request #10890 from owncloud/fix-10888
Lukas Reschke [Mon, 8 Sep 2014 14:39:48 +0000 (16:39 +0200)]
Merge pull request #10890 from owncloud/fix-10888

if only one attribute is requested, the returned array has 0 as key inst...

10 years agoFix typo
Lukas Reschke [Mon, 8 Sep 2014 14:34:03 +0000 (16:34 +0200)]
Fix typo

10 years agoMerge pull request #10911 from owncloud/template-funcs
Lukas Reschke [Mon, 8 Sep 2014 14:32:05 +0000 (16:32 +0200)]
Merge pull request #10911 from owncloud/template-funcs

Add template shortcut functions for style and script

10 years agoMerge pull request #10935 from owncloud/who_knows_what_horrors_lie_in_the_dark_of_unicode
Clark Tomlinson [Mon, 8 Sep 2014 14:30:09 +0000 (10:30 -0400)]
Merge pull request #10935 from owncloud/who_knows_what_horrors_lie_in_the_dark_of_unicode

w͢͢͝h͡o͢͡ ̸͢k̵͟n̴͘ǫw̸̛s͘ ̀́w͘͢ḩ̵a҉̡͢t ̧̕h́o̵r͏̵rors̡ ̶͡͠lį̶e͟͟ ̶͝in͢ ͏t̕h̷̡͟e ͟͟d̛a͜r̕͡k̢̨ ͡h̴e͏a̷̢̡rt́͏ ̴̷͠ò̵̶f̸ u̧͘ní̛͜c͢͏o̷͏d̸͢e̡͝