Mercurial > hg > soundsoftware-site
annotate .svn/pristine/bc/bcb08a380a912688504e27334c28309a609ac626.svn-base @ 1384:b51b5ae3734c luisf
Merge
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 20 Sep 2013 19:04:25 +0100 |
| parents | cbb26bc654de |
| children |
| rev | line source |
|---|---|
| Chris@909 | 1 --- |
| Chris@909 | 2 journals_001: |
| Chris@909 | 3 created_on: <%= 2.days.ago.to_date.to_s(:db) %> |
| Chris@909 | 4 notes: "Journal notes" |
| Chris@909 | 5 id: 1 |
| Chris@909 | 6 journalized_type: Issue |
| Chris@909 | 7 user_id: 1 |
| Chris@909 | 8 journalized_id: 1 |
| Chris@909 | 9 journals_002: |
| Chris@909 | 10 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@909 | 11 notes: "Some notes with Redmine links: #2, r2." |
| Chris@909 | 12 id: 2 |
| Chris@909 | 13 journalized_type: Issue |
| Chris@909 | 14 user_id: 2 |
| Chris@909 | 15 journalized_id: 1 |
| Chris@909 | 16 journals_003: |
| Chris@909 | 17 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@909 | 18 notes: "A comment with inline image: !picture.jpg!" |
| Chris@909 | 19 id: 3 |
| Chris@909 | 20 journalized_type: Issue |
| Chris@909 | 21 user_id: 2 |
| Chris@909 | 22 journalized_id: 2 |
| Chris@909 | 23 journals_004: |
| Chris@909 | 24 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@909 | 25 notes: "A comment with a private version." |
| Chris@909 | 26 id: 4 |
| Chris@909 | 27 journalized_type: Issue |
| Chris@909 | 28 user_id: 1 |
| Chris@909 | 29 journalized_id: 6 |
| Chris@909 | 30 journals_005: |
| Chris@909 | 31 id: 5 |
| Chris@909 | 32 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@909 | 33 notes: "A comment on a private issue." |
| Chris@909 | 34 user_id: 2 |
| Chris@909 | 35 journalized_type: Issue |
| Chris@909 | 36 journalized_id: 14 |