scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 06:35:14 +08:00
Code Issues Projects Releases Packages Wiki Activity
17107 commits 31 branches 181 tags 167 MiB
Commit graph

215 commits

Author SHA1 Message Date
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02: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
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Zanz2
4e55fdc9b5 Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662 2018-08-21 12:09:05 +02:00
Zanz2
601335a807 Fixed non .js errors hound 2018-08-21 12:08:14 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
zmagod
a7e47faa61 sanitizes the report name on repors index page [fixes SCI-2600] 2018-07-10 10:58:39 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +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
zmagod
9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
Oleksii Kriuchykhin
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
zmagod
1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod
dd2f7dd417 Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration 2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin
269f7d74fa Add explicit ordering to samples_tables [SCI-2148][SCI-2149] 2018-03-13 13:16:34 +01:00
zmagod
4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +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
5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797 
Permissions - refactor organization & team level permissions (core) [SCI-1797]
 2018-01-05 16:03:55 +01:00
mlorb
99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
Oleksii Kriuchykhin
070711917e Code fixes [SCI-1873] 2018-01-04 11:25:34 +01:00
Oleksii Kriuchykhin
512ee07bde Fix repositories [SCI-1873] 2017-12-19 17:53:45 +01:00
mlorb
0d37f9c85a refactor clone protocol permission 2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
mlorb
806fcbce36 refactor update protocol in repository permission 2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e refactor read protocol in repository permission 2017-12-14 14:18:15 +01:00
zmagod
1f45123d51 removes unneeded comments 2017-08-21 13:34:39 +02:00
Luka Murn
ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
 2017-08-07 08:45:53 +02:00
okriuchykhin
af4b310754 Add ordering for column mappings in repositories 2017-07-26 13:35:54 +02:00
zmagod
506e47a595 fixes sorting of assigned column [fixes SCI-1483] 2017-07-14 09:45:36 +02:00
Mojca Lorber
ec76873e95 fix sorting by assigned causes ajax error 2017-07-13 11:41:19 +02:00
Oleksii Kriuchykhin
b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
Oleksii Kriuchykhin
115ce91d8d Handle column mappings in task repository [SCI-1381] 2017-06-20 15:58:52 +02:00
Oleksii Kriuchykhin
9a9f8b9c41 Fix total number of records in task repository [SCI-1381] 2017-06-19 16:45:57 +02:00
mlorb
14429a270c Merge pull request #689 from mlorb/ml_sci_1354 
Truncate and display text in tooltip in custom repository fields [SCI-1354]
 2017-06-19 15:50:38 +02:00
Mojca Lorber
39dd6daabb small fixes 2017-06-19 15:30:38 +02:00
Matej Zrimšek
6b284d8c89 Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357] 2017-06-16 16:02:31 +02:00
Matej Zrimšek
1f0eeeaecb Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357] 2017-06-16 14:31:31 +02:00
okriuchykhin
05ea00a5d3 Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2 
Fix bug when reordering column to the first position in repositories [SCI-1346]
 2017-06-16 14:29:08 +02:00
Oleksii Kriuchykhin
94d74b8101 Make assigned column always visible in repositories [SCI-1346] 2017-06-16 11:47:41 +02:00
Mojca Lorber
a195c9a5af truncate and display text in tooltip in custom repository fields 2017-06-15 15:08:33 +02:00
Luka Murn
3df034ff21 Merge pull request #687 from mz3944/mz-SCI-1357 
Repository management - filter on custom columns [SCI-1357]
 2017-06-15 13:30:42 +02:00
Matej Zrimšek
bae1e298d7 Fixed repositories search to only search the current repository. [SCI-1357] 2017-06-14 19:49:08 +02:00
Matej Zrimšek
092e82c722 Date search fix for repositories. [SCI-1357] 2017-06-14 19:36:15 +02:00
Matej Zrimšek
e38947b1f8 Minor repository search refactoring. [SCI-1357] 2017-06-14 19:28:53 +02:00
Matej Zrimšek
be4a8d494a Search functionality added to custom columns of custom repositories. [SCI-1357] 2017-06-14 19:28:12 +02:00
Oleksii Kriuchykhin
13fdbf8850 Fix sorting in repositories when only assigned selected [SCI-1349] 2017-06-14 14:29:59 +02:00
Oleksii Kriuchykhin
4b0d7acabe Fix search when viewing only assigned repository records [SCI-1342] 2017-06-13 09:11:27 +02:00
Luka Murn
28f78a0c6c Merge pull request #670 from Ducz0r/lm-sci-1340 
Fix assigned repository rows in task display [SCI-1340]
 2017-06-13 08:55:55 +02:00
Luka Murn
e26337d5ee Merge pull request #671 from biosistemika/custom-repositories 
Merge custom-repositories into master
 2017-06-09 18:46:47 +02:00
Luka Murn
90ca6d9a76 Fix assigned repository rows in task display 
Closes SCI-1340.
 2017-06-09 13:50:13 +02:00
