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

982 commits

Author SHA1 Message Date
Zmago Devetak f3f1a68070 Merge pull request #667 from ZmagoD/zd_SCI_1338 
fixes long column names in repository dropdown [fixes SCI-1338]
 2017-06-13 09:33:04 +02:00
okriuchykhin d88de4009a Merge pull request #674 from okriuchykhin/ok_SCI_1346 
Fix reordering columns to the first position [SCI-1346]
 2017-06-13 09:01:10 +02:00
okriuchykhin 56c3b891a5 Merge pull request #673 from okriuchykhin/ok_SCI_1350 
Fix row selection info after record deletion [SCI-1350]
 2017-06-13 09:00:48 +02:00
okriuchykhin 05c77e7298 Merge pull request #672 from okriuchykhin/ok_SCI_1341 
Fix row selecton after column reorder in repositories [SCI-1341]
 2017-06-13 09:00:33 +02:00
Matej Zrimšek e3db79b3cc Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275] 2017-06-12 17:49:42 +02:00
Oleksii Kriuchykhin 248fd7be06 Fix reordering columns to the first position [SCI-1346] 2017-06-12 17:16:49 +02:00
Oleksii Kriuchykhin c081cda5f3 Fix row selection info after record deletion [SCI-1350] 2017-06-12 10:23:18 +02:00
Oleksii Kriuchykhin aa42ca6b8b Fix row selecton after column reorder in repositories [SCI-1341] 2017-06-12 10:07:16 +02:00
Matej Zrimšek 514aa6214b Repository records minor JS refactoring. [SCI-1275] 2017-06-09 19:44:28 +02:00
Matej Zrimšek 29b721365a Moved export form to proper place in the code. [SCI-1275] 2017-06-09 19:44:28 +02:00
rekonder 4df8e1ffe3 Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository 2017-06-09 19:44:28 +02:00
rekonder ede744849b Export repository [aj-SCI-1275] 2017-06-09 19:44:28 +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
zmagod d1977d0773 fixes long column names in repository dropdown [fixes SCI-1338] 2017-06-09 11:42:38 +02:00
Zmago Devetak 4873624cec Merge pull request #658 from ZmagoD/zd_SCI_1011 
Multiple file upload with drag & drop capability in steps and results
 2017-06-09 10:03:33 +02:00
zmagod 33b996ffee refactor 2017-06-09 09:49:57 +02:00
Luka Murn 7bb1af3692 Minor JS fix 2017-06-08 15:28:26 +02:00
Mojca Lorber 0004c2b7d5 fix selection of tab after redirection 2017-06-08 14:17:27 +02:00
Mojca Lorber 71c523c406 load tabs with javascript 2017-06-08 13:47:30 +02:00
Luka Murn 2ab31aba2f Merge pull request #660 from Ducz0r/lm-sci-1270 
Copy repository functionality [SCI-1270]
 2017-06-08 11:45:57 +02:00
Luka Murn 27feb46d8f Merge pull request #659 from Ducz0r/lm-sci-1279 
Include repositories in reports [SCI-1279]
 2017-06-08 11:24:21 +02:00
Luka Murn 38361e4bb4 Setup initial GUI 2017-06-07 18:43:48 +02:00
Matej Zrimšek 77a225ec31 Added toggle between assigned and all repository records. [SCI-1276] 2017-06-07 18:13:25 +02:00
Luka Murn 02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +02:00
Luka Murn b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +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
Zmago Devetak fcec42ae31 Merge pull request #645 from ZmagoD/zd_SCI_1278 
generates samples csv file in background job [fixes SCI-1278]
 2017-06-07 15:04:24 +02:00
zmagod c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +02:00
Mojca Lorber 51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber 39dda1ad5d refactoring 2017-06-06 13:18:44 +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
Mojca Lorber da98788031 small code fixes 2017-06-06 09:57:50 +02:00
Mojca Lorber 13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Luka Murn f382c04f01 Refactor JS code a bit 
Closes SCI-1323.
 2017-06-06 08:02:01 +02:00
Luka Murn 1712fc0611 Fix bug with protocol preview modal not working in protocol repo 
Closes SCI-1323.
 2017-06-05 17:10:13 +02:00
