Luka Murn
84d0cf4620
Use rails helpers as per @ZmagoD's request
2016-11-30 09:48:57 +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
b1b095910c
Merge pull request #309 from Ducz0r/lm-remove-unused-files
...
Brace for impact...
2016-11-25 10:00:29 +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
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
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
086f937fbb
fix empty space and blockquote padding - rich text editing
2016-11-18 12:43:57 +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
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
c64146904a
Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.
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
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
Luka Murn
83160a487b
Fix importer so it supports rendering & importing rich text format
...
Closes SCI-674.
2016-11-15 16:57:53 +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
Mojca Lorber
607f1381d0
fix mobile view
2016-11-15 10:58:15 +01:00
Mojca Lorber
6afc5c5a4b
fix position of buttons in text result
2016-11-14 16:31:48 +01:00
zmagod
67c508a891
fixes description label [fixes SCI-662]
2016-11-14 13:47:20 +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
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
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
b42922d32c
Add autosize functionality to all textareas
...
Closes SCI-637
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
Mojca Lorber
fbaffbcaab
add formatted text in reports
2016-11-10 15:20:40 +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
Luka Murn
55d8fea359
Make all comment edit fields textareas
2016-11-08 11:29:55 +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
Luka Murn
0ab62576a2
Add new modal to organization page, remove old modal code
2016-11-07 09:43:10 +01:00
