Commits · c9b1cea287a4416996a7b30710db9bacdca5a204 · M. Chardon / ADIM

15 Jun, 2015 5 commits

Julien Furrer authored Jun 15, 2015

Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev

c9b1cea2

updated moodle url · 471bf635
Julien Furrer authored Jun 15, 2015

471bf635
Changed the way sharing properties are displayed in AOMgr · 6c759df8
Julien Furrer authored Jun 15, 2015
```
Display URL and label for ttp shared objects
```
6c759df8

Merge branch 'dev' of... · e5c6a5d2

Julien Furrer authored Jun 15, 2015

Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev

e5c6a5d2

Updated RestFramework permission, adapted AnobjMgr properties for TTP · 7d2e167d

Julien Furrer authored Jun 15, 2015

DRF:
Updated permission check for Annotation (compatibility with v3.*) using PermissionClass
Added a TTPAuthentication class (adim_ttp.authentication.TTPAuthentication) so api call can be done without user token

AnObj Manager:
Updated the properties panel for TTP shared object: the link for editing the object in the distant service is more visible

7d2e167d

11 Jun, 2015 2 commits
- Merge branch 'dev' of... · c89ee22e
  Julien Furrer authored Jun 11, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  c89ee22e
- Fixed BASE_URL trailing slash ; added moodle check_url · 6ed8a210
  Julien Furrer authored Jun 11, 2015
  
  6ed8a210
08 Jun, 2015 14 commits
- Merge branch 'dev' of... · 18da5f29
  Julien Furrer authored Jun 08, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  18da5f29
- Fixed trailing slash at the end of BASE_URL · 6a087d5b
  Julien Furrer authored Jun 08, 2015
  
  6a087d5b
- Merge branch 'dev' of... · 1d0267ed
  Julien Furrer authored Jun 08, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  1d0267ed
- config deploy · 0f30e1d3
  Julien Furrer authored Jun 08, 2015
  
  0f30e1d3
- Merge branch 'dev' of... · 4e6ddc73
  Julien Furrer authored Jun 08, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  4e6ddc73
- config deploy · 3cb54789
  Julien Furrer authored Jun 08, 2015
  
  3cb54789
- Merge branch 'dev' of... · 0aab7491
  Julien Furrer authored Jun 08, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  0aab7491
- Suite fix config deploy · 9757700f
  Julien Furrer authored Jun 08, 2015
  
  9757700f
- Merge branch 'dev' of... · 33b6f3f0
  Julien Furrer authored Jun 08, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  33b6f3f0
- Fixing apache_config for deploy · 495ed2ee
  Julien Furrer authored Jun 08, 2015
  
  495ed2ee
- Merge branch 'dev' of... · 27d39d89
  Julien Furrer authored Jun 08, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  27d39d89
- Merge branch 'small-dev' into dev · db6e193e
  Julien Furrer authored Jun 08, 2015
```
Conflicts:
	.gitignore
FIXED
```
  db6e193e
- Adaptation configuration pour deploiement · 4e53ccb4
  Julien Furrer authored Jun 08, 2015
  
  4e53ccb4
- fixed typo · 73c9676e
  Julien Furrer authored Jun 08, 2015
  
  73c9676e
04 Jun, 2015 2 commits

Merge branch 'dev' of... · ac5f5f06

Julien Furrer authored Jun 04, 2015

Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev

ac5f5f06

In attp, changed get_or_create_user to have a better support of uniqueId · 78868e9d

Julien Furrer authored Jun 04, 2015

If a user is created without a uniqueId, but the value of the attribute is given later, it is
added to the user. This address the case when a user is shibbolized afterwards.

78868e9d

26 May, 2015 1 commit
- Changed sharing mode icon for TTP services · a0f148cc
  Julien Furrer authored May 26, 2015
  
  a0f148cc
19 May, 2015 3 commits
- Merge branch 'dev' of... · d01b175b
  Julien Furrer authored May 19, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  d01b175b
- Changed AnObj shared icons in AnObjMgr · 8628233a
  Julien Furrer authored May 19, 2015
  
  8628233a
- Adapted AnObjMgr for displaying ttp properties properly · 8a9e7090
  Julien Furrer authored May 19, 2015
  
  8a9e7090
18 May, 2015 2 commits
- Updated adim.permission module, PERMISSION_CLASSES use instances instead of Class · f05f6ae9
  Julien Furrer authored May 18, 2015
```
The TTP permission classes are bulit from settings, no need for hardcoding.
```
  f05f6ae9
- Added support for Trusted Third Party authentication and authorization · 8a856559
  Julien Furrer authored May 18, 2015
  
  8a856559
30 Apr, 2015 11 commits
- updated settings for prod and staging · 051d7fc1
  Julien Furrer authored Apr 30, 2015
  
  051d7fc1
- Merge branch 'dev' of... · 902370a2
  Julien Furrer authored Apr 30, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  902370a2
- new dev build · b22ac73d
  Julien Furrer authored Apr 30, 2015
  
  b22ac73d
- Merge branch 'dev' of... · 5bfbb77b
  Julien Furrer authored Apr 30, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  5bfbb77b
- Fixed staging settings · bb33a18a
  Julien Furrer authored Apr 30, 2015
  
  bb33a18a
- Merge branch 'dev' of... · 4188609f
  Julien Furrer authored Apr 30, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  4188609f
- Added staging setting · 1804a884
  Julien Furrer authored Apr 30, 2015
  
  1804a884
- Merge branch 'dev' of... · 04ae624c
  Julien Furrer authored Apr 30, 2015
```
Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
```
  04ae624c
- git cleanup (removed unwanted files media/*) · 3b7ce358
  Julien Furrer authored Apr 30, 2015
  
  3b7ce358
- git cleanup (removed unwanted files media/*) · 4fe04b00
  Julien Furrer authored Apr 30, 2015
  
  4fe04b00
- PEP 8 conforming · 257ac42d
  Julien Furrer authored Apr 30, 2015
  
  257ac42d