Commit graph

44 commits

Author SHA1 Message Date
Henrik Levkowetz cf6354608a - Legacy-Id: 14093 2017-09-01 13:07:21 +00:00
Henrik Levkowetz 73c4a7b397 - Legacy-Id: 13981 2017-07-26 21:34:29 +00:00
Henrik Levkowetz 7d443e5577 Merged in [13955] from kivinen@iki.fi:
Changed links to previous reviews go to the doc page of the last
result, not the review request page. The doc page will contain the
actual review, so it has all information that is needed. Fixes #2090.
 - Legacy-Id: 13961
Note: SVN reference [13955] has been migrated to Git commit 7154166e74
2017-07-21 15:57:03 +00:00
Henrik Levkowetz 7ecf7dfa44 Merged in [13615] and [13627]from rcross@amsl.com:
Changed views that use GET requests to delete objects to use POST.
Fixes #1796.
 - Legacy-Id: 13654
Note: SVN reference [13615] has been migrated to Git commit 3ccb550888

Note: SVN reference [13627] has been migrated to Git commit b908caf95c
2017-06-16 14:20:01 +00:00
Henrik Levkowetz 2c1acdcbea Removed temporary merge holds
- Legacy-Id: 13354
2017-05-15 12:29:29 +00:00
Henrik Levkowetz 849c69ea11 Hold part of 2 commits for next release, to avoid mixing schema and data migrations.
- Legacy-Id: 13312
2017-05-11 09:27:47 +00:00
Henrik Levkowetz 7dafab0b30 Hold a merge for fix of test failure.
- Legacy-Id: 13155
2017-03-27 20:35:26 +00:00
Henrik Levkowetz 1a92efb77e Merged in ^/branch/proceedings/6.33.1.dev0@12141 from rcross@amsl.com:
Added meeting proceedings introduction pages: Progress Report and Attendees.  Added a data migration to provide proceedings introduction information for IETF 95 and 96.
 - Legacy-Id: 12150
2016-10-14 15:48:10 +00:00
Henrik Levkowetz fa94b93560 - Legacy-Id: 12123 2016-10-13 14:42:42 +00:00
Henrik Levkowetz f026dd64cd Hold some commits which have been merged forward to a newer dev branch.
- Legacy-Id: 11872
2016-08-25 11:25:06 +00:00
Henrik Levkowetz 7d3724d9b9 Commits [11765], [11768] have been merged into ^/personal/rjs/6.29.1.dev0@11770, will merge to trunk from there.
- Legacy-Id: 11803
Note: SVN reference [11765] has been migrated to Git commit 485fcd0e53

Note: SVN reference [11768] has been migrated to Git commit 4abb5026d3
2016-08-17 15:27:21 +00:00
Henrik Levkowetz 96f70800a9 Hold commit for addition of tests.
- Legacy-Id: 11701
2016-07-18 10:14:40 +00:00
Henrik Levkowetz 49473ab830 Hold 11667, possible re-work.
- Legacy-Id: 11691
2016-07-17 10:50:34 +00:00
Henrik Levkowetz 4d7f1bf6ed - Legacy-Id: 11115 2016-04-08 17:35:59 +00:00
Henrik Levkowetz 108d9a159d - Legacy-Id: 11094 2016-04-04 19:56:28 +00:00
Henrik Levkowetz c9cb6a6cee Merged in [11083] from stephen.farrell@cs.tcd.ie, with some tweaks:
Assigned default consensus for IETF stream documents, partly fixing #1403 - IRTF/IAB may want more, this just does IETF stream.
 - Legacy-Id: 11089
Note: SVN reference [11083] has been migrated to Git commit 9ca4e98d46
2016-04-03 17:56:33 +00:00
Henrik Levkowetz 59a74b6954 - Legacy-Id: 11088 2016-04-03 17:50:37 +00:00
Henrik Levkowetz 93554376e4 Skip a merge.
- Legacy-Id: 10744
2016-01-26 21:58:38 +00:00
Henrik Levkowetz b88b835fb3 Updated ready/hold-for-merge lists.
- Legacy-Id: 10702
2016-01-15 17:18:02 +00:00
Henrik Levkowetz 70bc268778 Hold nomcom work for the next release.
- Legacy-Id: 10652
2016-01-12 18:11:14 +00:00
Henrik Levkowetz 452166afd0 Not downgrading the PT fonts to a smaller unicode range at this time.
- Legacy-Id: 10548
2015-12-07 18:08:38 +00:00
Henrik Levkowetz 681807528e Updated merge lists.
- Legacy-Id: 10274
2015-10-23 19:14:35 +00:00
Henrik Levkowetz a69db3e569 - Legacy-Id: 10250 2015-10-19 19:24:05 +00:00
Henrik Levkowetz 34a7df494f Updated hold-for-merge
- Legacy-Id: 10181
2015-10-10 11:41:41 +00:00
Henrik Levkowetz 9fa41c42a3 Merged in [10159] from rcross@amsl.com:
Improve secretariat rolodex roles section, sort and identify concluded groups.
 - Legacy-Id: 10180
