scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 22:51:24 +08:00
Code Issues Projects Releases Packages Wiki Activity
5487 commits 31 branches 181 tags 166 MiB
Commit graph

176 commits

Author SHA1 Message Date
zmagod
43a60b632a adds datahook to experiment card [fixes SCI-2373] 2018-06-06 17:28:04 +02:00
Luka Murn
c07fa5adc2 Update blank page for projects 2018-06-06 17:23:22 +02:00
zmagod
9b9143f145 add hook to tab pane 2018-06-01 16:46:27 +02:00
zmagod
84170f6de0 add data-hook, refactor add user to project modal to support addons 2018-06-01 16:13:22 +02:00
Oleksii Kriuchykhin
58d8414f92 Code fixes for sidebar [SCI-2478] 2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin
2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
mlorb
f791234ec7 changes on Zmago's request 2018-05-28 11:36:37 +02:00
mlorb
f02363dfce fix error if user is not assigned to any teams 2018-05-25 17:14:22 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
mlorb
dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
mlorb
ed27a7a62a some extra restyling/unifying off app 2018-05-11 18:02:17 +02:00
mlorb
7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
mlorb
d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244 
Update buttons positions and wording throughout app [SCI-2244]
 2018-05-03 11:05:15 +02:00
zmagod
e9642cadad Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304 2018-04-26 14:26:30 +02:00
mlorb
88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
Luka Murn
cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
mlorb
9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
zmagod
503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
mlorb
600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +02:00
Oleksii Kriuchykhin
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
mlorb
bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
zmagod
3131ed0948 adds permission check to archived project actions dropdown [fixes SCI-2194] 2018-03-16 17:30:49 +01:00
Oleksii Kriuchykhin
ca66858063 Fix edit project's users modal [SCI-2130] 2018-03-06 15:49:30 +01:00
Matej Zrimšek
b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
Matej Zrimšek
6ba226d514 Added missing '?' to the canaid permission calls that were missing it. 2018-02-16 11:12:30 +01:00
Matej Zrimšek
5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
Matej Zrimšek
854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
Matej Zrimšek
d058c371d4 Readded project archive permission. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
900446557b Fixed mistyped permission checker. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
93536afcd5 Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
e5799ee6dc Some permission fixes. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
d423700e84 Used permissions where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek
321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin
917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +01:00
Luka Murn
9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
 2017-07-06 15:12:15 +02:00
Mojca Lorber
a3514bdaf0 fix restore action from archives pages 2017-06-29 16:14:25 +02:00
Mojca Lorber
d03be76f35 add tooltips to archive buttons 2017-06-27 14:48:45 +02:00
Oleksii Kriuchykhin
a5926726ce Add notifications counter badge to project card [SCI-1253] 2017-05-10 17:28:37 +02:00
Oleksii Kriuchykhin
344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +02:00
Matej Zrimšek
a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02:00
Mojca Lorber
ac0988ef32 add data-hooks for remove manage teams button 2017-02-21 15:39:08 +01:00
Mojca Lorber
0fd41e8a6d remove changes on user has no teams view 2017-02-21 15:12:58 +01:00
Mojca Lorber
90864a45a0 fix user has no teams view 2017-02-21 13:08:06 +01:00
Oleksii Kriuchykhin
c119b7c014 Make sciNote work for users without any teams [SCI_934] 2017-02-01 14:16:26 +01:00
zmagod
e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Oleksii Kriuchykhin
310d8c1920 Refactor smart annotation/auto_link/simple_format rendering [SCI-940] 2017-01-25 17:18:19 +01:00
zmagod
afd8328e9c rename ortanizations -> teams 2017-01-25 14:22:06 +01:00
zmagod
72e13beee3 renamed organizations in views 2017-01-25 12:01:23 +01:00
Luka Murn
53699193a2 Merge branch 'smart-annotations' 
Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb
 2017-01-24 14:33:23 +01:00
okriuchykhin
02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
zmagod
1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
75031e17b9 Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin
0350f2f792 Add html escaping to name filelds in the views [SCI-102] 2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin
d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin
0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
zmagod
a4aa933151 refactor smart annotation parser helper 2017-01-11 10:34:14 +01:00
zmagod
89e8946a47 expand smart annotation 2017-01-10 14:14:21 +01:00
Matej Zrimšek
4b0f47675a Fixes experiment button not being clicable in project overview page. [SCI-849] 2017-01-05 14:42:52 +01:00
Oleksii Kriuchykhin
4d3e002c81 Add sorting to Project's experiments overview [SCI-361] 2016-12-23 15:40:01 +01:00
zmagod
fafecce264 adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643] 2016-11-23 14:18:50 +01:00
Matej Zrimšek
f13cc5be0e Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way). 2016-11-17 18:03:49 +01:00
Zmago Devetak
4f5b7ad8ad Merge pull request #228 from ZmagoD/zd_SCI_585 
Removes archived projects from index page [fixes SCI-585]
 2016-10-21 11:33:01 +02:00
