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
Georg Ehrke
a4c2893128
some more work on calendar import - new import is (nearly) done
2012-07-04 21:14:40 +02:00
Georg Ehrke
c036700c54
some more work on calendar import
2012-07-03 22:33:24 +02:00
Georg Ehrke
29a9559fa9
some work on calendar import dialog
2012-07-03 13:43:18 +02:00
Georg Ehrke
803f2c2517
some work on calendar import
2012-07-01 21:36:09 +02:00
Robin Appelman
75af5778a4
pass progresskey the correct way during calender import
2012-06-29 00:49:37 +02:00
Georg Ehrke
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +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
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
Georg Ehrke
3efa69bc84
update js files for new ajax pathes
2012-02-20 11:27:25 +01:00
Georg Ehrke
868cf46290
improve import function
2012-01-14 14:22:30 +01:00
Georg Ehrke
f9c4975a45
improve import form for calendar
2012-01-13 13:57:46 +01:00
Georg Ehrke
cd8f54ade2
update js of calendar import
2012-01-12 22:06:53 +01:00
Georg Ehrke
c40a1fcede
added import function as filehandler
2011-10-03 22:50:10 +02:00