Matej Zrimšek 2c6ad4aa05 Refactored modal popups for repositories to make them general. [fix 1269] 2017-06-05 14:13:24 +02:00
zmagod ab4961ddb1 adds overlay partial 2017-06-05 11:31:05 +02:00
zmagod 67d902db52 refactor 2017-06-05 10:43:58 +02:00
Matej Zrimšek d8d54232c3 After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269] 2017-06-02 19:08:51 +02:00
Matej Zrimšek c82fd66146 Removed unneeded utility JS function. [SCI-1269] 2017-06-02 17:52:04 +02:00
Matej Zrimšek f8258812ef Repository remove and rename refactoring. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek 21a72da84f Added rename logic and improved remove logic. [SCI-1269] 2017-06-02 17:50:34 +02:00
Matej Zrimšek cdaac6a01b Added remove repository modal logic. [SCI-1269] 2017-06-02 17:50:33 +02:00
Matej Zrimšek 791bb934ca Remove repository modal logic (WIP). [SCI-1269] 2017-06-02 17:50:33 +02:00
zmagod 1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
ajugo a9bd86352d Step: wrong last columns of table [fixes SCI-405] (#600) 
* Step: wrong last two columns of table after add table results [fixes SCI-405]

* Changing double quotes to single

* Adding empty line back
 2017-06-01 15:52:02 +02:00
zmagod b527afd12b generates samples csv file in background job [fixes SCI-1278] 2017-05-29 14:42:55 +02:00
Zmago Devetak 1df6265326 Merge pull request #627 from ZmagoD/zd_SCI_1280 
prevent to duplicate new step [fixes SCI-1280]
 2017-05-29 09:55:22 +02:00
zmagod 5806cb8e67 removes unneeded animateSpinner call 2017-05-29 09:10:11 +02:00
mz3944 9fe3b717c8 Merge pull request #626 from mz3944/mz-SCI-487 
Simplify "Add contents to report" popup
 2017-05-23 09:57:39 +02:00
ajugo 1abaefce4f At importing large sample file, error flash message appears [fixes SCI-903] (#625) 
* At importing large sample file, error flash message appears [fixes SCI-903]

* Changing double quotes to single

* Adding animatedSpinner
 2017-05-18 09:19:44 +02:00
Matej Zrimšek 20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +02:00
Oleksii Kriuchykhin bbf6d38c50 Fix error handling in result_assets [SCI-1288] 2017-05-17 15:14:35 +02:00
zmagod b21923cf98 prevent to duplicate new step [fixes SCI-1280] 2017-05-16 11:52:07 +02:00
Matej Zrimšek 79ec3b5e4c Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek 901558c733 Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek ba693c65a8 Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
zmagod 9bec7dd96e Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248 2017-05-15 14:49:37 +02:00
zmagod d34b2520b5 refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248] 2017-05-12 15:59:58 +02:00
zmagod 070a829c49 change new results hendlers 2017-05-12 10:02:33 +02:00
zmagod 81a3cb0a41 adds results js code in modules 2017-05-11 16:54:28 +02:00
mlorb 219921ee33 Merge pull request #612 from mlorb/ml_sci_1250 
Fix sample page bugs when editing column name [SCI-1250]
 2017-05-11 13:48:20 +02:00
okriuchykhin 328c9292b1 Merge pull request #606 from okriuchykhin/ok_SCI_1235 
Fix error messages display during file upload in steps and results [SCI-1235]
 2017-05-11 13:00:36 +02:00
Mojca Lorber 86bc6adc2a fix lost column updated name at sample page and bug with another user not able to view column dropdown 2017-05-11 11:16:12 +02:00
zmagod 2081e0a94b Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1 2017-05-10 15:14:17 +02:00
zmagod a4032f5cc6 first run 2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin 52ad5ecdc2 Fix error messages display during file upload in steps and results [SCI-1235] 2017-05-09 17:13:47 +02:00
okriuchykhin ccc640f2bc Merge pull request #593 from okriuchykhin/ok_SCI_1158 
Add advanced search options [SCI-1158]
 2017-05-09 10:23:34 +02:00
okriuchykhin bd0b930382 Merge pull request #598 from okriuchykhin/ok_SCI_152 
Add counters for users and comments on canvas [SCI-152]
 2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin bd5a48b9c8 Improve code style [SCI-1158] 2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin 344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +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 0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
mlorb 4c85ac7bf5 Merge pull request #588 from mlorb/ml_sci_191 
Add information how many samples are selected [SCI-191]
 2017-05-05 15:24:16 +02:00
Zmago Devetak de3d1172c1 Merge pull request #584 from ZmagoD/zd_SCI_1200 
add popup for approval to complete the Task [fixes SCI-1200]
 2017-05-05 14:57:27 +02:00
Mojca Lorber 45baba1803 fix zmago the hound 2017-05-04 16:46:52 +02:00
Mojca Lorber ad9497a638 add information how many samples are selected 2017-05-04 16:30:29 +02:00
zmagod f784844472 fixes bug with empty checklist item [fixes SCI-1233] 2017-05-04 16:15:00 +02:00
zmagod acc5594f1b add popup for approval to complete the Task [fixes SCI-1200] 2017-05-04 12:41:22 +02:00
Mojca Lorber f8f6a5f63a fix bug edit canvas not working and fix positioning of cloned task/workflow 2017-05-04 10:54:50 +02:00
zmagod 5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
ajugo 41df727e57 Merge pull request #569 from rekonder/aj-SCI-1130 
Fix error with close on reports
 2017-05-03 12:27:42 +02:00
ajugo 081aa4aea7 Merge pull request #570 from rekonder/aj-SCI-1088 
My profile - avatar size fix [SCI-1088]
 2017-05-03 12:27:05 +02:00
Matej Zrimšek 8ad52354eb Used locales instead of hardcoded values for intro.js tutorial popup. 2017-04-25 16:03:50 +02:00
Matej Zrimšek e8bc9542cc Removed some unneeded intro.js tutorial code. 2017-04-25 16:03:50 +02:00
Matej Zrimšek a6573bd508 Next button is now always focused when navigating through tutorial steps. [fixes SCI-719] 2017-04-25 16:03:50 +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 49574e7a06 remove behavior of not allowing the empty tables in steps 2017-04-25 10:21:16 +02:00
rekonder b93edac3b9 My profile - avatar size fixes [SCI-1088] 2017-04-25 10:02:00 +02:00
zmagod 66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
rekonder dc46a7b650 Fix error with close on reports 2017-04-24 16:02:30 +02:00
zmagod 55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod 550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +02:00
zmagod c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +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
mlorb ddc0e86c92 Merge pull request #556 from mlorb/ml_sci_1174 
Fix bug with changing user own role from admin to normal user [SCI-1174]
 2017-04-13 14:33:58 +02:00
Zmago Devetak ec60044949 Merge pull request #548 from ZmagoD/zd_SCI_1129_v2 
Disables annimateSpiner in result assets actions
 2017-04-13 14:06:50 +02:00
Mojca Lorber 27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin 181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +02:00
zmagod 929d8aab5e disables annimateSpiner in result assets actions 2017-04-10 15:40:36 +02:00
Zmago Devetak 91793c295a Merge pull request #542 from ZmagoD/zd_SCI_825 
Smart annotations and Notifications
 2017-04-10 15:10:17 +02:00
Luka Murn becdd687a6 Only require jquery-ui-sortable on samples page 
(hopefully) closes SCI-794.
 2017-04-07 13:05:22 +02:00
okriuchykhin aa776aaa71 Merge pull request #541 from okriuchykhin/ok_SCI_615 
Fix moving of the steps after adding a new one [SCI-615]
 2017-04-06 15:50:01 +02:00
zmagod f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin 5c0197220d Fix moving of the steps after adding a new one [SCI-615] 2017-04-06 12:53:21 +02:00
Mojca Lorber 5e62046627 remove ERROR from message 2017-04-05 14:40:55 +02:00
mlorb 317739af1e Merge pull request #530 from biosistemika/ml_sci_1044 
Add data-hook and yadcf-filter plug-in [SCI-1044]
 2017-03-31 14:00:23 +02:00
Mojca Lorber 9458f391e5 add data-hook and yadcf-filter plug-in 2017-03-29 15:59:51 +02:00
zmagod 9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +02:00
mlorb 3beb179f87 Merge pull request #514 from biosistemika/ml_sci_1089 
Add error messages to sample group/type edit/delete actions [SCI-1089]
 2017-03-27 09:57:32 +02:00
okriuchykhin 33544ec91d Merge pull request #521 from okriuchykhin/ok_SCI_1087 
Move flash message creation JS code to helper method [SCI-1087]
 2017-03-20 15:35:21 +01:00
Oleksii Kriuchykhin c715902058 Move flash message creation JS code to helper method [SCI-1087] 2017-03-17 17:58:53 +01:00
Mojca Lorber 83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
zmagod 95a0f596b7 adds file link 2017-03-17 16:40:57 +01:00
zmagod 52878e0989 fixed wopi buttons [fixes SCI-1110] 2017-03-16 15:38:11 +01:00
Mojca Lorber 4792bd87b9 fix error message when editing custom column on locked task 2017-03-15 14:09:44 +01:00
Mojca Lorber 7a4e3201e7 add error messages to sample group/type edit/delete actions 2017-03-14 17:32:25 +01:00
zmagod 7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +01:00
zmagod 0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
Luka Murn 800df7a26b Also make button icons work when rendering them via JS 
Closes SCI-1073.
 2017-03-08 13:55:10 +01:00
Luka Murn 42b773f180 Merge pull request #504 from Ducz0r/lm-sci-1078-fix 
Fix sample type groups edit color script [SCI-1078]
 2017-03-02 13:09:51 +01:00
Luka Murn 3599537e42 Fix sample type groups edit color script so it works properly now 
Closes SCI-1078.
 2017-03-01 09:09:44 +01:00
Luka Murn 2252b46afc Canvas should now properly work again 
Closes SCI-1057.
 2017-02-28 10:41:55 +01:00
zmagod 151dc79a81 adds hook for lock task action 2017-02-21 16:25:50 +01:00
okriuchykhin 8e18ff44a6 Merge pull request #479 from okriuchykhin/ok_SCI_999 
Add task complete/uncomplete functionality [SCI-999]
 2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin 218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
Oleksii Kriuchykhin cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00
Luka Murn f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +01:00
Luka Murn 5cb3eb5e09 Refactor preferences -> move them to subcontroller, subroute 2017-02-09 11:07:16 +01: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 80dbc669d0 Simplify all teams dt definition [SCI-936] 2017-02-06 17:17:48 +01:00
Oleksii Kriuchykhin 449f4479e9 Fix code style issues [SCI-936] 2017-02-06 17:08:20 +01:00
Oleksii Kriuchykhin 916ed2572a Fix smart annotation is missing at editing column with smart annotation [SCI-997] 2017-02-03 16:42:38 +01:00
Oleksii Kriuchykhin 62535a01bd Move teams datatable js code into separate file [SCI-936] 2017-02-03 10:44:42 +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
okriuchykhin 9909f9dcff Merge pull request #456 from okriuchykhin/ok_SCI_951 
Fix missing preview images in task and protocol management [SCI-951]
 2017-01-27 14:42:41 +01:00
okriuchykhin 53e09bd50a Merge pull request #457 from okriuchykhin/ok_SCI_955 
Fix comments re-initialization after edit of the results [SCI-955]
 2017-01-27 11:50:52 +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
Luka Murn 2c3be391a8 Merge pull request #462 from ZmagoD/zd_SCI_962_vol2 
fix edit action
 2017-01-26 17:25:57 +01:00
Luka Murn 36f25e98f1 Merge pull request #459 from okriuchykhin/ok_SCI_943 
Fix RTF toolbar init after eding new step [SCI-943]
 2017-01-26 17:25:41 +01:00
zmagod 30912c514e fix edit action 2017-01-26 17:24:24 +01:00
zmagod cec5f1333d fixes RTE bug for new text results [fixes SCI-962] 2017-01-26 16:54:43 +01:00
Oleksii Kriuchykhin 100cc700c6 Fix RTF toolbar init after eding new step [SCI-943] 2017-01-26 16:37:44 +01:00
Oleksii Kriuchykhin ff86184b24 Fix comments re-initialization after edit of the results [SCI-955] 2017-01-26 15:24:37 +01:00
Oleksii Kriuchykhin 0f860496a7 Fix image preview after saving of report [SCI-951] 2017-01-26 14:42:14 +01:00
Mojca Lorber 13d1cc5171 fix entering new smart anotations 2017-01-26 13:50:32 +01:00
zmagod afd8328e9c rename ortanizations -> teams 2017-01-25 14:22:06 +01:00
Oleksii Kriuchykhin ddd8bcf7b0 Prevent double initialization of popup [SCI-855] 2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin 96a9857dec Add handling of popups in the end of the table [SCI-855] 2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin fb49ce8be2 Improved tooltip handling in samples datatable [SCI-855] 2017-01-25 13:47:01 +01:00
zmagod 8c035a1981 renames organization in assets 2017-01-25 12:12:27 +01:00
Oleksii Kriuchykhin 365eef506c Fixes merge conflicts with smart-annotations branch 2017-01-24 15:20:50 +01:00
mlorb 02f314ce60 Merge pull request #443 from mlorb/ml_sci_919_v2 
Remove table of content and customize link target [SCI-919]
 2017-01-24 14:39:47 +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
Mojca Lorber 4dc7998fdd Remove table of content and customize link target 2017-01-24 13:10:01 +01:00
mlorb 4253e3de2b Merge pull request #439 from mlorb/ml_sci_919 
Remove functionalities from rich text formatting [SCI-919]
 2017-01-24 11:03:34 +01:00
Matej Zrimšek b48e48e100 Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913] 2017-01-24 10:56:10 +01:00
Matej Zrimšek 2e041d9e81 Added smart annotations when adding new sample in samples table. [SCI-913] 2017-01-24 10:23:26 +01:00
Mojca Lorber eb40513ada remove functionalities from rich text formatting 2017-01-24 09:44:37 +01:00
Oleksii Kriuchykhin 401b37956b Simplify protocol export start [SCI-742] 2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin d555ba7905 Add export to protocol management page and code style improvements [SCI-742] 2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin 14a6705b55 Implemented protocol export through Zip::OutputStream [SCI-742] 2017-01-23 17:43:48 +01:00
zmagod 9c3bc8dac7 fixes checklist item user popover bug [fixes SCI-907] 2017-01-23 09:47:04 +01:00
mz3944 fd63a1de12 Merge pull request #432 from mlorb/ml-sci-fix-847 
Add dynamic length for sample type/group field when adding new sample [SCI-847]
 2017-01-20 15:46:34 +01:00
