Commit Graph

2573 Commits

Author SHA1 Message Date
Robin Appelman c6a5ce54a7 these functions should be static 2012-12-15 02:22:09 +01:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher df7d6cb26c More style fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Bart Visscher 85bd28c508 Fix some of "Closing brace must be on a line by itself" 2012-12-15 00:43:46 +01:00
Bart Visscher f39454ed12 Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
Bart Visscher 8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +01:00
Arthur Schiwon 627da205b3 implement getCurrentUser in Sabre Auth Connector, fixes #508 2012-12-14 01:06:09 +01:00
Arthur Schiwon 4466e06e7d use username, not passed loginname, might differ 2012-12-14 01:06:00 +01:00
blizzz 680ff3a51b Merge pull request #584 from wardragon/ldap_access_userExists_fix
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
Thomas Mueller 84420035df throwing InsufficientStorage in case the quota is reached 2012-12-12 20:09:57 +01:00
Thomas Mueller b8b64d6ffc set the session name to the instance id - which is unique
Conflicts:
	lib/base.php
2012-12-12 16:07:51 +01:00
Thomas Müller 72fe339c10 Merge pull request #766 from btactic/language_autodetect
Improve autodetection of language.
2012-12-12 03:43:17 -08:00
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Bart Visscher ddba90679d Merge pull request #829 from owncloud/contacts_api_namespace_fix
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide...
2012-12-11 13:38:57 -08:00
Thomas Müller 2361639a0d Merge pull request #825 from owncloud/oc_namespace
Autoload classes with 'OC' namespace prefix.
2012-12-11 10:31:42 -08:00
Thomas Mueller 8ed0ce7801 [contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data 2012-12-11 17:42:09 +01:00
Thomas Tanghus af12b0f5da Autoload classes with 'OC' namespace prefix. 2012-12-11 16:00:48 +01:00
Frank Karlitschek 728ea711b2 Merge pull request #824 from owncloud/add_user_backend_registration_debug_log
add debug logging for user backend registration
2012-12-11 06:34:20 -08:00
Jörn Friedrich Dreyer 8126b09bfe add debug logging for user backend registration 2012-12-11 14:56:04 +01:00
Thomas Müller eb7dbf3701 Merge pull request #697 from eMerzh/revoke_on_create
Revoke DB rights on install only if the db is newly created
2012-12-11 05:20:41 -08:00
Thomas Müller b11912f9bc Merge pull request #623 from owncloud/contacts_api_2
Contacts API has been implemented and unit tests are provided
2012-12-11 05:10:54 -08:00
Robin Appelman 438d3c21f6 actually connect the filesystem hooks to the cache updater 2012-12-11 01:24:53 +01:00
Robin Appelman 8635699db9 fix cache behaviour for non existing files 2012-12-11 01:06:21 +01:00
Jenkins for ownCloud f7f462f273 [tx-robot] updated from transifex 2012-12-11 00:04:40 +01:00
Jenkins for ownCloud a444999a8c [tx-robot] updated from transifex 2012-12-10 00:12:32 +01:00
Sergi Almacellas Abellana 7b0e2b348b Fix the loop to search al the available languages, not only the las element. 2012-12-09 20:21:04 +01:00
Thomas Mueller 4cc895aa0a [contacts_api] move addressbook to it's own file 2012-12-08 16:42:54 +01:00
Thomas Müller a84ae04c17 Merge pull request #762 from owncloud/database_exception
dont handle database exception in OC_DB
2012-12-08 03:42:01 -08:00
Jenkins for ownCloud 2ca72d0da7 [tx-robot] updated from transifex 2012-12-08 00:10:53 +01:00
Sergi Almacellas Abellana b810e42cc7 Improve autodetection of language.
Fixes #730.
2012-12-07 20:34:17 +01:00
Lorenzo M. Catucci 15afbfd198 Add an $excludingBackend optional parameter
to the userExists method both in OCP\User and in OC_User.
2012-12-07 17:19:26 +01:00
Robin Appelman 65e4dc183c dont handle database exception in OC_DB
give the caller the option to handle the exception
2012-12-07 16:09:29 +01:00
Bart Visscher 1e062ea895 Merge pull request #182 from owncloud/fix-redirect
Make the redirect_url working again
2012-12-07 03:09:19 -08:00
Bart Visscher 271b8384e7 Fix warning about redirect_url not set 2012-12-07 12:07:56 +01:00
Thomas Mueller 889e55fdac [contacts_api] update documentation 2012-12-06 23:51:35 +01:00
Robin Appelman 317cd4c70a catch error if old filecache table is not present during upgrade 2012-12-06 17:49:35 +01:00
Robin Appelman 98f42d314c merge master into filesystem 2012-12-06 17:47:28 +01:00
Björn Schießle 5b04db9b22 one more undefined index error 2012-12-06 15:58:12 +01:00
Björn Schießle e3ae0b7ba6 fix more undefined indexes 2012-12-06 15:58:05 +01:00
Thomas Müller 76625e9ba5 Merge pull request #647 from owncloud/fix_app_settings_navigation
Move loading of all the apps to setting the active navigation entry.
2012-12-05 01:48:20 -08:00
Thomas Müller 521b6c7b04 Merge pull request #700 from eMerzh/fix_error_display
Quick Fix a dirty function preventing showing errors
2012-12-05 01:37:27 -08:00
Thomas Mueller e65abb8054 minified version no longer available 2012-12-04 14:49:19 +01:00
Brice Maron a310dcb0ff Fix a dirty function preventing showing errors 2012-12-03 22:53:06 +00:00
Brice Maron 4327ed8382 Revoke DB rights on install only if the db is newly created 2012-12-03 20:20:17 +00:00
Robin Appelman be30b1a8de merge master into filesystem 2012-12-03 18:02:22 +01:00
Thomas Müller cee92bde20 Merge pull request #682 from VicDeo/master
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-03 02:18:04 -08:00
Jenkins for ownCloud f4d7955fe6 [tx-robot] updated from transifex 2012-12-03 00:05:40 +01:00
Victor Dubiniuk 3d5ffebb52 Clean KB entries processing code 2012-12-02 23:54:53 +03:00