zmagod
db806f3c10 hide private projects 2016-10-21 09:06:19 +02:00
zmagod
4c086a6fc1 removes archived projects from index page [fixes SCI-585] 2016-10-20 13:13:44 +02:00
zmagod
8aaf58f75f removes org selector form project archive [fixes SCI-587] 2016-10-20 12:50:55 +02:00
zmagod
54a3237994 displays org name on the project index page if no project 2016-10-17 15:21:19 +02:00
zmagod
a116feac9c fixed typos and added truncation to org name 2016-10-17 15:21:19 +02:00
zmagod
1614cbc2b2 fixes repeat tutorial button and localization typos 2016-10-17 15:16:22 +02:00
zmagod
fa36488397 fixed new project form 2016-10-17 15:10:26 +02:00
zmagod
d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
Matej Zrimšek
a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
zmagod
42a30576e3 removed introductory popup [fixes SCI-534] 2016-10-11 08:33:50 +02:00
Luka Murn
f1b74f1906 Fix image names in introductory popup 
This will make sure browsers don't display old, cached images to clients.
 2016-09-29 13:44:38 +02:00
zmagod
2a86aaf7e4 changed popout content [fixes SCI-520] 2016-09-28 15:12:30 +02:00
okriuchykhin
b5c861583d Merge pull request #157 from okriuchykhin/ok_SCI_430 
Fixes issue with unneeded sort icon [fixes SCI-430]
 2016-09-22 16:39:26 +02:00
Matej Zrimšek
234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
Oleksii Kriuchykhin
411ee4ee77 Fixes issue with unneeded sort icon [fixes SCI-430] 2016-09-20 11:30:11 +02:00
Luka Murn
0c1759c15a Merge pull request #135 from Ducz0r/lm-sci-397 
Resize archived experiment panels
 2016-09-07 11:14:53 +02:00
Luka Murn
bda5120548 Resize archived experiment panels 
Closes SCI-397.
 2016-09-06 10:55:05 +02:00
Mojca Lorber
47983812e7 minimize buttons on mobile phone 2016-09-06 10:10:49 +02:00
zmagod
eb39eedfdf [fixes SCI-398] again 2016-08-31 08:46:51 +02:00
zmagod
2ac20d1af1 adds new image + new panel title [fixes SCI-336] 2016-08-29 09:28:29 +02:00
Luka Murn
a0311970f8 Add missing commits for showing image and not able to preview 2016-08-26 16:49:32 +02:00
zmagod
d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
Zmago Devetak
0cfc758f43 Merge pull request #102 from ZmagoD/zd_SCI_336 
implement first time popup logic
 2016-08-26 09:19:36 +02:00
zmagod
2031c42920 fixed confirmation text 2016-08-26 09:13:45 +02:00
zmagod
1738ca66d2 one-time introductory popup [fixes SCI-336] 2016-08-25 18:44:21 +02:00
zmagod
8ff645fb89 disabled experiment dropdown actions 2016-08-25 15:16:51 +02:00
Zmago Devetak
b090fd8d5b Merge pull request #95 from ZmagoD/zd_SCI_374 
adds edit workflow link if no workflow [fixes SCI-374]
 2016-08-25 14:07:33 +02:00
zmagod
5fabe06b8d implement first time popup logic 2016-08-25 11:44:49 +02:00
zmagod
dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Mojca Lorber
2a897432e1 update buttons on canvas view 2016-08-24 17:00:27 +02:00
zmagod
9393a96302 adds edit workflow link if no workflow [fixes SCI-374] 2016-08-24 14:10:50 +02:00
Zmago Devetak
afaeab492d Merge pull request #87 from ZmagoD/zd_SCI_371 
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
 2016-08-24 11:56:29 +02:00
zmagod
27d77bc73f added new permission for dropdown actions 2016-08-24 10:56:30 +02:00
Zmago Devetak
9dc7708b73 Merge pull request #85 from ZmagoD/zd_SCI_360 
fixes project overview style and add no description link [fixes SCI-360]
 2016-08-23 16:24:22 +02:00