mz3944 18a2e4c423 Merge pull request #433 from mz3944/mz-sci-914 
Edit of a sample in sample table does not work
 2017-01-20 13:02:05 +01:00
Zmago Devetak c1e7cc83a7 Merge pull request #434 from ZmagoD/zd_SCI_915 
Text is deleted when entering smart annotation in rich text editor
 2017-01-20 13:01:29 +01:00
Zmago Devetak 7bd368e002 Merge pull request #431 from ZmagoD/zd_add_code_highlight 
Fixes code highlight and smart annotations experiments bug
 2017-01-20 12:59:21 +01:00
zmagod 71453398b1 bugfix 2017-01-20 11:33:49 +01:00
zmagod 4f7d62e79d removes unneeded annotations [fixes SCI-915] 2017-01-20 11:33:10 +01:00
Matej Zrimšek 5d65627808 Fixed sample editing in samples table. [SCI-914] 2017-01-20 11:10:17 +01:00
Mojca Lorber 3789769af3 add dynamic length for sample type/group field when adding new sample 2017-01-20 09:53:44 +01:00
zmagod 9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
Matej Zrimšek 54f8b01341 Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894] 2017-01-19 15:26:28 +01:00
Oleksii Kriuchykhin 890c5e3c3d Add “no results found” message in smart annotation [SCI-886] 2017-01-19 13:42:58 +01:00
Zmago Devetak 039a8d7da6 Merge pull request #426 from ZmagoD/zd_add_tinyMCE 
Add tiny mce
 2017-01-19 12:57:55 +01:00
