Commit Graph

3122 Commits

Author SHA1 Message Date
Michael Gapczynski df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04:00
Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
2012-08-14 10:22:13 -04:00
Arthur Schiwon 62e4f55f72 LDAP: adjust usersInGroup to updated interface 2012-08-14 14:30:03 +02:00
Arthur Schiwon 3c1380b093 LDAP: adjust getGroups to updated interface 2012-08-14 14:22:05 +02:00
Arthur Schiwon 452f55e163 adjust LDAP to updated interface 2012-08-14 14:14:20 +02:00
Jenkins for ownCloud 19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Michael Gapczynski 830676b475 Improve usability for configuring Dropbox and Google Drive external storage 2012-08-13 17:10:58 -04:00
Michael Gapczynski d3bdab286b Suggest mount point name, don't reload custom javascript file 2012-08-13 17:10:58 -04:00
Michael Gapczynski 98c7d40fcd Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct 2012-08-13 17:10:58 -04:00
Michael Gapczynski 7f12a65c24 Show access granted label immediately after granting access 2012-08-13 17:10:58 -04:00
Michael Gapczynski 0e6d22e25f Prevent editing Dropbox configuration input after access granted 2012-08-13 17:10:58 -04:00
Michael Gapczynski b6b2f8826b Show access granted label next to Google Drive and Dropbox storage in configuration 2012-08-13 17:10:58 -04:00
Michael Gapczynski be32625fcc Fix remove button display for external storage 2012-08-13 17:10:58 -04:00
Thomas Mueller 53f117c01a l10n directories have been missing 2012-08-13 23:10:10 +02:00
Thomas Tanghus d303763d1f Automatically check radio when new addressbook fields get focus. 2012-08-13 15:07:15 +02:00
Bart Visscher 758f476fe3 Calendar: remove not used style rules 2012-08-12 22:40:36 +02:00
Bart Visscher 73b1b68fff Rewrite remoteStorage settings, remove block echo 2012-08-12 22:30:13 +02:00
Bart Visscher ab8e7f1da3 Remove unused gallery template 2012-08-12 22:30:13 +02:00
Bart Visscher cb71996008 Change image links to use imagePath function 2012-08-12 22:30:13 +02:00
Thomas Tanghus 329bc28d06 Commented out unused(?) class that interfered with appsettings. 2012-08-12 18:44:18 +02:00
Thomas Tanghus 7113e80184 Readded refresh param. 304 and ETag is still sent so shouldn't matter. 2012-08-12 17:30:09 +02:00
Jenkins for ownCloud 355a1adb3a [tx-robot] updated from transifex 2012-08-12 02:04:58 +02:00
Lukas Reschke 5b16c7a25d This is unnessecary because we already run htmlentities() over the template engine 2012-08-11 20:53:56 +02:00
Jenkins for ownCloud 39b9052c2f [tx-robot] updated from transifex 2012-08-11 02:05:58 +02:00
Lukas Reschke d3427be5e4 Following the code guidelines makes Michael happy :-) 2012-08-10 22:20:32 +02:00
Lukas Reschke 85f2e737a4 Disable listening, instead checking the ACL to prevent DoS 2012-08-10 22:18:08 +02:00
Lukas Reschke 11895a86b0 Activate ACLs 2012-08-10 22:02:04 +02:00
Bart Visscher fb493c45dd Calendar: update share backend using contacts backend as template 2012-08-10 14:40:48 +02:00
Bart Visscher 6a95e4288e Contacts: Check format parameter 2012-08-10 14:40:43 +02:00
Bart Visscher 6d971d3b1d Contacts: Better parameter names in addressbook share backend 2012-08-10 14:32:54 +02:00
Lukas Reschke e73292339f Check if webfinger is enabled 2012-08-10 10:01:56 +02:00
Thomas Tanghus 2c5ab91c7d Used wrong class. 2012-08-10 01:39:05 +02:00
Lukas Reschke 2dfc485149 XSRF checks 2012-08-10 00:44:35 +02:00
Thomas Tanghus 26a9d7ea71 Fixed 3 - THREE - errors in one method call :-P 2012-08-09 23:16:07 +02:00
Lukas Reschke 5f51366435 Sanitzing user input 2012-08-09 22:14:09 +02:00
Arthur Schiwon 7780e37f38 LDAP: don't give Test Connection button red background on fail, it is becoming unreadable 2012-08-09 21:42:35 +02:00
Michael Gapczynski 3b13051f7a Additional permission checks for editing and deleting contacts 2012-08-09 13:54:59 -04:00
Georg Ehrke 7955120aed remove debug code from calendar - thanks michael for pointing that out :) 2012-08-09 17:39:16 +02:00
Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
Thomas Tanghus f9cec1426f Change parameter name and update docs. 2012-08-09 17:04:14 +02:00
Thomas Tanghus 39814edf81 Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
Georg Ehrke 00d7ae8319 move calendar settings from personal settings to in app settings 2012-08-09 12:37:26 +02:00
Thomas Tanghus d24582503a Fix require statements. Fix for oc-1460. 2012-08-09 11:35:14 +02:00
Michael Gapczynski b830b3e24b Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Michael Gapczynski f4285a25ef Don't include shared addressbook if source not found 2012-08-08 19:12:59 -04:00
Bart Visscher 10cfcd4ff0 Remove useless setting of RUNTIME_NOAPPS 2012-08-08 22:42:50 +02:00
Bart Visscher 7522a23693 Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
Michael Gapczynski 05648dac61 Don't return file handle if the mode supports writing and the file is not writable 2012-08-08 11:25:24 -04:00
Bart Visscher 35a1738a39 Use new sharing API in OC_Calendar_Share::allSharedwithuser 2012-08-07 23:31:06 +02:00
Bart Visscher 1e644b5a53 Add Event share backend 2012-08-07 23:27:06 +02:00