Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Removed unused tests

    • -2165
    • +0
    ./javascript/lib/angular-mocks.js
    • -32600
    • +0
    ./javascript/lib/angular-scenario.js
    • -285
    • +0
    ./javascript/lib/jasmine-gradle.js
    • -188
    • +0
    ./javascript/lib/jasmine-html.js
    • -159
    • +0
    ./javascript/lib/jasmine-reporters.js
    • -18
    • +0
    ./javascript/lib/jquery-1.6.1.min.js
  1. … 35 more files in changeset.
OLMIS-982: Move refui root from /public to /

    • -141
    • +141
    ./javascript/SpecRunner.html
  1. … 842 more files in changeset.
OLMIS-1220: upgrade angular bootstrap dependency for using new bootstrap detepickers

- also removed old bootstrap modal and bootstrap dropdown elements so navbar and modals were changed

- removed some dependencies and 1 test from v2 js files

  1. … 9 more files in changeset.
OLMIS-1033: NavigationService that generates from routes

Instead of hardcoding navigation items, a service and directive are

created to read ui-router configuration. THe navigation bar was updated

to follow Bootstrap's navigation styles

  1. … 24 more files in changeset.
OLMIS-1051 test updated for changes in rnr

    • -0
    • +186
    ./javascript/specs/rnr/model/rnr-test.js
Re-enabled PhantomJS tests

- Re-enabled LoginService tests

- Re-enabled LoginController test

- Changed module include from openlmis to openlmis-core

- Requisition tests now pass, because many are commented out

- Moved HeaderController test

- Re-enabled NavigationController tests

- Stubbed out $state in auth interceptor test

- Stubbed out $scope.$emit in LoginController

- Commented out locale controller test

  1. … 21 more files in changeset.
OLMIS-1051 test updated for changes in rnr

    • -191
    • +6
    ./javascript/specs/rnr/model/rnr-test.js
  1. … 1 more file in changeset.
OLMIS-1051: View Requisition page

Squashed commit of the following:

commit be8c6211284f14873ac814bdf522ec2ed52998ea

Merge: 00a20e8 9796b87

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Wed Oct 5 17:40:22 2016 +0200

Merge branch 'master' into OLMIS-1051

commit 00a20e8de866d12965e35995f3941bfc6620d70e

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Wed Oct 5 17:39:53 2016 +0200

OLMIS-1051: View requisition page

commit 10c233c035c99e74324f46ca5e1c58770d2d2434

Author: Nikodem Graczewski <ngraczewski@soldevelo.com>

Date: Wed Oct 5 15:02:33 2016 +0200

OLMIS-1051: Added error when user tries to enter page for requisition that does not exist

commit 21947bf5dd9a5da8514eff72791b4964e4473835

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Wed Oct 5 14:05:02 2016 +0200

OLMIS-1051: Make requisitiong from API visible instead of hardcoded example

commit 8e64897e2a745259837bae154b7c20e7524db020

Author: Nick Reid <nickreid@nickreid.com>

Date: Tue Oct 4 19:50:01 2016 -0700

OLMIS-1051: Got view-requistion url to work

The requisiton URL wasn't working because of the wild card overlapping

with approval-list. To fix this, I made the path /requisition/<id> so

there is no overlap (and its slightly more semantic).

Included in this commit is removing error checking code from

view-requisition, because those errors are caught by the resolve

statement.

I also move the header closer to the actual page.

commit 716454b9564254abadc7a8a62ea62fda361c3f3d

Merge: af54174 b283d48

Author: Nick Reid <nickreid@nickreid.com>

Date: Tue Oct 4 18:58:04 2016 -0700

Merged master & seperated .routes from .module

commit af54174de673e9dd8dd25ebb9a663ad52807db38

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Tue Oct 4 18:21:27 2016 +0200

Added abstract to the requisitions state

commit 43c599f944357b9ca14e322e2f701ab6c084b5cb

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Tue Oct 4 18:18:57 2016 +0200

Fixed paths in requisition routes

commit bdc3186fefea8a2d4ed3656346463e7348cb8939

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Tue Oct 4 17:29:49 2016 +0200

Fixed URLs in routes so that the 'requisitions' is not repeated twice

commit 93b30ebf02e1b94cc2892074313307aab1f9c7d9

Author: Jakub Hopen <jhopen@soldevelo.com>

Date: Tue Oct 4 15:52:57 2016 +0200

additional changes