zmagod 2cbb8ba41a removed unneeded comments 2017-01-19 12:54:48 +01:00
mz3944 da604d2619 Merge pull request #427 from mz3944/mz-sci-908 
Some smart annotations refactoring [SCI-908]
 2017-01-19 12:15:20 +01:00
zmagod f2d5066dc7 fix some bugs 2017-01-19 11:37:59 +01:00
Matej Zrimšek 5d86bbb812 Smart annotations improved documentation. [SCI-908] 2017-01-19 10:56:02 +01:00
Matej Zrimšek fec83e8c45 Smart annotations refactoring. [SCI-908] 2017-01-19 10:55:43 +01:00
zmagod 2ccafdd670 bug fix 2017-01-19 10:12:01 +01:00
zmagod 27d3868f37 fix bugs 2017-01-19 09:40:39 +01:00
zmagod 88d7cb200e removed quill 2017-01-18 23:06:14 +01:00
zmagod 65fa631b1c adding tinyMce first run 2017-01-18 22:40:08 +01:00
okriuchykhin 18d329fb42 Merge pull request #423 from okriuchykhin/ok_SCI_896 
Make search work for full names in smart annotations [SCI-896]
 2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin 6555fd02b6 Make search work for full names in smart annotations [SCI-896] 2017-01-18 16:57:51 +01:00
