Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

vMap
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

01d64244

Commit 01d64244 authored 6 years ago by Anthony Borghi

Downloads
- Plain Diff

Merge branch 'master' into 'next_version'

Master into next_version

See merge request Development/vitis_apps/application/gtf!14

parents 2b490842 ea21e16b

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/module_gtf/module/javascript/script_module.js 3 additions, 1 deletion

src/module_gtf/module/javascript/script_module.js
src/module_gtf/module/lang/lang-en.json 2 additions, 1 deletion

src/module_gtf/module/lang/lang-en.json
src/module_gtf/module/lang/lang-fr.json 2 additions, 1 deletion

src/module_gtf/module/lang/lang-fr.json
src/module_gtf/web_service/class/gtf_lib/gtf_object/Order.class.inc 7 additions, 8 deletions

..._gtf/web_service/class/gtf_lib/gtf_object/Order.class.inc
src/module_gtf/web_service/ws/License.class.inc 74 additions, 54 deletions

src/module_gtf/web_service/ws/License.class.inc
src/module_gtf/web_service/ws/UserOrders.class.inc 1 addition, 8 deletions

src/module_gtf/web_service/ws/UserOrders.class.inc
src/vitis/client/modules/vitis/less/versionConfiguration.less 11 additions, 7 deletions

...vitis/client/modules/vitis/less/versionConfiguration.less

with 100 additions and 80 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment