summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * remove old code in commentsGeorg Ehrke2012-01-081-6/+0
| * Merge branch 'master' into calendarGeorg Ehrke2012-01-0830-152/+662
| |\
| | * dont overwrite the database with the gallery databaseRobin Appelman2012-01-081-1/+1
| | * dont create a new user when it already existsRobin Appelman2012-01-081-9/+16
| | * improve detection for mysql databasesRobin Appelman2012-01-081-3/+6
| | * Improve music playlist rendering.Cloud Dumper2012-01-082-4/+16
| | * load reverse driver when updating databaseRobin Appelman2012-01-081-0/+1
| | * don't try to upgrade what isn't installedRobin Appelman2012-01-081-7/+9
| | * db overwriting, gallery creating fixBartek Przybylski2012-01-082-3/+8
| | * Merge branch 'master' of gitorious.org:owncloud/owncloudBartek Przybylski2012-01-086-54/+137
| | |\
| | | * allow changing database backends between PDO and MDB2Robin Appelman2012-01-081-4/+19
| | | * Fix updateApp() and add extra check to updateApps()Michael Gapczynski2012-01-081-7/+9
| | | * update apps when their version number increasesRobin Appelman2012-01-082-0/+31
| | | * fix errors during database migrationRobin Appelman2012-01-081-7/+8
| | | * set the installed version after updating the databaseRobin Appelman2012-01-081-0/+1
| | | * fixes in the sqlite manager driverRobin Appelman2012-01-081-23/+49
| | | * automatically upgrade the main database on version number increase (doesnt wo...Robin Appelman2012-01-082-7/+12
| | | * small fix in sqlite3 driverRobin Appelman2012-01-081-3/+0
| | | * minor changes to mysql setupRobin Appelman2012-01-081-4/+4
| | | * some fixes in the sqlite3 driverRobin Appelman2012-01-082-7/+12
| | * | rename fix, licence header addedBartek Przybylski2012-01-0815-4/+308
| | |/
| | * Merge branch 'master' of gitorious.org:owncloud/owncloudBartek Przybylski2012-01-082-5/+18
| | |\
| | | * Also use track_number to retrieve song track.Cloud Dumper2012-01-081-1/+14
| | | * Sort results from music collection getters.Cloud Dumper2012-01-081-4/+4
| | * | rename and delete hooksBartek Przybylski2012-01-082-6/+74