summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-15212-13891/+36258
|\
| * 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
| | * | pdfjs updated from githubThomas Müller2012-04-1539-4837/+15894
| | |/
| * | Remove google web fontTom Needham2012-04-151-1/+1
| * | remove unused cssTom Needham2012-04-151-5/+2
| |/
| * clean the collection view after rescanningRobin Appelman2012-04-151-0/+5
| * enable archive support on defaultRobin Appelman2012-04-151-0/+1
| * only run archive tests if the test data is availableRobin Appelman2012-04-152-14/+22
| * group LDAP: simple basic testsArthur Schiwon2012-04-151-0/+6
| * group LDAP: usersInGroup not getUsersInGroupArthur Schiwon2012-04-152-3/+11
| * don't forget changes in lib_ldap for last commitArthur Schiwon2012-04-151-7/+11
| * group LDAP: implemented getUsersInGroup()Arthur Schiwon2012-04-151-8/+18
| * group LDAP: implemented getUserGroups()Arthur Schiwon2012-04-151-0/+11
| * typoArthur Schiwon2012-04-151-1/+1
| * group LDAP: implemented inGroup()Arthur Schiwon2012-04-153-4/+65
| * renamed extention to extension, also now only showing lowercaseJan-Christoph Borchardt2012-04-156-12/+12
| * Contact: Don't use non core class in appinfo/app.phpBart Visscher2012-04-141-1/+1
| * few pieces of documentationArthur Schiwon2012-04-141-0/+17
| * give back expected result types as long as logic is not there yetArthur Schiwon2012-04-141-0/+3
| * test for ldap group backendArthur Schiwon2012-04-141-0/+36
| * starting to create the ldap group backend (with some inspiration from Yoann G...Arthur Schiwon2012-04-143-0/+183
| * reuse OC_L10N objectsRobin Appelman2012-04-1419-21/+15
| * keep version numbers in their own files for faster readingRobin Appelman2012-04-1442-21/+21
| * Remove go to lineTom Needham2012-04-141-25/+17
| * Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-04-148-19/+20
| |\
| | * Sharing: Add a filename after public share linkBart Visscher2012-04-141-4/+4
| | * Sharing: Don't get share icon for undefined filenameBart Visscher2012-04-141-1/+4
| | * Sharing: Define missing template varsBart Visscher2012-04-141-0/+2
| | * improve flexibility of search providers a bitRobin Appelman2012-04-145-10/+10
| | * LDAP: don't keep possibly outdated passwordsArthur Schiwon2012-04-141-4/+0
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-04-1316-63/+225
| |\|
| * | Update language stringTom Needham2012-04-131-1/+1
* | | Merge branch 'master' into sabredav_1.6Georg Ehrke2012-04-13103-37016/+312
|\ \ \ | | |/ | |/|
| * | Contacts: Save the category list update when updating/adding contactBart Visscher2012-04-131-1/+1
| * | Calendar: Update category list when updating/adding eventBart Visscher2012-04-132-0/+10
| * | Calendar: Document active parameter in allCalendarsBart Visscher2012-04-131-3/+1
| * | Calendar: Also set repeat options when editing a non repeating eventBart Visscher2012-04-132-3/+9
| * | Calendar: Fix saving of Categories in an eventBart Visscher2012-04-134-17/+4
| * | Calendar: Implement rescan of CategoriesBart Visscher2012-04-132-0/+69
| * | VCategories css is now in styles.cssThomas Tanghus2012-04-132-2/+0
| * | Contacts: Better error reporting.Thomas Tanghus2012-04-131-1/+2
| * | only run tests for files_external when asked for explicitlyRobin Appelman2012-04-134-35/+59
| * | some idexes for the media player tablesRobin Appelman2012-04-132-1/+70
| |/