Oleksii Kriuchykhin
|
b0c785f4fb
|
Extend inventory import to support new data types [SCI-4220]
|
2020-02-03 15:20:01 +01:00 |
|
Oleksii Kriuchykhin
|
eed68a2590
|
Refactor repository cell clonning to support all data types [SCI-4204]
|
2020-01-14 16:55:10 +01:00 |
|
Oleksii Kriuchykhin
|
01b8d2226d
|
Optimize repository table counters [SCI-4224]
|
2020-01-13 16:31:42 +01:00 |
|
Oleksii Kriuchykhin
|
7b82e33eb6
|
Fix repository filtering and improve speed [SCI-4224]
|
2020-01-13 16:09:07 +01:00 |
|
Oleksii Kriuchykhin
|
16b591b110
|
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-06 16:07:23 +01:00 |
|
aignatov-bio
|
68284c10da
|
Add task description and task protocol description activities
|
2019-11-27 14:37:53 +01:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Miha Mencin
|
d522b3807a
|
codestyle improvements
|
2019-09-06 14:59:30 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +02:00 |
|
aignatov-bio
|
b6661682ad
|
Fix shared inventory in task dropdown (#1993)
|
2019-08-19 13:56:02 +02:00 |
|
Mojca Lorber
|
cac7dab440
|
Show shared inventories in left navigation and fix read repository permission
|
2019-08-09 14:13:00 +02:00 |
|
aignatov-bio
|
6e5f078dea
|
Add activities for marvinJS [SCI-3630] (#1950)
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
|
2019-08-09 09:47:07 +02:00 |
|
Jure Grabnar
|
bbdc5ce6c3
|
Remove couple of Samples related logic/comments
|
2019-08-05 14:09:13 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
Oleksii Kriuchykhin
|
1128fedc51
|
Refactor title inline editing permission checking [SCI-3471]
|
2019-05-20 13:13:31 +02:00 |
|
Anton Ignatov
|
652fba0e23
|
Merge branch 'master-with-note-section'
|
2019-05-13 11:08:11 +02:00 |
|
Oleksii Kriuchykhin
|
40550f92c9
|
Improve HTML data escaping in JSON endpoints [SCI-3403]
|
2019-05-08 17:38:24 +02:00 |
|
Anton Ignatov
|
7d60eb5572
|
Fix migration issues
|
2019-04-23 11:11:22 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
Oleksii Kriuchykhin
|
a43e42fdb3
|
Fix crash when no activities present [SCI-3340]
|
2019-04-15 10:51:59 +02:00 |
|
Oleksii Kriuchykhin
|
231106e131
|
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 15:37:45 +02:00 |
|
Urban Rotnik
|
86ddbc68b6
|
fixup! Show date actual value without link
|
2019-04-02 14:21:06 +02:00 |
|
Urban Rotnik
|
8eaeeee9f8
|
Show date actual value without link
|
2019-04-02 13:15:34 +02:00 |
|
aignatov-bio
|
e6102c72c7
|
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties
* Adding test for activities
|
2019-04-02 11:50:37 +02:00 |
|
aignatov-bio
|
b51dcc9d75
|
Adding children selector to global activities subjects [SCI-3247] (#1605)
* Adding children selector to global activities subjects
* Fix naming, add seperate check for project id
|
2019-03-29 09:26:27 +01:00 |
|
mlorb
|
5f663b3c74
|
Merge pull request #1600 from mlorb/ml-sci-3215
Implement missing tests for global activities [SCI-3215][SCI-3219]
|
2019-03-28 11:10:38 +01:00 |
|
aignatov-bio
|
08263ab64e
|
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
|
2019-03-28 10:55:48 +01:00 |
|
Mojca Lorber
|
f06358b2ae
|
Implement missing tests for global activities (task and protocol activities)
|
2019-03-27 11:24:44 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
Mojca Lorber
|
c55e314ed5
|
Refactor upon the review requests
|
2019-03-20 21:34:47 +01:00 |
|
Oleksii Kriuchykhin
|
0c2b7959b6
|
Fix smart annotations in RTE [SCI-3111]
|
2019-03-20 11:41:36 +01:00 |
|
Mojca Lorber
|
c476816359
|
Task activities refactoring, without tests
|
2019-03-19 15:33:57 +01:00 |
|
Urban Rotnik
|
2ea2700837
|
fixup! Fix failing tests
|
2019-03-15 10:30:51 +01:00 |
|
Oleksii Kriuchykhin
|
a822227383
|
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +01:00 |
|
Urban Rotnik
|
3f18166320
|
Add Task and TaskTags activities
|
2019-03-12 09:15:06 +01:00 |
|
Oleksii Kriuchykhin
|
132f46b136
|
Improve error handling in task inventories dropdown [SCI-2776]
|
2019-01-10 21:11:20 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
d5c07fd22a
|
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-13 16:17:22 +01:00 |
|
mlorb
|
426fadc10a
|
Fix due date can not be set
|
2018-12-11 10:31:13 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
Luka Murn
|
84df2c81f9
|
Merge branch 'features/export-all'
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
|
2018-11-13 09:14:02 +01:00 |
|
Oleksii Kriuchykhin
|
8d0dbc7076
|
Add time format selection to settings [SCI-2778]
|
2018-11-09 16:19:40 +01:00 |
|
Matej Zrimšek
|
18e52e2c6f
|
Fix fetching all user projects [SCI-2787]
|
2018-10-24 00:29:30 +02:00 |
|
Oleksii Kriuchykhin
|
84428b37c2
|
Add project view JSON endpoints [SCI-2728]
|
2018-09-21 10:39:20 +02:00 |
|
Zanz2
|
b26530a02f
|
Found a new, and more elegant fix inside controller with Luka
|
2018-08-28 14:48:23 +02:00 |
|
zmagod
|
f769215468
|
fixes assign items flash message [fixes SCI-2487]
|
2018-06-08 10:02:57 +02:00 |
|
Oleksii Kriuchykhin
|
2ddc0fb561
|
Improve sidebar rendering performance [SCI-2478]
|
2018-06-01 13:49:02 +02:00 |
|
zmagod
|
89046e9787
|
fixes items assign flash message [fixes SCI-2395]
|
2018-05-29 12:54:41 +02:00 |
|
zmagod
|
10351bbf83
|
fixes tast description/due-date modal [fixes SCI-2433]
|
2018-05-24 16:44:10 +02:00 |
|
Oleksii Kriuchykhin
|
1d0536b064
|
Fix task resore permissions [SCI-2385]
|
2018-05-15 11:51:53 +02:00 |
|
Zmago Devetak
|
0a4deeaa35
|
Merge pull request #1112 from ZmagoD/zd_SCI_2261
propagate assigned repository items in workflow [fixes SCI-2261]
|
2018-05-10 09:57:49 +02:00 |
|
zmagod
|
0fe499d4a1
|
adds the update action to repository records last_modified_by field when downstreaming assigned records
|
2018-05-10 09:04:12 +02:00 |
|
zmagod
|
8dac887f10
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261
|
2018-04-26 14:18:41 +02:00 |
|
zmagod
|
24acd5c779
|
fixes per @duco 's request
|
2018-04-26 14:13:46 +02:00 |
|
mlorb
|
88d5ba369d
|
Merge branch 'ux-release-1' into ml-sci-2244
|
2018-04-26 14:07:03 +02:00 |
|
Luka Murn
|
cb6fe50832
|
Merge branch 'master' into ux-release-1
Conflicts:
app/assets/javascripts/repositories/index.js
|
2018-04-26 11:38:54 +02:00 |
|
mlorb
|
9e11f3b220
|
update buttons positions and wording throughout app
|
2018-04-25 13:57:12 +02:00 |
|
zmagod
|
824962c084
|
propagate assigned repository items in workflow [fixes SCI-2261]
|
2018-04-23 11:33:16 +02:00 |
|
mlorb
|
600ec99c82
|
fix project navigation to work with archived pages and correct current team
|
2018-04-17 13:52:43 +02:00 |
|
Oleksii Kriuchykhin
|
aa69624f9f
|
Fix sample assign permissions [SCI-2249]
|
2018-03-25 20:10:32 +02:00 |
|
mlorb
|
bc06542ed7
|
refactor project navigation
|
2018-03-22 11:41:33 +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
|
4f951f6679
|
adds unit specs for datatable service [fixes SCI-2068]
|
2018-03-09 14:22:00 +01:00 |
|
zmagod
|
26883af386
|
fix assigned ordering
|
2018-03-08 17:36:10 +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 |
|
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
|
5bda53eebf
|
Overall refactoring of all canaid permissions and code related to their calls.
|
2018-02-16 10:54:06 +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
|
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
|
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
|
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 |
|
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 |
|
mlorb
|
e151c963e1
|
fix error on task activity
|
2018-02-06 16:34:16 +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 |
|
Mojca Lorber
|
ac8b1769be
|
add notification for previous task has been completed
|
2018-01-23 15:53:33 +01:00 |
|
mlorb
|
3f5e9e60b7
|
refactor view repository permission
|
2017-12-14 14:18:18 +01:00 |
|
Oleksii Kriuchykhin
|
b26b963e54
|
Optimize update canvas SQL and remove module group name [SCI-1642]
|
2017-10-05 16:19:25 +02:00 |
|
Mojca Lorber
|
ea455d3596
|
fix no repository name in activity bug
|
2017-06-15 09:43:10 +02:00 |
|
Mojca Lorber
|
9108102b42
|
fix permissions
|
2017-06-12 17:34:36 +02:00 |
|
Oleksii Kriuchykhin
|
ad8dd6d740
|
PR fixes [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Oleksii Kriuchykhin
|
8b1190060e
|
Add custom repository table [SCI-1274]
|
2017-06-07 15:23:25 +02:00 |
|
Oleksii Kriuchykhin
|
e99e3edb7b
|
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-18 14:21:00 +02:00 |
|
zmagod
|
acc5594f1b
|
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-04 12:41:22 +02:00 |
|
Mojca Lorber
|
b1e939e715
|
add experiment to activities
|
2017-04-20 13:16:11 +02:00 |
|
Luka Murn
|
800df7a26b
|
Also make button icons work when rendering them via JS
Closes SCI-1073.
|
2017-03-08 13:55:10 +01:00 |
|
Oleksii Kriuchykhin
|
4868ec5331
|
Remove task completion duplicated code [SCI-1075]
|
2017-02-28 17:07:59 +01:00 |
|
okriuchykhin
|
8e18ff44a6
|
Merge pull request #479 from okriuchykhin/ok_SCI_999
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-20 15:19:00 +01:00 |
|
Oleksii Kriuchykhin
|
4fb5fa79af
|
Move task completion activity and notification creation to separate methods [SCI-999]
|
2017-02-16 13:36:05 +01:00 |
|
Oleksii Kriuchykhin
|
218e96b1f0
|
Code style fixes [SCI-999]
|
2017-02-16 11:45:07 +01:00 |
|
Oleksii Kriuchykhin
|
78d5cbb223
|
Add links to task completion notification [SCI-999]
|
2017-02-13 14:51:21 +01:00 |
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
Luka Murn
|
3eb4faa44b
|
Fix task restore action
Closes SCI-991.
|
2017-02-10 14:08:56 +01:00 |
|
zmagod
|
c2c5616078
|
rename Organization to Team in controllers
|
2017-01-24 17:06:51 +01:00 |
|
zmagod
|
21c2f82582
|
rename controllers where org/organization
|
2017-01-24 16:57:14 +01:00 |
|
Luka Murn
|
cf72da5635
|
Merge branch 'improved-files-handling' into 'master'
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
|
2017-01-18 11:29:40 +01:00 |
|
okriuchykhin
|
02bfd19d1c
|
Merge pull request #385 from okriuchykhin/ok_SCI_102
Fix XSS on activites and throghout the rest of app [SCI-102]
|
2017-01-16 11:41:38 +01:00 |
|
Matej Zrimšek
|
93a8e0bdae
|
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
|
2017-01-12 14:08:29 +01:00 |
|
Oleksii Kriuchykhin
|
0546716a0b
|
Improve user input sanitization, fix bugs [SCI-102]
|
2017-01-11 15:50:11 +01:00 |
|
Matej Zrimšek
|
ec7a1cb4c0
|
Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848]
|
2017-01-06 14:23:20 +01:00 |
|
Matej Zrimšek
|
5d104981fd
|
Fixed sample deletion on experiments level. Minor refactoring. [SCI-848]
|
2017-01-06 14:23:20 +01:00 |
|
Oleksii Kriuchykhin
|
835e982292
|
SAnitize AJAX calls in controllers and datatables [SCI-102]
|
2017-01-05 13:12:22 +01:00 |
|
zmagod
|
e2723a288c
|
fixes bug with samples sorting [fixes SCI-812]
|
2016-12-21 14:32:28 +01:00 |
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01:00 |
|
Luka Murn
|
f5e286b1f6
|
Remove unused code for some more comments
|
2016-11-22 14:52:43 +01:00 |
|
Mojca Lorber
|
3e162b3a93
|
remove redcarpet gem - markdown
|
2016-11-10 14:11:32 +01:00 |
|
Oleksii Kriuchykhin
|
fe6724431e
|
Futher improvement of samples assign/unassign logging [SCI-605]
|
2016-11-07 09:29:56 +01:00 |
|
Oleksii Kriuchykhin
|
a1bfacef86
|
Improved samples assign/unassign logging [SCI-605]
|
2016-11-03 17:59:32 +01:00 |
|
Oleksii Kriuchykhin
|
e8d20dfc01
|
Added additional activities [SCI-605]
|
2016-11-02 10:43:36 +01:00 |
|
zmagod
|
3117a464f0
|
fixed controllers
|
2016-10-17 15:10:26 +02:00 |
|
zmagod
|
bb9c03df24
|
fixes controllers
|
2016-10-17 15:10:26 +02:00 |
|
Matej Zrimšek
|
234918a76d
|
Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.
|
2016-09-21 19:48:18 +02:00 |
|
Luka Murn
|
ecf5b5a2c1
|
Feed the Hound
|
2016-07-29 16:46:25 +02:00 |
|
Luka Murn
|
34af50a9d0
|
Fix breadcrumbs & sidebar so it works
|
2016-07-29 15:47:41 +02:00 |
|
Luka Murn
|
b64e200b91
|
Refactor canvas a lot.
Also refactor localization files concerning canvas.
|
2016-07-28 16:41:10 +02:00 |
|
Luka Murn
|
076b67620f
|
Migration GitLab -> GitHub
|
2016-07-21 13:11:15 +02:00 |
|
Luka Murn
|
055298fee8
|
Initial commit.
|
2016-02-12 16:52:43 +01:00 |
|