Thomas Tanghus
|
2296521a2e
|
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
|
2012-05-04 11:16:29 +02:00 |
Bart Visscher
|
07ff1e723a
|
Calendar: Fix repeating events
|
2012-05-03 23:33:44 +02:00 |
|
Bart Visscher
|
077ea94f71
|
Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
apps/calendar/ajax/events.php
|
2012-05-03 23:18:43 +02:00 |
Frank Karlitschek
|
97a8af7f25
|
ported oc_db
|
2012-05-03 13:06:08 +02:00 |
|
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Frank Karlitschek
|
351740601a
|
port oc_response
|
2012-05-03 10:46:27 +02:00 |
|
Frank Karlitschek
|
4fe90f62f4
|
port checkAppEnabled
|
2012-05-02 19:08:37 +02:00 |
|
Frank Karlitschek
|
eec7c3833c
|
fix install
|
2012-05-02 19:02:41 +02:00 |
Georg Ehrke
|
da03d05700
|
create folder 'remote' for the remote services like caldav, carddav and webdav
|
2012-05-02 16:41:23 +02:00 |
|
Frank Karlitschek
|
82a61e2e1a
|
port oc_preferences
|
2012-05-02 15:54:34 +02:00 |
|
Frank Karlitschek
|
ff66600bc0
|
port appconfig
|
2012-05-02 14:11:29 +02:00 |
|
Frank Karlitschek
|
2fe646dcec
|
ported the oc_app calls
|
2012-05-02 00:50:26 +02:00 |
|
Frank Karlitschek
|
93b63cf375
|
ported the rest of the OC_Helper calls
|
2012-05-02 00:20:45 +02:00 |
|
Frank Karlitschek
|
e48f511606
|
port linkto and serverHost
|
2012-05-01 23:19:39 +02:00 |
|
Frank Karlitschek
|
31e32e3c10
|
ported checkLoggedIn and checkAdmin
|
2012-05-01 22:59:38 +02:00 |
|
Frank Karlitschek
|
1a2bbd2ee4
|
ported addSyript and other small stuff
|
2012-05-01 20:03:41 +02:00 |
|
Frank Karlitschek
|
254b8b9506
|
porting of OC_User to public API complete.
What better thing to do during a long train ride than refactoring ;-)
|
2012-05-01 19:04:20 +02:00 |
|
Frank Karlitschek
|
70cea18cce
|
ported getUser
|
2012-05-01 18:50:31 +02:00 |
|
Frank Karlitschek
|
5bf69237b2
|
ported isLoggedIn
|
2012-05-01 18:46:15 +02:00 |
|
Frank Karlitschek
|
d0554bef06
|
finish porting of the LOG calls or the apps to the public api
|
2012-05-01 17:38:27 +02:00 |
|
Frank Karlitschek
|
e8ec999090
|
port to use the new public api
|
2012-05-01 09:49:22 +02:00 |
|
Georg Ehrke
|
8a3d41c043
|
fix a PHP Notice
|
2012-04-30 21:46:33 +02:00 |
|
Georg Ehrke
|
6c908a4cd0
|
fix path in calendars geo.js
|
2012-04-30 21:18:54 +02:00 |
Thomas Mueller
|
07f2e316e4
|
removing executable bit from various files
|
2012-04-30 12:05:57 +02:00 |
|
Georg Ehrke
|
5fda0e4b3b
|
make *DAV work with movable apps
|
2012-04-26 21:56:29 +02:00 |
|
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
9092692b8e
|
make calendar work with movable apps
|
2012-04-23 20:32:55 +02:00 |
|
Georg Ehrke
|
10eea3f464
|
fix pathes of shared calendars
|
2012-04-23 20:13:55 +02:00 |
|
Georg Ehrke
|
e888f4d9bc
|
Merge branch 'master' into sabredav_1.6
|
2012-04-22 13:20:50 +02:00 |
|
Georg Ehrke
|
4c2cf35050
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
|
Georg Ehrke
|
1bba445642
|
hide alarm and attendees tab
|
2012-04-22 13:15:24 +02:00 |
|
Thomas Tanghus
|
f08cfcecec
|
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
|
2012-04-22 03:59:28 +02:00 |
|
Georg Ehrke
|
0918fc7d91
|
fix merge conflicts
|
2012-04-21 23:21:50 +02:00 |
|
Georg Ehrke
|
74e5402711
|
fix a php notice
|
2012-04-21 22:27:19 +02:00 |
|
Georg Ehrke
|
e29ae46609
|
fix merge conflicts
|
2012-04-21 22:12:31 +02:00 |
|
Georg Ehrke
|
711aa229b8
|
Merge branch 'master' into movable_apps
|
2012-04-20 22:41:39 +02:00 |
|
Georg Ehrke
|
3706bbec1b
|
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
|
2012-04-19 20:30:58 +02:00 |
|
Georg Ehrke
|
de71842888
|
implement shared calendar activation on server side
|
2012-04-18 11:50:12 +02:00 |
|
Georg Ehrke
|
8959e0af3d
|
implement shared calendar activation on js-side
|
2012-04-18 11:39:00 +02:00 |
|
Georg Ehrke
|
7402543d3e
|
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
|
2012-04-18 09:53:54 +02:00 |
|
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
|
Georg Ehrke
|
77cefdedb8
|
Merge branch 'master' into sabredav_1.6
|
2012-04-15 22:28:11 +02:00 |
|
Georg Ehrke
|
dc18e65b46
|
fix merge conflicts
|
2012-04-15 22:26:55 +02:00 |
Jakob Sack
|
0b426b5e64
|
Display correct URL in caldav and carddav paths
|
2012-04-15 16:50:45 +02:00 |
|
Jakob Sack
|
9b1d6246a9
|
Remove useless, unmaintained dav.php
|
2012-04-15 16:50:44 +02:00 |
|
Georg Ehrke
|
e292b1fcdb
|
fix merge conflicts
|
2012-04-15 12:43:07 +02:00 |
Robin Appelman
|
b1bcc60d83
|
reuse OC_L10N objects
|
2012-04-14 16:44:15 +02:00 |
|
Robin Appelman
|
926b2b78fe
|
keep version numbers in their own files for faster reading
|
2012-04-14 16:29:11 +02:00 |
|
Robin Appelman
|
3babb8c22c
|
improve flexibility of search providers a bit
|
2012-04-14 11:29:54 +02:00 |
|
Georg Ehrke
|
e256ac8791
|
fix unsharing of events
|
2012-04-13 21:49:24 -04:00 |