Permalink
Switch branches/tags
Nothing to show
Commits on Sep 17, 2009
  1. Merge remote branch 'ieb/master'

    codders committed Sep 17, 2009
  2. Fixed missing license headers.

    ieb committed Sep 17, 2009
  3. Added Comment to discussion types.

    ieb committed Sep 17, 2009
  4. FIxed the build,

    ieb committed Sep 17, 2009
    not valid to @Override an interface method in JDK 1.5
  5. Added missing license headers.

    ieb committed Sep 17, 2009
  6. Merge commit 'simong/master'

    ieb committed Sep 17, 2009
    * commit 'simong/master':
      Changed the sakai:propertiesmix nodetype so that we can now have multivalued properties beside sakai:labels as well.
    
    Conflicts:
    	slingtests/osgikernel/bundles/messaging/src/main/java/org/sakaiproject/kernel/api/message/MessageConstants.java
  7. Merge commit 'nico/master'

    ieb committed Sep 17, 2009
    * commit 'nico/master':
      Fixed parsing of replies in search result processors.
      Added from filter to chat messages.
      Made small adjustments so comments and discussions now use the new routing system.
Commits on Sep 16, 2009
  1. Changed the sakai:propertiesmix nodetype so that we can now have mult…

    Simon Gaeremynck committed Sep 16, 2009
    …ivalued properties beside sakai:labels as well.
  2. Merge branch 'master' of git://github.com/ieb/open-experiments

    Simon Gaeremynck committed Sep 16, 2009
    Conflicts:
    	slingtests/osgikernel/bundles/messaging/src/main/java/org/sakaiproject/kernel/api/message/MessageConstants.java
  3. NOJIRA - Recent merges

    nicolaas committed Sep 16, 2009
  4. Merge branch 'master' of git://github.com/simong/open-experiments

    nicolaas committed Sep 16, 2009
    * 'master' of git://github.com/simong/open-experiments:
      Fixed parsing of replies in search result processors.
      Added from filter to chat messages.
      Made small adjustments so comments and discussions now use the new routing system.
Commits on Sep 15, 2009
  1. Fixed parsing of replies in search result processors.

    Simon Gaeremynck committed Sep 15, 2009
  2. Added from filter to chat messages.

    Simon Gaeremynck committed Sep 15, 2009
  3. Reenabled UX update.

    ieb committed Sep 15, 2009
  4. Merge commit 'stuartf/master'

    ieb committed Sep 15, 2009
    * commit 'stuartf/master':
      Constant got renamed
Commits on Sep 14, 2009
  1. Constant got renamed

    stuartf committed Sep 14, 2009
  2. Made small adjustments so comments and discussions now use the new ro…

    Simon Gaeremynck committed Sep 14, 2009
    …uting system.
Commits on Sep 13, 2009
  1. Merge commit 'stuartf/master'

    ieb committed Sep 13, 2009
    * commit 'stuartf/master':
      added unit tests for messaging and email
  2. Merge commit 'nico/master'

    ieb committed Sep 13, 2009
    * commit 'nico/master':
      NOJIRA - Some more site template additions
      Added outputting of data when the file is of type nt:file
      Fixed versioning of site templates
      Added versioning to entire site structure
Commits on Sep 11, 2009
  1. NOJIRA - Some more site template additions

    nicolaas committed Sep 11, 2009
  2. Merge branch 'master' of git://github.com/simong/open-experiments

    nicolaas committed Sep 11, 2009
    * 'master' of git://github.com/simong/open-experiments:
      Added outputting of data when the file is of type nt:file
  3. Added outputting of data when the file is of type nt:file

    Simon Gaeremynck committed Sep 11, 2009
  4. Merge branch 'master' of git://github.com/simong/open-experiments

    nicolaas committed Sep 11, 2009
    * 'master' of git://github.com/simong/open-experiments: