summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add jplayer sourceRobin Appelman2012-01-019-0/+4458
* Move to branchMichael Gapczynski2012-01-011-76/+0
* Initial commit of common filestorageMichael Gapczynski2012-01-011-0/+76
* Fix return for empty Shared folder in opendir()Michael Gapczynski2012-01-011-12/+8
* Include PostgreSQL when checking for available database drivers.Daniel Köb2011-12-301-2/+2
* contacts entry duplication fixBartek Przybylski2011-12-301-1/+1
* Merge branch 'master' of gitorious.org:owncloud/owncloudBartek Przybylski2011-12-308-1/+485
|\
| * Merge branch 'contact_thumbnails' of git://gitorious.org/~tanghus/owncloud/ta...Bart Visscher2011-12-297-0/+484
| |\
| | * More missing js.Thomas Tanghus2011-12-281-0/+12
| | * Merge git://gitorious.org/owncloud/owncloud into contact_thumbnailsThomas Tanghus2011-12-2879-62/+59337
| | |\
| | * \ Merge git://gitorious.org/owncloud/owncloud into contact_thumbnailsThomas Tanghus2011-12-2626-136/+170
| | |\ \
| | * | | Added missing files and tried to revert the wrong commit of app/contacts/js/i...Thomas Tanghus2011-12-175-125/+443
| | * | | Added thumbnails to contact list. The contacts have a default thumbnail when ...Thomas Tanghus2011-12-173-1/+149
| * | | | Keep the urls pretty, decode forward slashes for newly added directoriesMichael Gapczynski2011-12-281-1/+1
* | | | | gallery fixesBartek Przybylski2011-12-302-1/+10
|/ / / /
* | | | Merge branch 'master' of gitorious.org:owncloud/owncloudMichael Gapczynski2011-12-2824-50/+548
|\ \ \ \ | | |_|/ | |/| |
| * | | Contacts: small merge cleanupsBart Visscher2011-12-273-27/+3
| * | | Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud...Bart Visscher2011-12-2722-50/+546
| |\ \ \
| | * | | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backupThomas Tanghus2011-12-164-36/+34
| | |\| |
| | * | | Misc. changes after review by bartv.Thomas Tanghus2011-12-1616-43/+38
| | * | | Update READMEThomas Tanghus2011-12-131-1/+4
| | * | | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backupThomas Tanghus2011-12-133-15/+19
| | |\ \ \
| | * | | | Added readme.tanghusThomas Tanghus2011-12-111-0/+19
| | * | | | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backupThomas Tanghus2011-12-115-27/+12
| | |\ \ \ \
| | * | | | | Updating of contact list when activating/adding/deleting address books now wo...Thomas Tanghus2011-12-1110-116/+96
| | * | | | | Resolved conflictThomas Tanghus2011-12-091-6/+0
| | * | | | | Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backupThomas Tanghus2011-12-0952-589/+728
| | |\ \ \ \ \
| | * | | | | | Various fixes to multiple address books handlingThomas Tanghus2011-12-0913-37/+146
| | * | | | | | Fixed adding, editing and deleting address books. One minor UI flaw remains.Thomas Tanghus2011-12-058-21/+101
| | * | | | | | Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_ba...Thomas Tanghus2011-12-044-4/+6
| | |\ \ \ \ \ \
| | * | | | | | | Added UI for selecting/editing address books.Thomas Tanghus2011-12-0411-6/+277
| | * | | | | | | Removed some debug statements.Thomas Tanghus2011-12-012-30/+24
| | * | | | | | | Added export.php for contacts app. Works the same way as the one in the calen...Thomas Olsen2011-12-012-8/+53
| * | | | | | | | Calendar: add loading indicatorBart Visscher2011-12-273-0/+26
* | | | | | | | | Fix encoding again and update the link after renaming filesMichael Gapczynski2011-12-283-4/+10
|/ / / / / / / /
* | | | | | | | Keep the urls pretty, decode forward slashesMichael Gapczynski2011-12-271-1/+1
* | | | | | | | Fix folder names with + characters in itMichael Gapczynski2011-12-273-4/+4
* | | | | | | | some coding style fixes for the pdf viewerRobin Appelman2011-12-271-33/+24
* | | | | | | | some styling changes for the pdf viewerRobin Appelman2011-12-272-26/+18
* | | | | | | | remove debug messages in consoleRobin Appelman2011-12-271-1/+0
* | | | | | | | pdf viewer from Google Code-In programBartek Przybylski2011-12-2740-0/+58600
* | | | | | | | Merge branch 'gallery'Bartek Przybylski2011-12-2712-15/+204
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | removing and renaming albumsBartek Przybylski2011-12-215-8/+103
| * | | | | | | merged with stashBartek Przybylski2011-12-211-0/+1
| * | | | | | | merged with stashBartek Przybylski2011-12-213-7/+25
| * | | | | | | mergedBartek Przybylski2011-12-21180-2518/+10462
| |\ \ \ \ \ \ \
| * | | | | | | | adjusting to new db "api", merge with masterBartek Przybylski2011-10-273-9/+10
| * | | | | | | | Merge branch 'master' into galleryBartek Przybylski2011-10-27126-921/+5583
| |\ \ \ \ \ \ \ \
| * | | | | | | | | new way of showing gallery covers, missing filesBartek Przybylski2011-10-186-6/+33
| * | | | | | | | | new way of showing gallery coversBartek Przybylski2011-10-181-0/+43