Commit Graph

263 Commits

Author SHA1 Message Date
vladrigos
1a3d74ee39 add holiday calendar 2020-08-05 14:03:45 +03:00
vladrigos
fa731a80fe fix exception for project without status, fix character set in company table 2020-08-04 11:16:14 +03:00
vladrigos
8b3687cb81 added upload files in additional fields 2020-08-04 11:14:55 +03:00
vladrigos
812bb2b23a added history of changes 2020-08-04 10:47:53 +03:00
38069c57d4
Merge pull request #41 from apuc/sum_and_calendar
Sum and calendar
2020-05-22 16:43:51 +03:00
glambertessa
97619ba347 fixed console user generate 2020-05-22 16:42:24 +03:00
glambertessa
1894eaba6d Merge branch 'master' of https://github.com/apuc/guild into sum_and_calendar 2020-05-22 11:29:24 +03:00
glambertessa
ddd14e436c email required 2020-05-22 11:25:21 +03:00
88212626a6
Merge pull request #40 from apuc/sum_and_calendar
Sum and calendar
2020-02-06 12:04:11 +03:00
akosse
f90a70811e frontend controllers behaviors access 2020-02-06 11:28:51 +03:00
akosse
6d37a8ef18 report fix 2020-02-05 16:28:37 +03:00
27bca791d5
Merge pull request #39 from apuc/sum_and_calendar
reports
2020-02-05 12:34:02 +03:00
akosse
3da2dd1543 reports 2020-02-05 12:08:01 +03:00
b310d6c4cd
Merge pull request #38 from apuc/sum_and_calendar
link & info in accesses is not required
2020-02-04 15:24:30 +03:00
akosse
dbaeeb3c5a link & info in accesses is not required 2020-02-04 15:23:31 +03:00
93be7e8d1e
Merge pull request #37 from apuc/sum_and_calendar
accesses user-card innerJoin
2020-02-04 14:44:48 +03:00
akosse
9c18cc61c8 accesses user-card innerJoin 2020-02-04 14:28:41 +03:00
2f73cf6cee
Merge pull request #36 from apuc/sum_and_calendar
Sum and calendar
2020-02-04 12:37:40 +03:00
akosse
b35d6fd4fa ExpandRowColumn Accesses 2020-02-04 12:17:14 +03:00
akosse
6630452a1e add role user to generated user & update readme 2020-01-29 13:48:06 +03:00
0ec17ddf89
Merge pull request #35 from apuc/sum_and_calendar
Sum and calendar
2020-01-29 12:48:34 +03:00
akosse
f647a4905c closed admin panel 2020-01-29 11:41:29 +03:00
akosse
aa501900e4 closed admin panel 2020-01-29 11:26:01 +03:00
akosse
75ccbff934 accesses custom delete & validation 2020-01-27 10:30:26 +03:00
akosse
c5227f1ee4 frontend user-card view 2020-01-24 17:38:25 +03:00
akosse
c85a047f77 console generate-user 2020-01-24 12:05:34 +03:00
8aaa7c0ab4
Merge pull request #34 from apuc/sum_and_calendar
remove spaces from password
2020-01-24 11:21:10 +03:00
akosse
eb09f95ff8 remove spaces from password 2020-01-24 11:04:48 +03:00
678446fa67
Merge pull request #33 from apuc/sum_and_calendar
total in serch model
2020-01-23 17:15:47 +03:00
akosse
3daeae0293 total in serch model 2020-01-23 17:14:53 +03:00
7585a9c04a
Merge pull request #32 from apuc/sum_and_calendar
fix parameters error
2020-01-23 16:57:04 +03:00
akosse
3de2cb7a4a fix parameters error 2020-01-23 16:53:37 +03:00
79f9c9338c
Merge pull request #31 from apuc/sum_and_calendar
backend change password
2020-01-23 15:42:55 +03:00
akosse
dfbcdbae6e backend change password 2020-01-23 13:16:54 +03:00
56a22f6f1c
Merge pull request #30 from apuc/sum_and_calendar
change password
2020-01-22 18:00:18 +03:00
akosse
8322d58066 change password 2020-01-22 12:18:03 +03:00
45b6bb480a
Merge pull request #29 from apuc/sum_and_calendar
Sum and calendar
2020-01-21 17:47:24 +03:00
akosse
cb10af1bce user card edit form 2020-01-21 17:46:03 +03:00
akosse
6880eaa2ba accesses new 2020-01-21 17:33:07 +03:00
akosse
188758c79c bd calendar and salary sum 2020-01-17 16:28:25 +03:00
akosse
88b0b13a2a theme & comment 2019-12-10 17:22:20 +03:00
3264f1c944
Merge pull request #28 from apuc/NotesAdd
Notes add
2019-12-09 17:29:58 +02:00
Leorne
34e56f9fcc remove descriptions from notes list 2019-12-09 17:25:43 +03:00
Leorne
8200544531 cities for profiles 2019-12-09 10:54:39 +03:00
ff5f421d9c
Merge pull request #27 from apuc/NotesAdd
Notes add
2019-12-06 16:01:07 +02:00
Leorne
86b5476998 default file image 2019-12-06 15:40:57 +03:00
Leorne
7b7fa6c51d spaces and symbols in files names 2019-12-06 15:40:41 +03:00
Leorne
deee41345d spaces and symbolse in files names 2019-12-06 15:39:19 +03:00
b27a033802
Merge pull request #26 from apuc/NotesAdd
Notes add
2019-12-06 13:50:27 +02:00
Leorne
8c1c2cf5cd change accesses table access column to text type 2019-12-06 13:46:06 +03:00