Matej Zrimšek
77a225ec31 Added toggle between assigned and all repository records. [SCI-1276] 2017-06-07 18:13:25 +02:00
Oleksii Kriuchykhin
ad8dd6d740 PR fixes [SCI-1274] 2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin
8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
ajugo
887d9a4f52 Samples - show all/show assigned [SCI-1277] (#644) 
* Samples - show all/show assigned [SCI-1277]

* Some fixes in code

* Some minor fixes in code

* Omit present

* Correct missed present

* Fixing hound warnings
 2017-06-06 12:46:56 +02:00
Zmago Devetak
4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin
9055894d07 Add additional sanitization to search parameters in datatables [SCI-763] 2017-04-25 17:37:42 +02:00
zmagod
c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
okriuchykhin
c2a69982aa Merge pull request #471 from okriuchykhin/ok_SCI_936 
Adds datatable to all teams page [SCI-936]
 2017-02-07 10:33:33 +01:00
Oleksii Kriuchykhin
db90c5d63b Add datatable to all teams page [SCI-936] 2017-02-02 09:53:59 +01:00
Mojca Lorber
d3e0eca44e redesign individual team page 2017-02-01 14:44:47 +01:00
Zmago Devetak
5c9954bb89 Merge pull request #450 from ZmagoD/zd_SCI_939 
Refactor "organizations" to "teams"
 2017-02-01 13:12:02 +01:00
zmagod
be5faad97c fixes hound 2017-01-31 13:33:55 +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
zmagod
61b260fb8a fixes bug in protocol management 2017-01-27 11:01:44 +01:00
Oleksii Kriuchykhin
17a53cbd7f Fix protocol table filtering by keywords [SCI-957] 2017-01-26 15:52:46 +01:00
Oleksii Kriuchykhin
c55f3cb99c Add flag to disable simple_format in custom_auto_link [SCI-940] 2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
310d8c1920 Refactor smart annotation/auto_link/simple_format rendering [SCI-940] 2017-01-25 17:18:19 +01:00
zmagod
a507bb4d1f hound 2017-01-25 15:40:35 +01:00
zmagod
9ae799d52c rename organization/org/Organization to Team in datatables 2017-01-25 09:48:49 +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
Matej Zrimšek
5d65627808 Fixed sample editing in samples table. [SCI-914] 2017-01-20 11:10:17 +01:00
Zmago Devetak
1b9f7db385 Merge pull request #405 from ZmagoD/zd_SCI_832 
Visualization of User smart annotation after saving the field
 2017-01-18 09:36:42 +01:00
Luka Murn
ffc2b56dff Fix String quotes 2017-01-17 08:28:41 +01:00
Luka Murn
2f48409fdd Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2 
Fix filter not working correctly with hidden custom columns [SCI-813]
 2017-01-17 08:17:52 +01:00
Luka Murn
16955dcee6 Fix Hound errors. 2017-01-16 15:58:37 +01:00
Luka Murn
a2935c6620 Add sample info modal popup to sample smart annotations 
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').

Closes SCI-892.
 2017-01-16 15:52:02 +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
Luka Murn
ba567284ed Fix filter not working correctly with hidden custom columns 
Closes SCI-813.
 2017-01-13 17:03:19 +01:00
zmagod
1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +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
okriuchykhin
404952336d Merge pull request #400 from okriuchykhin/ok_SCI_846 
Fixes sorting of custom columns in samples datatable [SCI-846]
 2017-01-11 15:34:02 +01:00
Oleksii Kriuchykhin
094d0f0f71 Fixes sorting of custom columns in samples datatable [SCI-846] 2017-01-11 13:21:38 +01:00
zmagod
89e8946a47 expand smart annotation 2017-01-10 14:14:21 +01:00
Luka Murn
0cf5afa499 Merge pull request #376 from Ducz0r/lm-sci-813-fix 
Fix search on hidden columns in samples table [SCI-813]
 2017-01-10 11:27:56 +01:00
Oleksii Kriuchykhin
835e982292 SAnitize AJAX calls in controllers and datatables [SCI-102] 2017-01-05 13:12:22 +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
Mojca Lorber
c476faca30 fix hound 2017-01-03 11:04:09 +01:00
Mojca Lorber
e555535dfb add edit button to protocol preview modal 2017-01-03 10:04:14 +01:00
Luka Murn
fbc2be890c Fix search on hidden columns in samples table 
Closes SCI-813.
 2016-12-23 19:56:54 +01:00
zmagod
01849a46db removed unneeded lines 2016-12-21 15:40:07 +01:00
zmagod
a5a8bbf27a fixed assigned column bug 2016-12-21 15:35:05 +01:00
zmagod
e2723a288c fixes bug with samples sorting [fixes SCI-812] 2016-12-21 14:32:28 +01:00
Zmago Devetak
c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
Mojca Lorber
2cfcba0ceb add protocol preview modal 2016-12-13 10:39:18 +01:00
Mojca Lorber
7d88e247fc refactoring 2016-12-08 14:41:35 +01:00
Mojca Lorber
195055f9cf change SAMPLES_TABLE_DEFAULT_STATE 2016-12-07 14:51:34 +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
3dddffaa34 Fix bug with linked tasks 
This bug was a legacy of experiment level introduction.
Closes SCI-385, SCI-366.
 2016-08-24 17:22:16 +02:00
Zmago Devetak
13697e8688 Merge pull request #58 from ZmagoD/zd_SCI_74 
Filter search query for special chars [fixes SCI_74]
 2016-08-17 10:00:47 +02:00
zmagod
c9ff249067 fixed hound alert 2016-08-12 11:11:52 +02:00
zmagod
6c7cfb4467 filter search query for special chars [fixes SCI_74] 2016-08-12 11:08:51 +02:00
zmagod
7653f2b9ec fixed hound 2016-08-10 11:26:27 +02:00
zmagod
deb739efa6 fixes loading samples error in blank project 2016-08-10 09:13:12 +02:00
zmagod
fd8187370e Feed the Hound part 3 2016-08-03 13:16:51 +02:00
zmagod
9d4a67a5b6 Feed the Hound 2 2016-08-03 13:11:46 +02:00
zmagod
57ac34e9f4 add samples to experiment page [fixes SCI-43] 2016-08-03 12:57:51 +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