Commit Graph

3310 Commits

Author SHA1 Message Date
Bart Visscher 17af1ba893 Silence error for missing appinfo info file 2012-04-10 21:04:35 +02:00
Frank Karlitschek 07719045db Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-10 15:05:59 +02:00
Frank Karlitschek 47f94548ce don´t enable by default. still broken 2012-04-10 15:05:33 +02:00
Arthur Schiwon 0c56f82db5 fix: drag'n'drop actions with files containing special chars, fixes oc-420 2012-04-10 13:53:27 +02:00
Frank Karlitschek 6cf3f10d35 fix includes 2012-04-09 22:51:53 +02:00
Frank Karlitschek b0894b3148 Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do. 2012-04-09 22:10:29 +02:00
Thomas Tanghus 4fda6af725 Contacts: Fix for not being able to add contact to empty/non-existant address book. 2012-04-09 16:30:58 +02:00
Thomas Tanghus 9c247ce874 Removed padding. 2012-04-09 16:30:58 +02:00
Thomas Tanghus 53091551d8 Re-added file I had accidentally removed earlier :-P 2012-04-09 16:30:58 +02:00
Tom Needham 8e188cd96f Copy over all file app data for imported user 2012-04-08 19:16:03 +00:00
Tom Needham ecc596534a Decode json response for admin exports 2012-04-08 19:08:17 +00:00
Tom Needham e5ebbacc9e Fix sqlite version detection 2012-04-08 18:52:31 +00:00
Tom Needham 5e314e8eff Emit hooks for user creation 2012-04-07 22:00:32 +00:00
Tom Needham c0869887cf Return JSON for import and export methods of OC_Migrate 2012-04-07 21:55:16 +00:00
Tom Needham 9edf45a324 Merge branch 'master' into migration 2012-04-07 17:31:30 +00:00
Tom Needham d2886f2020 Hide instance import as it eats data 2012-04-07 17:27:09 +00:00
Tom Needham 00449cdf37 rename admin_export -> admin_migrate 2012-04-07 17:23:25 +00:00
Tom Needham 23d39f7ef0 Display errors on import 2012-04-07 16:13:18 +00:00
Thomas Tanghus d1ae6512cc Contacts: Misc. cleanup tweaks. 2012-04-07 16:03:43 +02:00
Thomas Tanghus b71cf1a4f9 Fix bug oc-413: PHP fatal error in contacts page when no contacts in ownCloud. 2012-04-07 16:03:43 +02:00
Tom Needham 660951dc64 Add some filetypes 2012-04-07 13:32:00 +00:00
Tom Needham 42e110b49c Update url 2012-04-07 13:07:44 +00:00
Tom Needham a098c7c685 Give editor focus after saving 2012-04-06 21:38:38 +00:00
Tom Needham 22466010fc Provide undo when closing editor with unsaved changes 2012-04-06 21:37:28 +00:00
Tom Needham 2fe0716cb4 Show nice errors 2012-04-06 20:52:41 +00:00
Bartek Przybylski 96c99125da mimetype filter for filepicker 2012-04-05 23:18:44 +02:00
Bartek Przybylski fe3d3be399 filepicker loading style fixup 2012-04-05 22:25:58 +02:00
Bartek Przybylski 5b4a303672 loading screen for filepicker 2012-04-05 21:29:54 +02:00
Florian Hülsmann 8a2c5dda6d Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102 2012-04-04 21:36:50 +02:00
Tom Needham 85f9869f69 Make the token really random 2012-04-04 13:18:02 +00:00
Arthur Schiwon 60e3b563e2 webdav needs to load authentication apps 2012-04-04 12:41:32 +02:00
Tom Needham acdce2b1e0 Check blacklist before saving to filesystem 2012-04-03 22:31:34 +00:00
Tom Needham 95c2ac5d58 Dont typecast variables as integers 2012-04-03 21:14:55 +00:00
Bartek Przybylski cd05dfb943 adding icons to filepicker 2012-04-03 22:18:03 +02:00
Thomas Tanghus dd4e577f6d Contacts: l11n for geo autocomplete. Not sure if it works though. 2012-04-03 08:13:10 +02:00
Thomas Tanghus fc555b48ec Contacts: Added autocomplete using geonames.org. 2012-04-03 07:29:47 +02:00
Thomas Tanghus b3f107ddda Contacts: First work on cleaner design. 2012-04-03 03:29:12 +02:00
Thomas Tanghus 896bff5748 Contacts: rescan categories on load if there are none. 2012-04-03 03:29:12 +02:00
Florian Hülsmann bd9fa658de merged from upstream 2012-04-02 23:54:18 +02:00
Bartek Przybylski ff5dbc52b8 multiselect handle for filepicker 2012-04-02 21:32:35 +02:00
Tom Needham 9f9b448161 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-02 17:44:24 +00:00
Tom Needham adc9d906e4 confirm close when there are unsaved changes 2012-04-02 17:44:15 +00:00
Bartek Przybylski f21d6d4f9f dialogs filepicker first draft 2012-04-02 19:39:24 +02:00
Tom Needham dc499c5b4e add * to filename when changes have been made 2012-04-02 17:27:06 +00:00
Tom Needham d0cb99e347 use OC_Dialogs instead of alert() 2012-04-02 16:35:11 +00:00
Florian Hülsmann 2cb741adff Merge branch 'master' of gitorious.org:~cbix/owncloud/cbix-owncloud 2012-04-02 17:13:21 +02:00
Florian Hülsmann 33c1fa6e28 webfinger protocol compatible + minor changes 2012-04-02 17:12:52 +02:00
Florian Hülsmann 3e150ff548 webfinger protocol compatible + minor changes 2012-04-02 06:31:00 +02:00
Michael Gapczynski ff4b0c4d7f Move writable check into local filestorage so shared files can be renamed 2012-04-01 13:30:41 -04:00
Robin Appelman cce59df2ae the core apps don't have types 2012-04-01 19:22:23 +02:00