scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 23:44:55 +08:00
Code Issues Projects Releases Packages Wiki Activity
1465 commits 43 branches 185 tags 169 MiB
Commit graph

1205 commits

Author SHA1 Message Date
Mojca Lorber
7d88e247fc refactoring 2016-12-08 14:41:35 +01:00
zmagod
ac52e643be cleanup direct upload 2016-12-08 11:26:13 +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
Mojca Lorber
beae54e278 remove already_authenticated alert flash 2016-11-23 14:55:41 +01:00
zmagod
32eea3dbdd adds autolink to result comments 2016-11-23 14:24:51 +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
198febfd94 Fix user projects not working 2016-11-23 13:19:10 +01:00
Matej Zrimšek
1db926101d Minor refactoring. 2016-11-23 10:48:43 +01:00
Matej Zrimšek
6bc2603157 Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707] 2016-11-23 10:36:09 +01:00
Mojca Lorber
51abd8907c add switch to toggle email confirmations 2016-11-23 09:49:52 +01:00
Zmago Devetak
341fb13a26 Merge pull request #310 from ZmagoD/zd_add_email_login_constraints 
adds rake task that creates a sign up email domain constraint
 2016-11-23 09:16:24 +01:00
Zmago Devetak
0f3db56a74 Merge pull request #311 from ZmagoD/zd_SCI_716 
load comments after edit step [fixes SCI-716]
 2016-11-23 09:14:57 +01:00
zmagod
d75d58b159 moved email constraint to database_helper 2016-11-23 09:13:09 +01:00
Mojca Lorber
48ac289b6e put recaptcha in helper method 2016-11-22 17:57:42 +01:00
Luka Murn
fba646bfba Fix Hound errors 2016-11-22 15:19:12 +01:00
Luka Murn
7cbe44d1f2 Refactor user projects & user my modules code 2016-11-22 15:16:26 +01:00
Luka Murn
201b1a48d5 Refactor user my modules code 2016-11-22 15:07:18 +01:00
Luka Murn
e0607f7891 Refactor step comments code 2016-11-22 15:01:48 +01:00
Luka Murn
0c96036de8 Refactor some sample types code 2016-11-22 14:59:57 +01:00
Mojca Lorber
60f23b109b integrate reCaptcha into sciNote 2016-11-22 14:57:41 +01:00
Luka Murn
8ff5285179 Refactor some sample groups code 2016-11-22 14:57:01 +01:00
Luka Murn
f5e286b1f6 Remove unused code for some more comments 2016-11-22 14:52:43 +01:00
zmagod
8d7285ce7c load comments after edit step [fixes SCI-716] 2016-11-22 14:39:08 +01:00
Luka Murn
1f7a8712fb Update task comments & task tags controllers & localized Strings 
(Remove a lot of unused code)
 2016-11-22 14:26:35 +01:00
Oleksii Kriuchykhin
d7aa155860 Disable keyboard navigation in tutorial [SCI-703] 2016-11-22 14:14:42 +01:00
Oleksii Kriuchykhin
be59b85d3b Added additional checks for tutorial steps [SCI-703] 2016-11-22 13:55:23 +01:00
Oleksii Kriuchykhin
cc86ff268f Reload page after exit from tutorial [SCI-703] 2016-11-22 13:49:57 +01:00
mz3944
c5bc3a4dc6 Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2 
Added additional tutorial step for showing protocol link. Tutorial st…
 2016-11-21 16:06:45 +01:00
mlorb
f4aa75b4d2 Merge pull request #305 from mlorb/ml_sci_692 
Fix empty space and blockquote padding - rich text editing [SCI-692]
 2016-11-21 14:38:33 +01:00
Oleksii Kriuchykhin
d6f5f6b9bf Changes default behaviour for absolute urls in Quill [SCI-684] 2016-11-21 14:18:08 +01:00
Luka Murn
1dff6c527e Merge pull request #302 from Ducz0r/lm-sci-691-fix 
Correctly import protocols with rich text [SCI-691]
 2016-11-21 14:04:22 +01:00
