df43ddb902
Merge pull request #3872 from bantu/phpunit-xml-dist
...
Use phpunit.xml.dist instead of phpunit.xml ...
2013-06-27 13:07:42 -07:00
be22d28eb9
Merge pull request #3576 from owncloud/jquery.multiselect-1.13
...
Update to jquery.multiselect 1.13
2013-06-27 07:50:47 -07:00
2269145b4d
gitignore: Fix typo + adjust comment format.
2013-06-27 16:50:17 +02:00
d015b9219c
PHPUnit: Add tests/phpunit.xml to gitignore.
2013-06-27 16:44:55 +02:00
121e4ca395
PHPUnit: Allow developers to use their own custom phpunit.xml file.
...
The order of precedence of configuration files for PHPUnit is:
- phpunit.xml (allowing custom user defined configuration)
- phpunit.xml.dist (configuration distributed with the software)
2013-06-27 16:31:31 +02:00
aa7403500f
Merge pull request #3847 from bantu/phpunit-json-listener-removal
...
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console
2013-06-27 01:55:57 -07:00
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
6fcee1ee11
Merge pull request #3855 from owncloud/fixing-3853-master
...
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js....
2013-06-26 04:42:32 -07:00
e6c1db7a3f
move javascript variables 'oc_current_user' and 'oc_requesttoken' to js.js - fixes #3853
2013-06-26 11:23:21 +02:00
afc3d9314a
[tx-robot] updated from transifex
2013-06-26 02:07:04 +02:00
592bb01ccd
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console.
2013-06-25 21:57:00 +02:00
9c9bfcd626
log as index, not remote
2013-06-25 17:45:42 +03:00
39cca72964
Merge pull request #3750 from owncloud/dummy_session_for_errors
...
Init dummy session to render error pages
2013-06-25 03:34:49 -07:00
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
754bc86ec8
Merge pull request #3826 from owncloud/fix_webdav_locking_for_oracle
...
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 07:37:21 -07:00
3e3b66bd0d
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 16:12:21 +02:00
bca2eb39fa
Merge pull request #3818 from owncloud/update-trigger-cli
...
Add a CLI script for manually triggering checking a folder for updates
2013-06-24 05:49:01 -07:00
993a1f1976
Merge pull request #3822 from owncloud/graceful_teardown_of_cache
...
graceful teardown of cache
2013-06-24 05:46:30 -07:00
4ecca9e97b
graceful teardown of cache
2013-06-24 12:59:56 +02:00
073464af0b
[tx-robot] updated from transifex
2013-06-24 02:11:03 +02:00
909d279e55
Add a CLI script for manually triggering checking a folder for updates
2013-06-23 17:49:38 +02:00
aaecfa18ed
[tx-robot] updated from transifex
2013-06-23 02:05:39 +02:00
52ba86678a
[tx-robot] updated from transifex
2013-06-22 02:11:35 +02:00
d6650a51fe
Merge pull request #3766 from owncloud/fix_display_name_edit
...
Correct new user display name output
2013-06-21 12:45:09 -07:00
65de0a5831
Merge pull request #3810 from owncloud/improve_webdavauth
...
improve error handling of webdavauth
2013-06-21 11:28:00 -07:00
8c21cc64d0
Merge pull request #3811 from owncloud/string_fixes_encryption_settings
...
fix some strings in the admin settings of the encryption app
2013-06-21 09:59:15 -07:00
f40f49851c
fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key'
2013-06-21 14:49:01 +02:00
b0e1259295
improve error handling of webdavauth
2013-06-21 14:39:04 +02:00
76369b7424
encryption is LDAP compatible
2013-06-21 13:08:31 +02:00
d10ad0d603
Squashed commit of the following:
...
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:27:46 2013 +0200
add l10n support
commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 16:19:10 2013 +0200
only init session if openssl extension is loaded
commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:25:40 2013 +0200
first disable app and than show error page
commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:17:34 2013 +0200
typo fixed
commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 12:15:40 2013 +0200
move dependency check to the encryption app
commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jun 20 11:13:11 2013 +0200
make sure that openssl is installed and loaded
2013-06-21 10:37:51 +02:00
8c923a85de
[tx-robot] updated from transifex
2013-06-21 08:53:57 +02:00
59d3c5a575
Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test
...
skip teardown if cache has not been set up
2013-06-20 04:07:33 -07:00
4232ccbc6d
Merge pull request #3792 from owncloud/scanfolder-remove
...
remove deleted files when re-scanning a folder
2013-06-20 04:02:10 -07:00
7a7b54c4a2
skip teardown if cache has not been set up
2013-06-20 11:41:07 +02:00
c41f11a821
Merge pull request #3779 from shkdee/patch-1
...
Update user.php
2013-06-20 02:37:12 -07:00
c4aa3fac7e
Merge pull request #3788 from owncloud/more_error_messages
...
add some more error messages, in case something went wrong
2013-06-20 02:12:01 -07:00
5d0a3f981c
adding unit test for folder remove: testRemovedFolder()
2013-06-20 10:47:37 +02:00
5aaf807366
Merge pull request #3784 from owncloud/rescan-all
...
Give admins the ability to rescan the filesystem for multiple users at once
2013-06-20 01:41:49 -07:00
91c0b81130
add missing backticks
...
guys, please ...
2013-06-20 10:18:29 +02:00
c1a3f015c9
Merge branch 'rescan-all' into scanfolder-remove
2013-06-20 08:17:31 +02:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
fe61230cc1
always have a defined return value
2013-06-19 16:55:31 +02:00
e3171a701d
Merge pull request #3783 from owncloud/improved_wording
...
fixed enghlish sentence
2013-06-19 07:06:04 -07:00
e2e370f199
some more error messages
2013-06-19 15:58:34 +02:00
83d98e2d8b
add some more error messages, in case something went wrong
2013-06-19 15:52:33 +02:00
6778a45d45
use json to encode user list
2013-06-19 15:02:18 +02:00
cb41b88520
Merge pull request #3764 from owncloud/scanfolder-existing
...
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
99008ace36
fixed enghlish sentence, thanks to @MTGap
2013-06-19 12:05:45 +02:00
8406d3f7b1
also use the default theme if the theme is set to an empty string in the config.php
2013-06-19 11:58:29 +02:00
Jörn Friedrich Dreyer
Thomas Tanghus
Andreas Fischer
Thomas Müller
VicDeo
Robin Appelman
Lukas Reschke
Björn Schießle
Georg Ehrke
blizzz
Björn Schießle
Michael Gapczynski
icewind1991