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

845 commits

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