Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swik 1944 warning of simultaneous slide editing #1151

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Swik 1944 warning of simultaneous slide editing #1151

wants to merge 29 commits into from

Commits on Nov 26, 2018

  1. Adding action and service to handle edition control on slides.

    @sednanref
    sednanref committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    b322204 View commit details
    Browse the repository at this point in the history

  2. executing controlSlidesEdition from loadSlideEdit.

    @sednanref
    sednanref committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    ed4ad2a View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2018

  1. Refactor and fixes on slideEditions -> slideCurrentlyEdited

    @sednanref
    sednanref committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    17778ea View commit details
    Browse the repository at this point in the history

  2. Adding new slideCurrentlyEdited store

    @sednanref
    sednanref committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    d5d9472 View commit details
    Browse the repository at this point in the history

  3. updating store (users editing) when accessing to edit a slide

    @sednanref
    sednanref committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    8a97a11 View commit details
    Browse the repository at this point in the history

  4. Getting the event id for future deletion/track

    @sednanref
    sednanref committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    530659c View commit details
    Browse the repository at this point in the history

  5. fetching slideCurrentlyEdited service.

    @sednanref
    sednanref committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    b4d93ec View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. Adding deletion in slidesCurrentlyEdited service.

    @sednanref
    sednanref committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    efdadb0 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Merge branch 'master' into SWIK-1944-warning-of-simultaneous-slide-ed… 

    …iting
    @sednanref
    sednanref committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    f804026 View commit details
    Browse the repository at this point in the history

  2. Removing slideedition event after cancelling edition without changes

    @sednanref
    sednanref committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    76b5126 View commit details
    Browse the repository at this point in the history

  3. Deleting edition event when cancelling after changes made and when sa… 

    …ving after edition.
    @sednanref
    sednanref committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    4de1340 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2019

  1. Creating modal layout

    @sednanref
    sednanref committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    f175036 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into SWIK-1944-warning-of-simultaneous-slide-ed… 

    …iting
    @sednanref
    sednanref committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    ee6a7ff View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Displaying modal with useful information.

    @sednanref
    sednanref committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    af5bc4f View commit details
    Browse the repository at this point in the history

  2. Fixing mistake and '}' symbol in cancel button in slide Edition

    @sednanref
    sednanref committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    d68d9ca View commit details
    Browse the repository at this point in the history

  3. Removing triggerStyle bug.

    @sednanref
    sednanref committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    00a16cb View commit details
    Browse the repository at this point in the history

  4. Formatting timestamp output for the warning.

    @sednanref
    sednanref committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    895a72f View commit details
    Browse the repository at this point in the history

  5. Removing event from db when edition is omitted without cancel / ie na… 

    …vlink
    @sednanref
    sednanref committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    073b23f View commit details
    Browse the repository at this point in the history

  6. Adding link to the users currently editing

    @sednanref
    sednanref committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    597b4b2 View commit details
    Browse the repository at this point in the history

  7. Added deletion of the users editing list in the store to avoid bug of… 

    … opening the warning modal when it shouldn't
    @sednanref
    sednanref committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    80b3f5f View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Adding note and changing icon on button.

    @sednanref
    sednanref committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    117c916 View commit details
    Browse the repository at this point in the history

  2. Fixing padding on note

    @sednanref
    sednanref committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    c91f3d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2019

  1. Fix on lint error.

    @sednanref
    sednanref committed Feb 14, 2019
    Configuration menu
    Copy the full SHA
    3ada7b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. Merge branch 'master' into SWIK-1944-warning-of-simultaneous-slide-ed… 

    …iting
    @sednanref
    sednanref committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    5cd1722 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Sending jwt token correctly and removing userid from payload.

    @sednanref
    sednanref committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    5dc2273 View commit details
    Browse the repository at this point in the history

  2. Refactoring table format and userid -> username

    @sednanref
    sednanref committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    be753cb View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. Merge branch 'inclusiveOCW' into SWIK-1944-warning-of-simultaneous-sl… 

    …ide-editing
    @sednanref
    sednanref committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    1dd3093 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Merge branch 'master' into SWIK-1944-warning-of-simultaneous-slide-ed… 

    …iting
    @kprist
    kprist authored Feb 26, 2019
    Configuration menu
    Copy the full SHA
    a97bc43 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2019

  1. Merge branch 'master' into SWIK-1944-warning-of-simultaneous-slide-ed… 

    …iting
    @sednanref
    sednanref committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    cddfc0d View commit details
    Browse the repository at this point in the history