scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-30 03:46:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
5054 commits 69 branches 179 tags 165 MiB
Commit graph

3919 commits

Author SHA1 Message Date
mlorb 7fdef4d3ec Change experiment cards look and feel 2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin fdf7db425b Merge branch 'master' into features/templates 2019-01-18 14:41:21 +01:00
Oleksii Kriuchykhin 1861f86b2c Improve export all modal messages in case of unlimited exports [SCI-2965] 2019-01-17 17:27:32 +01:00
Oleksii Kriuchykhin e62e1873b0 Fix issue with caching in inventories dropdown [SCI-2776] 2019-01-17 15:04:20 +01:00
Alex Kriuchykhin 88cea198f0
Merge pull request #1452 from okriuchykhin/ok_SCI_2950 
Fix binary files in Export All archive [SCI-2950]
 2019-01-16 17:29:48 +01:00
Oleksii Kriuchykhin 4f9eb7e165 Fix binary files in Export All archive [SCI2950] 2019-01-16 17:07:05 +01:00
Jure Grabnar 761932282b Fix Hound formatting 
Closes SCI-2937
 2019-01-16 16:11:38 +01:00
Jure Grabnar d1f966ee05 Add importing of the experiment templates 2019-01-16 15:54:03 +01:00
Miha Mencin 0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2 
Fix task tags update on canvas cards [SCI-2875]
 2019-01-16 12:44:50 +01:00
Jure Grabnar 5b496a85d3 Experiment exporting works 2019-01-16 08:37:05 +01:00
Jure Grabnar 0184c97c61 Refactor TeamExporter into ModelExporter 2019-01-16 08:00:01 +01:00
Jure Grabnar ff17a7e367 Fix S3_BUCKET not being defined 2019-01-14 16:49:08 +01:00
Oleksii Kriuchykhin 3a4b992f4e Code style fixies []SCI-2875] 2019-01-14 16:31:23 +01:00
Matej Zrimšek a5c1cf4450 Switch user's team if he's no longer a member of the currently selected one 2019-01-12 23:39:31 +01:00
Matej Zrimšek 838455af0d Fix protocols.io Date handling at import 2019-01-12 19:28:45 +01:00
Oleksii Kriuchykhin 89240659a7 Fix task tags update on canvas cards [SCI-2875] 2019-01-11 17:20:39 +01:00
Alex Kriuchykhin b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776 
Add counters to task inventories dropdown [SCI-2776]
 2019-01-11 16:27:22 +01:00
Alex Kriuchykhin be514fd62d
Merge pull request #1445 from okriuchykhin/ok_SCI_2931 
Fix image URLs in export all document [SCI-2931]
 2019-01-11 12:03:06 +01:00
Oleksii Kriuchykhin 132f46b136 Improve error handling in task inventories dropdown [SCI-2776] 2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +01:00
Alex Kriuchykhin c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888 
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
 2019-01-10 11:05:07 +01:00
Alex Kriuchykhin 8ea37c541b
Merge pull request #1436 from okriuchykhin/ok_SCI_2904 
Disable edit button for unsupported WOPI formats [SCI-2904]
 2019-01-10 11:04:26 +01:00
mlorb 06b1e5cf20 Allow org. administrators to invite them onto all projects 2019-01-08 16:30:52 +01:00
Jure Grabnar fe46f9c9fe Reinit tooltips after cancel/save step 
Closes SCI-2891.
 2019-01-08 15:36:44 +01:00
Matej Zrimšek 8070b7f8b5 Fix Date and Time display formats on JS side 2019-01-08 08:07:24 +01:00
Matej Zrimšek b64df7d8cc Fix additional Date and Time display formats 2019-01-08 06:29:37 +01:00
Oleksii Kriuchykhin 6a64b23f90 Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888] 2019-01-04 10:44:38 +01:00
Alex Kriuchykhin 8ffe5dafee
Merge pull request #1437 from okriuchykhin/ok_SCI_2907 
Change sample date in date format settings [SCI-2907]
 2019-01-03 16:10:19 +01:00
Oleksii Kriuchykhin 5ea5b76d39 Change sample date in date format settings [SCI-2907] 2019-01-03 14:15:41 +01:00
Oleksii Kriuchykhin 534866467b Add counters to task inventories dropdown [SCI-2776] 2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin 2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
Matej Zrimšek c84457e1ed Prevent archiving of experiments with at least one locked task 2018-12-23 21:17:51 +01:00
Matej Zrimšek b74105abc2 Fix Date and Time display formats 2018-12-23 20:30:09 +01:00
Luka Murn 1c8407e4f4
Merge pull request #1433 from okriuchykhin/ok_SCI_2864 
Additional fix for export all S3 path [SCI-2864]
 2018-12-20 13:27:50 +01:00
