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
zmagod
7725374c42
refactor sample types/groups [fixes SCI-700]
2016-12-02 09:58:35 +01:00
zmagod
83aae59eed
adds sample groups index page
2016-12-02 09:33:09 +01:00
Luka Murn
7309da9d92
Version bump to 1.5.1
2016-12-01 15:54:08 +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
mz3944
1957c8a3ff
Merge pull request #331 from mz3944/mz_update_scinote_net_sign_up_form_SCI_689
...
Added automatic sign in with token authentication, needed when signin…
2016-12-01 15:40:05 +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
Nejc Bernot
ef60982913
Subdomain checks fixed
2016-12-01 14:20:43 +01:00
Nejc Bernot
c54bd6df82
Added user ids to wopi tokens
2016-12-01 13:48:11 +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
Nejc Bernot
cb03ed8384
Users can now have multiple tokens
...
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
2016-11-30 16:48:42 +01:00
Nejc Bernot
495c648f41
Added subdomain based routing constraints
...
Non-wopi routes will only work with the subdomain set by the env variable USER_SUBDOMAIN (if it is set). Likewise, wopi routes will only work with the WOPI_SUBDOMAIN if it is set, but they also require the WOPI_ENABLED to be true.
2016-11-30 16:43:33 +01:00
Zmago Devetak
33adb58950
Merge pull request #328 from ZmagoD/zd_SCI_699
...
Managing sample types tab
2016-11-30 16:14:13 +01:00
okriuchykhin
a1be687e45
Merge pull request #330 from okriuchykhin/ok_SCI_695
...
Added sorting functionality to samples columns dropdown [SCI-695]
2016-11-30 13:48:31 +01:00
Oleksii Kriuchykhin
2a27c8e6b3
Fix hound warning [SCI-695]
2016-11-30 11:52:07 +01:00
Oleksii Kriuchykhin
f51f33ec25
Added sorting functionality to samples colunmns dropdown [SCI-695]
2016-11-30 11:42:05 +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
f138a39508
Merge pull request #324 from Ducz0r/lm-sci-718-fix
...
Fix intro tutorial string
2016-11-30 09:50:40 +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
zmagod
1859df0319
fix hound
2016-11-30 09:44:49 +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
ac83fe44c7
Merge pull request #327 from Ducz0r/lm-sci-747-fix
...
Remove link to "Resend confirmation instructions" if not neccesary
2016-11-30 09:14:26 +01:00
zmagod
a2e13441e5
removes create_sample_type modal and related js actions
2016-11-30 09:02:34 +01:00
zmagod
4e4a48620c
adds validation to input fields
2016-11-29 18:08:29 +01:00
zmagod
12848f15fa
adds sample_type index view with all crud actions
2016-11-29 17:15:54 +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
zmagod
5c0b2d7b24
init sample_types page
2016-11-29 08:57:12 +01:00
Luka Murn
48a1c98f16
Fix intro tutorial string
...
Closes SCI-718.
2016-11-28 17:28:04 +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
Zmago Devetak
1e870a6e7c
Merge pull request #320 from ZmagoD/zd_SCI_698
...
adds new samples columns dropdown [fixes SCI-698]
2016-11-28 16:30:16 +01:00
zmagod
72d1dfb15e
cleanup sample_datatable.js
2016-11-28 16:28:22 +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
Luka Murn
a41278f03c
Merge pull request #319 from Ducz0r/lm-sci-720-fix
...
Add uniqueness to sample_type & sample_group name
2016-11-28 13:53:02 +01:00
Luka Murn
5035ec338b
Code style fix
2016-11-28 13:51:28 +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
Luka Murn
d0b86de3a4
Use Rails's email regex
2016-11-25 17:37:27 +01:00
zmagod
9d91d2ce28
adds new samples columns dropdown [fixes SCI-698]
2016-11-25 17:29:30 +01:00
