scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 00:11:22 +08:00
Code Issues Projects Releases Packages Wiki Activity
13647 commits 92 branches 197 tags 174 MiB
Commit graph

847 commits

Author SHA1 Message Date
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
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Luka Murn
ccef5571f1 Add dependency to Canaid, the permission helper library 2017-11-16 15:49:13 +01:00
Oleksii Kriuchykhin
84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
Luka Murn
e740e586e8 Additional fixes required by latest merge from master (nr. 2) 2017-10-23 10:43:32 +02:00
Luka Murn
6c2c5aff17 Additional fixes required by latest merge from master 2017-10-23 09:51:13 +02:00
Oleksii Kriuchykhin
58c2487eb6 Enable :preserve_files in paperclip config [SCI-1626] 2017-10-10 13:32:14 +02:00
Oleksii Kriuchykhin
c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +02:00
Luka Murn
13eae287bb Revert "Add core API using JWT authentication and tests for it [SCI-1507]" 2017-08-07 11:54:45 +02:00
Luka Murn
ae5bccf709 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
 2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin
35b643f34e Fix typo in config and code style improvements [SCI-1507] 2017-08-04 10:19:56 +02:00
Oleksii Kriuchykhin
e958410261 Add core API using JWT authentication and tests for it [SCI-1507] 2017-08-03 17:00:14 +02:00
Zmago Devetak
7b898666da Merge pull request #745 from ZmagoD/zd_SCI_1485 
refactor repositories js files [fixes SCI-1485]
 2017-07-19 11:17:52 +02:00
zmagod
a2b7bcda4c refactor repositories js files [fixes SCI-1485] 2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin
036ee390ed Fix error messages in repository import and uploading files starting with hyphen[SCI-1484] 2017-07-14 16:19:03 +02:00
Luka Murn
1dc3e49367 Merge pull request #739 from Ducz0r/lm-sci-1432 
Extend confirmation period of emails to 7 days [SCI-1432]
 2017-07-11 10:57:16 +02:00
Luka Murn
19a8dfe116 Extend confirmation period of emails to 7 days 
Closes SCI-1432.
 2017-07-11 08:32:52 +02:00
Luka Murn
16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
Luka Murn
bc8d945101 Damn, I spent too much time on GeneIO. Fixing again >_< 2017-07-07 13:19:39 +02:00
Luka Murn
e9ef7b61ef Fix WickedPdf bug on production 2017-07-07 13:05:18 +02:00
mz3944
f55861b373 Merge pull request #731 from mz3944/mz-SCI-1413 
Fixed some RoR 5.1 default settings. [SCI-1413]
 2017-07-06 17:17:27 +02:00
Luka Murn
9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
 2017-07-06 15:12:15 +02:00
Matej Zrimšek
843116f645 Fixed some RoR 5.1 default settings. [SCI-1413] 2017-07-04 14:42:53 +02:00
Luka Murn
9a19cb711f Version bump to 1.12.1 2017-07-04 08:00:32 +02:00
zmagod
fd13921720 fixes repeat tutorial [fixes SCI-1410] 2017-06-29 11:00:50 +02:00
zmagod
525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
zmagod
819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Zmago Devetak
d726c121bc Version bump to 1.12.0 2017-06-23 12:37:19 +02:00
Mojca Lorber
b6f146f177 fix cog position on repositories page 2017-06-16 11:54:31 +02:00
Luka Murn
e0828657b3 Somebody kill the Hound please 2017-06-08 11:23:24 +02:00
Luka Murn
9bfbf3b634 Minor fix #2 2017-06-08 11:22:27 +02:00
Luka Murn
b729c06f31 Minor fix 2017-06-08 11:20:11 +02:00
Luka Murn
0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d Hound is love, Hound is life 2017-06-07 18:22:15 +02:00