scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-26 01:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
3645 commits 69 branches 179 tags 166 MiB
Commit graph

1162 commits

Author SHA1 Message Date
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
Zanz2 5c93bd9676 Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom 2018-02-16 14:14:51 +01:00
Zanz2 673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
 2018-02-16 12:52:51 +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
Matej Zrimšek 4fe669ca9a Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions. 2018-02-16 10:53:22 +01:00
Zanz2 b9db39f87d removing last commit 2018-02-16 00:00:53 +01:00
Zanz2 95501eb046 saving work for later 2018-02-15 20:01:36 +01:00
Zanz2 ad8f93b57f
Merge pull request #991 from Zanz2/missplaced_authors_sci1808 
protocols io authors are now real authors, not user that added the protocol [SCI-1808]
 2018-02-15 16:53:39 +01:00
Zmago Devetak 0583979cf9
Merge pull request #993 from ZmagoD/zd_SCI_2039 
fixes errors with form id duplicates [fixes SCI-2039]
 2018-02-15 11:10:43 +01:00
Matej Zrimšek 09c5e23adf Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes. 2018-02-14 14:39:10 +01:00
Matej Zrimšek d571ab2ed8 Fixed comments permissions for experiment level. 2018-02-14 14:39:10 +01:00
Matej Zrimšek 6b1fee4d30 Added/joined repository record assignment to task with sample assignmment to task. 2018-02-14 14:39:10 +01:00
Matej Zrimšek f21c794a95 Fixed permission error when accessing samples page. 2018-02-14 14:39:09 +01:00
Matej Zrimšek 68206cb591 Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling. 2018-02-14 14:39:08 +01:00
Matej Zrimšek d55734e501 Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view. 2018-02-14 14:39:07 +01:00
Matej Zrimšek 8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
Matej Zrimšek 0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek 7938c2e036 Minor code style changes. 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
Matej Zrimšek d058c371d4 Readded project archive permission. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 900446557b Fixed mistyped permission checker. 2018-02-14 13:16:32 +01:00
Matej Zrimšek e36ec69ca9 Project level permissions refactoring (mostly names). 2018-02-14 13:16:32 +01:00
Matej Zrimšek 93536afcd5 Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 13e9a2a132 Corrected some project level permissions; minor refactoring. 2018-02-14 13:16:32 +01:00
Matej Zrimšek e5799ee6dc Some permission fixes. 2018-02-14 13:16:32 +01:00
Matej Zrimšek d423700e84 Used permissions where they were missing. 2018-02-14 13:16:32 +01:00
Matej Zrimšek 321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
zmagod ace78cfb58 fixes errors with form id duplicates [fixes SCI-2039] 2018-02-09 14:54:16 +01:00
Zanz2 128f15f984
Merge pull request #990 from Zanz2/code_formatting_sci1822 
Commands in protocols io steps are now properly formatted like code [SCI-1822]
 2018-02-08 08:52:44 +01:00
Zanz2 49a4d9cf23 Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar 2018-02-07 15:50:42 +01:00
Zanz2 60aa1a0953 Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before 2018-02-07 15:12:03 +01:00
Zanz2 a6356d2420 Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines 2018-02-07 14:46:25 +01:00
Zmago Devetak b33d09536e
Merge pull request #987 from ZmagoD/zd_SCI_2033 
fixes user dropdown [fixes SCI-2033]
 2018-02-07 14:34:37 +01:00
Zanz2 efaf5ad721 Commands now get styled like code 2018-02-07 13:51:22 +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
zmagod 695e9d90d2 fixes user dropdown [fixes SCI-2033] 2018-02-07 08:43:42 +01:00
Zmago Devetak 25a42658c8
Merge pull request #980 from ZmagoD/zd_SCI_2009 
adds nil check in step_table_element for table name [fixes SCI-2009]
 2018-02-06 15:44:56 +01:00
Zanz2 83e9550feb
Merge pull request #966 from Zanz2/images_not_imported_SCI1807 
Images not imported [SCI-1807]
 2018-02-06 14:33:35 +01:00
Zanz2 dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +01:00
zmagod ad742ac2d1 adds nil check in ste_table_element for table name [fixes SCI-2009] 2018-02-05 16:27:04 +01:00
zmagod 25dcfe66ae Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960 2018-02-01 16:04:05 +01:00
okriuchykhin def08a3faa
Merge pull request #971 from okriuchykhin/ok_SCI_1968 
Update notification settings accessor names and update Rubocop config [SCI-1968]
 2018-01-31 15:40:09 +01:00
