scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-21 20:44:45 +08:00
Code Issues Projects Releases Packages Wiki Activity
4018 commits 88 branches 195 tags 173 MiB
Commit graph

894 commits

Author SHA1 Message Date
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
zmagod
b106545d31 fixes per @duco 's request 2017-12-13 08:57:50 +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
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747 
Improve server side assets validation display for steps [SCI-1747]
 2017-12-04 14:12:43 +01:00
Zanz2
fcbd956d6e Finished code beautification 2017-12-03 01:17:49 +01:00
zmagod
b6a5ab5e6c fix request 2017-12-01 17:29:46 +01:00
zmagod
52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +01:00
zmagod
e69e9f6794 remove unneeded comment and add tiny_mce_asset regex in a constant 2017-11-24 17:04:01 +01:00
zmagod
930e3a86dc Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1762 2017-11-23 13:56:17 +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
Zanz2
f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Zanz2
d8c809ffd0 Reviewed pull request 2017-11-20 23:19:34 +01:00
zmagod
70db34090d fixes rspec tests 2017-11-20 09:41:14 +01:00
Zanz2
cf66d94d45 Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields 2017-11-20 00:59:32 +01:00
Zanz2
fa25a6785b Made the propper files and functionality for the text truncation to function 2017-11-17 02:43:32 +01:00
Zanz2
c44465817d Added the functions and put in limitations from my validations files, changed controller name, added some locals 2017-11-16 20:03:44 +01:00
Luka Murn
d715eb06ef Add team & project role-related helper functions to User model 
This will be required later once we start using Canaid.
 2017-11-16 15:50:30 +01:00
Luka Murn
ccef5571f1 Add dependency to Canaid, the permission helper library 2017-11-16 15:49:13 +01:00
mlorb
6c80c338e4
Merge pull request #880 from mlorb/ml-sci-1316 
Change text for avatar size on my profile page [SCI-1316]
 2017-11-16 10:43:23 +01:00
Oleksii Kriuchykhin
84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
Mojca Lorber
cd006c2640 change text for expiry of a link for an exported file 2017-11-15 14:32:19 +01:00
Mojca Lorber
ff998a6c98 change text for avatar size on my profile page 2017-11-15 14:21:04 +01:00
mlorb
47784e09a8
Merge pull request #867 from mlorb/ml-sci-1434 
Add explanation when copying custom repositories [SCI-1434]
 2017-11-15 11:34:02 +01:00
Zanz2
9bd198eaf6
Merge pull request #875 from Zanz2/removed_txt_1793 
Removed the .txt text from translations file [SCI-1793]
 2017-11-14 19:12:32 +01:00
Zanz2
6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2
3e964da241 Removed the .txt text from translations file 2017-11-14 11:42:10 +01:00
Mojca Lorber
be74338d9f add explanation when copying custom repositories 2017-11-13 16:30:42 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import 
Protocols io import
 2017-11-13 11:53:28 +01:00
Zanz2
b265beb386
Merge pull request #864 from Zanz2/move_desc 
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
 2017-11-13 10:07:01 +01:00
Zanz2
23d3ffa5a4 Fixed PR 2017-11-12 15:48:45 +01:00
Zanz2
fa2c0fe556 merging 2017-11-09 18:55:17 +01:00
Zanz2
812fa3f1d5 Hopefully this will resolve my merge problems 2017-11-09 17:42:17 +01:00
zmagod
327e27e123 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576 2017-11-09 15:55:10 +01:00
Zanz2
9086cd8b6b Jira branch code 2017-11-09 10:49:44 +01:00