Tobia De Koninck
efff7dd2a4
Change key to addressbook-key
2014-04-22 12:46:09 +02:00
Robin Appelman
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
Raghu Nayyar
d56072cf2e
Merge pull request #8255 from owncloud/fix-public-download-button
...
keep long file names in one line to not overflow download button on mobile
2014-04-22 15:44:29 +05:30
Thomas Müller
f353e6f669
Merge pull request #8286 from owncloud/use-proper-jsdoc
...
Use proper JSDoc documentation instead of inconsistent documentation styles
2014-04-22 12:00:25 +02:00
Jan-Christoph Borchardt
e7e87f4d9f
improve upload and download icons
2014-04-22 11:47:01 +02:00
Jan-Christoph Borchardt
378f79b2d9
improve delete and close icons
2014-04-22 11:37:30 +02:00
Jan-Christoph Borchardt
cef795790f
thinner add icon
2014-04-22 11:36:39 +02:00
Thomas Müller
54873c7aae
Merge pull request #8247 from owncloud/l10n-files_trasbin-fix
...
Fix localization issues of files_trashbin
2014-04-22 11:34:49 +02:00
Thomas Müller
5049664285
Merge pull request #8239 from owncloud/directlink-overflow
...
add max-width to directLink input to prevent overflow
2014-04-22 11:23:10 +02:00
Lukas Reschke
381c1c8b6e
Fix typo
...
to => too
2014-04-22 10:43:35 +02:00
Jörn Friedrich Dreyer
4d9ff49f61
Merge pull request #8283 from owncloud/translatable-max-in-upload
...
make max. text translatable
2014-04-22 10:23:08 +02:00
Thomas Müller
29bc82be8d
fixing typos
2014-04-22 09:54:25 +02:00
Thomas Müller
56bc5f8f43
fixing typo
2014-04-22 09:43:29 +02:00
Thomas Müller
54476c468c
fix spelling 'Allow user ...' -> 'Allow users ...'
2014-04-22 09:34:08 +02:00
Jenkins for ownCloud
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
Morris Jobke
0ebb4662ec
Merge pull request #8281 from owncloud/public-responses
...
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
Frank Karlitschek
ee70eb0808
Merge pull request #8287 from owncloud/phpdoc-base
...
Some more PHPDoc fixes
2014-04-21 20:13:45 +02:00
Lukas Reschke
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
Lukas Reschke
51eee3dec1
Fix JSDoc
2014-04-21 14:42:50 +02:00
Lukas Reschke
8fcffae1e2
Reuse selector
2014-04-21 14:28:54 +02:00
Lukas Reschke
539cecbd63
Use proper JSDoc documentation
2014-04-21 13:46:33 +02:00
Jenkins for ownCloud
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
Volkan Gezer
1aa7774178
make max. text translatable
2014-04-21 02:41:33 +02:00
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
Bernhard Posselt
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +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
LEDfan
b78c1373b6
Add key to every contact
2014-04-18 14:30:44 +02:00
Jenkins for ownCloud
d23c4697d0
[tx-robot] updated from transifex
2014-04-18 01:56:04 -04:00
Volkan Gezer
f434c3a213
Fix localization issues of files_trashbin
2014-04-17 21:10:21 +02: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
Jan-Christoph Borchardt
d82a31d121
keep long file names in one line to not overflow download button on mobile
2014-04-17 17:11:28 +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
cbojar
4a541e38e0
Clean up js.js along suggestions from scrutinizer-ci, fixes #8204 .
...
Also used JSHint.com to find a few other issues.
-Strict comparisons (===)
-Fixed regex escaping errors
-Refactored OC.buildQueryString to use jQuery.map
-Missing semicolons
-Braces around if block
Left some of the mixed spaces/tabs as they are for alignment in comments.
2014-04-16 22:51:09 -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