5405 commits

Author	SHA1	Message	Date
Urban Rotnik	3a76753b72	Add Edit renderer for ListColumnType	2019-11-29 12:52:27 +01:00
Alex Kriuchykhin	fbf1a5b6e2	Merge pull request #2239 from okriuchykhin/ok_SCI_4098 ... Refactor Azure configuration and connected accounts [SCI-4098]	2019-11-29 11:30:33 +01:00
Urban Rotnik	5f2407e3fb	Add view renders for DateTime column types	2019-11-29 10:50:14 +01:00
Urban Rotnik	cac4c11071	Typo fix	2019-11-29 10:19:57 +01:00
Urban Rotnik	65d8d0e35b	DateTime HTML and JS simplified	2019-11-29 10:19:57 +01:00
Urban Rotnik	d9178f4617	Remove .off handlers for columns JS	2019-11-29 10:19:56 +01:00
Urban Rotnik	bc1c377f63	Fix html	2019-11-29 10:19:56 +01:00
Urban Rotnik	9ea61578f1	Generic custom trigger event for loading partial	2019-11-29 10:19:55 +01:00
Urban Rotnik	cb0fe049f0	Remove range method from model	2019-11-29 10:19:55 +01:00
Urban Rotnik	5ae29d549e	Add manage modal for DateTime values	2019-11-29 10:19:55 +01:00
Urban Rotnik	1c9d7ef6e7	Add File type renderer	2019-11-29 10:19:54 +01:00
aignatov-bio	3474f72c41	Change JS load order	2019-11-29 10:19:49 +01:00
Urban Rotnik	f39af1916f	Split DateTime and DateTimeRange column types, rename DateType table	2019-11-29 10:19:16 +01:00
Urban Rotnik	f30664a7b3	Add inverse_of option	2019-11-29 10:19:15 +01:00
Urban Rotnik	aee806edaa	Add methods for repository_date_time_value	2019-11-29 10:19:14 +01:00
Urban Rotnik	2a20ad68a3	Add range column to RepositoryColumn	2019-11-29 10:19:14 +01:00
Urban Rotnik	fe4aa12ced	Add DateTime columns CRUD endpoints	2019-11-29 10:19:14 +01:00
Urban Rotnik	b591346a3f	Add DateTime type column	2019-11-29 10:19:13 +01:00
Urban Rotnik	64d797678a	Small syntax improvement	2019-11-29 10:19:13 +01:00
Urban Rotnik	0eb5c5671f	LoadParams refactor	2019-11-29 10:19:13 +01:00
Urban Rotnik	253205dcd1	Syntax improvements	2019-11-29 10:19:12 +01:00
Urban Rotnik	dc6cc3bc62	Show after create flash messages	2019-11-29 10:19:12 +01:00
Urban Rotnik	85153a5785	Split css file	2019-11-29 10:19:12 +01:00
Urban Rotnik	9bf948c3a8	Add statuses validation on FE	2019-11-29 10:19:11 +01:00
Urban Rotnik	b9d50263c4	Add simple emoji picker	2019-11-29 10:19:11 +01:00
Urban Rotnik	621f7da37b	Add fields for StatusItem	2019-11-29 10:19:10 +01:00
Urban Rotnik	b2ce600820	Add delimiter column for repository_column	2019-11-29 10:19:10 +01:00
Urban Rotnik	b2b6296cb5	Improve update items action, JS and views	2019-11-29 10:19:10 +01:00
Urban Rotnik	804e36650e	Add service for updating ListColumnItems	2019-11-29 10:19:09 +01:00
Urban Rotnik	db2943a1b7	Strip length of dropdown items, unique items, add specific params to request	2019-11-29 10:19:09 +01:00
Urban Rotnik	6fbb99c8d2	Add List items partial and JS	2019-11-29 10:19:09 +01:00
Urban Rotnik	24acf1f84b	Fix edit mode for File and Text	2019-11-29 10:19:08 +01:00
Urban Rotnik	1e8261ac2a	Update InventoryColumns API for new Status Type	2019-11-29 10:19:07 +01:00
Urban Rotnik	7ab12baef9	Add API endpoint for StatusItems	2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin	7efcf5abcf	Cleanup updateButtons method [SCI-4070]	2019-11-29 10:19:07 +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	73be1181ac	Fix failing tests for repository states [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
Oleksii Kriuchykhin	e8fdfe7111	Implement datatables renderer for status data type [SCI-4032]	2019-11-29 10:19:04 +01:00
aignatov-bio	2024afce4b	Fix markup	2019-11-29 10:19:04 +01:00
aignatov-bio	c6a075664c	Add default renders for new columns type	2019-11-29 10:19:04 +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
aignatov-bio	6d0f0dd3e2	Fix messages for manage columns modal	2019-11-29 10:18:11 +01:00
aignatov-bio	28de55acce	Fix url variables for manage columns	2019-11-29 10:18:06 +01:00
aignatov-bio	308c1c93d0	Fix merge	2019-11-29 10:18:02 +01:00
aignatov-bio	9eec36cb01	Refactor column type edit modal	2019-11-29 10:17:58 +01:00
Mojca Lorber	bcb8cc1840	Remove byebug	2019-11-29 10:17:54 +01:00
Mojca Lorber	305104f639	Refactor text inventory type	2019-11-29 10:17:53 +01:00
Urban Rotnik	37b7d5aa64	Use values from extends	2019-11-29 10:17:52 +01:00
Urban Rotnik	f645ff52ab	Refactor ColumnServices	2019-11-29 10:17:52 +01:00
Urban Rotnik	28d7a4f284	Refactor FileColumnController	2019-11-29 10:17:51 +01:00
Urban Rotnik	1720623665	Refactor RepositoryListColumn controller	2019-11-29 10:17:50 +01:00
Mojca Lorber	a269c8462d	Fix hound	2019-11-29 10:17:50 +01:00
Mojca Lorber	006a422e25	Refactor again	2019-11-29 10:17:49 +01:00
Mojca Lorber	482deafdd3	Rename partial	2019-11-29 10:17:49 +01:00
Mojca Lorber	fe8829b592	Fix multiple load of modal	2019-11-29 10:17:49 +01:00
Mojca Lorber	f1487561be	Reafactor javascript repository column	2019-11-29 10:17:48 +01:00
Mojca Lorber	c47d0017a0	fix failed tests	2019-11-29 10:17:48 +01:00
Mojca Lorber	9d4796cf90	refactor repository column javascript	2019-11-29 10:17:44 +01:00
Mojca Lorber	467c80da52	Update basic modal layout for creating new column types	2019-11-29 10:16:47 +01:00
Urban Rotnik	43e81c46b7	Rename CreateColumnService to ColumnService	2019-11-29 10:16:46 +01:00
Urban Rotnik	5923e8897a	Remove commented code	2019-11-29 10:16:46 +01:00
Urban Rotnik	b55966487e	Remove permission helper	2019-11-29 10:16:46 +01:00
Urban Rotnik	4cb3d1b6f0	Add BaseColumnsController for column_types controllers	2019-11-29 10:16:45 +01:00
Urban Rotnik	14b43d516e	Add UpdateStatusColumnService service	2019-11-29 10:16:45 +01:00
Urban Rotnik	de2ee66dd4	Add DeleteStatusColumnService service	2019-11-29 10:16:44 +01:00
Urban Rotnik	5930bdd794	Add StatusColumnsController	2019-11-29 10:16:44 +01:00
Urban Rotnik	bbb8c46fe2	Add CreateStatusColumnService service	2019-11-29 10:16:44 +01:00
Urban Rotnik	c00a837105	Add models for RepositoryStatus column type	2019-11-29 10:16:43 +01:00
Mojca Lorber	dda5ffe4f9	Add create repository column service	2019-11-29 10:16:43 +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	6c7f45fc20	Add simplified view for sign-in form [SCI-4098]	2019-11-28 17:00:43 +01:00
aignatov-bio	e07fad72b6	Merge pull request #2235 from aignatov-bio/ai-sci-4116-update-filter-logic-for-activities ... Update filter logic for activities [SCI-4116]	2019-11-28 14:58:53 +01:00
aignatov-bio	bcd9c6aee3	Merge pull request #2238 from aignatov-bio/ai-sci-4101-improve-time-zone-date-format-interaction ... Improve time zone and date format interaction at preference page [SCI-4101]	2019-11-28 14:54:30 +01:00
aignatov-bio	a87cc3ae98	Merge pull request #2237 from aignatov-bio/ai-sci-4114-fix-task-and-protocol-description-activities ... Add task description and task protocol description activities [SCI-4114]	2019-11-28 14:54:20 +01:00
aignatov-bio	4f5fada41f	Merge pull request #2236 from aignatov-bio/ai-sci-4117-ui-activities-fixes ... UI activtiies fixes [SCI-4117]	2019-11-28 14:54:07 +01:00
aignatov-bio	990d8e1c3a	Merge pull request #2218 from aignatov-bio/ai-sci-4088-remove-rte-from-team-description ... Replace RTE with simple textarea [SCI-4088]	2019-11-28 14:45:06 +01:00
Miha Mencin	13191f1a72	Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user ... Sci 4058 disable inventory delition for normal user	2019-11-28 14:31:32 +01:00
Oleksii Kriuchykhin	f5abb7c767	Add connected accounts section to settings [SCI-4106]	2019-11-27 23:16:25 +01:00
aignatov-bio	06a11a4a49	Improve time zone and date format interaction at preference page	2019-11-27 15:14:40 +01:00
aignatov-bio	68284c10da	Add task description and task protocol description activities	2019-11-27 14:37:53 +01:00
aignatov-bio	a87fc24251	UI activtiies fixes	2019-11-27 14:04:59 +01:00
aignatov-bio	3d9351c537	Update filter logic for activities	2019-11-27 13:13:19 +01:00
aignatov-bio	3322676373	Replace RTE with simple textarea	2019-11-27 12:37:33 +01:00
aignatov-bio	75f29d7b04	Fix tag edit mode	2019-11-27 12:34:54 +01:00
Oleksii Kriuchykhin	6b20a10473	Refactor Azure configuration [SCI-4098]	2019-11-26 15:09:40 +01:00
Alex Kriuchykhin	111056a032	Merge pull request #2224 from okriuchykhin/ok_SCI_4112 ... Fix adding experiment contents to report [SCI-4112]	2019-11-26 09:50:28 +01:00
Miha Mencin	a328c4ad56	fix CR comments	2019-11-25 17:40:29 +01:00
Miha Mencin	d74cad3b8c	Merge pull request #2231 from biosistemika/SCI-4108-bug-at-report-generation ... SCI-4108 Docx report error because of checklist does not have any item	2019-11-25 17:33:20 +01:00
Miha Mencin	b968de96c7	Merge pull request #2232 from biosistemika/SCI-4109-export-with-assigned-item-bugfix ... SCI-4109 fix the file copying	2019-11-25 17:32:34 +01:00
aignatov-bio	8f2eaaacf9	Merge pull request #2229 from aignatov-bio/ai-sci-4111-fix-css-on-activity-page ... Update css for global activities page [SCI-4111]	2019-11-25 14:08:33 +01:00
aignatov-bio	ad137b47df	Merge pull request #2230 from aignatov-bio/ai-sci-4097-fix-dropdown-event-after-back-action ... Fix dropdown event after click browser back action [SCI-4097]	2019-11-25 13:58:04 +01:00
aignatov-bio	d732b2f1a6	Merge pull request #2228 from aignatov-bio/ai-sci-4090-fix-task-tags ... Add strict order to module tags in modal [SCI-4090]	2019-11-25 13:55:33 +01:00
aignatov-bio	4a641ac03a	Merge pull request #2227 from aignatov-bio/ai-sci-4110-update-due-date-autosave-for-tags ... Fix permission check and due date clear [SCI-4110]	2019-11-25 13:55:20 +01:00
aignatov-bio	993424d08e	Merge pull request #2226 from aignatov-bio/ai-sci-4086-fix-team-name-after-update ... Fix name update and path to team [SCI-4086]	2019-11-25 13:55:09 +01:00
Miha Mencin	48fc7708f8	SCI-4109 fix the file copying	2019-11-25 13:38:16 +01:00
Miha Mencin	72c158d3e2	SCI-4108 check if there are any checklist items before rendering the checklist	2019-11-25 11:55:02 +01:00
aignatov-bio	179dea085f	Fix dropdown event after click browser back action	2019-11-25 11:28:11 +01:00
aignatov-bio	e99fe2dbda	Update css for global activties page	2019-11-25 11:09:37 +01:00
Miha Mencin	e65e344c39	fix styling	2019-11-25 10:45:21 +01:00
aignatov-bio	5100ab4d08	Add strict order to module tags in modal	2019-11-25 10:15:06 +01:00
Miha Mencin	bd34435b39	fixing style issues	2019-11-25 08:44:33 +01:00
aignatov-bio	fae8b252a6	Fix markup	2019-11-24 21:11:32 +01:00
aignatov-bio	e76b4ca26f	Fix permission check and due date clear	2019-11-24 21:06:34 +01:00
aignatov-bio	7fa753ca81	Fix name update and path to team	2019-11-23 23:20:38 +01:00
aignatov-bio	84a9d764e0	Add arrows controll for dropdown	2019-11-23 21:09:34 +01:00
Oleksii Kriuchykhin	8f94c85b7a	Fix adding experimaent contents to report [SCI-4112]	2019-11-22 14:57:59 +01:00
Miha Mencin	1bf6663196	check the permissions in before action	2019-11-22 13:23:02 +01:00
aignatov-bio	96523ae131	Update CSS for team preferences and enable autosave	2019-11-22 10:46:44 +01:00
aignatov-bio	2e30f50ae8	Merge pull request #2221 from aignatov-bio/ai-sci-3976-add-autosave-other-fields ... Add autosave for protocol keywords, user preferences and due date [SCI-3976]	2019-11-21 13:13:10 +01:00
aignatov-bio	c712e4e48c	Fix due date moda	2019-11-21 13:05:36 +01:00
aignatov-bio	0b04ca4012	Fix markup	2019-11-21 12:19:47 +01:00
aignatov-bio	f2ed3198d5	Add due date autosave field	2019-11-21 12:14:43 +01:00
Miha Mencin	04a6645cfc	Separate view/edit/modify permissions SCI-4058	2019-11-20 17:12:47 +01:00
aignatov-bio	56ae32323c	Add autosave for protocol keywords and user preferences	2019-11-20 14:57:53 +01:00
Oleksii Kriuchykhin	46ee43ea8b	Improve handling of file links for local storage [SCI-4071]	2019-11-19 15:35:31 +01:00
Oleksii Kriuchykhin	5e8afae1f0	Fix failing tests [SCI-3988]	2019-11-18 15:15:44 +01:00
Urban Rotnik	0dc1daa7c6	Add gem Down, File size validation before and during download	2019-11-18 14:28:19 +01:00
Oleksii Kriuchykhin	244c003137	Prettify template JSON files [SCI-3988]	2019-11-18 14:26:38 +01:00
Oleksii Kriuchykhin	b2862b6c9e	Remove Paperclip DB columns and fix experiment templates [SCI-3988]	2019-11-18 14:16:28 +01:00
aignatov-bio	32d99f676c	Fix markup	2019-11-18 13:59:55 +01:00
aignatov-bio	264493a322	Finish removing Select2 library	2019-11-18 13:59:55 +01:00
aignatov-bio	e7ad7ae969	New tags drop down	2019-11-18 13:59:55 +01:00
aignatov-bio	5964a1b1f4	Fix shadows	2019-11-18 13:59:54 +01:00
Anton Ignatov	0ed3d84407	Fix styling	2019-11-18 13:59:54 +01:00
Anton Ignatov	b1c32d9a30	Improve dropdown and side panel	2019-11-18 13:59:54 +01:00
Anton Ignatov	163a17d6d9	Fix tablet view	2019-11-18 13:59:54 +01:00
Anton Ignatov	5b8e1fedf1	Fix markup	2019-11-18 13:59:54 +01:00
Anton Ignatov	7117b767f4	Fix commnets to PR	2019-11-18 13:59:54 +01:00
Anton Ignatov	17e457c686	Finished global activities refactoring	2019-11-18 13:59:54 +01:00
Anton Ignatov	fc70ce24f8	Refactor side filters for global activities	2019-11-18 13:59:54 +01:00
Anton Ignatov	4e517ca6c4	Fix eslint for main file	2019-11-18 13:59:54 +01:00
Anton Ignatov	7b855f54ac	Finish main part of selectors	2019-11-18 13:59:54 +01:00
Anton Ignatov	f832cfbbd4	Added tags	2019-11-18 13:59:54 +01:00
Anton Ignatov	04bd5269ec	Created new dropdown selector	2019-11-18 13:59:54 +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
Urban Rotnik	dcfca76602	Update method 'update_canvas' to work with new DB constraint	2019-11-18 11:11:41 +01:00
Urban Rotnik	b8bf7bbd9b	Rename validation	2019-11-18 11:11:40 +01:00
Urban Rotnik	43e3763ec8	Update x, y, experiment unqiue validation ... [SCI-3887]	2019-11-18 11:11:40 +01:00
Urban Rotnik	5e97116c5a	Update results params	2019-11-18 11:11:39 +01:00
Urban Rotnik	8b5e346770	Remove file deletion manually	2019-11-18 11:11:39 +01:00
Urban Rotnik	cc9d987321	Add update result(file) and create result(file) API endpoint	2019-11-18 11:11:38 +01:00
Urban Rotnik	060125a1c4	Add file size validation	2019-11-18 11:11:38 +01:00
Urban Rotnik	1be88baab1	Add API endpoint for Attachments resource	2019-11-18 11:11:38 +01:00
Urban Rotnik	e7083e188c	Add API endpoint for Step resource ... [SCI-3835]	2019-11-18 11:11:37 +01:00
Urban Rotnik	24033bec7a	Add API endpoint for Task creation	2019-11-18 11:11:37 +01:00
Urban Rotnik	7802d5ee8b	Add uniq validation for x and y position scoped to experiment	2019-11-18 11:11:36 +01:00
aignatov-bio	3eb6f5695b	Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004 ... Add auto-save feature to text fields [SCI-4004]	2019-11-18 09:11:10 +01:00
aignatov-bio	a5666cacc5	Fix markup	2019-11-15 16:28:08 +01:00
aignatov-bio	b9a34fa809	Fix placeholder for authors	2019-11-15 16:23:48 +01:00
aignatov-bio	d88d479854	Merge pull request #2175 from aignatov-bio/ai-sci-4007-error-at-click-to-share-button ... Add check for existing elements for shared repository modal [SCI-4007]	2019-11-15 14:32:46 +01:00
aignatov-bio	b979435b35	Merge pull request #2199 from aignatov-bio/ai-sci-4055-fix-eln-export-for-files-without-extension ... Fix eln export for file without extension [SCI-4055]	2019-11-15 14:16:07 +01:00
Alex Kriuchykhin	d1a324401e	Merge pull request #2210 from biosistemika/release_1_17_6 ... Master << Release 1.17.6	2019-11-14 11:46:51 +01:00
aignatov-bio	1488f75e26	Add activities	2019-11-13 13:57:04 +01:00
Alex Kriuchykhin	8b665d4f1c	Merge pull request #2193 from okriuchykhin/ok_SCI_4028 ... Fix reports in team importer [SCI-4028]	2019-11-13 13:10:15 +01:00
aignatov-bio	19f5f9de67	Disable autocomplete for textarea field	2019-11-12 14:44:33 +01:00
aignatov-bio	a356c290ea	Fix markup	2019-11-12 11:32:43 +01:00
aignatov-bio	4a8eb041cb	Fix markup	2019-11-12 11:31:26 +01:00
aignatov-bio	a9690482d1	Add autosave feature to text fields	2019-11-12 11:26:18 +01:00
Urban Rotnik	1d180f3688	Fix for step description overwriting ... [SCI-4067]	2019-11-11 10:31:55 +01:00
aignatov-bio	cf2687f7e5	Merge branch 'ml-sci-4004' of https://github.com/mlorb/scinote-web into mlorb-ml-sci-4004	2019-11-07 13:03:02 +01:00
aignatov-bio	938ea259cc	Merge pull request #2195 from aignatov-bio/ai-sci-4051-fix-team-import-for-avatars ... Fix team import for user with avatars [SCI-4051]	2019-11-07 13:02:30 +01:00
Oleksii Kriuchykhin	b646295698	Fix service_url for local storage [SCI-4057]	2019-11-06 15:21:56 +01:00
aignatov-bio	e4a39bbbe4	Add check for files	2019-11-06 14:41:51 +01:00
aignatov-bio	0c5ce90895	Fix eln export for file without extension	2019-11-06 09:53:44 +01:00
Alex Kriuchykhin	522d236e10	Merge pull request #2198 from okriuchykhin/ok_SCI_4053 ... Fix TinyMCE images in protocol cloning [SCI-4053]	2019-11-05 18:15:22 +01:00
Oleksii Kriuchykhin	b2eda231a0	Fix TinyMCE images in protocol clonning [SCI-4053]	2019-11-05 18:13:44 +01:00
Alex Kriuchykhin	95686a9275	Merge pull request #2197 from okriuchykhin/ok_SCI_4053 ... Fix TinyMCE image URLs in the editor [SCI-4053]	2019-11-05 13:46:48 +01:00
Oleksii Kriuchykhin	67fdda1eeb	Fix TinyMCE image URLs in the editor [SCI-4053]	2019-11-05 13:38:47 +01:00
aignatov-bio	ae0db3a7bc	Update avatars and small CSS fixes	2019-11-05 10:43:02 +01:00
aignatov-bio	b56a997aef	Fix team import for user with avatars	2019-11-04 14:53:59 +01:00
Mojca Lorber	16eddc0ad0	Save on click away, inline editing	2019-11-03 14:59:30 +01:00
Alex Kriuchykhin	ec66ab8654	Merge pull request #2190 from mlorb/ml-sci-4023 ... Small improvements in the avatar settings [SCI-4023]	2019-10-30 16:02:24 +01:00
Oleksii Kriuchykhin	1e748f2d7e	Fix reports in team importer [SCI-4028]	2019-10-30 15:47:11 +01:00
Mojca Lorber	a3ded83292	Small css change	2019-10-30 15:42:11 +01:00
Mojca Lorber	7b86a3932a	Additional avatar small fixes	2019-10-30 15:23:14 +01:00
Alex Kriuchykhin	2e4f444f63	Merge pull request #2191 from okriuchykhin/ok_SCI_4047 ... Fix LinkedIn sign-up [SCI-4047]	2019-10-29 16:29:13 +01:00
Oleksii Kriuchykhin	ab691efdb2	Fix LinkedIn sign-up [SCI-4047]	2019-10-29 16:20:19 +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
Mojca Lorber	a0873cb16d	Small improvements in the avatar settings	2019-10-29 13:21:22 +01:00
Alex Kriuchykhin	ba3a5e5460	Merge pull request #2159 from mlorb/ml-sci-3816-v2 ... Fix reloading of datatables header again [SCI-3816]	2019-10-29 10:33:04 +01:00
Urban Rotnik	169a381629	Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download ... Fix for downloading image [SCI-4008]	2019-10-22 15:12:11 +02:00
Urban Rotnik	a7d351dc38	Add file size check	2019-10-22 14:13:22 +02:00
Alex Kriuchykhin	e333e7c44a	Merge pull request #2173 from biosistemika/release_1_17_4 ... Merge release 1.17.4 to master	2019-10-22 13:21:02 +02:00
Alex Kriuchykhin	5524598d53	Merge pull request #2172 from biosistemika/release_1_17_3 ... Merge release 1.17.3 to master	2019-10-22 12:45:02 +02:00
aignatov-bio	9950a23188	Replace base64 avatars with url	2019-10-22 12:27:13 +02:00
Urban Rotnik	0119533e75	Fix for file generation	2019-10-22 11:02:59 +02:00
aignatov-bio	4d3e318174	Add check for existing elements	2019-10-22 10:46:16 +02:00
aignatov-bio	aaf76c0526	Fix avatars in comments and activities	2019-10-22 09:54:36 +02:00
Urban Rotnik	ce9f1b1309	Add mceToken check	2019-10-22 08:28:35 +02:00
Oleksii Kriuchykhin	6c57f56bf4	Fix issue with empty cells for xlsx inventory imports [SCI-4003]	2019-10-21 12:06:45 +02:00
Oleksii Kriuchykhin	4cba412e31	Fix protocols table select all checkbox [SCI-3999]	2019-10-17 17:05:01 +02:00
Alex Kriuchykhin	34f9e6265c	Merge pull request #2162 from okriuchykhin/ok_SCI_3990 ... Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]	2019-10-17 17:03:11 +02:00
Miha Mencin	0af8629f98	SCI-3994 fix for excel import	2019-10-17 14:37:11 +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
Mojca Lorber	b78211e3ca	Fix reloading of datatables header again	2019-10-16 13:02:41 +02:00
Oleksii Kriuchykhin	f3a6c18a84	Improve permission checking for reports [SCI-3991]	2019-10-14 14:50:05 +02:00
aignatov-bio	198697ff23	Fix avatar localization	2019-10-11 12:22:09 +02:00
aignatov-bio	54627faeb3	Fix tests	2019-10-11 11:46:51 +02:00
aignatov-bio	521a367960	Add predefined avatars	2019-10-11 11:46:51 +02:00
aignatov-bio	1f43f35073	First modal	2019-10-11 11:46:51 +02:00
Oleksii Kriuchykhin	8f52b362d6	Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]	2019-10-11 11:46:51 +02:00
Alex Kriuchykhin	f6da6814b8	Merge pull request #2154 from okriuchykhin/ok_SCI_3977 ... Generate previews for newly created office files once asset is saved [SCI-3977]	2019-10-10 15:43:02 +02:00
Oleksii Kriuchykhin	07b037f05b	Generate previews for newly created office files once asset is saved [SCI-3977]	2019-10-10 15:40:50 +02:00
Alex Kriuchykhin	48171f7e02	Merge pull request #2153 from okriuchykhin/ok_SCI_3977 ... Fix previews for newly created office files [SCI-3977]	2019-10-10 15:11:24 +02:00
Oleksii Kriuchykhin	0b4f72e517	Fix previews for newly created office files [SCI-3977]	2019-10-10 14:25:19 +02:00
aignatov-bio	9d59d56818	Generate all preview for assets at same time	2019-10-10 14:17:02 +02:00
Miha Mencin	e2b5989c14	Revert "Handle missing experiment previews [SCI-3949]"	2019-10-09 16:42:15 +02:00
Alex Kriuchykhin	71aa8e646e	Merge pull request #2147 from okriuchykhin/ok_SCI_3949 ... Handle missing experiment previews [SCI-3949]	2019-10-09 16:27:16 +02:00
Oleksii Kriuchykhin	00921a5f6a	Hadle missing experiment previews [SCI-3949]	2019-10-09 16:24:21 +02:00
Miha Mencin	8e98c82bbf	SCI-3979 removing accessors	2019-10-09 15:49:49 +02:00
Miha Mencin	6d71036d07	Remove paperclip attribute accessors	2019-10-09 10:20:00 +02:00
Miha Mencin	78fd5df0f6	Revert "Fix report in academia"	2019-10-09 10:16:39 +02:00
Miha Mencin	37e6604f8b	Merge pull request #2136 from biosistemika/SCI-3975-team-export ... Sci 3975 team export	2019-10-08 21:47:08 +02:00
Miha Mencin	fa871bf56e	Merge branch 'SCI-3975-team-export' of github.com:biosistemika/scinote-web into SCI-3975-team-export	2019-10-08 21:42:13 +02:00
Miha Mencin	f12c29bd2a	fixing import	2019-10-08 21:40:44 +02:00
aignatov-bio	5eed152403	Revert "Force save office file"	2019-10-08 21:34:16 +02:00
aignatov-bio	0d88466894	Merge pull request #2139 from aignatov-bio/ai-sci-fix-office-save ... Force save office file	2019-10-08 21:11:33 +02:00
aignatov-bio	236ce30254	Force save office file	2019-10-08 21:10:18 +02:00
aignatov-bio	4a5db36c07	Merge pull request #2138 from aignatov-bio/ai-sci-fix-report-in-academia ... Fix report in academia	2019-10-08 20:19:48 +02:00
aignatov-bio	5d80c51996	Fix report in academia	2019-10-08 20:18:51 +02:00
aignatov-bio	65ab3c421a	Merge pull request #2137 from aignatov-bio/ai-sci-fix-async-request-for-multiple-result ... Fix async assets results	2019-10-08 19:52:04 +02:00
aignatov-bio	a930f7affd	Fix async assets results	2019-10-08 19:51:03 +02:00
Miha Mencin	c673c3960f	removin uneeded stuff left there by supidity	2019-10-08 17:23:46 +02:00
Miha Mencin	4f290cacfc	remove the unneeded require	2019-10-08 16:22:48 +02:00
Miha Mencin	de89a97e0a	Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-3975-team-export	2019-10-08 16:20:40 +02:00
Miha Mencin	5f16926280	SCI-3976 different approach to file download	2019-10-08 16:20:16 +02:00
Alex Kriuchykhin	f82d02b5d0	Merge pull request #2134 from okriuchykhin/ok_SCI_3960 ... Fix team deletion script [SCI-3960]	2019-10-08 13:35:07 +02:00
Alex Kriuchykhin	6306691cfe	Merge pull request #2133 from okriuchykhin/ok_SCI_3959 ... Implement JPEG quality extraction for ActiveStorage [SCI-3959]	2019-10-08 13:34:57 +02:00
Oleksii Kriuchykhin	6908a5c3a3	Fix team deletion script [SCI-3960]	2019-10-08 12:04:47 +02:00
Oleksii Kriuchykhin	3d9c2282f3	Implement JPEG quality extraction for ActiveStorage [SCI-3959]	2019-10-08 10:42:55 +02:00
aignatov-bio	f9497e2e3e	Fix TinyMCE import from ELN	2019-10-07 16:21:11 +02:00
Alex Kriuchykhin	39a2669eef	Merge pull request #2129 from okriuchykhin/ok_SCI_3950 ... Improve missing files handling when clonning TinyMceAsset [SCI-3950]	2019-10-07 09:18:45 +02:00
Oleksii Kriuchykhin	a2d70afeca	Improve missing files handling when clonning TinyMceAsset [SCI-3950]	2019-10-04 15:59:22 +02:00
mlorb	ba8ee86c9f	Merge pull request #2128 from mlorb/ml-sci-3966 ... Fix position of shared inventory icon [SCI-3966]	2019-10-04 15:21:48 +02:00
aignatov-bio	002686ba23	Merge pull request #2127 from aignatov-bio/ai-sci-3965-fix-complete-button-position ... Fix complete button position [SCI-3965]	2019-10-04 15:19:27 +02:00
Mojca Lorber	564321d327	Fix position of shared inventory icon	2019-10-04 15:18:17 +02:00
aignatov-bio	b460cd4384	Fix complete button position	2019-10-04 15:17:28 +02:00
Urban Rotnik	037bba9a16	Merge pull request #2126 from urbanrotnik/ur-sci-3738-new-ste-default-field-selection ... Fix focus for RTE [SCI-3738]	2019-10-04 15:02:55 +02:00
Urban Rotnik	bd1c5e4454	Fix focus for RTE	2019-10-04 14:55:14 +02:00
mlorb	9e1339fb18	Merge pull request #2124 from aignatov-bio/ai-sci-3961-fix-image-in-archive-experiments ... Fix image in archived experiments [SCI-3961]	2019-10-04 14:52:55 +02:00
aignatov-bio	23581059e7	Remove image	2019-10-04 14:50:27 +02:00
Urban Rotnik	c296760be8	Merge pull request #2125 from urbanrotnik/ur-sci-3962-step-is-not-saved-after-removing-file ... Add team_id when asset is creating [SCI-3962]	2019-10-04 14:46:18 +02:00
Alex Kriuchykhin	076d61d4d0	Merge pull request #2116 from okriuchykhin/ok_SCI_3908 ... Remove Paperclip from the codebase [SCI-3908]	2019-10-04 14:45:42 +02:00
Urban Rotnik	8f0c3bd2ce	Add team_id when asset is creating	2019-10-04 14:24:19 +02:00