Commit graph

4171 commits

Author SHA1 Message Date
Morris Jobke
49d6186714 Add min-height to login page for IE8 and IE9 2015-06-03 10:22:57 +02:00
Morris Jobke
99c6f96c69 Revert "fix theme in IE8 and IE9"
This reverts commit a4c9688711.
2015-06-03 10:20:29 +02:00
Jenkins for ownCloud
410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Morris Jobke
d2f3710ede Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview
Get a 96x96 preview for file conflict resolution
2015-06-02 09:36:51 +02:00
Jenkins for ownCloud
baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Tom Needham
2bf9219be3 Fix grammar of search results phrase 2015-06-01 12:29:12 +01:00
Thomas Müller
b522baaaa6 Merge pull request #16650 from owncloud/fix-sqlite-only-setup
[setup] Disable buttons only in the case they are present
2015-06-01 12:11:49 +02:00
Morris Jobke
b521109881 [setup] Disable buttons only in the case they are present
* fixes #16648
2015-06-01 11:01:42 +02:00
Jenkins for ownCloud
8d23b34402 [tx-robot] updated from transifex 2015-05-31 01:54:44 -04:00
Olivier Paroz
f05ac47eb6 Escape single quotes 2015-05-29 18:34:38 +02:00
Olivier Paroz
6aeaa6954b Fix for parenthesis 2015-05-29 17:49:26 +02:00
Olivier Paroz
4e364311f1 Get a 96x96 preview for file conflict resolution 2015-05-29 13:49:51 +02:00
Thomas Müller
c700f42b68 Merge pull request #16517 from owncloud/remove-logo-wide
replace logo-wide on share page as well with better icon + text
2015-05-29 12:15:02 +02:00
Jenkins for ownCloud
fff0fb66d6 [tx-robot] updated from transifex 2015-05-29 01:56:13 -04:00
Morris Jobke
7b50eb05f3 Merge pull request #16380 from rullzer/fix_16281
Properly format recipients
2015-05-28 20:34:04 +02:00
Jenkins for ownCloud
1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Morris Jobke
7385b5dad9 Merge pull request #16417 from owncloud/master-16415
fix theme in IE8 and IE9
2015-05-27 16:41:13 +02:00
Roeland Jago Douma
bf491183c1 Properly format remote recipients
* A list of recipients can now be properly formatted with remote shares.
Before the shares where simply shown in full in the "Shared with others"
section.
* Unit tests updated and added
2015-05-27 16:22:34 +02:00
Jenkins for ownCloud
fda0995e4c [tx-robot] updated from transifex 2015-05-27 01:55:34 -04:00
Björn Schießle
9366dde875 Merge pull request #15985 from owncloud/hotfix/fix-encryption-references
[enc2] fix references to legacy encryption app name
2015-05-26 17:28:27 +02:00
Thomas Müller
07c6e523b1 Merge pull request #16565 from owncloud/add-urandom-check
Add check for availability of /dev/urandom
2015-05-26 16:53:11 +02:00
Lukas Reschke
bc6d17ed74 Add check for availability of /dev/urandom
Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system:

1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop
2. MTRand: chr((mt_rand() ^ mt_rand()) % 256)
3. Rand: chr((rand() ^ rand()) % 256)
4. UniqId: Plain uniqid()

An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour.

One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface.

Thanks to David Black from d1b.org for bringing this again to our attention.
2015-05-26 14:16:07 +02:00
Vincent Petry
d7c18b04bd Merge pull request #16521 from owncloud/unbold-placeholder-image
use normal font weight instead of bold for image placeholders
2015-05-26 12:55:05 +02:00
Vincent Petry
7b10e7b747 Merge pull request #16520 from owncloud/fix-float-spinner-position
fix float spinner position
2015-05-26 12:13:15 +02:00
Jenkins for ownCloud
6198fb20cb [tx-robot] updated from transifex 2015-05-26 01:54:57 -04:00
Jenkins for ownCloud
fe610a65d3 [tx-robot] updated from transifex 2015-05-25 01:55:06 -04:00
Jenkins for ownCloud
06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Roeland Jago Douma
914c74ea9b Unit tests for #16511
Make sure that password is updated on focusout of the password field or
on pressing enter in the password field.
2015-05-22 15:09:21 +02:00
Jan-Christoph Borchardt
79c5790a72 use normal font weight instead of bold for image placeholders 2015-05-22 03:26:30 +02:00
Jan-Christoph Borchardt
6bba345f34 fix float spinner position 2015-05-22 02:30:55 +02:00
Jan-Christoph Borchardt
2fccfbe278 also replace logo-mail with new look 2015-05-22 00:35:12 +02:00
Jan-Christoph Borchardt
78a0464354 replace logo-wide on share page as well with better icon + text 2015-05-22 00:04:47 +02:00
Joas Schilling
896130b68d Merge pull request #16473 from owncloud/occ_16221
occ option to update all third party apps without disable
2015-05-21 09:47:54 +02:00
Jenkins for ownCloud
42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Steffen Lindner
48040c46cb Skip disable3rdParty Apps 2015-05-20 17:06:00 +02:00
Jenkins for ownCloud
c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-19 11:23:06 +00:00
Thomas Müller
54a6ba47c0 Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith
Remove hard coded limit of 15 from getShareWith
2015-05-19 12:40:37 +02:00
Morris Jobke
176b9674d2 Add hint about additional PHP database modules
* fixes #16391
2015-05-18 22:59:35 +02:00
Morris Jobke
a4c9688711 fix theme in IE8 and IE9 2015-05-18 16:04:33 +02:00
Clark Tomlinson
a0c6c01137 fix references to legacy encryption app name 2015-05-18 09:45:41 -04:00
Vincent Petry
d15471abd4 Merge pull request #15738 from rullzer/fix_15611
Fix to make sure expiration date is properly set
2015-05-18 11:26:12 +02:00
Roeland Jago Douma
b090a32d23 Reset share dialog values so we start out clean
* Unit test
2015-05-18 10:08:09 +02:00
Roeland Jago Douma
efd6fec57d Fix to make sure expiration date is properly set
This did not happen correctly when the password was enforced since a
different code path was taken.

* moved generation of the default date string to separate function
* added unit test
2015-05-18 09:35:47 +02:00
Thomas Müller
2cafbc803a Merge pull request #16242 from owncloud/use-oc-webroot
Use OC.webroot instead of calculating the URL
2015-05-15 18:10:18 +02:00
Craig Morrissey
ca341a8d59 add support for limit request parameter to getShareWith 2015-05-15 18:03:18 +02:00
Jenkins for ownCloud
49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Jenkins for ownCloud
1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Lukas Reschke
e753e8cc37 Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-apps
Add info message for upgrade of an 3rdparty app
2015-05-13 08:32:42 +02:00
Jenkins for ownCloud
504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00