djing

Commit Graph

Author	SHA1	Message	Date
bashmak	43ebbed5bd	Fix bugs	8 years ago
Dmitry	8396561bb8	На ветке global_group_update Изменения, которые будут включены в коммит: изменено: abonapp/admin.py изменено: abonapp/forms.py изменено: abonapp/locale/ru/LC_MESSAGES/django.po переименовано: abonapp/migrations/0001_squashed_0022_auto_20170816_1109.py -> abonapp/migrations/0001_initial.py удалено: abonapp/migrations/0002_auto_20170905_1248.py удалено: abonapp/migrations/0003_auto_20170927_1838.py удалено: abonapp/migrations/0004_auto_20180122_1732.py удалено: abonapp/migrations/0005_auto_20180123_1353.py удалено: abonapp/migrations/0006_abon_markers.py изменено: abonapp/models.py изменено: abonapp/templates/abonapp/addAbon.html удалено: abonapp/templates/abonapp/addGroup.html изменено: abonapp/templates/abonapp/addInvoice.html изменено: abonapp/templates/abonapp/buy_tariff.html изменено: abonapp/templates/abonapp/charts.html изменено: abonapp/templates/abonapp/editAbon.html изменено: abonapp/templates/abonapp/ext.htm изменено: abonapp/templates/abonapp/group_list.html изменено: abonapp/templates/abonapp/group_tariffs.html изменено: abonapp/templates/abonapp/invoiceForPayment.html изменено: abonapp/templates/abonapp/modal_abonamount.html изменено: abonapp/templates/abonapp/passport_view.html изменено: abonapp/templates/abonapp/payHistory.html изменено: abonapp/templates/abonapp/peoples.html изменено: abonapp/templates/abonapp/service.html изменено: abonapp/urls.py изменено: abonapp/views.py изменено: accounts_app/migrations/0001_initial.py удалено: accounts_app/migrations/0002_userprofile_email.py удалено: accounts_app/migrations/0003_auto_20161206_2135.py удалено: accounts_app/migrations/0004_auto_20170128_1316.py удалено: accounts_app/migrations/0005_auto_20170222_2224.py удалено: accounts_app/migrations/0006_auto_20170416_1029.py удалено: accounts_app/migrations/0007_auto_20170816_1109.py удалено: accounts_app/migrations/0008_auto_20170927_1838.py изменено: accounts_app/models.py изменено: accounts_app/templates/accounts/create_acc.html изменено: accounts_app/templates/accounts/profile_chgroup.html изменено: accounts_app/templates/accounts/set_abon_groups_permission.html изменено: accounts_app/views.py изменено: agent/commands/dhcp.py изменено: chatbot/migrations/0001_initial.py удалено: chatbot/migrations/0002_auto_20171214_1517.py изменено: clientsideapp/views.py изменено: devapp/forms.py изменено: devapp/locale/ru/LC_MESSAGES/django.po новый файл: devapp/migrations/0001_initial.py удалено: devapp/migrations/0001_squashed_0007_auto_20170816_1109.py удалено: devapp/migrations/0002_device_user_group.py удалено: devapp/migrations/0003_auto_20170927_1838.py удалено: devapp/migrations/0004_auto_20171103_0006.py удалено: devapp/migrations/0005_device_snmp_item_num.py удалено: devapp/migrations/0006_auto_20180129_1625.py изменено: devapp/models.py изменено: devapp/templates/devapp/add_dev.html изменено: devapp/templates/devapp/custom_dev_page/olt.html изменено: devapp/templates/devapp/custom_dev_page/onu.html изменено: devapp/templates/devapp/custom_dev_page/ports.html изменено: devapp/templates/devapp/dev.html изменено: devapp/templates/devapp/devices.html изменено: devapp/templates/devapp/devices_null_group.html изменено: devapp/templates/devapp/ext.htm изменено: devapp/templates/devapp/fix_dev_group.html изменено: devapp/templates/devapp/group_list.html изменено: devapp/templates/devapp/manage_ports/add_ports.html изменено: devapp/templates/devapp/manage_ports/fix_abon_device.html изменено: devapp/templates/devapp/manage_ports/list.html изменено: devapp/views.py изменено: dialing_app/migrations/0001_initial.py удалено: dialing_app/migrations/0002_auto_20171229_1353.py удалено: dialing_app/migrations/0003_smsout.py изменено: dialing_app/views.py изменено: djing/settings.py изменено: djing/urls.py новый файл: group_app/__init__.py новый файл: group_app/admin.py новый файл: group_app/apps.py новый файл: group_app/forms.py новый файл: group_app/locale/ru/LC_MESSAGES/django.po новый файл: group_app/migrations/0001_initial.py новый файл: group_app/migrations/__init__.py новый файл: group_app/models.py новый файл: group_app/templates/group_app/add_group.html новый файл: group_app/templates/group_app/edit_group.html новый файл: group_app/templates/group_app/ext.html новый файл: group_app/templates/group_app/group_list.html новый файл: group_app/tests.py новый файл: group_app/urls.py новый файл: group_app/views.py изменено: locale/ru/LC_MESSAGES/django.po изменено: mapapp/migrations/0001_initial.py удалено: mapapp/migrations/0002_auto_20171103_0006.py изменено: mapapp/templates/maps/dot.html изменено: mapapp/templates/maps/map_tooltip.html изменено: mapapp/templates/maps/ya_index.html изменено: mapapp/views.py изменено: msg_app/migrations/0001_initial.py изменено: photo_app/migrations/0001_initial.py переименовано: statistics/migrations/0002_statcache.py -> statistics/migrations/0001_initial.py изменено: tariff_app/migrations/0001_initial.py удалено: tariff_app/migrations/0002_tariff_descr.py удалено: tariff_app/migrations/0003_tariff_is_admin.py удалено: tariff_app/migrations/0004_auto_20170416_0350.py удалено: tariff_app/migrations/0005_auto_20170502_2229.py удалено: tariff_app/migrations/0006_auto_20180122_1732.py удалено: tariff_app/migrations/0007_auto_20180215_1423.py изменено: tariff_app/models.py изменено: tariff_app/templates/tariff_app/tarifs.html изменено: taskapp/forms.py изменено: taskapp/migrations/0001_initial.py удалено: taskapp/migrations/0001_squashed_0015_auto_20170816_1109.py удалено: taskapp/migrations/0002_auto_20161006_0027.py удалено: taskapp/migrations/0002_auto_20180219_1255.py удалено: taskapp/migrations/0003_auto_20161130_1815.py удалено: taskapp/migrations/0004_auto_20161202_1230.py удалено: taskapp/migrations/0005_auto_20161206_0013.py удалено: taskapp/migrations/0006_auto_20161206_2135.py удалено: taskapp/migrations/0007_auto_20161206_2303.py удалено: taskapp/migrations/0008_auto_20161213_1932.py удалено: taskapp/migrations/0009_auto_20161216_2214.py удалено: taskapp/migrations/0010_auto.py удалено: taskapp/migrations/0011_auto_20170116_0126.py удалено: taskapp/migrations/0012_auto_20170407_0124.py удалено: taskapp/migrations/0013_auto_20170413_1944.py удалено: taskapp/migrations/0014_auto_20170416_1029.py удалено: taskapp/migrations/0015_auto_20170816_1109.py изменено: templates/base.html	8 years ago
bashmak	a34b4f12b2	Fix bug when task recipients not saves	8 years ago
Dmitry Novikov	f9bf5ed958	Fix bugs	8 years ago
bashmak	18da20c77e	Fix bug when author of task is not saved. Add to settings DEBUG directive.	8 years ago
bashmak	2fd0d2eb9e	Add install package list	8 years ago
bashmak	0e9679119c	Fix bugs	8 years ago
bashmak	eeaede4363	Make comments in tasks	8 years ago
Dmitry Novikov	d079a57f82	Fix mispelled	8 years ago
Dmitry Novikov	95bcbad04d	Merge branch 'devel' of https://github.com/nerosketch/djing into devel	8 years ago
Dmitry Novikov	a41a8311a2	Redesign task list pages	8 years ago
bashmak	8c86e5fb9d	Kicked deprecation pagination method	8 years ago
bashmak	a0feb5b574	Complete translations in app accounts_app	8 years ago
bashmak	c5bb870fe7	Kicked old deprecated mydefs.order_helper function	8 years ago
bashmak	7528f1818a	Add button to view subscribers on device port	8 years ago
bashmak	75d7524060	fix locale	8 years ago
bashmak	feb0fd2cda	Display flags in userlist	8 years ago
bashmak	bb57557997	New feauture: User flags. You may mark each user for multiple flags.	8 years ago
bashmak	bfe17719d3	Refactoring listed views to ClassBasedViews	8 years ago
bashmak	6e6c989691	Merge branch 'devel' of https://github.com/nerosketch/djing into devel	8 years ago
bashmak	54671ca680	Refactoring function views to ClassBasedViews	8 years ago
bashmak	23ff9a069a	Rename toolbar_bage_cbv.html to pagination.	8 years ago
Dmitry Novikov	d4679b88ea	Merge branch 'devel' of https://github.com/nerosketch/djing into devel	8 years ago
Dmitry Novikov	ae9da90cbc	Fix misprint and fix result text	8 years ago
bashmak	66438d1b1b	Refactoring abonapp.views.grouplist from function view to ClassBasedView	8 years ago
bashmak	3ab48e8a19	Refactoring abonapp.views.peoples from function view to ClassBasedView	8 years ago
Dmitry Novikov	ee31263323	Merge branch 'devel' of https://github.com/nerosketch/djing into devel	8 years ago
Dmitry Novikov	28024ec7ef	fix	8 years ago
bashmak	dc2a8cb462	Refactoring vedapp.views.devices view to ClassBasedView. Also add OrderingMixin for ordering. And update ordering template. Changed files in commit changed: README.md changed: devapp/templates/devapp/devices.html changed: devapp/urls.py changed: devapp/views.py changed: djing/global_base_views.py new file: docs/img/pagination.png new file: docs/views.md changed: mydefs.py new file: templates/toolbar_page_cbv.html	8 years ago
Dmitry Novikov	954780f384	Fix bugs	8 years ago
bashmak	4a6a8a75c6	Merge branch 'devel' of https://github.com/nerosketch/djing into devel # Conflicts: # devapp/locale/ru/LC_MESSAGES/django.po # devapp/views.py	8 years ago
Dmitry Novikov	4b23271822	Enable admin and some bugs fixes	8 years ago
bashmak	ffc5a6d5ac	Multiple changes: 1) Makes mixin for API views. 2) Makes device monitoring notification. And little bit fixes	8 years ago
bashmak	a2066f5104	Merge branch 'devel' of https://github.com/nerosketch/djing into devel	8 years ago
bashmak	a0890ebb18	add logging to cron.py when users services is expired	8 years ago
Dmitry Novikov	e8efa2be59	fix	8 years ago
Dmitry Novikov	96ccd6e231	Fix importing when changed settings path	8 years ago
bashmak	ad7799bf39	Fix database error	8 years ago
Dmitry Novikov	f637233659	Fix translations. Fix raising error dialog when session is expired	8 years ago
bashmak	3a16578491	Merge branch 'devel' of https://github.com/nerosketch/djing into devel # Conflicts: # abonapp/forms.py # abonapp/locale/ru/LC_MESSAGES/django.po # abonapp/models.py	8 years ago
bashmak	62c3aa8118	1) Maked periodic pays. 2) Settings reformat. 3) more logs	8 years ago
nerosketch	f975750abc	Merge branch 'devel' of https://github.com/nerosketch/djing into devel	8 years ago
nerosketch	16ba530adc	fix	8 years ago
Dmitry Novikov	bf7c175c95	Merge branch 'devel' of https://github.com/nerosketch/djing into devel	8 years ago
Dmitry Novikov	387ec969cc	fix	8 years ago
nerosketch	21b1da970e	Did functionality to export subscribers to csv	8 years ago
Dmitry Novikov	9b7791a562	Merge branch 'devel' of https://github.com/nerosketch/djing into devel , для объяснения, зачем нужно	8 years ago
Dmitry Novikov	3ce2b2b25a	fix bugs	8 years ago
Dmitry Novikov	35a10c5336	fix bugs	8 years ago
bashmak	aac17dfd95	prepare to migrate to Django 1.11	8 years ago

1 2 3 4 5 ...

1066 Commits (43ebbed5bd3f32e366d946e65f76618cc91a99fb) All Branches Search

1066 Commits (43ebbed5bd3f32e366d946e65f76618cc91a99fb)

All Branches