You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
bashmak
402737dc0f
Merge branch 'devel' into separate_network
Conflicts:
abonapp/templates/abonapp/group_list.html
abonapp/templates/abonapp/peoples.html
abonapp/views.py
agent/commands/dhcp.py
devapp/dev_types.py
devapp/templates/devapp/devices_null_group.html
djing/global_base_views.py
docs/dev.md
group_app/templates/group_app/group_list.html
Изменения, которые будут включены в коммит:
изменено: abonapp/forms.py
изменено: abonapp/templates/abonapp/group_list.html
изменено: abonapp/templates/abonapp/peoples.html
удалено: abonapp/templatetags/__init__.py
изменено: abonapp/views.py
изменено: clientsideapp/templates/clientsideapp/ext.html
изменено: devapp/dev_types.py
изменено: devapp/forms.py
изменено: devapp/models.py
изменено: devapp/templates/devapp/devices.html
изменено: devapp/templates/devapp/devices_null_group.html
изменено: devapp/templates/devapp/manage_ports/list.html
изменено: devapp/views.py
изменено: djing/fields.py
изменено: djing/global_base_views.py
изменено: djing/local_settings.py.template
изменено: djing/settings.py
переименовано: abonapp/templatetags/dpagination.py -> djing/templatetags/dpagination.py
изменено: docs/dev.md
изменено: group_app/templates/group_app/group_list.html
изменено: group_app/views.py
изменено: searchapp/views.py
изменено: tariff_app/templates/tariff_app/tarifs.html
изменено: tariff_app/views.py
Изменения, которые не в индексе для коммита:
изменено: abonapp/views.py
изменено: ip_pool/views.py
|
8 years ago |
| .. |
|
locale/ru/LC_MESSAGES
|
initial
|
8 years ago |
|
migrations
|
initial commit
|
10 years ago |
|
templates/searchapp
|
little refactoring
|
8 years ago |
|
__init__.py
|
initial commit
|
10 years ago |
|
admin.py
|
coming soon..
|
9 years ago |
|
apps.py
|
Auto reformat code
|
8 years ago |
|
models.py
|
Auto reformat code
|
8 years ago |
|
urls.py
|
Auto reformat code
|
8 years ago |
|
views.py
|
Include additional telephones to search results
|
8 years ago |