Mojca Lorber
40e3240a99
add content to preview modal
2016-12-22 11:43:11 +01:00
Mojca Lorber
2cfcba0ceb
add protocol preview modal
2016-12-13 10:39:18 +01:00
Zmago Devetak
310b61ec12
Merge pull request #335 from ZmagoD/zd_SCI_752
...
fixes inport eln error message and spinner [fixes SCI-752]
2016-12-06 15:11:34 +01:00
zmagod
8ca7151df4
added constant to load_from_file_size_error local
2016-12-06 13:52:07 +01:00
Zmago Devetak
a376118cd8
Merge pull request #334 from ZmagoD/zd_SCI_746
...
fixes bug with deleted team name
2016-12-05 10:47:39 +01:00
Zmago Devetak
91f29745c4
Merge pull request #314 from ZmagoD/zd_SCI_643
...
adds autolink
2016-12-05 10:47:23 +01:00
zmagod
ef2471d3f7
fixes inport eln error message and spinner [fixes SCI-752]
2016-12-05 10:44:58 +01:00
zmagod
6274cd413e
fixes bug with deleted team name [fixes SCI-746]
2016-12-02 16:07:00 +01:00
Luka Murn
372b455d7d
Merge pull request #332 from Ducz0r/lm-sci-750-751
...
Fix inviting users not working
2016-12-01 15:52:40 +01:00
Luka Murn
6a770f6a7e
Fix inviting users not working
...
Closes SCI-750, SCI-751.
Probably reopens parts of SCI-746.
2016-12-01 15:46:37 +01:00
Matej Zrimšek
3bdaa4bcef
Some token authentication refactoring and error handilng fixes. [closes SCI-689]
2016-12-01 15:38:56 +01:00
Matej Zrimšek
46465060d0
Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]
2016-11-30 16:56:56 +01:00
Luka Murn
680f443e31
Merge pull request #323 from Ducz0r/lm-sci-733-fix
...
Fix task comments not properly showing in reports
2016-11-30 09:51:59 +01:00
Luka Murn
c0a03d9f2d
Merge pull request #322 from Ducz0r/lm-add-show-version-var
...
Add an environmental variable to toggle version display in navbar
2016-11-30 09:49:40 +01:00
Luka Murn
84d0cf4620
Use rails helpers as per @ZmagoD's request
2016-11-30 09:48:57 +01:00
Luka Murn
76ec77fce4
Merge pull request #329 from biosistemika/simplify-signup
...
Merge simplify-signup into master
2016-11-30 09:41:20 +01:00
Luka Murn
d685ac939b
Merge pull request #326 from Ducz0r/lm-sci-746-fix
...
Fix some recaptcha form submit errors for signup pages
2016-11-30 09:35:16 +01:00
Luka Murn
6491cf1806
Refactor & fix sign up constraints
2016-11-29 16:53:40 +01:00
Luka Murn
e099a279b1
Remove link to "Resend confirmation instructions" if not neccesary
...
Closes SCI-747.
2016-11-29 16:12:35 +01:00
Luka Murn
b5d0a39827
Fix some recaptcha form submit errors for signup pages
...
Closes SCI-746.
2016-11-29 15:53:58 +01:00
Luka Murn
90816ae1fa
Just pleasing the Hound
2016-11-28 17:16:39 +01:00
Luka Murn
073f30dcc5
Fix task comments not properly showing in reports
...
Closes SCI-733.
2016-11-28 17:14:27 +01:00
okriuchykhin
f9c8223fe5
Merge pull request #321 from okriuchykhin/ok_SCI_736
...
Improve regexp for image whitelisting [SCI-736]
2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin
d8f8e01a46
Code cleanup, added new image types to whitelist [SCI-736]
2016-11-28 11:13:20 +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
d142fa96d9
Merge pull request #317 from Ducz0r/lm-sci-735-fix
...
Add Deface hooks to sign up & confirm invitation forms
2016-11-28 10:22:46 +01:00
Oleksii Kriuchykhin
cc0aab2e59
Improve regexp for image whitelisting [SCI-736]
2016-11-28 10:08:54 +01:00
okriuchykhin
31f6379866
Merge pull request #318 from okriuchykhin/ok_SCI_736
...
Add whitelisting of supported image types [SCI-736]
2016-11-28 09:32:49 +01:00
okriuchykhin
5981d1a48e
Merge pull request #316 from okriuchykhin/ok_SCI_738
...
Add full name field to accept invitation form [SCI-738]
2016-11-25 16:15:23 +01:00
Oleksii Kriuchykhin
74f6455a8f
Add whitelisting of supported image types [SCI-736]
2016-11-25 16:12:43 +01:00
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
Oleksii Kriuchykhin
3fdb20b92c
Add full name field to accept invitation form [SCI-738]
2016-11-25 11:15:10 +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
Luka Murn
87d3280847
Refactor registrations_controller code slightly
2016-11-25 09:56:07 +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
Mojca Lorber
beae54e278
remove already_authenticated alert flash
2016-11-23 14:55:41 +01:00
zmagod
32eea3dbdd
adds autolink to result comments
2016-11-23 14:24:51 +01:00
zmagod
fafecce264
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
2016-11-23 14:18:50 +01:00
Luka Murn
198febfd94
Fix user projects not working
2016-11-23 13:19:10 +01:00
Matej Zrimšek
1db926101d
Minor refactoring.
2016-11-23 10:48:43 +01:00
Matej Zrimšek
6bc2603157
Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707]
2016-11-23 10:36:09 +01:00
Mojca Lorber
51abd8907c
add switch to toggle email confirmations
2016-11-23 09:49:52 +01:00
Zmago Devetak
341fb13a26
Merge pull request #310 from ZmagoD/zd_add_email_login_constraints
...
adds rake task that creates a sign up email domain constraint
2016-11-23 09:16:24 +01:00
Zmago Devetak
0f3db56a74
Merge pull request #311 from ZmagoD/zd_SCI_716
...
load comments after edit step [fixes SCI-716]
2016-11-23 09:14:57 +01:00
zmagod
d75d58b159
moved email constraint to database_helper
2016-11-23 09:13:09 +01:00
Mojca Lorber
48ac289b6e
put recaptcha in helper method
2016-11-22 17:57:42 +01:00
Luka Murn
fba646bfba
Fix Hound errors
2016-11-22 15:19:12 +01:00
Luka Murn
7cbe44d1f2
Refactor user projects & user my modules code
2016-11-22 15:16:26 +01:00