Luka Murn
59eb1c1d18 Remove unused new, edit user_projects views 2016-11-19 17:01:10 +01:00
Luka Murn
911b7ba72f Remove unused new user_my_module view 2016-11-19 16:59:24 +01:00
Luka Murn
6999105e51 Remove tags 2016-11-19 16:57:08 +01:00
Luka Murn
008b31df0c Finish removing new comment forms 2016-11-19 16:54:55 +01:00
Luka Murn
595b213b1a Changes up to samples in views folder 2016-11-19 16:51:40 +01:00
Mojca Lorber
91b0f4907c fix hound 2016-11-18 12:54:32 +01:00
Mojca Lorber
086f937fbb fix empty space and blockquote padding - rich text editing 2016-11-18 12:43:57 +01:00
Luka Murn
f5795f5516 Remove unused assets & helpers 2016-11-18 11:30:03 +01:00
Luka Murn
3be30c0e7a Re-introduce fix for SCI-650 that was lost during merge 
Closes SCI-650.
 2016-11-18 10:57:03 +01:00
Matej Zrimšek
f13cc5be0e Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way). 2016-11-17 18:03:49 +01:00
Luka Murn
08c6210f7c Also employ "no format" Nokogiri strategy when sanitizing 
Closes SCI-691.
 2016-11-17 16:43:14 +01:00
Luka Murn
fc32aa8606 Add custom scrubber for QuillJs 2016-11-17 16:43:14 +01:00
Luka Murn
26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +01:00
Luka Murn
9d3685f872 Merge branch 'gamification' into 'master' 
Conflicts:
	app/controllers/users/invitations_controller.rb
	app/controllers/users/settings_controller.rb
 2016-11-17 16:30:18 +01:00
Matej Zrimšek
c8eb82cc85 Fixed tutorial step numbers and changed getting next page reference on protocols page. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
92d990a715 Code for tutorial function steps parameter reformatted. Deleted Git merging line. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
0e97bfc002 Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
c64146904a Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
47c1308ba6 Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
00ed91e856 Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
bfe7c19f93 Refactored and added back button for tutorial for steps 14-15. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
4ee7baabec Enriched tutorial function description. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
33c96c9eee Refactored and added back button for tutorial for steps 12-13. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
0687153eb8 Minor tutorial refactoring. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
f4206ea3d0 No warning popup is shown when running tutorial. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
3f8d3d5939 Refactored and added back button for tutorial for steps 6-11. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
74e58b044f Tutorial refactored using one method, for steps 1-5. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
0d133ff32e Refactoring and added back buttons for tutorial steps 1-5. 2016-11-17 14:46:04 +01:00
Luka Murn
d1701bd7ae Merge pull request #276 from Ducz0r/lm-sci-637 
Automatically resize textarea elements [SCI-637]
 2016-11-17 09:58:36 +01:00
zmagod
da54d779ec Merge branch 'rich-text-formatting' of https://github.com/biosistemika/scinote-web into zd_SCI_687 2016-11-17 08:48:40 +01:00
Luka Murn
a3bbf94643 Add a smart_text_area tag & implement it throughout application 
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
 2016-11-16 17:57:01 +01:00
Luka Murn
aadcdde417 Merge pull request #294 from Ducz0r/lm-sci-674-fix 
Import protocol steps' rich text styling when importing protocols [SCI-674]
 2016-11-16 16:59:18 +01:00
Oleksii Kriuchykhin
d2e29935cf Improved tutorial styling [SCI-685] 2016-11-16 15:44:06 +01:00
zmagod
b781db9667 fixed bullets 2016-11-16 15:30:14 +01:00
zmagod
e5ba134e83 fixes search 2016-11-16 14:50:06 +01:00
Zmago Devetak
d3234bc52f Merge pull request #284 from biosistemika/zd_SCI_662 
fixes description label [fixes SCI-662]
 2016-11-16 14:16:57 +01:00
zmagod
7953372d83 add description label 2016-11-16 13:59:35 +01:00
okriuchykhin
43b85ac5c2 Merge pull request #293 from okriuchykhin/ok_SCI_670 
Fix project canvas interactivity in the tutorial [SCI-670]
 2016-11-16 11:32:13 +01:00
Luka Murn
4b8824ca16 Merge pull request #291 from Ducz0r/lm-sci-676-fix 
Allow inviting of unconfirmed user onto multiple teams [SCI-676]
 2016-11-16 11:32:01 +01:00
Luka Murn
e4b3d397a0 Merge pull request #288 from Ducz0r/lm-sci-675-fix 
Fix a bug where user could be assigned to same project twice [SCI-675]
 2016-11-16 10:34:37 +01:00