mz3944 b5e38afb64 Merge pull request #416 from mz3944/mz-sci-884 
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
 2017-01-18 16:13:19 +01:00
Matej Zrimšek dbbb709bf2 Smart annotations minor refactoring. [SCI-884, SCI-889] 2017-01-18 16:04:39 +01:00
Matej Zrimšek 24458fe590 Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889] 2017-01-18 15:29:48 +01:00
Mojca Lorber dde9854bf1 update protocol import/export and clone 2017-01-18 14:22:19 +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
Oleksii Kriuchykhin 12eb1df69f Remove previous fix for popups [SCI-855] 2017-01-18 10:59:00 +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
Matej Zrimšek d3c33c9dca Refactored smart annotation JS. [SCI-884] 2017-01-17 10:05:41 +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
Matej Zrimšek 2877126dc6 Fixed selected search filter button style. [SCI-884] 2017-01-16 12:52:03 +01:00
mlorb 88cc87d168 Merge pull request #408 from mlorb/ml-sci-847-v2 
Adjust columns width in samples table header after selecting sample group [SCI-847]
 2017-01-16 10:52:00 +01:00
Mojca Lorber 9f1a49847e fix table header again 2017-01-13 18:54:43 +01:00
Matej Zrimšek 15d7944302 Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889] 2017-01-13 18:51:05 +01:00
Mojca Lorber 5f7e0b2227 adjust columns width in samples table header after selecting sample group 2017-01-13 15:59:47 +01:00
Oleksii Kriuchykhin a190ef36ff Extend comment to make more clear [SCI-855] 2017-01-13 12:43:43 +01:00
zmagod 1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin 097209bd9d Fix compatibility of fixed samples table header and modal-tooltip [SCI-855] 2017-01-13 11:34:05 +01:00
zmagod 1840fdb7e5 cleanup js 2017-01-12 09:52:29 +01:00
zmagod 3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
okriuchykhin 8d4b2d7373 Merge pull request #399 from okriuchykhin/ok_SCI_811_v2 
Fix changed sample type and sample group in sample edit [SCI-811]
 2017-01-11 11:37:38 +01:00
mlorb b898c792c4 Merge pull request #395 from mlorb/ml_sci_847 
Adjust columns width in table header after selecting sample type/group [SCI-847]
 2017-01-11 10:43:12 +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
Oleksii Kriuchykhin a3d9e25feb Fix changed sample type and sample group in sample edit [SCI-811] 2017-01-10 16:51:51 +01:00
zmagod fc76a4ae6d Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834 2017-01-10 14:22:04 +01:00
zmagod 89e8946a47 expand smart annotation 2017-01-10 14:14:21 +01:00
zmagod e0e998a0d8 add smart annotation parser helper 2017-01-10 14:14:21 +01:00
zmagod 6efcf49927 working version of dropdown filter 2017-01-10 14:14:21 +01:00
zmagod 53d20df449 added xregexp 2017-01-10 14:14:21 +01:00
zmagod 94262b56ef prepare data for atwho 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
Luka Murn 05be1e862f Update filter after toggling visibility (if neccesary) 2017-01-10 11:26:12 +01:00
okriuchykhin f8237e025a Merge pull request #394 from okriuchykhin/ok_SCI_853 
Fix non removable error messages in samples [SCI-853]
 2017-01-10 11:00:01 +01:00
Oleksii Kriuchykhin 4c9c9037ed Enable image preview after editing protocol and disable preview modal animation [SCI-868] 2017-01-09 17:19:46 +01:00
Mojca Lorber a0a7f35d44 adjust columns width in table header after selecting sample type/group 2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin 773b00933a Improve multiple messages handling in samples [SCI-853] 2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin 0fd7688427 Fix hiding of error messages in the samples datatable [SCI-853] 2017-01-09 13:34:23 +01:00
okriuchykhin 3f930ccfce Merge pull request #392 from okriuchykhin/ok_SCI_858 
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
 2017-01-09 12:49:38 +01:00
