alamin
/
djing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 1333492185 fixed service buy www-data 2018-03-29 12:51:10 +0300
  • eae2c4ae31 Fix mobile view bashmak 2018-03-29 12:50:06 +0300
  • 3b11532c37 Fix type error bashmak 2018-03-28 13:58:41 +0300
  • 39f81c42a2 Merge branch 'devel' of https://github.com/nerosketch/djing into devel www-data 2018-03-28 13:09:31 +0300
  • cc0b0165cc Fix search www-data 2018-03-28 13:09:27 +0300
  • 073050320f add annotate to conversations www-data 2018-03-28 10:26:29 +0100
  • 1ae7694988 Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-03-26 18:39:41 +0300
  • 49a7078662 Username in subscriber urls instead of id bashmak 2018-03-26 18:38:48 +0300
  • bf46c634cb Merge branch 'global_group_update' into devel www-data 2018-03-26 16:17:10 +0300
  • eed7497388 fix bugs www-data 2018-03-26 16:01:47 +0300
  • 3db41d0d0a Merge branch 'global_group_update' into devel bashmak 2018-03-26 15:58:42 +0300
  • 1ee6706951 When statistics is empty then message about it instead of redirect bashmak 2018-03-26 15:57:00 +0300
  • 06987aa37b Merge branch 'devel' into global_group_update bashmak 2018-03-24 14:11:53 +0300
  • 7063332836 Merge branch 'global_group_update' of https://github.com/nerosketch/djing into global_group_update bashmak 2018-03-24 14:07:28 +0300
  • 4d6995845e fix bug bashmak 2018-03-24 14:07:06 +0300
  • 8145288824 Disable admin side by default, and fix some bugs www-data 2018-03-24 13:43:29 +0300
  • a07c75ea70 Merge branch 'global_group_update' into devel bashmak 2018-03-24 13:23:23 +0300
  • 5ad8f02839 Merge branch 'global_group_update' of https://github.com/nerosketch/djing into global_group_update www-data 2018-03-22 13:17:50 +0300
  • 2a17c75895 fix bug www-data 2018-03-22 13:16:51 +0300
  • 8694b6d237 Merge branch 'global_group_update' of https://github.com/nerosketch/djing into global_group_update www-data 2018-03-22 09:36:06 +0000
  • 7e2a690cde Fix logout url www-data 2018-03-22 09:35:39 +0000
  • 5e01803e43 fix bugs www-data 2018-03-22 12:34:31 +0300
  • 2b13fa136e Merge remote-tracking branch 'origin/global_group_update' into devel bashmak 2018-03-20 12:51:20 +0300
  • 0b555331fb Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-03-20 12:35:36 +0300
  • a26b2bcc36 Merge branch 'devel' of https://github.com/nerosketch/djing into devel www-data 2018-03-20 11:25:09 +0300
  • b51571e65f load i18n www-data 2018-03-20 11:24:38 +0300
  • e830a49731 Merge branch 'master' into devel Dmitry 2018-03-19 23:40:48 +0000
  • 91556518f3 Merge branch 'devel' into global_group_update Dmitry 2018-03-19 22:57:54 +0000
  • 7091a6a36c Merge branch 'master' into global_group_update Dmitry 2018-03-19 22:26:45 +0000
  • 2c6a79b26a refactoring bashmak 2018-03-19 13:46:37 +0300
  • fdb88b0107 fix bugs bashmak 2018-03-19 13:45:29 +0300
  • 97851d7a23 fixed bashmak 2018-03-18 19:44:38 +0300
  • e38802f244 Merge branch 'global_group_update' of https://github.com/nerosketch/djing into global_group_update bashmak 2018-03-18 13:39:53 +0300
  • 791b21ee51 Fix some bugs bashmak 2018-03-18 00:26:35 +0300
  • bcdd33ea0f Fix some bugs bashmak 2018-03-18 00:26:35 +0300
  • 81442c321d Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-03-15 19:27:15 +0300
  • 5def7b81b9 1 bashmak 2018-03-15 19:26:56 +0300
  • 884003f903 fix bugs www-data 2018-03-15 16:55:37 +0300
  • 65e2b7502d Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-03-13 12:22:19 +0300
  • 1471437d8a Add customisable pages and add somthing translates. bashmak 2018-03-13 12:15:27 +0300
  • 8c24905ed4 Merge branch 'devel' of https://github.com/nerosketch/djing into devel www-data 2018-03-11 20:43:55 +0300
  • c9ec0214ed fix bugs www-data 2018-03-11 20:42:58 +0300
  • 1915c806d1 it remains to finish the guardians bashmak 2018-03-08 17:23:26 +0300
  • ca4988896f fix bugs bashmak 2018-03-08 17:22:56 +0300
  • c83e891760 Work is still continue Dmitry 2018-03-06 23:34:32 +0000
  • 291d9d6a0d Fix when btn-modal retrn 302 and not redirected bashmak 2018-03-06 16:30:34 +0300
  • 38017de5ae make migration to version 0.2 and translate comment bashmak 2018-03-01 18:17:45 +0300
  • 00bf8459dc Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-03-01 14:55:29 +0300
  • fb5ae9af6a Fix dlink view error bashmak 2018-03-01 14:55:10 +0300
  • 17ed2fc753 fix www-data 2018-03-01 14:48:00 +0300
  • ce28b258e8 Fix bugs bashmak 2018-03-01 14:02:55 +0300
  • 980689be36
         Update views.md Дмитрий 2018-03-01 11:16:32 +0200
  • a0570849f0 Migrations script to new version from 0.1 bashmak 2018-02-28 16:12:18 +0300
  • ec776106a5
         Update install_debian.sh Дмитрий 2018-02-28 01:20:30 +0600
  • 1d86d4819b
         Update install_debian.sh Дмитрий 2018-02-28 00:55:00 +0600
  • 43ebbed5bd Fix bugs bashmak 2018-02-27 19:40:03 +0300
  • 571d1dccc6 Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-02-27 18:52:55 +0300
  • 1713beb93e Fix 404 error page when data is empty on filtering page and pagination bashmak 2018-02-27 18:52:07 +0300
  • 439e8676fd Add comment count to task list Dmitry Novikov 2018-02-27 17:29:03 +0300
  • 831f83a63d fix statistics display Dmitry Novikov 2018-02-26 15:53:56 +0300
  • b418b0c812 Fix ordering bug bashmak 2018-02-26 13:40:42 +0300
  • 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 Dmitry 2018-02-25 23:40:36 +0000
  • a34b4f12b2 Fix bug when task recipients not saves bashmak 2018-02-23 13:59:27 +0300
  • f9bf5ed958 Fix bugs Dmitry Novikov 2018-02-23 13:18:53 +0300
  • 18da20c77e Fix bug when author of task is not saved. Add to settings DEBUG directive. bashmak 2018-02-23 12:55:00 +0300
  • 2fd0d2eb9e Add install package list bashmak 2018-02-20 15:32:11 +0300
  • 0e9679119c Fix bugs bashmak 2018-02-20 00:14:35 +0300
  • eeaede4363 Make comments in tasks bashmak 2018-02-19 16:45:52 +0300
  • d079a57f82 Fix mispelled Dmitry Novikov 2018-02-19 11:49:29 +0300
  • 95bcbad04d Merge branch 'devel' of https://github.com/nerosketch/djing into devel Dmitry Novikov 2018-02-19 11:46:38 +0300
  • a41a8311a2 Redesign task list pages Dmitry Novikov 2018-02-19 11:45:44 +0300
  • 8c86e5fb9d Kicked deprecation pagination method bashmak 2018-02-15 18:26:48 +0300
  • a0feb5b574 Complete translations in app accounts_app bashmak 2018-02-15 15:21:07 +0300
  • c5bb870fe7 Kicked old deprecated mydefs.order_helper function bashmak 2018-02-15 14:41:01 +0300
  • 7528f1818a Add button to view subscribers on device port bashmak 2018-02-14 16:04:42 +0300
  • 75d7524060 fix locale bashmak 2018-02-14 14:20:16 +0300
  • feb0fd2cda Display flags in userlist bashmak 2018-02-14 13:42:15 +0300
  • bb57557997 New feauture: User flags. You may mark each user for multiple flags. bashmak 2018-02-13 18:02:00 +0300
  • bfe17719d3 Refactoring listed views to ClassBasedViews bashmak 2018-02-09 17:10:41 +0300
  • 6e6c989691 Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-02-09 16:50:15 +0300
  • 54671ca680 Refactoring function views to ClassBasedViews bashmak 2018-02-09 16:49:10 +0300
  • 23ff9a069a Rename toolbar_bage_cbv.html to pagination. bashmak 2018-02-09 13:15:15 +0300
  • d4679b88ea Merge branch 'devel' of https://github.com/nerosketch/djing into devel Dmitry Novikov 2018-02-09 11:12:27 +0300
  • ae9da90cbc Fix misprint and fix result text Dmitry Novikov 2018-02-09 11:10:42 +0300
  • 66438d1b1b Refactoring abonapp.views.grouplist from function view to ClassBasedView bashmak 2018-02-07 23:02:30 +0300
  • 3ab48e8a19 Refactoring abonapp.views.peoples from function view to ClassBasedView bashmak 2018-02-07 22:47:53 +0300
  • ee31263323 Merge branch 'devel' of https://github.com/nerosketch/djing into devel Dmitry Novikov 2018-02-07 16:10:49 +0300
  • 28024ec7ef fix Dmitry Novikov 2018-02-07 16:10:42 +0300
  • 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 bashmak 2018-02-07 16:07:38 +0300
  • 954780f384 Fix bugs Dmitry Novikov 2018-02-05 16:33:32 +0300
  • 4a6a8a75c6 Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-01-29 16:42:14 +0300
  • 4b23271822 Enable admin and some bugs fixes Dmitry Novikov 2018-01-29 16:34:08 +0300
  • ffc5a6d5ac Multiple changes: 1) Makes mixin for API views. 2) Makes device monitoring notification. And little bit fixes bashmak 2018-01-29 16:32:32 +0300
  • a2066f5104 Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-01-26 19:37:05 +0300
  • a0890ebb18 add logging to cron.py when users services is expired bashmak 2018-01-26 19:36:03 +0300
  • e8efa2be59 fix Dmitry Novikov 2018-01-26 19:34:15 +0300
  • 96ccd6e231 Fix importing when changed settings path Dmitry Novikov 2018-01-23 17:14:06 +0300
  • ad7799bf39 Fix database error bashmak 2018-01-23 13:57:56 +0300
  • f637233659 Fix translations. Fix raising error dialog when session is expired Dmitry Novikov 2018-01-23 12:19:44 +0300
  • 3a16578491 Merge branch 'devel' of https://github.com/nerosketch/djing into devel bashmak 2018-01-22 19:31:05 +0300