Permalink
Commits on May 14, 2012
Commits on May 10, 2012
  1. Merge pull request #2105 from christianv/SAKIII-5600

    SAKIII-5600 - fix to make .versions.json work
    Bert Pareyn committed May 10, 2012
  2. Merge pull request #2106 from christianv/SAKIII-5599

    SAKIII-5599 - Fix label for search - manage
    Bert Pareyn committed May 10, 2012
Commits on May 9, 2012
  1. Merge pull request #2096 from jsloane/SAKIII-5591

    SAKIII-5591 remove pointer cursor on hover
    
    * jsloane/SAKIII-5591:
      SAKIII-5591 remove pointer cursor on hover
    christianvuerings committed May 9, 2012
  2. Merge pull request #2102 from bp323/SAKIII-5583

    SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group
    
    * bp323/SAKIII-5583:
      SAKIII-5583 Setting sharing config so that private documents can't be shared out isn't applied when adding existing content to a group
    christianvuerings committed May 9, 2012
  3. Merge pull request #2101 from bp323/SAKIII-5587

    SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared
    christianvuerings committed May 9, 2012
  4. SAKIII-5587 No user feedback given when trying to share multiple item…

    …s via Add To and one of those items cannot be shared
    
    Squashed commit of the following:
    
    commit 066fac0
    Author: Bert Pareyn <bp323@caret.cam.ac.uk>
    Date:   Wed May 9 12:23:21 2012 +0100
    
        SAKIII-5587 No user feedback given when trying to share multiple items via Add To and one of those items cannot be shared
    
    commit 8bd3c33
    Author: Christian Vuerings <vueringschristian@gmail.com>
    Date:   Tue May 8 16:15:48 2012 -0700
    
        SAKIII-5587 - User feedback for can't share content - Add to
        https://jira.sakaiproject.org/browse/SAKIII-5587
    Bert Pareyn committed with christianvuerings May 9, 2012
  5. SAKIII-5583 Setting sharing config so that private documents can't be…

    … shared out isn't applied when adding existing content to a group
    Bert Pareyn committed May 9, 2012
  6. Merge pull request #2095 from jsloane/SAKIII-5382

    SAKIII-5382 fix collection count
    Bert Pareyn committed May 9, 2012
  7. Merge pull request #2097 from jsloane/SAKIII-5593

    SAKIII-5593 fixed default sharing config
    Bert Pareyn committed May 9, 2012
Commits on May 8, 2012
  1. Merge origin/master and fix conflicts

    Bert Pareyn committed May 8, 2012
  2. Merge branch 'SAKIII-5564' of git://github.com/bp323/3akai-ux into SA…

    …KIII-5564
    
    * 'SAKIII-5564' of git://github.com/bp323/3akai-ux:
      SAKIII-5564 Respect sharing configuration in the add content widget
      SAKIII-5564 - make sure you can still add it to your library
      SAKIII-5564 - obey the sharing config
    Nicolaas Matthijs committed May 8, 2012
  3. SAKIII-5281 check if collection is associated with selected library w…

    …hen adding content
    jsloane committed with Bert Pareyn Mar 12, 2012
  4. Merge pull request #2062 from christianv/SAKIII-4655

    SAKIII-4655 - Display helpful error message when Javascript is disabled
    Bert Pareyn committed May 8, 2012
  5. Merge remote-tracking branch 'origin/1.5.0' into 1.5.0

    Bert Pareyn committed May 8, 2012
  6. Merge pull request #2086 from christianv/SAKIII-4610

    SAKIII-4610 - Youtube URL link no longer works
    Bert Pareyn committed May 8, 2012
  7. SAKIII-5374 Toggle versions widget

    Bert Pareyn committed May 8, 2012
  8. Merge pull request #2082 from christianv/SAKIII-5576

    SAKIII-5576 - Fix delete link on content comments
    Bert Pareyn committed May 8, 2012
Commits on May 7, 2012
  1. Merge pull request #2080 from gsilver/SAKIII-5306

    Sakiii 5306
    christianvuerings committed May 7, 2012
  2. Sakiii 5306

    Squashed commit of the following:
    
    commit 688aa8b50b854fe6448d79c492319904cdf9b654
    Merge: 1ee12a7 8c42d79
    Author: Christian Vuerings <vueringschristian@gmail.com>
    Date:   Mon May 7 16:53:53 2012 -0700
    
        Merge remote-tracking branch 'gsilver/SAKIII-5306' into gsilver-SAKIII-5306
    
    commit 8c42d79
    Author: Gonzalo Silverio <gsilver@umich.edu>
    Date:   Fri May 4 09:48:02 2012 -0400
    
        SAKIII-5306 - more style changes
    
    commit a262432
    Author: Gonzalo Silverio <gsilver@umich.edu>
    Date:   Fri May 4 09:47:16 2012 -0400
    
        SAKIII-5306 - more style changes
    
    commit 2dd5512
    Author: Gonzalo Silverio <gsilver@umich.edu>
    Date:   Fri May 4 09:46:11 2012 -0400
    
        SAKIII-5306 - style changes
    
    commit 2ef308e
    Author: Gonzalo Silverio <gsilver@umich.edu>
    Date:   Wed May 2 14:59:01 2012 -0400
    
        SAKIII-5306 - rearrange links so that tab order follows source order
    committed with christianvuerings May 7, 2012
  3. Merge pull request #2081 from gsilver/SAKIII-5303

    Sakiii 5303
    christianvuerings committed May 7, 2012