489 lines
33 KiB
Plaintext
489 lines
33 KiB
Plaintext
Anton Romanov;Thu Mar 15 11:10:34 2018 +0400;change to date time
|
||
romanov73;Thu Mar 15 11:03:19 2018 +0400;read commits in constructor
|
||
romanov73;Thu Mar 15 09:12:07 2018 +0400;add commits page
|
||
Romanov Anton;Wed Mar 14 20:26:54 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 20:16:53 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 20:08:09 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 20:00:58 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 19:50:22 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 19:34:17 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 19:20:42 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:59:18 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:47:17 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:35:37 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:33:54 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:29:27 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:21:18 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:19:27 2018 +0000;Update README.md
|
||
Romanov Anton;Wed Mar 14 18:16:06 2018 +0000;Update README.md
|
||
romanov73;Wed Mar 14 21:28:10 2018 +0400;fix using constant
|
||
Aleksey Filippov;Wed Mar 14 20:07:25 2018 +0400;some fixes after merge
|
||
Aleksey Filippov;Wed Mar 14 19:52:45 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into odin-ui
|
||
Aleksey Filippov;Wed Mar 14 19:48:45 2018 +0400;refactoring of odin paginator
|
||
romanov73;Wed Mar 14 18:43:16 2018 +0400;Merge branch 'develop' into 36-rest
|
||
romanov73;Wed Mar 14 18:17:02 2018 +0400;Merge branch 'develop' into 36-rest
|
||
Aleksey Filippov;Wed Mar 14 18:11:00 2018 +0400;fix null value check in formatter
|
||
Aleksey Filippov;Wed Mar 14 18:06:16 2018 +0400;fix odin paginator style, fix odin negative file
|
||
romanov73;Wed Mar 14 18:04:47 2018 +0400;rename entities
|
||
Aleksey Filippov;Wed Mar 14 17:58:59 2018 +0400;improve odin table look
|
||
romanov73;Wed Mar 14 17:47:45 2018 +0400;fix db changelogs
|
||
romanov73;Wed Mar 14 17:47:20 2018 +0400;fix db changelogs
|
||
Gleb;Wed Mar 14 08:50:23 2018 +0000;Merge branch '48-' into 'develop'
|
||
funny73;Wed Mar 14 12:28:55 2018 +0400;Поправил отображение подразделения при редактировании смены
|
||
Aleksey Filippov;Wed Mar 14 00:02:24 2018 +0400;move navbar to the left, move odin css to separate file
|
||
Aleksey Filippov;Tue Mar 13 23:26:33 2018 +0400;some style fixes
|
||
Aleksey Filippov;Tue Mar 13 23:22:37 2018 +0400;move version panel to navbar
|
||
funny73;Tue Mar 13 20:41:41 2018 +0400;Поправил валидацию сменности
|
||
romanov73;Tue Mar 13 17:26:54 2018 +0400;fix offsetable page request
|
||
romanov73;Tue Mar 13 17:26:02 2018 +0400;fix table constructor
|
||
romanov73;Tue Mar 13 17:24:56 2018 +0400;fix checking empty value
|
||
Romanov Anton;Tue Mar 13 13:09:41 2018 +0000;Merge branch 'odin-ui' into '36-rest'
|
||
Aleksey Filippov;Tue Mar 13 16:59:27 2018 +0400;notes updated
|
||
Aleksey Filippov;Tue Mar 13 16:56:00 2018 +0400;odin refactoring
|
||
Aleksey Filippov;Tue Mar 13 16:53:38 2018 +0400;odin refactoring
|
||
romanov73;Tue Mar 13 15:27:17 2018 +0400;fix tool load calc
|
||
romanov73;Tue Mar 13 14:46:46 2018 +0400;fix area load calc
|
||
Aleksey Filippov;Tue Mar 13 13:38:23 2018 +0400;some fixes
|
||
romanov73;Tue Mar 13 13:33:25 2018 +0400;Merge remote-tracking branch 'origin/develop' into develop
|
||
romanov73;Tue Mar 13 13:33:07 2018 +0400;fix tools count calc
|
||
Aleksey Filippov;Tue Mar 13 13:12:09 2018 +0400;some odin refactoring
|
||
Aleksey Filippov;Tue Mar 13 13:11:41 2018 +0400;some offsetablepagerequest fix
|
||
Aleksey Filippov;Tue Mar 13 13:06:48 2018 +0400;add offsetablepagerequest
|
||
Aleksey Filippov;Tue Mar 13 07:27:12 2018 +0000;Merge branch '51-rest-points' into '36-rest'
|
||
romanov73;Tue Mar 13 11:22:02 2018 +0400;fix by comment: remove default version id
|
||
romanov73;Tue Mar 13 00:04:50 2018 +0400;fix path
|
||
romanov73;Mon Mar 12 23:55:05 2018 +0400;add tool square dictionary
|
||
romanov73;Mon Mar 12 23:36:49 2018 +0400;add dictionary pages
|
||
romanov73;Mon Mar 12 23:18:01 2018 +0400;sort second level menu items by name
|
||
romanov73;Mon Mar 12 23:11:22 2018 +0400;fix menu
|
||
romanov73;Mon Mar 12 22:52:15 2018 +0400;add stream api utils and converter for "map ... collect"
|
||
funny73;Mon Mar 12 20:01:47 2018 +0400;Добавил свойство базового изделия для изделия
|
||
romanov73;Mon Mar 12 19:46:52 2018 +0400;refactor units
|
||
romanov73;Mon Mar 12 19:36:57 2018 +0400;refactor tool types and work types
|
||
romanov73;Mon Mar 12 19:20:23 2018 +0400;refactor tools
|
||
romanov73;Mon Mar 12 19:07:09 2018 +0400;refactor stages
|
||
romanov73;Mon Mar 12 18:53:26 2018 +0400;refactor positions
|
||
romanov73;Mon Mar 12 18:27:36 2018 +0400;refactor employees
|
||
romanov73;Mon Mar 12 18:26:49 2018 +0400;refactor employees
|
||
romanov73;Mon Mar 12 18:09:38 2018 +0400;refactor categories
|
||
Aleksey Filippov;Mon Mar 12 17:32:06 2018 +0400;todo added
|
||
Aleksey Filippov;Mon Mar 12 17:29:51 2018 +0400;paginator added to odin
|
||
Aleksey Filippov;Mon Mar 12 17:29:06 2018 +0400;notes updated
|
||
funny73;Mon Mar 12 16:29:13 2018 +0400;Добавил сущность изделие без привязки к производственной программе
|
||
funny73;Mon Mar 12 15:16:35 2018 +0400;Переименовал сущность Product на ProductOnProgram Ещё немного переименования
|
||
funny73;Mon Mar 12 14:39:52 2018 +0400;Переименовал сущность Product на ProductOnProgram
|
||
Aleksey Filippov;Mon Mar 12 13:44:42 2018 +0400;add formatters and initial form support to odin
|
||
Aleksey Filippov;Mon Mar 12 13:44:16 2018 +0400;userlistdto refactoring
|
||
Aleksey Filippov;Mon Mar 12 13:43:59 2018 +0400;dateutils improvements
|
||
Aleksey Filippov;Mon Mar 12 13:43:43 2018 +0400;add support of localdatetime type to odin
|
||
Aleksey Filippov;Mon Mar 12 13:42:54 2018 +0400;odin backend example added
|
||
Aleksey Filippov;Mon Mar 12 13:42:12 2018 +0400;notes updated
|
||
funny73;Mon Mar 12 12:16:02 2018 +0400;Поправил всплывающие сообщения при работе с "Категориями"
|
||
Aleksey Filippov;Mon Mar 12 11:25:51 2018 +0400;some refactoring
|
||
Aleksey Filippov;Mon Mar 12 11:25:30 2018 +0400;odinid annotation added
|
||
Aleksey Filippov;Sun Mar 11 15:23:49 2018 +0400;notes updated
|
||
Aleksey Filippov;Sun Mar 11 15:18:45 2018 +0400;some fixes
|
||
Aleksey Filippov;Sun Mar 11 15:09:57 2018 +0400;simple table draw support added, some refactoring
|
||
Aleksey Filippov;Sun Mar 11 15:08:22 2018 +0400;add user id field to userlistdto
|
||
Aleksey Filippov;Sun Mar 11 14:32:50 2018 +0400;add jsonproperty annotation support
|
||
Aleksey Filippov;Sun Mar 11 13:38:45 2018 +0400;some template fixes
|
||
Aleksey Filippov;Sun Mar 11 13:33:09 2018 +0400;some balance page fixes
|
||
Aleksey Filippov;Sun Mar 11 13:25:58 2018 +0400;add jsonignore annotation support
|
||
Aleksey Filippov;Thu Mar 8 14:16:20 2018 +0400;some odin improvements
|
||
Aleksey Filippov;Wed Mar 7 16:03:04 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
Aleksey Filippov;Wed Mar 7 16:01:21 2018 +0400;odin submodule for basic types added, some refactoring
|
||
romanov73;Tue Mar 6 22:52:02 2018 +0400;remove old packages
|
||
romanov73;Tue Mar 6 19:12:27 2018 +0400;add tool type crud
|
||
romanov73;Tue Mar 6 13:09:51 2018 +0400;add version crud
|
||
romanov73;Tue Mar 6 10:48:36 2018 +0400;add unit crud
|
||
romanov73;Mon Mar 5 16:58:37 2018 +0400;fix tree
|
||
romanov73;Mon Mar 5 16:38:37 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
romanov73;Mon Mar 5 16:38:21 2018 +0400;employee crud
|
||
Aleksey Filippov;Mon Mar 5 15:43:49 2018 +0400;some fixes
|
||
Aleksey Filippov;Mon Mar 5 15:39:53 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
Aleksey Filippov;Mon Mar 5 15:39:33 2018 +0400;user reset password function added, some refactoring
|
||
romanov73;Mon Mar 5 15:29:16 2018 +0400;fix delete category
|
||
Aleksey Filippov;Mon Mar 5 15:08:27 2018 +0400;user change password function added, some refactoring
|
||
romanov73;Mon Mar 5 15:08:17 2018 +0400;add category crud
|
||
romanov73;Mon Mar 5 14:07:10 2018 +0400;add tree component
|
||
Aleksey Filippov;Mon Mar 5 11:30:22 2018 +0400;user delete function added, some refactoring
|
||
Aleksey Filippov;Mon Mar 5 11:18:23 2018 +0400;user update function added
|
||
Aleksey Filippov;Mon Mar 5 11:18:06 2018 +0400;some refactoring
|
||
Aleksey Filippov;Mon Mar 5 10:06:04 2018 +0400;add user activation function
|
||
Aleksey Filippov;Mon Mar 5 09:48:22 2018 +0400;add scheduler for users
|
||
Aleksey Filippov;Mon Mar 5 09:48:07 2018 +0400;add activateddate field to userentity
|
||
Aleksey Filippov;Mon Mar 5 09:47:25 2018 +0400;notes file updated
|
||
Aleksey Filippov;Mon Mar 5 09:47:11 2018 +0400;some refactoring
|
||
Aleksey Filippov;Mon Mar 5 09:21:49 2018 +0400;thymeleaf cache settings added
|
||
Aleksey Filippov;Mon Mar 5 09:21:11 2018 +0400;notes file added
|
||
Aleksey Filippov;Mon Mar 5 09:20:57 2018 +0400;some refactoring
|
||
Aleksey Filippov;Mon Mar 5 08:37:01 2018 +0400;some refactoring
|
||
romanov73;Mon Mar 5 00:08:02 2018 +0400;add callbacks on version getters
|
||
romanov73;Mon Mar 5 00:07:34 2018 +0400;fix npe
|
||
romanov73;Sun Mar 4 01:13:57 2018 +0400;fix column style
|
||
romanov73;Sun Mar 4 01:06:38 2018 +0400;fix table style
|
||
romanov73;Sun Mar 4 00:27:14 2018 +0400;add balance dto + draw employee balance
|
||
romanov73;Sat Mar 3 22:43:06 2018 +0400;add balance services
|
||
romanov73;Sat Mar 3 16:31:19 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
romanov73;Sat Mar 3 16:31:04 2018 +0400;add employee balance table
|
||
Aleksey Filippov;Sat Mar 3 15:54:23 2018 +0400;some user support improvements
|
||
Aleksey Filippov;Sat Mar 3 15:53:20 2018 +0400;edit migration files, need manual fix of databasechangelog table
|
||
Aleksey Filippov;Sat Mar 3 15:51:58 2018 +0400;add application properties handler
|
||
Aleksey Filippov;Sat Mar 3 15:51:19 2018 +0400;disable tests
|
||
Aleksey Filippov;Sat Mar 3 13:49:32 2018 +0400;some refactoring
|
||
romanov73;Fri Mar 2 18:10:23 2018 +0400;add balance page
|
||
Aleksey Filippov;Fri Mar 2 18:04:39 2018 +0400;some refactoring
|
||
Aleksey Filippov;Fri Mar 2 17:51:41 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
Aleksey Filippov;Fri Mar 2 17:50:59 2018 +0400;advicecontroller improvements
|
||
Aleksey Filippov;Fri Mar 2 17:50:39 2018 +0400;some mvc improvements
|
||
romanov73;Fri Mar 2 15:15:46 2018 +0400;add dtos
|
||
romanov73;Fri Mar 2 15:02:38 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
Aleksey Filippov;Fri Mar 2 14:54:33 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
Aleksey Filippov;Fri Mar 2 14:53:39 2018 +0400;add migrations
|
||
Aleksey Filippov;Fri Mar 2 14:53:30 2018 +0400;some core improvements
|
||
Aleksey Filippov;Fri Mar 2 14:53:13 2018 +0400;some users improvements
|
||
romanov73;Fri Mar 2 12:42:54 2018 +0400;add category service
|
||
romanov73;Fri Mar 2 12:37:51 2018 +0400;fix unit service
|
||
romanov73;Fri Mar 2 11:24:11 2018 +0400;add unit controller
|
||
romanov73;Thu Mar 1 23:19:42 2018 +0400;fix versions panel
|
||
romanov73;Thu Mar 1 22:50:57 2018 +0400;Merge branch 'develop' into 36-rest
|
||
romanov73;Thu Mar 1 22:50:37 2018 +0400;Merge branch 'develop' into 36-rest
|
||
Romanov Anton;Thu Mar 1 18:31:03 2018 +0000;Merge branch '29-' into 'develop'
|
||
romanov73;Thu Mar 1 22:25:49 2018 +0400;change versions
|
||
romanov73;Thu Mar 1 20:14:22 2018 +0400;show version select
|
||
romanov73;Thu Mar 1 19:56:24 2018 +0400;add old models, add versions controller
|
||
romanov73;Thu Mar 1 19:55:59 2018 +0400;add old models, add versions controller
|
||
romanov73;Thu Mar 1 19:04:47 2018 +0400;save menu to session
|
||
romanov73;Thu Mar 1 18:50:00 2018 +0400;add favicon
|
||
funny73;Thu Mar 1 18:01:43 2018 +0400;1) Поправил имена колонок и таблицы для смен под постгрес 2) Исправил ошибку в имени переменной thidShift ->thirdShift
|
||
romanov73;Thu Mar 1 16:03:03 2018 +0400;add menu and restore changelogs
|
||
funny73;Thu Mar 1 15:33:36 2018 +0400;Добавил распорядок смен для каждого подразделения. Смена назначается на месяц. Есть возможность сохранить любой вариант комбинирования 1,2 и 3 смены. Например (1,3); (2); ()... Добавлен интерфейс для просмотра и редактирования распорядка смен по каждому подразделению. Добавлена валидация - для каждого месяца может быть только один распорядок смен.
|
||
Aleksey Filippov;Thu Mar 1 15:23:06 2018 +0400;migrate to webjars
|
||
Aleksey Filippov;Thu Mar 1 13:31:16 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
Aleksey Filippov;Thu Mar 1 13:30:55 2018 +0400;create migrations for user models
|
||
Aleksey Filippov;Thu Mar 1 13:30:09 2018 +0400;old code refactoring
|
||
romanov73;Thu Mar 1 12:51:14 2018 +0400;add basic menu from rest
|
||
romanov73;Thu Mar 1 11:51:17 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
romanov73;Thu Mar 1 11:50:59 2018 +0400;try to fix ci: 3 remove tests
|
||
Aleksey Filippov;Thu Mar 1 11:50:25 2018 +0400;Merge remote-tracking branch 'origin/36-rest' into 36-rest
|
||
Aleksey Filippov;Thu Mar 1 11:49:59 2018 +0400;moved to new database
|
||
romanov73;Thu Mar 1 11:45:40 2018 +0400;try to fix ci: 2 change image
|
||
romanov73;Thu Mar 1 11:44:42 2018 +0400;try to fix ci: 1
|
||
romanov73;Thu Mar 1 11:15:52 2018 +0400;fix csrf tokens
|
||
Aleksey Filippov;Thu Mar 1 00:25:43 2018 +0400;initial user management support added
|
||
romanov73;Wed Feb 28 22:26:00 2018 +0400;save current version in local storage
|
||
romanov73;Wed Feb 28 18:40:57 2018 +0400;add ajax datatable
|
||
romanov73;Wed Feb 28 18:01:23 2018 +0400;add static index page with menu
|
||
Romanov Anton;Tue Feb 27 16:53:04 2018 +0000;Merge branch '33-' into 'develop'
|
||
romanov73;Tue Feb 27 20:50:44 2018 +0400;calc area balance
|
||
romanov73;Tue Feb 27 17:36:31 2018 +0400;remove unused panel
|
||
Romanov Anton;Tue Feb 27 13:06:02 2018 +0000;Merge branch '32-' into 'develop'
|
||
romanov73;Tue Feb 27 17:02:35 2018 +0400;calc tool balance
|
||
romanov73;Tue Feb 27 15:45:39 2018 +0400;calc tool balance
|
||
romanov73;Tue Feb 27 12:16:41 2018 +0400;calc tool power
|
||
romanov73;Tue Feb 27 11:40:59 2018 +0400;use tool types in dto
|
||
romanov73;Tue Feb 27 11:29:05 2018 +0400;fix dtos
|
||
romanov73;Mon Feb 26 23:50:53 2018 +0400;inherit dtos
|
||
romanov73;Mon Feb 26 15:38:00 2018 +0400;fix services for balance calculation
|
||
Aleksey Filippov;Mon Feb 26 15:00:48 2018 +0400;move from maven to gradle, move from javaee to spring boot
|
||
romanov73;Thu Feb 22 18:03:35 2018 +0400;Add menu resource
|
||
Romanov Anton;Tue Feb 20 18:12:55 2018 +0000;Merge branch 'balance-different-dto' into 'develop'
|
||
romanov73;Tue Feb 20 22:09:33 2018 +0400;restore tests
|
||
romanov73;Tue Feb 20 21:46:45 2018 +0400;filter employees by stage
|
||
romanov73;Tue Feb 20 21:21:27 2018 +0400;filter employees by workload
|
||
romanov73;Tue Feb 20 20:58:23 2018 +0400;Merge branch 'develop' into balance-different-dto
|
||
funny73;Tue Feb 20 19:52:24 2018 +0400;Add shift unit model Add link to unit view
|
||
romanov73;Tue Feb 20 16:14:09 2018 +0400;Important fix using coefficient
|
||
romanov73;Mon Feb 19 19:00:07 2018 +0400;partially fix ajustment
|
||
romanov73;Mon Feb 19 18:24:10 2018 +0400;Modify dto for using with different periods and work types
|
||
Romanov Anton;Mon Feb 19 08:11:39 2018 +0000;Merge branch '30-' into 'develop'
|
||
romanov73;Mon Feb 19 12:09:05 2018 +0400;Add work type to position
|
||
Romanov Anton;Wed Feb 14 20:57:35 2018 +0000;Merge branch '34-' into 'develop'
|
||
romanov73;Thu Feb 15 00:51:24 2018 +0400;fixes by comments
|
||
romanov73;Thu Feb 15 00:47:21 2018 +0400;merge fields
|
||
romanov73;Wed Feb 14 23:42:35 2018 +0400;Merge branch 'develop' into 34-gleb
|
||
romanov73;Wed Feb 14 21:05:51 2018 +0400;add clock
|
||
Romanov Anton;Wed Feb 14 16:49:29 2018 +0000;Merge branch '45-balance-employee-recomendations' into 'develop'
|
||
romanov73;Wed Feb 14 20:46:59 2018 +0400;cleanup code
|
||
romanov73;Wed Feb 14 18:25:42 2018 +0400;reduce code
|
||
romanov73;Wed Feb 14 18:24:59 2018 +0400;adjust additional employees
|
||
romanov73;Wed Feb 14 17:22:10 2018 +0400;move employees from other units
|
||
romanov73;Tue Feb 13 23:59:09 2018 +0400;fix save product name
|
||
romanov73;Tue Feb 13 23:28:30 2018 +0400;add converter, fix UI and backing for add complex object
|
||
romanov73;Tue Feb 13 22:10:59 2018 +0400;Merge branch 'develop' into 34-gleb
|
||
funny73;Tue Feb 13 18:07:25 2018 +0400;Add stage to workload
|
||
funny73;Tue Feb 13 16:05:45 2018 +0400;Add stage to category
|
||
romanov73;Tue Feb 13 13:20:16 2018 +0400;add map of all units balances
|
||
romanov73;Tue Feb 13 11:24:50 2018 +0400;move method
|
||
romanov73;Tue Feb 13 00:35:30 2018 +0400;add dialog
|
||
romanov73;Mon Feb 12 22:59:49 2018 +0400;filter only workshops and manufactures
|
||
romanov73;Mon Feb 12 22:04:55 2018 +0400;rename employees
|
||
romanov73;Mon Feb 12 17:34:37 2018 +0400;fix font size
|
||
romanov73;Mon Feb 12 16:59:16 2018 +0400;fix versions panel width
|
||
Romanov Anton;Mon Feb 12 12:47:04 2018 +0000;Merge branch '41-' into 'develop'
|
||
romanov73;Mon Feb 12 16:43:06 2018 +0400;change to working hours
|
||
romanov73;Mon Feb 12 14:05:36 2018 +0400;remove constructor
|
||
romanov73;Mon Feb 12 14:05:13 2018 +0400;Merge remote-tracking branch 'origin/develop' into develop
|
||
romanov73;Mon Feb 12 14:04:57 2018 +0400;fix selects
|
||
Romanov Anton;Mon Feb 12 09:20:05 2018 +0000;Merge branch '39-work-type-code' into 'develop'
|
||
Aleksey Filippov;Mon Feb 12 13:16:36 2018 +0400;add migration for work type code
|
||
Aleksey Filippov;Mon Feb 12 13:16:28 2018 +0400;add work type code support to xhtml
|
||
Aleksey Filippov;Mon Feb 12 13:16:12 2018 +0400;add work type code
|
||
Romanov Anton;Mon Feb 12 08:25:47 2018 +0000;Update README.md
|
||
Romanov Anton;Mon Feb 12 08:25:35 2018 +0000;Update README.md
|
||
Romanov Anton;Mon Feb 12 08:07:30 2018 +0000;Update README.md
|
||
Romanov Anton;Mon Feb 12 07:10:38 2018 +0000;Merge branch '40-' into 'develop'
|
||
Aleksey Filippov;Mon Feb 12 11:08:13 2018 +0400;add migration for position type
|
||
Aleksey Filippov;Mon Feb 12 11:07:45 2018 +0400;add position type support to xhtml
|
||
Aleksey Filippov;Mon Feb 12 11:07:23 2018 +0400;move position converter from boundary to view
|
||
Aleksey Filippov;Mon Feb 12 11:06:55 2018 +0400;add position type converter
|
||
Aleksey Filippov;Mon Feb 12 11:06:35 2018 +0400;add position type to backing
|
||
Aleksey Filippov;Mon Feb 12 11:06:00 2018 +0400;add position type support to service
|
||
Aleksey Filippov;Mon Feb 12 11:05:44 2018 +0400;add position type to model
|
||
Romanov Anton;Mon Feb 12 07:02:32 2018 +0000;Merge branch '33-' into 'develop'
|
||
romanov73;Mon Feb 12 14:58:51 2018 +0400;refactor
|
||
romanov73;Mon Feb 12 14:58:33 2018 +0400;add human hours coefficient
|
||
romanov73;Mon Feb 12 14:56:43 2018 +0400;fix api name
|
||
romanov73;Mon Feb 12 00:58:15 2018 +0400;add balance button
|
||
romanov73;Sun Feb 11 01:36:15 2018 +0400;add tools balance prototype
|
||
romanov73;Sat Feb 10 23:09:33 2018 +0400;move enum
|
||
romanov73;Sat Feb 10 23:02:36 2018 +0400;refactor
|
||
romanov73;Sat Feb 10 22:54:28 2018 +0400;add quarter
|
||
romanov73;Sat Feb 10 22:42:14 2018 +0400;refactor
|
||
romanov73;Sat Feb 10 20:52:46 2018 +0400;Merge branch 'develop' into 33-balance-area
|
||
romanov73;Sat Feb 10 20:52:32 2018 +0400;Merge branch 'develop' into 33-balance-area
|
||
Romanov Anton;Sat Feb 10 16:14:26 2018 +0000;Merge branch '31-map-2-dto' into 'develop'
|
||
romanov73;Sat Feb 10 19:35:17 2018 +0400;fixes after Almaz consultation
|
||
romanov73;Sat Feb 10 14:25:00 2018 +0400;fix npe
|
||
romanov73;Sat Feb 10 13:50:21 2018 +0400;add filter by work type
|
||
romanov73;Sat Feb 10 13:08:56 2018 +0400;rename field
|
||
romanov73;Sat Feb 10 13:08:38 2018 +0400;filter by all children
|
||
Aleksey Filippov;Sat Feb 10 11:26:17 2018 +0400;some fixes
|
||
Aleksey Filippov;Sat Feb 10 11:26:06 2018 +0400;add dto for total balance
|
||
Aleksey Filippov;Sat Feb 10 11:11:58 2018 +0400;add dto for employee load by unit
|
||
Aleksey Filippov;Sat Feb 10 10:30:11 2018 +0400;getEmployeesByUnit method refactoring
|
||
romanov73;Sat Feb 10 00:22:37 2018 +0400;add other type of balance area
|
||
romanov73;Fri Feb 9 22:03:39 2018 +0400;add tools balance
|
||
romanov73;Fri Feb 9 19:50:21 2018 +0400;divide balance page
|
||
Aleksey Filippov;Fri Feb 9 16:37:18 2018 +0400;adapt backing and view to areas and employee experience dtos
|
||
Aleksey Filippov;Fri Feb 9 16:36:18 2018 +0400;add dto for employee experience
|
||
Aleksey Filippov;Fri Feb 9 16:35:51 2018 +0400;add dto for areas
|
||
Aleksey Filippov;Fri Feb 9 14:57:01 2018 +0400;some ui fixes
|
||
Aleksey Filippov;Fri Feb 9 14:55:36 2018 +0400;move db methods from getters to init
|
||
romanov73;Thu Feb 8 01:20:12 2018 +0400;add areas panel
|
||
romanov73;Thu Feb 8 01:19:13 2018 +0400;add areas panel
|
||
romanov73;Thu Feb 8 01:02:39 2018 +0400;add global preloader
|
||
romanov73;Thu Feb 8 00:57:46 2018 +0400;select default unit
|
||
romanov73;Thu Feb 8 00:57:23 2018 +0400;add preloader
|
||
romanov73;Wed Feb 7 22:46:44 2018 +0400;change id
|
||
Romanov Anton;Wed Feb 7 13:53:35 2018 +0000;Merge branch '23-' into 'develop'
|
||
Romanov Anton;Wed Feb 7 13:49:27 2018 +0000;Merge branch 'deploy-fixes' into 'develop'
|
||
funny73;Wed Feb 7 17:34:41 2018 +0400;UDP modify AirplaneKitCounter to double
|
||
Aleksey Filippov;Wed Feb 7 17:33:23 2018 +0400;some wildfly deploy fixes
|
||
funny73;Wed Feb 7 17:19:22 2018 +0400;Modify AirplaneKitCounter to double -> Workload.java
|
||
funny73;Wed Feb 7 17:00:10 2018 +0400;Add AirplaneKitCounter to balance view -> BalanceEmployeeService.java Modify Worckload total Value (Value * AirplaneKitCounter) -> BalanceService.java
|
||
funny73;Wed Feb 7 14:13:35 2018 +0400;Add AirplaneKitCounter to view
|
||
funny73;Wed Feb 7 14:13:15 2018 +0400;Add AirplaneKitCounter to model Workload
|
||
funny73;Wed Feb 7 14:12:15 2018 +0400;Changelog for airplainetKitCounter
|
||
Romanov Anton;Wed Feb 7 06:54:55 2018 +0000;Merge branch '22-' into 'develop'
|
||
romanov73;Wed Feb 7 14:47:34 2018 +0400;add unit types
|
||
Romanov Anton;Tue Feb 6 22:43:40 2018 +0000;Merge branch '25-' into 'develop'
|
||
romanov73;Wed Feb 7 02:41:34 2018 +0400;filter balance by unit
|
||
romanov73;Wed Feb 7 02:06:46 2018 +0400;filter balance by unit
|
||
romanov73;Wed Feb 7 02:05:10 2018 +0400;filter balance by unit
|
||
romanov73;Wed Feb 7 00:41:01 2018 +0400;add method get all unit children
|
||
romanov73;Tue Feb 6 23:26:18 2018 +0400;add filter by unit in balance results
|
||
romanov73;Tue Feb 6 21:26:45 2018 +0400;refactor work with tree of menu items
|
||
romanov73;Tue Feb 6 21:08:01 2018 +0400;refactor work with tree
|
||
romanov73;Tue Feb 6 21:07:22 2018 +0400;fix update after remove enum key
|
||
romanov73;Tue Feb 6 20:03:31 2018 +0400;rename method
|
||
Gleb;Tue Feb 6 15:07:04 2018 +0000;Merge branch '17-' into 'develop'
|
||
romanov73;Tue Feb 6 21:15:12 2018 +0400;fix inf.
|
||
funny73;Tue Feb 6 19:02:36 2018 +0400;Add changelog for units with unit_type == 'Корпус', unit_type='Цех'
|
||
funny73;Tue Feb 6 18:19:50 2018 +0400;Remove "Korpus" from "Tip podrazdeleniya"
|
||
Romanov Anton;Tue Feb 6 11:31:43 2018 +0000;Merge branch '24-' into 'develop'
|
||
romanov73;Tue Feb 6 19:01:21 2018 +0400;add user
|
||
Romanov Anton;Thu Feb 1 19:45:21 2018 +0000;Merge branch 'wildfly-deploy' into 'develop'
|
||
Aleksey Filippov;Thu Feb 1 23:24:34 2018 +0400;add wildfly-maven-plugin, remove maven-glassfish-plugin
|
||
romanov73;Thu Feb 1 19:51:24 2018 +0400;add todos
|
||
Romanov Anton;Wed Jan 31 15:03:39 2018 +0000;Merge branch 'master' into 'develop'
|
||
romanov73;Wed Jan 31 18:53:27 2018 +0400;fix round
|
||
romanov73;Wed Jan 31 18:43:33 2018 +0400;fix round
|
||
romanov73;Wed Jan 31 18:38:33 2018 +0400;add balance by employees
|
||
romanov73;Wed Jan 31 18:30:18 2018 +0400;add balance by employees
|
||
Romanov Anton;Wed Jan 31 13:02:52 2018 +0000;Merge branch 'develop' into 'master'
|
||
Romanov Anton;Wed Jan 31 12:58:00 2018 +0000;Merge branch '4-' into 'develop'
|
||
romanov73;Wed Jan 31 16:47:51 2018 +0400;add balance by employees
|
||
romanov73;Wed Jan 31 00:47:39 2018 +0400;add calculation employee loads
|
||
romanov73;Wed Jan 31 00:47:25 2018 +0400;add calculation employee loads
|
||
romanov73;Wed Jan 31 00:47:08 2018 +0400;add calculation employee loads
|
||
romanov73;Wed Jan 31 00:46:53 2018 +0400;add calculation employee loads
|
||
romanov73;Wed Jan 31 00:45:59 2018 +0400;add interface for edit additional fields
|
||
romanov73;Wed Jan 31 00:45:04 2018 +0400;add comparable for using in tree map
|
||
romanov73;Wed Jan 31 00:44:33 2018 +0400;add fields for production program
|
||
romanov73;Wed Jan 31 00:43:56 2018 +0400;move interface to base entity
|
||
romanov73;Wed Jan 31 00:43:21 2018 +0400;add database fields for production program
|
||
romanov73;Wed Jan 31 00:42:55 2018 +0400;add dynamic columns
|
||
romanov73;Tue Jan 30 15:11:12 2018 +0400;add work type for workload
|
||
romanov73;Tue Jan 30 14:55:56 2018 +0400;add comments
|
||
romanov73;Tue Jan 30 03:00:28 2018 +0400;show by production program
|
||
romanov73;Tue Jan 30 00:07:31 2018 +0400;add employee available capacity
|
||
romanov73;Mon Jan 29 23:42:06 2018 +0400;fix units hierarchy bypass
|
||
romanov73;Mon Jan 29 23:28:28 2018 +0400;divide logic
|
||
romanov73;Mon Jan 29 22:59:45 2018 +0400;add employee experience table
|
||
romanov73;Mon Jan 29 22:15:29 2018 +0400;fix calc areas
|
||
romanov73;Mon Jan 29 21:57:23 2018 +0400;fix calc employee experience
|
||
romanov73;Mon Jan 29 21:12:52 2018 +0400;calc employee experience by units
|
||
romanov73;Mon Jan 29 14:01:36 2018 +0400;add employee experience
|
||
Romanov Anton;Mon Jan 29 06:04:01 2018 +0000;Update README.md
|
||
Romanov Anton;Sun Jan 28 16:16:56 2018 +0000;Merge branch 'develop' into 'master'
|
||
Romanov Anton;Sun Jan 28 16:06:14 2018 +0000;Merge branch '3-' into 'develop'
|
||
romanov73;Sun Jan 28 19:53:21 2018 +0400;remove product work types edit
|
||
romanov73;Sun Jan 28 19:41:31 2018 +0400;fix months select
|
||
romanov73;Sun Jan 28 19:06:10 2018 +0400;fix year select
|
||
romanov73;Sun Jan 28 04:28:21 2018 +0400;fix program edit
|
||
romanov73;Sun Jan 28 04:27:55 2018 +0400;add product backend
|
||
romanov73;Sun Jan 28 04:26:53 2018 +0400;add table and fields
|
||
Romanov Anton;Sat Jan 27 08:11:15 2018 +0000;Merge branch '9-' into 'develop'
|
||
romanov73;Sat Jan 27 15:28:22 2018 +0400;sort menu items, change logo
|
||
Romanov Anton;Sat Jan 27 05:55:52 2018 +0000;Update README.md
|
||
romanov73;Sat Jan 20 00:12:44 2018 +0400;fix versions select
|
||
Romanov Anton;Fri Jan 19 04:27:48 2018 +0000;Merge branch 'tool-square-catalog' into 'master'
|
||
Aleksey Filippov;Fri Jan 19 01:11:50 2018 +0400;add tool square catalog migration
|
||
Aleksey Filippov;Thu Jan 18 02:20:48 2018 +0400;add tool square catalog
|
||
romanov73;Thu Jan 11 21:22:14 2018 +0400;fix rest path
|
||
romanov73;Tue Jan 9 03:44:10 2018 +0400;fixes
|
||
romanov73;Tue Jan 9 00:09:27 2018 +0400;fix unit name
|
||
romanov73;Tue Jan 9 00:07:47 2018 +0400;fix year
|
||
romanov73;Mon Jan 8 19:16:28 2018 +0400;add short view
|
||
romanov73;Mon Jan 8 11:55:30 2018 +0400;fix
|
||
romanov73;Mon Jan 8 01:24:37 2018 +0400;fill work type by tool name
|
||
romanov73;Mon Jan 8 00:23:00 2018 +0400;ui fixes
|
||
romanov73;Sun Jan 7 23:54:40 2018 +0400;fix units hierarchy, add unit type, calc areas balance
|
||
romanov73;Sat Jan 6 22:51:11 2018 +0400;remove versions
|
||
romanov73;Sat Jan 6 22:06:03 2018 +0400;fix edit program
|
||
romanov73;Sat Jan 6 21:40:11 2018 +0400;add title image
|
||
romanov73;Sat Jan 6 18:04:27 2018 +0400;add production program input
|
||
romanov73;Wed Jan 3 21:05:48 2018 +0400;change wizard to tabs
|
||
romanov73;Wed Jan 3 01:03:05 2018 +0400;add wizard
|
||
romanov73;Sat Dec 30 02:02:42 2017 +0400;fix tools loading
|
||
romanov73;Sat Dec 30 01:46:01 2017 +0400;fix tools loading
|
||
romanov73;Sat Dec 30 01:32:33 2017 +0400;fix tools loading
|
||
romanov73;Sat Dec 30 01:28:24 2017 +0400;fix tools loading
|
||
romanov73;Sat Dec 30 00:54:26 2017 +0400;fix employee loading
|
||
romanov73;Fri Dec 29 19:04:14 2017 +0400;fix unit select
|
||
romanov73;Fri Dec 29 17:19:10 2017 +0400;fix unit select
|
||
romanov73;Fri Dec 29 01:40:38 2017 +0400;add cache
|
||
romanov73;Fri Dec 29 01:27:18 2017 +0400;add cache
|
||
romanov73;Fri Dec 29 01:14:09 2017 +0400;add cache
|
||
romanov73;Fri Dec 29 01:12:17 2017 +0400;change color
|
||
romanov73;Fri Dec 29 00:50:57 2017 +0400;add ci
|
||
romanov73;Fri Dec 29 00:48:10 2017 +0400;add ci
|
||
romanov73;Fri Dec 29 00:34:36 2017 +0400;add ci
|
||
romanov73;Fri Dec 29 00:31:22 2017 +0400;add ci
|
||
romanov73;Fri Dec 29 00:18:51 2017 +0400;add ci
|
||
romanov73;Fri Dec 29 00:16:44 2017 +0400;add ci
|
||
romanov73;Fri Dec 29 00:13:33 2017 +0400;add ci
|
||
romanov73;Fri Dec 29 00:09:51 2017 +0400;fix menus
|
||
Romanov Anton;Thu Dec 28 19:47:02 2017 +0000;Merge branch 'balance-example' into 'master'
|
||
romanov73;Thu Dec 28 23:44:52 2017 +0400;add other dictionaries
|
||
romanov73;Sat Dec 23 10:40:41 2017 +0400;add tool and work types
|
||
romanov73;Sat Dec 23 09:12:38 2017 +0400;fix menu item
|
||
romanov73;Sat Dec 23 09:12:23 2017 +0400;fix employee load
|
||
romanov73;Sat Dec 23 08:51:18 2017 +0400;add employee category
|
||
romanov73;Sat Dec 23 08:22:10 2017 +0400;add categories dictionary
|
||
romanov73;Fri Dec 22 12:38:08 2017 +0400;add menu item
|
||
romanov73;Fri Dec 22 12:31:26 2017 +0400;add employee category
|
||
romanov73;Fri Dec 22 09:55:31 2017 +0400;fix calendar
|
||
romanov73;Fri Dec 22 09:33:56 2017 +0400;fix date
|
||
romanov73;Thu Dec 21 16:38:20 2017 +0400;fix for context path change
|
||
romanov73;Thu Dec 21 13:58:02 2017 +0400;fluid panel
|
||
romanov73;Wed Dec 20 20:50:17 2017 +0400;fix context path
|
||
romanov73;Wed Dec 20 17:12:19 2017 +0400;fix displaying position
|
||
romanov73;Wed Dec 20 17:10:14 2017 +0400;load employees from file
|
||
romanov73;Wed Dec 20 15:09:54 2017 +0400;fix tool loading
|
||
romanov73;Mon Dec 18 18:18:04 2017 +0400;add resource versions
|
||
romanov73;Mon Dec 18 17:36:50 2017 +0400;add resource
|
||
romanov73;Mon Dec 18 17:07:47 2017 +0400;add swagger
|
||
romanov73;Sat Dec 16 09:42:46 2017 +0400;add new version
|
||
romanov73;Fri Dec 15 19:50:46 2017 +0400;fix title
|
||
romanov73;Fri Dec 15 19:24:13 2017 +0400;fix title
|
||
romanov73;Fri Dec 15 11:57:18 2017 +0400;add menu items
|
||
romanov73;Fri Dec 15 11:52:01 2017 +0400;add positions dictionary
|
||
romanov73;Fri Dec 15 11:29:02 2017 +0400;fix select for employee
|
||
romanov73;Fri Dec 15 10:35:12 2017 +0400;add employee backing
|
||
romanov73;Fri Dec 15 09:36:33 2017 +0400;fix 500 error page
|
||
romanov73;Thu Dec 14 22:26:45 2017 +0400;fix mapping
|
||
romanov73;Thu Dec 14 22:49:44 2017 +0400;add employee
|
||
romanov73;Thu Dec 14 22:37:30 2017 +0400;add employee
|
||
romanov73;Thu Dec 14 14:12:03 2017 +0400;fix crud service
|
||
romanov73;Thu Dec 14 12:51:59 2017 +0400;fix table style
|
||
romanov73;Thu Dec 14 12:22:48 2017 +0400;remove border for grid
|
||
romanov73;Thu Dec 14 12:20:14 2017 +0400;add version_id for units
|
||
romanov73;Thu Dec 14 11:49:53 2017 +0400;fix font size
|
||
romanov73;Thu Dec 14 11:08:46 2017 +0400;add unit fields
|
||
romanov73;Thu Dec 14 10:23:01 2017 +0400;KISS units hierarchy
|
||
romanov73;Wed Dec 13 19:04:05 2017 +0400;refresh page
|
||
romanov73;Wed Dec 13 17:43:54 2017 +0400;add version
|
||
romanov73;Wed Dec 13 01:46:05 2017 +0400;body width
|
||
romanov73;Wed Dec 13 01:45:17 2017 +0400;add menu item
|
||
romanov73;Tue Dec 12 22:20:07 2017 +0400;fix tree
|
||
romanov73;Tue Dec 12 20:02:20 2017 +0400;fix login
|
||
romanov73;Tue Dec 12 19:29:03 2017 +0400;add unit tree
|
||
romanov73;Tue Dec 12 18:23:38 2017 +0400;add unit dictionary
|
||
romanov73;Tue Dec 12 16:18:03 2017 +0400;add filter
|
||
romanov73;Tue Dec 12 14:13:31 2017 +0400;fix menu session
|
||
romanov73;Tue Dec 12 00:10:47 2017 +0400;remove bootstrap
|
||
romanov73;Mon Dec 11 21:53:18 2017 +0400;add unit select
|
||
romanov73;Mon Dec 11 19:49:15 2017 +0400;add menu item and role
|
||
romanov73;Mon Dec 11 19:37:38 2017 +0400;fix permissions
|
||
romanov73;Mon Dec 11 17:08:39 2017 +0400;refactor and add tools dictionary backing
|
||
romanov73;Mon Dec 11 17:08:04 2017 +0400;refactor and add tools dictionary backing
|
||
romanov73;Mon Dec 11 17:07:27 2017 +0400;refactor and add tools dictionary backing
|
||
romanov73;Mon Dec 11 14:12:24 2017 +0400;add tools dictionary page
|
||
romanov73;Sat Dec 9 09:54:45 2017 +0400;add global exception hadler
|
||
romanov73;Sat Nov 25 13:52:33 2017 +0400;add monitoring
|
||
romanov73;Sat Nov 25 13:21:18 2017 +0400;fix xls and xlsx
|
||
romanov73;Sat Nov 25 12:39:45 2017 +0400;upload tools
|
||
romanov73;Fri Nov 24 22:16:27 2017 +0400;save tools
|
||
romanov73;Fri Nov 24 13:06:21 2017 +0400;fix message
|
||
romanov73;Fri Nov 24 12:11:43 2017 +0400;add loading from xlsx
|
||
romanov73;Fri Nov 17 19:43:35 2017 +0400;add message
|
||
romanov73;Fri Nov 17 15:11:22 2017 +0400;fix button
|
||
romanov73;Fri Nov 17 10:15:42 2017 +0400;add registration service
|
||
romanov73;Thu Nov 16 21:35:04 2017 +0400;add push script
|
||
romanov73;Thu Nov 16 20:54:49 2017 +0400;fix named query execution
|
||
romanov73;Sun Nov 12 22:19:03 2017 +0400;sort menu items
|
||
romanov73;Sat Nov 11 15:09:35 2017 +0400;fix title
|
||
romanov73;Sat Nov 11 14:54:25 2017 +0400;fix table
|
||
romanov73;Sat Nov 11 14:35:38 2017 +0400;fix style attribute
|
||
romanov73;Sat Nov 11 14:08:56 2017 +0400;show user sessions
|
||
romanov73;Sat Nov 11 13:51:34 2017 +0400;rename service
|
||
romanov73;Fri Nov 10 22:03:25 2017 +0400;fix update tree
|
||
romanov73;Fri Nov 10 14:29:25 2017 +0400;edit menu items
|
||
romanov73;Fri Nov 10 12:17:24 2017 +0400;set bootstrap theme for primefaces
|
||
romanov73;Thu Nov 9 23:40:40 2017 +0400;fix saving entitites
|
||
romanov73;Thu Nov 9 23:27:42 2017 +0400;fix saving entitites
|
||
romanov73;Thu Nov 9 20:51:19 2017 +0400;fix titles
|
||
romanov73;Thu Nov 9 18:00:45 2017 +0400;fix login page title
|
||
romanov73;Thu Nov 9 13:36:21 2017 +0400;commit log
|
||
romanov73;Thu Nov 9 07:31:37 2017 +0400;reverse sort commits
|
||
romanov73;Thu Nov 9 00:27:48 2017 +0400;sort commits
|
||
romanov73;Wed Nov 8 23:16:07 2017 +0400;extend commits log
|
||
romanov73;Wed Nov 8 21:42:16 2017 +0400;fix styles
|
||
romanov73;Wed Nov 8 19:17:08 2017 +0400;add logout
|
||
romanov73;Wed Nov 8 19:13:17 2017 +0400;add logout
|
||
romanov73;Wed Nov 8 20:18:35 2017 +0400;Merge branch 'master' of gitlab.com:romanov73/balance
|
||
romanov73;Wed Nov 8 20:17:55 2017 +0400;add database diagramm
|
||
Romanov Anton;Wed Nov 8 04:13:39 2017 +0000;Update README.md
|
||
Romanov Anton;Wed Nov 8 04:11:33 2017 +0000;Update README.md
|
||
romanov73;Wed Nov 8 07:48:13 2017 +0400;Merge remote-tracking branch 'origin/master'
|
||
Romanov Anton;Tue Nov 7 18:05:04 2017 +0000;Update README.md
|
||
romanov73;Tue Nov 7 22:01:50 2017 +0400;add example of permissions validation
|
||
romanov73;Tue Nov 7 20:56:31 2017 +0400;rename project
|
||
romanov73;Wed Oct 11 21:37:49 2017 +0400;reverse sort commits
|
||
romanov73;Wed Oct 11 21:32:19 2017 +0400;fix read resource as file
|
||
romanov73;Wed Oct 11 20:23:10 2017 +0400;Merge remote-tracking branch 'origin/master'
|
||
romanov73;Wed Oct 11 20:22:52 2017 +0400;add commits log
|
||
Romanov Anton;Tue Oct 10 20:47:29 2017 +0000;Update README.md
|
||
romanov73;Fri Oct 6 01:55:57 2017 +0400;add menu to platform |