summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-2215-39/+508
|\
| * 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 merge conflictsGeorg Ehrke2012-04-2154-453/+2183
|\|
| * fix a php noticeGeorg Ehrke2012-04-212-1/+7
| * fix merge conflictsGeorg Ehrke2012-04-2111-115/+779
| |\
| | * Merge branch 'merge-requests/105'Georg Ehrke2012-04-192-60/+70
| | |\
| | | * Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/ownclo...Georg Ehrke2012-04-192-60/+70
| | | |\
| | | | * cal import should group events by uid, export should have correct newlines, f...Scott Shambarger2012-03-312-60/+70
| | * | | emulate touch with custom mtime for swift backendRobin Appelman2012-04-191-11/+39
| | * | | add SWIFT (openstack object storage) storage backendRobin Appelman2012-04-184-1/+529
| | * | | add test cases for cryptstreamRobin Appelman2012-04-182-0/+13
| | * | | make use of the fact that stream_read will always read 8192 bytes for encrypt...Robin Appelman2012-04-182-23/+71
| | * | | bugfixes for encryption library and test casesRobin Appelman2012-04-182-27/+64
| | |/ /
| * | | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-188-10/+49
| |\| |
| | * | test data for archivesRobin Appelman2012-04-173-0/+4
| | * | LDAP: don't forget to unbindArthur Schiwon2012-04-161-0/+11
| | * | checked, works for meArthur Schiwon2012-04-161-1/+0
| | * | group ldap: check configurationArthur Schiwon2012-04-161-2/+16
| | * | group LDAP: implement groupExists function, needed for SharingArthur Schiwon2012-04-161-0/+9
| | * | OC_Group does expect object, not stringArthur Schiwon2012-04-161-1/+1
| | * | minor code beautificationArthur Schiwon2012-04-161-2/+3
| | * | use the right attribute for member retrievalArthur Schiwon2012-04-161-1/+2
| | * | a string be a stringArthur Schiwon2012-04-161-1/+1
| | * | updated logos and iconsJan-Christoph Borchardt2012-04-162-2/+2
| * | | 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
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 04:48:03 +0000