Oleksii Kriuchykhin 2fa4f42883 Additional fix for export all S3 path [SCI-2864] 2018-12-20 13:22:56 +01:00
Luka Murn faf6601962
Merge pull request #1432 from okriuchykhin/ok_SCI_2864 
Fix S3 zip exports path [SCI-2864]
 2018-12-20 11:08:48 +01:00
Oleksii Kriuchykhin c880f3fd84 Fix S3 zip exports path [SCI-2864] 2018-12-20 11:07:19 +01:00
Luka Murn ac5c809d20 Add force_encoding to export all report view template 2018-12-18 21:03:10 +01:00
Luka Murn cb1cfe2ef3
Merge pull request #1429 from Ducz0r/lm-sci-2902-fix-2 
Fix assets include in export all report to work on production env [SCI-2902]
 2018-12-18 09:14:44 +01:00
Luka Murn 097e871228 Fix assets include in export all report to work on production env 
Closes SCI-2902.
 2018-12-18 09:10:55 +01:00
Oleksii Kriuchykhin 3610960ee3 Fix ajax calls duplication [SCI-2916] 2018-12-17 20:59:22 +01:00
mlorb 5ebcd1dfe1
Merge pull request #1423 from mlorb/ml-sci-2911 
Fix export projects getting fired multiple times [SCI-2911]
 2018-12-17 11:26:40 +01:00
mlorb 37f1d66268
Merge pull request #1421 from mlorb/ml-sci-2800-v2 
Fix tooltip style [SCI-2800]
 2018-12-17 11:25:31 +01:00
Luka Murn 8935e4c7c1
Merge pull request #1426 from Ducz0r/lm-add-queue-to-export-all-jobs 
Add team_zip_export job queue to export all delayed jobs
 2018-12-16 22:16:10 +01:00
Alex Kriuchykhin 94e6143ac0
Merge pull request #1425 from okriuchykhin/ok_SCI_2907 
Use fixed date example in date format drop down [SCI-2907]
 2018-12-16 20:11:58 +01:00
Alex Kriuchykhin a6bfa38ceb
Merge pull request #1424 from okriuchykhin/ok_SCI_2909 
Change color of the selected element in the side navigation [SCI-2909]
 2018-12-16 20:11:41 +01:00
Alex Kriuchykhin ab0924c8e6
Merge pull request #1415 from okriuchykhin/ok_SCI_2864 
Use built-in methods for Postgres extensions enabling [SCI-2864]
 2018-12-16 19:45:56 +01:00
Alex Kriuchykhin 8a348b8504
Merge pull request #1422 from okriuchykhin/ok_SCI_2910 
Improve rendering speed of inventory table [SCI-2910]
 2018-12-16 19:45:29 +01:00
Alex Kriuchykhin abdf64a8c7
Merge pull request #1420 from okriuchykhin/ok_SCI_2894 
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
 2018-12-16 19:44:50 +01:00
Luka Murn 7ba9628cfb Add team_zip_export job queue to export all delayed jobs 2018-12-13 18:40:56 +01:00
Oleksii Kriuchykhin 23f8602872 Use fixed date example in date format dropdown [SCI-2907] 2018-12-13 17:53:04 +01:00
Oleksii Kriuchykhin 97bde075b2 Change color of the selected element in the side navigation [SCI-2909] 2018-12-13 16:50:22 +01:00
mlorb 55cab34eb4 fix export projects getting fired miltiple times 2018-12-13 16:46:08 +01:00
Oleksii Kriuchykhin d5c07fd22a Improve rendering speed of inventory table [SCI-2910] 2018-12-13 16:17:22 +01:00
Luka Murn 022d0d9512
Merge pull request #1419 from Ducz0r/lm-sci-2902-fix 
Change export all to use HTML instead of PDF [SCI-2902]
 2018-12-13 15:19:37 +01:00
mlorb b7efce579b fix tooltip style 2018-12-13 12:43:12 +01:00
Oleksii Kriuchykhin 311189a2e9 Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894] 2018-12-13 11:18:09 +01:00
Luka Murn 3d7b633c25 Hound is love, Hound is life 2018-12-12 14:03:16 +01:00
Alex Kriuchykhin 4e416fe81b
Merge pull request #1404 from okriuchykhin/ok_SCI_2822 
Return task inputs/outputs as references [SCI-2822]
 2018-12-12 11:36:39 +01:00
