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
|
9f82edc157
|
Merge branch 'master' into oc_error
|
2012-06-13 15:30:04 +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 |
|
Georg Ehrke
|
9edd40354e
|
Merge branch 'master' into calendar_repeat
|
2012-06-11 19:46:12 +02:00 |
|
Lukas Reschke
|
ad36fc8938
|
Fix double sanitization
|
2012-06-11 19:43:37 +02:00 |
|
Lukas Reschke
|
d2a34f4b35
|
Fixes a issue with the log
|
2012-06-11 19:33:16 +02:00 |
|
Lukas Reschke
|
6defbc7f4d
|
Removed some unessecary sanitizations
|
2012-06-11 19:20:48 +02:00 |
|
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
|
Bjoern Schiessle
|
1d493a70e7
|
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
|
2012-06-11 18:13:12 +02:00 |
|
Lukas Reschke
|
6d68b7620c
|
Check for string
|
2012-06-11 18:12:46 +02:00 |
|
Bjoern Schiessle
|
18d19b022f
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-11 17:28:15 +02:00 |
|
Georg Ehrke
|
09e744b793
|
connect OC_Calendar_repeat to events.php
|
2012-06-11 17:25:03 +02:00 |
|
Georg Ehrke
|
009c4c9045
|
add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public
|
2012-06-11 17:15:50 +02:00 |
|
Georg Ehrke
|
2dd84373c1
|
fix bug in OC_Calendar_Repeat
|
2012-06-11 17:13:20 +02:00 |
Arthur Schiwon
|
fcc9a5c8d4
|
LDAP: offer config option for Group Display Name attribute
|
2012-06-11 16:48:43 +02:00 |
|
Bjoern Schiessle
|
739589f485
|
make sure that contact data are always utf8 encoded to avoid encoding problems
|
2012-06-11 16:26:21 +02:00 |
|
Georg Ehrke
|
24a1ab8c15
|
Merge branch 'master' into calendar_repeat
|
2012-06-11 15:38:02 +02:00 |
|
Georg Ehrke
|
44e62c03e2
|
increase version number of calendar
|
2012-06-11 15:37:19 +02:00 |