zmagod 366b67ca1c fixes per @mojca 's request 2018-01-31 15:18:18 +01:00
zmagod b1684dbd5b removed unneeded hook 2018-01-31 14:40:19 +01:00
zmagod 34f5076b04 fixes failin specs [fixes SCI-2001] 2018-01-31 12:05:45 +01:00
Oleksii Kriuchykhin 7a769bbfde Update notification settings accessor names and update Rubocop config [SCI-1968] 2018-01-29 16:15:12 +01:00
zmagod 029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +01:00
Zanz2 70a972c264 Fixed pr and small oversight 2018-01-27 14:33:01 +01:00
Zanz2 2a287193b7 Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix 2018-01-27 13:50:35 +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 1d4ce42f23 fixed according to PR 2018-01-26 15:29:13 +01:00
Zanz2 98b3ddbdb0
Merge branch 'master' into images_not_imported_SCI1807 2018-01-26 15:13:40 +01:00
Zanz2 020e9ddc16 Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807 2018-01-26 11:08:47 +01:00
Zanz2 6f56f829da Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title 2018-01-26 10:49: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
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
Zmago Devetak 1e407bd9c5
removes unneeded classes 2018-01-25 11:00:48 +01:00
zmagod 76b08e6ac9 add permissions in views 2018-01-24 13:59:57 +01:00
Zanz2 00ac774fde Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result 2018-01-24 13:40:13 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
okriuchykhin aef80f86b5
Merge pull request #934 from okriuchykhin/ok_SCI_1931 
Fix protocol import button [SCI-1931]
 2018-01-18 10:30:19 +01:00
okriuchykhin 8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 
Remove Addons caption if no addons in info modal and fix linter packages
 2018-01-17 15:33:43 +01:00
Zmago Devetak 26f7a94392
Merge pull request #943 from ZmagoD/zd_SCI_1866_v2 
fixes first element both in Rails part an React part off the application
 2018-01-17 14:12:52 +01:00
okriuchykhin 38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939 
Fix repository records import [SCI-1939]
 2018-01-17 12:55:11 +01:00
okriuchykhin 1692bdade7
Merge pull request #941 from okriuchykhin/ok_SCI_1945 
Fix repository item export [SCI-1945]
 2018-01-17 12:50:22 +01:00
zmagod 0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin 86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01:00
zmagod a931a1bc15 adds first date to _list.html.erb view 2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
Oleksii Kriuchykhin a64012237e Fix repository records import [SCI-1939] 2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin 79e1eaf145 Fix export samples button [SCI-1936] 2018-01-15 13:54:08 +01:00
Oleksii Kriuchykhin deabd39a98 Fix protocol import button [SCI-1931] 2018-01-15 13:43:09 +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
Zanz2 3c6d37ce64 Fixed according to PR review 2018-01-11 18:37:36 +01:00
Zmago Devetak 0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866 
Wrong date at activity
 2018-01-08 14:20:26 +01:00
zmagod eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797 
Permissions - refactor organization & team level permissions (core) [SCI-1797]
 2018-01-05 16:03:55 +01:00
mlorb efb4ce289c fix and/or use 2018-01-05 15:52:41 +01:00
mlorb 99185871c4 fix naming things 2018-01-05 15:15:50 +01:00
mlorb 70ae14a9b8 refactor manage repository permissions again because of addons 2018-01-05 11:17:01 +01:00
mlorb ec851caa80 refactor manage repository column permissions again because of addons 2018-01-05 10:43:59 +01:00
zmagod 862b73cae7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866 2018-01-05 09:13:43 +01:00
okriuchykhin 4cdbecc3bc
Merge pull request #923 from okriuchykhin/ok_SCI_1869 
Add project/task path with tooltips to activities [SCI-1869]
 2018-01-04 16:44:35 +01:00
okriuchykhin b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870 
Fix adding users to a task [SCI-1870]
 2018-01-04 14:14:05 +01:00
mlorb abced181d5 refactor manage repository rows permissions again because of addons 2018-01-04 11:53:58 +01:00
mlorb 0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +01:00
okriuchykhin ff62a36788
Merge pull request #910 from okriuchykhin/ok_SCI_1838 
Change invite users to project link to new settings page [SCI-1838]
 2018-01-03 14:47:26 +01:00
okriuchykhin b8fa3c4d51
Merge pull request #905 from okriuchykhin/ok_SCI_1865 
Add icons for different notification types in recent notification dropdown [SCI-1865]
 2018-01-03 14:23:53 +01:00
