merge

website/doctype/about_us_settings/about_us_settings.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-03-26 12:48:00", 
+  "creation": "2013-03-19 12:02:15", 
   "docstatus": 0, 
-  "modified": "2013-03-12 14:48:34", 
+  "modified": "2013-05-03 11:01:30", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -10,7 +10,7 @@
   "allow_attach": 1, 
   "description": "Settings for the About Us Page", 
   "doctype": "DocType", 
-  "document_type": "Master", 
+  "document_type": "Other", 
   "issingle": 1, 
   "module": "Website", 
   "name": "__common__"
@@ -21,7 +21,8 @@
   "parent": "About Us Settings", 
   "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "read_only": 0
  }, 
  {
   "create": 1, 

website/doctype/website_settings/website_settings.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-03-26 06:51:18", 
+  "creation": "2013-04-30 12:58:46", 
   "docstatus": 0, 
-  "modified": "2013-04-17 11:51:24", 
+  "modified": "2013-05-02 15:51:14", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -219,13 +219,16 @@
   "reqd": 0
  }, 
  {
-  "description": "Enter domain names associated to this website, each on a new line", 
   "doctype": "DocField", 
-  "fieldname": "domain_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
-  "label": "Domain List", 
-  "reqd": 0
+  "fieldname": "column_break_28", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "description": "Disable Customer Signup link in Login page", 
+  "doctype": "DocField", 
+  "fieldname": "disable_signup", 
+  "fieldtype": "Check", 
+  "label": "Disable Signup"
  }, 
  {
   "create": 1,