Revision: 2262
http://mrbs.svn.sourceforge.net/mrbs/?rev=2262&view=rev
Author: cimorrison
Date: 2012-01-27 18:15:54 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
Merged in latest changes from trunk
Modified Paths:
--------------
mrbs/branches/ics_import/web/Themes/default/header.inc
Property Changed:
----------------
mrbs/branches/ics_import/
Property changes on: mrbs/branches/ics_import
___________________________________________________________________
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/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/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/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:2250-2261
Modified: mrbs/branches/ics_import/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/ics_import/web/Themes/default/header.inc 2012-01-27
18:08:32 UTC (rev 2261)
+++ mrbs/branches/ics_import/web/Themes/default/header.inc 2012-01-27
18:15:54 UTC (rev 2262)
@@ -3197,7 +3197,6 @@
var tableOptions = new Object();
<?php
// Use an Ajax source - gives much better performance for large tables
-
$ajax_url = basename($PHP_SELF) . "?" . $QUERY_STRING . "&ajax=1";
?>
tableOptions.sAjaxSource = "<?php echo $ajax_url ?>";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
