summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix another warning in pgsqlRobin Appelman2012-01-141-1/+1
* Fix breadcrumb issue when closing editorTom Needham2012-01-141-1/+1
* fix editor jsTom Needham2012-01-141-2/+2
* Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editorTom Needham2012-01-1416-151/+292
|\
| * don´t show warnings for missing language name definitionsFrank Karlitschek2012-01-141-1/+1
| * handle gallery remove when removing dir via webinterfaceBartek Przybylski2012-01-143-2/+17
| * Merge branch 'calendar'Georg Ehrke2012-01-145-105/+200
| |\
| | * improve import functionGeorg Ehrke2012-01-145-48/+161
| | * improve import form for calendarGeorg Ehrke2012-01-132-66/+48
| * | handling directory renaming and thumbnail move on gallery name chengeBartek Przybylski2012-01-144-36/+63
| * | content divs alignmentBartek Przybylski2012-01-141-2/+2
| * | remove temporary files after updatingRobin Appelman2012-01-131-0/+4
| * | use absolute path for db_structure.xml when updatingRobin Appelman2012-01-131-1/+1
| * | fix some warning in the pgsql driverRobin Appelman2012-01-132-4/+4
* | | Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editorTom Needham2012-01-13451-6660/+32024
|\| |
| * | Connect to the newly created database when checking if it needs to be filled.Daniel Köb2012-01-131-9/+22
| * | Too quick on the copy/paste trigger...Thomas Tanghus2012-01-121-1/+1
| * | Oops. Missing ')' :-PThomas Tanghus2012-01-121-1/+1
| * | Don't chunk_split encoded image string.Thomas Tanghus2012-01-123-13/+10
| * | Added search. Thanks to icewind it was mostly copy/paste :-)Thomas Tanghus2012-01-122-1/+32
| * | Add PRODID to vcards created by ownCloud.Thomas Tanghus2012-01-121-0/+8
| |/
| * Merge branch 'calendar'Georg Ehrke2012-01-123-0/+16
| |\
| | * Merge branch 'master' into calendarGeorg Ehrke2012-01-12457-7069/+32277
| | |\
| | * | change app iconGeorg Ehrke2012-01-123-0/+16
| * | | update js of calendar importGeorg Ehrke2012-01-121-13/+16
| * | | fix previous changeGeorg Ehrke2012-01-121-1/+1
| | |/ | |/|
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudGeorg Ehrke2012-01-12455-7068/+32257
| |\ \
| | * | Don't add address if none of the fields are filled out.Thomas Tanghus2012-01-121-2/+14
| | * | reimplement auto playing music from location hash (like from search results)Robin Appelman2012-01-121-6/+13
| | * | fix searching artists and albumsRobin Appelman2012-01-121-3/+12
| | * | fix event handler after re-expanding an artist in collection viewRobin Appelman2012-01-121-0/+7
| | * | fix expending artists and albums in collection viewRobin Appelman2012-01-121-4/+6
| | * | fix searching musicRobin Appelman2012-01-121-4/+5
| | * | user suggested style changeBartek Przybylski2012-01-111-2/+2
| | * | resolving depricated script openingBartek Przybylski2012-01-111-1/+1
| | * | Tweaked some tipsys.Thomas Tanghus2012-01-112-3/+2
| | * | using new image backend, moving ajax calls to one file, using generated thumn...Bartek Przybylski2012-01-116-136/+29
| | * | Localizin strings and adding error checking.Thomas Tanghus2012-01-1116-33/+101
| | * | Make sure VERSION is set.Thomas Tanghus2012-01-115-7/+24
| | * | Added files for error messages, removed old syle sheet.Thomas Tanghus2012-01-113-270/+23
| | * | CSS cleanup, more error checking, better error messages, general cleanup.Thomas Tanghus2012-01-1110-89/+171
| | * | Added missing }Thomas Tanghus2012-01-111-1/+1
| | * | fix old calendar name and color not being preserved when editing a calendarRobin Appelman2012-01-111-2/+2
| | * | also use translated string for music navigation entry when showing inline con...Robin Appelman2012-01-111-1/+1
| | * | update translationsRobin Appelman2012-01-11404-6043/+31418
| | * | Merge branch 'tanghus_contacts'Thomas Tanghus2012-01-108-45/+95
| | |\ \
| | | * | More fixes on saving TYPE parameters.Thomas Tanghus2012-01-104-36/+62
| | | * | Return standard thumbnail even if contact couldn't be found as it could be be...Thomas Tanghus2012-01-091-3/+2
| | | * | OC_DB::insertid was being called too late to get the correct result.Thomas Tanghus2012-01-091-1/+2
| | | * | Insert new contacts alphabetically correct in the list.Thomas Tanghus2012-01-093-5/+29