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

2564 commits

Author SHA1 Message Date
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
Thomas Müller
f81321af3d Merge pull request #556 from owncloud/postgres_insert_id 
use lastval() to get the insert id in postgesql
 2012-11-24 22:55:33 -08:00
Frank Karlitschek
e450933650 remove left over tag 2012-11-24 18:25:05 +01:00
Frank Karlitschek
0f61816278 A new function to create nice error page. And use it for fatal db errors 2012-11-24 18:07:26 +01:00
Frank Karlitschek
fb5d0db037 prettier error output. Let´s see how many more low hanging fruits I find on my way to the real bug that I want to fix ;-) 2012-11-23 16:40:28 +01:00
Jörn Friedrich Dreyer
995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Robin Appelman
95340a9e67 use lastval() to get the insert id in postgesql 2012-11-23 00:23:27 +01:00
Jenkins for ownCloud
3688376a6f [tx-robot] updated from transifex 2012-11-23 00:03:17 +01:00
Frank Karlitschek
6cb3774706 make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups. 2012-11-22 19:22:00 +01:00
Thomas Müller
54356636e4 Merge pull request #483 from owncloud/archive_sizes 
stop increasing folder sizes once we hit a non folder
 2012-11-22 01:56:08 -08:00
Jenkins for ownCloud
3a5f5e127c [tx-robot] updated from transifex 2012-11-22 00:02:16 +01:00
Thomas Müller
a85d891938 Merge pull request #538 from Deltachaos/fix_537 
Fixes update of shared files with mirall because it dose not update all ...
 2012-11-20 22:55:08 -08:00
Jenkins for ownCloud
9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Maximilian Ruta
ac4cafcfc7 Fixes update of shared files with mirall because it dose not update all methadata for a file 2012-11-20 23:34:25 +01:00
Jörn Friedrich Dreyer
d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Jenkins for ownCloud
568def2b61 [tx-robot] updated from transifex 2012-11-20 00:02:08 +01:00
Brice Maron
8fa7d6a48a Fix typo in getUrlContent fix #514 2012-11-19 17:13:07 +00:00
Thomas Müller
d91c841f73 Merge pull request #383 from owncloud/contacts_api 
Proposal for a public contacts api
 2012-11-19 05:42:01 -08:00
Frank Karlitschek
5b2aeebaf0 Merge pull request #280 from butonic/feature_bmp_support 
add bmp support
 2012-11-19 00:53:46 -08:00
Jenkins for ownCloud
c5e891008b [tx-robot] updated from transifex 2012-11-19 00:01:48 +01:00
Thomas Müller
ea80a8b9e3 Merge pull request #114 from riso/xsendfile 
Implement X-Sendfile support
 2012-11-18 04:35:46 -08:00
Jenkins for ownCloud
e28d71bf55 [tx-robot] updated from transifex 2012-11-18 00:02:00 +01:00
Brice Maron
4337e0fb99 Little case fix 2012-11-17 22:12:24 +00:00
Brice Maron
71adad8817 Add User agent when OC does a request 2012-11-17 21:08:58 +00:00
Thomas Müller
ac3e962732 Merge pull request #375 from tdevos/master 
Use curl to get remote file content
 2012-11-17 12:31:25 -08:00
Jenkins for ownCloud
61670184c4 [tx-robot] updated from transifex 2012-11-17 00:02:24 +01:00
Robin Appelman
1007013833 stop increasing folder sizes once we hit a non folder 
fixes #234
 2012-11-16 17:54:58 +01:00
Robin Appelman
8fe69dfac6 also return fileid in OC_Filecache::get 2012-11-16 17:52:52 +01:00
Robin Appelman
74611801dd typo 2012-11-16 17:41:38 +01:00
Thomas Müller
d1c0f2a739 Merge pull request #454 from Raydiation/master 
Routing fixes
 2012-11-15 15:15:07 -08:00