scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
2376 commits 77 branches 180 tags 167 MiB
Commit graph

133 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
Oleksii Kriuchykhin
fc72453a5b Fix hound warning [SCI-1356] 2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin
e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
zmagod
a2e1aa5b36 fixes bug with long text in parse records modal [fixes SCI-1392] 2017-06-22 14:43:01 +02:00
Mojca Lorber
a195c9a5af truncate and display text in tooltip in custom repository fields 2017-06-15 15:08:33 +02:00
zmagod
33b996ffee refactor 2017-06-09 09:49:57 +02:00
zmagod
1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
Matej Zrimšek
b97cb91840 Refactoring of modal for adding content to report. [fixes SCI-487] 2017-05-15 17:43:12 +02:00
Oleksii Kriuchykhin
620a989a2f Improve view of badges on experiment canvas [SCI-152] 2017-05-09 14:07:23 +02:00
Oleksii Kriuchykhin
3f60439948 Change color of loading animation in reports [SCI-1029] 2017-05-08 11:02:51 +02:00
Oleksii Kriuchykhin
d3fb688fce Change color of turbolinks progress bar [SCI-1029] 2017-04-26 15:04:29 +02:00
okriuchykhin
3d805d529d Merge pull request #554 from okriuchykhin/ok_SCI_877 
Add image preview to protocol repository [SCI-877]
 2017-04-18 08:58:39 +02:00
Zmago Devetak
cb1ad9e0be Merge pull request #555 from ZmagoD/zd_SCI_1103 
adds additional explanations [fixes SCI-1103]
 2017-04-13 15:15:08 +02:00
zmagod
0987cf8abc fixes hound alerts 2017-04-13 14:55:18 +02:00
zmagod
f104444a0c adds additional explanations [fixes SCI-1103] 2017-04-12 16:56:47 +02:00
Oleksii Kriuchykhin
181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +02:00
Mojca Lorber
b09c18a9bc fix overlaping text in audit trail table 2017-04-11 14:29:31 +02:00
zmagod
023b3213e8 fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
Luka Murn
4ddb139911 Fix padding of state buttons 
Closes SCI-1073.
 2017-03-03 16:36:52 +01:00
Oleksii Kriuchykhin
a326fa374f Lower z-index value for notification count icon [SCI-739] 2017-02-22 14:35:07 +01:00
Mojca Lorber
6b30f097f0 fix visual bug in edit avatar mode 2017-02-21 14:02:42 +01:00
Oleksii Kriuchykhin
db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
zmagod
8c035a1981 renames organization in assets 2017-01-25 12:12:27 +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
zmagod
9c3bc8dac7 fixes checklist item user popover bug [fixes SCI-907] 2017-01-23 09:47:04 +01:00
Mojca Lorber
6de83ff53b fix hound 2017-01-19 15:58:40 +01:00
Mojca Lorber
44de927cf4 display smart annotations in reports - without rich text fields 2017-01-19 14:22:54 +01:00
Oleksii Kriuchykhin
890c5e3c3d Add “no results found” message in smart annotation [SCI-886] 2017-01-19 13:42:58 +01:00
Luka Murn
cf72da5635 Merge branch 'improved-files-handling' into 'master' 
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
 2017-01-18 11:29:40 +01:00
zmagod
cb0483a6e6 refactor 2017-01-18 08:34:29 +01:00
zmagod
1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
zmagod
a4aa933151 refactor smart annotation parser helper 2017-01-11 10:34:14 +01:00
zmagod
a903772de8 style dropdown 2017-01-10 17:05:32 +01:00
Mojca Lorber
510731bd4e change color of clickable nameswhen row is selected in datatables 2017-01-09 15:51:21 +01:00
Luka Murn
0ee5b98977 Refactor code a bit, add dismiss button to header 2017-01-07 09:59:52 +01:00
Luka Murn
b614ce714b Restyle atwho dropdown 2017-01-05 14:06:48 +01:00
Luka Murn
e12907c9b9 Remove original atwho css, apply our own 2017-01-05 10:52:28 +01:00
mlorb
59751ec41e Merge pull request #373 from mlorb/ml_sci_709 
Add Protocol Preview to Protocol repository [SCI-709]
 2017-01-04 11:28:55 +01:00
Luka Murn
3bee9d2e12 Save an (yet unworking) version of user smart annotations 
Used so other devs can start working on smart annotations.
 2017-01-04 10:54:02 +01:00
Mojca Lorber
fe37ac3b6d fix hound 2 2017-01-03 17:46:30 +01:00
Mojca Lorber
0011474ea3 fix hound 2017-01-03 17:43:55 +01:00
Mojca Lorber
c476faca30 fix hound 2017-01-03 11:04:09 +01:00
Oleksii Kriuchykhin
c77c83752e Remove unused css class link-look [SCI-819] 2016-12-30 15:50:43 +01:00
Mojca Lorber
40e3240a99 add content to preview modal 2016-12-22 11:43:11 +01:00
zmagod
25671c744a disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804] 2016-12-16 09:50:45 +01:00
zmagod
9083f84396 Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789 2016-12-15 11:03:19 +01:00
zmagod
b003d192c3 fixed edit mode 2016-12-15 09:54:38 +01:00
zmagod
1ff98bb6df adds tooltip to samples dropdown and column names 2016-12-14 13:36:10 +01:00
zmagod
d9971b4502 adds error message in samples table dropdown [fixes SCI-789] 2016-12-13 17:08:19 +01:00