Revision: 2465
https://sourceforge.net/p/mrbs/code/2465/
Author: cimorrison
Date: 2012-10-03 19:43:09 +0000 (Wed, 03 Oct 2012)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/flexible_day_end/web/import.php
Property Changed:
----------------
mrbs/branches/flexible_day_end/
Property changes on: mrbs/branches/flexible_day_end
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datatables:1863-2063
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/draggable_bookings:2074-2141
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/ics_import:2250-2262
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:2402-2438
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datatables:1863-2063
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/draggable_bookings:2074-2141
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/ics_import:2250-2262
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:2402-2464
Modified: mrbs/branches/flexible_day_end/web/import.php
===================================================================
--- mrbs/branches/flexible_day_end/web/import.php 2012-10-03 19:35:57 UTC
(rev 2464)
+++ mrbs/branches/flexible_day_end/web/import.php 2012-10-03 19:43:09 UTC
(rev 2465)
@@ -491,7 +491,7 @@
echo "<div>\n";
echo "<label for=\"ics_file\">" . get_vocab("file_name") . ":</label>\n";
-echo "<input type=\"file\" name=\"ics_file\" id=\"ics_file\">\n";
+echo "<input type=\"file\" accept=\"text/calendar\" name=\"ics_file\"
id=\"ics_file\">\n";
echo "</div>\n";
echo "<fieldset>\n";
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
