Commit graph

49 commits

Author SHA1 Message Date
Henrik Levkowetz 6da2b2af22 Added commits ready to merge
- Legacy-Id: 11680
2016-07-16 13:46:26 +00:00
Henrik Levkowetz 8cac770f83 - Legacy-Id: 11087 2016-04-03 17:27:29 +00:00
Henrik Levkowetz 41db1e061b - Legacy-Id: 11076 2016-04-02 20:10:00 +00:00
Henrik Levkowetz dd2b49bf92 Merged in [11037] from rcross@amsl.com:
Grant Bob Hinden announcement tool access.
 - Legacy-Id: 11067
Note: SVN reference [11037] has been migrated to Git commit 5c06843f2c
2016-04-02 16:24:47 +00:00
Henrik Levkowetz d8873e8c75 Work from Russ ready for merge.
- Legacy-Id: 10889
2016-03-04 20:00:04 +00:00
Henrik Levkowetz 15460b3cff Merged in [10718] from olau@iola.dk:
Set daemon = True on the thread in the SMTP test server running while
running tests. This fixes the annoying problem of the python process
staying alive after certain bugs in the test invocation or after a
plain Ctrl + c.
 - Legacy-Id: 10859
Note: SVN reference [10718] has been migrated to Git commit d67a96b4f0
2016-02-25 20:04:57 +00:00
Henrik Levkowetz 8ae4afb7a3 Updated mergelist
- Legacy-Id: 10836
2016-02-11 23:06:19 +00:00
Henrik Levkowetz 849c3ed4ba Updated mergelist
- Legacy-Id: 10777
2016-02-04 16:03:03 +00:00
Henrik Levkowetz b9d9309335 Updated plan and mergelist.
- Legacy-Id: 10766
2016-02-03 20:09:50 +00:00
Henrik Levkowetz d1087f3d50 Merged in [10701] from rjsparks@nostrum.com:
Simplified meeting.session_details. Shows all sessions for a meeting on one page instead of having a page per session. Removes the by-date, by-weekday, by-sequence mechanic.
 - Legacy-Id: 10735
Note: SVN reference [10701] has been migrated to Git commit 4a453281ea
2016-01-26 20:01:23 +00:00
Henrik Levkowetz b88b835fb3 Updated ready/hold-for-merge lists.
- Legacy-Id: 10702
2016-01-15 17:18:02 +00:00
Henrik Levkowetz bce152b2b9 Rewrote crawl_history() to be easier to read (renaming multiple 'retval' variables and other naming tweaks) and made it return distinct revisions without the added uniqueness filtering round from /personal/lars/6.11.1.dev0@10604.
- Legacy-Id: 10639
2016-01-11 23:33:50 +00:00
Henrik Levkowetz a46289c6d4 Added a bunch of commits ready for merge but not marked as such.
- Legacy-Id: 10637
2016-01-11 22:39:50 +00:00
Henrik Levkowetz a60624a731 Updated mergeinfo
- Legacy-Id: 10594
2015-12-15 07:59:34 +00:00
Henrik Levkowetz 8d56f46209 Added a commit which is ready for merge but lacks the 'Commit ready for merge' keywords in the commit message.
- Legacy-Id: 10573
2015-12-10 23:10:16 +00:00
Henrik Levkowetz 7fa8c42249 Typo fix
- Legacy-Id: 10571
2015-12-10 23:07:17 +00:00
Henrik Levkowetz 5087b41018 Added a commit which is ready for merge but lacks the keywords in the commit message.
- Legacy-Id: 10570
2015-12-10 22:56:55 +00:00
Henrik Levkowetz 681807528e Updated merge lists.
- Legacy-Id: 10274
2015-10-23 19:14:35 +00:00
Henrik Levkowetz bce91b4680 Updated merge list
- Legacy-Id: 10203
2015-10-13 18:58:01 +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 f3936db48f Updated ready-for-merge list
- Legacy-Id: 10112
2015-10-01 05:33:35 +00:00
Henrik Levkowetz fb66c1856f Merged in [9669] from olau@iola.dk:
Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.
Fixes #1088. Branch
 - Legacy-Id: 10005
