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
1220 commits 70 branches 179 tags 165 MiB
Commit graph

983 commits

Author SHA1 Message Date
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
zmagod 3c1a275510 fixes invited user samples table [fixes SCI-790] 2016-12-13 10:56:13 +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 4b0e2baa3f fixes breadcrumbs in secondary nav 2016-12-12 16:03:14 +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
zmagod d9025a9601 changes create/edit mode buttons [fixes SCI-777] 2016-12-12 14:42:06 +01:00
zmagod 8bb452e4f7 trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775] 2016-12-12 10:30:03 +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
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
Mojca Lorber 7d88e247fc refactoring 2016-12-08 14:41:35 +01:00
Mojca Lorber 227fe9c284 change to after_create 2016-12-07 17:43:00 +01:00
Mojca Lorber 87dc76f4e3 change to update samples table state after initialize 2016-12-07 17:25:42 +01:00
Mojca Lorber 114a17ff0f change to create 2016-12-07 16:57:17 +01:00
Mojca Lorber 228990f9da fix samples table state, when adding new custom column 2016-12-07 16:37:16 +01:00
Mojca Lorber 5b5342de6f make first column fixed 2016-12-07 15:02:18 +01:00
Mojca Lorber 195055f9cf change SAMPLES_TABLE_DEFAULT_STATE 2016-12-07 14:51:34 +01:00
Mojca Lorber 39b6fa66fe add SamplesTable for new users 2016-12-07 14:14:32 +01:00
zmagod 9f1e436623 limits max size of all uploaded files at the one time [fixes SCI-740] 2016-12-07 09:02:04 +01:00
Zmago Devetak 310b61ec12 Merge pull request #335 from ZmagoD/zd_SCI_752 
fixes inport eln error message and spinner [fixes SCI-752]
 2016-12-06 15:11:34 +01:00
okriuchykhin cb2abfa7a9 Merge pull request #325 from okriuchykhin/ok_SCI_712 
Added form for adding new columns to samples table into dropdown [SCI-712]
 2016-12-06 15:00:01 +01:00
Zmago Devetak 49f9e64171 Merge pull request #333 from ZmagoD/zd_SCI_700 
Managing sample groups tab
 2016-12-06 14:51:09 +01:00
