Commit graph

563 commits

Author SHA1 Message Date
Henrik Levkowetz 7ecfac6308 Merged in personal/henrik/django-1.7@9020 which upgrades Django from 1.6.0 to 1.7.4 and applies the needed changes to the datatracker code to work with release 1.7.x.
- Legacy-Id: 9028
2015-02-08 21:16:44 +00:00
Henrik Levkowetz 028b7e315a Reverted to [9025] because commit [9026] failed (it was incomplete with a broken working dir).
- Legacy-Id: 9027
Note: SVN reference [9026] has been migrated to Git commit 4a3749a66b
2015-02-08 20:03:16 +00:00
Henrik Levkowetz 4a3749a66b Merged in personal/henrik/django-1.7@9020 which upgrades Django from 1.6.0 to 1.7.4 and applies the needed changes to the datatracker code to work with release 1.7.x.
- Legacy-Id: 9026
2015-02-08 19:16:46 +00:00
Henrik Levkowetz 3b21cacecd Set version info and settings back to development mode
- Legacy-Id: 9024
2015-02-08 16:40:13 +00:00
Henrik Levkowetz d257284662 Set version info to release version 5.10.3 before branching.
- Legacy-Id: 9022
2015-02-08 16:40:07 +00:00
Henrik Levkowetz c64570c6c0 Set version info and settings back to development mode
- Legacy-Id: 9001
2015-02-05 18:33:26 +00:00
Henrik Levkowetz b4f71e4e2d Set version info to release version 5.10.2 before branching.
- Legacy-Id: 8999
2015-02-05 18:33:21 +00:00
Henrik Levkowetz 58cc1e431f When draft email aliases are generated, the content of the doc.notify field is used to generate the .notify alias, and is also included in the .all alias. If the notify field contains either the .notify alias or the .all alias, this can create a mail loop. Changed the alias generation code to expand (or ignore, for .notify) aliases found in the notify field, and changed the code which fills in the notify field with a default value to insert the author, ad, and shepherd aliases instead of the .all alias.
- Legacy-Id: 8994
2015-02-05 15:38:01 +00:00
Henrik Levkowetz 4c33787976 Set version info and settings back to development mode
- Legacy-Id: 8909
2015-01-25 19:36:45 +00:00
Henrik Levkowetz 468ea206fd Set version info to release version 5.10.1 before branching.
- Legacy-Id: 8907
2015-01-25 19:36:40 +00:00
Henrik Levkowetz 76881655d3 Removed south from INSTALLED_APPS.
- Legacy-Id: 8822
2014-12-22 16:52:28 +00:00
Henrik Levkowetz 413e926b2b Set version info and settings back to development mode
- Legacy-Id: 8813
2014-12-21 21:34:03 +00:00
Henrik Levkowetz f90e802dc5 Set version info to release version 5.10.0 before branching.
- Legacy-Id: 8811
2014-12-21 21:33:56 +00:00
Henrik Levkowetz 5183042d58 Merged in branch/amsl/iprtool/5.7.4@8734 from rcross@amsl.com, providing new IPR models, refactored code, and improved list, search, and management interfaces.
- Legacy-Id: 8808
2014-12-21 19:26:33 +00:00
Henrik Levkowetz 04164ad157 Set version info and settings back to development mode
- Legacy-Id: 8805
2014-12-18 21:29:50 +00:00
Henrik Levkowetz 813bf0c025 Set version info to release version 5.9.0 before branching.
- Legacy-Id: 8803
2014-12-18 21:29:46 +00:00
Henrik Levkowetz da9419ae64 Set version info and settings back to development mode
- Legacy-Id: 8763
2014-12-18 18:40:22 +00:00
Henrik Levkowetz f15295863a Set version info to release version 5.8.1 before branching.
- Legacy-Id: 8761
2014-12-18 18:40:18 +00:00
Henrik Levkowetz f403aa9886 Set version info and settings back to development mode
- Legacy-Id: 8757
2014-12-18 16:06:12 +00:00
Henrik Levkowetz b878bfa9eb Set version info to release version 5.8.0 before branching.
- Legacy-Id: 8755
2014-12-18 16:06:08 +00:00
Henrik Levkowetz 00e4818ceb Alternative DRY definition of the REST api top URL; this time in ietf/urls.py. This in itself is nicer, but I'm not so sure about the use of reverse() everywhere else, instead of referring to settings.
- Legacy-Id: 8752
2014-12-17 21:26:32 +00:00
Henrik Levkowetz 3cb39d462e Define the REST api top url in settings.py, rather than having literals in multiple places in the code.
- Legacy-Id: 8751
2014-12-17 21:06:05 +00:00
Henrik Levkowetz 50cb5f0762 Set version info and settings back to development mode
- Legacy-Id: 8656
2014-11-13 03:37:17 +00:00
Henrik Levkowetz 8bdd8deafd Set version info to release version 5.7.4 before branching.
- Legacy-Id: 8654
2014-11-13 03:37:13 +00:00
Henrik Levkowetz 8675c1e5ad Added a setting for the temporary bluesheets directory used during testing.
- Legacy-Id: 8648
2014-11-12 01:49:55 +00:00
Henrik Levkowetz c462e63adb Added settings for the PhantomJS ghostdriver.log and the temporary meeting materials directory used during testing, so that it's possible to place them in other places than the working copy.
- Legacy-Id: 8646
2014-11-12 01:45:58 +00:00
Henrik Levkowetz bb8359f80d Merged in [8624] from rcross@amsl.com:\n Remove secauth middleware. Replace with role_required decorators.
- Legacy-Id: 8637
Note: SVN reference [8624] has been migrated to Git commit 097b936ca8
2014-11-11 02:00:35 +00:00
Henrik Levkowetz f2d3d4213a Reworked the generation of draft aliases and WG aliases, after trying out the output of the previous version for real. This code seems to work better, based on tests on ietfa.
- Legacy-Id: 8633
2014-11-11 01:09:30 +00:00
Ryan Cross 097b936ca8 Remove secauth middleware. Replace with role_required decorators. Commit ready for merge
- Legacy-Id: 8624
2014-11-09 02:32:41 +00:00
Henrik Levkowetz bd6d0775e1 Require posting confirmation for some particular draft name prefixes.
- Legacy-Id: 8591
2014-11-08 03:15:20 +00:00
Henrik Levkowetz b74d4e7795 Set version info and settings back to development mode
- Legacy-Id: 8538
2014-11-01 23:16:37 +00:00
Henrik Levkowetz 16bbbc8e20 Set version info to release version 5.7.2 before branching.
- Legacy-Id: 8536
2014-11-01 23:16:27 +00:00
Henrik Levkowetz f3b8d34479 Set version info and settings back to development mode
- Legacy-Id: 8493
2014-10-27 06:15:25 +00:00
Henrik Levkowetz f6edbcd855 Set version info to release version 5.7.1 before branching.
- Legacy-Id: 8491
2014-10-27 06:15:21 +00:00
Henrik Levkowetz 330beb7a21 Merged in [8452] from rjsparks@nostrum.com:\n Relax ALLOWED_HOSTS when not running in production. Fixes bug #1373.
- Legacy-Id: 8487
Note: SVN reference [8452] has been migrated to Git commit 745145d5ed
2014-10-26 20:39:57 +00:00
Henrik Levkowetz b1edef1099 Merged in [8441] from rjsparks@nostrum.com:\n Remove X-Frame-Options configuration.
- Legacy-Id: 8485
Note: SVN reference [8441] has been migrated to Git commit c4fb9b5bd5
2014-10-26 20:19:09 +00:00
Henrik Levkowetz 1d02752f01 Set version info and settings back to development mode
- Legacy-Id: 8477
2014-10-26 12:52:06 +00:00
Henrik Levkowetz e7321e1d8b Set version info to release version 5.7.0 before branching.
- Legacy-Id: 8475
2014-10-26 12:52:02 +00:00
Henrik Levkowetz df8705b187 Merged in patches from production.
- Legacy-Id: 8473
2014-10-25 21:14:00 +00:00
Henrik Levkowetz 51bc4430bc Set version info and settings back to development mode
- Legacy-Id: 8468
2014-10-25 16:14:27 +00:00
Henrik Levkowetz f872eaaa11 Set version info to release version 5.6.5 before branching.
- Legacy-Id: 8466
2014-10-25 16:14:22 +00:00
Henrik Levkowetz 6e38e974f5 Merged in [8237] from rcross@amsl.com:
Changes to support video content in proceedings ('recording' document type).
 - Legacy-Id: 8462
