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

81 commits

Author SHA1 Message Date
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 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