Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tasks | Bart Visscher | 2012-05-04 | 70 | -688/+1730 |
|\ | |||||
| * | Calendar: Fix repeating events | Bart Visscher | 2012-05-03 | 2 | -2/+5 |
| * | Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud | Bart Visscher | 2012-05-03 | 2 | -2/+18 |
| |\ | |||||
| | * | Handle event exceptions in calendar app. Execeptions to recurring events are ... | Henning Becker | 2012-02-17 | 1 | -1/+20 |
| * | | ported oc_db | Frank Karlitschek | 2012-05-03 | 4 | -37/+37 |
| * | | ported oc_json | Frank Karlitschek | 2012-05-03 | 34 | -112/+112 |
| * | | port oc_response | Frank Karlitschek | 2012-05-03 | 1 | -2/+2 |
| * | | port checkAppEnabled | Frank Karlitschek | 2012-05-02 | 5 | -5/+5 |
| * | | fix install | Frank Karlitschek | 2012-05-02 | 1 | -2/+2 |
| * | | create folder 'remote' for the remote services like caldav, carddav and webdav | Georg Ehrke | 2012-05-02 | 3 | -3/+9 |
| * | | port oc_preferences | Frank Karlitschek | 2012-05-02 | 16 | -28/+28 |
| * | | port appconfig | Frank Karlitschek | 2012-05-02 | 1 | -1/+1 |
| * | | ported the oc_app calls | Frank Karlitschek | 2012-05-02 | 3 | -5/+5 |
| * | | ported the rest of the OC_Helper calls | Frank Karlitschek | 2012-05-02 | 2 | -2/+2 |
| * | | port linkto and serverHost | Frank Karlitschek | 2012-05-01 | 6 | -6/+6 |
| * | | ported checkLoggedIn and checkAdmin | Frank Karlitschek | 2012-05-01 | 2 | -2/+2 |
| * | | ported addSyript and other small stuff | Frank Karlitschek | 2012-05-01 | 3 | -10/+10 |
| * | | porting of OC_User to public API complete. | Frank Karlitschek | 2012-05-01 | 3 | -3/+3 |
| * | | ported getUser | Frank Karlitschek | 2012-05-01 | 29 | -66/+66 |
| * | | ported isLoggedIn | Frank Karlitschek | 2012-05-01 | 2 | -2/+2 |
| * | | finish porting of the LOG calls or the apps to the public api | Frank Karlitschek | 2012-05-01 | 1 | -2/+2 |
| * | | port to use the new public api | Frank Karlitschek | 2012-05-01 | 2 | -6/+6 |
| * | | fix a PHP Notice | Georg Ehrke | 2012-04-30 | 1 | -6/+9 |
| * | | fix path in calendars geo.js | Georg Ehrke | 2012-04-30 | 1 | -1/+1 |
| * | | removing executable bit from various files | Thomas Mueller | 2012-04-30 | 5 | -0/+0 |
| * | | make *DAV work with movable apps | Georg Ehrke | 2012-04-26 | 1 | -1/+1 |
| * | | fix merge conflicts | Georg Ehrke | 2012-04-26 | 6 | -20/+19 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-22 | 3 | -10/+10 |
| | |\ \ | |||||
| | * \ \ | fix merge conflicts | Georg Ehrke | 2012-04-21 | 37 | -392/+1429 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-15 | 15 | -31/+11 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-13 | 10 | -57/+122 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-29 | 2 | -2/+2 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-25 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-19 | 17 | -87/+142 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime | Georg Ehrke | 2012-02-24 | 6 | -22/+22 |
| * | | | | | | | | | | make calendar work with movable apps | Georg Ehrke | 2012-04-23 | 2 | -4/+4 |
| * | | | | | | | | | | fix pathes of shared calendars | Georg Ehrke | 2012-04-23 | 1 | -2/+2 |
| * | | | | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-22 | 38 | -403/+1428 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | hide alarm and attendees tab | Georg Ehrke | 2012-04-22 | 2 | -8/+8 |
| | * | | | | | | | | | Personal settings: Emphasized labels etc, mono-spaced generated paths and mov... | Thomas Tanghus | 2012-04-22 | 1 | -2/+2 |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | fix a php notice | Georg Ehrke | 2012-04-21 | 2 | -1/+7 |
| | * | | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-21 | 2 | -64/+74 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | implement shared calendar activation on server side | Georg Ehrke | 2012-04-18 | 4 | -2/+24 |
| | * | | | | | | | | | implement shared calendar activation on js-side | Georg Ehrke | 2012-04-18 | 1 | -4/+4 |
| | * | | | | | | | | | resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts | Georg Ehrke | 2012-04-18 | 1 | -3/+7 |
| | * | | | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-15 | 3 | -23/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-15 | 13 | -17/+29 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | fix unsharing of events | Georg Ehrke | 2012-04-13 | 2 | -4/+4 |
| | * | | | | | | | | | | add chosen script to calendar | Georg Ehrke | 2012-04-13 | 1 | -0/+2 |
| | * | | | | | | | | | | fix public sharing of calendars | Georg Ehrke | 2012-04-13 | 2 | -3/+3 |