Commit graph

77 commits

Author SHA1 Message Date
Robert Sparks 77881658d2 Putting 19103 back in the mergequeue.
- Legacy-Id: 19110
2021-06-10 23:15:05 +00:00
Robert Sparks 69a4220f31 defer 19103 until the release after next
- Legacy-Id: 19105
2021-06-10 20:49:49 +00:00
Robert Sparks b0590c838f Grooming mergequeue
- Legacy-Id: 19000
2021-05-18 17:21:04 +00:00
Robert Sparks 5ecd47009d managing merge queue entries.
- Legacy-Id: 18942
2021-04-12 14:34:08 +00:00
Robert Sparks 8beda6c5d1 removing 18860 and 18858 from hold-for-merge
- Legacy-Id: 18883
2021-03-03 17:13:07 +00:00
Robert Sparks c5dc71bc39 Holding r1860 for test issues
- Legacy-Id: 18877
2021-03-02 21:03:42 +00:00
Robert Sparks 810331c748 Hold r18859. Will probably address a different way.
- Legacy-Id: 18876
2021-03-02 20:22:22 +00:00
Robert Sparks d3914cf2a9 Capturing 18858 in old for merge
- Legacy-Id: 18874
2021-03-02 18:45:21 +00:00
Robert Sparks 09809b874e Merged in [18689] from kivinen@iki.fi:
New version of the timezone support for agenda. Now the ongoing
bars work. This also moves the javascript from the agenda.html
to separate timezone.js file. This commit does not include the
moment and moment-timezone javascript libraries that are
needed to get this working, they need to be added to
ietf/externals/static separately.
 - Legacy-Id: 18800
Note: SVN reference [18689] has been migrated to Git commit f18fe23ea5
2021-01-25 16:28:34 +00:00
Robert Sparks 159b8fe37c Merged in [18712] from jennifer@painless-security.com:
Add timezone support to agenda weekview; display UTC on UTC agenda page. Fixes #3111.
 - Legacy-Id: 18796
Note: SVN reference [18712] has been migrated to Git commit d29553c0bc
2021-01-15 19:59:56 +00:00
Robert Sparks 22de976120 bringing agenda work in now that the timezone aware migrations deferred
- Legacy-Id: 18795
2021-01-15 19:09:43 +00:00
Henrik Levkowetz 80f667589b Updated hold-for-merge and ready-for-merge lists
- Legacy-Id: 18732
2020-12-04 16:20:26 +00:00
Henrik Levkowetz c9f805f8e5 - Legacy-Id: 18699 2020-11-16 17:36:36 +00:00
Henrik Levkowetz 35f4f4c8a8 Merged in [18651] from jennifer@painless-security.com:
Retrieve session agenda, slides, and minutes each time agenda modal is opened. Fixes #3050.
 - Legacy-Id: 18658
Note: SVN reference [18651] has been migrated to Git commit bbf04c3fbe
2020-11-06 15:53:28 +00:00
Henrik Levkowetz 2ed49e24ba - Legacy-Id: 18404 2020-08-22 18:55:43 +00:00
Henrik Levkowetz 9be854429e Updated hold-for-merge
- Legacy-Id: 18317
2020-07-30 10:42:48 +00:00
Henrik Levkowetz a8829bdaee - Legacy-Id: 18303 2020-07-29 10:58:45 +00:00
Henrik Levkowetz 868598955b - Legacy-Id: 17729 2020-05-04 19:39:56 +00:00
Henrik Levkowetz 267bd59040 Updated merge hold and ready lists.
- Legacy-Id: 17726
2020-05-04 13:00:17 +00:00
Henrik Levkowetz 9b8d9c8305 - Legacy-Id: 17596 2020-04-08 14:53:51 +00:00
Henrik Levkowetz db635fe7b3 - Legacy-Id: 17499 2020-03-22 10:57:59 +00:00
Henrik Levkowetz d5f18de71f - Legacy-Id: 17066 2019-11-20 09:58:11 +00:00
Henrik Levkowetz 290a98631f Merged in [16564] from pusateri@bangj.com and added tests:
Convert markdown to html if Accept header prioritizes text/html over text/markdown. Fixes #1926.
 - Legacy-Id: 16982
Note: SVN reference [16564] has been migrated to Git commit 65b3f93afe
2019-11-09 17:15:39 +00:00
Henrik Levkowetz d798196f5a Merged in [16703] from sasha@dashcare.nl:
Ref #2231 - Fix send-review-reminders and add it to daily cron
This fixes a syntax error and a Python 3 incompatibility, and adds
send-review-reminders to the daily cron script.
Important notes:
- I have not tested to what degree the existing reminders work as they
  should, as that's out of scope. It does have tests.
- I can't assess whether the virtualenv activation works in the
  production setup, and it may be obsolete as bin/daily also
  activates the virtualenv.
- The same Python 3 incompatibility (execfile() no longer exists) seems
  to exist in various other scripts.
 - Legacy-Id: 16821
Note: SVN reference [16703] has been migrated to Git commit 296b126c70
2019-10-04 13:04:37 +00:00
Henrik Levkowetz 565d24cbbc - Legacy-Id: 16766 2019-09-30 15:12:49 +00:00
Henrik Levkowetz f6db442fc4 - Legacy-Id: 16692 2019-09-03 11:30:45 +00:00
Henrik Levkowetz a9b9d30eab Tweaked mergeready, and added/changed some items in the merge support files.
- Legacy-Id: 16605
2019-07-31 21:31:55 +00:00
Henrik Levkowetz 0606c6dd5f - Legacy-Id: 16595 2019-07-26 19:33:51 +00:00
Henrik Levkowetz ef3cbf4684 Merged in [15595] from rjsparks@nostrum.com:
Converted stats, submit, sync. and utils/test to use factories. Excluded utils/test_data from coverage checks.
 - Legacy-Id: 15599
Note: SVN reference [15595] has been migrated to Git commit 39e76a836996ec9ed8ea449c92bdfae91c3dbaae
2018-10-19 12:54:58 +00:00
Henrik Levkowetz 977b3ca74a Merged in [15580] from rjsparks@nostrum.com:
Better constrain a liaison test object to match the preconditions for the test.
 - Legacy-Id: 15594
Note: SVN reference [15580] has been migrated to Git commit 8004ba367a
2018-10-17 13:50:34 +00:00
Henrik Levkowetz a74055c922 - Legacy-Id: 15542 2018-10-08 14:09:16 +00:00
Henrik Levkowetz 50b546338a Merged in [15314] from rjsparks@nostrum.com:
Converted the community app tests to use factories.
 - Legacy-Id: 15346
Note: SVN reference [15314] has been migrated to Git commit ae70706faf
2018-07-14 19:50:22 +00:00
Henrik Levkowetz 54f36359b0 Updated hold-for-merge
- Legacy-Id: 15343
2018-07-14 18:09:34 +00:00
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