blizzz
8f7676c762
Merge pull request #10340 from owncloud/fix-9887
...
better check whether string resembles a DN, fixes #9887
2014-08-18 19:24:41 +02:00
Vincent Petry
a820df71ee
Merge pull request #10339 from owncloud/users-defaultquotafix
...
Fixed default quota field on user management page
2014-08-18 18:50:43 +02:00
Morris Jobke
5f389bb334
Merge pull request #10493 from owncloud/design-warning-link
...
fix color of links in warnings, fix #10480
2014-08-18 17:17:58 +02:00
Arthur Schiwon
97fd39e983
unify tests
2014-08-18 16:55:08 +02:00
Clark Tomlinson
8c35afd097
Merge pull request #10491 from helix84/fix-typo
...
fix typo in util.php
2014-08-18 10:47:56 -04:00
Jan-Christoph Borchardt
58cb0697d6
fix color of links in warnings, fix #10480
2014-08-18 16:40:32 +02:00
Joas Schilling
1b81cc1acd
Merge pull request #10478 from owncloud/issue/9995
...
Add a note about overwritewebroot when using system cron
2014-08-18 16:31:13 +02:00
helix84
722a119e46
fix typo in util.php
2014-08-18 15:59:36 +02:00
Morris Jobke
ce64d07ec7
Merge pull request #10488 from owncloud/upgrade-clinotice
...
Added upgrade notice to avoid timeouts
2014-08-18 15:44:02 +02:00
Vincent Petry
8995e88e6f
Added upgrade notice to avoid timeouts
2014-08-18 15:05:55 +02:00
Joas Schilling
64d64610d2
Add a note about overwritewebroot when using system cron
...
If the current webroot is non-empty but the webroot from the config is,
and system cron is used, the URL generator fails to build valid URLs.
So we notify the admin to set it up correctly.
Fix #9995
2014-08-18 11:10:22 +02:00
Thomas Müller
62e06cb0ba
Merge pull request #10472 from owncloud/fix_undefined_index_ocsid
...
check if array index ocsid is set before accessing it
2014-08-18 10:43:21 +02:00
Thomas Müller
c933848c55
Merge pull request #10156 from owncloud/issue/9968
...
Check return of fopen() before using it
2014-08-18 10:35:04 +02:00
Jenkins for ownCloud
4dd07f572c
[tx-robot] updated from transifex
2014-08-18 01:56:30 -04:00
Frank Karlitschek
ddeb301ad6
Merge pull request #10456 from kroimon/skeleton_dir_config
...
Make skeleton directory configurable.
2014-08-17 20:01:02 -04:00
Morris Jobke
942d09030e
Merge pull request #10471 from owncloud/fix-db-mapper-update
...
according to PHPDoc this function shall return the entity
2014-08-18 00:19:58 +02:00
Thomas Müller
c08a1e6455
according to PHPDoc this function shall return the entity
2014-08-17 22:27:55 +02:00
Georg Ehrke
7347174636
check if array index ocsid is set before accessing it
2014-08-17 22:26:14 +02:00
Thomas Müller
4c79d34980
Merge pull request #10469 from owncloud/remove-xmailer-header
...
Remove X-Mailer header from mails
2014-08-17 21:46:11 +02:00
Lukas Reschke
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Lukas Reschke
a2677c14c8
Remove X-Mailer header from mails
2014-08-17 18:55:13 +02:00
Jenkins for ownCloud
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
Lukas Reschke
283b99a42d
Merge pull request #10276 from owncloud/skip-webdavput
...
skip WebdavTest of encryption
2014-08-16 10:32:04 +02:00
Morris Jobke
5498186333
Merge pull request #10447 from owncloud/share-foldericonfix
...
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
Jenkins for ownCloud
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00
Stefan Rado
ccc46be740
Make skeleton directory configurable.
2014-08-16 01:07:42 +02:00
Lukas Reschke
c1272871a5
Merge pull request #10413 from owncloud/adding-handlebars
...
Adding handlebars.js
2014-08-15 23:10:11 +02:00
Lukas Reschke
8d112ff61f
Merge pull request #10449 from owncloud/share-clientsidesortnoservercall
...
Client side sort for sharing overview
2014-08-15 21:25:30 +02:00
Thomas Müller
2e551d645f
Merge pull request #10452 from owncloud/betterssl
...
We'd better use SSL in capital
2014-08-15 21:23:41 +02:00
Volkan Gezer
3da69ed7d0
ssl capital
2014-08-15 20:41:40 +02:00
Vincent Petry
3a99f15af2
Client side sort for sharing overview
...
Since the server doesn't support sorting, use client side sort directly
instead of calling reload() first.
2014-08-15 16:52:41 +02:00
Lukas Reschke
a822a31ce3
Merge pull request #10442 from owncloud/move-failed-logins
...
Move authentication failed logging to checkPassword
2014-08-15 16:50:28 +02:00
Vincent Petry
607ea636be
Fixed folder icon update routine when share owner exists
...
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Bjoern Schiessle
5a2fef4309
login as user1 before performing a test
2014-08-15 15:48:44 +02:00
Clark Tomlinson
1fff77f5de
Merge pull request #10440 from owncloud/enforce-debug
...
Remove ability to trigger DEBUG mode via cookie
2014-08-15 09:03:29 -04:00
Lukas Reschke
98fc56831d
Merge pull request #9275 from NormalRa/master
...
Add .apk mimetype.
2014-08-15 14:41:53 +02:00
Lukas Reschke
a82cd1ff67
Fix unit test
2014-08-15 14:15:27 +02:00
Morris Jobke
a6fff70a7c
Merge pull request #10439 from owncloud/design-fix-contrast
...
change error text color to white for better contrast, fix #10424
2014-08-15 13:26:10 +02:00
Vincent Petry
3c7fbbef22
Do not close container/slider when clicking on single select field
2014-08-15 12:44:00 +02:00
Lukas Reschke
5bb4772858
Move authentication failed logging to checkPassword
...
Fixes https://github.com/owncloud/core/issues/10366
2014-08-15 12:13:00 +02:00
Lukas Reschke
a4a897d26d
Remove ability to trigger DEBUG mode via cookie
...
Users should not be able to enable debug mode on their own by setting a cookie. Using debug mode might leak too much information about the environment or have other unexpected behaviour.
We should backport this.
2014-08-15 11:21:56 +02:00
Jan-Christoph Borchardt
61c788f9dc
change error text color to white for better contrast, fix #10424
2014-08-15 10:52:45 +02:00
Jenkins for ownCloud
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
Morris Jobke
e4595311b4
Merge pull request #10434 from owncloud/update_deprecation_doc
...
add missing @deprecated annotation to legacy classes
2014-08-15 01:23:07 +02:00
Jan-Christoph Borchardt
f6a6f8541a
Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_file
...
Compare upload limit against biggest file
2014-08-14 23:24:18 +02:00
Jörn Friedrich Dreyer
799fb46927
add missing @deprecated annotation to legacy classes
2014-08-14 22:18:12 +02:00
Thomas Müller
c1102b1671
Merge pull request #10417 from owncloud/update_deprecation_doc
...
update deprecation docs
2014-08-14 17:54:23 +02:00
Björn Schießle
64c3fe670c
Merge pull request #10399 from owncloud/fix_setSendMailStatus
...
[sharing] fix mail notification
2014-08-14 17:45:39 +02:00
Robin Appelman
a645da3640
Merge pull request #10398 from owncloud/external-share-ssl-warn
...
Give a better error message for external shares with self-signed ssl certificates
2014-08-14 16:10:29 +02:00
Clark Tomlinson
4502eaf9f8
Merge pull request #10414 from owncloud/relax-code-checker
...
in order to prevent false-positives on the code checker - exec and eval ...
2014-08-14 09:35:20 -04:00