summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | fix uploading to subfoldersRobin Appelman2012-01-101-1/+3
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-01-101-1/+1
| |\ \
| | * | Quick fix for file actions inside Shared folder (or other readonly folder)Michael Gapczynski2012-01-091-1/+1
| * | | default table prefix to oc_ if not setTom Needham2012-01-101-1/+1
| |/ /
| * | Merge branch 'tanghus_contacts'Thomas Tanghus2012-01-098-113/+88
| |\|
| | * Fixed Phone types not being saved correctly when adding them.Thomas Tanghus2012-01-093-5/+22
| | * Some cleanup, better error messages and such.Thomas Tanghus2012-01-092-3/+30
| | * Fixed showing first contact if non is selected.Thomas Tanghus2012-01-091-4/+10
| | * Modified thumbnail.php to use OC_Image. Cut out 50 loc ;-)Thomas Tanghus2012-01-091-73/+31
| | * Changed SQL queries for looking up contacts to only query once and sort at th...Thomas Tanghus2012-01-093-33/+0
| * | Just a comment ;-)Thomas Tanghus2012-01-091-0/+1
| |/
| * Missing line returnTom Needham2012-01-081-1/+1
| * save updated version number of apps after updatingRobin Appelman2012-01-081-0/+1
| * Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-01-081-2/+5
| |\
| | * improve pgsql database detectionRobin Appelman2012-01-081-2/+5
| * | Merge branch 'master' of gitorious.org:owncloud/owncloud into jqueryuiTom Needham2012-01-0873-595/+2251
| |\|
| | * remove mp3info from dependency checkRobin Appelman2012-01-081-6/+0
| | * mp3info is giving to much trouble, get rid of itRobin Appelman2012-01-081-64/+46
| | * When a music file is playing, the page title gets modified.Kshitij Parajuli2012-01-081-1/+3
| * | Fixed merge conflict in /files/ajax/move.phpTom Needham2012-01-0431-74/+5241
| |\ \
| * | | removed data-read and fixed droppable logicTom Needham2012-01-022-3/+2
| * | | Used data-read and data-wite when binding drag and drop eventsTom Needham2012-01-021-2/+2
| * | | Added data-read and data-write attributes to file listTom Needham2012-01-021-1/+3
| * | | Fix merge conflictsTom Needham2012-01-01148-909/+60831
| |\ \ \
| * | | | Fix missing ;Tom Needham2012-01-011-1/+3
| * | | | Fix js errorTom Needham2012-01-011-5/+3