Commits on May 10, 2016

  1. Move files for dev

    @avukkonen
    avukkonen committed May 10, 2016
    5479c2d

  2. Dust files moving, quote-link

    @avukkonen
    avukkonen committed May 10, 2016
    411e0ae

Commits on May 11, 2016

  1. Quote link

    @avukkonen
    avukkonen committed May 11, 2016
    ab5d6b6

  2. Message, reply & reply's reply JS

    @avukkonen
    avukkonen committed May 11, 2016
    fed2477

Commits on May 12, 2016

  1. workspace functionality 

    blockquote styles
    @avukkonen
    avukkonen committed May 12, 2016
    28b25e0

  2. Move files from dev to core

    @avukkonen
    avukkonen committed May 12, 2016
    b7adcbd

  3. Delete temp dev files

    @avukkonen
    avukkonen committed May 12, 2016
    6d05225

  4. Merge branch 'devel' into FTR-1332-discussions-quoting-a-message

    @avukkonen
    avukkonen committed May 12, 2016
    57a0914

  5. Merge branch 'FTR-1671_flags' into BUG-1966_word_definition_edit

    @anttileppa
    anttileppa committed May 12, 2016
    7dcf43b

  6. Fixes #1966

    @anttileppa
    anttileppa committed May 12, 2016
    edaa6e7

Commits on May 13, 2016

  1. Merge branch 'FTR-1671_flags' into BUG-1966_word_definition_edit

    @anttileppa
    anttileppa committed May 13, 2016
    f33327b

  2. Merge remote-tracking branch 'origin/devel' into BUG-1966_word_defini… 

    …tion_edit
    @petja-laitila
    petja-laitila committed May 13, 2016
    489e3de

  3. Merge branch 'BUG-1966_word_definition_edit' of github.com:otavanopis… 

    …to/muikku into BUG-1966_word_definition_edit
    @anttileppa
    anttileppa committed May 13, 2016
    35665c2

  4. Merge remote-tracking branch 'origin/devel' into BUG-1966_word_defini… 

    …tion_edit
    @anttileppa
    anttileppa committed May 13, 2016
    5bd408c

Commits on May 16, 2016

  1. Removed deprecated REST services

    @anttileppa
    anttileppa committed May 16, 2016
    0c69cd2

  2. Removed deprecated picture upload servlet

    @anttileppa
    anttileppa committed May 16, 2016
    bfa7865

  3. Cleaned up unused imports and local variables

    @anttileppa
    anttileppa committed May 16, 2016
    923b378

  4. Removed couple of dead code blocks

    @anttileppa
    anttileppa committed May 16, 2016
    b0070d4

  5. Added serial id into AfterPluginInitEvent

    @anttileppa
    anttileppa committed May 16, 2016
    2d105f3

  6. Removed @stateful from NotifierController

    @anttileppa
    anttileppa committed May 16, 2016
    aa11f47

  7. Merge remote-tracking branch 'origin/devel' into BUG-2018_cleanup

    @anttileppa
    anttileppa committed May 16, 2016
    635a90b

  8. Merge pull request #2011 from otavanopisto/BUG-1966_word_definition_edit 

    Bug 1966 word definition edit
    @ilmoeuro
    ilmoeuro committed May 16, 2016
    4f60234

  9. Merge pull request #2019 from otavanopisto/BUG-2018_cleanup 

    Bug 2018 cleanup
    @ilmoeuro
    ilmoeuro committed May 16, 2016
    a3c9358

  10. Added support for viewing table of records for students with data 

    transfer prohibition flag on
    @anttileppa
    anttileppa committed May 16, 2016
    3c3e1cb

  11. Added support for viewing student in guider with data 

    transfer prohibition flag on (when logged user has sufficient
privileges)
    @anttileppa
    anttileppa committed May 16, 2016
    94b879e

  12. Added script component for displaying word definitions

    @anttileppa
    anttileppa committed May 16, 2016
    8cf0e12

  13. ** Course list can be loaded before courses, wait until the courses 

    themselves are loaded
    @ilmoeuro
    ilmoeuro committed May 16, 2016
    db611ec

  14. Merge branch 'devel' of ssh://git@github.com/otavanopisto/muikku.git … 

    …into devel
    @ilmoeuro
    ilmoeuro committed May 16, 2016
    cb791d7

  15. Added support for filtering evaluation students by flags

    @anttileppa
    anttileppa committed May 16, 2016
    9a07111

  16. * Added word definition styles

    @jjlankinen
    jjlankinen committed May 16, 2016
    bda3e55

  17. Merge pull request #2020 from otavanopisto/devel 

    Release
    @anttileppa
    anttileppa committed May 16, 2016
    d10b9a0

  18. [maven-release-plugin] prepare release 1.1.24

    Travis CI committed May 16, 2016
    0d15c97

  19. [maven-release-plugin] prepare for next development iteration

    Travis CI committed May 16, 2016
    83da7e6

  20. * Added flag filters and modified filters rendering a bit.

    @jjlankinen
    jjlankinen committed May 16, 2016
    7dbf3b3

  21. - work in progress for grouping fields

    @pkukkon
    pkukkon committed May 16, 2016
    921f9fd

Commits on May 17, 2016

  1. Fixed issue #1979

    @anttileppa
    anttileppa committed May 17, 2016
    bb58bc7

  2. - work in progress for organizer fields

    @pkukkon
    pkukkon committed May 17, 2016
    5cb021d

  3. - work in progress for organizer fields

    @pkukkon
    pkukkon committed May 17, 2016
    95fbace

  4. - fixes #2029

    @pkukkon
    pkukkon committed May 17, 2016
    97257b1

  5. * Added initial styles for organizer task field

    @jjlankinen
    jjlankinen committed May 17, 2016
    300c335

  6. Merge branch 'FTR-1613-organizer' of https://github.com/otavanopisto/… 

    …muikku.git into FTR-1613-organizer
    @jjlankinen
    jjlankinen committed May 17, 2016
    e3d1b8f

  7. Merge pull request #2030 from otavanopisto/BUG-2029-usergroup-permiss… 

    …ions

Proper handling of workspace scoped permissions for user groups
    @anttileppa
    anttileppa committed May 17, 2016
    b131a94

  8. Merge pull request #2032 from otavanopisto/devel 

    Release
    @anttileppa
    anttileppa committed May 17, 2016
    2749a88

  9. [maven-release-plugin] prepare release 1.1.25

    Travis CI committed May 17, 2016
    f8bc99c

  10. [maven-release-plugin] prepare for next development iteration

    Travis CI committed May 17, 2016
    034497e

  11. Fixes #1967

    @anttileppa
    anttileppa committed May 17, 2016
    0dffb7e

  12. - work in progress for organizer fields

    @pkukkon
    pkukkon committed May 17, 2016
    b18f66d

Commits on May 18, 2016

  1. * Added .clear css rule to materials

    @jjlankinen
    jjlankinen committed May 18, 2016
    7075faa

  2. Bumped cyberneko to version 1.9.22 (fixes issue #2035)

    @anttileppa
    anttileppa committed May 18, 2016
    aea2d8c

  3. Merge pull request #2006 from otavanopisto/FTR-1332-discussions-quoti… 

    …ng-a-message

Ftr 1332 discussions quoting a message
    @anttileppa
    anttileppa committed May 18, 2016
    879b549