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

548 commits

Author SHA1 Message Date
Georg Ehrke
cac995ee9f some more work on repeating events caching 2012-06-09 11:49:25 +02:00
Georg Ehrke
ac74d87e3e some work on repeating events caching 2012-06-08 22:22:16 +02:00
Georg Ehrke
65cd15ca15 fix merge conflicts 2012-06-08 11:21:55 +02:00
Thomas Tanghus
e1f4978150 Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:21:24 +02:00
Thomas Tanghus
ca0108aabf Corrected typos. 2012-06-06 11:50:49 +02:00
Georg Ehrke
2fa19ce9a0 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Robin Appelman
f7d221f5f0 update translations 2012-06-06 00:29:28 +02:00
Bjoern Schiessle
564b0358f9 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 10:38:42 +02:00
Bjoern Schiessle
dcc5b5ca0a xss vulnerability fixed 2012-06-05 10:37:22 +02:00
Bart Visscher
091b343d5c Calendar & Contacts: Store import progress in OC_Cache 
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
 2012-06-04 22:24:17 +02:00
Georg Ehrke
46b3b30d46 add status 
file for repeating events caching
 2012-06-01 13:47:48 +02:00
Georg Ehrke
e75146a811 Merge branch 'master' into calendar_repeat 2012-06-01 11:40:39 +02:00
Georg Ehrke
7a8e322679 some work for repeating events caching 2012-06-01 11:30:54 +02:00
Georg Ehrke
f0bd571866 fix potential XSS 2012-05-31 20:01:12 +02:00
Bart Visscher
a33f580db1 Remove OC_App::register function 
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
 2012-05-31 13:01:30 +02:00
Bart Visscher
2ae58ee6c0 Calendar: small cleanup of import progress writing 2012-05-31 13:01:30 +02:00
Georg Ehrke
29b17672b4 a bit of work for repeating events caching 2012-05-29 19:46:17 +02:00
Georg Ehrke
482caa04f9 add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke
a56f2dbce7 Merge branch 'master' into calendar_repeat 2012-05-29 13:16:08 +02:00
Georg Ehrke
75afc09b9d fix status 
of timezone detection
 2012-05-29 13:14:05 +02:00
Brice Maron
22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Georg Ehrke
5e7b318e42 add urlencode for caldav link 2012-05-28 10:49:27 +02:00
Georg Ehrke
459114b994 Merge branch 'master' into calendar_repeat 2012-05-26 22:54:24 +02:00
Georg Ehrke
a1c9191006 fix share for users with a point within their name 2012-05-26 15:23:46 +02:00
Georg Ehrke
bc9accd26e Merge branch 'master' into calendar_repeat 2012-05-25 10:30:00 +02:00
Georg Ehrke
ad66bb9c84 Merge branch 'calendar_dropimport' 2012-05-19 18:58:24 +02:00
Georg Ehrke
07fa8da278 fix for calendar 2012-05-19 15:05:58 +02:00
Frank Karlitschek
9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Georg Ehrke
7d49bf7f6e some changes in calendar repeat class 2012-05-18 11:48:18 +02:00
Georg Ehrke
f7366de673 Merge branch 'master' into calendar_repeat 2012-05-17 22:17:23 +02:00
Georg Ehrke
38b93653a1 Merge branch 'master' into calendar_dropimport 2012-05-17 22:17:06 +02:00
Georg Ehrke
6146b6a131 fix paths to images and set height for calendar management dialog 2012-05-17 21:51:38 +02:00
Robin Appelman
ac8bfc218e update translations 2012-05-17 00:36:21 +02:00
Georg Ehrke
9e83c3f823 add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav 2012-05-16 21:05:15 +02:00
Thomas Mueller
583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Georg Ehrke
18c8896b3c better user permission check for files in ajax/calendar/ 2012-05-14 15:59:06 +02:00
Georg Ehrke
84827ff992 some fixes for calendar's export.php 2012-05-14 15:52:24 +02:00
Georg Ehrke
9c8eb104b6 check user permissions in calendar's changepermission.php 2012-05-14 15:42:16 +02:00
Georg Ehrke
55eb318265 check user permissions in calendar's unshare.php 2012-05-14 15:42:16 +02:00
Robin Appelman
e7c106d91e selective app loading for remote/public 2012-05-14 00:28:28 +02:00
Georg Ehrke
ddf0903ace add post user delete hook for calendar sharing 2012-05-13 20:03:52 +02:00
Robin Appelman
ee0294bbb1 update translations 2012-05-13 20:00:34 +02:00
Georg Ehrke
da9486157d Merge branch 'master' into calendar_repeat 2012-05-13 19:10:49 +02:00
Georg Ehrke
0892abd050 some little js fixes for drop import 2012-05-13 15:08:27 +02:00
Georg Ehrke
62a86748b5 Merge branch 'master' into calendar_dropimport 2012-05-13 15:06:02 +02:00
Georg Ehrke
63a1b066bc add first version of drop import 2012-05-13 15:05:57 +02:00
Georg Ehrke
5ac10a9c0e hide share tab for new events, because you can't share an event that haven't got an id yet 2012-05-13 12:28:28 +02:00
Georg Ehrke
f45411f79d fix another php notice 2012-05-13 12:25:26 +02:00
Georg Ehrke
85cc34fd05 fix another php notice 2012-05-13 12:14:08 +02:00
Georg Ehrke
f6dc158d51 fix php notice and displaying of events 2012-05-13 12:02:36 +02:00