Oleksii Kriuchykhin
|
aa69624f9f
|
Fix sample assign permissions [SCI-2249]
|
2018-03-25 20:10:32 +02:00 |
|
Oleksii Kriuchykhin
|
ecd3c73772
|
Skip asset if file is missing in protocol export [SCI-2250]
|
2018-03-25 13:36:24 +02:00 |
|
zmagod
|
baf69461f5
|
adds edit/create modal and related actions
|
2018-03-23 16:00:33 +01:00 |
|
mlorb
|
bc06542ed7
|
refactor project navigation
|
2018-03-22 11:41:33 +01:00 |
|
zmagod
|
3be3c00574
|
adds manage columns page [fixes SCI-2218]
|
2018-03-22 09:35:36 +01:00 |
|
zmagod
|
81df97f008
|
add library sidebar and create new library button [fixes SCI-2121]
|
2018-03-21 09:22:55 +01:00 |
|
zmagod
|
62858bc14f
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
|
2018-03-20 14:46:11 +01:00 |
|
zmagod
|
1ad8c259d1
|
add blank page for repositories [fixes SCI-2139]
|
2018-03-20 14:45:57 +01:00 |
|
zmagod
|
c46da5cc67
|
fixes import protocol bug for guest user [fixes SCI-2197]
|
2018-03-19 16:10:28 +01:00 |
|
Oleksii Kriuchykhin
|
a105e61d48
|
Remove tutorial [SCI-1860]
|
2018-03-18 13:18:05 +01:00 |
|
zmagod
|
fad4001273
|
fix edit row action
|
2018-03-16 12:27:19 +01:00 |
|
zmagod
|
1cdba5e0d3
|
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068
|
2018-03-16 11:05:16 +01:00 |
|
zmagod
|
c2eb6d6900
|
fixes hound adds specs to repository_list_items controller
|
2018-03-16 10:53:05 +01:00 |
|
zmagod
|
d69754af04
|
implement search on list items dropdown, update, create actions [fixes SCI-2070]
|
2018-03-15 15:43:16 +01:00 |
|
Zmago Devetak
|
f778415321
|
Merge pull request #1014 from ZmagoD/zd_SCI_2025
Fix custom repositories export so it supports "list of values" custom column types [fixes SCI-2025]
|
2018-03-13 15:20:46 +01:00 |
|
Zmago Devetak
|
d7679dcb99
|
Merge pull request #1032 from ZmagoD/zd_SCI_2141
refactor global activities in separate page [fixes SCI-2141]
|
2018-03-13 15:20:14 +01:00 |
|
okriuchykhin
|
503617b42c
|
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025
|
2018-03-13 14:44:20 +01:00 |
|
zmagod
|
dd2f7dd417
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration
|
2018-03-13 13:24:36 +01:00 |
|
Oleksii Kriuchykhin
|
269f7d74fa
|
Add explicit ordering to samples_tables [SCI-2148][SCI-2149]
|
2018-03-13 13:16:34 +01:00 |
|
Oleksii Kriuchykhin
|
21c07371c9
|
Fix repository export to support file columns [SCI-2079]
|
2018-03-13 10:40:27 +01:00 |
|
zmagod
|
e218cae453
|
refactor global activities in separate page [fixes SCI-2141]
|
2018-03-12 11:01:23 +01:00 |
|
mlorb
|
64e26e1c60
|
add file custom column type to db
|
2018-03-09 17:04:54 +01:00 |
|
okriuchykhin
|
707d2a048f
|
Merge pull request #1024 from okriuchykhin/ok_SCI_2145
Fix sample record creation [SCI-2145]
|
2018-03-09 16:52:38 +01:00 |
|
okriuchykhin
|
7cbfa5936a
|
Merge pull request #1026 from okriuchykhin/ok_SCI_2148
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
|
2018-03-09 16:42:33 +01:00 |
|
Oleksii Kriuchykhin
|
853e1f7657
|
Fix nil case [SCI-2145]
|
2018-03-09 16:41:23 +01:00 |
|
Oleksii Kriuchykhin
|
e4d974aa58
|
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
|
2018-03-09 15:34:06 +01:00 |
|
zmagod
|
4f951f6679
|
adds unit specs for datatable service [fixes SCI-2068]
|
2018-03-09 14:22:00 +01:00 |
|
Oleksii Kriuchykhin
|
940469e41b
|
Fix user management on project [SCI-2146]
|
2018-03-09 12:08:34 +01:00 |
|
Oleksii Kriuchykhin
|
804d313f90
|
Fix sample record creation [SCI-2145]
|
2018-03-09 11:52:28 +01:00 |
|
Oleksii Kriuchykhin
|
1765d83cd1
|
Refactor search to support repository list items [SCI-2108]
|
2018-03-09 11:05:43 +01:00 |
|
zmagod
|
26883af386
|
fix assigned ordering
|
2018-03-08 17:36:10 +01:00 |
|
Oleksii Kriuchykhin
|
1082f7f93c
|
Fix notification for user removal from a team [SCI-2131]
|
2018-03-07 13:20:17 +01:00 |
|
zmagod
|
fb66131e29
|
setup endpoint for repository_rows paging/search
|
2018-03-06 16:32:39 +01:00 |
|
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 |
|
Matej Zrimšek
|
c5b0a6525b
|
Some additional permission calls fixes, minor refactoring.
|
2018-03-06 06:56:35 +01:00 |
|
Zanz2
|
c5728c4018
|
Merge branch 'master' into null_step_crash_sci2043
|
2018-03-05 16:37:24 +01:00 |
|
zmagod
|
fca01bd54f
|
refactor repository export [fixes SCI-2025]
|
2018-03-05 15:54:04 +01:00 |
|
mlorb
|
5e44859ce0
|
Merge pull request #1010 from mlorb/ml-sci-1826
Sign up with linkedIn account [SCI-1826]
|
2018-03-05 13:24:36 +01:00 |
|
mlorb
|
a19b672a83
|
change validation again
|
2018-03-05 13:12:44 +01:00 |
|
Matej Zrimšek
|
61d1f5374d
|
Additionaly removed some unneeded code, related to the previous commit.
|
2018-03-04 15:24:43 +01:00 |
|
Matej Zrimšek
|
53f75f3cd6
|
Minor permissions and their calls refactoring and fixing.
|
2018-03-04 14:49:41 +01:00 |
|
mlorb
|
d19ca7fbdc
|
change validation
|
2018-03-02 16:32:46 +01:00 |
|
zmagod
|
4642d049fa
|
fix hound
|
2018-03-02 14:16:31 +01:00 |
|
zmagod
|
2b55cd7090
|
rename variables
|
2018-03-02 14:14:27 +01:00 |
|
mlorb
|
f5949e9d10
|
refactor
|
2018-03-01 17:52:24 +01:00 |
|
mlorb
|
08439e7f58
|
sign up with linkedIn account
|
2018-02-28 18:12:21 +01:00 |
|
zmagod
|
29a1073a50
|
refactor queries
|
2018-02-27 16:34:51 +01:00 |
|
zmagod
|
e3ca782996
|
add info modal for repository items [fixes SCI-2066]
|
2018-02-27 16:21:46 +01:00 |
|
Matej Zrimšek
|
96a6779d55
|
Fixed misspelled permission call.
|
2018-02-22 14:08:12 +01:00 |
|
Matej Zrimšek
|
ff9dff5c10
|
Fixed reports permissions check calls. Fixed Hound warnings.
|
2018-02-22 13:51:22 +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 |
|
mlorb
|
d2dcb765b4
|
fix bug with load older activities button not working
|
2018-02-16 15:42:10 +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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
d058c371d4
|
Readded project archive permission.
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
b48fa3f231
|
fixes bug with step table update [fixes SCI-2026]
|
2018-02-05 17:32:38 +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 |
|
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 |
|
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 |
|
okriuchykhin
|
94f604ae17
|
Merge pull request #961 from okriuchykhin/ok_SCI_1994
Actually return 404 when requested asset doesn't exist [SCI-1994]
|
2018-01-26 11:14:59 +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 |
|
okriuchykhin
|
0b1f43c1c5
|
Merge pull request #954 from okriuchykhin/ok_SCI_1970
Add health check endpoint to API controller [SCI-1970]
|
2018-01-25 14:33:37 +01:00 |
|
Oleksii Kriuchykhin
|
7dd9121072
|
Actually return 404 when requested asset doesn't exist [SCI-1994]
|
2018-01-25 14:30:04 +01:00 |
|
mlorb
|
ab2955c9bb
|
Merge pull request #956 from mlorb/ml-sci-1491
Add notification for previous task has been completed [SCI-1491]
|
2018-01-25 11:35:19 +01:00 |
|
zmagod
|
9b836d04fa
|
fixes per @mlorb 's request
|
2018-01-24 13:21:53 +01:00 |
|
Zanz2
|
7fe1c20ebe
|
Finished the protocol reorder functions and implemented them
|
2018-01-24 09:31:43 +01:00 |
|
Mojca Lorber
|
ac8b1769be
|
add notification for previous task has been completed
|
2018-01-23 15:53:33 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Oleksii Kriuchykhin
|
28be7c4fc4
|
Add health check endpoint to API controller [SCI-1970]
|
2018-01-22 16:52:48 +01:00 |
|
zmagod
|
ee7c646b1d
|
update user settings controllers to new permission system [fixes SCI-1960]
|
2018-01-22 16:42:26 +01:00 |
|
Oleksii Kriuchykhin
|
91468faaf9
|
Fix addons display in info modal [SCI-1875]
|
2018-01-17 18:30:55 +01:00 |
|
zmagod
|
488dba378e
|
fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
|
2018-01-17 15:06:43 +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 |
|
Oleksii Kriuchykhin
|
3c8d8e2fbb
|
Fix samples import [SCI-1946]
|
2018-01-16 17:50:33 +01:00 |
|
Oleksii Kriuchykhin
|
a64012237e
|
Fix repository records import [SCI-1939]
|
2018-01-15 18:01:35 +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 |
|
zmagod
|
371491c259
|
refactor
|
2018-01-12 11:38:52 +01:00 |
|
mlorb
|
aba426091c
|
add render 403 for create team permission
|
2018-01-10 10:47:45 +01:00 |
|
mlorb
|
6c4514f550
|
add create_teams permission checks
|
2018-01-09 15:28:27 +01:00 |
|
zmagod
|
0d7c116de1
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854
|
2018-01-09 10:03:02 +01:00 |
|
zmagod
|
c5379896c0
|
fix HOC to recive objects
|
2018-01-08 16:28:20 +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
|
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 |
|
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
|
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
|
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 |
|
zmagod
|
e0e3ef9359
|
fixes flow, and before_action in permissions_controller
|
2018-01-03 17:23:50 +01:00 |
|
mlorb
|
0c519b8f03
|
refactor manage sample elements permissions again because of addons
|
2018-01-03 16:37:02 +01:00 |
|
zmagod
|
1d3881b649
|
fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]
|
2018-01-03 13:48:59 +01:00 |
|
mlorb
|
dc68b3068b
|
fix Rails 5.1 bug with params
|
2018-01-03 13:19:56 +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 |
|
Oleksii Kriuchykhin
|
512ee07bde
|
Fix repositories [SCI-1873]
|
2017-12-19 17:53:45 +01:00 |
|
Luka Murn
|
cf291bf887
|
Merge branch 'gilson-iot-rails4'
Conflicts:
Gemfile.lock
|
2017-12-19 10:56:39 +01:00 |
|
mlorb
|
bd7eda1506
|
fix failing tests
|
2017-12-14 14:18:18 +01:00 |
|
mlorb
|
2936770c01
|
refactor can view team users ATWHO permission
|
2017-12-14 14:18:18 +01:00 |
|
mlorb
|
5c790287ec
|
refactor again manage user team permissions
|
2017-12-14 14:18:18 +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
|
e577b363b2
|
byTheWay fix of Rails 5.1 bug
|
2017-12-14 14:18:17 +01:00 |
|
mlorb
|
29f9414839
|
refactor create project permission
|
2017-12-14 14:18:17 +01:00 |
|
mlorb
|
72023c7dfe
|
refactor update/delete sample permissions
|
2017-12-14 14:18:17 +01:00 |
|
mlorb
|
b09377cd8d
|
refactor update sample permission
|
2017-12-14 14:18:17 +01:00 |
|
mlorb
|
f801ed8eb6
|
refactor view/export samples permission
|
2017-12-14 14:18:16 +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
|
a3a494c3a2
|
fix banana: remove dead code which strangely reappeared, probably with some rebasing
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
zmagod
|
e01e7bebbf
|
add permissions endpoint on the API
|
2017-12-04 13:25:48 +01:00 |
|
Zanz2
|
835ac6910f
|
Code refactor part 1
|
2017-12-02 00:29:47 +01:00 |
|
zmagod
|
52b278fe78
|
adds premissions service to FE
|
2017-12-01 17:15:15 +01:00 |
|
okriuchykhin
|
16729ccd7d
|
Merge pull request #898 from okriuchykhin/ok_SCI_1838
Fix assignment of users to projects [SCI-1838]
|
2017-11-30 11:16:07 +01:00 |
|
Oleksii Kriuchykhin
|
194054d973
|
Fix assignment of users to projects [SCI-1838]
|
2017-11-29 22:55:10 +01:00 |
|
Oleksii Kriuchykhin
|
7bb52191cd
|
Fix Ajax calls with redirect [SCI-1837]
|
2017-11-29 16:13:28 +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 |
|
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 |
|
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
|
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 |
|
Oleksii Kriuchykhin
|
84f4aba213
|
Pull latest master into gilson-iot-rails4
|
2017-11-15 15:15:26 +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 |
|