zmagod 1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
Oleksii Kriuchykhin 2e275d6d67 Add project/task path with tooltips to activities [SCI-1869] 2017-12-28 15:13:39 +01:00
Zanz2 83e1b04c7a Fixed pull request 2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin 917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +01:00
mlorb 0774b6f7e6 refactor manage samples permissions again, so that addons permissions can be added 2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin 49ae9bcd55 Fix adding users to a task [SCI-1870] 2017-12-20 13:44:21 +01:00
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4' 
Conflicts:
	Gemfile.lock
 2017-12-19 10:56:39 +01:00
Zanz2 53561ffd84 Refactored according to PR 2017-12-15 20:39:15 +01:00
mlorb 7c1ae6bc82 refactor manage repository permissions 2017-12-14 14:18:18 +01:00
mlorb 2918a9833d refactor manage repository column permissions 2017-12-14 14:18:18 +01:00
mlorb 3f5e9e60b7 refactor view repository permission 2017-12-14 14:18:18 +01:00
mlorb 079ac7a4d3 refactor manage repository row permissions 2017-12-14 14:18:18 +01:00
mlorb 740ecc674b refactor view repositories permission 2017-12-14 14:18:18 +01:00
mlorb 3ca51f097f refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions 2017-12-14 14:18:17 +01:00
mlorb 72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb f801ed8eb6 refactor view/export samples permission 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 ccc2451494 refactor create sample permissions 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
zmagod 219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin 4ff6e87fed Change invite users to project link to new settings page [SCI-1838] 2017-12-14 11:22:28 +01:00
Oleksii Kriuchykhin 6986d11cfe Add Flow types for notifications [SCI-1865] 2017-12-13 17:25:25 +01:00
zmagod 249d3d7698 fixes current timezone setup for activities 2017-12-13 16:48:31 +01:00
okriuchykhin 2fa7591f36
Merge pull request #903 from okriuchykhin/ok_SCI_1864 
Rename notifications settings accessor [SCI-1864]
 2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin baf3151bb0 Fix notification settings accessors [SCI-1864] 2017-12-13 11:59:53 +01:00
Oleksii Kriuchykhin ea63864b33 Add icons for different notification types in recent notification dropdown [SCI-1865] 2017-12-12 17:05:08 +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
Zanz2 11dc3be9d4 It is now possible to scroll down preview modal 2017-12-10 01:41:21 +01:00
Zanz2 d0a9198408 Fixed the styling 2017-12-10 01:20:08 +01:00
Oleksii Kriuchykhin 6256acdfea Rename notifications settings accessor [SCI-1864] 2017-12-07 13:59:33 +01:00
Luka Murn 86ac07c69f
Merge pull request #902 from biosistemika/rails-5.1 
Merge rails-5.1 into decoupling-settings-page
 2017-12-07 09:25:11 +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
Zanz2 835ac6910f Code refactor part 1 2017-12-02 00:29:47 +01:00
Oleksii Kriuchykhin c4fe2b1c11 Fix jsPlumb library loading [SCI-1839] 2017-12-01 10:48:07 +01:00
zmagod 7442684846 fix protocol preview, remove unneeded functions, fix copy paste tokens 2017-11-28 14:16:20 +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
zmagod 066c782cd2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step 2017-11-24 16:29:32 +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
zmagod d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
Zanz2 dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
Zanz2 764e5259d1 Fixed last review, and a bug i found 2017-11-22 23:38:22 +01:00
zmagod afbeafb137 adds RTE images import, disables turbolinks on edit step actions 2017-11-22 16:28:14 +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
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 a6009806c4 Fixed some oversights 2017-11-17 02:56:16 +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
Zanz2 4d65ad59fe
Merge pull request #878 from Zanz2/protocol_description_fix 
Found a bug; i forot to include protocol description in new preview modal
 2017-11-16 01:11:52 +01:00
Oleksii Kriuchykhin 84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +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 c3f6c2b34a Found a bug where i forot to include protocol description in preview modal and fixed it 2017-11-14 19:46:51 +01:00
Zanz2 bc00c4a28b
Merge pull request #874 from Zanz2/supported_file_1794 
Made button green and added .json to supported file [SCI-1794]
 2017-11-14 19:12:45 +01:00
Zanz2 6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2 7ec8d7c2b2 Made button green and added .json to supported file 2017-11-14 11:46:19 +01:00
Mojca Lorber be74338d9f add explanation when copying custom repositories 2017-11-13 16:30:42 +01:00