1. 02 Jul, 2012 1 commit
  2. 01 Jul, 2012 4 commits
  3. 29 Jun, 2012 20 commits
  4. 28 Jun, 2012 7 commits
  5. 27 Jun, 2012 8 commits
    • Hugh Davenport's avatar
    • Hugh Davenport's avatar
    • Hugh Davenport's avatar
      Merge changes Idcaecd01,I50037d93 · ca95d3fb
      Hugh Davenport authored
      * changes:
        Cut down on similar failed notification notifications (bug #1009301)
        Don't recursively notify admins about notification exceptions (bug #1009301)
      ca95d3fb
    • Richard Mansfield's avatar
      Merge changes Idf805a5c,If8a62526,Id4924165,I2ea95fdf,I182adeb1,I9c1817d2,I8c8ac4e0,I9e1cb479 · 777af769
      Richard Mansfield authored
      * changes:
        Add spans and classes to pieform element pre- and post-html
        Avoid cross-domain ajax requests from user subdomains (bug #1006634)
        Use subdomain URLs on Settings and Edit view pages (bug #1006634)
        Allow html to appear directly after an element in pieforms
        Allow login redirect to subdomains (bug #1006634)
        Add a function to get the servername from the request
        Always use wwwroot to generate the cookie domain (bug #1006634)
        Add clean URL "User subdomain" option (bug #1006634)
      777af769
    • Richard Mansfield's avatar
      Merge changes I7a5e6448,Ie1ba5cb8 · 745679ea
      Richard Mansfield authored
      * changes:
        Remove plans block javascript from template (bug #1002168)
        Use get_all_blocktype_javascript in 5 files:
      745679ea
    • Richard Mansfield's avatar
      Merge changes... · fc289843
      Richard Mansfield authored
      Merge changes Ib67a4adf,I2354cdcf,Iecf288d4,I961671d7,I02760d10,Idb307371,Ib705b8fc,Ic6bcfab3,If66abd5b,Ia46c3c52,I847aa583,Ide4f33ab,I7b2143ac,I14c6af22,I3841a74d
      
      * changes:
        Group collections and views in the submission drop-down (bug #786389)
        Add optgroups to pieform select element
        Use View::get_views_and_collections for submission lists (bug #786389)
        Filter by submitted views in View::get_views_and_collections
        Show submission information on collection index page (bug #786389)
        Disallow editing and deletion of submitted collections (bug #786389)
        Get the details of the entity a collection is submitted to
        Modify release form to release entire collections (bug #786389)
        Handle collection submissions in view/submit.php (bug #786389)
        Add a function to release a submitted collection (bug #786389)
        Allow required activity parameters to be specified as strings
        Separate db-specific parts from View::release
        Deal with collections in submission forms (bug #786389)
        Add submission properties to Collection class (bug #786389)
        Add submission fields to collection table (bug #786389)
      fc289843
    • Richard Mansfield's avatar
      Remove plans block javascript from template (bug #1002168) · f4cc34f0
      Richard Mansfield authored
      
      
      By putting more javascript into the static plansblock.js file, it's
      possible to remove the script element from the template.  This is
      better for exports, which should not include javascript designed for
      the site.  Putting the entire block initialisation into a separate
      function also allows the pagination links to be made available when a
      new plans block is first dragged into a page.
      
      Change-Id: I7a5e6448c14272660b317b55b4db7cd2829576f7
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      f4cc34f0
    • Son Nguyen's avatar
      Use get_all_blocktype_javascript in 5 files: · 662aec08
      Son Nguyen authored
      
      
      view/blocks.php
      view/view.php
      user/view.php
      group/view.php
      index.php
      
      Change-Id: Ie1ba5cb82489756d419c5ace9f5d2d56eee3311d
      Signed-off-by: default avatarSon Nguyen <son.nguyen@catalyst.net.nz>
      662aec08