Commit Graph

551 Commits

Author SHA1 Message Date
Reena-cell
29be9d5efc /feature add Connector Method 2022-08-15 11:02:46 +02:00
Reena-cell
2f39d2b1d2 /refector remove Heloooo 2022-08-05 00:26:27 +02:00
Reena-cell
d1522d60f5 /feature add Export_CSV in ATM_Detail 2022-08-03 13:38:46 +02:00
Reena-cell
7fa33153fd /feature Add Lock/Unlock button 2022-07-28 12:42:34 +02:00
Reena-cell
1d77791ade /refactor changes url name of ATMs list 2022-07-20 13:36:16 +02:00
Reena-cell
0d3405598a /refactor change url name of ATMs list 2022-07-20 13:30:26 +02:00
Reena-cell
7d565de466 /refactor change url name of ATMs list 2022-07-20 13:24:24 +02:00
Reena-cell
bb608ec2ee /refactor not translate OBP 2022-07-20 12:54:10 +02:00
Reena-cell
e2037e0fba Merge remote-tracking branch 'UPSTREAM/develop' into develop
# Conflicts:
#	apimanager/base/templates/base.html
#	apimanager/locale/es/LC_MESSAGES/django.mo
2022-07-13 09:40:22 +02:00
Reena-cell
fb0187ca58 bugfix/ URL fix 2022-07-07 14:42:21 +02:00
Reena-cell
501acd2c83 bugfix/ ATM View bug fix 2022-07-07 11:11:34 +02:00
Reena-cell
0936691a5b feature ATMs internationalization i18n 2022-07-06 14:48:01 +02:00
Reena-cell
68e147f7bc bugfix/ ATM View url 2022-07-06 14:08:55 +02:00
Simon Redfern
6d1eb175ae
Merge pull request #182 from CristhTejada/develop
Spanish translation checked
2022-07-06 13:55:07 +02:00
Reena-cell
d197c72ae7 bugfix/ ATM Vies url 2022-07-06 13:53:53 +02:00
Simon Redfern
c82ecb8b4a
Merge pull request #183 from tawoe/bugfix/view_atm_list
fix view all atms
2022-07-06 13:51:15 +02:00
tawoe
86137c0ea8 fix view all atms 2022-07-06 09:12:56 +02:00
CristhTejada
5b0c455067 Spanish translation checked 2022-06-30 10:53:04 -06:00
Simon Redfern
8ab53e18b8
Merge pull request #181 from Reena-cell/develop
feature/ internalization i18n - moving auth related URLs out of i18n
2022-06-27 13:06:48 +02:00
Reena-cell
92fc713ca5 feature/ internalization i18n 2022-06-24 15:54:26 +02:00
tawoe
cb61117755
fix requirements bug 2022-06-16 12:45:29 +02:00
tawoe
3b66c83ffd
Merge pull request #180 from Reena-cell/develop
feature/ internalization i18n WIP
2022-06-16 12:44:10 +02:00
Reena-cell
e2dfa664cf feature/ internalization i18n WIP 2022-06-16 12:28:52 +02:00
Simon Redfern
23fb79ad2d
Merge pull request #179 from Reena-cell/develop
feature Internationalization i18n (label)
2022-06-10 14:21:13 +02:00
Reena-cell
602f3be981 feature internalization i18n (label) 2022-06-10 12:42:55 +02:00
Reena-cell
08720a0e16 feature internalization i18n WIP 2022-06-09 16:32:08 +02:00
Reena-cell
25f4c4194a feature internalization i18n WIP 2022-05-31 18:21:48 +02:00
Reena-cell
3ae195a7a5 Merge branch 'develop-master-merge' into develop
# Conflicts:
#	apimanager/apimanager/settings.py
#	apimanager/apimanager/urls.py
#	apimanager/atms/templates/atms/update.html
#	apimanager/base/templates/base.html
#	apimanager/base/templates/home.html
#	apimanager/locale/de/LC_MESSAGES/django.mo
#	apimanager/locale/de/LC_MESSAGES/django.po
#	apimanager/locale/es/LC_MESSAGES/django.mo
#	apimanager/locale/es/LC_MESSAGES/django.po
#	apimanager/locale/fr/LC_MESSAGES/django.mo
#	apimanager/locale/fr/LC_MESSAGES/django.po
#	apimanager/locale/hi/LC_MESSAGES/django.mo
#	apimanager/locale/hi/LC_MESSAGES/django.po
#	apimanager/metrics/templates/metrics/custom_summary.html
2022-05-31 14:31:24 +02:00
Reena-cell
3cc6771514 Internationalization i18n 2022-05-31 13:22:35 +02:00
Reena-cell
78d11a8303 feature internalization i18n WIP 2022-05-30 17:48:35 +02:00
Reena-cell
4efa717cfa feature internalization i18n 2022-05-25 13:32:45 +02:00
Reena-cell
9330c7adeb feature ATMs 2022-05-23 10:04:37 +02:00
Reena-cell
f5e76978f0 feature ATMs 2022-05-23 09:58:51 +02:00
Reena-cell
f6da0ae100 feature translate i18n 2022-05-11 06:31:01 +02:00
Reena Aheer
c28768d9d9
Merge branch 'OpenBankProject:develop' into develop 2022-05-10 15:31:29 +02:00
tawoe
27e495e6d2 Merge remote-tracking branch 'origin/master' into develop 2022-05-10 15:28:02 +02:00
tawoe
d71fc2b1e7 Merge remote-tracking branch 'origin/master' into develop-master-merge 2022-05-10 15:25:53 +02:00
tawoe
8e44e1c2a5 Revert "Added missing dependency and cleared unnecessary lines"
This reverts commit 9877c0d3a5.
2022-05-10 15:24:07 +02:00
tawoe
9692544d0a Revert "set debug to false"
This reverts commit 09d033018b.
2022-05-10 15:23:59 +02:00
Reena-cell
08056d224c feature translation i18n 2022-05-10 12:16:33 +02:00
Reena-cell
e78bb5d3fd Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apimanager/apimanager/settings.py
#	requirements.txt
2022-05-10 12:15:47 +02:00
Reena-cell
882757c59d feature translation i18n 2022-05-10 12:14:03 +02:00
Simon Redfern
b29914ca93
Merge pull request #171 from tawoe/update_config
change default behaviour
2022-05-04 09:01:26 +02:00
tawoe
380636b78a change default behaviour 2022-05-03 12:31:23 +02:00
Simon Redfern
1d3165ec94
Merge pull request #170 from tawoe/update_config
doc/ improve settings comment
2022-05-03 11:26:23 +02:00
tawoe
befc0c453e doc/ improve settings comment 2022-05-02 11:55:46 +02:00
Simon Redfern
c3635889d2
Merge pull request #169 from tawoe/update_config
make ssl verification configurable
2022-04-26 09:36:23 +02:00
tawoe
281b1da913 make ssl verification configurable 2022-04-25 18:33:58 +02:00
Simon Redfern
2363bdc1dc
Merge pull request #168 from Reena-cell/master
/feature Add ATM page
2022-04-25 12:16:39 +02:00
Reena_Aheer
bc4bb66251 /feature Add ATM page 2022-04-25 04:03:59 +02:00