mlorb 3f79cc5f93
Merge pull request #1418 from mlorb/ml-sci-2905 
Fix due date can not be set [SCI-2905]
 2018-12-12 11:27:57 +01:00
mlorb cfd5156c09
Merge pull request #1416 from mlorb/ml-sci-2871 
Fix behavior when user has no teams [SCI-2871]
 2018-12-12 11:27:28 +01:00
mlorb 8170e1b367
Merge pull request #1414 from mlorb/ml-sci-2899 
Fix invited member is added multiple times to team [SCI-2899]
 2018-12-12 11:26:41 +01:00
Luka Murn 65adc7a556 Fix 2 minor visual bugs in reports 2018-12-12 11:15:32 +01:00
Luka Murn 24af108e98 Change PDF in export all to HTML 2018-12-12 11:15:16 +01:00
mlorb 426fadc10a Fix due date can not be set 2018-12-11 10:31:13 +01:00
mlorb 4040b31143 Fix behavior when user has no teams 2018-12-10 15:42:05 +01:00
Oleksii Kriuchykhin 7cd1c12a4f Use built-in methods for Postgres extensions enabling [SCI-2864] 2018-12-10 14:14:49 +01:00
Alex Kriuchykhin 37db41e18e
Merge pull request #1405 from okriuchykhin/ok_SCI_2881 
Refresh sidebar when project is archived/restored [SCI-2881]
 2018-12-10 14:11:34 +01:00
Alex Kriuchykhin 51ba74cbab
Merge pull request #1403 from okriuchykhin/ok_SCI_2757 
Enable caching for navigation sidebar [SCI-2757]
 2018-12-10 14:11:05 +01:00
mlorb 33d5d2a1cc
Merge pull request #1412 from mlorb/ml-sci-2893 
Fix download exported project from email link [SCI-2893]
 2018-12-10 09:48:00 +01:00
mlorb 7c3bad1e86
Merge pull request #1410 from mlorb/ml-sci-2789 
Fix missing protocols link tooltip [SCI-2789]
 2018-12-10 09:15:31 +01:00
Luka Murn 3663320cf1
Merge pull request #1411 from Ducz0r/lm-fix-team-importer 
Refactor team importer to use closed File.open blocks
 2018-12-10 08:52:26 +01:00
Matej Zrimšek 9480234682 Show all smart annotations when they contain special characters [SCI-2816] 2018-12-09 11:15:31 +01:00
mlorb d761a81b26 fix download link in email again 2018-12-07 15:02:45 +01:00
mlorb 2246166107 fix protocol link tooltip again 2018-12-07 12:00:42 +01:00
mlorb d37f3a3c09 fix invited member is added multiple times to team 2018-12-07 11:36:26 +01:00
mlorb 5dee804006 fix download exported project from email link 2018-12-06 09:42:58 +01:00
mlorb 3031fb7a4b
Merge pull request #1398 from mlorb/ml-sci-2786 
Fix projects table css [SCI-2786]
 2018-12-06 09:15:51 +01:00
Luka Murn f56847e44a Refactor team importer to use closed File.open blocks 2018-12-05 18:34:32 +01:00
mlorb c7f5c17e7e change css again 2018-12-04 11:21:54 +01:00
mlorb 7d1817350a fix missing protocols link tooltip 2018-12-04 10:45:16 +01:00
Oleksii Kriuchykhin d2b1fd8ef2 Remove unneeded check [SCI-2757] 2018-12-03 13:03:22 +01:00
Alex Kriuchykhin 9621f0b372
Merge pull request #1408 from okriuchykhin/ok_SCI_2802 
Search for IDs on inventory table as text [SCI-2802]
 2018-12-03 11:39:57 +01:00