mz3944 54ef2be94b Merge pull request #383 from mz3944/mz-sci-845 
Fixed samples table all rows un/checking. [SCI-845]
 2017-01-09 11:58:44 +01:00
mlorb 006db01b11 Merge pull request #390 from mlorb/ml_sci_850 
Fix samples info popup error [SCI-850]
 2017-01-09 11:38:50 +01:00
Oleksii Kriuchykhin bc8db28746 Fixes wrong samples info modals being shown in samples datatable [SCI-858] 2017-01-09 09:38:42 +01:00
Luka Murn 0ee5b98977 Refactor code a bit, add dismiss button to header 2017-01-07 09:59:52 +01:00
Matej Zrimšek 72df48500d Fixed samples table all rows un/checking. [SCI-845] 2017-01-06 18:19:20 +01:00
Mojca Lorber 6f7c08fa63 fix samples info popup error 2017-01-06 17:31:17 +01:00
Oleksii Kriuchykhin 89710d8782 Enable image preview for newly uploaded images [SCI-694] 2017-01-06 16:41:24 +01:00
Oleksii Kriuchykhin aa2b573278 Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
Luka Murn 7835753d3c Add atwho-users URL to <body> 2017-01-06 12:48:37 +01:00
Mojca Lorber 4e7e261225 fix protocol preview 2017-01-06 10:10:33 +01:00
Mojca Lorber 356edba1b3 add protocol preview to search results 2017-01-05 18:08:59 +01:00
Luka Murn b614ce714b Restyle atwho dropdown 2017-01-05 14:06:48 +01:00
Luka Murn a78bb79618 Temp commit 2017-01-05 12:07:17 +01:00
Luka Murn eb64162633 Remove Gem dependency, add atwho as regular vendor/js 2017-01-05 12:06:59 +01:00
Luka Murn 09ef3b3ad5 Merge pull request #378 from Ducz0r/lm-sci-802-fix 
Add tooltips to samples column dropdown [SCI-802]
 2017-01-04 11:30:04 +01:00
Luka Murn 2c5b27ce81 Change "Update" to "Save" 
Closes SCI-802.
 2017-01-04 11:29:34 +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
Luka Murn 23e60e0d01 Add Gems for smart annotations (atwho) 2017-01-04 10:51:55 +01:00
Luka Murn 6402acc102 Merge pull request #377 from Ducz0r/lm-sci-820-fix 
Fix 2 bugs with comments editing [SCI-820]
 2017-01-04 10:47:29 +01:00
Luka Murn 37cd6417c8 Merge pull request #374 from Ducz0r/lm-sci-808-814-fix 
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
 2017-01-04 09:50:26 +01:00
Mojca Lorber a0704cd873 remove duplicated includes of css and js 2017-01-03 17:33:01 +01:00
zmagod a434649f42 Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-01-03 16:35:25 +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
Oleksii Kriuchykhin 0d01a4b2bd Remove unneeded function from utils.js [SCI-819] 2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin 4065be9e4e Fix marking of selected option [SCI-819] 2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin e22ff6f8bb Fix an issue with sample editing and type/group dropdowns [SCI-819] 2016-12-30 15:50:43 +01:00
okriuchykhin 2474eac37d Merge pull request #367 from okriuchykhin/ok_SCI_818 
Fix sample info popup [SCI-818]
 2016-12-30 15:43:28 +01:00
okriuchykhin e826791429 Merge pull request #365 from okriuchykhin/ok_SCI_807 
Fix buttons disappear when deleting columns in samples [SCI-807]
 2016-12-30 15:43:13 +01:00
okriuchykhin 73478d7b5e Merge pull request #372 from okriuchykhin/ok_SCI_816 
Fix flash message display in samples table [SCI-816]
 2016-12-30 15:30:14 +01:00
Oleksii Kriuchykhin e156dbc987 Implement flash message hiding through module pattern [SCI-816] 2016-12-28 14:52:03 +01:00
Luka Murn 2304742d87 Add tooltips to samples column dropdown 
Closes SCI-802.
 2016-12-27 08:45:23 +01:00
Luka Murn b931b20f02 Fix 2 bugs with comments editing 
Closes SCI-820.
 2016-12-23 20:41:23 +01:00
Luka Murn fbc2be890c Fix search on hidden columns in samples table 
Closes SCI-813.
 2016-12-23 19:56:54 +01:00
Luka Murn 87d8fece46 Fix bug on edit/cancel sample group page 
Closes SCI-814.
 2016-12-23 12:50:49 +01:00
mlorb 876ce37a96 Merge pull request #366 from mlorb/ml-sci-284 
Samples - freeze header row and edit button... [SCI-284]
 2016-12-23 12:29:41 +01:00
Mojca Lorber 40e3240a99 add content to preview modal 2016-12-22 11:43:11 +01:00
Luka Murn 5beaa26224 Update utils.js 
Closes SCI-811.
 2016-12-22 10:03:00 +01:00