Note: SVN reference [8237] has been migrated to Git commit 96bccc7b17
2014-10-24 12:18:25 +00:00
Robert Sparks 745145d5ed Relax ALLOWED_HOSTS when not running in production. Fixes bug #1373. Commit ready for merge.
- Legacy-Id: 8452
2014-10-21 20:20:31 +00:00
Robert Sparks c4fb9b5bd5 Remove X-Frame-Options configuration. Commit ready for merge.
- Legacy-Id: 8441
2014-10-17 14:22:44 +00:00
Henrik Levkowetz 96f99e72d6 Set version info and settings back to development mode
- Legacy-Id: 8399
2014-10-13 20:14:44 +00:00
Henrik Levkowetz a5f49b3fcf Set version info to release version 5.6.4 before branching.
- Legacy-Id: 8397
2014-10-13 20:14:40 +00:00
Henrik Levkowetz 5bf7c412b8 Set version info and settings back to development mode
- Legacy-Id: 8324
2014-09-19 19:28:38 +00:00
Henrik Levkowetz 919cfd2024 Set version info to release version 5.6.3 before branching.
- Legacy-Id: 8322
2014-09-19 19:28:33 +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 e661231b99 Merged in [8208] from rjsparks@nostrum.com:
use doc.href rather than manually constructing URLs in several templates. Fixes ticket #1459.
 - Legacy-Id: 8314
Note: SVN reference [8208] has been migrated to Git commit be3d2034ff8432ca9869d26a56e51cc66275c68b
2014-09-16 19:34:03 +00:00