Oleksii Kriuchykhin 2c0927b254 Search for IDs on inventory table as text [SCI-2802] 2018-11-30 15:32:01 +01:00
Oleksii Kriuchykhin bf3c7e7840 Fix search across reports, search all readable projects [SCI-2823] 2018-11-30 11:46:13 +01:00
Oleksii Kriuchykhin e43b366cdb Disable fragment caching 2018-11-29 18:07:31 +01:00
Oleksii Kriuchykhin 2c96f08b98 Refresh sidebar when project is archived/restored [SCI-2881] 2018-11-29 14:20:20 +01:00
Oleksii Kriuchykhin 60a19734b2 Enable caching for navigation sidebar [SCI-2757] 2018-11-29 11:28:36 +01:00
Luka Murn 8b1449b5a2 Add bottom margin to OAuth authorize page, for better mobile xp 2018-11-28 21:46:33 +01:00
Oleksii Kriuchykhin 5b566b48ae Improve error messages and fix task users/items endpoints [SCI-2886] 2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin b3a377f949 Return task inputs/outputs as references [SCI-2822] 2018-11-28 11:33:00 +01:00
Alex Kriuchykhin 20e2cbf0ca
Merge pull request #1391 from okriuchykhin/ok_SCI_2880 
Fix smart annotations rendering issues [SCI-2880]
 2018-11-28 09:47:20 +01:00
mlorb 15ddd0ab91 fix projects table css 2018-11-27 12:37:10 +01:00
Alex Kriuchykhin 676d4da7d2
Merge pull request #1397 from okriuchykhin/ok_SCI_2885 
Fix support menu for Safari [SCI-2885]
 2018-11-27 11:21:29 +01:00
mlorb 398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676 
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
 2018-11-27 11:06:45 +01:00
mlorb 0b6b3b3609 code simplify 2018-11-27 10:58:51 +01:00
Oleksii Kriuchykhin 79544e789d Fix support menu for Safari [SCI-2885] 2018-11-26 18:47:21 +01:00
Alex Kriuchykhin d475197e65
Merge pull request #1396 from okriuchykhin/ok_SCI_2882 
Fix handsontable initialization [SCI-2882]
 2018-11-26 15:19:23 +01:00
Oleksii Kriuchykhin d67abfda2c Additional fixies for smart annotations [SCI-2880] 2018-11-26 15:17:18 +01:00
Jure Grabnar 7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix 
Protocols - import from protocols.io doesn't work
 2018-11-26 14:56:25 +01:00
mlorb 18d9ab5888 fixes upon @Ducz0r request 2018-11-26 14:23:26 +01:00
Oleksii Kriuchykhin 2e00f1546a Fix handsontable initialization [SCI-2882] 2018-11-26 14:11:46 +01:00
Jure Grabnar 6ec2c99a28 Hound styling 2018-11-26 13:52:01 +01:00
Jure Grabnar 0086e4dcf3 Catch some of templates error when import protocols.io 2018-11-26 13:43:05 +01:00
Luka Murn eb2bf184b2
Merge pull request #1394 from Ducz0r/lm-sci-2884-fix 
Update export email's look & feel [SCI-2884]
 2018-11-26 11:50:31 +01:00
Jure Grabnar c7d108ec16 Update according to Hound 
Closes [SCI-2790]
 2018-11-23 20:52:07 +01:00
Jure Grabnar 1c7a051551 Catch all errors on PIO import and show message 2018-11-23 20:47:48 +01:00
Jure Grabnar 2834edb286 Add command/subprotocol/safety for PIO 2018-11-23 20:13:34 +01:00
Jure Grabnar c00b08b101 Add sw_package and dataset component for PIO 2018-11-23 19:44:10 +01:00
Jure Grabnar 5ab2556632 Importing of protocols now works 2018-11-23 18:54:37 +01:00
Jure Grabnar 2c8a7f8eca Add last_modified evaluation for PIO import 2018-11-23 17:51:47 +01:00
Jure Grabnar 87d5e5029a Fix publish_date in PIO import 2018-11-23 17:37:26 +01:00
Luka Murn 87ff7c71e3 Update the delivery email look & feel 
Closes SCI-2884.
 2018-11-23 17:24:10 +01:00
Jure Grabnar 76c2da4bae Add uniq tables 2018-11-23 16:30:29 +01:00
mlorb f61187dd18 Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows 2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin b926cadba4 Fix smartannotations rendering issues [SCI-2880] 2018-11-23 15:07:08 +01:00
Luka Murn af307eae73 Move some text into localization file 2018-11-23 11:12:10 +01:00
Luka Murn d071454fc8 Remove byebug from HTML template 
Closes SCI-2883.
 2018-11-23 10:31:41 +01:00
Alex Kriuchykhin 95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859 
Refactor & restyle the API authorization screen [SCI-2859]
 2018-11-22 13:06:13 +01:00
mlorb de803e70a8
Merge pull request #1385 from mlorb/ml-sci-2866 
Fix in app help window does not close in some cases [SCI-2866]
 2018-11-22 10:48:52 +01:00
