mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,999 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

751 Commits

Author SHA1 Message Date
Jenkins for ownCloud e6d87b2c4b [tx-robot] updated from transifex 2012-08-22 02:08:16 +02:00
Jenkins for ownCloud b819aa33f7 [tx-robot] updated from transifex 2012-08-21 02:09:12 +02:00
Michael Gapczynski 82d81e8d39 Merge branch 'share_api' 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
 2012-08-19 22:29:01 -04:00
Jenkins for ownCloud f893d21660 [tx-robot] updated from transifex 2012-08-20 02:03:51 +02:00
Jenkins for ownCloud 36474e5681 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Lukas Reschke d54390b1a0 Optimized image size 2012-08-18 13:56:04 +02:00
Georg Ehrke 41639f0517 fix fail in sql query of isDuplicate method of OC_Calendar_Import 2012-08-17 21:29:26 +02:00
Georg Ehrke 44272b9889 increase margin top of calendar import's color picker 2012-08-17 20:48:47 +02:00
Jenkins for ownCloud 1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Jenkins for ownCloud da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Lukas Reschke db5b995a6b Disable user enumeration 2012-08-14 17:23:26 +02: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
Jenkins for ownCloud 19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Bart Visscher 758f476fe3 Calendar: remove not used style rules 2012-08-12 22:40:36 +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
Jenkins for ownCloud 355a1adb3a [tx-robot] updated from transifex 2012-08-12 02:04:58 +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
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
Georg Ehrke 00d7ae8319 move calendar settings from personal settings to in app settings 2012-08-09 12:37:26 +02: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
Michael Gapczynski 9580d0ef29 Initial calendar sharing backend 2012-08-07 14:57:52 -04:00
Michael Gapczynski ea23854328 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00
Bart Visscher fe6450002d Change hardcoded urls to use linkTo function 2012-08-06 18:51:41 +02:00
Bart Visscher b12ed88794 Calendar: remove double html encoding 2012-08-03 16:18:33 +02:00
Jenkins for ownCloud 36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
Jenkins for ownCloud 3430dcd367 [tx-robot] updated from transifex 2012-07-30 02:05:41 +02:00
Jenkins for ownCloud 18f6552a08 [tx-robot] updated from transifex 2012-07-29 02:06:29 +02:00
Jenkins for ownCloud fa4052d6f1 [tx-robot] updated from transifex 2012-07-28 02:05:38 +02:00
Georg Ehrke bccd372565 Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76 2012-07-27 14:17:55 +02:00
Jenkins for ownCloud 0a9c33e151 [tx-robot] updated from transifex 2012-07-27 02:04:26 +02:00
Georg Ehrke f7155b4276 convert through caldav transmitted rgba calendarcolor to rgb 2012-07-26 14:46:03 +02:00
Jenkins for ownCloud ba0ea21074 [tx-robot] updated from transifex 2012-07-26 08:04:12 +02:00
Jenkins for ownCloud 42c22bee36 [tx-robot] updated from transifex 2012-07-26 08:03:10 +02:00
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Jenkins for ownCloud 37bccf54f2 [tx-robot] updated from transifex 2012-07-25 22:15:24 +02:00
Georg Ehrke f9d3388854 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke 57207ddb82 some style fixes for calendar 2012-07-21 17:09:10 +02:00
Bart Visscher 060b8865a4 DRY for getting calendar timezone setting 2012-07-21 00:45:30 +02:00
Lukas Reschke c04aa8d6a9 Add CSRF checks 2012-07-20 15:45:17 +02:00
Thomas Tanghus 06ff6c6d7d Added CSRF checks to Calendar. Expect some error messages - and report them ;) 2012-07-17 11:46:01 +02:00
Thomas Tanghus 258df5eea2 Added hook for postCreateUser. Probably fix for oc-1265. 2012-07-17 03:04:04 +02:00