summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Server verhindert beim OSX Client einen DeleteSteven2012-02-132-1/+5
* Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-127-92/+197
|\
| * Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-02-121-0/+7
| |\
| | * Redirect to installer if not installedMichael Gapczynski2012-02-111-0/+7
| * | add a READMEFrank Karlitschek2012-02-121-0/+7
| |/
| * Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-02-113-71/+45
| |\
| | * Derive the user principles from the owncloud usersBart Visscher2012-02-113-71/+45
| * | add themeing support and support for autoselection of mobile/tablet and stand...Frank Karlitschek2012-02-112-21/+138
| |/
* | check userrights in events.phpGeorg Ehrke2012-02-121-0/+5
* | Revert "initial project import from KDevelop"Georg Ehrke2012-02-111-7/+0
* | show shared calendarsGeorg Ehrke2012-02-114-26/+36
* | fix sharing calendar managerGeorg Ehrke2012-02-112-4/+6
* | initial project import from KDevelopGeorg Ehrke2012-02-101-0/+7
* | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-1057-333/+6872
|\|
| * Merge branch 'tanghus_contacts'Thomas Tanghus2012-02-107-11/+278
| |\
| | * Merge gitorious.org:owncloud/owncloud into tanghus_contactsThomas Tanghus2012-02-109-130/+148
| | |\
| | * | Added custom combobox widget.Thomas Tanghus2012-02-107-11/+278
| * | | Variable wasn't reset.Thomas Tanghus2012-02-101-0/+1
| | |/ | |/|
| * | - Added the ability to change a files mtime via webdavs propset.Klaas Freitag2012-02-105-11/+43
| * | Gallery: remove unset call, not needed anymoreBart Visscher2012-02-091-1/+0
| * | OC_Image: change static vars to object varsBart Visscher2012-02-091-115/+100
| * | dont try to remove buffers, can cause trouble with strict warningsRobin Appelman2012-02-091-1/+0
| * | don't use PDO::inTransactionRobin Appelman2012-02-091-2/+5
| |/
| * Merge gitorious.org:owncloud/owncloud into tanghus_contactsThomas Tanghus2012-02-0943-1081/+1495
| |\
| | * fix filecache with MDB2Robin Appelman2012-02-081-6/+6
| | * use fetchRow instead of fetchRobin Appelman2012-02-081-4/+4
| | * Fix wrong var name in sharedstorage.phpBart Visscher2012-02-081-2/+2
| | * Gallery: Add caching headers to album thumbnail sendingBart Visscher2012-02-081-0/+5
| | * Gallery: use thumbnails of images for the album thumbnailBart Visscher2012-02-081-2/+5
| | * Add caching to gallery thumbnail generationBart Visscher2012-02-082-18/+39
| | * Change gallery thumbnail generation to OC_ImageBart Visscher2012-02-084-57/+18
| | * OC-41: [Calendar] Date format not translatableBart Visscher2012-02-081-1/+11
| | * add convinience function to get filesystem view for app storageRobin Appelman2012-02-081-0/+18
| | * use oc_filecache and oc_eventsource for music scanningRobin Appelman2012-02-083-114/+38
| | * bugfix in searching files by mimetypeRobin Appelman2012-02-081-7/+15
| * | Keep js data structure in sync on changes.Thomas Tanghus2012-02-096-17/+82
| * | More @£#¤ conflictsThomas Tanghus2012-02-082-19/+4
| |\ \
| | * | Fix merge conflictsThomas Tanghus2012-02-081-15/+0
| | * | Added files for new contact editor/viewer.Thomas Tanghus2012-02-082-63/+16
| | * | Fixed broken "Add new" contact.Thomas Tanghus2012-02-087-46/+85
| | * | Hide container for emails/phones/adresses if there are none.Thomas Tanghus2012-02-082-1/+5
| | * | Updated copyrights.Thomas Tanghus2012-02-084-15/+9
| | * | Added files for new contact editor/viewer.Thomas Tanghus2012-02-0832-0/+6293
| * | | Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tangh...Thomas Tanghus2012-02-082-51/+3
| |\ \ \
| | * | | Fixed broken "Add new" contact.Thomas Tanghus2012-02-067-46/+85
| | * | | Hide container for emails/phones/adresses if there are none.Thomas Tanghus2012-02-062-1/+5
| | * | | Updated copyrights.Thomas Tanghus2012-02-064-15/+9
| | * | | Added files for new contact editor/viewer.Thomas Tanghus2012-02-0632-0/+6293
| * | | | Don't import cards that can't be parsed by Sabre, but log it instead.Thomas Tanghus2012-02-084-32/+55
| * | | | Some fixes for malformed VCards.Thomas Tanghus2012-02-083-75/+23