f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
06ff6c6d7d
Added CSRF checks to Calendar. Expect some error messages - and report them ;)
2012-07-17 11:46:01 +02:00
a4c2893128
some more work on calendar import - new import is (nearly) done
2012-07-04 21:14:40 +02:00
c036700c54
some more work on calendar import
2012-07-03 22:33:24 +02:00
b6cff93254
fix spelling fail in code
2012-07-03 16:47:46 +02:00
29a9559fa9
some work on calendar import dialog
2012-07-03 13:43:18 +02:00
e89a0949c4
remove some whitespace
2012-07-01 23:32:21 +02:00
803f2c2517
some work on calendar import
2012-07-01 21:36:09 +02:00
ce331bd1d3
improvements for dropoimport
2012-06-30 23:18:41 +02:00
f15941a967
improve dropimport
2012-06-30 22:26:29 +02:00
376431fa0d
import works now for dropimport
2012-06-30 22:08:30 +02:00
390f5cc89f
some work on (drop)import)
2012-06-30 15:17:29 +02:00
31ec93bd00
remove a lot of closing php tags and empty lines at a file's end in calendar app
2012-06-16 09:45:17 +02:00
ad32c20300
Agree on argument type (cleaned this time).
2012-06-15 01:51:26 +02:00
6d43e6565e
Revert "Agree on argument type."
...
This reverts commit 0f6b1be0e6
2012-06-15 00:53:13 +02:00
0f6b1be0e6
Agree on argument type.
2012-06-15 00:50:42 +02:00
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +02:00
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
2ae58ee6c0
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
63a1b066bc
add first version of drop import
2012-05-13 15:05:57 +02:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
ab96fa67c8
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
b7de1850a0
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
Georg Ehrke
Thomas Tanghus
Bart Visscher
Thomas Mueller
Frank Karlitschek
Robin Appelman
Frank Karlitschek
Georg Ehrke