scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 11:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity
3577 commits 39 branches 184 tags 168 MiB
Commit graph

230 commits

Author SHA1 Message Date
mlorb
11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243 
Style Guide - refactor colors, typography and buttons [SCI-2243]
 2018-04-03 11:30:02 +02:00
mlorb
e5e92eb215 fix the rest of the constants 2018-04-03 10:28:39 +02:00
okriuchykhin
5e0cf58bc5
Merge pull request #1058 from okriuchykhin/ok_SCI_2111 
Implement search in file repository cells and improve performance [SCI-2111]
 2018-03-30 12:39:47 +02:00
mlorb
22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
Oleksii Kriuchykhin
e42fc3117b Implement search in file repository cells and improve performance [SCI-2111] 2018-03-26 13:19:09 +02:00
mlorb
faaecec2ff implement new Help dropup in navigation 2018-03-23 14:08:27 +01:00
zmagod
1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
Zmago Devetak
d7679dcb99
Merge pull request #1032 from ZmagoD/zd_SCI_2141 
refactor global activities in separate page [fixes SCI-2141]
 2018-03-13 15:20:14 +01:00
zmagod
dd2f7dd417 Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration 2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin
be1ead22e0 Implement importable selector for repository columns [SCI-2078] 2018-03-13 11:36:05 +01:00
zmagod
e218cae453 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +01:00
mlorb
64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
zmagod
4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin
1765d83cd1 Refactor search to support repository list items [SCI-2108] 2018-03-09 11:05:43 +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
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
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
9199f287ba fix hound 2018-03-01 09:18:36 +01:00
mlorb
08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
Oleksii Kriuchykhin
aa933ad1f4 Add extendable file types mappings for icons [PIP-46] 2018-02-26 14:23:02 +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
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
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
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
Zmago Devetak
4716fc7752
Merge pull request #955 from biosistemika/decoupling 
Decoupling
 2018-01-25 11:33:06 +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
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
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
Oleksii Kriuchykhin
8b11427780 Add allowed zip file type to Powerpoin and Word files [SCI-1916] 2018-01-11 15:17:30 +01:00
Luka Murn
cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step 
Fixes bug with embedded images [SCI-1624]
 2017-12-12 09:53:24 +01:00
zmagod
e69e9f6794 remove unneeded comment and add tiny_mce_asset regex in a constant 2017-11-24 17:04:01 +01:00
Luka Murn
c51a85a161
Merge pull request #888 from biosistemika/lm-sci-1795 
Setup main architecture for permissions refactoring [SCI-1795]
 2017-11-23 12:32:49 +01:00
Zmago Devetak
2f66c1df25
adds travis config file (#873) 
* adds travis config file

* add dist to travis

* adds script section

* test env

* remove globals

* adds hashed variables

* add matrix

* removed matrix

* test env

* testing

* test

* update Gemfile

* test travis

* test

* test

* test travis

* test

* build with docker

* test

* test

* ads

* add devise secre

* test travis

* test

* test

* test

* adds travis db configurations

* make travis happy

* test

* test

* test

* test

* test

* test

* testing devise

* test

* test

* teset

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* edit env

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* test

* final commit

* test

* cleanup

* cleanup
 2017-11-23 09:55:57 +01:00