Note: SVN reference [10159] has been migrated to Git commit 1145751a9b
2015-10-10 11:35:41 +00:00
Henrik Levkowetz 1bc71132c5 Merged in [10156] from rcross@amsl.com:
Adjust audio file glob pattern.
 - Legacy-Id: 10179
Note: SVN reference [10156] has been migrated to Git commit e2b8bad862
2015-10-10 11:15:19 +00:00
Henrik Levkowetz 9688749404 Merged in [10109] from rjsparks@nostrum.com:
Make it clearer in search results when one IPR disclosure updates another. Fixes #1798.
 - Legacy-Id: 10117
Note: SVN reference [10109] has been migrated to Git commit a6b8707030f0e6411b1acc3b38a0fd426c5223a1
2015-10-01 20:26:23 +00:00
Henrik Levkowetz 0712276737 Merged in [9989] from rjsparks@nostrum.com:
Restore color bands to the email-alias page.
 - Legacy-Id: 10022
Note: SVN reference [9989] has been migrated to Git commit 7fef69daa5
2015-08-18 15:25:04 +00:00
Henrik Levkowetz c41a079d4f Merged in [9735] from lars@netapp.com:
More HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9767
Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361
2015-07-18 09:18:54 +00:00
Henrik Levkowetz 5d8306cfc8 Merged in [9733] from lars@netapp.com:
First round of HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9764
Note: SVN reference [9733] has been migrated to Git commit 205df716f8bf4b7dae9e2637f3aa1ba048a158f9
2015-07-18 08:55:30 +00:00
Henrik Levkowetz 7a28608e95 Don't merge personal/rjs/v6.0.4.dev0@9647
- Legacy-Id: 9655
2015-06-03 13:13:54 +00:00
Henrik Levkowetz c426d83a0a Updated solution to the check_permissions decorator, from Ryan
- Legacy-Id: 8643
2014-11-11 22:11:48 +00:00
Henrik Levkowetz 3b59ccf910 The commit personal/rcross/v5.6.3-dev0@8237 Includes other changes which has been merged forward; merge personal/rcross/v5.6.2-dev0@8216 instead. Hold till name FK fields has been extended to new size, and use 'recording' instead of 'record' for the recording type.
- Legacy-Id: 8361
2014-09-28 18:26:01 +00:00
Henrik Levkowetz 272f593e99 - Legacy-Id: 8312 2014-09-16 19:26:21 +00:00
Henrik Levkowetz 3744da4031 - Legacy-Id: 8163 2014-07-22 13:10:25 +00:00
Henrik Levkowetz 092fb8cf84 - Legacy-Id: 8161 2014-07-21 21:01:19 +00:00
Henrik Levkowetz 5bbf1ee46b - Legacy-Id: 8160 2014-07-21 21:00:03 +00:00
Henrik Levkowetz f07ac6171f - Legacy-Id: 8142 2014-07-19 21:12:58 +00:00
Henrik Levkowetz 682681e1cf - Legacy-Id: 8138 2014-07-19 20:54:38 +00:00
Henrik Levkowetz 557c32eeaa - Legacy-Id: 8126 2014-07-19 17:27:49 +00:00
Henrik Levkowetz fe2ea43fa5 - Legacy-Id: 7932 2014-06-24 23:01:49 +00:00
Henrik Levkowetz 81e2f300f3 Corrected referenced commit in comment about [7771]
- Legacy-Id: 7813
Note: SVN reference [7771] has been migrated to Git commit 4d7d0d5959b715228d5e548cae3bd868714a93f9
2014-05-31 18:18:04 +00:00
Henrik Levkowetz 9ad725c7e4 The issue addressed in [7771] was already fixed in [7664].
- Legacy-Id: 7811
Note: SVN reference [7664] has been migrated to Git commit 3e0e10377c

Note: SVN reference [7771] has been migrated to Git commit 4d7d0d5959b715228d5e548cae3bd868714a93f9
2014-05-31 17:16:10 +00:00
Henrik Levkowetz b94e364edd Added a file used by bin/mergeready to mark certain releases which has earlier been marked as ready to merge with a 'hold' indication, instead.
- Legacy-Id: 7760
2014-05-20 19:51:32 +00:00