summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Server verhindert beim OSX Client einen DeleteSteven2012-02-131-0/+4
* Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-122-2/+2
|\
| * Derive the user principles from the owncloud usersBart Visscher2012-02-112-2/+2
* | check userrights in events.phpGeorg Ehrke2012-02-121-0/+5
* | show shared calendarsGeorg Ehrke2012-02-114-26/+36
* | fix sharing calendar managerGeorg Ehrke2012-02-112-4/+6
* | Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-1041-188/+6132
|\|
| * Merge branch 'tanghus_contacts'Thomas Tanghus2012-02-105-11/+186
| |\
| | * Merge gitorious.org:owncloud/owncloud into tanghus_contactsThomas Tanghus2012-02-101-1/+0
| | |\
| | * | Added custom combobox widget.Thomas Tanghus2012-02-105-11/+186
| * | | Variable wasn't reset.Thomas Tanghus2012-02-101-0/+1
| | |/ | |/|
| * | Gallery: remove unset call, not needed anymoreBart Visscher2012-02-091-1/+0
| |/
| * Merge gitorious.org:owncloud/owncloud into tanghus_contactsThomas Tanghus2012-02-0915-261/+127
| |\
| | * 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-082-55/+12
| | * OC-41: [Calendar] Date format not translatableBart Visscher2012-02-081-1/+11
| | * use oc_filecache and oc_eventsource for music scanningRobin Appelman2012-02-083-114/+38
| * | 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-0828-0/+5839
| * | | 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-0628-0/+5839
| * | | | 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
| * | | | 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-0828-0/+5839
| | |/ / | |/| |
* | | | Merge branch 'master' into calendarGeorg Ehrke2012-02-0815-85/+301
|\ \ \ \ | | |_|/ | |/| |
| * | | dont load pdfview for ieRobin Appelman2012-02-081-7/+9
| * | | Merge branch 'filesystem'Robin Appelman2012-02-086-78/+22
| |\ \ \ | | |/ / | |/| |
| | * | writable not writeableRobin Appelman2012-02-053-7/+7
| | * | Merge branch 'master' into filesystemRobin Appelman2012-02-0524-65/+194
| | |\ \
| | * \ \ Merge branch 'master' into filesystemRobin Appelman2012-02-023-32/+41
| | |\ \ \
| | * \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-02-0120-163/+386
| | |\ \ \ \
| | * | | | | prevent sharing from making aditional http requests while scanningRobin Appelman2012-02-011-0/+1
| | * | | | | dont try to use the filesystem when it isnt setup yetRobin Appelman2012-01-311-1/+1
| | * | | | | Merge branch 'master' into filesystemRobin Appelman2012-01-301-1/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ merge master into filesystemRobin Appelman2012-01-30118-419/+1717
| | |\ \ \ \ \ \