Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Server verhindert beim OSX Client einen Delete | Steven | 2012-02-13 | 1 | -0/+4 |
* | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-02-12 | 2 | -2/+2 |
|\ | |||||
| * | Derive the user principles from the owncloud users | Bart Visscher | 2012-02-11 | 2 | -2/+2 |
* | | check userrights in events.php | Georg Ehrke | 2012-02-12 | 1 | -0/+5 |
* | | show shared calendars | Georg Ehrke | 2012-02-11 | 4 | -26/+36 |
* | | fix sharing calendar manager | Georg Ehrke | 2012-02-11 | 2 | -4/+6 |
* | | Merge branch 'master' into calendar_sharing | Georg Ehrke | 2012-02-10 | 41 | -188/+6132 |
|\| | |||||
| * | Merge branch 'tanghus_contacts' | Thomas Tanghus | 2012-02-10 | 5 | -11/+186 |
| |\ | |||||
| | * | Merge gitorious.org:owncloud/owncloud into tanghus_contacts | Thomas Tanghus | 2012-02-10 | 1 | -1/+0 |
| | |\ | |||||
| | * | | Added custom combobox widget. | Thomas Tanghus | 2012-02-10 | 5 | -11/+186 |
| * | | | Variable wasn't reset. | Thomas Tanghus | 2012-02-10 | 1 | -0/+1 |
| | |/ | |/| | |||||
| * | | Gallery: remove unset call, not needed anymore | Bart Visscher | 2012-02-09 | 1 | -1/+0 |
| |/ | |||||
| * | Merge gitorious.org:owncloud/owncloud into tanghus_contacts | Thomas Tanghus | 2012-02-09 | 15 | -261/+127 |
| |\ | |||||
| | * | Fix wrong var name in sharedstorage.php | Bart Visscher | 2012-02-08 | 1 | -2/+2 |
| | * | Gallery: Add caching headers to album thumbnail sending | Bart Visscher | 2012-02-08 | 1 | -0/+5 |
| | * | Gallery: use thumbnails of images for the album thumbnail | Bart Visscher | 2012-02-08 | 1 | -2/+5 |
| | * | Add caching to gallery thumbnail generation | Bart Visscher | 2012-02-08 | 2 | -18/+39 |
| | * | Change gallery thumbnail generation to OC_Image | Bart Visscher | 2012-02-08 | 2 | -55/+12 |
| | * | OC-41: [Calendar] Date format not translatable | Bart Visscher | 2012-02-08 | 1 | -1/+11 |
| | * | use oc_filecache and oc_eventsource for music scanning | Robin Appelman | 2012-02-08 | 3 | -114/+38 |
| * | | Keep js data structure in sync on changes. | Thomas Tanghus | 2012-02-09 | 6 | -17/+82 |
| * | | More @£#¤ conflicts | Thomas Tanghus | 2012-02-08 | 2 | -19/+4 |
| |\ \ | |||||
| | * | | Fix merge conflicts | Thomas Tanghus | 2012-02-08 | 1 | -15/+0 |
| | * | | Added files for new contact editor/viewer. | Thomas Tanghus | 2012-02-08 | 2 | -63/+16 |
| | * | | Fixed broken "Add new" contact. | Thomas Tanghus | 2012-02-08 | 7 | -46/+85 |
| | * | | Hide container for emails/phones/adresses if there are none. | Thomas Tanghus | 2012-02-08 | 2 | -1/+5 |
| | * | | Updated copyrights. | Thomas Tanghus | 2012-02-08 | 4 | -15/+9 |
| | * | | Added files for new contact editor/viewer. | Thomas Tanghus | 2012-02-08 | 28 | -0/+5839 |
| * | | | Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tangh... | Thomas Tanghus | 2012-02-08 | 2 | -51/+3 |
| |\ \ \ | |||||
| | * | | | Fixed broken "Add new" contact. | Thomas Tanghus | 2012-02-06 | 7 | -46/+85 |
| | * | | | Hide container for emails/phones/adresses if there are none. | Thomas Tanghus | 2012-02-06 | 2 | -1/+5 |
| | * | | | Updated copyrights. | Thomas Tanghus | 2012-02-06 | 4 | -15/+9 |
| | * | | | Added files for new contact editor/viewer. | Thomas Tanghus | 2012-02-06 | 28 | -0/+5839 |
| * | | | | Don't import cards that can't be parsed by Sabre, but log it instead. | Thomas Tanghus | 2012-02-08 | 4 | -32/+55 |
| * | | | | Some fixes for malformed VCards. | Thomas Tanghus | 2012-02-08 | 3 | -75/+23 |
| * | | | | Fixed broken "Add new" contact. | Thomas Tanghus | 2012-02-08 | 7 | -46/+85 |
| * | | | | Hide container for emails/phones/adresses if there are none. | Thomas Tanghus | 2012-02-08 | 2 | -1/+5 |
| * | | | | Updated copyrights. | Thomas Tanghus | 2012-02-08 | 4 | -15/+9 |
| * | | | | Added files for new contact editor/viewer. | Thomas Tanghus | 2012-02-08 | 28 | -0/+5839 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'master' into calendar | Georg Ehrke | 2012-02-08 | 15 | -85/+301 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | dont load pdfview for ie | Robin Appelman | 2012-02-08 | 1 | -7/+9 |
| * | | | Merge branch 'filesystem' | Robin Appelman | 2012-02-08 | 6 | -78/+22 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | writable not writeable | Robin Appelman | 2012-02-05 | 3 | -7/+7 |
| | * | | Merge branch 'master' into filesystem | Robin Appelman | 2012-02-05 | 24 | -65/+194 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-02-02 | 3 | -32/+41 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-02-01 | 20 | -163/+386 |
| | |\ \ \ \ | |||||
| | * | | | | | prevent sharing from making aditional http requests while scanning | Robin Appelman | 2012-02-01 | 1 | -0/+1 |
| | * | | | | | dont try to use the filesystem when it isnt setup yet | Robin Appelman | 2012-01-31 | 1 | -1/+1 |
| | * | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-01-30 | 1 | -1/+0 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-01-30 | 118 | -419/+1717 |
| | |\ \ \ \ \ \ |