Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of gitorious.org:owncloud/owncloud | Bjoern Schiessle | 2012-06-05 | 4 | -18/+18 |
|\ | |||||
| * | Calendar & Contacts: Store import progress in OC_Cache | Bart Visscher | 2012-06-04 | 4 | -18/+18 |
| | | | | | | | | | | | | 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. | ||||
* | | xss vulnerability fixed | Bjoern Schiessle | 2012-06-05 | 1 | -3/+3 |
|/ | |||||
* | fix potential XSS | Georg Ehrke | 2012-05-31 | 2 | -2/+2 |
| | |||||
* | Remove OC_App::register function | Bart Visscher | 2012-05-31 | 1 | -4/+0 |
| | | | | The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty. | ||||
* | Calendar: small cleanup of import progress writing | Bart Visscher | 2012-05-31 | 1 | -24/+15 |
| | |||||
* | fix status | Georg Ehrke | 2012-05-29 | 1 | -9/+5 |
| | | | | of timezone detection | ||||
* | Correct typo in last_insert_id for calendar and pg fix #oc-731 | Brice Maron | 2012-05-28 | 1 | -1/+1 |
| | |||||
* | add urlencode for caldav link | Georg Ehrke | 2012-05-28 | 1 | -0/+1 |
| | |||||
* | fix share for users with a point within their name | Georg Ehrke | 2012-05-26 | 1 | -3/+4 |
| | |||||
* | Merge branch 'calendar_dropimport' | Georg Ehrke | 2012-05-19 | 2 | -0/+119 |
|\ | |||||
| * | Merge branch 'master' into calendar_dropimport | Georg Ehrke | 2012-05-17 | 79 | -35/+940 |
| |\ | |||||
| * | | some little js fixes for drop import | Georg Ehrke | 2012-05-13 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into calendar_dropimport | Georg Ehrke | 2012-05-13 | 4 | -6/+7 |
| |\ \ | |||||
| * | | | add first version of drop import | Georg Ehrke | 2012-05-13 | 2 | -0/+119 |
| | | | | |||||
* | | | | fix for calendar | Georg Ehrke | 2012-05-19 | 1 | -2/+1 |
| | | | | |||||
* | | | | mark the apps as part of the shipped package and increase the requirement to ↵ | Frank Karlitschek | 2012-05-18 | 1 | -1/+2 |
| |_|/ |/| | | | | | | | | ownCloud 4 | ||||
* | | | fix paths to images and set height for calendar management dialog | Georg Ehrke | 2012-05-17 | 3 | -4/+5 |
| | | | |||||
* | | | update translations | Robin Appelman | 2012-05-17 | 8 | -8/+366 |
| | | | |||||
* | | | add caldav and carddav files in their old place for backward compatibility - ↵ | Georg Ehrke | 2012-05-16 | 2 | -0/+10 |
| | | | | | | | | | | | | add rewriterule for caldav and carddav | ||||
* | | | removing executable bit - again | Thomas Mueller | 2012-05-15 | 52 | -0/+0 |
| | | | |||||
* | | | better user permission check for files in ajax/calendar/ | Georg Ehrke | 2012-05-14 | 4 | -4/+20 |
| | | | |||||
* | | | some fixes for calendar's export.php | Georg Ehrke | 2012-05-14 | 1 | -0/+8 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | selective app loading for remote/public | Robin Appelman | 2012-05-14 | 1 | -0/+4 |
| | | | |||||
* | | | add post user delete hook for calendar sharing | Georg Ehrke | 2012-05-13 | 2 | -0/+19 |
| | | | |||||
* | | | update translations | Robin Appelman | 2012-05-13 | 18 | -20/+493 |
| |/ |/| | |||||
* | | hide share tab for new events, because you can't share an event that haven't ↵ | Georg Ehrke | 2012-05-13 | 1 | -2/+2 |
| | | | | | | | | got an id yet | ||||
* | | fix another php notice | Georg Ehrke | 2012-05-13 | 1 | -0/+1 |
| | | |||||
* | | fix another php notice | Georg Ehrke | 2012-05-13 | 1 | -3/+3 |
| | | |||||
* | | fix php notice and displaying of events | Georg Ehrke | 2012-05-13 | 1 | -1/+1 |
|/ | |||||
* | load remote and public paths from info.xml during upgrade instead of setting ↵ | Robin Appelman | 2012-05-11 | 3 | -3/+9 |
| | | | | them every time | ||||
* | 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 | 2 | -9/+16 |
| | |||||
* | revert 000d7ba97535f470f30be44e02140401b24b43e2 | Georg Ehrke | 2012-05-09 | 1 | -1/+1 |
| | |||||
* | fix bug in events.php | Georg Ehrke | 2012-05-09 | 1 | -1/+1 |
| | |||||
* | update translations | Robin Appelman | 2012-05-09 | 43 | -732/+1619 |
| | |||||
* | fix bug in calendar | Georg Ehrke | 2012-05-09 | 1 | -1/+1 |
| | |||||
* | Calendar: Resize content after creating calendar layout | Bart Visscher | 2012-05-08 | 1 | -0/+1 |
| | | | | The calendar can be higher than the window, this corrects for the scrollbar | ||||
* | fix for previous commit | Georg Ehrke | 2012-05-08 | 1 | -1/+1 |
| | |||||
* | fix calendar vulnerability | Georg Ehrke | 2012-05-08 | 1 | -1/+7 |
| | |||||
* | Create a function for linking to remote.php | Bart Visscher | 2012-05-07 | 3 | -4/+4 |
| | |||||
* | make calendar compatible with public.php | Georg Ehrke | 2012-05-07 | 4 | -4/+6 |
| | |||||
* | improve remote.php and create public.php | Georg Ehrke | 2012-05-07 | 1 | -1/+2 |
| | |||||
* | fix path of caldav in calendar management | Georg Ehrke | 2012-05-07 | 1 | -1/+1 |
| | |||||
* | fix pathes in calendar and contacts | Georg Ehrke | 2012-05-07 | 1 | -1/+1 |
| | |||||
* | fix merge conflicts | Georg Ehrke | 2012-05-07 | 20 | -56/+58 |
|\ | |||||
| * | ported the oc_template class | Frank Karlitschek | 2012-05-06 | 17 | -41/+41 |
| | | |||||
| * | Calendar: Fixed image paths. | Thomas Tanghus | 2012-05-06 | 1 | -5/+5 |
| | |