mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,688 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

14688 Commits

Author SHA1 Message Date
vsapronov 1efbf7774f Fixed review issues 2013-09-29 20:16:32 -04:00
Andreas Fischer 9ba0edcadb Merge pull request #4966 from owncloud/text_preview_blacklist 
add blacklist to txt preview backend

* owncloud/text_preview_blacklist:
  rename variable in testIsTransparent
  rename testTxtBlacklist to txtBlacklist
  move fileView object initialization to testIsTransparent
  use dataProvider for txt blacklist test
  add test for txt blacklist
  add test data for cal and contact preview
  add blacklist to txt preview backend
 2013-09-29 23:20:34 +02:00
Thomas Müller 258e8d58da flipping arguments on assertEquals() - first argument contains the expected value and second argument contains the value to be asserted 2013-09-29 22:20:42 +02:00
Thomas Müller 63ea6844e8 - adding unit test testGetShareFromUnknownId() 
- fixing getShareFromId() for Oracle
- fixing error message
 2013-09-29 22:16:48 +02:00
Thomas Müller a79294771b Merge pull request #4960 from owncloud/fixing-mirall-1014-master 
handle error situation of rename proper
 2013-09-29 12:49:10 -07:00
Thomas Müller 48b5c1d5f9 initial implementation of activity manager 2013-09-29 20:31:12 +02:00
Thomas Müller 2e1e283592 Merge branch 'appframework-master' into activities-api 
Conflicts:
	lib/public/iservercontainer.php
 2013-09-29 20:10:07 +02:00
Thomas Müller 5462e199d3 Merge branch 'master' into appframework-master 2013-09-29 20:07:56 +02:00
Thomas Müller 88d5e8fbca Merge pull request #5031 from zimba12/master 
followup of #4032 - makes the settings-button bigger...
 2013-09-29 09:26:47 -07:00
Alessandro Cosentino 710d3f139f followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation 2013-09-29 01:46:23 -04:00
Jenkins for ownCloud 59e4ff7d24 [tx-robot] updated from transifex 2013-09-29 00:03:26 -04:00
Thomas Müller adcb738e47 initialize $middleWares 2013-09-28 20:40:25 +02:00
Thomas Müller 6979fd343b Merge branch 'master' into appframework-master 2013-09-28 20:39:19 +02:00
Morris Jobke 1097c3ce63 Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname 
Base defaultavatar text on displayname
 2013-09-28 08:52:22 -07:00
kondou 24d092c4ba Have uniform (wrong) indention 2013-09-28 17:49:07 +02:00
kondou 4907685405 Base defaultavatar text on displayname 
Fix #4876
 2013-09-28 16:46:53 +02:00
Morris Jobke cb565a5f60 Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes 
phpunit.xml: Port code coverage excludes from autotest to dist.
 2013-09-28 06:50:34 -07:00
Thomas Tanghus d124b6965b Implement PUT an PATCH support 2013-09-28 01:35:24 +02:00
Thomas Müller 57f37c876b delay middleware registrations 2013-09-27 17:15:26 +02:00
Thomas Müller adff34cb8a fixing error in initialization of TagManager 2013-09-27 17:08:48 +02:00
Morris Jobke 0f5fed5409 fix license header line breaks 2013-09-27 17:02:57 +02:00
Thomas Tanghus 95cc666742 Add interface docs to IRequest. 2013-09-27 15:55:22 +02:00
Thomas Tanghus b0d6d30705 Add patch method to OC_Route 2013-09-27 15:54:18 +02:00
Georg Ehrke c5bcefe4db rename variable in testIsTransparent 2013-09-27 14:55:37 +02:00
Thomas Tanghus d49e982ac8 Check if accessor matched request method. 
It's easier to find errors in the code if an exception is thrown.
 2013-09-27 14:36:19 +02:00
Thomas Müller 687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Thomas Müller 735608f513 Merge pull request #4207 from owncloud/search_shared_files 
add initial search in shared files
 2013-09-27 05:18:12 -07:00
Bjoern Schiessle f935a38559 add some comments 2013-09-27 14:04:28 +02:00
Bjoern Schiessle 5b4f515e7b add test getShareFromId 2013-09-27 14:01:04 +02:00
Thomas Müller 79da35b698 code cleanup 2013-09-27 13:41:23 +02:00
Bjoern Schiessle 03d5ea6cec check not only if the keyfile folder exists but also if it contains keyfiles 2013-09-27 13:34:48 +02:00
Arthur Schiwon 3e1bdd8a04 remove outdated (thus failing) and anyway insufficient group tests - for now 2013-09-27 13:34:16 +02:00
Arthur Schiwon 05ee6606f1 give test file a proper name 2013-09-27 13:34:16 +02:00
Arthur Schiwon 2cebd8b92e added user_ldap tests via public api calls 2013-09-27 13:34:16 +02:00
Arthur Schiwon a1aff3e8a1 LDAP: don't throw exceptions in the wrapper, errors are handled in the code. nevertheless, log unexpected errors 2013-09-27 13:34:16 +02:00
Arthur Schiwon 81cf4a22ef LDAP: coding style 2013-09-27 13:34:15 +02:00
Arthur Schiwon 84f522f406 LDAP: simple tests for the user backend 2013-09-27 13:34:15 +02:00
Arthur Schiwon bb162b1f94 LDAP: get rid of some PHP Warnings 2013-09-27 13:34:15 +02:00
Arthur Schiwon d4f92494a2 LDAP: make Access be a dependency to the user and group backend instead of inheriting it. 2013-09-27 13:34:15 +02:00
Arthur Schiwon b9cc2ad660 Whitespaces 2013-09-27 13:34:15 +02:00
Arthur Schiwon f04aa1af5d LDAP: don't check var type when you can specify the type in the parameter list 2013-09-27 13:34:15 +02:00
Arthur Schiwon b9cd22cf78 LDAP: use wrapper, not direct function call 2013-09-27 13:34:15 +02:00
Arthur Schiwon 5090ca3eb4 LDAP: add phpdoc 2013-09-27 13:34:15 +02:00
Arthur Schiwon 6e850e0bee LDAP: establish wrapper interface to allow proper mocking 2013-09-27 13:34:15 +02:00
Arthur Schiwon 52454e39b7 LDAP: move is_resource check to ldap wrapper to make it mockable 2013-09-27 13:34:15 +02:00
Arthur Schiwon d34fbf3a86 LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing 2013-09-27 13:34:15 +02:00
Arthur Schiwon 1a020e0696 Resolve merge conflict 2013-09-27 13:34:15 +02:00
Thomas Müller 1ec7dff2fe remove unused setUp() 2013-09-27 13:30:09 +02:00
Morris Jobke f47ff13abf Merge pull request #5001 from owncloud/fixing-user-external-backends-master 
prelogin apps have to be loaded within setupBackend() otherwise required...
 2013-09-27 02:34:59 -07:00
Georg Ehrke 4e9296a484 rename testTxtBlacklist to txtBlacklist 2013-09-27 11:33:37 +02:00