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

OC 6905 v1.1 #54

Open
wants to merge 106 commits into
base: 1.1
Choose a base branch
from
Open

OC 6905 v1.1 #54

wants to merge 106 commits into from

Commits on Apr 23, 2014

  1. Add Status and Start Date to every Event

    Ron Panduwana committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    b32acd8 View commit details
    Browse the repository at this point in the history

  2. Add Event Action to Designer Action Dropdown

    Ron Panduwana committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    627aace View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. Change TreeModel to TreeModelInterface for eventsCrfsList and eventsC… 

    …rfsListOid.

Add test for start date and status.
    Ron Panduwana committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    7cab6fa View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. Add the form for the new Event action

    Ron Panduwana committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    67f7077 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2014

  1. Add xjc generated file from openclinica rules-ODM.xsd

    Ron Panduwana committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    4153f9e View commit details
    Browse the repository at this point in the history

  2. Add new LazyEventActionType for the Event action

    Ron Panduwana committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    e404ad6 View commit details
    Browse the repository at this point in the history

  3. Add the new Event action

    Ron Panduwana committed Apr 28, 2014
    Configuration menu
    Copy the full SHA
    e23172b View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2014

  1. Fix designer and xml tab after adding Event action

    Ron Panduwana committed Apr 29, 2014
    Configuration menu
    Copy the full SHA
    8c89ed2 View commit details
    Browse the repository at this point in the history

  2. Generate Eclipse project files

    Ron Panduwana committed Apr 29, 2014
    Configuration menu
    Copy the full SHA
    3248fcc View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2014

  1. Regenerate rules-ODM.xsd-generated files to match the changes of rule… 

    …s.xsd
    Ron Panduwana committed Apr 30, 2014
    Configuration menu
    Copy the full SHA
    c6af405 View commit details
    Browse the repository at this point in the history

  2. Updates to adapt to the changes of rules.xsd

    Ron Panduwana committed Apr 30, 2014
    Configuration menu
    Copy the full SHA
    74085f4 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2014

  1. Fixing event action validationerror by renaming START_DATE to STARTDATE.

    Ron Panduwana committed May 6, 2014
    Configuration menu
    Copy the full SHA
    3122be5 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2014

  1. change openclinica-odm version number to 0.2.0.BUILD-SNAPSHOT

    Ron Panduwana committed May 7, 2014
    Configuration menu
    Copy the full SHA
    dad16a0 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2014

  1. Change openclinica-odm version to 2.0

    Ron Panduwana committed May 8, 2014
    Configuration menu
    Copy the full SHA
    ecb60f2 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2014

  1. OC-5126 Display Start Date and Status before CRFs

    Ron Panduwana committed May 9, 2014
    Configuration menu
    Copy the full SHA
    25b4285 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2014

  1. OC-5126 Display Start Date and Status before CRFs: Fix conflicts

    Ron Panduwana committed May 12, 2014
    Configuration menu
    Copy the full SHA
    a2ebf11 View commit details
    Browse the repository at this point in the history

  2. OC-5126 Display Start Date and Status before CRFs: Fix crfs not defined

    Ron Panduwana committed May 12, 2014
    Configuration menu
    Copy the full SHA
    e342948 View commit details
    Browse the repository at this point in the history

  3. OC5126 - Add "Property" dropdown to Event action designer form

    Ron Panduwana committed May 12, 2014
    Configuration menu
    Copy the full SHA
    fa792b3 View commit details
    Browse the repository at this point in the history

  4. OC-5126 Fill the "Property" dropdown when dragging Start Date from tr… 

    …ee onto OID field
    Ron Panduwana committed May 12, 2014
    Configuration menu
    Copy the full SHA
    7bcb298 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2014

  1. add dev.openclinica.com/artifactory/libs-release to pom.xml

    Ron Panduwana committed May 13, 2014
    Configuration menu
    Copy the full SHA
    306713e View commit details
    Browse the repository at this point in the history

Commits on May 20, 2014

  1. Merge pull request #2 from kkrumlian/OC-5353 

    OC-5353: Move Designer codebase to github, version the code & cleanup code
    @kkrumlian
    kkrumlian committed May 20, 2014
    Configuration menu
    Copy the full SHA
    626917e View commit details
    Browse the repository at this point in the history