Luka Murn
29f0557d3c Prevent CORS when importing protocols 2016-11-15 17:06:39 +01:00
Luka Murn
83160a487b Fix importer so it supports rendering & importing rich text format 
Closes SCI-674.
 2016-11-15 16:57:53 +01:00
Oleksii Kriuchykhin
410837e6cf Fix project canvas interactivity in the tutorial [SCI-670] 2016-11-15 16:53:20 +01:00
Luka Murn
263244ad83 Reload whole page after user is invited from team invite users modal 
Closes SCI-664.
 2016-11-15 16:21:32 +01:00
Luka Murn
d425a7ad05 Merge pull request #283 from Ducz0r/lm-sci-650-fix 
Update invited user form so it works if user inputs empty team name [SCI-650]
 2016-11-15 15:59:52 +01:00
Luka Murn
eb4d031b79 Fix destroying of users in relation to notifications 2016-11-15 15:56:32 +01:00
Luka Murn
04749c3b2c Allow inviting of existing, unconfirmed users 
Closes SCI-676.
 2016-11-15 15:04:31 +01:00
Mojca Lorber
c089832909 add validation for result text field 2016-11-15 12:55:32 +01:00
okriuchykhin
01b01939f3 Merge pull request #277 from okriuchykhin/ok_SCI_571 
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
 2016-11-15 12:05:20 +01:00
Luka Murn
7c03037643 Merge pull request #286 from Ducz0r/lm-sci-655-fix 
Save first time tutorial Activity-s without callbacks [SCI-655]
 2016-11-15 12:00:35 +01:00
mlorb
c996df7476 Merge pull request #287 from mlorb/ml_sci_665 
Fix position of buttons in text result [SCI-665]
 2016-11-15 11:27:04 +01:00
Mojca Lorber
607f1381d0 fix mobile view 2016-11-15 10:58:15 +01:00
Luka Murn
e733da728c Fix a bug where user could be assigned to same project twice 
Closes SCI-675.
 2016-11-15 10:44:32 +01:00
Zmago Devetak
fddd7f662b Merge pull request #281 from ZmagoD/zd_SCI_660 
hide flash after 5 sec [fixes SCI-660]
 2016-11-15 10:33:45 +01:00
Zmago Devetak
914bd42448 Merge pull request #278 from ZmagoD/zd_search_bug_with_rich_text_editor 
strips the html tags from fearch query
 2016-11-15 10:30:29 +01:00
Mojca Lorber
6afc5c5a4b fix position of buttons in text result 2016-11-14 16:31:48 +01:00
Luka Murn
fa6d8d3020 Save first time tutorial Activity-s without callbacks 
This PR adds a new, pretty useful little gem called sneaky-save.
Closes SCI-655
 2016-11-14 15:55:44 +01:00
Mojca Lorber
7002fc3f2f fix hound 2016-11-14 15:10:37 +01:00
Mojca Lorber
615cd3c278 profile changes for gamification 2016-11-14 15:04:18 +01:00
zmagod
67c508a891 fixes description label [fixes SCI-662] 2016-11-14 13:47:20 +01:00
zmagod
3728a6cef9 fixed sql regex 2016-11-14 12:32:41 +01:00
okriuchykhin
091cb0005e Merge pull request #280 from okriuchykhin/ok_SCI_658 
Show only protocols from Protocol Management in users statistics [SCI-658]
 2016-11-14 09:40:12 +01:00
Luka Murn
861e7cf72d Update invited user form so it works if user inputs empty team name 
Closes SCI-650
 2016-11-11 17:27:32 +01:00
Oleksii Kriuchykhin
2fb3041784 Fixes edit avatar link area [SCI-649] 2016-11-11 13:17:44 +01:00
mlorb
b0b2484fdf Merge pull request #279 from mlorb/ml_sci_638_vol2 
Fix validation problems for rich text fields [SCI-638]
 2016-11-11 12:37:02 +01:00
Mojca Lorber
4d681bb63c change strip html function 2016-11-11 12:34:57 +01:00
zmagod
59f7bdb54e hide flash after 5 sec [fixes SCI-660] 2016-11-11 12:30:48 +01:00
Oleksii Kriuchykhin
ab895ae864 Show only protocols from Protocol Management in users statistics [SCI-658] 2016-11-11 12:14:57 +01:00
mlorb
1ca452db7b Merge pull request #273 from mlorb/ml_sci_640 
Add rich text formatting on results and remove markdown [SCI-640]
 2016-11-11 12:06:13 +01:00
