Commit Graph

812 Commits

Author SHA1 Message Date
Bart Visscher a8bca282df Implement moving of event 2011-10-20 23:49:28 +02:00
Bart Visscher bb5ccc5731 Connect popup to fullcalendar 2011-10-20 23:49:28 +02:00
Bart Visscher 0eb6c759d7 Connect newEvent & editEvent to fullcalendar 2011-10-20 23:49:28 +02:00
Bart Visscher 4fe48a50f0 Translation of calendar interface 2011-10-20 23:49:27 +02:00
Bart Visscher 2e6ec6ce0b Connect calendar buttons to actions 2011-10-20 23:49:27 +02:00
Bart Visscher 4075d18050 Implement loading of events in calendar 2011-10-20 23:49:27 +02:00
Bart Visscher a12cdb55b1 Replace ownCloud calendar html with fullcalendar implementation 2011-10-20 23:49:27 +02:00
Brice Maron 2906ea3d78 Add caching for filelist sharing icon status to avoid many http req. 2011-10-20 23:03:05 +02:00
Robin Appelman e9b6a1018d remove unneeded definiton of get_temp_dir 2011-10-20 01:27:04 +02:00
Robin Appelman 8f77179d29 Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud 2011-10-20 01:24:23 +02:00
Hendrik Langer 466b41c36b Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments 2011-10-19 23:38:35 +02:00
Brice Maron 7e34452746 Little trick to avoid editor loading twice on double click 2011-10-19 22:42:44 +02:00
Brice Maron da8d32ae38 Tweak bookmarklet to not change the current page. Correct encoding when add bookmark 2011-10-18 23:27:53 +02:00
Brice Maron 9ea34250a0 Lower also the album name in media scanner... 2011-10-18 23:15:47 +02:00
Brice Maron b15d8878b7 Correct use of null for not null columns in media scanner 2011-10-18 22:41:25 +02:00
Brice Maron 29368d1c58 Add 3 More log writing in files sharing app 2011-10-18 21:30:08 +02:00
Robin Appelman b975f11514 make sharing work with the new mouting mechanism 2011-10-18 21:19:13 +02:00
Brice Maron 59eac3bc29 Correct little typo/bug in log display and remove ending php tag 2011-10-18 20:10:17 +02:00
Brice Maron 2ac00b378a Fix file sharing : Don't give a unused param to execute 2011-10-17 23:39:23 +02:00
Brice Maron 492931562f Fix bookmark listing with mysql: limit is binded as string. 2011-10-17 13:49:33 +02:00
Robin Appelman 4d1776faf9 catch some edge cases in media player 2011-10-17 01:25:11 +02:00
Robin Appelman 595b13f1e0 prevent the remaining ob_clean related errors 2011-10-17 01:18:02 +02:00
Robin Appelman 330c513015 prevent error in media player ajax api 2011-10-17 00:25:13 +02:00
Brice Maron 1f6be85719 Fix bookmarks app to work with postgresql.
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
Robin Appelman b0127e3918 use OC_Log instead of error_log 2011-10-16 21:42:24 +02:00
Georg Ehrke 323a98adb7 Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar 2011-10-15 17:16:00 +02:00
Bart Visscher c383543ec9 Remove unused parameter 2011-10-15 11:45:58 +02:00
Bart Visscher 9cfae56df5 Fix calendar colors with new calendar 2011-10-15 11:45:58 +02:00
Brice Maron 8d4039b678 Add loading message to image lightbox and tweak events 2011-10-14 23:51:51 +02:00
Robin Appelman 8450785379 Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud 2011-10-14 20:38:42 +02:00
Georg Ehrke ea8461e83d scrolling in calendar 2011-10-14 13:46:28 +02:00
Georg Ehrke a01d10e57d Merge branch 'master' into calendar 2011-10-13 21:59:16 +02:00
Michiel@unhosted 8da00e2d9a avoiding notice if ['HTTPS'] is not set 2011-10-13 15:50:08 +02:00
John Kristensen c86d1824fe Improve handling of calendar export $_GET params
* a notice would be reported if either of the 'cal' or 'event' $_GET params
   where not supplied, which would result in 'Cannot modify header information'
   warnings
