Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge branch 'master' into calendar_dropimport | Georg Ehrke | 2012-05-13 | 2 | -1/+2 | |
| | |\ \ | ||||||
| | * | | | add first version of drop import | Georg Ehrke | 2012-05-13 | 1 | -0/+74 | |
| | | | | | ||||||
* | | | | | Added CSRF checks | Lukas Reschke | 2012-07-20 | 14 | -3/+19 | |
| | | | | | ||||||
* | | | | | another fix for oc-1044 | Georg Ehrke | 2012-06-24 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | fix calendar | Georg Ehrke | 2012-06-21 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | make edit event form work with DateTime Property UTC | Georg Ehrke | 2012-06-21 | 1 | -0/+8 | |
| | | | | | ||||||
* | | | | | use sanitizeHTML() function | Bjoern Schiessle | 2012-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Calendar: Write-close session to enable parallel events.php requests | Bart Visscher | 2012-06-19 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | fix merge conflicts | Georg Ehrke | 2012-06-16 | 23 | -38/+21 | |
| | | | | | ||||||
* | | | | | remove a closing php tag in calendar | Georg Ehrke | 2012-06-16 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | show username of the body who shares in the summary | Georg Ehrke | 2012-06-13 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | Corrected typos. | Thomas Tanghus | 2012-06-06 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | fix status | Georg Ehrke | 2012-05-29 | 1 | -9/+5 | |
|/ / / / | | | | | | | | | | | | | of timezone detection | |||||
* | | / | fix for calendar | Georg Ehrke | 2012-05-19 | 1 | -2/+1 | |
| |_|/ |/| | | ||||||
* | | | removing executable bit - again | Thomas Mueller | 2012-05-15 | 33 | -0/+0 | |
| | | | ||||||
* | | | better user permission check for files in ajax/calendar/ | Georg Ehrke | 2012-05-14 | 4 | -4/+20 | |
| | | | ||||||
* | | | check user permissions in calendar's changepermission.php | Georg Ehrke | 2012-05-14 | 1 | -0/+8 | |
| | | | ||||||
* | | | check user permissions in calendar's unshare.php | Georg Ehrke | 2012-05-14 | 1 | -0/+8 | |
| |/ |/| | ||||||
* | | fix another php notice | Georg Ehrke | 2012-05-13 | 1 | -0/+1 | |
| | | ||||||
* | | fix php notice and displaying of events | Georg Ehrke | 2012-05-13 | 1 | -1/+1 | |
|/ | ||||||
* | Correct undef variable mistake from prev commit | Brice Maron | 2012-05-10 | 1 | -2/+3 | |
| | ||||||
* | Correct calendar loading when calendar are from hooks. fix oc-619 | Brice Maron | 2012-05-10 | 1 | -9/+13 | |
| | ||||||
* | fix bug in events.php | Georg Ehrke | 2012-05-09 | 1 | -1/+1 | |
| | ||||||
* | fix for previous commit | Georg Ehrke | 2012-05-08 | 1 | -1/+1 | |
| | ||||||
* | fix calendar vulnerability | Georg Ehrke | 2012-05-08 | 1 | -1/+7 | |
| | ||||||
* | ported the oc_template class | Frank Karlitschek | 2012-05-06 | 10 | -11/+11 | |
| | ||||||
* | Calendar: Use array_merge to join event arrays | Bart Visscher | 2012-05-04 | 1 | -1/+1 | |
| | ||||||
* | Calendar: Fix repeating events | Bart Visscher | 2012-05-03 | 1 | -1/+1 | |
| | ||||||
* | Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud | Bart Visscher | 2012-05-03 | 1 | -1/+0 | |
|\ | | | | | | | | | Conflicts: apps/calendar/ajax/events.php | |||||
| * | Handle event exceptions in calendar app. Execeptions to recurring events are ↵ | Henning Becker | 2012-02-17 | 1 | -1/+20 | |
| | | | | | | | | not shown anymore. | |||||
* | | ported oc_json | Frank Karlitschek | 2012-05-03 | 33 | -111/+111 | |
| | | ||||||
* | | port checkAppEnabled | Frank Karlitschek | 2012-05-02 | 2 | -2/+2 | |
| | | ||||||
* | | port oc_preferences | Frank Karlitschek | 2012-05-02 | 10 | -13/+13 | |
| | | ||||||
* | | porting of OC_User to public API complete. | Frank Karlitschek | 2012-05-01 | 3 | -3/+3 | |
| | | | | | | | | What better thing to do during a long train ride than refactoring ;-) | |||||
* | | ported getUser | Frank Karlitschek | 2012-05-01 | 19 | -26/+26 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | fix a PHP Notice | Georg Ehrke | 2012-04-30 | 1 | -6/+9 | |
| | | ||||||
* | | removing executable bit from various files | Thomas Mueller | 2012-04-30 | 2 | -0/+0 | |
| | | ||||||
* | | fix merge conflicts | Georg Ehrke | 2012-04-26 | 4 | -12/+11 | |
|\ \ | ||||||
| * \ | fix merge conflicts | Georg Ehrke | 2012-04-21 | 13 | -176/+163 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-15 | 8 | -10/+4 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-04-13 | 3 | -13/+52 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into sabredav_1.6 | Georg Ehrke | 2012-03-29 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | 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 | 5 | -44/+67 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime | Georg Ehrke | 2012-02-24 | 4 | -12/+12 | |
| | | | | | | | | | ||||||
* | | | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-22 | 13 | -176/+161 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-21 | 1 | -62/+72 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| * | | | | | | | | implement shared calendar activation on server side | Georg Ehrke | 2012-04-18 | 1 | -0/+12 | |
| | | | | | | | | |