Oleksii Kriuchykhin ee5e0ad455 Fix flash message display in samples table [SCI-816] 2016-12-21 17:26:33 +01:00
Luka Murn af6bf2aee1 Fix jQuery selector, make it work for new samples 2016-12-21 16:23:09 +01:00
Luka Murn e52277bdad Fix sample types & groups when editing sample in samples table 
Closes SCI-811.
 2016-12-21 13:15:55 +01:00
Oleksii Kriuchykhin 034976a709 Fix sample info popup [SCI-818] 2016-12-20 17:21:17 +01:00
Oleksii Kriuchykhin 00ea3a027c Fix generation of preview url for new steps and results [SCI-694] 2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin cbef971d85 Fix timeouts when fetching images from S3 [SCI-694] 2016-12-20 15:36:07 +01:00
Mojca Lorber ba0214d1ff staying on same page after saving a sample; fix button disappearance when adding new column 2016-12-20 15:19:31 +01:00
Mojca Lorber 165ec6144c adjust columns width in table header when editing or adding new sample; and fix horizontal scrolling 2016-12-20 13:41:19 +01:00
Oleksii Kriuchykhin 42f71f4da8 Fix buttons disappear when deleting columns in samples datatable [SCI-807] 2016-12-20 09:49:21 +01:00
Oleksii Kriuchykhin d2b76d8385 Improved image preview modal [SCI-694] 2016-12-19 17:36:18 +01:00
Mojca Lorber d1e2354f4e add scrolling functionality and remove bug with adding new column 2016-12-19 16:59:09 +01:00
zmagod 6f7f6a8b7f removes dropdown sorting [fixes SCI-811] 2016-12-19 16:41:14 +01:00
zmagod efe41817f2 removes sample group/type link in new sample form [fixes SCI-809] 2016-12-19 10:49:21 +01:00
Oleksii Kriuchykhin b537feb8a0 Added large preview [SCI-694] 2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin 0541253ffa Added modal for images preview [SCI-694] 2016-12-16 15:53:16 +01:00
Zmago Devetak 90a115fff3 Merge pull request #342 from ZmagoD/zd_SCI_758 
Generate png preview images for uploaded TIFF images
 2016-12-16 15:39:07 +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
Zmago Devetak c9d38a5454 Merge pull request #359 from ZmagoD/zd_SCI_804 
disables sorting and columns dropdown when editing or adding new samp…
 2016-12-16 12:56:11 +01:00
Zmago Devetak 601594fdb9 Merge pull request #355 from ZmagoD/zd_fix_mozilla_compatibility_issue 
fixes compatibility issue on mozilla firefox
 2016-12-16 11:57:18 +01:00
Zmago Devetak b35744d18e Merge pull request #360 from ZmagoD/zd_update_gemfile 
updated gemfile
 2016-12-16 11:53:05 +01:00
zmagod 897e34a23b reinitialize highlight.js after ajax call 2016-12-16 11:44:42 +01:00
zmagod b87246c8c2 cleanup spinner after edit step 2016-12-16 11:10:03 +01:00
Zmago Devetak ad9b25ba44 Merge pull request #356 from ZmagoD/zd_SCI_803 
fixes bug with long column names in edit mode [fixes SCI-803]
 2016-12-16 11:02:42 +01:00
Zmago Devetak 3d500800cd Merge pull request #358 from ZmagoD/zd_SCI_805_801 
removes error message from new type/group form [fixes SCI-805]
 2016-12-16 10:54:23 +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 fffa0d91da removes error message from new type/group form [fixes SCI-805] 2016-12-15 16:17:34 +01:00
zmagod 7c88f3e0aa fixed empty name error 2016-12-15 15:50:07 +01:00
zmagod 6755ebcbf8 fixes bug with long column names in edit mode [fixes SCI-803] 2016-12-15 15:26:51 +01:00
Zmago Devetak daee14bed5 Merge pull request #343 from ZmagoD/zd_SCI_780 
fixed step description links [fixes SCI-780]
 2016-12-15 13:12:25 +01:00
zmagod dc6e9dcbd8 fixes compatibility issue on mozilla firefox 2016-12-15 11:57:17 +01:00
Mojca Lorber 69d164da68 add new column on first position 2016-12-15 11:20:40 +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 3e31f114d4 app/assets/javascripts/samples/sample_datatable.js 2016-12-15 10:51:17 +01:00
zmagod b164886270 fixed error mesage scroll 2016-12-15 10:44:23 +01:00
zmagod b003d192c3 fixed edit mode 2016-12-15 09:54:38 +01:00
zmagod ba58ac2a77 Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796 2016-12-15 09:26:12 +01:00
zmagod 54fee339f8 cleanup unneeded code 2016-12-15 09:23:38 +01:00
zmagod 4d6a85ed7c fixed sample groups colorpicker [fixes SCI-781] 2016-12-15 09:23:38 +01:00
zmagod b07f9fae59 fixes new sample group/type link in sample row [fixes SCI-796] 2016-12-15 09:23:38 +01:00
zmagod 6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +01:00
zmagod dfd472d37d fixed column name after edit 2016-12-14 16:47:39 +01:00
zmagod a9f8239516 fixed edit action 2016-12-14 16:37:44 +01:00
okriuchykhin c4ff12be51 Merge pull request #349 from okriuchykhin/ok_SCI_783 
Fix columns ordering when deleting custom fields [SCI-783]
 2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin fa1cf1f04d Better handling of columns deleting with fixing columns ordering [SCI-783] 2016-12-14 15:23:00 +01:00
