Morris Jobke
57746ffed4
Update music repo
2014-08-20 09:50:00 +02:00
Morris Jobke
e3c0db1026
Merge pull request #10534 from owncloud/autotest-cleanuponinterrupt
...
Restore autotest config on SIGINT or SIGTERM
2014-08-20 09:45:07 +02:00
Jenkins for ownCloud
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00
Vincent Petry
6ed174d0e4
Restore autotest config on SIGINT or SIGTERM
...
When hitting Ctrl+C to interrupt unit test running, the old
configuration was not restored properly.
This fix traps the signal to properly restore the configuration after an
interruption.
2014-08-19 22:46:24 +02:00
Clark Tomlinson
5ddea98df2
Merge pull request #10525 from owncloud/remove-download-message
...
remove obsolete 'Download preparing' message for zip downloads, fix #3755
2014-08-19 14:17:15 -04:00
Morris Jobke
71601d7ade
Merge pull request #10523 from owncloud/fix-shared-multiselect
...
fix multiselect bar offset on shared page
2014-08-19 17:11:45 +02:00
Jan-Christoph Borchardt
e713e97df5
remove obsolete 'Download preparing' message for zip downloads, fix #3755
2014-08-19 16:44:28 +02:00
Jan-Christoph Borchardt
3d8031564e
fix multiselect bar offset on shared page
2014-08-19 15:51:10 +02:00
Robin Appelman
fdfc5c67f8
Merge pull request #9866 from owncloud/app-upgrade
...
Don't do app upgrades in the background
2014-08-19 13:33:38 +02:00
Lukas Reschke
fdb203ff1e
Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinking
...
Add a copied_sample_config switch
2014-08-19 11:03:57 +02:00
Morris Jobke
43266526e8
Merge pull request #10500 from owncloud/fix_userlist_settings_ajax
...
properly encode groups as json, not ',' separated
2014-08-19 10:36:10 +02:00
Björn Schießle
19610157d3
Merge pull request #10425 from owncloud/set_default_share_folder
...
Set default share folder
2014-08-19 10:21:21 +02:00
Björn Schießle
312ed53307
Merge pull request #10494 from owncloud/fix_upload_to_public_folder
...
set incognitoMode to true during upload to a public folder
2014-08-19 10:13:38 +02:00
Thomas Müller
1c23f54d42
Merge pull request #10341 from owncloud/issue/9928
...
[Issue/9928] Problems with filemtime in MappedLocal Storage
2014-08-19 10:10:09 +02:00
Lukas Reschke
c33d1cacd4
Add a copied_sample_config switch
...
Hopefully this will stop people from copying the sample config. I'm so annoyed by all those wrong bug reports...
Add some explanation about this switch
Move check to init
2014-08-19 09:57:03 +02:00
Morris Jobke
df963b3ccf
Merge pull request #10492 from owncloud/hidesharesectionswhendisabled
...
Hide sharing sections in files app when sharing API is disabled
2014-08-19 08:53:19 +02:00
Jenkins for ownCloud
77cfddff0f
[tx-robot] updated from transifex
2014-08-19 01:57:09 -04:00
Jörn Friedrich Dreyer
a1e8dd14a1
properly encode groups as json, not ',' separated
2014-08-18 19:47:50 +02:00
blizzz
8f7676c762
Merge pull request #10340 from owncloud/fix-9887
...
better check whether string resembles a DN, fixes #9887
2014-08-18 19:24:41 +02:00
Vincent Petry
a820df71ee
Merge pull request #10339 from owncloud/users-defaultquotafix
...
Fixed default quota field on user management page
2014-08-18 18:50:43 +02:00
Morris Jobke
5f389bb334
Merge pull request #10493 from owncloud/design-warning-link
...
fix color of links in warnings, fix #10480
2014-08-18 17:17:58 +02:00
Arthur Schiwon
97fd39e983
unify tests
2014-08-18 16:55:08 +02:00
Lukas Reschke
594078e22f
Fix copyright
2014-08-18 16:52:48 +02:00
Bjoern Schiessle
193a0b1a17
fix broken unit tests
2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c25915cde4
update unit tests with configurable share folder
2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c9903f2e68
make share folder configurable
2014-08-18 16:52:48 +02:00
Clark Tomlinson
8c35afd097
Merge pull request #10491 from helix84/fix-typo
...
fix typo in util.php
2014-08-18 10:47:56 -04:00
Jan-Christoph Borchardt
58cb0697d6
fix color of links in warnings, fix #10480
2014-08-18 16:40:32 +02:00
Bjoern Schiessle
043cd1d02b
set incognitoMode to true, getUser should always return false during public upload
2014-08-18 16:39:25 +02:00
Vincent Petry
1de5ae8845
Hide sharing sections in files app when sharing API is disabled
2014-08-18 16:33:29 +02:00
Joas Schilling
1b81cc1acd
Merge pull request #10478 from owncloud/issue/9995
...
Add a note about overwritewebroot when using system cron
2014-08-18 16:31:13 +02:00
helix84
722a119e46
fix typo in util.php
2014-08-18 15:59:36 +02:00
Morris Jobke
ce64d07ec7
Merge pull request #10488 from owncloud/upgrade-clinotice
...
Added upgrade notice to avoid timeouts
2014-08-18 15:44:02 +02:00
Robin Appelman
ab590ce9a0
fix undefined variable
2014-08-18 15:30:46 +02:00
Vincent Petry
8995e88e6f
Added upgrade notice to avoid timeouts
2014-08-18 15:05:55 +02:00
Joas Schilling
64d64610d2
Add a note about overwritewebroot when using system cron
...
If the current webroot is non-empty but the webroot from the config is,
and system cron is used, the URL generator fails to build valid URLs.
So we notify the admin to set it up correctly.
Fix #9995
2014-08-18 11:10:22 +02:00
Thomas Müller
62e06cb0ba
Merge pull request #10472 from owncloud/fix_undefined_index_ocsid
...
check if array index ocsid is set before accessing it
2014-08-18 10:43:21 +02:00
Thomas Müller
c933848c55
Merge pull request #10156 from owncloud/issue/9968
...
Check return of fopen() before using it
2014-08-18 10:35:04 +02:00
Jenkins for ownCloud
4dd07f572c
[tx-robot] updated from transifex
2014-08-18 01:56:30 -04:00
Frank Karlitschek
ddeb301ad6
Merge pull request #10456 from kroimon/skeleton_dir_config
...
Make skeleton directory configurable.
2014-08-17 20:01:02 -04:00
Morris Jobke
942d09030e
Merge pull request #10471 from owncloud/fix-db-mapper-update
...
according to PHPDoc this function shall return the entity
2014-08-18 00:19:58 +02:00
Thomas Müller
c08a1e6455
according to PHPDoc this function shall return the entity
2014-08-17 22:27:55 +02:00
Georg Ehrke
7347174636
check if array index ocsid is set before accessing it
2014-08-17 22:26:14 +02:00
Thomas Müller
4c79d34980
Merge pull request #10469 from owncloud/remove-xmailer-header
...
Remove X-Mailer header from mails
2014-08-17 21:46:11 +02:00
Lukas Reschke
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Lukas Reschke
a2677c14c8
Remove X-Mailer header from mails
2014-08-17 18:55:13 +02:00
Jenkins for ownCloud
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
Lukas Reschke
283b99a42d
Merge pull request #10276 from owncloud/skip-webdavput
...
skip WebdavTest of encryption
2014-08-16 10:32:04 +02:00
Morris Jobke
5498186333
Merge pull request #10447 from owncloud/share-foldericonfix
...
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
Jenkins for ownCloud
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00