Note: SVN reference [9669] has been migrated to Git commit acda84208d
2015-08-10 19:46:11 +00:00
Henrik Levkowetz 097b4c5e7a - Legacy-Id: 9997 2015-08-10 15:05:25 +00:00
Henrik Levkowetz 18e4b07b6a - Legacy-Id: 9566 2015-04-26 20:43:56 +00:00
Henrik Levkowetz 5a5289d1ad Added pip and setuptools, required in virtualenv, to requirements.txt in order to simplify buildbot testing of package installation and version testing.
- Legacy-Id: 9560
2015-04-26 19:12:16 +00:00
Henrik Levkowetz 6deac8e06e Merged in [9524] from lars@netapp.com:
Add some shim js libraries for IE8 and earlier
(see http://getbootstrap.com/getting-started/#template)
Fix HTML structural errors in the template.
Wrap some HTML comments into Django comments, so they don't get sent to the
client.
 - Legacy-Id: 9539
Note: SVN reference [9524] has been migrated to Git commit 6f2e9f7c25
2015-04-21 20:28:13 +00:00
Henrik Levkowetz d30981ddbd Merged in [9519] from rcross@amsl.com:
Fixes issue #1676.

    Fixes #1676.  RelatedObjectDoesNotExist when User has no Person.
 - Legacy-Id: 9538
Note: SVN reference [9519] has been migrated to Git commit 80d6564458
2015-04-21 20:17:39 +00:00
Henrik Levkowetz 92057b69d4 Branch from Lars ready for merge
- Legacy-Id: 9532
2015-04-21 19:37:39 +00:00
Henrik Levkowetz 7b94d6086a Merged in [9316] from willem@nlnetlabs.nl:
Test fetching of wg and rg document dependency graphs.

  Also added conditional running of these tests, as they depend on the
  availability of the dot, unflatten and ps2pdf binaries, which may not
  be available on all developers' systems.
 - Legacy-Id: 9322
Note: SVN reference [9316] has been migrated to Git commit 5980a35e6c
2015-03-22 16:57:14 +00:00
Henrik Levkowetz ec5b4261b7 Merge in crawler speedup fix from olau@iola.dk.
- Legacy-Id: 8975
2015-02-04 22:05:49 +00:00
Henrik Levkowetz 1dc7a8690f Added a bugfix from Ole to the merge queue.
- Legacy-Id: 8740
2014-12-13 13:40:22 +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 88ee1f0e48 Added a commit from Suresh which didn't have the 'ready for merge' tag.
- Legacy-Id: 8606
2014-11-09 00:24:44 +00:00
Henrik Levkowetz 1307151c6c Added [8305] to the merge queue.
- Legacy-Id: 8443
Note: SVN reference [8305] has been migrated to Git commit feb57a04f0
2014-10-18 15:29:05 +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 8b8a282730 Merged in [8229] from rjsparks@nostrum.com, with minor tweaks:
From mcr@sandelman.ca:
    Refactor to remove dajaxice.
    Modified the URLs that address schedules:
      - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
      - urls to a given schedule include the schedule owner (by email address)
    Corrected issue that prevented deleting sessions.
    Changed comment mechanism in timeslot_edit.js
    Migration to change the email address for (System)
  Fixes bug #1426
 - Legacy-Id: 8319
Note: SVN reference [8229] has been migrated to Git commit fc512680d8
2014-09-18 20:27:28 +00:00
Henrik Levkowetz d2b49ff85a - Legacy-Id: 8058 2014-07-09 10:41:42 +00:00
Henrik Levkowetz c1db415498 Capture branch ready for merge from Peng.
- Legacy-Id: 8010
2014-07-01 18:55:26 +00:00
Henrik Levkowetz a71335af14 Added team-support@rev to the mergelist.
- Legacy-Id: 7916
2014-06-15 11:19:06 +00:00
Henrik Levkowetz be762cd2d2 Added team-support to the mergelist.
- Legacy-Id: 7915
2014-06-15 11:11:31 +00:00
Henrik Levkowetz ce318f4d90 - Legacy-Id: 7650 2014-04-25 15:28:26 +00:00
Henrik Levkowetz f6cc509fd6 Merged [7416] from olau@iola.dk: Redo the quickfix to the "Send and Post" button bug (mentioned in
issue #1308) so that we still do the validation correctly, but just
always show the button (even if it's unusable)
 - Legacy-Id: 7599
Note: SVN reference [7416] has been migrated to Git commit 649618626e
2014-04-12 18:28:05 +00:00
Henrik Levkowetz a83c139a43 Updated ready-for-merge list.
- Legacy-Id: 7569
2014-04-06 14:26:37 +00:00
Henrik Levkowetz 5a424fe2da Merged in [7153] from rjsparks@nostrum.com:
Fixed a typo in code that looks for the IRTF chair email address while adding replaces relationships.
Made that code slightly more robust.
Fixes ticket #1253
 - Legacy-Id: 7531
Note: SVN reference [7153] has been migrated to Git commit 99c01fa54a
2014-03-21 11:55:51 +00:00
Henrik Levkowetz ba43ac0de3 Merged [7447] from rjsparks@nostrum.com: Cache the dependency graph pdf for an hour.
- Legacy-Id: 7512
Note: SVN reference [7447] has been migrated to Git commit 1afc7ada13
2014-03-18 20:09:13 +00:00
Henrik Levkowetz b297c67765 Merged [7396] from rcross@amsl.com: updated test for clean_up_draft_files.
- Legacy-Id: 7401
Note: SVN reference [7396] has been migrated to Git commit 852509c96d983e595fa082e13b771a7f89771803
2014-03-04 17:47:26 +00:00
Henrik Levkowetz 348fa48c2e Updated mergedevbranch script, to be able to add a descriptive commit comment if missing from the original commit message.
- Legacy-Id: 7384
2014-03-01 18:49:23 +00:00
Henrik Levkowetz fd0602ac22 Merged [7371] from rjsparks@nostrum.com: Migration to repair missing StateDocEvents from wg chairs using
the datatracker to request publication of ietf stream documents.
Incremental improvement to the request publication view to create
those StateDocEvents going forward.
This is related to bug #1312
 - Legacy-Id: 7379
Note: SVN reference [7371] has been migrated to Git commit ff48d32c08
2014-03-01 18:05:54 +00:00
Henrik Levkowetz 4f84f7b5ac Added a file to hold a list of changesets which are ready for merge, as a manually maintained alternative to 'Ready for merge' annotations in commit messages.
- Legacy-Id: 7255
2014-02-17 18:52:15 +00:00