Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix security check for the path of the requested file | Georg Ehrke | 2012-04-26 | 2 | -2/+2 |
| | |||||
* | fix downloading of files in files app | Georg Ehrke | 2012-04-26 | 2 | -4/+4 |
| | |||||
* | fixes for media app | Georg Ehrke | 2012-04-26 | 1 | -2/+2 |
| | |||||
* | fixes for contacts app | Georg Ehrke | 2012-04-26 | 2 | -23/+16 |
| | |||||
* | some fixes fore movable apps | Georg Ehrke | 2012-04-26 | 4 | -37/+37 |
| | |||||
* | gallery app seems to work now :) | Georg Ehrke | 2012-04-25 | 1 | -1/+1 |
| | |||||
* | bookmarks app seems to work now :) | Georg Ehrke | 2012-04-25 | 2 | -6/+6 |
| | |||||
* | some fixes in contacts javascript files | Georg Ehrke | 2012-04-25 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-25 | 1 | -0/+1 |
|\ | |||||
| * | fix js fail in media player | Georg Ehrke | 2012-04-25 | 1 | -0/+1 |
| | | |||||
* | | fix merge conflicts | Georg Ehrke | 2012-04-24 | 31 | -1242/+585 |
|\| | |||||
| * | Merge branch 'master' of gitorious.org:owncloud/owncloud | Frank Karlitschek | 2012-04-24 | 10 | -23/+237 |
| |\ | |||||
| | * | Added loading indicator. | Thomas Tanghus | 2012-04-24 | 1 | -0/+1 |
| | | | |||||
| | * | Contacts: Check that UIDs really are unique on import. Better solution would ↵ | Thomas Tanghus | 2012-04-24 | 1 | -3/+35 |
| | | | | | | | | | | | | be to suggest to merge contacts, but that will have to wait to OC5 ;-) | ||||
| | * | Contacts: In app import (for Chrome and Firefox only) | Thomas Tanghus | 2012-04-24 | 3 | -22/+14 |
| | | | |||||
| | * | Contacts: Tried to format NOTE field a bit. Needs to be improved more though. | Thomas Tanghus | 2012-04-24 | 2 | -1/+2 |
| | | | |||||
| | * | Contacts: In app import. Cleanup still needed. | Thomas Tanghus | 2012-04-24 | 7 | -15/+201 |
| | | | |||||
| | * | Applied patches by Nicolas progweb at free.fr - ↵ | Thomas Tanghus | 2012-04-24 | 2 | -1/+3 |
| | | | | | | | | | | | | https://mail.kde.org/pipermail/owncloud/2012-April/002900.html | ||||
| * | | non working app. moved to the apps-playground repository | Frank Karlitschek | 2012-04-24 | 12 | -1217/+0 |
| |/ | |||||
| * | wrote a new versioning app over the weekend. Basic functionality to far but ↵ | Frank Karlitschek | 2012-04-23 | 10 | -0/+347 |
| | | | | | | | | it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing. | ||||
* | | fix pathes in contacts | Georg Ehrke | 2012-04-24 | 2 | -30/+37 |
| | | |||||
* | | fix contacts app a bit | Georg Ehrke | 2012-04-23 | 2 | -13/+13 |
| | | |||||
* | | make calendar work with movable apps | Georg Ehrke | 2012-04-23 | 2 | -4/+4 |
| | | |||||
* | | fix pathes of shared calendars | Georg Ehrke | 2012-04-23 | 1 | -2/+2 |
| | | |||||
* | | fix file path in apps/media/ajax/api.php | Georg Ehrke | 2012-04-23 | 1 | -5/+3 |
| | | |||||
* | | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-23 | 5 | -20/+57 |
|\| | |||||
| * | adding proper copyright and license notice to the style files | Jan-Christoph Borchardt | 2012-04-23 | 2 | -1/+9 |
| | | |||||
| * | LDAP: optimize LDAP requests for users and groups. Settings are still to do, ↵ | Arthur Schiwon | 2012-04-23 | 2 | -18/+46 |
| | | | | | | | | though. | ||||
| * | only retrieve requested attributes | Arthur Schiwon | 2012-04-23 | 1 | -1/+1 |
| | | |||||
| * | don't forget to declare class properties | Arthur Schiwon | 2012-04-23 | 1 | -0/+1 |
| | | |||||
* | | fix path in apps/files/templats/index.php | Georg Ehrke | 2012-04-23 | 1 | -1/+1 |
| | | |||||
* | | fix style.css of the files app | Georg Ehrke | 2012-04-23 | 1 | -2/+2 |
| | | |||||
* | | fix path in /apps/files/js/timezone.php | Georg Ehrke | 2012-04-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into movable_apps | Georg Ehrke | 2012-04-23 | 17 | -56/+285 |
|\| | |||||
| * | Wrong app check. | Thomas Tanghus | 2012-04-23 | 1 | -1/+1 |
| | | |||||
| * | Contacts: Tipsyfied photo toolbar. | Thomas Tanghus | 2012-04-23 | 1 | -0/+1 |
| | | |||||
| * | fix image viewer | Robin Appelman | 2012-04-22 | 1 | -1/+1 |
| | | |||||
| * | add the option to disable file encryption while still being able to decrypt ↵ | Robin Appelman | 2012-04-22 | 4 | -3/+11 |
| | | | | | | | | existing files | ||||
| * | Contacts: | Thomas Tanghus | 2012-04-22 | 8 | -48/+260 |
| | | | | | | | | | | - Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options. - Made action icons translucent instead of hiding them. | ||||
| * | Contacts: Clear cache for contact photo and thumbnail when it has been changed. | Thomas Tanghus | 2012-04-22 | 3 | -3/+11 |
| | | |||||
* | | fix merge conflicts | Georg Ehrke | 2012-04-22 | 51 | -435/+1933 |
|\| | |||||
| * | hide alarm and attendees tab | Georg Ehrke | 2012-04-22 | 2 | -8/+8 |
| | | |||||
| * | Personal settings: Emphasized labels etc, mono-spaced generated paths and ↵ | Thomas Tanghus | 2012-04-22 | 3 | -9/+9 |
| | | | | | | | | moved text formatting to style sheet. | ||||
| * | Link to icon was absolute. | Thomas Tanghus | 2012-04-22 | 1 | -1/+1 |
| | | |||||
| * | Contacts: Added bg color and shadow to controls. I suck at CSS... | Thomas Tanghus | 2012-04-22 | 1 | -1/+1 |
| | | |||||
| * | Missing double quote. | Thomas Tanghus | 2012-04-22 | 1 | -1/+1 |
| | | |||||
| * | Contacts: Fix error on photo crop. | Thomas Tanghus | 2012-04-22 | 1 | -7/+6 |
| | | |||||
| * | Contacts: Changed layout as discussed with JanC. Still WiP. | Thomas Tanghus | 2012-04-22 | 4 | -8/+467 |
| | | |||||
| * | Don't trigger unnecessary change events. | Thomas Tanghus | 2012-04-22 | 1 | -1/+3 |
| | | |||||
| * | Contacts: Fixed contact photo drag'n'drop upload - again... | Thomas Tanghus | 2012-04-22 | 1 | -4/+5 |
| | |