7cfb0dc406
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
2013-06-13 13:17:35 +07:00
dd8011925a
Merge pull request #3552 from owncloud/files_encryption_upgrade_fix
...
Fix files_encryption app upgrade from 4.5 to 5.0
2013-06-13 03:54:19 +07:00
bc2862fcb9
Merge branch 'master' into files_encryption_upgrade_fix
2013-06-13 12:53:29 +07:00
54f3174665
Merge pull request #3640 from infoneo/master
...
Folders with multiple periods problem fix
2013-06-13 03:34:36 +07:00
2b179ccff0
Merge pull request #3668 from owncloud/encryption_migrate_only_once
...
make sure that only one process can enter the migration mode
2013-06-13 03:31:31 +07:00
fd5042cc46
Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix
2013-06-13 10:49:23 +07:00
a178de8501
Merge pull request #3677 from owncloud/apps-buttons
...
remove App management top bar and move buttons more contextually in the interface
2013-06-13 01:44:48 +07:00
2f1005f05f
LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed
2013-06-13 10:44:05 +07:00
6394fedb33
add comment to explain the helper function
2013-06-13 10:35:30 +07:00
77944cf7b8
fix typo in var name
2013-06-13 10:11:23 +07:00
c989e32adc
[tx-robot] updated from transifex
2013-06-13 02:20:23 +07:00
2daec351d4
update submodule
2013-06-12 23:21:24 +07:00
27fcdb3af5
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/tests/crypt.php
2013-06-12 20:53:45 +07:00
3584d48d65
Merge pull request #3679 from owncloud/multiselect-fixes
...
Multiselect fixes
2013-06-12 09:52:15 +07:00
2df8468b2f
Revert "FIX: Download of files named "true" or "false" impossible"
...
This reverts commit d2d71c8797
2013-06-12 18:30:28 +07:00
06808eddf3
Merge pull request #3676 from owncloud/move-storage-bar
...
move storage bar below clients showcase to make it more visible
2013-06-12 09:02:16 +07:00
d2d71c8797
FIX: Download of files named "true" or "false" impossible
...
It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.
Hotfix provided by Herbert Pophal
2013-06-12 17:25:21 +07:00
4cafe21aa4
apps management: change misleading + to ...
2013-06-12 14:49:23 +07:00
df78085171
adapt test to the code changes
2013-06-12 14:00:53 +07:00
c0568e0443
remove App management top bar and move buttons more contextually in the interface
2013-06-12 13:36:17 +07:00
a39ecd5ea9
Merge pull request #3681 from owncloud/fix_ajax_removeuser.php
...
Init language object before using it
2013-06-12 04:23:52 +07:00
1abce78cb8
Merge pull request #3654 from owncloud/clean_up_exceptions
...
Introduce more robust SQL execution and exception handling
2013-06-12 04:13:12 +07:00
a2d3c030fb
every test now has 15min to execute
...
we don't want to check performance just yet. we just want to make jenkins end more reliably.
2013-06-12 13:58:25 +07:00
40e74b5907
Merge pull request #3682 from owncloud/disable_proxys_on_sslcert_upload
...
disable proxys during ssl root cert upload to avoid encryption
2013-06-12 03:55:10 +07:00
c78a90fd54
use number of manipulated rows as idicator if it was possible to enter the migration mode
2013-06-12 12:21:11 +07:00
519508736d
disable proxys during ssl root cert upload to avoid encryption
2013-06-12 10:37:09 +07:00
de5eed4fb0
Merge branch 'master' of github.com:owncloud/core
2013-06-12 10:31:39 +07:00
506c9de5cd
backport of 1fa76e53dc
2013-06-12 10:30:54 +07:00
a2fa91fdd5
init language object before using it
2013-06-12 09:40:13 +07:00
aab3b7d8ea
[tx-robot] updated from transifex
2013-06-12 03:05:58 +07:00
d2773982d5
Merge pull request #3672 from owncloud/files-contrast
...
Contrast fixes
2013-06-11 11:11:55 +07:00
cdedfb6f37
multiselect: up min-width of group multiselect to 150px
2013-06-11 18:23:29 +07:00
0bcb04398d
multiselect: fixed 'add group' interface a bit
2013-06-11 18:21:13 +07:00
686797eb6d
multiselect: more breathing space for entries
2013-06-11 18:08:47 +07:00
27996d1c64
multiselect: drop shadow for better focus
2013-06-11 18:04:33 +07:00
35e7b64cc2
multiselect: do not cut off group names
2013-06-11 18:04:11 +07:00
e6a4721f64
checkstyle: add space after colon
2013-06-11 18:02:52 +07:00
09ff9b2a2c
remove leading spaces
2013-06-11 18:01:50 +07:00
b014509f41
move storage bar below clients showcase to make it more visible
2013-06-11 16:05:02 +07:00
51f8aa90d1
Merge pull request #3675 from owncloud/allow_autotest_to_run_10x
...
allow autotest to run 10x times longer
2013-06-11 06:59:57 +07:00
48b5e3d498
allow autotest to run 10x times longer
2013-06-11 15:57:00 +07:00
0eed1c980d
Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
...
fix fetchRow checks to also work with MDB2
2013-06-11 06:20:27 +07:00
20ddd6e1c7
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
apps/files_encryption/tests/crypt.php
2013-06-11 15:19:02 +07:00
db6080c5c6
Merge pull request #3673 from owncloud/gitignore-apps2
...
gitignore apps2 folder as well
2013-06-11 06:10:25 +07:00
ab79480dc6
gitignore apps2 folder as well
2013-06-11 14:57:06 +07:00
abfbd9b136
feedback for hover/tap on breadcrumbs
2013-06-11 14:51:29 +07:00
651f1b0995
better contrast and grouping for blocks in personal settings through darker background color
2013-06-11 14:51:06 +07:00
2a936670ce
better contrast for controls bar
2013-06-11 14:50:23 +07:00
5d4ff0e537
better contrast for files list, darker greys for selection and hover
2013-06-11 14:49:34 +07:00
e238eeef6f
Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
...
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-11 05:34:55 +07:00
Björn Schießle
Björn Schießle
Thomas Müller
Jan-Christoph Borchardt
Florin Peter
Thomas Tanghus
Roland Hager
Frank Karlitschek
Morris Jobke
Jörn Friedrich Dreyer
Georg Ehrke