Commits on May 21, 2014

  1. OC-5316 Add TOS to UI

    @rooney
    rooney committed May 21, 2014
    Configuration menu
    Copy the full SHA
    ea702aa View commit details
    Browse the repository at this point in the history

  2. OC-5095 Update Rule Designer logo

    @rooney
    rooney committed May 21, 2014
    Configuration menu
    Copy the full SHA
    96ae8bb View commit details
    Browse the repository at this point in the history

Commits on May 22, 2014

  1. OC-5126 Fill OID field when opening rule with event action

    @rooney
    rooney committed May 22, 2014
    Configuration menu
    Copy the full SHA
    56cdfb0 View commit details
    Browse the repository at this point in the history

  2. OC-5310 Add registration link to failed authentication page

    @rooney
    rooney committed May 22, 2014
    Configuration menu
    Copy the full SHA
    0f5e765 View commit details
    Browse the repository at this point in the history

  3. OC-5095 Change logo for Failed authentication page

    @rooney
    rooney committed May 22, 2014
    Configuration menu
    Copy the full SHA
    02a97cc View commit details
    Browse the repository at this point in the history

  4. OC-5138 Show Event Action in Test Tab

    @rooney
    rooney committed May 22, 2014
    Configuration menu
    Copy the full SHA
    a23674d View commit details
    Browse the repository at this point in the history

  5. gitignore designer.log

    @rooney
    rooney committed May 22, 2014
    Configuration menu
    Copy the full SHA
    400dd86 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4 from rooney/OC-5316 

    OC-5316 Add TOS to UI
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    6b19921 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from rooney/OC-5095 

    OC-5095 Update Rule Designer logo
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    bd88941 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #8 from rooney/OC-5126 

    OC-5126 Fill OID field when opening rule with event action
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    70bf233 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #9 from rooney/OC-5138 

    OC-5138 Show Event Action in Test Tab
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    5cf5d7b View commit details
    Browse the repository at this point in the history

  10. Merge pull request #10 from rooney/OC-5310 

    OC-5310 Add registration link to failed authentication page
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    c0b7a2a View commit details
    Browse the repository at this point in the history

  11. Merge pull request #11 from rooney/master 

    gitignore designer.log
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    76c0048 View commit details
    Browse the repository at this point in the history

  12. Cleanup tasks

    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    1d91aa0 View commit details
    Browse the repository at this point in the history

  13. Cleanup tasks

    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    65c66d0 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #12 from kkrumlian/master 

    Cleanup tasks
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    957c269 View commit details
    Browse the repository at this point in the history

  15. Cleaning Eclipse projects

    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    1d2ab6e View commit details
    Browse the repository at this point in the history

  16. Merge pull request #13 from kkrumlian/master 

    Cleaning Eclipse projects
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    93d06d8 View commit details
    Browse the repository at this point in the history

  17. Add .travis.yml

    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    2e46071 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #14 from kkrumlian/master 

    Add .travis.yml
    @kkrumlian
    kkrumlian committed May 22, 2014
    Configuration menu
    Copy the full SHA
    4ce5160 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2014

  1. OC-5095 Using updated Rule Designer logo from Rob

    @rooney
    rooney committed May 23, 2014
    Configuration menu
    Copy the full SHA
    e51aafb View commit details
    Browse the repository at this point in the history

