bashmak
|
ac78a64c8b
|
Merge branch 'devel' into separate_network
|
8 years ago |
|
bashmak
|
dcf4380d5f
|
Implement ip leases management
|
8 years ago |
|
bashmak
|
95544f36e5
|
Not refreshing ip if ip is dynamic
|
8 years ago |
|
bashmak
|
387558544c
|
Add support different dhcp devices in same group
|
8 years ago |
www-data
|
5c9e7220fc
|
Fix
|
8 years ago |
|
bashmak
|
1f4175736d
|
simple refactoring
|
8 years ago |
|
bashmak
|
5962b803f1
|
Merge branch 'devel' of github.com:nerosketch/djing into devel
|
8 years ago |
|
bashmak
|
ba5701b54e
|
fix
|
8 years ago |
|
bashmak
|
0b4427096f
|
fix
|
8 years ago |
|
bashmak
|
6c7e76fdb1
|
fix onu save to isc dhcp server config
|
8 years ago |
|
bashmak
|
20165ee538
|
Fix user removing
|
8 years ago |
|
bashmak
|
47c4086766
|
Fix search
|
8 years ago |
|
bashmak
|
a4d914c7f2
|
Make metaclass for lazy init objects
|
8 years ago |
|
bashmak
|
275d09293d
|
Make form in amount money page
|
8 years ago |
|
bashmak
|
5918032860
|
Find also by additional telephones
|
8 years ago |
|
bashmak
|
a564506f75
|
Add comment to payment
|
8 years ago |
nerosketch
|
d8332692e3
|
fix
|
8 years ago |
|
bashmak
|
0f569a6da4
|
Fix management ip lease
|
8 years ago |
|
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 |
|
bashmak
|
6b7abe9f0a
|
Fix bugs in nas in subscribers management
|
8 years ago |
|
bashmak
|
afda2c2b03
|
Fix
|
8 years ago |
|
bashmak
|
9ce218fe0c
|
Move comment from value to placeholder in HTML form
|
8 years ago |
|
bashmak
|
e7b1413800
|
Include additional telephones to search results
|
8 years ago |
|
bashmak
|
9b2fece608
|
little refactoring
|
8 years ago |
|
bashmak
|
7b36eb5538
|
remove extra field
|
8 years ago |
|
bashmak
|
9b2c1171a6
|
Fix ordering
|
8 years ago |
|
bashmak
|
1b736e23ab
|
Fix bugs
|
8 years ago |
|
bashmak
|
b3e621d49d
|
litte bit refactoring
|
8 years ago |
|
bashmak
|
9894968e9b
|
Add validation to networks form
|
8 years ago |
|
bashmak
|
fdfd085cbe
|
Add tabs for different networks types. And add validate mask in create form
|
8 years ago |
|
bashmak
|
a768482912
|
little bit refactoring
|
8 years ago |
|
bashmak
|
904ba0b59d
|
simple refactoring
|
8 years ago |
|
bashmak
|
bb0eeb82b7
|
remove duplicated pagination in pages
|
8 years ago |
|
bashmak
|
22b1b8e830
|
fix generate_random_chars function
|
8 years ago |
|
bashmak
|
5c5630adc1
|
Fix init device types
|
8 years ago |
|
nerosketch
|
f681096bb2
|
refactoring nas manager
|
8 years ago |
|
bashmak
|
5b2f56f08c
|
initial
|
8 years ago |
|
bashmak
|
9f03e88d44
|
Merge branch 'devel' of github.com:nerosketch/djing into devel
|
8 years ago |
|
bashmak
|
e31470aab0
|
Fix registrating ZTE ONU
|
8 years ago |
|
www-data
|
2794789fe9
|
fix
|
8 years ago |
|
bashmak
|
bd498d6f11
|
take parent device info if self is empty
|
8 years ago |
|
Дмитрий
|
bc2a87dd30
|
Update downloader.py
|
8 years ago |
|
bashmak
|
17a5088990
|
Add little bit tests
|
8 years ago |
|
bashmak
|
75536ecec1
|
Make extra data field for store custom data
|
8 years ago |
|
bashmak
|
35d5ca503e
|
One single language, disabled switching beetween languages
|
8 years ago |
|
bashmak
|
8a46a4c55a
|
fix signal view
|
8 years ago |
|
bashmak
|
37ae0636ab
|
fix
|
8 years ago |
|
bashmak
|
d033dbf8d8
|
Make registration button
|
8 years ago |
|
bashmak
|
5036761058
|
fix template generation for monitoring
|
8 years ago |
|
bashmak
|
78e9d951cf
|
Fix creating device.
|
8 years ago |
