578 commits

Author	SHA1	Message	Date
aignatov-bio	44eccaaa12	Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1 ... Fix small visual bugs [SCI-4254]	2020-01-30 13:42:07 +01:00
Urban Rotnik	fc14bf05be	Merge pull request #2377 from biosistemika/master ... Master >> Develop	2020-01-29 14:25:11 +01:00
Urban Rotnik	503c05805d	Move editable? method from helper to model	2020-01-25 09:43:05 +01:00
Urban Rotnik	ec8af5f943	Add readonly repository rows records	2020-01-24 16:33:44 +01:00
aignatov-bio	9524659e1d	Demodulize column name in datatable helper	2020-01-24 11:33:30 +01:00
aignatov-bio	4395a7cc6b	Fix small visual bugs	2020-01-23 13:12:58 +01:00
Urban Rotnik	75c7cb7aa8	Keep circles for task page	2020-01-14 13:31:44 +01:00
Urban Rotnik	2468b67de0	Assign column update	2020-01-14 09:02:30 +01:00
Oleksii Kriuchykhin	01b8d2226d	Optimize repository table counters [SCI-4224]	2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin	7b82e33eb6	Fix repository filtering and improve speed [SCI-4224]	2020-01-13 16:09:07 +01:00
aignatov-bio	d5675c0c33	Add smart annotations to repository text value	2020-01-10 12:56:57 +01:00
Alex Kriuchykhin	9ab07af87b	Merge pull request #2282 from okriuchykhin/ok_SCI_4149 ... Disable comment edit mode if comment is not editable [SCI-4149]	2020-01-09 15:06:04 +01:00
Oleksii Kriuchykhin	1624f9d5ab	Disable comment edit mode if comment is not editable [SCI-4149]	2020-01-08 12:32:59 +01:00
aignatov-bio	54c78cf4d1	Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles ... Update colors and buttons	2020-01-08 12:30:51 +01:00
aignatov-bio	68646276f5	Replace bootstrap styles for button	2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin	d9b9243da7	Merge branch 'develop' into features/new-column-types	2020-01-07 16:03:33 +01:00
aignatov-bio	ef3814ccec	Add new buttons to protocols, tasks, experiments, projects	2020-01-06 10:40:20 +01:00
Oleksii Kriuchykhin	e24bc2775a	Add view/edit renderers for numeric data type [SCI-4166]	2019-12-18 11:55:12 +01:00
Alex Kriuchykhin	792e6f2eb9	Merge pull request #2263 from okriuchykhin/ok_SCI_4142 ... Implement SSO with Azure AD [SCI-4142]	2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin	1aa334fdaa	Merge branch 'develop' into release-1-17-8	2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin	ff4ef818fb	Implement SSO with Azure AD [SCI-4142]	2019-12-10 17:24:53 +01:00
Urban Rotnik	06d87cb4b6	Add I18n to serializers	2019-12-06 11:39:10 +01:00
Urban Rotnik	2c0a6ed085	Remove current_user vars	2019-12-06 11:12:07 +01:00
Oleksii Kriuchykhin	7a89cae56f	Fix TinyMCE images and avatars for export all [SCI-4107]	2019-12-05 13:27:17 +01:00
Urban Rotnik	5f2407e3fb	Add view renders for DateTime column types	2019-11-29 10:50:14 +01:00
Urban Rotnik	1c9d7ef6e7	Add File type renderer	2019-11-29 10:19:54 +01:00
Urban Rotnik	b2ce600820	Add delimiter column for repository_column	2019-11-29 10:19:10 +01:00
Oleksii Kriuchykhin	371f699a11	Fix AR preloading for repository table [SCI-4070]	2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin	3481b50796	Fix column reordering for repositories [SCI-4070]	2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin	220c3f8eeb	Fix repository columns default state [SCI-4070]	2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin	338b710d81	Refactor inventory edit mode [SCI-4070]	2019-11-29 10:19:05 +01:00
aignatov-bio	232e4d78be	Add serializers to datatable values	2019-11-29 10:19:03 +01:00
aignatov-bio	0f3c138a7e	Fix markup	2019-11-29 10:19:03 +01:00
aignatov-bio	a0f11116d2	Add render views for datatables	2019-11-29 10:18:59 +01:00
Mojca Lorber	467c80da52	Update basic modal layout for creating new column types	2019-11-29 10:16:47 +01:00
aignatov-bio	70d721bb99	Add text method for assets	2019-11-29 10:16:42 +01:00
aignatov-bio	2ed3054c89	Make repository value render more flexible	2019-11-29 10:16:42 +01:00
Oleksii Kriuchykhin	f5abb7c767	Add connected accounts section to settings [SCI-4106]	2019-11-27 23:16:25 +01:00
aignatov-bio	b1f9e7f1ca	Fix global activities jsonb field [SCI-3830] (#2030) ... * Fix global activities jsonb field * Fix tests	2019-11-18 13:59:54 +01:00
aignatov-bio	717b70f75b	Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties ... Fix avatars in comments and activities [SCI-3995]	2019-10-29 14:11:39 +01:00
aignatov-bio	9950a23188	Replace base64 avatars with url	2019-10-22 12:27:13 +02:00
aignatov-bio	aaf76c0526	Fix avatars in comments and activities	2019-10-22 09:54:36 +02:00
Oleksii Kriuchykhin	53402c9ce1	Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]	2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
aignatov-bio	a3b2c7d5fe	Fix report image issues [SCI-3772] (#1983) ... * Fix report image issues * Small fixes	2019-09-12 09:02:45 +02:00
Mojca Lorber	e8f24b18e2	Fix missing icon on shared inventories in global search	2019-09-10 11:20:18 +02:00
mlorb	ba5bebedb2	change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)	2019-09-02 10:30:29 +02:00
Miha Mencin	a7bb7a1dd8	additional checking for icon: check also if user is guest	2019-08-26 11:20:18 +02:00
Miha Mencin	b850efbceb	Code review remarks, added tooltip for unshared inventory	2019-08-26 10:45:40 +02:00
Miha Mencin	9e9e698778	SCI-3806 Add an icon indicating shared status to dropdown	2019-08-26 09:14:37 +02:00