Andreas Fischer
f2f5a53d36
Merge pull request #7988 from owncloud/routing-cache-webroot
...
Keep cached urls with different hostnames or baseurls seperate
* owncloud/routing-cache-webroot:
Sort parameters and cast to int
add delimiter between host and baseurl
Keep cached urls with different hostnames or baseurls seperate
2014-04-20 18:27:23 +02:00
Andreas Fischer
f2e5494edc
Merge pull request #8203 from owncloud/correct-link
...
Use direct link instead of JS
* owncloud/correct-link:
Link to previous directory
Use direct link instead of JS
2014-04-20 15:58:53 +02:00
Andreas Fischer
93ed6a695e
Merge pull request #8169 from owncloud/change-to-show
...
Change from showHTML to show
* owncloud/change-to-show:
Change from showHTML to show
2014-04-20 15:53:33 +02:00
Andreas Fischer
96137027f8
Merge pull request #8277 from owncloud/add-type-hints
...
Add type hinting
* owncloud/add-type-hints:
Add type hinting
2014-04-20 15:40:26 +02:00
Jenkins for ownCloud
8fba61f844
[tx-robot] updated from transifex
2014-04-20 01:56:03 -04:00
Lukas Reschke
199ee18c0c
Merge pull request #8229 from owncloud/menutoggle-mobile
...
do not show menu toggle on public share links as there is no menu
2014-04-20 01:13:24 +02:00
Lukas Reschke
e930ce6436
Add type hinting
2014-04-20 00:55:01 +02:00
Jenkins for ownCloud
1abd9c1305
[tx-robot] updated from transifex
2014-04-19 01:56:06 -04:00
Jenkins for ownCloud
d23c4697d0
[tx-robot] updated from transifex
2014-04-18 01:56:04 -04:00
blizzz
36c8dec10a
Merge pull request #8220 from owncloud/type-hinting-ldap
...
Fix PHPdoc in user_ldap
2014-04-17 18:15:40 +02:00
Morris Jobke
2026c7558e
Merge pull request #8249 from owncloud/correct-m
...
Use JS as content-type due to mimesniffing
2014-04-17 17:14:34 +02:00
Morris Jobke
707658c00a
Merge pull request #8205 from owncloud/fix-8202
...
Add one more LOWER.
2014-04-17 16:10:33 +02:00
Morris Jobke
a2a0eb370b
Merge pull request #8222 from owncloud/type-hinting
...
Type hinting fixes
2014-04-17 16:08:15 +02:00
Morris Jobke
fe654ece99
Merge pull request #8246 from Gared/master
...
Fix javascript error in calendar app
2014-04-17 15:37:35 +02:00
Morris Jobke
0b4431216d
Merge pull request #8236 from owncloud/header-right-fix
...
remove duplication of header and 'header-right' element, also ellipsize when too wide
2014-04-17 15:18:40 +02:00
Robin McCorkell
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
Jörn Friedrich Dreyer
8a0c8a1956
Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master
...
videos which are shorter then 5 seconds will now get a proper thumbnail ...
2014-04-17 11:15:05 +02:00
Lukas Reschke
eecd4bd18e
Use JS as content-type due to mimesniffing
2014-04-17 10:40:19 +02:00
Jenkins for ownCloud
a7d7ca2fb3
[tx-robot] updated from transifex
2014-04-17 01:56:06 -04:00
Morris Jobke
5a1a056c6d
Merge pull request #8183 from owncloud/move-security-headers
...
Move security headers
2014-04-16 23:46:20 +02:00
Morris Jobke
2f6eed4f9d
Merge pull request #7994 from owncloud/fix-login-fields
...
Fix login fields
2014-04-16 23:17:49 +02:00
Stefan
1d8eb44677
Fix javascript error in calendar app
...
Fix owncloud/calendar#409
If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception.
License: WTFPL
2014-04-16 22:41:57 +02:00
Jan-Christoph Borchardt
7178e39569
Merge pull request #8235 from owncloud/fix-error-mobile
...
fix error display on smaller screens, fix #8090
2014-04-16 21:35:43 +02:00
Lukas Reschke
81c23b02da
Link to previous directory
2014-04-16 21:10:14 +02:00
Thomas Müller
a4389340b8
escape $second + update PHPDoc
2014-04-16 19:45:55 +02:00
Bart Visscher
81751cb616
Add missing param hint
2014-04-16 17:54:10 +02:00
Jan-Christoph Borchardt
03ad908c30
fix overlapping infield labels
2014-04-16 17:49:46 +02:00
Jan-Christoph Borchardt
067a5cdee7
fix database infield label indentation
2014-04-16 17:44:05 +02:00
Jan-Christoph Borchardt
6a79b7f2b5
fix sizing for fields when password is shown
2014-04-16 17:43:15 +02:00
Thomas Müller
d0f8cc20c5
videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second
2014-04-16 17:16:03 +02:00
Jan-Christoph Borchardt
e68006c0ce
Merge pull request #8157 from owncloud/share-expiration-smooth-hide
...
Expiration date is hidden smoothly
2014-04-16 17:10:14 +02:00
Jan-Christoph Borchardt
9c6f8e59ae
fix header code duplication, code style fixes
2014-04-16 16:26:41 +02:00
Jan-Christoph Borchardt
547ddf7775
remove duplication of 'header-right' element, also make it overflow when too wide
2014-04-16 15:53:38 +02:00
Jan-Christoph Borchardt
7110ecbf06
fix error display on smaller screens, fix #8090
2014-04-16 15:31:15 +02:00
Jan-Christoph Borchardt
9dabed04a4
do not show menu toggle on public share links as there is no menu
2014-04-16 10:49:16 +02:00
blizzz
f6551d214f
Merge pull request #7815 from owncloud/ldap_fix_usercount_master
...
correct LDAP user count on setup with many users (occ user:report)
2014-04-16 10:36:19 +02:00
Jenkins for ownCloud
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
Bart Visscher
cc8a4511fe
Fix PHPdoc in lib/public
...
using scrutinizer patch
2014-04-15 22:55:47 +02:00
Bart Visscher
a4b7f5155f
Fix PHPdoc in lib/private
...
using scrutinizer patch
2014-04-15 22:55:20 +02:00
Thomas Müller
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
Thomas Müller
83e8981e24
add link to further discussion about that folder check
2014-04-15 21:39:13 +02:00
Thomas Müller
7f4fefd7ad
Merge pull request #8211 from owncloud/flush-head-master
...
Flush the Buffer Early - right after head
2014-04-15 21:34:22 +02:00
Bart Visscher
bad41c05b8
Fix PHPdoc in user_ldap
...
using scrutinizer patch
2014-04-15 21:05:49 +02:00
Lukas Reschke
8322a9e5c2
Merge pull request #8210 from owncloud/enhance-assets-management-master
...
adding checks and log messages regarding the assets folder
2014-04-15 20:07:07 +02:00
Lukas Reschke
ffab31e3ee
Merge pull request #8197 from owncloud/secure_mimetypes
...
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
blizzz
9de1cc52c0
Merge pull request #8216 from owncloud/usermanager_fix_limitoffset
...
Remove limit and offset manipulation when getting users or groups, be…
2014-04-15 19:14:57 +02:00
Arthur Schiwon
450de0091a
adjust tests accordingly
2014-04-15 17:53:57 +02:00
Arthur Schiwon
64679b2e62
Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint
2014-04-15 17:46:48 +02:00
Thomas Müller
d826f33fae
Merge pull request #8127 from owncloud/searchresults-mobile
...
make search results work on mobile as well
2014-04-15 17:10:01 +02:00
Thomas Müller
242b3e240d
Merge pull request #8209 from owncloud/set-language-explicitly-master
...
Set language explicitly master
2014-04-15 16:57:38 +02:00