summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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 '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' of gitorious.org:owncloud/owncloudTom Needham2012-04-157-32/+3
| |\ \
| | * | Display correct URL in caldav and carddav pathsJakob Sack2012-04-153-3/+2
| | * | Remove useless, unmaintained dav.phpJakob Sack2012-04-154-29/+1
| * | | Update aceTom Needham2012-04-1583-8885/+19884
| |/ /
| * | dont try to view psd filesRobin Appelman2012-04-151-0/+3
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-04-1540-4855/+15912
| |\ \
| | * \ Merge branch 'master' of gitorious.org:owncloud/owncloudThomas Müller2012-04-151-18/+18
| | |\ \
| | | * | Bookmarks: handle input with & and ?, fixes oc-201Arthur Schiwon2012-04-151-18/+18