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 |
|
zmagod
|
10d40a391a
|
adds rake task that creates a sign up email domain constraint
|
2016-11-22 10:10:12 +01:00 |
|
Luka Murn
|
8505d75bca
|
Fix Hound errors
|
2016-11-21 17:33:08 +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
|
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 |
|
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
|
f5795f5516
|
Remove unused assets & helpers
|
2016-11-18 11:30:03 +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 |
|
Zmago Devetak
|
e0cbd56916
|
Merge pull request #296 from ZmagoD/zd_SCI_687
Rich text editing - indented bullets
|
2016-11-17 08:50:31 +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 |
|