wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
23296 commits 157 branches 562 tags 714 MiB
Commit graph

23296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
2ac6f3a4f5 Clean-up code and use proper exception types 2015-03-09 11:48:55 +01:00
Thomas Müller
fccede8f50 Merge pull request #14750 from owncloud/possible-fix-for-OC_Version 
proper filename for "require version.php"
 2015-03-09 09:55:21 +01:00
Morris Jobke
348fe105b1 Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit 
LDAP: set up paged search even if limit is 0
 2015-03-09 08:12:25 +01:00
Morris Jobke
d550143ba0 proper filename for "require version.php" 2015-03-09 08:03:28 +01:00
Morris Jobke
674654c210 Merge pull request #14743 from owncloud/autoconfig-password 
Convert 'abcpassword' to 'abcpass' during setup
 2015-03-09 07:54:22 +01:00
Jenkins for ownCloud
174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Jenkins for ownCloud
377165ae51 [tx-robot] updated from transifex 2015-03-08 01:54:36 -05:00
Robin McCorkell
f43b047636 Convert 'abcpassword' to 'abcpass' during setup 
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
 2015-03-07 13:10:43 +00:00
Jenkins for ownCloud
73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Morris Jobke
81dc550af0 Merge pull request #14736 from owncloud/errors-list 
adjust list of errors, more compact and readable
 2015-03-06 23:13:44 +01:00
Lukas Reschke
60c507cd4e Merge pull request #14722 from owncloud/master-14711 
Fix totally broken AppStore code...
 2015-03-06 18:52:12 +01:00
Thomas Müller
a77a6f3b48 Merge pull request #14734 from owncloud/unit-test-insertIfNotExist 
[sqlite] Use an atomic implementation on sqlite for insertIfNotExist() + use it in the file cache ...
 2015-03-06 18:20:22 +01:00
Thomas Müller
1b08b7c726 use insertIfNotExist() in cache put 2015-03-06 15:32:58 +01:00
Jan-Christoph Borchardt
db02edd7c8 adjust list of errors, more compact and readable 2015-03-06 15:27:21 +01:00
Thomas Müller
4e37831d85 Fix PHPDoc on the way .... 2015-03-06 14:54:57 +01:00
Thomas Müller
987b683895 Use an atomic implementation on sqlite for insertIfNotExist() 2015-03-06 14:54:54 +01:00
Jenkins for ownCloud
d11f040720 [tx-robot] updated from transifex 2015-03-06 01:54:52 -05:00
Lukas Reschke
d5a8225c0e Fix totally broken AppStore code... 
As it turned out the AppStore code was completely broken when it came from apps delivered from the appstore, this meant:

1. You could not disable and then re-enable an application that was installed from the AppStore. It simply failed hard.
2. You could not disable apps from the categories but only from the "Activated" page
3. It did not show the activation state from any category page

This code is completely static and thus testing it is impossible. We really have to stop with "let's add yet another feature in already existing static code". Such stuff has to get refactored first.

That said, this code works from what I can say when clicking around in the AppStore page GUI. However, it may easily be that it does not work with updates or whatsever as I have no chance to test that since the AppStore code is not open-source and it is impossible to write unit-tests for that.

Fixes https://github.com/owncloud/core/issues/14711
 2015-03-06 00:16:17 +01:00
Arthur Schiwon
42d3ed47e2 set up paged search when limit is 0 2015-03-05 13:15:21 +01:00
Lukas Reschke
9f5433c0c3 Merge pull request #13368 from owncloud/memcache_lowlatency 
Refactor \OC\Memcache\Factory
 2015-03-05 13:05:17 +01:00
Robin McCorkell
78819da3bf \OC\Memcache\Cache implements \OCP\ICache 2015-03-05 11:36:34 +00:00
Robin McCorkell
0e4933e6d2 Refactor \OC\Memcache\Factory 
Caches divided up into two groups: distributed and local. 'Low latency' is an
alias for local caches, while the standard `create()` call tries to get
distributed caches first, then local caches.

Memcache backend is set in `config.php`, with the keys `memcache.local` and
`memcache.distributed`. If not set, `memcache.distributed` defaults to the value
of `memcache.local`.
 2015-03-05 11:36:34 +00:00
Jenkins for ownCloud
7e0fd8fb50 [tx-robot] updated from transifex 2015-03-05 01:56:35 -05:00
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