summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Decode json response for admin exportsTom Needham2012-04-081-1/+3
* Fix sqlite version detectionTom Needham2012-04-081-3/+7
* Emit hooks for user creationTom Needham2012-04-071-0/+9
* Return JSON for import and export methods of OC_MigrateTom Needham2012-04-074-42/+42
* Merge branch 'master' into migrationTom Needham2012-04-0745-307/+698
|\
| * Contacts: Misc. cleanup tweaks.Thomas Tanghus2012-04-077-73/+64
| * Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud.Thomas Tanghus2012-04-071-10/+8
| * Add some filetypesTom Needham2012-04-071-0/+2
| * Update urlTom Needham2012-04-071-1/+1
| * Give editor focus after savingTom Needham2012-04-061-0/+1
| * Provide undo when closing editor with unsaved changesTom Needham2012-04-061-45/+55
| * mimetype filter for filepickerBartek Przybylski2012-04-054-10/+11
| * filepicker loading style fixupBartek Przybylski2012-04-051-1/+1
| * loading screen for filepickerBartek Przybylski2012-04-052-1/+5
| * Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/ownclo...Florian Hülsmann2012-04-042-1/+2
| |\
| | * as preperation for the sgf viewer app i added a file icon for .sgf files (sav...Nils Jansen2012-03-232-1/+2
| * | Make the token really randomTom Needham2012-04-041-1/+1
| * | webdav needs to load authentication appsArthur Schiwon2012-04-043-1/+7
| * | Check blacklist before saving to filesystemTom Needham2012-04-032-0/+16
| * | Dont typecast variables as integersTom Needham2012-04-031-1/+1
| * | adding icons to filepickerBartek Przybylski2012-04-032-1/+3
| * | Contacts: l11n for geo autocomplete. Not sure if it works though.Thomas Tanghus2012-04-032-1/+4
| * | Contacts: Added autocomplete using geonames.org.Thomas Tanghus2012-04-033-3/+87
| * | Contacts: First work on cleaner design.Thomas Tanghus2012-04-037-97/+112
| * | Contacts: rescan categories on load if there are none.Thomas Tanghus2012-04-031-2/+22
| * | merged from upstreamFlorian Hülsmann2012-04-0275-492/+3208
| |\ \
| | * | multiselect handle for filepickerBartek Przybylski2012-04-021-9/+21
| | * | Merge branch 'master' of gitorious.org:owncloud/owncloudTom Needham2012-04-024-14/+114
| | |\ \
| | | * | dialogs filepicker first draftBartek Przybylski2012-04-024-14/+114
| | * | | confirm close when there are unsaved changesTom Needham2012-04-021-1/+14
| | * | | add * to filename when changes have been madeTom Needham2012-04-021-26/+42
| | * | | use OC_Dialogs instead of alert()Tom Needham2012-04-021-1/+1
| | |/ /
| | * | Move writable check into local filestorage so shared files can be renamedMichael Gapczynski2012-04-012-1/+5
| | * | the core apps don't have typesRobin Appelman2012-04-011-1/+1
| | * | oc_db is not pdoRobin Appelman2012-04-011-4/+4
| | * | Try to configure php to enable big file uploads.Frank Karlitschek2012-04-011-0/+18
| | * | update outdated READMEFrank Karlitschek2012-04-011-2/+3
| | * | Show the different editions to the user. Used in the status call, on the pers...Frank Karlitschek2012-04-014-2/+11
| | * | Check file handle exists before trying to read fileMichael Gapczynski2012-04-011-6/+9
| * | | Merge branch 'master' of gitorious.org:~cbix/owncloud/cbix-owncloudFlorian Hülsmann2012-04-020-0/+0
| |\ \ \
| | * | | webfinger protocol compatible + minor changesFlorian Hülsmann2012-04-023-17/+36
| * | | | webfinger protocol compatible + minor changesFlorian Hülsmann2012-04-023-17/+36
| |/ / /
| * | | webfinger reimplementation startedFlorian Hülsmann2012-03-317-39/+52
| * | | create static host-meta instead of symlink and .htaccessFlorian Hülsmann2012-03-301-29/+28
| * | | whitespace indentation fixFlorian Hülsmann2012-03-281-26/+26
| * | | webfinger installation creates symlink in document rootFlorian Hülsmann2012-03-281-1/+31
* | | | Hide instance import as it eats dataTom Needham2012-04-072-1/+9
* | | | rename admin_export -> admin_migrateTom Needham2012-04-074-12/+10
* | | | Display errors on importTom Needham2012-04-072-16/+20
* | | | Show nice errorsTom Needham2012-04-061-4/+20