scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
4736 commits 70 branches 179 tags 165 MiB
Commit graph

4736 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin 32d00cb2b9 Make AWS access key variables optional [SCI-2727] 2018-11-28 10:41:05 +01:00
Oleksii Kriuchykhin 32536db171 Add subfolder option to S3 bucket config [SCI-2727] 2018-11-27 14:58:34 +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
Luka Murn 87ff7c71e3 Update the delivery email look & feel 
Closes SCI-2884.
 2018-11-23 17:24:10 +01:00
Luka Murn 4903cdadc4
Merge pull request #1389 from Ducz0r/lm-sci-2883 
Remove byebug from HTML template [SCI-2883]
 2018-11-23 14:02:49 +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
Alex Kriuchykhin 1a5868baf2
Merge pull request #1386 from okriuchykhin/ok_SCI_2875 
Fix task tags modal [SCI-2875]
 2018-11-22 10:27:40 +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
Luka Murn 5d61a93659
Merge pull request #1383 from biosistemika/release-1-14-3-hotfix-1 
Merge release-1.14.3-hotfix-1 into master
 2018-11-21 08:10:58 +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
Jure Grabnar 13bc664902
Merge pull request #1367 from jbargu/jg_2746_health_unit_tests 
Add unit tests for status/health API endpoints
 2018-11-19 13:14:38 +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
Alex Kriuchykhin c184ca1c95
Merge pull request #1373 from okriuchykhin/ok_SCI_2860 
Fix sorting on projects table [SCI-2860]
 2018-11-15 16:28:41 +01:00
mlorb 6453ab6fb1 update the Export all confirmation modal and export interaction 2018-11-15 15:53:58 +01:00
Luka Murn 5c3ad3fcc7 Automatic redirection to the O365 sign-in page business user flow 
Hotfix for supporting O365 update on 19th November 2018.
See SCI-2853.
 2018-11-15 10:49:30 +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
Luka Murn 2ecefe0e6d
Merge pull request #1371 from Ducz0r/lm-fix-visual-bug-projects-index 
Fix visual bug (everything bold) on projects index page
 2018-11-14 13:37:17 +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
Luka Murn 98a39ecd72 Fix visual bug (everything bold) on projects index page 
Bug was introduced in projects absent section, there was no
closing </strong> tag.
 2018-11-14 11:33:27 +01:00
Luka Murn c0940b143a Fix root page bug introduced with merge features/core-api -> master 2018-11-13 21:24:20 +01:00
mz3944 056efe170b
Merge pull request #1358 from mz3944/mz-SCI-2646 
Removal of the temporary files for export all [SCI-2646]
 2018-11-13 20:31:04 +01:00
Oleksii Kriuchykhin fb309a12b9 Refactor result and step comments initialization [SCI-2830] 2018-11-13 16:57:42 +01:00
Luka Murn 84df2c81f9 Merge branch 'features/export-all' 
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
 2018-11-13 09:14:02 +01:00