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

1016 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luka Murn 87d3280847 Refactor registrations_controller code slightly 2016-11-25 09:56:07 +01:00
okriuchykhin a788e8bc48 Merge pull request #315 from okriuchykhin/ok_SCI_706 
Enable reCaptcha and auto log in on confirm invitation form [SCI-706]
 2016-11-25 09:17:16 +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
mlorb 3a10c17150 Merge pull request #313 from mlorb/ml-sci-705 
Add switch to toggle email confirmations [SCI-705]
 2016-11-24 09:54:28 +01:00
Mojca Lorber 3f7eb75e40 add comment 2016-11-24 09:48:25 +01:00
Mojca Lorber beae54e278 remove already_authenticated alert flash 2016-11-23 14:55:41 +01:00
Mojca Lorber 51abd8907c add switch to toggle email confirmations 2016-11-23 09:49:52 +01:00
mlorb 0c9ce757f8 Merge pull request #312 from mlorb/ml_sci_690 
Integrate reCaptcha into sciNote [SCI-690]
 2016-11-23 09:39:35 +01:00
Mojca Lorber b87bc4020b set ENABLE_RECAPTCHA to false in test environment 2016-11-23 09:36:49 +01:00
Mojca Lorber 48ac289b6e put recaptcha in helper method 2016-11-22 17:57:42 +01:00
Mojca Lorber 88890ab65b fix hound 2016-11-22 15:05:25 +01:00
Mojca Lorber 60f23b109b integrate reCaptcha into sciNote 2016-11-22 14:57:41 +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
okriuchykhin c13a1cdd5c Merge pull request #308 from okriuchykhin/ok_SCI_684 
Changes default behaviour for absolute urls in Quill [SCI-684]
 2016-11-21 14:34:38 +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 7deb80bb06 Add make worker command 2016-11-19 15:26:16 +01:00
Luka Murn 5864640df2 Update README.md 2016-11-19 14:14:43 +01:00
Luka Murn b12753e055 Delete CONTRIBUTING.md 2016-11-19 14:13:41 +01:00
Luka Murn 523f456e45 Remove a lot of stuff from README.md 
It is now in Wiki.
 2016-11-19 14:13:06 +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 b95855ca11 Merge pull request #304 from Ducz0r/lm-sci-650-fix-vol-2 
Re-introduce fix for SCI-650 that was lost during merge [SCI-650]
 2016-11-18 10:58:31 +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
mz3944 8b93d2d574 Merge pull request #298 from mz3944/mz_intro_tutorial_back_button_SCI_564 
Mz intro tutorial back button sci 564
 2016-11-17 16:05:34 +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
okriuchykhin 39d3b65c52 Merge pull request #297 from okriuchykhin/ok_SCI_685 
Improved tutorial styling [SCI-685]
 2016-11-17 10:57:10 +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