Commits on May 28, 2014

  1. Merge pull request #15 from rooney/OC-5095 

    OC-5095 Using updated Rule Designer logo from Rob
    @kkrumlian
    kkrumlian committed May 28, 2014
    Configuration menu
    Copy the full SHA
    c50717b View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2014

  1. OC-5138 Change popup and label texts for event action

    @rooney
    rooney committed Jun 5, 2014
    Configuration menu
    Copy the full SHA
    bf13d3d View commit details
    Browse the repository at this point in the history

  2. OC-5138 Change detail links for STARTDATE and STATUS to itemDetails?n… 

    …ame=.STARTDATE and itemDetails?name=.STATUS
    @rooney
    rooney committed Jun 5, 2014
    Configuration menu
    Copy the full SHA
    6ec672e View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2014

  1. OC-5376 Add metadata information in right pane for STARTDATE and STATUS

    @rooney
    rooney committed Jun 6, 2014
    Configuration menu
    Copy the full SHA
    703e58a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2014

  1. Merge pull request #17 from rooney/OC-5138 

    OC 5138
    @kkrumlian
    kkrumlian committed Jun 7, 2014
    Configuration menu
    Copy the full SHA
    7a84cfb View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2014

  1. OC-5138 Rule Designer: Show Step 2 form input for STARTDATE parameter

    @rooney
    rooney committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    2f0585b View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. Merge remote-tracking branch 'origin/OC-5376' into OC-5138 

    Conflicts:
	src/main/java/org/akaza/openclinica/designer/web/controller/TestRulesGetResponseHandler.java
	src/main/java/org/akaza/openclinica/designer/web/controller/UIODMBuilder.java
    @rooney
    rooney committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    0604a69 View commit details
    Browse the repository at this point in the history

  2. OC-5138 Rule Designer: Show Step 2 form input for STARTDATE parameter… 

    …: Remove debug message
    @rooney
    rooney committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    02e475a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #18 from rooney/OC-5376 

    OC 5376
    @kkrumlian
    kkrumlian committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    0cb9192 View commit details
    Browse the repository at this point in the history

  4. OC-5138 Rule Designer: Show Step 2 form input or event action : Fix n… 

    …ullpointer when submitting test form
    @rooney
    rooney committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    a21992d View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2014

  1. OC-5138 : Item Metadata -> Entity Metadata for non CRF item

    @rooney
    rooney committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    6e23ed7 View commit details
    Browse the repository at this point in the history

  2. OC-5138 : Inversed STATUS options / value

    @rooney
    rooney committed Jun 11, 2014
    Configuration menu
    Copy the full SHA
    76787a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2014

  1. Merge remote-tracking branch 'origin/master' into OC-5138

    @rooney
    rooney committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    bd3493f View commit details
    Browse the repository at this point in the history

  2. OC-5126 Bugfix Prepopulated Drag and Drop Event Action Property. Now … 

    …support multiple event
    @rooney
    rooney committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    15e82c0 View commit details
    Browse the repository at this point in the history

  3. OC-5126 Bugfix Prepopulated Drag and Drop Event Action Property. Now … 

    …support multiple event. Fix multiple event designer form and test form.
    @rooney
    rooney committed Jun 12, 2014
    Configuration menu
    Copy the full SHA
    b931124 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2014

  1. Merge pull request #19 from rooney/OC-5138 

    OC-5138 Rule Designer: Show Step 2 form input for STARTDATE parameter
    @kkrumlian
    kkrumlian committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    df8f648 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #20 from rooney/OC-5126 

    OC 5126
    @kkrumlian
    kkrumlian committed Jun 13, 2014
    Configuration menu
    Copy the full SHA
    d52c37c View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2014

  1. OC-5095 Fix failed authentication page's background image

    @rooney
    rooney committed Jun 17, 2014
    Configuration menu
    Copy the full SHA
    c286800 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2014

  1. Merge pull request #21 from rooney/OC-5095 

    OC-5095 Fix failed authentication page's background image
    @kkrumlian
    kkrumlian committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    7841f28 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2014

  1. OC-5376 Bugfix for get metadata behaviour when right pane collapsed. … 

    …Bugfix for status metadata options, removing more link.
    @rooney
    rooney committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    ff36c8c View commit details
    Browse the repository at this point in the history

  2. OC-5310 Fix the registration link (was openclinica.com/designer-regis… 

    …tration, Alicia pointed out that it should be openclinica.com/rule-designer-registration)
    @rooney
    rooney committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    7fb2290 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #23 from rooney/OC-5376 

    OC-5376 Bugfix for get metadata/right pane
    @kkrumlian
    kkrumlian committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    46e8ae6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #24 from rooney/OC-5310 

    OC-5310 Fix the registration link ...
    @kkrumlian
    kkrumlian committed Jun 25, 2014
    Configuration menu
    Copy the full SHA
    7dae90d View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2014

  1. OC-5645 Remove hard coded values of username/pass/host/url from HostA… 

    …ccessService
    @rooney
    rooney committed Jun 26, 2014
    Configuration menu
    Copy the full SHA
    a46cd24 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2014

  1. OC-5650 Rule Designer version indicator on the GUI

    @rooney
    rooney committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    6d11a4c View commit details
    Browse the repository at this point in the history

  2. OC-5649 Rule Designer Home Page version number, copyright, and center… 

    …ed layout
    @rooney
    rooney committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    baf76ee View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26 from rooney/OC-5645 

    OC-5645 Remove hard coded values of username/pass/host/url
    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    0ecbc0e View commit details
    Browse the repository at this point in the history

  4. OC-5677: Setup assembly plugin

    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    c09cc25 View commit details
    Browse the repository at this point in the history

  5. OC-5677: Setup assembly plugin, add license.txt & change version in pom

    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    089d355 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #29 from rooney/OC-5650 

    OC-5650 Rule Designer version indicator on the GUI
    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    9d5f995 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #30 from rooney/OC-5649 

    OC-5649 Rule Designer Home Page version number, copyright, and centered ...
    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    3e0a708 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #32 from kkrumlian/master 

    OC-5677: Setup assembly plugin
    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    f0d62ff View commit details
    Browse the repository at this point in the history

  9. OC-5677: Remove second assembly plugin causing JAR to be created.

    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    4f33855 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #33 from kkrumlian/master 

    OC-5677: Remove second assembly plugin causing JAR to be created.
    @kkrumlian
    kkrumlian committed Jun 30, 2014
    Configuration menu
    Copy the full SHA
    7d2ae43 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2014

  1. OC-5645 Remove hard coded values of username/pass/host/url from HostA… 

    …ccessService
    @rooney
    rooney committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    b37da32 View commit details
    Browse the repository at this point in the history

  2. OC-5648 Rule Designer: Static Width breaks layout

    @rooney
    rooney committed Jul 1, 2014
    Configuration menu
    Copy the full SHA
    1cf2dd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2014

  1. Merge pull request #34 from rooney/OC-5645 

    OC-5645 Remove hard coded values from HostAccessService
    @kkrumlian
    kkrumlian committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    aedbe58 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #35 from rooney/OC-5648 

    OC-5648 Rule Designer: Static Width breaks layout
    @kkrumlian
    kkrumlian committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    335b921 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2014

  1. OC-5649 Change footer text

    @rooney
    rooney committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    d087f5d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenClinica/Designer into… 

    … OC-5649
    @rooney
    rooney committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    d2f4486 View commit details
    Browse the repository at this point in the history

  3. OC-5649 Add changeset information to each page

    @rooney
    rooney committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    8204636 View commit details
    Browse the repository at this point in the history

  4. OC-5694 RD footer CSS problem

    @rooney
    rooney committed Jul 3, 2014
    Configuration menu
    Copy the full SHA
    a691f78 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2014

  1. Merge pull request #37 from rooney/OC-5649 

    OC 5649
    @kkrumlian
    kkrumlian committed Jul 4, 2014
    Configuration menu
    Copy the full SHA
    c7dff96 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #38 from rooney/OC-5694 

    OC-5694 footer CSS problem
    @kkrumlian
    kkrumlian committed Jul 4, 2014
    Configuration menu
    Copy the full SHA
    1cbfcbb View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2015

  1. OC-5754 Rule Designer: For EventAction, If there is more than one Eve… 

    …ntAction added to a target, RD crashes.
    @rooney
    rooney committed Jun 4, 2015
    Configuration menu
    Copy the full SHA
    132d241 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2015

  1. OC-6455 Rule designer specifies rule executes at a specific time (Rul… 

    …e Designer) (in progress)
    @rooney
    rooney committed Jun 9, 2015
    Configuration menu
    Copy the full SHA
    3e3744c View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2015

  1. OC-6455 Rule designer specifies rule executes at a specific time (Rul… 

    …e Designer) (add run on a schedule option)
    @rooney
    rooney committed Jun 11, 2015
    Configuration menu
    Copy the full SHA
    ee53c4c View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2015

  1. OC-6455 Rule designer specifies rule executes at a specific time (Rul… 

    …e Designer) (add notification action)
    @rooney
    rooney committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    22d657b View commit details
    Browse the repository at this point in the history

  2. OC-6455 Rule designer specifies rule executes at a specific time (Rul… 

    …e Designer) (UI polish)
    @rooney
    rooney committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    626aadd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #40 from OpenClinica/OC-5754 

    OC 5754
    @kkrumlian
    kkrumlian committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    95a4a60 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/OC-6455' 

    # Conflicts:
