Mercurial > hg > soundsoftware-site
annotate .svn/pristine/66/66913dbb20af8be563c71466e0df0765d76b644f.svn-base @ 1519:afce8026aaeb redmine-2.4-integration
Merge from branch "live"
| author | Chris Cannam |
|---|---|
| date | Tue, 09 Sep 2014 09:34:53 +0100 |
| parents | 038ba2d95de8 |
| children |
| rev | line source |
|---|---|
| Chris@1296 | 1 --- |
| Chris@1296 | 2 journals_001: |
| Chris@1296 | 3 created_on: <%= 2.days.ago.to_date.to_s(:db) %> |
| Chris@1296 | 4 notes: "Journal notes" |
| Chris@1296 | 5 id: 1 |
| Chris@1296 | 6 journalized_type: Issue |
| Chris@1296 | 7 user_id: 1 |
| Chris@1296 | 8 journalized_id: 1 |
| Chris@1296 | 9 journals_002: |
| Chris@1296 | 10 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@1296 | 11 notes: "Some notes with Redmine links: #2, r2." |
| Chris@1296 | 12 id: 2 |
| Chris@1296 | 13 journalized_type: Issue |
| Chris@1296 | 14 user_id: 2 |
| Chris@1296 | 15 journalized_id: 1 |
| Chris@1296 | 16 journals_003: |
| Chris@1296 | 17 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@1296 | 18 notes: "A comment with inline image: !picture.jpg! and a reference to #1 and r2." |
| Chris@1296 | 19 id: 3 |
| Chris@1296 | 20 journalized_type: Issue |
| Chris@1296 | 21 user_id: 2 |
| Chris@1296 | 22 journalized_id: 2 |
| Chris@1296 | 23 journals_004: |
| Chris@1296 | 24 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@1296 | 25 notes: "A comment with a private version." |
| Chris@1296 | 26 id: 4 |
| Chris@1296 | 27 journalized_type: Issue |
| Chris@1296 | 28 user_id: 1 |
| Chris@1296 | 29 journalized_id: 6 |
| Chris@1296 | 30 journals_005: |
| Chris@1296 | 31 id: 5 |
| Chris@1296 | 32 created_on: <%= 1.days.ago.to_date.to_s(:db) %> |
| Chris@1296 | 33 notes: "A comment on a private issue." |
| Chris@1296 | 34 user_id: 2 |
| Chris@1296 | 35 journalized_type: Issue |
| Chris@1296 | 36 journalized_id: 14 |