Dmitry Novikov
|
4eaa83f2ea
|
add question before free user ip address
|
7 years ago |
|
Dmitry Novikov
|
749ff731eb
|
Merge branch 'devel' of dial.lo:~/djing into devel
|
7 years ago |
|
Dmitry Novikov
|
3fe295b8e7
|
fix jquery collapse and input height
|
7 years ago |
|
Dmitry Novikov
|
6194cfc629
|
fix dlink
|
7 years ago |
|
Dmitry Novikov
|
97b9b171b5
|
improve ping function. First time do simple ping, and if not response then try arp ping
|
7 years ago |
|
Dmitry Novikov
|
d5499cefc4
|
make huawei ports toggleable
|
7 years ago |
|
Dmitry Novikov
|
22df050d8d
|
fix huawei port status
|
7 years ago |
|
Dmitry Novikov
|
86caf1d8ff
|
fix free ip addr search
|
7 years ago |
|
Dmitry Novikov
|
6232195211
|
fix palceholder
|
7 years ago |
|
Dmitry Novikov
|
22d6e17f60
|
remove datetimepicker for bootstrap
|
7 years ago |
|
Dmitry Novikov
|
4adb3909d6
|
add simple traf info to employer page
|
7 years ago |
|
Dmitry Novikov
|
68624f1212
|
Check for passign SIGN parameter
|
7 years ago |
|
Dmitry Novikov
|
25c88bc58c
|
fix sign check
|
7 years ago |
|
Dmitry Novikov
|
51da392681
|
make finance app
|
7 years ago |
|
Dmitry Novikov
|
2b0864dae2
|
Merge branch 'devel' into fin
Conflicts:
abonapp/forms.py
abonapp/migrations/0002_auto_20180808_1448.py
abonapp/models.py
abonapp/templates/abonapp/group_list.html
abonapp/views.py
clientsideapp/views.py
djing/local_settings.py.example
djing/settings.py
djing/urls.py
locale/ru/LC_MESSAGES/django.po
periodic.py
Changes to be committed:
modified: abonapp/forms.py
modified: abonapp/locale/ru/LC_MESSAGES/django.po
new file: abonapp/migrations/0001_squashed_0008_auto_20181115_1206.py
modified: abonapp/migrations/0002_auto_20180808_1448.py
modified: abonapp/models.py
new file: abonapp/tasks.py
modified: abonapp/templates/abonapp/debtors.html
modified: abonapp/templates/abonapp/editAbon.html
modified: abonapp/templates/abonapp/group_list.html
modified: abonapp/templates/abonapp/invoiceForPayment.html
modified: abonapp/templates/abonapp/modal_phonebook.html
modified: abonapp/templates/abonapp/payHistory.html
modified: abonapp/templates/abonapp/peoples.html
modified: abonapp/templates/abonapp/service.html
modified: abonapp/views.py
modified: accounts_app/forms.py
modified: accounts_app/locale/ru/LC_MESSAGES/django.po
new file: accounts_app/migrations/0004_userprofile_flags.py
modified: accounts_app/models.py
modified: accounts_app/templates/accounts/acc_list.html
modified: accounts_app/templates/accounts/ext.htm
modified: accounts_app/templates/accounts/index.html
modified: accounts_app/templates/accounts/settings/ext.htm
renamed: accounts_app/templates/accounts/userprofile_form.html -> accounts_app/templates/accounts/settings/userprofile_form.html
modified: accounts_app/urls.py
modified: accounts_app/views.py
new file: agent/netflow/djing_flow.tar.gz
modified: agent/netflow/netflow_handler.py
modified: agent/netflow/start_netflow.sh
deleted: chatbot/admin.py
deleted: chatbot/apps.py
deleted: chatbot/locale/ru/LC_MESSAGES/django.po
deleted: chatbot/migrations/0001_initial.py
deleted: chatbot/migrations/0002_auto_20180808_1236.py
deleted: chatbot/models.py
deleted: chatbot/telebot.py
deleted: chatbot/views.py
modified: clientsideapp/views.py
modified: devapp/base_intr.py
modified: devapp/dev_types.py
modified: devapp/forms.py
modified: devapp/locale/ru/LC_MESSAGES/django.po
new file: devapp/migrations/0001_squashed_0005_device_ip_address_change.py
modified: devapp/models.py
new file: devapp/onu_config/__init__.py
new file: devapp/onu_config/base.py
new file: devapp/onu_config/f601.py
new file: devapp/onu_config/f660.py
modified: devapp/templates/devapp/custom_dev_page/generic_switch.html
modified: devapp/templates/devapp/custom_dev_page/onu.html
modified: devapp/templates/devapp/custom_dev_page/onu_for_zte.html
modified: devapp/templates/devapp/group_list.html
modified: devapp/urls.py
modified: devapp/views.py
modified: dialing_app/templates/index.html
modified: dialing_app/templatetags/telephone_filters.py
modified: djing/fields.py
modified: djing/lib/decorators.py
modified: djing/lib/mixins.py
deleted: djing/lib/tln/__init__.py
deleted: djing/lib/tln/tln.py
modified: djing/local_settings.py.example
modified: djing/settings.py
modified: djing/tasks.py
modified: djing/urls.py
modified: djing/views.py
modified: docs/extra_func.md
modified: group_app/views.py
modified: gw_app/nas_managers/core.py
modified: gw_app/nas_managers/mod_mikrotik.py
modified: gw_app/nas_managers/structs.py
new file: ip_pool/migrations/0001_squashed_0004_auto_20190305_1243.py
new file: ip_pool/migrations/0004_auto_20190305_1243.py
modified: ip_pool/models.py
modified: locale/ru/LC_MESSAGES/django.po
new file: messenger/__init__.py
new file: messenger/admin.py
new file: messenger/apps.py
new file: messenger/forms.py
new file: messenger/locale/ru/LC_MESSAGES/django.po
new file: messenger/migrations/0001_initial.py
renamed: chatbot/__init__.py -> messenger/migrations/__init__.py
new file: messenger/models.py
new file: messenger/tasks.py
new file: messenger/templates/messenger/add_messenger.html
new file: messenger/templates/messenger/messenger_list.html
new file: messenger/templates/messenger/vibermessenger_form.html
new file: messenger/tests.py
new file: messenger/urls.py
new file: messenger/views.py
modified: msg_app/forms.py
modified: msg_app/models.py
modified: msg_app/templates/msg_app/chat.html
modified: msg_app/urls.py
modified: msg_app/views.py
modified: periodic.py
modified: requirements.txt
modified: searchapp/templates/searchapp/index.html
modified: static/bad_ie.html
modified: static/css/all.min.css
deleted: static/css/bootstrap-datetimepicker.min.css
new file: static/css/chartist.min.css
deleted: static/img/gmarkers/dev.png
deleted: static/img/gmarkers/dev_bug.png
deleted: static/img/gmarkers/dev_ok.png
deleted: static/img/gmarkers/flag_black.png
deleted: static/img/gmarkers/relay_rack.png
modified: static/js/all.min.js
deleted: static/js/bootstrap-datetimepicker.min.js
new file: static/js/chartist.min.js
deleted: static/js/cidr.js
modified: static/js/my.js
deleted: systemd_units/djing_telebot.service
modified: systemd_units/do_backup.sh
modified: taskapp/forms.py
modified: taskapp/handle.py
modified: taskapp/locale/ru/LC_MESSAGES/django.po
modified: taskapp/models.py
modified: taskapp/templates/taskapp/details.html
modified: taskapp/templates/taskapp/footer_btns.html
modified: taskapp/urls.py
modified: taskapp/views.py
deleted: telebot.py
modified: templates/all_base.html
modified: templates/base.html
renamed: chatbot/migrations/__init__.py -> traf_stat/__init__.py
new file: traf_stat/admin.py
new file: traf_stat/apps.py
new file: traf_stat/fields.py
new file: traf_stat/migrations/0001_initial.py
new file: traf_stat/migrations/__init__.py
new file: traf_stat/models.py
new file: traf_stat/templates/statistics/index.html
new file: traf_stat/tests.py
new file: traf_stat/urls.py
new file: traf_stat/views.py
|
7 years ago |
|
Dmitry Novikov
|
0ebd15b6fc
|
recovery traffic statistics
|
7 years ago |
|
Dmitry Novikov
|
5bf5d606cc
|
changes for traf stat
|
7 years ago |
|
Dmitry Novikov
|
5402b0fecc
|
make squashed migrations to prepare new version
|
7 years ago |
|
Dmitry Novikov
|
83f7179c3d
|
revert to mysql
|
7 years ago |
|
Dmitry Novikov
|
008fb866fe
|
minor fixes
|
7 years ago |
|
Dmitry Novikov
|
cab26daacb
|
remove unused
|
7 years ago |
|
Dmitry Novikov
|
614c7dbcb0
|
add support for ZTE-F601 registration
|
7 years ago |
|
Dmitry Novikov
|
46d33373f4
|
Fix
|
7 years ago |
|
Dmitry Novikov
|
8f087ceec4
|
Fix translate
|
7 years ago |
|
Dmitry Novikov
|
044b154c18
|
Merge branch 'devel' into messanger
|
7 years ago |
|
Dmitry Novikov
|
d673b995d3
|
Add viber notifications
|
7 years ago |
|
Dmitry Novikov
|
8152f50ba2
|
change django-jsonfield source
|
7 years ago |
|
Dmitry Novikov
|
51cca66ff9
|
fix
|
7 years ago |
|
Dmitry Novikov
|
a61c0c1069
|
fix
|
7 years ago |
|
Dmitry Novikov
|
1f2f2bfa78
|
fix
|
7 years ago |
|
Dmitry Novikov
|
4443cea5b7
|
Merge branch 'devel' of github.com:nerosketch/djing into devel
|
7 years ago |
|
Dmitry Novikov
|
f5778b359a
|
fix device view
|
7 years ago |
|
Dmitry Novikov
|
b59521e7f6
|
fix bug
|
7 years ago |
|
Dmitry Novikov
|
c58e7ab12b
|
fix error typing
|
7 years ago |
|
Dmitry Novikov
|
efa00a9d3e
|
port list always shows, even if device is not available
|
7 years ago |
|
Dmitry Novikov
|
1c46eb39ed
|
refactoring
|
7 years ago |
|
Dmitry Novikov
|
e79e795546
|
refactoring
|
7 years ago |
|
Dmitry Novikov
|
2ac557b706
|
Fix bug
|
7 years ago |
|
Dmitry Novikov
|
2ffd970369
|
fix erro message
|
7 years ago |
|
Dmitry Novikov
|
de0bb5b9f2
|
float format for pay history
|
7 years ago |
|
Dmitry Novikov
|
c8a490b654
|
fix bug
|
7 years ago |
|
Dmitry Novikov
|
8624ab3e10
|
add task to abonapp
|
7 years ago |
|
Dmitry Novikov
|
fff6b847cf
|
Fix fin_report
|
7 years ago |
|
Dmitry Novikov
|
730ad18f00
|
fix task update bug
|
7 years ago |
|
Dmitry Novikov
|
f114848aa2
|
Fix accounts bugs
|
7 years ago |
|
Dmitry Novikov
|
74e3790508
|
Merge branch 'devel' of https://djing.git.beanstalkapp.com/djing into devel
|
7 years ago |
|
Dmitry Novikov
|
c2f49238b1
|
filter inly active admins
|
7 years ago |
|
Dmitry Novikov
|
44669c634e
|
made ping button in people list
|
7 years ago |
|
Dmitry Novikov
|
284593aa85
|
Merge branch 'devel' of https://djing.git.beanstalkapp.com/djing into devel
|
7 years ago |
|
Dmitry Novikov
|
fd3968f55d
|
make notification options
|
7 years ago |
