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 |
|
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 |
|
okriuchykhin
|
f4a059d01a
|
Merge pull request #295 from okriuchykhin/ok_SCI_677
Fix tutorial strings [SCI-677]
|
2016-11-16 14:33:45 +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 |
|
Oleksii Kriuchykhin
|
fc09cafe63
|
Fix tutorial strings [SCI-677]
|
2016-11-16 13:15:02 +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
|
8302a87671
|
Update Gemfile
|
2016-11-16 10:07:18 +01:00 |
|
Luka Murn
|
f4c9863814
|
Merge pull request #292 from Ducz0r/lm-sci-664-fix-2
Reload whole page after user is invited from team invite users modal [SCI-664]
|
2016-11-15 17:15:53 +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 |
|