#	src/main/java/org/akaza/openclinica/designer/web/controller/LazyRuleRefType2.java
#	src/main/java/org/akaza/openclinica/designer/web/controller/RuleBuilderController.java
    @kkrumlian
    kkrumlian committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    3af02c6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #42 from kkrumlian/OC-6455kk 

    OC-6455kk
    @kkrumlian
    kkrumlian committed Jun 12, 2015
    Configuration menu
    Copy the full SHA
    d007294 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2015

  1. OC-6455 Rule designer specifies rule executes at a specific time: fee… 

    …dback/bugfixes -- email message formatting bugfix still in progress
    @rooney
    rooney committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    38c8198 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenClinica/Designer into… 

    … OC-6455
    @rooney
    rooney committed Jun 16, 2015
    Configuration menu
    Copy the full SHA
    c91081e View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. OC-6455 Rule designer specifies rule executes at a specific time: ema… 

    …il message formatting bugfix
    @rooney
    rooney committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    33b27bc View commit details
    Browse the repository at this point in the history

  2. OC-6512 Rule Designer UI updates

    @rooney
    rooney committed Jun 17, 2015
    1 Configuration menu
    Copy the full SHA
    245dfaf View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2015

  1. OC-6512 Rule Designer UI updates (fixed select on other actions)

    @rooney
    rooney committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    6f8a575 View commit details
    Browse the repository at this point in the history

  2. OC-6509 Issues with new rule designer(in progress)

    @rooney
    rooney committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    c7b91f3 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2015

  1. OC-6509 Issues with new rule designer (in progress)

    @rooney
    rooney committed Jun 20, 2015
    Configuration menu
    Copy the full SHA
    4446b91 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2015

  1. OC-6455 Rule designer specifies rule executes at a specific time (UI … 

    …design/layout update)
    @rooney
    rooney committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    3845c89 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2015

  1. Merge pull request #43 from OpenClinica/OC-6455 

    OC-6455
    @kkrumlian
    kkrumlian committed Jun 29, 2015
    Configuration menu
    Copy the full SHA
    cf810e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2015

  1. OC-2795 When using email action to [email protected] , Rule des… 

    …igner produces an error

