summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into movable_appsGeorg Ehrke2012-04-2317-56/+285
|\
| * Wrong app check.Thomas Tanghus2012-04-231-1/+1
| * Contacts: Tipsyfied photo toolbar.Thomas Tanghus2012-04-231-0/+1
| * fix image viewerRobin Appelman2012-04-221-1/+1
| * add the option to disable file encryption while still being able to decrypt e...Robin Appelman2012-04-224-3/+11
| * Contacts:Thomas Tanghus2012-04-228-48/+260
| * Contacts: Clear cache for contact photo and thumbnail when it has been changed.Thomas Tanghus2012-04-223-3/+11
* | fix merge conflictsGeorg Ehrke2012-04-2251-435/+1933
|\|
| * hide alarm and attendees tabGeorg Ehrke2012-04-222-8/+8
| * Personal settings: Emphasized labels etc, mono-spaced generated paths and mov...Thomas Tanghus2012-04-223-9/+9
| * Link to icon was absolute.Thomas Tanghus2012-04-221-1/+1
| * Contacts: Added bg color and shadow to controls. I suck at CSS...Thomas Tanghus2012-04-221-1/+1
| * Missing double quote.Thomas Tanghus2012-04-221-1/+1
| * Contacts: Fix error on photo crop.Thomas Tanghus2012-04-221-7/+6
| * Contacts: Changed layout as discussed with JanC. Still WiP.Thomas Tanghus2012-04-224-8/+467
| * Don't trigger unnecessary change events.Thomas Tanghus2012-04-221-1/+3
| * Contacts: Fixed contact photo drag'n'drop upload - again...Thomas Tanghus2012-04-221-4/+5
| * Contacts: Add check for empty FN field.Thomas Tanghus2012-04-221-0/+8
| * make the button a bit more consistent to the other ownCloud interfaceFrank Karlitschek2012-04-211-1/+1
| * cleanup the admin page layout mess a bit. Still a lot to improve in the futur...Frank Karlitschek2012-04-211-1/+1
| * make field completely visibleFrank Karlitschek2012-04-211-1/+1
| * use less spaceFrank Karlitschek2012-04-211-3/+3
| * structure the information a bit more so that is easier readableFrank Karlitschek2012-04-211-4/+4
| * fix a php noticeGeorg Ehrke2012-04-212-1/+7
| * fix merge conflictsGeorg Ehrke2012-04-2111-115/+779
| |\
| * \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-188-10/+49
| |\ \
| * | | implement shared calendar activation on server sideGeorg Ehrke2012-04-184-2/+24
| * | | implement shared calendar activation on js-sideGeorg Ehrke2012-04-181-4/+4
| * | | resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflictsGeorg Ehrke2012-04-181-3/+7
| * | | fix merge conflictsGeorg Ehrke2012-04-15139-13812/+35948
| |\ \ \
| * \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-156-12/+12
| |\ \ \ \
| * \ \ \ \ fix merge conflictsGeorg Ehrke2012-04-1575-90/+334
| |\ \ \ \ \
| * | | | | | fix unsharing of eventsGeorg Ehrke2012-04-132-4/+4
| * | | | | | add chosen script to calendarGeorg Ehrke2012-04-131-0/+2
| * | | | | | fix public sharing of calendarsGeorg Ehrke2012-04-132-3/+3
| * | | | | | fix class nameGeorg Ehrke2012-04-131-1/+1
| * | | | | | check permission check in share functionGeorg Ehrke2012-04-131-0/+8
| * | | | | | fix merge conflictsGeorg Ehrke2012-04-13103-37027/+332
| |\ \ \ \ \ \
| * | | | | | | fix address of public shared calendarsGeorg Ehrke2012-04-132-2/+2
| * | | | | | | hide share tab in shared eventsGeorg Ehrke2012-04-133-0/+6
| * | | | | | | fix calendarid in eventform and validation of calendaridGeorg Ehrke2012-04-124-11/+8
| * | | | | | | fix bugs in share classGeorg Ehrke2012-04-122-1/+4
| * | | | | | | fix bugs and optimize OC_Calendar_Object ClassGeorg Ehrke2012-04-111-10/+8
| * | | | | | | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-1056-465/+2256
| |\ \ \ \ \ \ \
| * | | | | | | | make shared events editable and add (empty) classes for alarm and attendeesGeorg Ehrke2012-04-1011-15/+54
| * | | | | | | | fix bug in share lib of calendarGeorg Ehrke2012-04-101-1/+1
| * | | | | | | | fix view of single shared eventsGeorg Ehrke2012-04-072-5/+4
| * | | | | | | | fix path and class nameGeorg Ehrke2012-04-072-3/+3
| * | | | | | | | make dropdown menu work with single event sharingGeorg Ehrke2012-04-071-10/+16
| * | | | | | | | add dropdown to eventformGeorg Ehrke2012-04-071-2/+10