Morris Jobke
bb3901e87a
Merge pull request #14691 from owncloud/karma-forcejasmine2
...
Make sure we use Jasmine 2 for running JS unit tests
2015-03-04 20:36:49 +01:00
Morris Jobke
cffc256479
Merge pull request #14672 from Crote/master
...
Add --show-password option to ldap:show-config
2015-03-04 20:21:14 +01:00
Vincent Petry
d772bc56e7
Merge pull request #14693 from owncloud/fix-phpdoc
...
Fix PHPDoc
2015-03-04 17:55:24 +01:00
Lukas Reschke
cdced56f2b
Fix PHPDoc
...
That apparently went lost when changing the signature.
2015-03-04 15:35:41 +01:00
Vincent Petry
e56727e27b
Merge pull request #14690 from owncloud/trash-deletelink-unittest
...
Add unit test for selection overlay actions in trashbin
2015-03-04 14:50:11 +01:00
Laurens Post
8149217371
Add --show-password option to ldap:show-config
2015-03-04 14:15:33 +01:00
Vincent Petry
2a5f6a6448
Make sure we use Jasmine 2 for running JS unit tests
2015-03-04 13:50:59 +01:00
Vincent Petry
3f6e7d6a43
Add unit test for selection overlay actions in trashbin
2015-03-04 13:49:19 +01:00
Morris Jobke
299bcf749a
Merge pull request #14685 from owncloud/test-noop-scanner
...
Add a test for ObjectStore\NoopScanner
2015-03-04 13:19:41 +01:00
Thomas Müller
2831a1790c
Merge pull request #14675 from owncloud/files-external-smb-windows
...
adding a windows smb config for testing to ci
2015-03-04 12:27:59 +01:00
Joas Schilling
294724b5da
Add a test for ObjectStore\NoopScanner
2015-03-04 11:48:31 +01:00
Morris Jobke
f507601e25
Merge pull request #14582 from rullzer/avatar_fixes
...
Avatars in share dialog fixes
2015-03-04 10:30:09 +01:00
Robin McCorkell
ed4dc4db07
Fix slash normalization error in AmazonS3Migration unit test
...
Since aa821ecc00
leading and trailing slashes are
trimmed in the file cache paths
2015-03-04 09:22:21 +00:00
Vincent Petry
aa11b83158
Merge pull request #14682 from owncloud/issue/14681-noop-scanner-outdated
...
Update scanFile() and scanChildren() to the new signature of the parent ...
2015-03-04 10:07:42 +01:00
Morris Jobke
ac10441600
Merge pull request #14326 from owncloud/remove-unnessary-backslashes-from-translation
...
Remove unnecessary backslashes from translations
2015-03-04 09:58:42 +01:00
Morris Jobke
f1d74e8803
Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins
...
Let users configure security headers in their Webserver
2015-03-04 09:36:01 +01:00
Joas Schilling
09ac2df1f8
Update scanFile() and scanChildren() to the new signature of the parent class
2015-03-04 09:22:53 +01:00
Jenkins for ownCloud
84785a6a39
[tx-robot] updated from transifex
2015-03-04 01:55:19 -05:00
Roeland Jago Douma
c9272be0b9
Avatars in share dialog fixes
...
* Avatar for "xxxx share with you..." to the left
* Avatars for groups and remote shares (use default placeholder)
* Modified and added unit tests
* Use the same css for all the avatars in the dropdown
2015-03-03 20:57:50 +01:00
Joas Schilling
e12c83e3dc
Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2
...
Jenkins #14650
2015-03-03 18:33:08 +01:00
Robin McCorkell
d6b9b37ddb
Use dummy storages instead of real storages in files_external unit tests
...
We were using the SMB and SFTP backends, which since Icewind's new SMB library
results in an actual attempted connection just by constructing the storage.
This commit replaces all references to real storages (except when necessary)
with a dummy storage class.
2015-03-03 17:29:17 +01:00
Thomas Müller
7d3e228365
adding a windows smb config for testing
2015-03-03 17:29:10 +01:00
Joas Schilling
b669bf26d6
Fix the behaviour of getLanguageCode() to match the expectation of the name
2015-03-03 16:47:31 +01:00
Joas Schilling
ed4c05c7b5
Use findLanguage() instead of creating the object first
2015-03-03 16:47:31 +01:00
Joas Schilling
5fc004f8ea
Add a test of what everyone thinks should be the result of this method
2015-03-03 16:47:31 +01:00
Joas Schilling
1761b162e6
Merge pull request #14660 from metaworx/replace-static-dbtableprefix-with-config-dbtableprefix
...
use `dbtableprefix` for temp table and index names
2015-03-03 16:43:47 +01:00
Thomas Müller
be27188649
Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versions
...
Read from IRequest instead of reading twice
2015-03-03 14:22:56 +01:00
Vincent Petry
b4cfc79b5a
Added missing done() calls for async tests
2015-03-03 13:59:03 +01:00
Thomas Müller
e30ca8198f
Merge pull request #14638 from owncloud/issue/14538-repairstep-drop-old-tables
...
Add a repair step to delete old tables
2015-03-03 13:37:54 +01:00
Thomas Müller
0af2ea8b28
Merge pull request #14586 from owncloud/proper-appcodechecker-docu
...
proper description of appcodechecker in config sample
2015-03-03 12:59:51 +01:00
Joas Schilling
8df4077dd7
Add a test for dropping the tables
2015-03-03 11:27:06 +01:00
Thomas Müller
29ecbc8c6c
Merge pull request #14496 from owncloud/kill-substr-mssql-master
...
[Master] Remove hacky Substring support for MSSQL
2015-03-03 11:00:13 +01:00
Morris Jobke
9ddff4cec0
Merge pull request #14653 from sebomoto/fix_loading_feedback
...
fix for loading spinner reappearing after errors in db-connection
2015-03-03 10:12:48 +01:00
Vincent Petry
133c37fe22
Merge pull request #14652 from owncloud/kill-download-from-url
...
Remove "Download from URL" feature
2015-03-03 10:10:15 +01:00
Jenkins for ownCloud
e271fa3ee8
[tx-robot] updated from transifex
2015-03-03 01:55:50 -05:00
martin-rueegg
6be8ab65a5
replace 'oc_' with dbtableprefix form config for temporary table names and indexes
2015-03-03 01:54:15 +01:00
Sebastian Bolt
834f7039f0
fix for loading spinner reappearing after errors in db-connection
2015-03-02 21:58:06 +01:00
Lukas Reschke
d620fc8798
Merge pull request #14615 from kampka/cron-command
...
Allow configuring background job mode from the console
2015-03-02 21:35:57 +01:00
Thomas Müller
345c527ed0
remove $content parameter
2015-03-02 21:33:17 +01:00
Lukas Reschke
acabd81f42
Remove "Download from URL" feature
...
Fixes https://github.com/owncloud/core/issues/13326
2015-03-02 21:06:25 +01:00
Thomas Müller
7f029777a8
Adding dependency labels
2015-03-02 20:56:35 +01:00
Christian Kampka
83e0f84fef
Allow configuring background job mode from the console
2015-03-02 20:51:40 +01:00
Lukas Reschke
bbd5f28415
Let users configure security headers in their Webserver
...
Doing this in the PHP code is not the right approach for multiple reasons:
1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.
This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
2015-03-02 19:07:46 +01:00
Thomas Müller
1155ad6e38
Merge pull request #14633 from owncloud/issue/14627-maintenance-mode-message-misleading
...
Maintenance mode message might be misleading
2015-03-02 06:49:28 -08:00
Vincent Petry
e61aa3723e
Merge pull request #14573 from owncloud/enc-migrate-disable-updater
...
Disable the cache updater when doing the encryption migration
2015-03-02 14:53:29 +01:00
Lukas Reschke
e1f833a611
Merge pull request #14635 from owncloud/cleanup-config.sample.php
...
Cleanup config.sample.php
2015-03-02 14:35:54 +01:00
Joas Schilling
195c577c77
Add a repair step to delete old tables
2015-03-02 12:02:14 +01:00
Morris Jobke
8cf61c09c8
fix link for Preview documentation
2015-03-02 10:45:22 +01:00
Morris Jobke
297285249a
fix line breaks in config.sample.php
2015-03-02 10:44:18 +01:00
Thomas Müller
9c79b1fc6d
Merge pull request #14608 from kampka/master
...
Don't swallow errors in console.php
2015-03-02 01:40:57 -08:00