bugfix, email validator

Add new dependency commons-validator-1.4.1, and use their EmailValidator

Add repository maven-central from http://repo1.maven.org/maven2/, there was problem with packages downloaded by maven failing checksum

Add dependency jackson-core-asl, there was problem with rendering json http response

Add dependency apache.tiles, apache.httpcore, and ow2.asm, there was missing definition when building the package
    @rooney
    rooney committed Sep 11, 2015
    Configuration menu
    Copy the full SHA
    de1cc15 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. OC-6905 Bugfix, test button wasn't working 

    Actually they were working but the results from OpenClinica were not
properly displayed.
    @dozymoe
    dozymoe committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    8bcd677 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2016

  1. Merge branch '1.1' into OC-6905 

    Conflicts:
	LICENSE.txt
	pom.xml
	src/assemble/designer-assemble.xml
	src/main/resources/org/akaza/openclinica/i18n/licensing.properties
	src/main/webapp/WEB-INF/views/footer.jsp
	src/main/webapp/WEB-INF/views/south.jsp
	src/main/webapp/includes/NewLoginStyles.css
	src/main/webapp/includes/styles.css
    @theywa
    theywa committed Jan 19, 2016
    Configuration menu
    Copy the full SHA
    bf430d4 View commit details
    Browse the repository at this point in the history