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
13576 commits 31 branches 181 tags 166 MiB
Commit graph

37 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
Martin Artnik
e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] (#1808) 
* Preparing helpers for comments

* Refactored comments over scinote

* Update events
 2019-06-04 14:40:21 +02:00
Matej Zrimšek
b64df7d8cc Fix additional Date and Time display formats 2019-01-08 06:29:37 +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
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
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
mlorb
dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02: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
d571ab2ed8 Fixed comments permissions for experiment level. 2018-02-14 14:39:10 +01:00
Matej Zrimšek
8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
Oleksii Kriuchykhin
0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Oleksii Kriuchykhin
310d8c1920 Refactor smart annotation/auto_link/simple_format rendering [SCI-940] 2017-01-25 17:18:19 +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
zmagod
6e7fa21dd3 adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924] 2017-01-24 10:51:12 +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
Luka Murn
bc03a26d4b Also fix this new year issue on comments display 2017-01-12 15:06:12 +01:00
Oleksii Kriuchykhin
d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
zmagod
a4aa933151 refactor smart annotation parser helper 2017-01-11 10:34:14 +01:00
Luka Murn
b931b20f02 Fix 2 bugs with comments editing 
Closes SCI-820.
 2016-12-23 20:41:23 +01:00
Zmago Devetak
91f29745c4 Merge pull request #314 from ZmagoD/zd_SCI_643 
adds autolink
 2016-12-05 10:47:23 +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
Luka Murn
595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Luka Murn
a3bbf94643 Add a smart_text_area tag & implement it throughout application 
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
 2016-11-16 17:57:01 +01:00
Luka Murn
b42922d32c Add autosize functionality to all textareas 
Closes SCI-637
 2016-11-11 09:09:41 +01:00
Luka Murn
55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +01:00
zmagod
36fb2713b3 start fixing comments dates 2016-10-03 16:10:20 +02:00
zmagod
2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
zmagod
02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Luka Murn
6d86a02d7c Add individual permission checks in dropdowns 
Closes SCI-258.
 2016-08-25 13:51:50 +02:00
Luka Murn
c92d016f65 Add edit&delete module/task comments functionality 
This required a minor fix of comments.js.
 2016-08-25 13:51:31 +02:00
scibb
a76d82d188 delete and edit comments for projects, protocols, results, and workflow elements 2016-08-25 13:51:30 +02:00
Luka Murn
b64e200b91 Refactor canvas a lot. 
Also refactor localization files concerning canvas.
 2016-07-28 16:41:10 +02:00
Luka Murn
076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00