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

729 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
1765d83cd1 Refactor search to support repository list items [SCI-2108] 2018-03-09 11:05:43 +01:00
Zmago Devetak
50ccec5007
Merge pull request #1009 from ZmagoD/zd_SCI_2066 
add info modal for repository items [fixes SCI-2066]
 2018-03-05 12:49:29 +01:00
zmagod
2b55cd7090 rename variables 2018-03-02 14:14:27 +01:00
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +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
Oleksii Kriuchykhin
00fcf5404b Allow setting of SMTP auth method through ENV variable 2018-02-14 17:02:28 +01:00
Zmago Devetak
027297d46a
Merge pull request #985 from ZmagoD/zd_SCI_2008 
fixes bug with assets upload on task result page,
 2018-02-12 11:40:44 +01:00
okriuchykhin
5a94b40d9c
Merge pull request #978 from okriuchykhin/ok_SCI_2003 
Improve files handling in protocol cloning [SCI-2003]
 2018-02-12 11:01:59 +01:00
zmagod
6b7ff11bcf setup models for repository list column [fixes SCI-2015] 2018-02-07 15:28:28 +01:00
Luka Murn
b5ac4494d5 Uncommit load_addons_specs.rb 2018-02-06 16:58:15 +01:00
zmagod
bd1345d560 fixes bug with assets upload on task result page, 
adds ctrl+v listener to upload images from clipboard, adds image preview modal
 2018-02-06 15:39:19 +01:00
Luka Murn
5281d0792e Comment load_addons_specs.rb out 2018-02-06 08:48:33 +01:00
Luka Murn
4ddc7dfa85 Comment react-hijack code 2018-02-06 08:00:29 +01:00
Oleksii Kriuchykhin
16e1d072b9 Improve files handling in protocol clonning [SCI-2003] 2018-02-01 15:44:08 +01:00
zmagod
2684d2b515 fix typo 2018-02-01 15:34:40 +01:00
zmagod
952173fbd6 escape if no feature folder present 2018-02-01 14:03:36 +01:00
zmagod
c6d585bc57 adds spec/features loader [fixes SCI-1998] 2018-02-01 13:37:52 +01:00
Zmago Devetak
ccab688728
Merge pull request #975 from ZmagoD/zd_SCI_2001 
Zd sci 2001
 2018-01-31 14:42:41 +01:00
okriuchykhin
df66a3b410
Merge pull request #973 from okriuchykhin/ok_SCI_1975 
Allow optional tagging for logs [SCI-1975]
 2018-01-31 13:31:01 +01:00
Luka Murn
d4183aa253 Fix a typo 2018-01-31 08:20:42 +01:00
Oleksii Kriuchykhin
bdc60b9d53 Allow optional tagging for logs [SCI-1975] 2018-01-30 18:24:01 +01:00
zmagod
029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +01:00
Luka Murn
f752f82658 Fix canaid initializer so it only uses required Gems' permissions 
This should make sure that other addons that are located in
/addons folder, but not actually required by the core,
do not cause trouble.
 2018-01-26 16:24:28 +01:00
Zanz2
e484f0569b
Merge pull request #960 from Zanz2/fixed_styling_after_merge 
Fixed some styling bugs that happened after the merge
 2018-01-26 08:19:29 +01:00
okriuchykhin
0b1f43c1c5
Merge pull request #954 from okriuchykhin/ok_SCI_1970 
Add health check endpoint to API controller [SCI-1970]
 2018-01-25 14:33:37 +01:00
zanzdebian
8bd8c34c4d Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button) 2018-01-25 13:45:35 +01:00
mlorb
ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491 
Add notification for previous task has been completed [SCI-1491]
 2018-01-25 11:35:19 +01:00
Zmago Devetak
4716fc7752
Merge pull request #955 from biosistemika/decoupling 
Decoupling
 2018-01-25 11:33:06 +01:00
Mojca Lorber
ac8b1769be add notification for previous task has been completed 2018-01-23 15:53:33 +01:00
okriuchykhin
a2896031ab
Merge pull request #951 from okriuchykhin/ok_SCI_1949 
Allow first user seeding from env variables [SCI-1949]
 2018-01-23 14:02:54 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin
28be7c4fc4 Add health check endpoint to API controller [SCI-1970] 2018-01-22 16:52:48 +01:00
zmagod
246146c71e adds Delayed::Worker initializer [fixes SCI_1948] 2018-01-19 16:30:29 +01:00
Oleksii Kriuchykhin
d1a515da90 Allow first user seeding from env variables [SCI-1949] 2018-01-18 16:23:33 +01:00
Adrian Oprea
6d84790bdb Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader 
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
  fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
  Remove Addons info test from core [SCI-1875]
  Remove skip_on_import from repository_cell [SCI-1939]
  fixes bug with comment actions dropdown [fixes SCI-1938]
  fixes first element in global activities logs[fixes SCI-1866]
  Fix task repository row selector [SCI-1940]
  Fix repository item export [SCI-1945]
  Fix samples import [SCI-1946]
  adds first date to _list.html.erb view
  Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
  Fix repository records import [SCI-1939]
  Fix export samples button [SCI-1936]
  refactor
  adds additional tests for permissions controller
  fix HOC to recive objects
  fixes flow, and before_action in permissions_controller
  fixes per @duco 's request
  remove unneeded import
  add permissions endpoint on the API
  fix request
  ...
 2018-01-17 18:14:41 +02:00
Adrian Oprea
a5ecc1a36e refactor(addons_loader): Extract paths to variables / build mega-config file 
- Create variables for the paths the script impacts
- Create a file to host the configuration, import each add-on config and re-export them through a single object
 2018-01-16 17:22:00 +02:00
zmagod
3e95503017 adds(addon_loader) a generator that creates a js file with available addons 
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-16 14:18:31 +01:00
zmagod
fc5daabb73 fix(addon_loader): make symlink to target addon/client 
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-16 10:54:11 +01:00
zmagod
ed44762ff2 adds rescue 2018-01-15 08:44:59 +01:00
zmagod
0bfa92046d add an initializer that creates symlinks to react components in core [fixes SCI-1902] 2018-01-12 17:14:27 +01:00
okriuchykhin
b6e3774d0b
Merge pull request #931 from okriuchykhin/ok_SCI_1916 
Add allowed zip file type to Powerpoin and Word files [SCI-1916]
 2018-01-12 14:28:26 +01:00
Zmago Devetak
ebd354e4d5
Merge pull request #900 from ZmagoD/zd_SCI_1854 
adds premissions service to FE
 2018-01-12 14:24:28 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor 
Protocols.io code beautification and refactoring [SCI-1929]
 2018-01-12 12:34:00 +01:00
Oleksii Kriuchykhin
8b11427780 Add allowed zip file type to Powerpoin and Word files [SCI-1916] 2018-01-11 15:17:30 +01:00
mlorb
6c4514f550 add create_teams permission checks 2018-01-09 15:28:27 +01:00
zmagod
c07f54a0c7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-08 08:38:14 +01:00
Luka Murn
cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
mlorb
a3a494c3a2 fix banana: remove dead code which strangely reappeared, probably with some rebasing 2017-12-14 14:18:15 +01:00
mlorb
11a3cd196c add create, update team permission and refactor 422 respond handling in controllers 2017-12-14 14:18:14 +01:00
mlorb
8893fd668d add create, update, delete user_team permission 2017-12-14 14:18:14 +01:00