commit 0f41b9f29b0c205aa6351b562b05d4a1468f03c9

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Tue Oct 4 15:03:46 2016 +0200

Migrated viewRequisition page

commit 2e16738c77ae81417a5a9960f05d15f199fdc789

Merge: 73c2bf9 d23200e

Author: Weronika Ciecierska <wciecierska@soldevelo.com>

Date: Tue Oct 4 13:46:47 2016 +0200

Merge branch 'master' into OLMIS-1051

Conflicts:

src/test/javascript/specs/auth/auth-service-test.js

commit 73c2bf9f4c5e6b5da8c5aa92acf82ed6d75e8f74

Author: Jakub Hopen <jhopen@soldevelo.com>

Date: Mon Oct 3 14:21:52 2016 +0200

OLMIS-1051 Create page state to view Requisition

    • -2
    • +2
    ./javascript/specs/rnr/model/rnr-test.js
  1. … 12 more files in changeset.
Installing phantomjs through apt-get

  1. … 1 more file in changeset.
Made requisition tests run again, and commented out one test

  1. … 1 more file in changeset.
OLMIS-1040: Added access-token interceptor

Added a http interceptor that processes all HTTP requests, by adding

access_token from AuthorizationService as a URL parameter. To make this

work, AuthorizationService had to be so there is a LoginService because

of a circular dependency.

  1. … 17 more files in changeset.
Added PhantomJS for unit testing

Added PhantomJS to Karma tests, and updated tests so they pass. Tests

for offline functionality were turned off. Loaded in HTML templates

using ngHtml, and added watch command for a better dev experience.

Chrome related files have been removed.

Added proxy server and changed to grunt-connect from grunt-serve

    • -113
    • +0
    ./javascript/specs/auth/auth-service-test.js
    • -78
    • +0
    ./javascript/specs/auth/authURL-factory-test.js
  1. … 12 more files in changeset.
OLMIS-1045: Reformatted controllers

  1. … 3 more files in changeset.
OLMIS-1040: Navigation-controller tests had problem with information loading

OLMIS-1040: Condensing authentication services

    • -11
    • +18
    ./javascript/specs/auth/auth-service-test.js
    • -1
    • +1
    ./javascript/specs/auth/authURL-factory-test.js
  1. … 6 more files in changeset.
OLMIS-1045: Breaking auth to replace parts

    • -4
    • +3
    ./javascript/specs/auth/auth-service-test.js
  1. … 5 more files in changeset.
OLMIS-1045: Changed tests to work in shared environment

OLMIS-1045: Updated reset password routes and tests

  1. … 1 more file in changeset.
OLMIS-1040: Added url interceptor - that doest run on page load (bug)

    • -0
    • +64
    ./javascript/specs/auth/auth-interceptor-test.js
  1. … 1 more file in changeset.
OLMIS-1040: Modified AuthService so it will not run requests when loaded

    • -20
    • +17
    ./javascript/specs/auth/auth-service-test.js
  1. … 1 more file in changeset.
    • -9
    • +14
    ./javascript/specs/auth/auth-service-test.js
  1. … 2 more files in changeset.
Changed auth request parameters to POST Body

Made the auth request parameters pass in the POST Body, because URL

parameters (ie password) would be visible as plain text in a server's

access log.

  1. … 1 more file in changeset.
OLMIS-1040: Split LoginController into AuthService and LoginController

    • -0
    • +105
    ./javascript/specs/auth/auth-service-test.js
  1. … 2 more files in changeset.
added AuthURL to LoginController

  1. … 1 more file in changeset.
got authURL factory working

    • -8
    • +41
    ./javascript/specs/auth/authURL-factory-test.js
  1. … 1 more file in changeset.
OLMIS-1040: Added authService code

    • -0
    • +45
    ./javascript/specs/auth/authURL-factory-test.js
  1. … 1 more file in changeset.
Moved spec for login-controller

    • -0
    • +118
    ./javascript/specs/auth/login-controller-test.js
OLMIS-1040: Moved and encapsulated LoginController

Changed how LoginController is injected into OpenLMIS app because (1) I

couldn't figure it out (2) Leaving code on the global scope gets yucky

fast

  1. … 3 more files in changeset.
OLMIS-1011: Update indentation

  1. … 1 more file in changeset.
OLMIS-1011 FEOLMIS-212 Add spaces before and after '+' and remove unnecessary cleaning password

  1. … 1 more file in changeset.