mlorb
d42adff77e Merge pull request #275 from mlorb/ml_sci_642 
Add formatted text in reports [SCI-642]
 2016-11-11 12:04:19 +01:00
Mojca Lorber
4b7fa440f6 fix hound 2016-11-11 12:03:01 +01:00
Mojca Lorber
3b7af3e66c fix validation logic 2016-11-11 11:42:16 +01:00
zmagod
630724df2b strips the html tags from fearch query 2016-11-11 11:41:23 +01:00
Oleksii Kriuchykhin
b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin
d2491a18a4 Tutorial Save Protocol step added [SCI-571] 2016-11-11 10:06:18 +01:00
Luka Murn
5727158495 Hotfix to nicely render comments form on Firefox as well 2016-11-11 09:47:37 +01:00
Luka Murn
b42922d32c Add autosize functionality to all textareas 
Closes SCI-637
 2016-11-11 09:09:41 +01:00
Luka Murn
55f9633d1d Add jQuery.autosize plugin 2016-11-11 09:09:41 +01:00
Luka Murn
acd8ce8932 Merge pull request #270 from Ducz0r/lm-sci-644 
Convert all large text input fields into text areas (10000 characters)
 2016-11-11 09:07:25 +01:00
Mojca Lorber
1facd2cefe fix validation problems 2016-11-10 17:20:17 +01:00
Luka Murn
0e065026bd Closes SCI-648 2016-11-10 16:18:17 +01:00
Mojca Lorber
fbaffbcaab add formatted text in reports 2016-11-10 15:20:40 +01:00
Luka Murn
564274a588 Set invited_by field to invited users 2016-11-10 14:45:24 +01:00
Mojca Lorber
d2ae11f1af fix hound 2016-11-10 14:16:54 +01:00
Mojca Lorber
3e162b3a93 remove redcarpet gem - markdown 2016-11-10 14:11:32 +01:00
Mojca Lorber
456c6d1ad6 Copy rich text functionality to text results 2016-11-10 12:19:59 +01:00
Mojca Lorber
ab0879e8d6 Integrate library with default settings 2016-11-09 13:09:53 +01:00
Luka Murn
c88f834ba9 Merge pull request #269 from Ducz0r/lm-sci-569 
Add a refactored invite users modal that can be reused throughout application
 2016-11-08 16:57:05 +01:00
Luka Murn
b246853117 Code styling (use link_to, %w) 2016-11-08 16:43:25 +01:00
Zmago Devetak
82a12f0fce Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants 
Enables notifications to be extended
 2016-11-08 13:08:15 +01:00
Luka Murn
d44a757b25 Add textareas to checklist name & items 
Closes SCI-644
 2016-11-08 11:50:29 +01:00
zmagod
330afe80dc fixes notification model 2016-11-08 11:46:09 +01:00
mlorb
0793fb9f11 Merge pull request #260 from mlorb/ml_sci_614 
Add notification for removing user from team and removing user from project [SCI-614]
 2016-11-08 11:30:49 +01:00
Luka Murn
55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +01:00
Mojca Lorber
6f1c9ffb81 refactoring 2016-11-08 11:20:14 +01:00
Luka Murn
9438ba7e10 Fix a bug 2016-11-08 09:00:00 +01:00
Luka Murn
9260ed31f3 Add Deface hooks to main navbar 2016-11-07 16:57:18 +01:00
Mojca Lorber
63eb4eeaf8 fix hound 2016-11-07 15:33:21 +01:00
Mojca Lorber
27c83992b4 refactoring notification method 2016-11-07 15:31:06 +01:00
okriuchykhin
fd805f4072 Merge pull request #259 from okriuchykhin/ok_SCI_605 
Added additional activities [SCI-605]
 2016-11-07 10:01:16 +01:00
