Revision: 1545
http://mrbs.svn.sourceforge.net/mrbs/?rev=1545&view=rev
Author: cimorrison
Date: 2010-10-25 11:42:53 +0000 (Mon, 25 Oct 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/from_to_bookings/web/systemdefaults.inc.php
Property Changed:
----------------
mrbs/branches/from_to_bookings/
mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/from_to_bookings
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1491-1542
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1491-1544
Modified: mrbs/branches/from_to_bookings/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/from_to_bookings/web/systemdefaults.inc.php 2010-10-25
11:40:21 UTC (rev 1544)
+++ mrbs/branches/from_to_bookings/web/systemdefaults.inc.php 2010-10-25
11:42:53 UTC (rev 1545)
@@ -127,9 +127,11 @@
// been created and to have meaningful entries. This is due to differences
// in the way that the data is stored.
-$enable_periods = FALSE;
+// $enable_periods is settable on a per-area basis.
+$enable_periods = FALSE; // Default value for new areas
+
// TIMES SETTINGS
// --------------
Property changes on: mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1491-1542
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1491-1544
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
