Skip to content

Commit c3346e2

Browse files
dtheilerdtheiler
committed
Merge remote-tracking branch 'remotes/origin/servCallRefact'
Conflicts: adapter/adapter.rest/adapter.rest.v2/src/main/java/at/tugraz/sss/adapter/rest/v2/SSRestMainV2.java sss/src/main/resources/archive/rest.v1/SSRestMainV1.txt
2 parents e633518 + 016bddd commit c3346e2

File tree

948 files changed

+34355
-43140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

948 files changed

+34355
-43140
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,3 +507,10 @@ org.eclipse.wst.jsdt.ui.superType.name
507507
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/ues.json
508508
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/users.json
509509
/sss/ss.log.1
510+
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/jsonld.json
511+
/serv/serv.custom/serv.custom.caller/*.log
512+
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/files.json
513+
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/activities.json
514+
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/learneps.json
515+
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/colls.json
516+
/adapter/adapter.rest/adapter.rest.v2/src/main/webapp/api-docs/eval.json

‎3rdpartylibs/libs/tagrec_v2.0.jar‎

-7.45 MB
Binary file not shown.

‎3rdpartylibs/libs/tagrec_v2.1.jar‎

-7.67 MB
Binary file not shown.

3rdpartylibs/libs/tagrec_v2.2.jar renamed to 3rdpartylibs/libs/tagrec_v2.3.jar

7.68 MB
Binary file not shown.

‎adapter/adapter.rest/adapter.rest.v1/nb-configuration.xml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎adapter/adapter.rest/adapter.rest.v1/pom.xml‎

Lines changed: 0 additions & 275 deletions
This file was deleted.

0 commit comments

Comments
 (0)