Luka Murn
ce7733e9e9 Also add notification when UserOrganization is created 2016-11-07 09:47:30 +01:00
Luka Murn
0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +01:00
Luka Murn
a188984ede Allow strings of modal to be replaced 2016-11-07 09:43:10 +01:00
Luka Murn
6fe0d6b3df A working invite modal! 2016-11-07 09:43:10 +01:00
Luka Murn
ccf8932611 Add first version of invite users modal 2016-11-07 09:43:09 +01:00
Oleksii Kriuchykhin
fe6724431e Futher improvement of samples assign/unassign logging [SCI-605] 2016-11-07 09:29:56 +01:00
Oleksii Kriuchykhin
a1bfacef86 Improved samples assign/unassign logging [SCI-605] 2016-11-03 17:59:32 +01:00
Matej Zrimšek
0fe5822825 Added profile statistics data hook. 2016-11-03 17:50:32 +01:00
Mojca Lorber
a234c4c9d9 fix merge conflict problem with avatar on profile page 2016-11-03 15:23:09 +01:00
zmagod
1d6b93829c added hooks in notifications preview 2016-11-03 14:48:01 +01:00
Oleksii Kriuchykhin
3d25da5db7 Fixed bug with protocol loading from file [SCI-605] 2016-11-03 14:15:22 +01:00
zmagod
3c9bd6f511 enables notification to be extended 2016-11-02 14:44:16 +01:00
Mojca Lorber
44b51d087a merging 2016-11-02 14:06:20 +01:00
Mojca Lorber
749b108928 fix hound 2016-11-02 13:32:15 +01:00
Mojca Lorber
a2213e23b3 add notification for removing user from team and removing user from project 2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin
e8d20dfc01 Added additional activities [SCI-605] 2016-11-02 10:43:36 +01:00
Zmago Devetak
6e022699eb Merge pull request #256 from ZmagoD/add_getting_started_flash_hook 
Added getting started hoot to layout/application.html
 2016-10-28 16:19:20 +02:00
zmagod
01b27e9e6d added getting started hoot to layout/application.html 2016-10-28 10:36:15 +02:00
Mojca Lorber
91ec201fd0 make image clickable 2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin
d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
Mojca Lorber
888aa31aed fix hound 2016-10-27 11:18:11 +02:00
Mojca Lorber
5719d4c61f show edit avatar on mouse hover, add background and center image 2016-10-27 11:09:30 +02:00
Mojca Lorber
8309df0aaf fix hound 2016-10-26 13:51:05 +02:00
Mojca Lorber
878952f072 change edit avatar in profile 2016-10-26 13:41:17 +02:00
Luka Murn
b4685b0a40 Remove console.log() 2016-10-25 18:13:29 +02:00
Luka Murn
cd360d7279 Fix the save report alert() bug 
Closes SCI-616
 2016-10-25 18:12:29 +02:00
Luka Murn
eec6b1403d Merge pull request #247 from Ducz0r/lm-hotfix-blank-current-org 
Add check in application controller to always set current org if nil
 2016-10-25 11:53:05 +02:00
Zmago Devetak
266d1415d0 Merge pull request #246 from ZmagoD/zd_SCI_599 
fixes error when removing user from team [SCI-599]
 2016-10-25 11:52:44 +02:00
Luka Murn
7885fd0f39 Add check in application controller to always set current org if nil 2016-10-25 11:39:57 +02:00
zmagod
6a328969f0 reset current_user if the user leaves the team [fixes SCI-599] 2016-10-25 09:53:02 +02:00
zmagod
24b81c96f6 sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608] 2016-10-24 21:20:41 +02:00
zmagod
e02132578a first run 2016-10-24 20:07:20 +02:00
Luka Murn
b13fd22408 Add back the release notes URL to navbar 
Closes SCI-604
 2016-10-24 16:59:32 +02:00
Zmago Devetak
12c77df883 Merge pull request #237 from ZmagoD/zd_SCI_593_v2 
Styled global team switch and search [fixes SCI-593]
 2016-10-21 16:28:50 +02:00
zmagod
9a4603dd7d removed unneeded css 2016-10-21 16:27:53 +02:00
Luka Murn
388e092bbf Merge pull request #238 from Ducz0r/lm-sci-596-fix 
SCI-596 fix
 2016-10-21 11:59:01 +02:00
zmagod
49d3879642 fixes padding on mobile, added separator on team switch dropdown, focus search input 2016-10-21 11:46:59 +02:00
Zmago Devetak
4f5b7ad8ad Merge pull request #228 from ZmagoD/zd_SCI_585 
Removes archived projects from index page [fixes SCI-585]
 2016-10-21 11:33:01 +02:00
Luka Murn
7b825a217f Closes SCI-596 2016-10-21 11:08:47 +02:00
Zmago Devetak
af0e9b99b6 Merge pull request #233 from ZmagoD/zd_SCI_591 
Move tooltip to the right [fixes SCI-591]
 2016-10-21 10:38:25 +02:00
okriuchykhin
f876ade05e Merge pull request #236 from okriuchykhin/ok_SCI_557 
Fixes issue with new comments and date separator SCI-557
 2016-10-21 10:29:46 +02:00
Oleksii Kriuchykhin
5be7904f5a Fix hound warnings [SCI-557] 2016-10-21 09:37:24 +02:00
zmagod
c642e208dd styled global team switch and search [fixes SCI-593] 2016-10-21 09:33:18 +02:00
zmagod
db806f3c10 hide private projects 2016-10-21 09:06:19 +02:00
Zmago Devetak
f615b3da41 Merge pull request #230 from ZmagoD/zd_SCI_586 
Adds new team button to team switch dropdown [fixes SCI-586]
 2016-10-21 08:29:05 +02:00
Oleksii Kriuchykhin
0c1ff06f21 Fixes issue with new comments and date separator SCI-557 2016-10-20 22:33:15 +02:00
Zmago Devetak
094e989af5 Merge pull request #227 from ZmagoD/zd_SCI_587 
Removes org selector form project archive [fixes SCI-587]
 2016-10-20 16:32:46 +02:00
zmagod
9214adc591 fixed team name position 2016-10-20 15:35:09 +02:00
mlorb
fa4f3fb0a0 Merge pull request #220 from mlorb/ml_sci_462 
fix multiplication of edit comment fields [SCI-462]
 2016-10-20 15:14:31 +02:00
zmagod
f9fb4d8bd6 move tooltip to the right [fixes SCI-591] 2016-10-20 14:34:45 +02:00
Oleksii Kriuchykhin
347216183f Fixes different color of buttons in notifications settings [SCI-590] 2016-10-20 14:17:07 +02:00
zmagod
f21c9e394f adds new team button to team switch dropdown [fixes SCI-586] 2016-10-20 13:47:41 +02:00
zmagod
4c086a6fc1 removes archived projects from index page [fixes SCI-585] 2016-10-20 13:13:44 +02:00
zmagod
8aaf58f75f removes org selector form project archive [fixes SCI-587] 2016-10-20 12:50:55 +02:00
Luka Murn
640a575a3a Merge pull request #222 from biosistemika/modular-tasks 
Merge global team switch into master
 2016-10-18 11:39:09 +02:00
zmagod
76f6e30078 fixes word-wrap on mozilla 2016-10-17 15:36:33 +02:00
zmagod
557957c857 fixed issue with mozilla browsers 2016-10-17 15:21:19 +02:00
zmagod
54a3237994 displays org name on the project index page if no project 2016-10-17 15:21:19 +02:00
zmagod
8a6899aeea restyled team switch dropdown 2016-10-17 15:21:19 +02:00
zmagod
a116feac9c fixed typos and added truncation to org name 2016-10-17 15:21:19 +02:00
zmagod
1614cbc2b2 fixes repeat tutorial button and localization typos 2016-10-17 15:16:22 +02:00
zmagod
931cba2666 fixes hound [fixes SCI-512] 2016-10-17 15:10:26 +02:00
zmagod
e85ed788f2 fixed user_generator 2016-10-17 15:10:26 +02:00
zmagod
fa36488397 fixed new project form 2016-10-17 15:10:26 +02:00
zmagod
8f24d0d80c fixed new user registration 2016-10-17 15:10:26 +02:00
zmagod
8cd86a50bb styled dropdown 2016-10-17 15:10:26 +02:00
zmagod
3117a464f0 fixed controllers 2016-10-17 15:10:26 +02:00
zmagod
bb9c03df24 fixes controllers 2016-10-17 15:10:26 +02:00
zmagod
d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
zmagod
efe031d766 setup current_organization in all controllers 2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311 setup global team switch view and controller action 2016-10-17 15:10:26 +02:00
Oleksii Kriuchykhin
0ec7c019b3 Fix issue with pop-up windows and turbolinks [SCI-463] 2016-10-17 14:25:54 +02:00
Mojca Lorber
177c4b5918 fix multiplication of edit comment fields 2016-10-17 12:59:51 +02:00
Matej Zrimšek
a31753ea39 Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
f2cd9890dd Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
5966911b92 Fixed Hound alerts. 2016-10-17 11:57:46 +02:00
Matej Zrimšek
778ed8814b Removed some unneeded code. 2016-10-17 11:57:46 +02:00
Matej Zrimšek
05acf5a725 Replaced all Ruby constants instances in JS to be called from JS. 2016-10-17 11:57:46 +02:00
Matej Zrimšek
0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Luka Murn
845d487fa1 Merge pull request #218 from Ducz0r/lm-mail-previews 
Add notification mailer preview
 2016-10-13 14:58:04 +02:00