zmagod dd85b128d2 fixed glyphicon-ok position 2016-12-06 14:47:16 +01:00
zmagod 8ca7151df4 added constant to load_from_file_size_error local 2016-12-06 13:52:07 +01:00
Oleksii Kriuchykhin e02d780e44 Added Enter key handling and fixed error reporting [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin da7e86c7c2 Fix save/delete buttons after updating datatable and added permissions check [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin f6dd64772a Add columns to samples table without page reload [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin 40db8310fd Move code to sample_datatable.js and removed unused modal [SCI-712] 2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin 22dabd2177 Added form for adding new columns to samples table into dropdown [SCI-712] 2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin 94866e8994 Initial code commit for samples columns dropdown [SCI-712] 2016-12-06 13:16:05 +01:00
Mojca Lorber 1bc0ca9e75 fix bug with first time load 2016-12-06 13:14:29 +01:00
zmagod 787b8b1600 fixed new sample type/group form 2016-12-06 12:01:02 +01:00
Mojca Lorber 12088ebfd3 add visibility functionality after refresh 2016-12-06 09:40:28 +01:00
Mojca Lorber 849f78b4df implement reordering of columns in the samples table and change from local to database storage 2016-12-05 11:34:36 +01:00
Mojca Lorber 01e75fbbcc create samples table model and migration 2016-12-05 11:08:33 +01:00
Zmago Devetak a376118cd8 Merge pull request #334 from ZmagoD/zd_SCI_746 
fixes bug with deleted team name
 2016-12-05 10:47:39 +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 ef2471d3f7 fixes inport eln error message and spinner [fixes SCI-752] 2016-12-05 10:44:58 +01:00
zmagod 6274cd413e fixes bug with deleted team name [fixes SCI-746] 2016-12-02 16:07:00 +01:00
zmagod 7725374c42 refactor sample types/groups [fixes SCI-700] 2016-12-02 09:58:35 +01:00
zmagod 83aae59eed adds sample groups index page 2016-12-02 09:33:09 +01:00
Luka Murn 372b455d7d Merge pull request #332 from Ducz0r/lm-sci-750-751 
Fix inviting users not working
 2016-12-01 15:52:40 +01:00
Luka Murn 6a770f6a7e Fix inviting users not working 
Closes SCI-750, SCI-751.

Probably reopens parts of SCI-746.
 2016-12-01 15:46:37 +01:00
Matej Zrimšek 3bdaa4bcef Some token authentication refactoring and error handilng fixes. [closes SCI-689] 2016-12-01 15:38:56 +01:00
Matej Zrimšek 46465060d0 Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689] 2016-11-30 16:56:56 +01:00
Zmago Devetak 33adb58950 Merge pull request #328 from ZmagoD/zd_SCI_699 
Managing sample types tab
 2016-11-30 16:14:13 +01:00
Oleksii Kriuchykhin 2a27c8e6b3 Fix hound warning [SCI-695] 2016-11-30 11:52:07 +01:00
Oleksii Kriuchykhin f51f33ec25 Added sorting functionality to samples colunmns dropdown [SCI-695] 2016-11-30 11:42:05 +01:00
Luka Murn 680f443e31 Merge pull request #323 from Ducz0r/lm-sci-733-fix 
Fix task comments not properly showing in reports
 2016-11-30 09:51:59 +01:00
Luka Murn c0a03d9f2d Merge pull request #322 from Ducz0r/lm-add-show-version-var 
Add an environmental variable to toggle version display in navbar
 2016-11-30 09:49:40 +01:00
Luka Murn 84d0cf4620 Use rails helpers as per @ZmagoD's request 2016-11-30 09:48:57 +01:00
Luka Murn 76ec77fce4 Merge pull request #329 from biosistemika/simplify-signup 
Merge simplify-signup into master
 2016-11-30 09:41:20 +01:00
Luka Murn d685ac939b Merge pull request #326 from Ducz0r/lm-sci-746-fix 
Fix some recaptcha form submit errors for signup pages
 2016-11-30 09:35:16 +01:00
zmagod a2e13441e5 removes create_sample_type modal and related js actions 2016-11-30 09:02:34 +01:00
zmagod 4e4a48620c adds validation to input fields 2016-11-29 18:08:29 +01:00
zmagod 12848f15fa adds sample_type index view with all crud actions 2016-11-29 17:15:54 +01:00
Luka Murn 6491cf1806 Refactor & fix sign up constraints 2016-11-29 16:53:40 +01:00
Luka Murn e099a279b1 Remove link to "Resend confirmation instructions" if not neccesary 
Closes SCI-747.
 2016-11-29 16:12:35 +01:00
Luka Murn b5d0a39827 Fix some recaptcha form submit errors for signup pages 
Closes SCI-746.
 2016-11-29 15:53:58 +01:00
zmagod 5c0b2d7b24 init sample_types page 2016-11-29 08:57:12 +01:00
Luka Murn 90816ae1fa Just pleasing the Hound 2016-11-28 17:16:39 +01:00
Luka Murn 073f30dcc5 Fix task comments not properly showing in reports 
Closes SCI-733.
 2016-11-28 17:14:27 +01:00
Zmago Devetak 1e870a6e7c Merge pull request #320 from ZmagoD/zd_SCI_698 
adds new samples columns dropdown [fixes SCI-698]
 2016-11-28 16:30:16 +01:00
zmagod 72d1dfb15e cleanup sample_datatable.js 2016-11-28 16:28:22 +01:00
okriuchykhin f9c8223fe5 Merge pull request #321 from okriuchykhin/ok_SCI_736 
Improve regexp for image whitelisting [SCI-736]
 2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin d8f8e01a46 Code cleanup, added new image types to whitelist [SCI-736] 2016-11-28 11:13:20 +01:00
Luka Murn 9f998d6fed Add an environmental variable to toggle version display in navbar 
The variable is called NAVBAR_SHOW_VERSION. If not specified,
it defaults to the current behavior (version is hidden on
production, but visible on development & test environments).
 2016-11-28 10:52:17 +01:00
Luka Murn d142fa96d9 Merge pull request #317 from Ducz0r/lm-sci-735-fix 
Add Deface hooks to sign up & confirm invitation forms
 2016-11-28 10:22:46 +01:00
Oleksii Kriuchykhin cc0aab2e59 Improve regexp for image whitelisting [SCI-736] 2016-11-28 10:08:54 +01:00
okriuchykhin 31f6379866 Merge pull request #318 from okriuchykhin/ok_SCI_736 
Add whitelisting of supported image types [SCI-736]
 2016-11-28 09:32:49 +01:00
zmagod 9d91d2ce28 adds new samples columns dropdown [fixes SCI-698] 2016-11-25 17:29:30 +01:00
okriuchykhin 5981d1a48e Merge pull request #316 from okriuchykhin/ok_SCI_738 
Add full name field to accept invitation form [SCI-738]
 2016-11-25 16:15:23 +01:00
Luka Murn 7658ae264a Add uniqueness to sample_type & sample_group name 
Closes SCI-720.
 2016-11-25 16:15:05 +01:00
Oleksii Kriuchykhin 74f6455a8f Add whitelisting of supported image types [SCI-736] 2016-11-25 16:12:43 +01:00
Luka Murn a16bbe8fd2 Typo fix 2016-11-25 11:52:33 +01:00
Luka Murn cb16ab3c75 Add Deface hooks to signup & confirm invitation forms 2016-11-25 11:50:20 +01:00
Oleksii Kriuchykhin 3fdb20b92c Add full name field to accept invitation form [SCI-738] 2016-11-25 11:15:10 +01:00
Luka Murn b1b095910c Merge pull request #309 from Ducz0r/lm-remove-unused-files 
Brace for impact...
 2016-11-25 10:00:29 +01:00
Luka Murn 87d3280847 Refactor registrations_controller code slightly 2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin 592ed802b2 Switched to use of recaptcha_input_tag helper method [SCI-706] 2016-11-24 14:19:44 +01:00
Oleksii Kriuchykhin 698e07a3b5 Enable reCaptcha and auto log in on confirm invitation form [SCI-706] 2016-11-24 14:11:02 +01:00