scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-09 00:13:49 +08:00
Code Issues Projects Releases Packages Wiki Activity
3420 commits 43 branches 185 tags 169 MiB
Commit graph

3420 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zanz2
8f5dd3df38
Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818 
Table missing scrollbar [SCI-1818]
 2018-03-05 17:13:06 +01:00
Zanz2
1e6f1acef5 fixed according to pr 2018-03-05 17:02:37 +01:00
Zanz2
7b9425321b
Merge pull request #1000 from Zanz2/null_step_crash_sci2043 
Fixed big crash that was caused by invalid or null step hash in protocol [SCI-2043]
 2018-03-05 16:51:15 +01:00
Zanz2
451d14c2e9 Added 4 to constants too, then fixed line too long error 2018-03-05 16:48:18 +01:00
Zanz2
c5728c4018
Merge branch 'master' into null_step_crash_sci2043 2018-03-05 16:37:24 +01:00
Zanz2
e3e7514049 removed redundant return 2018-03-05 16:15:33 +01:00
Zanz2
554b31e0aa Added constants 2018-03-05 16:09:06 +01:00
Zanz2
bd19c89212
Merge pull request #1013 from Zanz2/step_reorder_fix 
quick fix for if previous guid is unknown format [Protocols.io import]
 2018-03-05 15:59:46 +01:00
mlorb
5e44859ce0
Merge pull request #1010 from mlorb/ml-sci-1826 
Sign up with linkedIn account [SCI-1826]
 2018-03-05 13:24:36 +01:00
mlorb
a19b672a83
change validation again 2018-03-05 13:12:44 +01:00
mz3944
c04a153652
Merge pull request #1005 from mz3944/mz-SCI-2064 
At adding file to task, cancel button does not respond [SCI-2064]
 2018-03-04 13:34:50 +01:00
mz3944
f40b0bd095
Merge pull request #1006 from mz3944/mz-SCI-2065 
Extend description for adding files to step/result [SCI-2065]
 2018-03-04 13:34:37 +01:00
Zanz2
ba67446eee quick fix for if previous guid is unknown format 2018-03-03 22:26:00 +01:00
Zanz2
5bcda7f6de fixed pr 2018-03-02 23:02:35 +01:00
Zanz2
350f12bdbc using dig method now 2018-03-02 22:29:51 +01:00
mlorb
d19ca7fbdc
change validation 2018-03-02 16:32:46 +01:00
mlorb
d4e62c3c13 add Gemfile.lock 2018-03-01 18:03:13 +01:00
mlorb
f5949e9d10 refactor 2018-03-01 17:52:24 +01:00
Luka Murn
070450f813 Merge branch 'release-1.12.11' 
Conflicts:
	config/initializers/extends.rb
 2018-03-01 14:04:57 +01:00
mlorb
e66eab7f57 fix typo 2018-03-01 09:45:52 +01:00
mlorb
9199f287ba fix hound 2018-03-01 09:18:36 +01:00
Luka Murn
bdc124faa0
Bump VERSION to 1.12.11 2018-03-01 07:50:55 +01:00
mlorb
08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
okriuchykhin
1330225796
Merge pull request #1008 from okriuchykhin/ok_PIP_46 
Add extendable file types mappings for icons [PIP-46]
 2018-02-26 15:19:18 +01:00
Oleksii Kriuchykhin
aa933ad1f4 Add extendable file types mappings for icons [PIP-46] 2018-02-26 14:23:02 +01:00
Matej Zrimšek
48bdd84163 Updated file upload text, to notify user of another approach to uploading files. 2018-02-22 14:18:53 +01:00
Matej Zrimšek
96a6779d55 Fixed misspelled permission call. 2018-02-22 14:08:12 +01:00
Zanz2
29aea1ebd2 refactored according to PR 2018-02-21 16:17:53 +01:00
mlorb
4d69636dbe
Merge pull request #1002 from mlorb/ml-sci-2031_v2 
Fix bug with load older activities button not working [SCI-2031]
 2018-02-20 13:19:20 +01:00
Zanz2
9c2a2956e3 Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818 
Merging Biosis master with branch that resizes small tables to atleast 5x5
 2018-02-19 17:40:13 +01:00
Zanz2
9d87d31a7e
Merge pull request #1001 from Zanz2/scroll_bar_table_fix_sci2044 
Protocols io tables now have fixed 200 px height in preview [SCI-2044]
 2018-02-16 20:20:48 +01:00
mlorb
d2dcb765b4 fix bug with load older activities button not working 2018-02-16 15:42:10 +01:00
Zanz2
5c93bd9676 Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom 2018-02-16 14:14:51 +01:00
Zanz2
673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
 2018-02-16 12:52:51 +01:00
Zanz2
b9db39f87d removing last commit 2018-02-16 00:00:53 +01:00
Zanz2
fab9180b7b fixed small oversight 2018-02-15 23:40:09 +01:00
Zanz2
c963c948a1 Fixed main issue, bad step structure now gets fixed to empty template 2018-02-15 23:28:20 +01:00
Zanz2
95501eb046 saving work for later 2018-02-15 20:01:36 +01:00
Zanz2
ad8f93b57f
Merge pull request #991 from Zanz2/missplaced_authors_sci1808 
protocols io authors are now real authors, not user that added the protocol [SCI-1808]
 2018-02-15 16:53:39 +01:00
mlorb
9797712561
Merge pull request #997 from mlorb/ml-sci-2045 
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
 2018-02-15 14:51:40 +01:00
okriuchykhin
0503aa054d
Merge pull request #999 from okriuchykhin/smtp_auth_method 
Allow setting of SMTP auth method through ENV variable
 2018-02-15 13:40:20 +01:00
Zmago Devetak
e0510ab448
Merge pull request #995 from ZmagoD/zd_SCI_2040 
fixed bug with assigned repository items [fixes SCI-2040]
 2018-02-15 13:05:30 +01:00
Zmago Devetak
0583979cf9
Merge pull request #993 from ZmagoD/zd_SCI_2039 
fixes errors with form id duplicates [fixes SCI-2039]
 2018-02-15 11:10:43 +01:00
zmagod
78e902f316 fixes few Hound alerts 2018-02-15 11:06:59 +01:00
mz3944
47e217bbc4
Merge pull request #979 from mz3944/mz-SCI-1964 
Refactoring experiment permissions, pt. 1 [merge after SCI-1802]
 2018-02-15 10:47:28 +01:00
Oleksii Kriuchykhin
00fcf5404b Allow setting of SMTP auth method through ENV variable 2018-02-14 17:02:28 +01:00
Matej Zrimšek
879eda2d8f Minor experiment level permissions refactoring. 2018-02-14 14:19:22 +01:00
Matej Zrimšek
0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek
1182ce5da1 Fixed experiment level permission checks in the controllers. 2018-02-14 14:19:22 +01:00
Matej Zrimšek
7938c2e036 Minor code style changes. 2018-02-14 14:19:22 +01:00