scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-12 12:16:06 +08:00
Code Issues Projects Releases Packages Wiki Activity
1246 commits 30 branches 180 tags 166 MiB
Commit graph

1246 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
87d3280847 Refactor registrations_controller code slightly 2016-11-25 09:56:07 +01:00
okriuchykhin
a788e8bc48 Merge pull request #315 from okriuchykhin/ok_SCI_706 
Enable reCaptcha and auto log in on confirm invitation form [SCI-706]
 2016-11-25 09:17:16 +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
Luka Murn
91ffb232e2 Version bump to 1.5.0 2016-11-24 11:37:45 +01:00
mlorb
3a10c17150 Merge pull request #313 from mlorb/ml-sci-705 
Add switch to toggle email confirmations [SCI-705]
 2016-11-24 09:54:28 +01:00
Mojca Lorber
3f7eb75e40 add comment 2016-11-24 09:48:25 +01:00
Luka Murn
de7c0ad641 Remove commit reference to quill-rails in Gemfile 2016-11-24 09:19:43 +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
mz3944
d749b6705f Merge pull request #307 from mz3944/mz_remove_tutorial_overlay_fix_SCI_707 
Fixed tutorial overlay unexpectedly blurring the screen when not runn…
 2016-11-23 11:23:43 +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
mlorb
0c9ce757f8 Merge pull request #312 from mlorb/ml_sci_690 
Integrate reCaptcha into sciNote [SCI-690]
 2016-11-23 09:39:35 +01:00
Mojca Lorber
b87bc4020b set ENABLE_RECAPTCHA to false in test environment 2016-11-23 09:36:49 +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
okriuchykhin
afb435e91d Merge pull request #306 from okriuchykhin/ok_SCI_703_v1 
Reload page after exit from tutorial [SCI-703]
 2016-11-22 17:20:58 +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
Luka Murn
201b1a48d5 Refactor user my modules code 2016-11-22 15:07:18 +01:00
Mojca Lorber
88890ab65b fix hound 2016-11-22 15:05:25 +01:00
Luka Murn
e0607f7891 Refactor step comments code 2016-11-22 15:01:48 +01:00
Luka Murn
0c96036de8 Refactor some sample types code 2016-11-22 14:59:57 +01:00
Mojca Lorber
60f23b109b integrate reCaptcha into sciNote 2016-11-22 14:57:41 +01:00
Luka Murn
8ff5285179 Refactor some sample groups code 2016-11-22 14:57:01 +01:00
Luka Murn
f5e286b1f6 Remove unused code for some more comments 2016-11-22 14:52:43 +01:00
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