zmagod 50c9dd3f59 fixed typo 2016-12-14 14:40:56 +01:00
okriuchykhin 2fd7536039 Merge pull request #352 from okriuchykhin/ok_SCI_793 
Hide dropdown when user interacts with samples table [SCI-793]
 2016-12-14 14:19:38 +01:00
okriuchykhin 6381166eb1 Merge pull request #346 from okriuchykhin/ok_SCI_788 
Preserve scroll position in the samples columns dropdown when reordering [SCI-788]
 2016-12-14 14:19:15 +01:00
Zmago Devetak ef4ae1abcb Merge pull request #348 from ZmagoD/zd_SCI_785 
fixes samples table dropdown edit mode [fixes SCI-785]
 2016-12-14 13:37:09 +01:00
zmagod 1ff98bb6df adds tooltip to samples dropdown and column names 2016-12-14 13:36:10 +01:00
Oleksii Kriuchykhin 9f439cf183 Hide dropdown when user interacts with samples table [SCI-793] 2016-12-13 17:25:01 +01:00
zmagod d9971b4502 adds error message in samples table dropdown [fixes SCI-789] 2016-12-13 17:08:19 +01:00
Oleksii Kriuchykhin e414af2fc3 Fix columns ordering when deleting custom fields [SCI-783] 2016-12-13 16:21:17 +01:00
zmagod fa19bf1de7 fixes samples table dropdown edit mode [fixes SCI-785] 2016-12-13 15:43:31 +01:00
zmagod 2426539715 fixes long names in columns dropdown [fixes SCI-784] 2016-12-13 14:54:37 +01:00
zmagod c960230bf0 fixes dropdown height bug [fixes SCI-787] 2016-12-13 11:35:50 +01:00
Oleksii Kriuchykhin de12fac767 Preserve scroll position in the samples coluns dropdown when reordering [SCI_788] 2016-12-13 11:25:35 +01:00
Mojca Lorber 2cfcba0ceb add protocol preview modal 2016-12-13 10:39:18 +01:00
Zmago Devetak d54007f69c Merge pull request #337 from ZmagoD/zd_SCI_740 
limits max size of all uploaded files at the one time
 2016-12-13 09:04:14 +01:00
zmagod b56913cc87 refactor 2016-12-12 16:21:38 +01:00
zmagod 8dd8a7e7cd Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777 2016-12-12 15:52:25 +01:00
zmagod 5176f8b459 clean unneeded code [fixes SCI-778] refactor js 2016-12-12 15:40:13 +01:00
Luka Murn d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
 2016-12-12 09:57:37 +01:00
okriuchykhin 420daf3a6a Merge pull request #344 from okriuchykhin/ok_SCI_779 
Fix adding new samples columns [SCI-779]
 2016-12-12 09:29:27 +01:00
Oleksii Kriuchykhin 435a8d20bb Fix columns visability and reordering bug [SCI-779] 2016-12-09 17:37:22 +01:00
Matej Zrimšek 54de13de82 Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701] 2016-12-09 17:22:09 +01:00
Matej Zrimšek 0b12c87b09 Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701] 2016-12-09 16:44:50 +01:00
Oleksii Kriuchykhin 460ca067a2 Fix adding new samples columns [SCI-779] 2016-12-09 16:07:41 +01:00
zmagod e23be6cc0e fixed step description links [fixes SCI-780] 2016-12-09 15:26:41 +01:00
Oleksii Kriuchykhin 274fd63a41 Initial code commit [SCI-779] 2016-12-09 15:21:26 +01:00
zmagod 8b0dab624d clear unneeded css, change processing image [fixes SCI-758] 2016-12-09 14:24:20 +01:00
zmagod de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +01:00
Luka Murn 8a55ef29e4 Remove unused code 
Closes SCI-711.
 2016-12-09 13:49:19 +01:00
Luka Murn 1a8b141b95 Add delete custom field functionality 2016-12-09 13:49:19 +01:00
Luka Murn 7e32c13d27 Fix edit & delete functionality so it works with draggable 2016-12-09 13:18:59 +01:00
Luka Murn 754c90b612 Edit functionality now works 2016-12-09 13:18:59 +01:00
Luka Murn 54ebdbb06c Update edit mode JS & CSS 2016-12-09 13:18:59 +01:00
Luka Murn da630ac2cb Make edit, delete buttons clickable & hide them if neccesary 2016-12-09 13:18:59 +01:00
Matej Zrimšek aea679ec11 Added links for creating new sample type and group when creating new sample. [fixes SCI-701] 2016-12-09 11:39:12 +01:00
Mojca Lorber 0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
 2016-12-08 15:44:50 +01:00
Mojca Lorber 1b2a438ed4 remove fixed columns 2016-12-08 15:24:54 +01:00
zmagod 40fdfef67f setup delayed_paperclip gem 2016-12-08 15:24:14 +01:00
Mojca Lorber 7d88e247fc refactoring 2016-12-08 14:41:35 +01:00