2011-10-12 15:23:39 +11:00
John Kristensen ef8826ac2d remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
* the description field was removed in commit:
     f3f5d775b5
   but the field was still trying to be mapped - causing errors with CalDAV
2011-10-12 15:10:59 +11:00
Georg Ehrke 4cbae823eb Merge branch 'master' into calendar 2011-10-10 21:08:11 +02:00
Georg Ehrke f49ecee24c reload calendar automatically 2011-10-10 12:03:30 +02:00
Michiel@unhosted e2468c4343 fix webfinger install script 2011-10-09 17:24:18 +02:00
Michiel@unhosted 6e62911a4e Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-09 17:13:34 +02:00
Michiel@unhosted f4fb6356cd use install.php properly 2011-10-09 17:12:16 +02:00
Bart Visscher 203f7a3a87 Move contact delete button to top right corner 2011-10-09 00:04:37 +02:00
Bart Visscher 88aa40e6ac Show add contact form on opening contacts page 2011-10-09 00:04:37 +02:00
Florian Pritz 19d4e6e1d5 apps/bookmarks: remove unused variable
This is not needed anymore since commit
6b64aa3faf.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-08 21:07:43 +02:00
Florian Pritz 4a4e6eb071 apps/bookmarks: follow redirects when fetching title
This solves a problem where hitting a redirect page would lead to a "302
Found" title.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-08 20:36:40 +02:00
Tom Needham deaeab3d92 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-08 15:47:03 +01:00
Tom Needham adebefad84 Fixed editor loading and file saving issue 2011-10-08 15:46:38 +01:00
Marvin Thomas Rabe 6b64aa3faf removed description. changed target to _blank. removed sorting. updated layout. 2011-10-08 13:54:45 +02:00
Marvin Thomas Rabe f3f5d775b5 removed description field for calendar 2011-10-08 13:28:01 +02:00
Marvin Thomas Rabe 39e7db7db4 added missing files 2011-10-08 13:11:13 +02:00
Marvin Thomas Rabe 590ff0ced9 moved bookmarklet to personal. username must be provided when adding a new user. 2011-10-08 13:10:49 +02:00
Jan-Christoph Borchardt 0bb3270503 Revert "support of RRULE in calendar app"
Reverting as per Georg's request (not stable enough yet)

