7889f2ef5c
Merge pull request #3687 from owncloud/template_updates
...
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
15eda53215
improved footer
2013-06-13 16:10:33 +02:00
4bafa4e81a
Merge pull request #3558 from owncloud/files_encryption_check_private_key
...
check if the decrypted private key is valid on login and on read/write files
2013-06-13 04:18:32 -07:00
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 +02:00
31f7afe56a
PDOException has no previous(), oh the consistency ...
2013-06-13 13:14:00 +02: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 +02: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 +02: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 +02:00
6394fedb33
add comment to explain the helper function
2013-06-13 10:35:30 +02:00
77944cf7b8
fix typo in var name
2013-06-13 10:11:23 +02:00
c989e32adc
[tx-robot] updated from transifex
2013-06-13 02:20:23 +02:00
84a8aea410
restore Updater functionality on non-Windows platforms
2013-06-13 00:09:52 +02:00
2daec351d4
update submodule
2013-06-12 23:21:24 +02:00
54f9477f34
fix another double wrapped array
2013-06-12 23:01:52 +02:00
86fe30bd4c
TL;DR and remove link from "Report issue here"
2013-06-12 21:58:19 +02:00
2a3887a5d7
Add tests for the updater with mount points
2013-06-12 15:32:00 -04:00
6d55a062be
remove additional array wrapping
2013-06-12 21:23:34 +02:00
27fcdb3af5
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/tests/crypt.php
2013-06-12 20:53:45 +02:00
d3eadcde56
use executeAudited in files cache
2013-06-12 20:11:53 +02: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 +02: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
63472aed3f
Merge branch 'template_updates' of github.com:owncloud/core into template_updates
2013-06-12 17:26:38 +02: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 +02:00
2141c41d0d
add logo-claim
2013-06-12 17:20:09 +02:00
2e1836c1da
don't show translation hints in enterprise edition
2013-06-12 17:07:43 +02:00
f565e4c25b
move common settings footer fieldset out of conditional
2013-06-12 16:59:23 +02:00
7a575cc2d7
short explanation about OC_Defaults
2013-06-12 16:33:09 +02:00
7273f38af6
make pub link share footer aware of different owncloud editions
2013-06-12 16:28:47 +02:00
839bce80c6
make main menu aware of the different owncloud editions
2013-06-12 16:20:23 +02:00
5c6a854489
add default doc url
2013-06-12 16:19:28 +02:00
f7dc07602b
minor cleanup for exception handling
2013-06-12 15:48:22 +02:00
e1e798c623
make footer and urls aware of ownCloud editions
2013-06-12 15:44:11 +02:00
b29e01d5cf
keep all strings in one place to make it easier to change them
2013-06-12 15:15:08 +02:00
918906f042
make footer aware of ownCloud editions
2013-06-12 14:49:30 +02:00
4cafe21aa4
apps management: change misleading + to ...
2013-06-12 14:49:23 +02:00
e33f68ecb6
Correct escaping
2013-06-12 14:36:28 +02:00
edc255421c
Try connection with specified db when postgres does not work
...
Conflicts:
lib/setup.php
2013-06-12 14:36:07 +02:00
7c108edc36
mage page title aware of ownCloud edition
2013-06-12 14:33:24 +02:00
df78085171
adapt test to the code changes
2013-06-12 14:00:53 +02:00
c0568e0443
remove App management top bar and move buttons more contextually in the interface
2013-06-12 13:36:17 +02: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 +03: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 +02:00
Björn Schießle
Björn Schießle
Jörn Friedrich Dreyer
Thomas Müller
Jan-Christoph Borchardt
Florin Peter
Morris Jobke
Michael Gapczynski
Thomas Tanghus
Roland Hager
Frank Karlitschek
eMerzh