Commit Graph

446 Commits

Author SHA1 Message Date
Simon Redfern
3fed3540cd
Merge pull request #146 from hongwei1/master
feature/Re-brand API Manager -- step3
2021-10-02 07:13:01 +02:00
Hongwei
a13b11ca55 docfix/added the comment to override.css 2021-10-01 12:35:09 +02:00
Hongwei
c2b602fa60 refactor/comment out the override.css first 2021-09-30 15:25:24 +02:00
Hongwei
aa37dde5e3 feature/Re-brand API Manager -- step3 2021-09-30 15:24:51 +02:00
Hongwei
1776469ff0 Merge remote-tracking branch 'OpenBankProject/master'
# Conflicts:
#	apimanager/users/views.py
2021-09-30 13:49:36 +02:00
Simon Redfern
5357b85147
Merge pull request #145 from constantine2nd/master
feature/Add field last_marketing_agreement_signed_date to CSV export
2021-09-24 10:59:39 +02:00
Marko Milić
edaa17ba28 feature/Add field last_marketing_agreement_signed_date to CSV export 2021-09-17 08:32:15 +02:00
Hongwei
3ceb473b35 feature/added the agreements to cvs file 2021-09-16 11:06:24 +02:00
Hongwei
71bdbc8e75 Merge remote-tracking branch 'OpenBankProject/master' 2021-09-16 09:24:41 +02:00
Marko Milić
897d92b8f9 Merge remote-tracking branch 'upstream/master' 2021-08-31 16:21:18 +02:00
Marko Milić
47120a34a6 bugfix/Show user invitation row after it's created 2021-08-31 16:20:54 +02:00
Simon Redfern
fe7690946a
Merge pull request #143 from constantine2nd/master
Make all fileds mandatory at User invitation page
2021-08-24 12:32:02 +02:00
Marko Milić
713e9ae8c5 Merge remote-tracking branch 'upstream/master' 2021-08-18 18:04:05 +02:00
Marko Milić
f312fbce27 feature/Make all fileds mandatory at User invitation page 2021-08-18 18:03:51 +02:00
Simon Redfern
faca329f6c
Merge pull request #142 from hongwei1/master
refactor/tweaked `Get user list` -> `Refresh`
2021-08-12 16:49:43 +02:00
Hongwei
37afe2feaa Merge remote-tracking branch 'OpenBankProject/master' 2021-08-12 15:49:57 +02:00
Hongwei
384a8a9043 refactor/tweaked Get user list -> Refresh 2021-08-12 15:11:21 +02:00
Simon Redfern
0a09ee9941
Merge pull request #141 from hongwei1/master
feature/added the getUser export csv button
2021-08-04 11:28:15 +02:00
Hongwei
aa4a8d982b refactor/tweak DEVELOP -> DEVELOPER 2021-08-03 14:58:40 +02:00
Hongwei
0057f45c88 feature/added the export-csv method for getUsers 2021-08-03 14:58:13 +02:00
Simon Redfern
2fdae21d19
Merge pull request #140 from constantine2nd/master
Fix highlighting at the nenu item Users
2021-08-02 15:32:18 +02:00
Marko Milić
2a24d96955 Merge remote-tracking branch 'upstream/master' 2021-07-30 15:47:26 +02:00
Marko Milić
bb19833bd9 bugfix/Fix highlighting at the nenu item Users 2021-07-30 15:46:56 +02:00
Marko Milić
baeb95a5c2 docfix/Override Log on/out button look and feel at css 2021-07-30 15:15:08 +02:00
Simon Redfern
75daa27df1
Merge pull request #139 from constantine2nd/master
Re-brand API Manager
2021-07-30 13:15:02 +02:00
Marko Milić
56dc2f3f2a Merge remote-tracking branch 'upstream/master' 2021-07-30 12:54:03 +02:00
Marko Milić
e53e8930de feature/Re-brand API Manager - fonts 2021-07-30 12:53:17 +02:00
Marko Milić
8445f9a8ec bugfix/Re-brand API Manager - show logo at every page 2021-07-29 16:45:23 +02:00
Simon Redfern
5cd759ada1
Merge pull request #138 from constantine2nd/master
Re-brand API Manager - LOGO
2021-07-28 17:57:55 +02:00
Marko Milić
666560660f Merge remote-tracking branch 'upstream/master' 2021-07-28 17:03:44 +02:00
Marko Milić
40b2287b20 feature/Re-brand API Manager - logo 2021-07-28 17:03:31 +02:00
Simon Redfern
c74a2a992c
Merge pull request #137 from constantine2nd/master
Fix SSO redirects to the portal instead of apis side
2021-07-23 14:31:51 +02:00
Marko Milić
47f952c4c9 Merge remote-tracking branch 'upstream/master' 2021-07-23 14:05:50 +02:00
Marko Milić
d2f852d35b bugfix/Fix SSO redirects to the portal instead of apis side 2021-07-23 14:04:56 +02:00
Simon Redfern
058808c456
Merge pull request #136 from constantine2nd/master
SSO
2021-07-21 12:46:10 +02:00
Marko Milić
a48d68e35e Merge remote-tracking branch 'upstream/master' 2021-07-21 11:26:34 +02:00
Marko Milić
a1c59b1b18 feature/Hide the delete status once a user is not deleted 2021-07-21 11:26:22 +02:00
Marko Milić
d6ab343c5b feature/Add Single Sign On flow 2021-07-21 10:37:05 +02:00
Simon Redfern
700d4169e3
Merge pull request #135 from constantine2nd/master
feature/Hide the delete button once a user is deleted
2021-07-20 16:32:21 +02:00
Marko Milić
9ab2cdb2d3 feature/Hide the delete button once a user is deleted 2021-07-20 16:29:44 +02:00
Simon Redfern
5b3bd91f8c
Merge pull request #134 from tawoe/removeUsers
add home link to portal page
2021-06-30 11:27:18 +02:00
tawoe
3e747842b3 add home link to portal page 2021-06-30 10:55:27 +02:00
Simon Redfern
83da126472
Merge pull request #133 from tawoe/removeUsers
delete user
2021-06-29 14:34:54 +02:00
tawoe
7acfc14129 delete user 2021-06-29 14:29:49 +02:00
Simon Redfern
b4ebd671ee
Merge pull request #132 from hongwei1/master
refactor/modify the invitation form
2021-06-17 12:49:31 +02:00
Hongwei
27b13eaa6f refactor/modify the invitation form 2021-06-17 12:24:04 +02:00
Simon Redfern
f76056a621
Merge pull request #130 from hongwei1/master
bugfix/remove the Secret Key
2021-06-17 12:02:11 +02:00
Hongwei
9114537a56 bugfix/remove the Secret Key 2021-06-10 10:50:25 +02:00
Hongwei
5ed5b59f57 feature/added the getAll invitations 2021-06-03 11:56:00 +02:00
Simon Redfern
a7dd8c9c18
Merge pull request #127 from hongwei1/master
docfix/tweaked H1 for invitation page
2021-06-03 11:24:42 +02:00