This reverts commit 55ab68a332.
2011-10-08 00:12:57 +02:00
Bart Visscher a13d42fdaf Fixes for adding contact property 2011-10-07 23:01:49 +02:00
Bart Visscher 46b8703b71 Display contact name without label and in bold 2011-10-07 22:42:50 +02:00
Bart Visscher f95e8c62c9 Save the right contact property 2011-10-07 22:38:19 +02:00
Bart Visscher 8ea9c39241 Fix saving properties with a new contact 2011-10-07 22:25:26 +02:00
Bart Visscher bc54f13636 Fix name when adding contact 2011-10-07 21:59:25 +02:00
Robin Appelman 7e0da0cb25 fix amapache url 2011-10-07 18:13:46 +02:00
Tom Needham 65a491eabd Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-07 17:02:56 +01:00
Robin Appelman 6449a45695 disable openid on default 2011-10-07 17:02:55 +02:00
Robin Appelman 4fc8e28fba Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-07 16:46:18 +02:00
Jan-Christoph Borchardt fa72f1c3cc some icon corrections 2011-10-07 16:18:47 +02:00
Bart Visscher 980a0893f0 Change colorselector to use border for selected color 2011-10-07 16:03:26 +02:00
Robin Appelman 20554be9f4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-07 00:15:54 +02:00
Marvin Thomas Rabe e345fbd386 conflicts solved 2011-10-06 22:40:11 +02:00
Marvin Thomas Rabe bb26fe9300 Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55 2011-10-06 22:37:06 +02:00
Marvin Thomas Rabe ae56bb63c6 Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52 2011-10-06 22:36:34 +02:00
Marvin Thomas Rabe 878178145d Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54 2011-10-06 22:35:36 +02:00
Bart Visscher 3cc7212c82 Add icon for calendar color selector 2011-10-06 21:22:55 +02:00
Bart Visscher b0847a61f5 Start using OC_JSON in gallery app 2011-10-06 21:22:01 +02:00
Bart Visscher c30aa4ddeb Start using OC_JSON in tasks app 2011-10-06 21:21:38 +02:00
Bart Visscher 16ee08385e Merge branch 'master' into tasks 2011-10-06 15:37:20 +02:00
Bart Visscher 4786ed321e Replace _ in timezone setting with a space 2011-10-06 13:22:36 +02:00
Bart Visscher c28f1e0276 Implement timezone fix from Stephen Rees-Carter 2011-10-06 13:22:36 +02:00
Georg Ehrke bf017fb4bd Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-06 13:21:38 +02:00
Georg Ehrke 55ab68a332 support of RRULE in calendar app 2011-10-06 13:21:13 +02:00
Stephen Rees-Carter c853fc75a1 BUGFIX: removed the hard-coded Continent selection for Calendar Timezones. 2011-10-06 10:31:05 +11:00
Tom Needham d9464de690 Updated saving feedback 2011-10-05 21:59:03 +01:00
Bartek Przybylski f92fa6989e another query fix 2011-10-05 22:28:17 +02:00
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
Borjan Tchakaloff 5570222b40 Added the missing quotes on the filename. 2011-10-05 15:20:32 +04:00
Borjan Tchakaloff 0cde2a3146 Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder). 2011-10-05 14:27:50 +04: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
Robin Appelman a8621265e2 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-05 02:11:44 +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
Marvin Thomas Rabe 7579fc7bc9 updated margins 2011-10-04 21:39:13 +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 36196b6c2d use browsercache for gallery covers 2011-10-02 19:42:14 +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
Bartek Przybylski 07b3b103ce changing <? to <?php 2011-10-02 12:24:02 +02:00
Tom Needham 0825073e8c Editor now loads on top of files app. 2011-10-01 22:48:00 +01:00
Georg Ehrke 0ebe9ad70c added function to export single events 2011-10-01 23:19:06 +02:00
Georg Ehrke f9824f6108 choosable default duration of event 2011-10-01 22:53:18 +02:00
Bartek Przybylski 339d417420 removing add new album button, removing logs, and unused code 2011-10-01 22:36:01 +02:00
Georg Ehrke 1ea183a0f7 fix duration bug 2011-10-01 21:09:08 +02:00
Georg Ehrke 8219516ec0 removed bug, that the drag and drop function added 24h to the duration of the event, after moving an event from allday to a time 2011-10-01 20:44:08 +02:00
Georg Ehrke 50007f2d40 removed bug, that you can't change time in week view, when event was an allday event 2011-10-01 20:36:20 +02:00
Georg Ehrke a7431d99e5 remove debugging text in drag and drop function 2011-10-01 20:31:58 +02:00
Georg Ehrke 43a3e46369 added drag and drop function for events in calendar app 2011-10-01 20:27:30 +02:00
Bartek Przybylski 83e7f9d54a showing galleries bahaviour change 2011-10-01 11:26:47 +02:00
Marvin Thomas Rabe 5a40804773 bookmarks are now translatable 2011-10-01 11:14:43 +02:00
Georg Ehrke bf6414d3ad choosable time format 2011-10-01 10:39:07 +02:00
Georg Ehrke 0514a1925b choosable first day of week & choosable days of weekend 2011-10-01 09:54:52 +02:00
Bart Visscher ddd28aae67 Remove test data from calendar creation 2011-09-30 23:17:30 +02:00
Bart Visscher 9a5d517ec2 Add more checks for admin user 2011-09-30 23:17:30 +02:00
Bart Visscher f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +02:00