Mercurial > hg > soundsoftware-site
comparison test/fixtures/.svn/text-base/custom_fields.yml.svn-base @ 524:1248a47e81b3 feature_36
Merge from branch "luisf"
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Mon, 25 Jul 2011 14:39:38 +0100 |
| parents | cbce1fd3b1b7 |
| children |
comparison
equal
deleted
inserted
replaced
| 519:3be6bc3c2a17 | 524:1248a47e81b3 |
|---|---|
| 127 id: 9 | 127 id: 9 |
| 128 is_required: false | 128 is_required: false |
| 129 field_format: date | 129 field_format: date |
| 130 default_value: "" | 130 default_value: "" |
| 131 editable: true | 131 editable: true |
| 132 custom_fields_010: | |
| 133 name: Overtime | |
| 134 min_length: 0 | |
| 135 regexp: "" | |
| 136 is_for_all: false | |
| 137 is_filter: false | |
| 138 type: TimeEntryCustomField | |
| 139 max_length: 0 | |
| 140 possible_values: "" | |
| 141 id: 10 | |
| 142 is_required: false | |
| 143 field_format: bool | |
| 144 default_value: 0 | |
| 145 editable: true |