Oleksii Kriuchykhin
c6fb57318f Added use of constants in JS [SCI-530] 2016-10-13 13:06:11 +02:00
Luka Murn
02d3e03f75 Bugfix for notification emails 
The URLs in notification emails didn't get server URL prepended,
so users could not click on them.
 2016-10-13 12:12:28 +02:00
Oleksii Kriuchykhin
37cff75013 Fixes issue with comments options menu [SCI-530] 2016-10-13 12:07:41 +02:00
mlorb
cbc14d9d50 Merge pull request #211 from mlorb/ml_sci_491 
change 80s glow [SCI-491]
 2016-10-13 10:13:14 +02:00
Mojca Lorber
c51aedb178 change thickness of shadow 2016-10-13 10:11:32 +02:00
Luka Murn
bdaeb4db13 Add notification mailer preview 2016-10-13 08:56:04 +02:00
mlorb
78f7879c04 Merge pull request #216 from mlorb/ml_sci_555 
Adding update notifications in settings [SCI-555]
 2016-10-13 08:53:55 +02:00
Mojca Lorber
8f783f87f7 fixes hound 2016-10-12 15:32:40 +02:00
Mojca Lorber
42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Mojca Lorber
6bea0a9e1a fixes merge conflicts 2016-10-12 10:55:40 +02:00
Luka Murn
cccabcdd7b Remove invitation_to_organization email 
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
 2016-10-12 10:54:36 +02:00
Mojca Lorber
4f1cbad7da adding update notifications in settings 2016-10-12 10:42:07 +02:00
Zmago Devetak
f25767fdc3 Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup 
Removed introductory popup [fixes SCI-534]
 2016-10-12 08:13:46 +02:00
Zmago Devetak
b225dc1e29 Merge pull request #210 from ZmagoD/zd_SCI_548_protocol_steps_not_visible 
Fixes protocol steps [fixes SCI-548]
 2016-10-12 08:13:28 +02:00
