Björn Schießle
|
710e9c2d14
|
fix tests, after unused variables are removed
|
2013-05-27 15:34:57 +02:00 |
Björn Schießle
|
1a3f7891ea
|
remove unused varaibles
|
2013-05-27 15:31:26 +02:00 |
Georg Ehrke
|
d408cd7f37
|
fix https://github.com/owncloud/core/issues/3320
|
2013-05-27 15:24:37 +02:00 |
Florin Peter
|
80433fc4c4
|
Merge branch 'master' into file_encryption_util_is_error
Conflicts:
apps/files_encryption/lib/util.php
|
2013-05-27 14:41:53 +02:00 |
Björn Schießle
|
5e243b48bb
|
Merge pull request #3481 from owncloud/firsttime_enc
fix first time encryption after app was enabled
|
2013-05-27 05:17:31 -07:00 |
FlorinPeter
|
d878926256
|
Merge pull request #3496 from owncloud/file_encryption_tests
improved tests for files_encryption
|
2013-05-27 05:15:21 -07:00 |
Florin Peter
|
8cf827ee9d
|
Merge branch 'master' into file_encryption_tests
|
2013-05-27 12:54:33 +02:00 |
Florin Peter
|
89f0c8f39d
|
added check by numRows()
changed to public api where it was possible
reformat code to comply with the coding guidelines
|
2013-05-27 12:41:55 +02:00 |
Georg Ehrke
|
62411965f9
|
make svg preview backend work with encryption
|
2013-05-27 11:09:55 +02:00 |
Georg Ehrke
|
f78e002096
|
make image preview backend work with encryption
|
2013-05-27 10:45:21 +02:00 |
Jenkins for ownCloud
|
73e0b4c10a
|
[tx-robot] updated from transifex
|
2013-05-27 02:07:24 +02:00 |
Florin Peter
|
9dd277576a
|
added users for tests
reformat code to meet coding guidelines
|
2013-05-26 20:44:15 +02:00 |
Florin Peter
|
c7981abbc9
|
improved test
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
|
2013-05-26 03:22:16 +02:00 |
Jenkins for ownCloud
|
0c621ff6a9
|
[tx-robot] updated from transifex
|
2013-05-26 02:03:54 +02:00 |
Florin Peter
|
788c5940f0
|
fixed error rising from fetchRow
|
2013-05-25 23:20:55 +02:00 |
Florin Peter
|
9a6cd89a69
|
added OC_DB::isError and logging
|
2013-05-25 21:33:05 +02:00 |
Florin Peter
|
adcafbde34
|
Merge branch 'master' into fix_for_2377
|
2013-05-25 20:37:28 +02:00 |
Florin Peter
|
4eddef1556
|
improved tests to check if database layer normalize folder names
|
2013-05-25 20:36:51 +02:00 |
Florin Peter
|
505a300776
|
we should also normalize on update and search because the database layer will not do this for us
|
2013-05-25 20:35:12 +02:00 |
Michael Gapczynski
|
dbb6a10364
|
Merge pull request #3478 from davidak/master
small typo fix: added 2 whitespaces
|
2013-05-25 11:21:21 -07:00 |
Michael Gapczynski
|
0fdf3a7e63
|
Merge pull request #3388 from roha4000/master
Duplicate DB entries in filecache table when renaming folder in WebUI #2
|
2013-05-25 11:18:20 -07:00 |
Michael Gapczynski
|
c870aed1b6
|
Merge pull request #3493 from owncloud/bumpversion
Bump version for files_encryption changes
|
2013-05-25 10:20:42 -07:00 |
Michael Gapczynski
|
2893bb9543
|
Bump version for files_encryption changes
|
2013-05-25 11:42:28 -04:00 |
Michael Gapczynski
|
0a29d2029a
|
Clear opcode caches after writing to the config file, fixes #3372
|
2013-05-25 11:25:43 -04:00 |
Florin Peter
|
c245f5a99f
|
added more places where normalization is needed
|
2013-05-25 14:56:00 +02:00 |
Florin Peter
|
f6bf9de6de
|
prevent for returning while false normalize string
|
2013-05-25 14:54:36 +02:00 |
Georg Ehrke
|
af57996d1e
|
Merge branch 'master' into oc_preview
|
2013-05-25 12:16:25 +02:00 |
Frank Karlitschek
|
29c8cbf4d1
|
increase version and add warning
|
2013-05-25 12:08:18 +02:00 |
Georg Ehrke
|
1bed3253ab
|
add sample config for previews
|
2013-05-25 11:05:37 +02:00 |
Arthur Schiwon
|
86d72b9a61
|
LDAP: fix possible recursion
|
2013-05-25 11:03:58 +02:00 |
Arthur Schiwon
|
bfa715768a
|
LDAP: fix handling when LDAP Host is offline
|
2013-05-25 11:02:51 +02:00 |
zafi
|
f314eb8f72
|
The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD
so it should only be visible for users with a supporting backend.
|
2013-05-25 09:03:07 +02:00 |
Thomas Tanghus
|
e66f609a64
|
Hack base.php to make Basic Auth work
|
2013-05-25 05:51:51 +03:00 |
Jenkins for ownCloud
|
6a6c18dfab
|
[tx-robot] updated from transifex
|
2013-05-25 02:11:52 +02:00 |
Florin Peter
|
fba7200b05
|
improved trashbin test again
|
2013-05-24 23:12:16 +02:00 |
Florin Peter
|
b32823a96e
|
improved trashbin test
|
2013-05-24 23:12:07 +02:00 |
Thomas Mueller
|
d1939a1c38
|
submodule 3rdparty updated
|
2013-05-24 21:54:47 +02:00 |
Thomas Mueller
|
1f9ac7850d
|
meanwhile phpunit is seq faulting with mysql as well
|
2013-05-24 21:50:34 +02:00 |
Bart Visscher
|
d12e44f96a
|
Merge branch 'master' into doctrine
Conflicts:
lib/MDB2/Driver/sqlite3.php
lib/base.php
lib/db.php
|
2013-05-24 21:46:42 +02:00 |
Florin Peter
|
946e9ccc0a
|
Merge branch 'master' into fix_for_2377
|
2013-05-24 20:54:13 +02:00 |
Florin Peter
|
5076c0d392
|
changed tests for using new normalizer
|
2013-05-24 20:37:11 +02:00 |
Florin Peter
|
736f10039d
|
changed builtin normalizer to \OC_Util::normalizeUnicode
|
2013-05-24 20:36:20 +02:00 |
Florin Peter
|
661b5501b0
|
added normalizeUnicode() method to OC_Util
|
2013-05-24 20:35:01 +02:00 |
Thomas Müller
|
ae9adcaf8c
|
Merge pull request #3482 from owncloud/fix_helper
use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 10:20:00 -07:00 |
Björn Schießle
|
f56802a437
|
no use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 18:37:58 +02:00 |
Thomas Mueller
|
26c91bfbc2
|
adding Oracle support to autotest.sh
|
2013-05-24 17:46:29 +02:00 |
Björn Schießle
|
5ce4149e75
|
fix first time encryption after app was enabled
|
2013-05-24 17:35:00 +02:00 |
Thomas Müller
|
39603b193b
|
Merge pull request #3479 from owncloud/testing-oracle-on-master
adding Oracle support to autotest.sh
|
2013-05-24 07:32:54 -07:00 |
Thomas Mueller
|
a753d14de9
|
adding Oracle support to autotest.sh
|
2013-05-24 15:19:13 +02:00 |
davidak
|
56006ea852
|
small typo fix: added 2 whitespaces
|
2013-05-24 14:31:06 +02:00 |