Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-23 | 17 | -56/+285 |
|\ | |||||
| * | Wrong app check. | Thomas Tanghus | 2012-04-23 | 1 | -1/+1 |
| * | Contacts: Tipsyfied photo toolbar. | Thomas Tanghus | 2012-04-23 | 1 | -0/+1 |
| * | fix image viewer | Robin Appelman | 2012-04-22 | 1 | -1/+1 |
| * | add the option to disable file encryption while still being able to decrypt e... | Robin Appelman | 2012-04-22 | 4 | -3/+11 |
| * | Contacts: | Thomas Tanghus | 2012-04-22 | 8 | -48/+260 |
| * | Contacts: Clear cache for contact photo and thumbnail when it has been changed. | Thomas Tanghus | 2012-04-22 | 3 | -3/+11 |
* | | fix merge conflicts | Georg Ehrke | 2012-04-22 | 51 | -435/+1933 |
|\| | |||||
| * | 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 | 3 | -9/+9 |
| * | Link to icon was absolute. | Thomas Tanghus | 2012-04-22 | 1 | -1/+1 |
| * | Contacts: Added bg color and shadow to controls. I suck at CSS... | Thomas Tanghus | 2012-04-22 | 1 | -1/+1 |
| * | Missing double quote. | Thomas Tanghus | 2012-04-22 | 1 | -1/+1 |
| * | Contacts: Fix error on photo crop. | Thomas Tanghus | 2012-04-22 | 1 | -7/+6 |
| * | Contacts: Changed layout as discussed with JanC. Still WiP. | Thomas Tanghus | 2012-04-22 | 4 | -8/+467 |
| * | Don't trigger unnecessary change events. | Thomas Tanghus | 2012-04-22 | 1 | -1/+3 |
| * | Contacts: Fixed contact photo drag'n'drop upload - again... | Thomas Tanghus | 2012-04-22 | 1 | -4/+5 |
| * | Contacts: Add check for empty FN field. | Thomas Tanghus | 2012-04-22 | 1 | -0/+8 |
| * | make the button a bit more consistent to the other ownCloud interface | Frank Karlitschek | 2012-04-21 | 1 | -1/+1 |
| * | cleanup the admin page layout mess a bit. Still a lot to improve in the futur... | Frank Karlitschek | 2012-04-21 | 1 | -1/+1 |
| * | make field completely visible | Frank Karlitschek | 2012-04-21 | 1 | -1/+1 |
| * | use less space | Frank Karlitschek | 2012-04-21 | 1 | -3/+3 |
| * | structure the information a bit more so that is easier readable | Frank Karlitschek | 2012-04-21 | 1 | -4/+4 |
| * | fix a php notice | Georg Ehrke | 2012-04-21 | 2 | -1/+7 |
| * | fix merge conflicts | Georg Ehrke | 2012-04-21 | 11 | -115/+779 |
| |\ | |||||
| * \ | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-04-18 | 8 | -10/+49 |
| |\ \ | |||||
| * | | | 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 | 139 | -13812/+35948 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-04-15 | 6 | -12/+12 |
| |\ \ \ \ | |||||
| * \ \ \ \ | fix merge conflicts | Georg Ehrke | 2012-04-15 | 75 | -90/+334 |
| |\ \ \ \ \ | |||||
| * | | | | | | 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 |
| * | | | | | | fix class name | Georg Ehrke | 2012-04-13 | 1 | -1/+1 |
| * | | | | | | check permission check in share function | Georg Ehrke | 2012-04-13 | 1 | -0/+8 |
| * | | | | | | fix merge conflicts | Georg Ehrke | 2012-04-13 | 103 | -37027/+332 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | fix address of public shared calendars | Georg Ehrke | 2012-04-13 | 2 | -2/+2 |
| * | | | | | | | hide share tab in shared events | Georg Ehrke | 2012-04-13 | 3 | -0/+6 |
| * | | | | | | | fix calendarid in eventform and validation of calendarid | Georg Ehrke | 2012-04-12 | 4 | -11/+8 |
| * | | | | | | | fix bugs in share class | Georg Ehrke | 2012-04-12 | 2 | -1/+4 |
| * | | | | | | | fix bugs and optimize OC_Calendar_Object Class | Georg Ehrke | 2012-04-11 | 1 | -10/+8 |
| * | | | | | | | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-04-10 | 56 | -465/+2256 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | make shared events editable and add (empty) classes for alarm and attendees | Georg Ehrke | 2012-04-10 | 11 | -15/+54 |
| * | | | | | | | | fix bug in share lib of calendar | Georg Ehrke | 2012-04-10 | 1 | -1/+1 |
| * | | | | | | | | fix view of single shared events | Georg Ehrke | 2012-04-07 | 2 | -5/+4 |
| * | | | | | | | | fix path and class name | Georg Ehrke | 2012-04-07 | 2 | -3/+3 |
| * | | | | | | | | make dropdown menu work with single event sharing | Georg Ehrke | 2012-04-07 | 1 | -10/+16 |
| * | | | | | | | | add dropdown to eventform | Georg Ehrke | 2012-04-07 | 1 | -2/+10 |