Oleksii Kriuchykhin
4c6a60c249 Added html_safe to notification email template 2016-10-11 16:46:20 +02:00
Oleksii Kriuchykhin
90c853743c Additional fixes to email markup and logic [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
3f219e1bfe Hound code style fixes [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
8dc956010c Initial code commit [SCI-443] 2016-10-11 16:43:17 +02:00
Mojca Lorber
b1b23b8f41 fixes hound 2016-10-11 10:39:00 +02:00
Mojca Lorber
63ec63047d change 80s glow 2016-10-11 10:33:26 +02:00
Zmago Devetak
692b31325b Merge pull request #206 from ZmagoD/zd_SCI_561 
Fixed assinement icon [fixes SCI-561]
 2016-10-11 09:32:47 +02:00
zmagod
ea305b356a fixes protocol steps [fixes SCI-548] 2016-10-11 09:10:12 +02:00
zmagod
42a30576e3 removed introductory popup [fixes SCI-534] 2016-10-11 08:33:50 +02:00
Luka Murn
448daab7c8 Merge pull request #207 from biosistemika/add-deface-hotfix 
Merge hotfix 1.3.1 into master
 2016-10-07 18:26:13 +02:00
zmagod
fe7b367eae fixed hound 2016-10-07 15:25:53 +02:00
zmagod
130db6a2c3 fixed assignment icon [fixes SCI-561] 2016-10-07 12:27:44 +02:00
zmagod
32f03ec94c Add Deface hooks 2016-10-06 16:47:36 +02:00
zmagod
0bdf77562d add word-wrap to notrification index page [fixes SCI-556] 2016-10-06 13:49:24 +02:00
zmagod
de00a19dd9 fixes styling in settings preferences [SCI-553] 2016-10-06 13:22:44 +02:00
zmagod
5b3889c172 notification index images [fixes SCI-554] 2016-10-06 12:09:01 +02:00
Luka Murn
5c80c8a817 Add "no notifications" to dropdown & notifications index page 2016-10-05 16:58:21 +02:00
Luka Murn
877574e853 Add link to settings from both notification lists 2016-10-05 16:26:26 +02:00
Luka Murn
56d2240de5 Optimize data query in user_notification.rb 2016-10-05 16:21:13 +02:00
Oleksii Kriuchykhin
083a09c2f7 Add link to notifications index page 2016-10-05 16:13:05 +02:00
okriuchykhin
50f28fe883 Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442 
Global notifications screen [SCI-442]
 2016-10-05 16:01:41 +02:00
Oleksii Kriuchykhin
4e2ad1d5e6 Fix the issues after code review [SCI-442] 2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin
c783e9a03d Code fix after rebase with latest master [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
d2b48e94bd CSS color fix [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
868ffd03d6 JS code improvement [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
246dae4f46 Code style improvements according to hound [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8907e54b49 Global notifications index page added [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8b5b0723d1 Initial code commit 2016-10-05 15:51:11 +02:00
Zmago Devetak
f3708bcac0 Merge pull request #191 from ZmagoD/zd_SCI_469_ver2 
Comments date duplication
 2016-10-05 15:47:42 +02:00
zmagod
b0f6b1f4d0 fixed comments action on project page 2016-10-05 15:39:54 +02:00
Zmago Devetak
eea310514a Merge pull request #194 from ZmagoD/zd_SCI_531_533 
Notification style fixes
 2016-10-05 15:27:36 +02:00
zmagod
bca3d19562 fixed comment options dropdown position 2016-10-05 15:26:11 +02:00
Zmago Devetak
71ad5bf034 Merge pull request #190 from ZmagoD/zd_SCI_529 
Prepare settings screen for notifications
 2016-10-05 14:54:47 +02:00
Zmago Devetak
c547d8a07a Merge pull request #195 from ZmagoD/zd_SCI_532 
add word wrapping to notifications dropdown [fixes SCI-532]
 2016-10-05 14:54:10 +02:00
zmagod
dfcbebbf4f cleaned up bootstrap extension 2016-10-05 14:49:23 +02:00
okriuchykhin
bfa7e57bd8 Merge pull request #168 from okriuchykhin/ok_SCI-463 
Fixes issue with unexpected notification windows [fixes SCI-463]
 2016-10-05 14:45:23 +02:00
zmagod
9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
zmagod
cba4318185 add word wrapping to notifications dropdown [fixes SCI-532] 2016-10-05 13:22:33 +02:00
zmagod
5bf278298b fixed navbar on sceens smaller than 1000px 2016-10-05 12:22:27 +02:00
zmagod
f9d956bbca fix notifications number on [fixes SCI-531] 2016-10-05 11:50:57 +02:00
zmagod
c4f28c3649 made notification images bigger [fixes SCI-533] 2016-10-05 10:16:51 +02:00
zmagod
848beb5d4b minor fix 2016-10-05 09:46:18 +02:00
zmagod
d7a4f85ba1 added links to notification project name and task 2016-10-05 09:40:44 +02:00
zmagod
d90f17d1eb clean comments date duplication [fixes SCI-469] 2016-10-05 08:42:32 +02:00
zmagod
6229e6a3a1 styled notification settings button [fixes SCI-529] 2016-10-04 16:12:56 +02:00
zmagod
a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn
61cb9651c7 Merge pull request #188 from biosistemika/global-notifications 
Global notifications
 2016-10-04 08:30:50 +02:00
zmagod
c9bbab1004 added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users 2016-10-03 20:31:00 +02:00
mlorb
00b0f6ab07 Merge pull request #184 from mlorb/ml_sci_472 
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
 2016-10-03 17:20:45 +02:00
mlorb
153b692c0c Merge pull request #181 from mlorb/ml_sci_321 
Displaying more information for individual samples in Sample table [SCI-321]
 2016-10-03 16:37:35 +02:00
Mojca Lorber
3b0185a45b change title of modal 2016-10-03 16:33:58 +02:00