Commit Graph

626 Commits

Author SHA1 Message Date
Tom Needham 30343f15e2 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-05 20:49:08 +01:00
Michiel@unhosted af6eb52b5e correct wrong variable name in remoteStorage app 2011-10-05 20:01:58 +02:00
Bartek Przybylski d5931b8c48 gallery db query fix 2011-10-05 19:32:30 +02:00
Tom Needham edd958836e Moved addScript and addStyle calls to app.php 2011-10-05 16:32:01 +01:00
Tom Needham 86825ee3b5 Cleanup of code. Fixed breadcrumb removal issue 2011-10-05 16:10:11 +01:00
Jan-Christoph Borchardt 28dcbe3cb0 disabled gallery app by default until it's in a branch 2011-10-05 14:54:34 +02:00
Jan-Christoph Borchardt 8e532b5ceb removed extra calendar settings. Also, table layout? 2011-10-05 14:32:25 +02:00
Robin Appelman 15e5bd16ab use texteditor for search results 2011-10-05 02:44:24 +02:00
Robin Appelman c6a73bee5e remove now unneeded textviewer 2011-10-05 02:38:55 +02:00
Robin Appelman 1fba8619d4 move some code to where it belongs and remove duplicated editor app 2011-10-05 02:36:54 +02:00
Florian Jacob 813e8b274a Added all the remaining extensions to filetypes
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
Tom Needham 93ed844015 Control events are now bound on the page load rather than everytime the editor is loaded. 2011-10-04 20:20:08 +01:00
Bart Visscher 2c95c799e6 Add new contact name to end of cantact list 2011-10-04 21:16:57 +02:00
Bart Visscher fada3517b0 All the basic field for add contact added 2011-10-04 21:16:57 +02:00
Tom Needham 39d42fc62b Save button now removed after closing editor 2011-10-04 20:15:20 +01:00
Marvin Thomas Rabe 0179b61f69 fixed another bug with breadcrumbs 2011-10-04 21:05:49 +02:00
Marvin Thomas Rabe 451b5940ea fixed scrollbar issues. fixed missing breadcrumb image. 2011-10-04 21:01:05 +02:00
Tom Needham fa203d186e Added fillHeight() js function for resizing editor 2011-10-04 19:46:27 +01:00
Tom Needham 2d9c3d75f3 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-04 19:17:23 +01:00
Tom Needham 09c1179094 Fixed breadcrumb issue. 2011-10-04 19:07:22 +01:00
Marvin Thomas Rabe 340f6bbaba Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-04 19:37:54 +02:00
Marvin Thomas Rabe d1518f2901 updated calendar settings 2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe de21378291 fixed scrollbar issues 2011-10-04 18:54:07 +02:00
Tom Needham 5c9b069fe5 Updated saving feedback to use loading.gif 2011-10-04 17:43:13 +01:00
Tom Needham 9d918b5ac8 Updated control bar styling and save feedback. 2011-10-04 16:31:26 +01:00
Tom Needham 58d284419c HTML data is now encoded before being shown. 2011-10-04 15:27:29 +01:00
Georg Ehrke 70091ec649 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-04 10:17:55 +02:00
Georg Ehrke 33b660857a fix ical import 2011-10-04 10:17:11 +02:00
Jan-Christoph Borchardt 79da90bb08 renamed unhosted to remoteStorage (needs to be updated with coming protocol version) 2011-10-04 10:07:46 +02:00
Tom Needham 45fda6f43e Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-03 23:43:58 +01:00
Tom Needham 6c9ff0e47e Fixed ajax urls 2011-10-03 23:41:32 +01:00
Tom Needham 32ce0d3c6e Fixed file saving issue. 2011-10-03 23:28:47 +01:00
Tom Needham 02d7b1a1fc Added breadcrumb and control bar. 2011-10-03 22:59:40 +01:00
Georg Ehrke 77e12a15b1 fix checkLoggedIn function in import of ical files 2011-10-03 22:52:13 +02:00
Georg Ehrke c40a1fcede added import function as filehandler 2011-10-03 22:50:10 +02:00
Bart Visscher dec8106665 Add user friendly calendar color chooser 2011-10-03 20:42:47 +02:00
Bart Visscher 6159b79715 Take setting default value out of loop 2011-10-03 20:42:47 +02:00
Marvin Thomas Rabe ffc5c4dabe Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51 2011-10-03 15:18:48 +02:00
Weng Xuetian acbd31255e fix add bookmark bug. 2011-10-03 20:44:03 +08:00
Marvin Thomas Rabe a2bcbec791 Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-10-03 02:01:24 +02:00
Robin Appelman 7bcc0efd6a show galleries in search results 2011-10-02 19:33:55 +02:00
Frank Karlitschek 39c4d9b2ca enable by default 2011-10-02 18:53:47 +02:00
Bartek Przybylski c3d7ffc877 adding tmp icon for app, extending memory size for php in .htaccess 2011-10-02 17:52:11 +02:00
Bartek Przybylski ee62eb7bb0 adding missing files, don know why they disappeared 2011-10-02 17:48:02 +02:00
Bartek Przybylski 6643f68663 merge 'gallery_app_devel' to 'master' 2011-10-02 17:17:46 +02:00
Marvin Thomas Rabe bdcf31cc73 Added translatable text. 2011-10-02 16:06:30 +02:00
Marvin Thomas Rabe 213275a1f8 Add translation and fixed some css problems 2011-10-02 15:55:23 +02:00
Marvin Thomas Rabe daee88fd26 Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone. 2011-10-02 15:51:24 +02:00
Robin Appelman fef31bc6c7 Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloud 2011-10-02 14:00:55 +02:00
Bartek Przybylski 54e5a10846 avoid creating empty albums, removing od depreciated code openings 2011-10-02 13:52:04 +02:00