scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
3476 commits 70 branches 179 tags 165 MiB
Commit graph

117 commits

Author SHA1 Message Date
mz3944 bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011 
Wrapping up the permissions [SCI-2011]
 2018-03-06 07:10:40 +01:00
Zanz2 29aea1ebd2 refactored according to PR 2018-02-21 16:17:53 +01:00
Matej Zrimšek b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
Matej Zrimšek 7b07e7b347 Fixed protocol in repository permissions, and refactored it a bit. 2018-02-16 12:04:11 +01:00
Matej Zrimšek 6ba226d514 Added missing '?' to the canaid permission calls that were missing it. 2018-02-16 11:12:30 +01:00
Matej Zrimšek 5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +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
Matej Zrimšek 1182ce5da1 Fixed experiment level permission checks in the controllers. 2018-02-14 14:19:22 +01:00
Matej Zrimšek d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00
Matej Zrimšek 854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
Zanz2 367eff6401 re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches 2018-02-07 11:17:53 +01:00
Zanz2 dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +01:00
Zanz2 e8f6dc0d24
Merge pull request #962 from Zanz2/missing_error_SCI1993 
A red error messagge is now displayed when not selecting protocol [SCI-1993]
 2018-01-26 16:00:15 +01:00
Zanz2 4ee51959eb fixed hound 2018-01-26 09:56:59 +01:00
Zanz2 346f9feaef Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html 2018-01-26 09:34:58 +01:00
Zanz2 24e772d7e5 Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816 2018-01-26 08:26:38 +01:00
Zanz2 fc541147c8 A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone 2018-01-25 15:54:38 +01:00
Zanz2 7fe1c20ebe Finished the protocol reorder functions and implemented them 2018-01-24 09:31:43 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
mlorb 99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb 0d37f9c85a refactor clone protocol permission 2017-12-14 14:18:16 +01:00
mlorb f6d36ae6a2 refactor update protocol type in repository 2017-12-14 14:18:16 +01:00
mlorb 806fcbce36 refactor update protocol in repository permission 2017-12-14 14:18:16 +01:00
mlorb e0d1ae174e refactor read protocol in repository permission 2017-12-14 14:18:15 +01:00
mlorb 43c01b74b1 refactor create protocol permission 2017-12-14 14:18:14 +01:00
mlorb a0b2d3f5ef refactor read_team permission 2017-12-14 14:18:14 +01:00
Zanz2 835ac6910f Code refactor part 1 2017-12-02 00:29:47 +01:00
Zanz2 bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 
Fixed validations lengths and added workarounds for bugs [SCI-1833]
 2017-11-24 17:55:20 +01:00
Zmago Devetak 027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651 
export and import RTE images
 2017-11-24 16:28:28 +01:00
Zanz2 dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
Zanz2 f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
zmagod 91fec89cab adds tiny_mce_assets to protocol export 2017-11-21 16:30:48 +01:00
Zanz2 d8c809ffd0 Reviewed pull request 2017-11-20 23:19:34 +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 b2e1623cf1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784 2017-11-16 20:04:12 +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
Zanz2 1b540a75a1 Fixed to use .megabytes 2017-11-16 15:17:13 +01:00
Zanz2 41c1193a78 Fixed unit error;Now when comparing file size, both are in bytes 2017-11-16 01:34:38 +01:00
mlorb 288e3ddcbd
Merge pull request #877 from mlorb/ml-sci-1190 
Fix bug when removing all keywords in protocol [SCI-1190]
 2017-11-15 11:22:18 +01:00
Mojca Lorber c2a5b52767 fix bug when removing all keywords in protocol 2017-11-14 15:04:37 +01:00
Zanz2 6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2 f35ab78849 Added some code to make the two seperate jira issues work together (protocol info and scinote tables 2017-11-14 00:56:39 +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 e7384ac38d Code review fixes, made seperate helper file 2017-11-12 15:31:04 +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
Zanz2 aa03a889c7 Fixed PR review 2017-11-03 16:28:15 +01:00