mlorb 4ace5bf49f
Merge pull request #1384 from mlorb/ml-sci-2846 
Fix teams switch not working at navigating from task [SCI-2846]
 2018-11-22 10:48:33 +01:00
Alex Kriuchykhin f811afc7e2
Merge pull request #1387 from okriuchykhin/ok_SCI_2877 
Fix comments form for new results [SCI-2877]
 2018-11-22 10:28:09 +01:00
Oleksii Kriuchykhin 6cd033767c Fix comments form for new results [SCI-2877] 2018-11-21 23:48:43 +01:00
Oleksii Kriuchykhin df938a8ba5 Fix task tags modal [SCI-2875] 2018-11-21 22:24:12 +01:00
Alex Kriuchykhin afe5db5cf3
Merge pull request #1382 from okriuchykhin/ok_SCI_2872 
Change text color on project cards tabs [SCI-2872]
 2018-11-21 10:59:03 +01:00
mlorb 39b01bc8ed fix in app help window does not close in some cases 2018-11-21 10:19:41 +01:00
mlorb 8bf1056bf5 fix teams switch not working at navigating from task 2018-11-21 10:12:21 +01:00
Alex Kriuchykhin c3ef391641
Merge pull request #1380 from okriuchykhin/ok_SCI_2869 
Prevent user being added to project/task multiple times [SCI-2869]
 2018-11-20 22:38:38 +01:00
mz3944 6b996fc000
Merge pull request #1362 from mz3944/mz-SCI-2817 
Export - various small changes/fixes [SCI-2817]
 2018-11-20 21:32:47 +01:00
mz3944 4d460d14ea
Merge pull request #1378 from mz3944/mz-SCI-2861 
All users in smart annotation have removed in brackets [SCI-2861]
 2018-11-20 21:22:23 +01:00
mz3944 a9eb2fc249
Merge pull request #1377 from mz3944/mz-SCI-2863 
Fix DataTable display for protocol modal [SCI-2863]
 2018-11-20 21:21:29 +01:00
Oleksii Kriuchykhin 59fb971394 Change text color on project cards tabs [SCI-2872] 2018-11-20 17:31:27 +01:00
Oleksii Kriuchykhin d98f11abdc Refactor & restyle the API authorization screen [SCI-2859] 2018-11-20 17:02:45 +01:00
Oleksii Kriuchykhin 5deaf25fd9 Prevent user being added to project/task multiple times [SCI-2869] 2018-11-20 14:29:33 +01:00
Alex Kriuchykhin a6bc02a2cb
Merge pull request #1369 from okriuchykhin/ok_SCI_2830 
Refactor result and step comments [SCI-2830]
 2018-11-20 00:13:15 +01:00
Oleksii Kriuchykhin b7ccfccfe0 Imrove tags update behaviour on canvas [SCI-2830] 2018-11-19 11:48:53 +01:00
mlorb 3b96a60938
Merge pull request #1374 from mlorb/ml-sci-2842 
Update the Export all confirmation modal and export interaction [SCI-2842]
 2018-11-19 11:36:08 +01:00
Alex Kriuchykhin d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778 
Add time format selection to settings [SCI-2778]
 2018-11-19 10:17:09 +01:00
Matej Zrimšek c144d599fc Fix user smart annotation showing as if the user is removed from team [SCI-2861] 2018-11-19 08:02:25 +01:00
Matej Zrimšek 716e74ceb4 Fix DataTable display for protocol modal [SCI-2863] 2018-11-19 07:21:29 +01:00
Matej Zrimšek dea4ed4e15 Add model name to the archive folders in export-all ZIP structure [SCI-2817] 2018-11-19 04:46:33 +01:00
mlorb 4b540958bd change close/cancel button and refactor export_project_modal endpoint 2018-11-16 13:37:32 +01:00
mlorb 6453ab6fb1 update the Export all confirmation modal and export interaction 2018-11-15 15:53:58 +01:00
Oleksii Kriuchykhin 7642d8d472 Fix sorting on projects table [SCI-2860] 2018-11-15 10:36:37 +01:00
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +01:00
Alex Kriuchykhin 324069c071
Merge pull request #1370 from okriuchykhin/ok_SCI_2853 
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
 2018-11-14 13:51:43 +01:00
Oleksii Kriuchykhin 3fd687161f Remove unused variables from activities controller [SCI-2778] 2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin 537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin c44109958a Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853] 2018-11-14 12:56:04 +01:00
Oleksii Kriuchykhin 380a96dcce Add caching for step and result fragments [SCI-2830] 2018-11-14 11:57:53 +01:00