Thomas Müller
9dc5ea172e
Merge pull request #975 from irgsmirx/patch-1
...
Update lib/util.php
2013-01-02 14:01:38 -08:00
Thomas Mueller
1727b2e84d
add smtp port configuration option
2013-01-02 19:04:08 +01:00
Robin Appelman
54f6f1e6b7
phpdoc fixes for public api
2013-01-02 16:38:20 +01:00
Tom Needham
8a5f583cac
Remove WIP OAuth code
2012-12-31 16:19:46 +00:00
Tom Needham
9626d9ce31
Code cleanup and add copyright info
2012-12-31 16:08:21 +00:00
Tom Needham
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
Tom Needham
218a5ea890
Remove unused methods
2012-12-31 14:16:29 +00:00
Jenkins for ownCloud
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
Jenkins for ownCloud
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
Michael Gapczynski
7980bccaab
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-29 19:30:31 +00:00
Jenkins for ownCloud
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
Jenkins for ownCloud
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
Jenkins for ownCloud
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
Frank Karlitschek
15da11effe
Merge pull request #845 from owncloud/sqlite_error
...
Try to fix #836
2012-12-22 15:22:09 -08:00
Thomas Müller
986f5d9f3e
fixing variable name
2012-12-21 00:04:58 +01:00
irgsmirx
1e3231c732
Update lib/util.php
...
getUrlContent should take proxy setting into consideration when not using curl, as well
2012-12-20 12:01:11 +01:00
Thomas Müller
7d811e57e6
setting the timezone is now part of the login process and true part of the core.
2012-12-20 11:10:45 +01:00
root
a64a923d56
call it "proxy" instead of "curlproxy"
...
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
2012-12-19 18:50:19 +01:00
Frank Karlitschek
f012135992
make it more readable as deepdiver suggested
2012-12-19 18:50:19 +01:00
Frank Karlitschek
019da9943a
add curl proxy support. Fixes #504
...
https://github.com/owncloud/core/issues/504
2012-12-19 18:50:19 +01:00
Frank Karlitschek
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
Frank Karlitschek
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
Frank Karlitschek
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
Thomas Mueller
186147d1ee
refs #933 send content length header - this will allow the browser to show the progressbar
2012-12-19 11:22:01 +01:00
Randolph Carter
d2828bab07
fixes default email sender address
2012-12-19 01:09:14 +01:00
Jenkins for ownCloud
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
Jörn Friedrich Dreyer
b6eb95349e
fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http
2012-12-17 16:46:07 +01:00
Michael Gapczynski
39eebebd99
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
2012-12-16 19:43:32 -05:00
Tom Needham
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
Robin Appelman
4301cd7f61
wrap hooks into a try, catch to prevent a faulty app from crashing the request
2012-12-16 20:29:36 +01:00
Tom Needham
39b5199775
API: PUT and DELETE variables are now accessed from the parameters array
2012-12-15 12:37:44 +00: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
Tom Needham
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00: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
Frank Karlitschek
79b8d67627
remove PgeNavi. It's no longer used
2012-12-13 19:26:05 +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
Tom Needham
1475ff63dd
API: Add check to see if the user is authorised to run the api method
2012-12-12 21:04:23 +00:00
Tom Needham
228a75ebaa
API: Include totalitems and itemsperpage meta data when needed.
2012-12-12 20:58:40 +00:00
Thomas Mueller
84420035df
throwing InsufficientStorage in case the quota is reached
2012-12-12 20:09:57 +01:00
Tom Needham
3cc3405536
API: Remove old code. Move remaining methods to OC_OCS_Result.
2012-12-12 18:06:07 +00:00
Tom Needham
2a4b554ca6
API: OCS methods now use OC_OCS_Result to return data
2012-12-12 17:35:58 +00:00
Tom Needham
140141edf2
API: Further tidying, implement OC_OCS_Result object for api results.
2012-12-12 16:50:25 +00:00
Frank Karlitschek
4265419bbd
Try to fix #836
...
https://github.com/owncloud/core/issues/836
2012-12-12 16:27:37 +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
Tom Needham
115dbc721d
API: Specify the response format using a GET parameter
2012-12-11 22:36:46 +00: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
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
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
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
Thomas Mueller
35e55214e2
[Contacts API] example for searching added
2012-12-02 11:54:30 +01:00
Isaac Rosenberg
d3ea7feb6b
Update lib/image.php
...
Corrected simple typo
2012-12-01 21:13:08 -05:00
Jenkins for ownCloud
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
Bart Visscher
8ce3aca331
Move loading of all the apps to setting the active navigation entry.
...
We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
2012-11-30 12:47:44 +01:00
Bart Visscher
4db53f9d8e
Merge pull request #619 from samtuke/versions_cache
...
OC_FSV->copy now only caches files which are copied from data/user/files
2012-11-30 03:25:06 -08:00
Robin Appelman
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
Robin Appelman
59d5aa2cb7
add function to safely end output buffering
2012-11-29 17:58:24 +01:00
Thomas Mueller
f99497a05a
test for search and unregister added
2012-11-28 23:10:30 +01:00
Thomas Mueller
2d597c2238
first unit tests implemented
2012-11-28 23:10:00 +01:00
Thomas Mueller
5b1dea56e5
change name to IAddressBook
2012-11-28 23:08:15 +01:00
Thomas Mueller
fba8c776e1
plugin mechanism implemented
2012-11-28 23:07:09 +01:00
Sam Tuke
6975c5537b
OC_FSV->copy now only caches files which are copied from data/user/files
...
Added contextual comments
2012-11-28 16:57:44 +00:00
Sam Tuke
60f4ea8ddc
Cleaned up docblock comments
2012-11-28 15:10:58 +00:00
Jörn Friedrich Dreyer
eaa625c9bc
Merge pull request #401 from owncloud/share_hooks
...
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Jenkins for ownCloud
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
Jenkins for ownCloud
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
Jörn Friedrich Dreyer
71e8755d31
Merge pull request #380 from butonic/feature_share_link_with_token
...
Feature share link with token
2012-11-26 07:42:53 -08:00
Jenkins for ownCloud
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00