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

4905 Commits

Author SHA1 Message Date
Georg Ehrke 2e44ffaf02 another ui fix 2012-06-13 22:14:40 +02:00
Georg Ehrke b1139e977a fix a ui bug for calendar sharing 2012-06-13 22:12:54 +02:00
Georg Ehrke 6bd80d6457 show username of the body who shares in the summary 2012-06-13 22:07:23 +02:00
Georg Ehrke 7d29bee859 fix merge conflicts 2012-06-13 21:40:05 +02:00
Bart Visscher 12b34d2dda Whitespace fix 2012-06-13 21:39:12 +02:00
Bart Visscher c98b56d2da CSSMin: Remove debug code 2012-06-13 21:39:12 +02:00
Bart Visscher 61b044e00e Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts 2012-06-13 21:39:12 +02:00
Bart Visscher 7a8e7f18db Calendar: Clicking #datecontrol_date gives datepicker to jump to date 2012-06-13 21:39:12 +02:00
Bart Visscher 4da6b3a391 Calendar: Make button of #datecontrol_date 2012-06-13 21:39:12 +02:00
Georg Ehrke c24752dc1d Merge branch 'master' into calendar_export 2012-06-13 21:38:33 +02:00
Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00
Michael Gapczynski bd01e93469 Add support for mounting Google Drive in external storage UI 2012-06-13 13:54:50 -04:00
Thomas Tanghus 613a122437 Remove check for encryption. 2012-06-13 19:03:34 +02:00
Thomas Tanghus d33d599b1b Remove debug statements. 2012-06-13 18:57:12 +02:00
Thomas Tanghus bc1e8cb0a2 Contacts: implemented CSRF prevention. 2012-06-13 17:35:42 +02:00
Thomas Tanghus 89464721c7 Added JSON methods for CSRF prevention. Make request token accessible from template and add js var. 2012-06-13 17:33:19 +02:00
Frank Karlitschek 9e9c40eabd fix time call 2012-06-13 17:27:49 +02:00
Bjoern Schiessle b9d5f510c3 urlencode link fort password reset (bug #970) 2012-06-13 17:22:28 +02:00
Georg Ehrke 3a8b280c06 Merge branch 'master' into calendar_export 2012-06-13 15:29:47 +02:00
Georg Ehrke 9bdad6fdbf fix merge conflicts 2012-06-13 11:40:00 +02:00
Michael Gapczynski 6f55a52858 Fix incorrect creation of filesystem for user@group in data folder during shares 2012-06-12 21:33:05 -04:00
Bartek Przybylski db1353655b check for view before trying to invoke method on object 2012-06-13 00:32:44 +02:00
Thomas Mueller 521294d0bf fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987 2012-06-12 23:16:26 +02:00
Michael Gapczynski 790ae70e32 Create directory for mount point if it doesn't already exist 2012-06-12 15:25:34 -04:00
Georg Ehrke deb2f87556 increase version of calendar app to force db upgrade 2012-06-12 19:53:26 +02:00
Georg Ehrke dc0adbad02 increase possible size of uri in database - fix oc-140 2012-06-12 19:52:25 +02:00
Georg Ehrke f7727a322d Merge branch 'master' into calendar_repeat 2012-06-12 19:26:52 +02:00
Michael Gapczynski 5f80be7664 Add support for mounting Dropbox in external storage UI 2012-06-12 11:36:43 -04:00
Bjoern Schiessle 8626f04f5d Label the delete operation "unshare" for files in the "Shared" folder to reduce 
confusion about the operation.
 2012-06-12 16:27:24 +02:00
Georg Ehrke 71573f7934 Merge branch 'master' into calendar_repeat 2012-06-12 15:58:01 +02:00
Georg Ehrke c9d408ff8c automatic cache repeating events after an update 2012-06-12 15:56:51 +02:00
Bjoern Schiessle f6e7c633a0 block slashes only for new files and new folders but not for file upload from url (bug #964) 2012-06-12 14:11:28 +02:00
Thomas Tanghus c44591e27a Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +02:00
Bjoern Schiessle b38ce8adfd committed patch (bug #967) to add missing translations for file actions 2012-06-12 11:39:03 +02:00
Bjoern Schiessle 1b6dd6628a applied patch provided by bug #966 to fix broken user specific quota settings 2012-06-12 11:18:34 +02:00
Thomas Mueller 5e37a10334 PDF.JS updated, compatibility.js added for browser support, should fix: oc-395 2012-06-12 00:50:34 +02:00
Marco B 3be5e2af26 utf8 in der DB config 2012-06-11 23:04:28 +02:00
Thomas Tanghus d623deb298 Add .vimrc to .gitignore. 2012-06-11 22:55:10 +02:00
Georg Ehrke 66c3ddcd74 Merge branch 'master' into calendar_repeat 2012-06-11 22:18:46 +02:00
Georg Ehrke 3c9be43aa4 add some information about repeating events caching on personal settings page 2012-06-11 22:16:26 +02:00
Thomas Tanghus ac11647d7a Fix js for missing address fields. 2012-06-11 22:14:21 +02:00
Thomas Tanghus 4b86cbcb6f Quick fix for index errors when not importing from files. 2012-06-11 22:14:21 +02:00
Thomas Tanghus c75f9f9397 Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e 2012-06-11 22:14:21 +02:00
Thomas Tanghus 8af53829d5 Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:14:21 +02:00
Georg Ehrke 08a3a4f185 fix a bug in OC_Calendar_Repeat 2012-06-11 21:43:24 +02:00
Bart Visscher 759ddcbf32 Tasks: Fix resizing of the content part 2012-06-11 20:34:06 +02:00
Bart Visscher 0eee140eaf Gallery: remove extra include of lib/base.php 2012-06-11 20:34:06 +02:00
Bart Visscher eddad8bedb Calendar: remove unused markup from #controls 2012-06-11 20:34:06 +02:00
Lukas Reschke f9bf34340c Removed unecessary sanitization 2012-06-11 19:49:24 +02:00
Lukas Reschke 68f819ee20 Removed double sanitization 2012-06-11 19:47:42 +02:00