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
|
fab9180b7b
|
fixed small oversight
|
2018-02-15 23:40:09 +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 |
|
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 |
|
mlorb
|
9797712561
|
Merge pull request #997 from mlorb/ml-sci-2045
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
|
2018-02-15 14:51:40 +01:00 |
|
Zmago Devetak
|
e0510ab448
|
Merge pull request #995 from ZmagoD/zd_SCI_2040
fixed bug with assigned repository items [fixes SCI-2040]
|
2018-02-15 13:05:30 +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 |
|
zmagod
|
78e902f316
|
fixes few Hound alerts
|
2018-02-15 11:06:59 +01:00 |
|
Matej Zrimšek
|
ac5b65b121
|
Added some additional comments for checking if project is active in permissions.
|
2018-02-14 14:39:10 +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
|
4c87fb4a55
|
Fixed permission error when restoring task.
|
2018-02-14 14:39:09 +01:00 |
|
Matej Zrimšek
|
946f516171
|
Fixed permission error when moving a freshly cloned task.
|
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
|
d7108f5a35
|
Fixed Hound warnings.
|
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
|
879eda2d8f
|
Minor experiment level permissions refactoring.
|
2018-02-14 14:19:22 +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
|
1182ce5da1
|
Fixed experiment level permission checks in the controllers.
|
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
|
c5b798017e
|
Minor Hound warning fixes.
|
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
|
70fdae567c
|
Forgot to add check whether project is active for archive project permission. Added some additional comments for checking if project is active in permissions.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
c09ffa4043
|
Project permissions comments change.
|
2018-02-14 13:16:32 +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
|
a21343a819
|
Fixing and refactoring project permissions in controllers.
|
2018-02-14 13:16:32 +01:00 |
|
Matej Zrimšek
|
279da20060
|
Fixed Hound warnings.
|
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 |
|
mlorb
|
8d0ac93c80
|
add check to start work on next task notification if recent changes notification is switched off
|
2018-02-13 11:01:45 +01:00 |
|
Zmago Devetak
|
027297d46a
|
Merge pull request #985 from ZmagoD/zd_SCI_2008
fixes bug with assets upload on task result page,
|
2018-02-12 11:40:44 +01:00 |
|
okriuchykhin
|
e7fb1bc716
|
Merge pull request #967 from okriuchykhin/ok_SCI_1966
Merge gilson-iot-rails4 to master [SCI-1966]
|
2018-02-12 11:02:17 +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
|
27b7aff3ea
|
fixed bug with assigned repository items [fixes SCI-2040]
|
2018-02-12 10:49:35 +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
|
e400514020
|
Merge pull request #981 from ZmagoD/zd_SCI_2026
fixes bug with step table update [fixes SCI-2026]
|
2018-02-07 14:35:15 +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
|
ef0733b886
|
Merge pull request #988 from Zanz2/red_error_msg_sci1993
Accidentally deleted this off master, identical to the branch before [SCI-1993]
|
2018-02-07 13:08:45 +01:00 |
|
Zanz2
|
a6e93b8e35
|
Fixed hound line too long
|
2018-02-07 13:04:02 +01:00 |
|
mlorb
|
edbcdc6bf4
|
Merge pull request #986 from mlorb/ml-sci-2031
Fix error on task activity [SCI-2031]
|
2018-02-07 11:39:14 +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
|
e56c0bb100
|
Tables are now always atleast 5x5, like in scinote when creating new table
|
2018-02-07 10:55:44 +01:00 |
|
Zanz2
|
f7f46a094e
|
Fixed PR and a mistake i made
|
2018-02-07 09:53:49 +01:00 |
|
Zanz2
|
167cbc98e5
|
Merge branch 'master' into yellow_flashv3_SCI1834
|
2018-02-07 09:42:56 +01:00 |
|
Zanz2
|
80735f2412
|
Fixed the bug with big text difference in preview and imported protocol
|
2018-02-07 09:26:45 +01:00 |
|
zmagod
|
695e9d90d2
|
fixes user dropdown [fixes SCI-2033]
|
2018-02-07 08:43:42 +01:00 |
|
Luka Murn
|
4389c110cf
|
Merge pull request #982 from biosistemika/lm-remove-component-loader
Remove component loader (so builds pass)
|
2018-02-06 17:02:08 +01:00 |
|
mlorb
|
e151c963e1
|
fix error on task activity
|
2018-02-06 16:34:16 +01:00 |
|
zmagod
|
2ad4eb3488
|
fix bug with checklists
|
2018-02-06 16:15:10 +01:00 |
|
zmagod
|
75cc9d11df
|
fix error on checklists
|
2018-02-06 16:06:15 +01:00 |
|
Zanz2
|
a37d4f3cde
|
there are always now atleast 5 rows, like in edit table in repository, so it adds empty rows if there are not atleast 5 originally
|
2018-02-06 15:46:03 +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 |
|
zmagod
|
bd1345d560
|
fixes bug with assets upload on task result page,
adds ctrl+v listener to upload images from clipboard, adds image preview modal
|
2018-02-06 15:39:19 +01:00 |
|
Zanz2
|
a2df9777f6
|
Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000
fixed empty table name unable to generate reports bug [SCI-2000]
|
2018-02-06 14:34:31 +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
|
f9c6eafe49
|
most protocol attributes, and step description and step expected result now dont get cut tables when they are at max character limit
|
2018-02-06 12:04:24 +01:00 |
|
Zanz2
|
9b5ddc6789
|
moved code from older branch to new master
|
2018-02-06 11:03:17 +01:00 |
|
Zanz2
|
748af2cbf7
|
Fixed the issue, table name defaults to empty string space now
|
2018-02-06 10:29:49 +01:00 |
|
Zanz2
|
dac59cf4d0
|
Refactored to PR, deleted unrelated things
|
2018-02-06 09:06:33 +01:00 |
|
Luka Murn
|
4ddc7dfa85
|
Comment react-hijack code
|
2018-02-06 08:00:29 +01:00 |
|
zmagod
|
b48fa3f231
|
fixes bug with step table update [fixes SCI-2026]
|
2018-02-05 17:32:38 +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 |
|
Oleksii Kriuchykhin
|
16e1d072b9
|
Improve files handling in protocol clonning [SCI-2003]
|
2018-02-01 15:44:08 +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 |
|
mlorb
|
39fc52ddf4
|
Merge pull request #972 from mlorb/ml-sci-1997
Fix type error at changing task at navigation bar after setting due date [SCI-1997]
|
2018-01-31 15:13:28 +01:00 |
|
Zmago Devetak
|
ccab688728
|
Merge pull request #975 from ZmagoD/zd_SCI_2001
Zd sci 2001
|
2018-01-31 14:42:41 +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 |
|
mlorb
|
553039b7b4
|
fix type error at changing task at navigation bar after seting due date
|
2018-01-30 13:29:54 +01:00 |
|
Oleksii Kriuchykhin
|
7a769bbfde
|
Update notification settings accessor names and update Rubocop config [SCI-1968]
|
2018-01-29 16:15:12 +01:00 |
|
mlorb
|
775b8b3201
|
fix bug with ajax error caused to the other user when deleting column in custom repository
|
2018-01-29 16:01:33 +01:00 |
|
zmagod
|
029d69b033
|
revert to old setting [fixes SCI-1967]
|
2018-01-29 15:42:22 +01:00 |
|
Zanz2
|
0607579d06
|
Fixes the database error i was having on home machine too, wasnt exclusive to me
|
2018-01-27 14:57:07 +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
|
a15e624b06
|
Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995
Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]
|
2018-01-26 15:08:03 +01:00 |
|
Oleksii Kriuchykhin
|
7c14800570
|
Change base class for API controller [SCI-1966]
|
2018-01-26 13:34:38 +01:00 |
|
Zanz2
|
e041426a09
|
Merge pull request #964 from Zanz2/steps_order_SCI1816
Steps order fix [SCI-1816]
|
2018-01-26 11:32:28 +01:00 |
|
Zanz2
|
48b48c945c
|
Refactored hound errors, now that rubocop works
|
2018-01-26 11:17:49 +01:00 |
|