summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* some fixes fore movable appsGeorg Ehrke2012-04-2610-49/+67
|
* gallery app seems to work now :)Georg Ehrke2012-04-251-1/+1
|
* bookmarks app seems to work now :)Georg Ehrke2012-04-252-6/+6
|
* some fixes in contacts javascript filesGeorg Ehrke2012-04-251-2/+2
|
* add a proper 404Georg Ehrke2012-04-251-1/+2
|
* Merge branch 'master' into movable_appsGeorg Ehrke2012-04-251-0/+1
|\
| * fix js fail in media playerGeorg Ehrke2012-04-251-0/+1
| |
* | fix merge conflictsGeorg Ehrke2012-04-2442-3039/+589
|\|
| * move granite also to apps-playground because it´s not stable yet and is no ↵Frank Karlitschek2012-04-2410-1797/+0
| | | | | | | | longer used
| * Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-04-2411-23/+241
| |\
| | * Added loading indicator.Thomas Tanghus2012-04-241-0/+1
| | |
| | * Contacts: Check that UIDs really are unique on import. Better solution would ↵Thomas Tanghus2012-04-241-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 Tanghus2012-04-243-22/+14
| | |
| | * Contacts: Tried to format NOTE field a bit. Needs to be improved more though.Thomas Tanghus2012-04-242-1/+2
| | |
| | * OC_App::getStorage() failed if app dir didn't exist.Thomas Tanghus2012-04-241-0/+4
| | |
| | * Contacts: In app import. Cleanup still needed.Thomas Tanghus2012-04-247-15/+201
| | |
| | * Applied patches by Nicolas progweb at free.fr - ↵Thomas Tanghus2012-04-242-1/+3
| | | | | | | | | | | | https://mail.kde.org/pipermail/owncloud/2012-April/002900.html
| * | non working app. moved to the apps-playground repositoryFrank Karlitschek2012-04-2412-1217/+0
| |/
| * wrote a new versioning app over the weekend. Basic functionality to far but ↵Frank Karlitschek2012-04-2310-0/+347
| | | | | | | | it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing.
* | fix OC.filePath in main jsGeorg Ehrke2012-04-241-3/+8
| |
* | fix position of SemicolonGeorg Ehrke2012-04-241-1/+1
| |
* | fix php failGeorg Ehrke2012-04-241-1/+1
| |
* | remove debug messageGeorg Ehrke2012-04-241-1/+1
| |
* | fix pathes in contactsGeorg Ehrke2012-04-244-30/+47
| |
* | another fix for linkto functionGeorg Ehrke2012-04-241-1/+1
| |
* | fix linkto function in OC_HelperGeorg Ehrke2012-04-241-4/+8
| |
* | fix contacts app a bitGeorg Ehrke2012-04-232-13/+13
| |
* | make calendar work with movable appsGeorg Ehrke2012-04-232-4/+4
| |
* | remove debug code in lib baseGeorg Ehrke2012-04-231-1/+0
| |
* | fix pathes of shared calendarsGeorg Ehrke2012-04-231-2/+2
| |
* | fix bug in lib baseGeorg Ehrke2012-04-231-1/+3
| |
* | fix file path in apps/media/ajax/api.phpGeorg Ehrke2012-04-231-5/+3
| |
* | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-2311-25/+137
|\|
| * first step to an public api of ownCloud for the apps. In the future they ↵Frank Karlitschek2012-04-232-0/+63
| | | | | | | | shouldn´t call internall classes, functions or session variables because this will change and break in upcoming versions. Apps should only call this public interface that we will kepp stable over different releases. The namespace is OCP for ownCloud public. This is just the first step. more coming soon
| * fixing multiselect overflow, issue 341Jan-Christoph Borchardt2012-04-231-3/+3
| |
| * adding proper copyright and license notice to the style filesJan-Christoph Borchardt2012-04-237-3/+23
| |
| * LDAP: optimize LDAP requests for users and groups. Settings are still to do, ↵Arthur Schiwon2012-04-232-18/+46
| | | | | | | | though.
| * only retrieve requested attributesArthur Schiwon2012-04-231-1/+1
| |
| * don't forget to declare class propertiesArthur Schiwon2012-04-231-0/+1
| |
* | use native functions of php to parse the string into the VarGeorg Ehrke2012-04-233-9/+8
| |
* | rename var file to getfile to prevent fails in files appGeorg Ehrke2012-04-233-5/+5
| |
* | fix bug in lib/helper.php and fix file uploadGeorg Ehrke2012-04-231-1/+1
| |
* | fix path in apps/files/templats/index.phpGeorg Ehrke2012-04-231-1/+1
| |
* | fix style.css of the files appGeorg Ehrke2012-04-231-2/+2
| |
* | fix path in /apps/files/js/timezone.phpGeorg Ehrke2012-04-231-1/+1
| |
* | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-2323-1275/+1210
|\|
| * Wrong app check.Thomas Tanghus2012-04-231-1/+1
| |
| * Contacts: Tipsyfied photo toolbar.Thomas Tanghus2012-04-231-0/+1
| |
| * fix image viewerRobin Appelman2012-04-221-1/+1
| |
| * add the option to disable file encryption while still being able to decrypt ↵Robin Appelman2012-04-224-3/+11
| | | | | | | | existing files