Commit Graph

13689 Commits

Author SHA1 Message Date
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
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
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Morris Jobke 3dd19c7758 Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
run unit tests for apps as well
2013-09-26 07:09:32 -07:00
Thomas Müller f8933eaf92 Remove $RUNTIME_NOAPPS - setting to false was not enough 2013-09-26 14:03:04 +02:00
Thomas Müller e515509a81 prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded 2013-09-26 13:34:47 +02:00
blizzz b9d582caa2 Merge pull request #4990 from owncloud/user_fix_manager
manager checkPassword now returns User object, adjust internal user clas...
2013-09-26 04:03:20 -07:00
Björn Schießle 6b1d70f148 Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
2013-09-26 03:16:15 -07:00
Thomas Müller 2334f96906 Merge pull request #4991 from owncloud/enc_fix_warning
check if key exists before reading it
2013-09-26 03:15:14 -07:00
Thomas Müller d1b5d65622 run unit tests for apps as well 2013-09-26 12:02:06 +02:00
Bjoern Schiessle 0b98427536 fix check if app is enabled 2013-09-25 19:23:07 +02:00
Arthur Schiwon b5ac672864 Missing Test for the previous commit 2013-09-25 19:15:27 +02:00
Morris Jobke 70dccd28ef Merge pull request #4987 from owncloud/different_color_placeholder
Make it possible to have a different color than the username for placeholder
2013-09-25 10:11:52 -07:00
Bjoern Schiessle 71bbb2ea8b check if key exists before reading it 2013-09-25 17:44:05 +02:00
kondou 5e7a7b3f61 Shorten optional text-argument processing 2013-09-25 17:19:38 +02:00
Thomas Müller 2feb753b84 Merge pull request #4989 from owncloud/coverage-for-all-master
collect coverage for all databases again - ci.owncloud.org has more RAM ...
2013-09-25 07:46:49 -07:00
Arthur Schiwon 1c976a7c9b manager checkPassword now returns User object, adjust internal user class accordingly. 2013-09-25 15:03:22 +02:00
Thomas Müller 0486dc24ad collect coverage for all databases again - ci.owncloud.org has more RAM available 2013-09-25 14:41:13 +02:00
Thomas Müller 68bfcfbf77 Merge pull request #4968 from owncloud/user_checkpwd
User: move checkPassword from User to Manager to not break API
2013-09-25 05:28:42 -07:00
kondou 24eb41548e Make it possible to have a different color than the username for placeholder 2013-09-25 12:57:41 +02:00
Jenkins for ownCloud 2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Arthur Schiwon 14a160e176 Adjust Tests and satisfy them 2013-09-24 17:10:01 +02:00
Arthur Schiwon 63324e2347 Fix doc 2013-09-24 14:12:44 +02:00
Arthur Schiwon 0a7ee7c3f7 Fix return value from User object to User ID 2013-09-24 14:11:47 +02:00
Arthur Schiwon fe88a62d6e === not == 2013-09-24 13:51:33 +02:00
Arthur Schiwon d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Christopher e41ef97ac0 Merge pull request #4963 from cyberb/patch-1
fixing typo
2013-09-24 04:45:13 -07:00
Thomas Müller 40871bab88 Merge pull request #4930 from owncloud/fix-apps-settings
Fix the apps enabling/disabling in settings
2013-09-24 01:02:50 -07:00
Thomas Müller 759f732aaa Merge pull request #4917 from owncloud/scan-clear-permissions
clear permissions cache when scanning a file
2013-09-24 00:50:33 -07:00
Boris Rybalkin 00c998c5bb fixing typo
Typo in comment "feature" => "future"
2013-09-23 21:08:58 -04:00
Andreas Fischer 2129974584 Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). 2013-09-24 00:59:23 +02:00
Robin Appelman 235517f111 clear permissions cache when scanning a file 2013-09-24 00:57:58 +02:00
Thomas Müller bc1c6039b7 Merge pull request #4956 from owncloud/fix_not_displaying_emptycontent
Fix not displaying "Upload something!" message
2013-09-23 13:09:47 -07:00
kondou d7409547aa Fix not displaying "Upload something!" message
Fix #4940
2013-09-23 16:39:42 +02:00
Thomas Müller 5d671a84b2 Merge pull request #4869 from owncloud/fixing-4866-master
recreate an etag within the scanner if the cache contains an empty etag
2013-09-23 07:13:12 -07:00
Thomas Müller 46f64cc39a Merge pull request #4950 from owncloud/fix_preview_shared_folder
Fix preview for shared folder and public upload
2013-09-23 06:31:50 -07:00
Andreas Fischer 437858852c Merge pull request #4856 from owncloud/fix-link-expiration
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)

* owncloud/fix-link-expiration:
  Perform expiration date checking before returning share data for token.
  Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
Andreas Fischer d9a36ee82e Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php. 2013-09-23 12:45:02 +02:00
Andreas Fischer 4a9f1cc74d Merge remote-tracking branch 'owncloud/master' into fixing-4866-master
* owncloud/master: (98 commits)
  [tx-robot] updated from transifex
  files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
  setting a default on filecache column unencrypted_size
  [tx-robot] updated from transifex
  remove unneccessary lib in namespace
  namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
  initialize variable
  calculate correct permissions while toggle the password protection
  make sure that both $permissions and $oldPermissions have the same type
  Add copyright, remove starting blank line
  update inherit docs comment
  Fix insert/update/delete helper functions for oracle
  Add missing return true statements to legacy preferences functions
  Add missing static
  Convert OC_Preference to object interface
  fix race condition in lazy preview loading
  use {count} instead of 'One' for more versatile translation
  fix double translation of error message
  use n to translate title
  fixing typos and l10n
  ...

Conflicts:
	tests/lib/files/cache/scanner.php
2013-09-23 12:44:11 +02:00
Georg Ehrke 8a1618bce5 implement previews for public upload 2013-09-23 12:27:05 +02:00
Georg Ehrke edd38e5948 fix previews in shared folders 2013-09-23 10:26:46 +02:00
Björn Schießle 9851f0f4f2 Merge pull request #4896 from owncloud/sharing_allow_disable_password
sharing, allow user to disable password protection
2013-09-23 01:20:09 -07:00
Thomas Müller 03eedb58fc Merge pull request #4327 from owncloud/scanfile-remove
remove deleted files while scanning
2013-09-22 22:40:13 -07:00