Urban Rotnik
|
478d43f9ce
|
Merge pull request #2987 from urbanrotnik/ur-sci-5208
Projects cards and list view with filters [SCI-5208]
|
2020-12-03 12:30:37 +01:00 |
|
Urban Rotnik
|
3700faa04a
|
Update proejcts grid, include breadcrumbs, fix JS
[SCI-5208]
|
2020-12-03 12:29:28 +01:00 |
|
Oleksii Kriuchykhin
|
dc15accc86
|
Update sidebar usages in partials [SCI-5177]
|
2020-12-03 10:21:53 +01:00 |
|
Oleksii Kriuchykhin
|
9546b8f71d
|
Prepare backend for the improved navigation [SCI-5177]
|
2020-12-03 10:19:11 +01:00 |
|
Mojca Lorber
|
d7e3b57d0d
|
[SCI-5240] Implement Create new folder function
|
2020-12-01 09:59:08 +01:00 |
|
Oleksii Kriuchykhin
|
78e050ccc0
|
Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]
|
2020-11-27 14:27:24 +01:00 |
|
Urban Rotnik
|
fcb82fd0d2
|
Merge pull request #2984 from okriuchykhin/ok_SCI_5204
Project filters: add text field to the filters [SCI-5204]
|
2020-11-27 12:04:46 +01:00 |
|
Oleksii Kriuchykhin
|
1553d32c6e
|
Project filters: add text field to the filters [SCI-5204]
|
2020-11-26 21:29:45 +01:00 |
|
Urban Rotnik
|
efd4f8abde
|
Add members dropdown on project filters flyout
|
2020-11-26 12:29:43 +01:00 |
|
Alex Kriuchykhin
|
5a1f169846
|
Merge pull request #2978 from urbanrotnik/ur-sci-5244-folders-projects-sorting
Project and folders sorting [SCI-5244]
|
2020-11-26 11:42:29 +01:00 |
|
Urban Rotnik
|
34fbcb8f56
|
Add clear functionallity to projects filters
|
2020-11-26 09:23:22 +01:00 |
|
Urban Rotnik
|
afc6d12b49
|
Project and folders sorting
|
2020-11-25 18:34:39 +01:00 |
|
Oleksii Kriuchykhin
|
0de237cece
|
Implement project search with grouping by folder [SCI-5207]
|
2020-11-25 11:59:02 +01:00 |
|
Alex Kriuchykhin
|
1380d5873d
|
Merge pull request #2946 from okriuchykhin/ok_SCI_5136
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-23 13:09:33 +01:00 |
|
Alex Kriuchykhin
|
f5860397f5
|
Merge pull request #2953 from okriuchykhin/ok_SCI_5183
Make folders selectable for 'Export all' functionality [SCI-5183]
|
2020-11-20 09:54:53 +01:00 |
|
Urban Rotnik
|
e893d40eea
|
Add filters flyout for projects
|
2020-11-19 09:23:35 +01:00 |
|
Oleksii Kriuchykhin
|
6dfeae2283
|
Make folders selectable for 'Export all' functionality [SCI-5183]
|
2020-11-13 14:39:10 +01:00 |
|
Oleksii Kriuchykhin
|
ee1bcd7aac
|
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-09 16:16:09 +01:00 |
|
Urban Rotnik
|
0f5bf45cf6
|
Rebase, add toolbar, minor fixes css and JS
|
2020-11-06 13:56:21 +01:00 |
|
Urban Rotnik
|
9f12c5f343
|
New cards and list layout
|
2020-11-06 13:01:52 +01:00 |
|
Oleksii Kriuchykhin
|
327baafcd7
|
Improve CSS structure for project toolbar [SCI-5129]
|
2020-11-04 16:10:40 +01:00 |
|
Oleksii Kriuchykhin
|
258c57870f
|
Implement the toolbar on the Team Projects page [SCI-5129]
|
2020-11-02 13:28:37 +01:00 |
|
Urban Rotnik
|
042231469c
|
Fix syntax
|
2020-10-30 13:37:59 +01:00 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
Urban Rotnik
|
b94a3a6cb8
|
Clean up controller
|
2020-10-26 16:17:39 +01:00 |
|
Urban Rotnik
|
1ffc3449bf
|
Clean up index view
|
2020-10-26 13:42:32 +01:00 |
|
Urban Rotnik
|
a259800590
|
Merge branch 'develop' into jg_sci_2228
|
2020-08-31 16:29:23 +02:00 |
|
Urban Rotnik
|
b11f166c38
|
Fix cucumber tests
|
2020-07-09 13:14:07 +02:00 |
|
Urban Rotnik
|
8fa024ed10
|
Remove all tooltips from HTML
|
2020-04-28 12:30:43 +02:00 |
|
Mojca Lorber
|
24c345721c
|
Add hook
|
2020-03-13 15:04:56 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
aignatov-bio
|
d93095b489
|
Fix markup
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
3f38b1e6a1
|
Add text input fields
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
443ab8645f
|
Add toggles
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
7bfefd8659
|
Add checkboxes and radio buttons
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
9694117635
|
Add new colors and buttons
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
23581059e7
|
Remove image
|
2019-10-04 14:50:27 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Anton Ignatov
|
5a1efb84c6
|
Fix error on archived experiment page
|
2019-09-18 15:23:45 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Luka Murn
|
2db39c049e
|
Remove projects archive page
|
2019-08-21 13:10:54 +02:00 |
|
Anton Ignatov
|
a4b2825258
|
Fix tests for active storage
|
2019-07-26 15:58:51 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
aignatov-bio
|
d207cf5dce
|
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
|
2019-06-04 14:40:21 +02:00 |
|
Oleksii Kriuchykhin
|
1128fedc51
|
Refactor title inline editing permission checking [SCI-3471]
|
2019-05-20 13:13:31 +02:00 |
|
Oleksii Kriuchykhin
|
2ef926e795
|
Add permission checking to inline editor fields [SCI-3468]
|
2019-05-15 17:47:09 +02:00 |
|
aignatov-bio
|
60296419e8
|
Update project card due date dropdown (#1716)
|
2019-04-30 13:30:09 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
8ba0555922
|
Add check for tasks complete in project notifications (#1657)
|
2019-04-12 09:17:34 +02:00 |
|
aignatov-bio
|
e93b0c3109
|
Adding preload filters for global activities [SCI-3254] (#1619)
* Adding preload filter for global activities
* Adding link to task activities
|
2019-04-02 11:14:36 +02:00 |
|
aignatov-bio
|
b1df8c9aa7
|
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
|
2019-03-06 09:17:34 +01:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
Oleksii Kriuchykhin
|
1861f86b2c
|
Improve export all modal messages in case of unlimited exports [SCI-2965]
|
2019-01-17 17:27:32 +01:00 |
|
Oleksii Kriuchykhin
|
311189a2e9
|
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-13 11:18:09 +01:00 |
|
Alex Kriuchykhin
|
37db41e18e
|
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-12-10 14:11:34 +01:00 |
|
Alex Kriuchykhin
|
51ba74cbab
|
Merge pull request #1403 from okriuchykhin/ok_SCI_2757
Enable caching for navigation sidebar [SCI-2757]
|
2018-12-10 14:11:05 +01:00 |
|
Oleksii Kriuchykhin
|
e43b366cdb
|
Disable fragment caching
|
2018-11-29 18:07:31 +01:00 |
|
Oleksii Kriuchykhin
|
2c96f08b98
|
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-11-29 14:20:20 +01:00 |
|
Oleksii Kriuchykhin
|
60a19734b2
|
Enable caching for navigation sidebar [SCI-2757]
|
2018-11-29 11:28:36 +01:00 |
|
mz3944
|
4d460d14ea
|
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
|
2018-11-20 21:22:23 +01:00 |
|
mlorb
|
3b96a60938
|
Merge pull request #1374 from mlorb/ml-sci-2842
Update the Export all confirmation modal and export interaction [SCI-2842]
|
2018-11-19 11:36:08 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
mlorb
|
4b540958bd
|
change close/cancel button and refactor export_project_modal endpoint
|
2018-11-16 13:37:32 +01:00 |
|
mlorb
|
6453ab6fb1
|
update the Export all confirmation modal and export interaction
|
2018-11-15 15:53:58 +01:00 |
|
Oleksii Kriuchykhin
|
3fd687161f
|
Remove unused variables from activities controller [SCI-2778]
|
2018-11-14 13:17:38 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
Luka Murn
|
98a39ecd72
|
Fix visual bug (everything bold) on projects index page
Bug was introduced in projects absent section, there was no
closing </strong> tag.
|
2018-11-14 11:33:27 +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
|
98d1ea8542
|
Improve Export All button behaviour [SCI-2839]
|
2018-11-12 15:51:03 +01:00 |
|
Oleksii Kriuchykhin
|
e89d60785f
|
Fix dates on activities and experiments [SCI-2778]
|
2018-11-12 10:26:48 +01:00 |
|
mlorb
|
4d156080ac
|
fix empty projects page bug and projects tree bug
|
2018-11-07 13:45:46 +01:00 |
|
mlorb
|
63e039e235
|
fix bug with new project button not working
|
2018-11-06 11:38:31 +01:00 |
|
Alex Kriuchykhin
|
c1d853f7bd
|
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-29 10:56:02 +01:00 |
|
Oleksii Kriuchykhin
|
641d74829a
|
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-24 17:52:40 +02:00 |
|
Matej Zrimšek
|
c89488e105
|
Fix displaying projects when all are archived [SCI-2787]
|
2018-10-24 03:34:13 +02:00 |
|
Matej Zrimšek
|
43fdab561f
|
Fix project archiving and restoring edge case [SCI-2787]
|
2018-10-24 01:37:57 +02:00 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Jure Grabnar
|
ed16e8d479
|
Fix reviewers errors
|
2018-10-16 11:00:38 +02:00 |
|
Jure Grabnar
|
26df1e5a98
|
Add export project modal
Closes [SCI-2645]
|
2018-10-16 11:00:38 +02:00 |
|
Oleksii Kriuchykhin
|
af02f29fb5
|
Implement user state saving for projects overview [SCI-2733]
|
2018-10-10 16:15:31 +02:00 |
|
Oleksii Kriuchykhin
|
7a591273a3
|
Remove unused variables [SCI-2731]
|
2018-10-08 13:45:26 +02:00 |
|
Oleksii Kriuchykhin
|
ba58eec2e2
|
Merge latest features/export-all [SCI-2731]
|
2018-10-03 11:04:44 +02:00 |
|
Oleksii Kriuchykhin
|
7d995189bd
|
Fixies after code review [SCI-2730]
|
2018-10-02 14:24:44 +02:00 |
|
Oleksii Kriuchykhin
|
492a5de19e
|
Add Projects view - list/table view [SCI-2731]
|
2018-10-01 15:39:42 +02:00 |
|
Oleksii Kriuchykhin
|
2508394924
|
Refactor Projects view - cards view [SCI-2730]
|
2018-09-27 10:43:44 +02:00 |
|
Oleksii Kriuchykhin
|
f8388d4bcd
|
Merge branch 'ok_SCI_2729' into ok_SCI_2730
|
2018-09-25 10:26:46 +02:00 |
|
Oleksii Kriuchykhin
|
80e73bfb97
|
Implement Projects view - navigation bar (tabs) [SCI-2729]
|
2018-09-24 16:25:04 +02:00 |
|
Oleksii Kriuchykhin
|
84428b37c2
|
Add project view JSON endpoints [SCI-2728]
|
2018-09-21 10:39:20 +02:00 |
|
Zanz2
|
22a565a684
|
Made fixes according to review
|
2018-09-14 13:07:09 +02:00 |
|
Zanz2
|
2d1d4c78bc
|
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
|
2018-08-21 11:27:01 +02:00 |
|
Zanz2
|
8c492e1491
|
started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute
|
2018-08-17 16:03:49 +02:00 |
|
Oleksii Kriuchykhin
|
b2bd1cb849
|
Upgrade to Turbolinks 5 [SCI-2253]
|
2018-07-27 17:26:46 +02:00 |
|
Oleksii Kriuchykhin
|
6669beaf0e
|
Change icons throughout the rest of application [SCI-2445]
|
2018-07-27 15:27:08 +02:00 |
|
Luka Murn
|
9a4fdd166e
|
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
Conflicts:
app/views/projects/index.html.erb
|
2018-06-12 17:44:42 +02:00 |
|
Zmago Devetak
|
6ba5c587f7
|
Merge pull request #1189 from ZmagoD/zd_SCI_2211
add data-hook, refactor add user to project modal to support addons
|
2018-06-08 15:23:26 +02:00 |
|
zmagod
|
43a60b632a
|
adds datahook to experiment card [fixes SCI-2373]
|
2018-06-06 17:28:04 +02:00 |
|
Luka Murn
|
c07fa5adc2
|
Update blank page for projects
|
2018-06-06 17:23:22 +02:00 |
|
zmagod
|
9b9143f145
|
add hook to tab pane
|
2018-06-01 16:46:27 +02:00 |
|
zmagod
|
84170f6de0
|
add data-hook, refactor add user to project modal to support addons
|
2018-06-01 16:13:22 +02:00 |
|
Oleksii Kriuchykhin
|
58d8414f92
|
Code fixes for sidebar [SCI-2478]
|
2018-06-01 15:05:12 +02:00 |
|
Oleksii Kriuchykhin
|
2ddc0fb561
|
Improve sidebar rendering performance [SCI-2478]
|
2018-06-01 13:49:02 +02:00 |
|
mlorb
|
f791234ec7
|
changes on Zmago's request
|
2018-05-28 11:36:37 +02:00 |
|
mlorb
|
f02363dfce
|
fix error if user is not assigned to any teams
|
2018-05-25 17:14:22 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
mlorb
|
dfe65ccaed
|
UI/UX restyle - fixes throughout application - part 2
|
2018-05-14 18:33:57 +02:00 |
|
mlorb
|
ed27a7a62a
|
some extra restyling/unifying off app
|
2018-05-11 18:02:17 +02:00 |
|
mlorb
|
7df40e56c7
|
UI/UX restyle - fixes throughout application part one
|
2018-05-08 16:33:42 +02:00 |
|
mlorb
|
d2c0ae241e
|
Merge pull request #1121 from mlorb/ml-sci-2244
Update buttons positions and wording throughout app [SCI-2244]
|
2018-05-03 11:05:15 +02:00 |
|
zmagod
|
e9642cadad
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304
|
2018-04-26 14:26:30 +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
|
503ad1ba20
|
removes samples from views [fixes SCI-2304]
|
2018-04-24 08:26:55 +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
|
f656ad1561
|
Fix fa icons [SCI-2217]
|
2018-03-30 17:03:44 +02:00 |
|
mlorb
|
bc06542ed7
|
refactor project navigation
|
2018-03-22 11:41:33 +01:00 |
|
zmagod
|
3131ed0948
|
adds permission check to archived project actions dropdown [fixes SCI-2194]
|
2018-03-16 17:30:49 +01:00 |
|
Oleksii Kriuchykhin
|
ca66858063
|
Fix edit project's users modal [SCI-2130]
|
2018-03-06 15:49:30 +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
|
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
|
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
|
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
|
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
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Oleksii Kriuchykhin
|
917c2cf28e
|
Fix experiment workflow image update indicator [SCI-1872]
|
2017-12-22 13:12:52 +01:00 |
|
Luka Murn
|
9f60ece25f
|
Merge branch 'master' into rails-5.1
Conflicts:
app/models/repository.rb
app/models/repository_row.rb
app/views/projects/index.html.erb
app/views/shared/_secondary_navigation.html.erb
|
2017-07-06 15:12:15 +02:00 |
|
Mojca Lorber
|
a3514bdaf0
|
fix restore action from archives pages
|
2017-06-29 16:14:25 +02:00 |
|
Mojca Lorber
|
d03be76f35
|
add tooltips to archive buttons
|
2017-06-27 14:48:45 +02:00 |
|
Oleksii Kriuchykhin
|
a5926726ce
|
Add notifications counter badge to project card [SCI-1253]
|
2017-05-10 17:28:37 +02:00 |
|
Oleksii Kriuchykhin
|
344b9c290a
|
Add counters for users and comments on canvas [SCI-152]
|
2017-05-08 17:32:55 +02:00 |
|
Matej Zrimšek
|
a5cffd06f3
|
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
|
2017-04-25 16:03:50 +02:00 |
|
Mojca Lorber
|
ac0988ef32
|
add data-hooks for remove manage teams button
|
2017-02-21 15:39:08 +01:00 |
|
Mojca Lorber
|
0fd41e8a6d
|
remove changes on user has no teams view
|
2017-02-21 15:12:58 +01:00 |
|
Mojca Lorber
|
90864a45a0
|
fix user has no teams view
|
2017-02-21 13:08:06 +01:00 |
|
Oleksii Kriuchykhin
|
c119b7c014
|
Make sciNote work for users without any teams [SCI_934]
|
2017-02-01 14:16:26 +01:00 |
|
zmagod
|
e59b2e039a
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
|
2017-01-27 11:15:31 +01:00 |
|
Oleksii Kriuchykhin
|
310d8c1920
|
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
zmagod
|
afd8328e9c
|
rename ortanizations -> teams
|
2017-01-25 14:22:06 +01:00 |
|
zmagod
|
72e13beee3
|
renamed organizations in views
|
2017-01-25 12:01:23 +01:00 |
|
Luka Murn
|
53699193a2
|
Merge branch 'smart-annotations'
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
|
2017-01-24 14:33:23 +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 |
|
zmagod
|
1b2fa78e42
|
adds user preview to user smart annotation [fixes SCI-832]
|
2017-01-13 11:34:10 +01:00 |
|
Oleksii Kriuchykhin
|
75031e17b9
|
Remove double sanitization from views [SCI-102]
|
2017-01-12 16:54:15 +01:00 |
|
Oleksii Kriuchykhin
|
0350f2f792
|
Add html escaping to name filelds in the views [SCI-102]
|
2017-01-12 11:03:14 +01:00 |
|
Oleksii Kriuchykhin
|
d05c16b0ba
|
Added auto_link wrapper with custom sanitization [SCI-102]
|
2017-01-11 17:02:17 +01:00 |
|
Oleksii Kriuchykhin
|
0546716a0b
|
Improve user input sanitization, fix bugs [SCI-102]
|
2017-01-11 15:50:11 +01:00 |
|
zmagod
|
a4aa933151
|
refactor smart annotation parser helper
|
2017-01-11 10:34:14 +01:00 |
|
zmagod
|
89e8946a47
|
expand smart annotation
|
2017-01-10 14:14:21 +01:00 |
|
Matej Zrimšek
|
4b0f47675a
|
Fixes experiment button not being clicable in project overview page. [SCI-849]
|
2017-01-05 14:42:52 +01:00 |
|
Oleksii Kriuchykhin
|
4d3e002c81
|
Add sorting to Project's experiments overview [SCI-361]
|
2016-12-23 15:40:01 +01:00 |
|
zmagod
|
fafecce264
|
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
|
2016-11-23 14:18:50 +01:00 |
|
Matej Zrimšek
|
f13cc5be0e
|
Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).
|
2016-11-17 18:03:49 +01:00 |
|
Zmago Devetak
|
4f5b7ad8ad
|
Merge pull request #228 from ZmagoD/zd_SCI_585
Removes archived projects from index page [fixes SCI-585]
|
2016-10-21 11:33:01 +02:00 |
|
zmagod
|
db806f3c10
|
hide private projects
|
2016-10-21 09:06:19 +02:00 |
|
zmagod
|
4c086a6fc1
|
removes archived projects from index page [fixes SCI-585]
|
2016-10-20 13:13:44 +02:00 |
|
zmagod
|
8aaf58f75f
|
removes org selector form project archive [fixes SCI-587]
|
2016-10-20 12:50:55 +02:00 |
|
zmagod
|
54a3237994
|
displays org name on the project index page if no project
|
2016-10-17 15:21:19 +02:00 |
|
zmagod
|
a116feac9c
|
fixed typos and added truncation to org name
|
2016-10-17 15:21:19 +02:00 |
|
zmagod
|
1614cbc2b2
|
fixes repeat tutorial button and localization typos
|
2016-10-17 15:16:22 +02:00 |
|
zmagod
|
fa36488397
|
fixed new project form
|
2016-10-17 15:10:26 +02:00 |
|
zmagod
|
d7f514db09
|
fixes search
|
2016-10-17 15:10:26 +02:00 |
|
Matej Zrimšek
|
a6a2a237aa
|
Removed unneeded ERB tags, which caused error. Minor refactoring.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
ece89da391
|
Removed ruby constants duplicates in JS, because of caching problems.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
0780bd2416
|
Ruby constants are now automatically available in JS. Refactoring was needed.
|
2016-10-17 11:57:37 +02:00 |
|
Matej Zrimšek
|
a3dfb59558
|
Added remaining constants.
|
2016-10-17 11:30:05 +02:00 |
|
zmagod
|
42a30576e3
|
removed introductory popup [fixes SCI-534]
|
2016-10-11 08:33:50 +02:00 |
|
Luka Murn
|
f1b74f1906
|
Fix image names in introductory popup
This will make sure browsers don't display old, cached images to clients.
|
2016-09-29 13:44:38 +02:00 |
|
zmagod
|
2a86aaf7e4
|
changed popout content [fixes SCI-520]
|
2016-09-28 15:12:30 +02:00 |
|
okriuchykhin
|
b5c861583d
|
Merge pull request #157 from okriuchykhin/ok_SCI_430
Fixes issue with unneeded sort icon [fixes SCI-430]
|
2016-09-22 16:39: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 |
|
Oleksii Kriuchykhin
|
411ee4ee77
|
Fixes issue with unneeded sort icon [fixes SCI-430]
|
2016-09-20 11:30:11 +02:00 |
|
Luka Murn
|
0c1759c15a
|
Merge pull request #135 from Ducz0r/lm-sci-397
Resize archived experiment panels
|
2016-09-07 11:14:53 +02:00 |
|
Luka Murn
|
bda5120548
|
Resize archived experiment panels
Closes SCI-397.
|
2016-09-06 10:55:05 +02:00 |
|
Mojca Lorber
|
47983812e7
|
minimize buttons on mobile phone
|
2016-09-06 10:10:49 +02:00 |
|
zmagod
|
eb39eedfdf
|
[fixes SCI-398] again
|
2016-08-31 08:46:51 +02:00 |
|
zmagod
|
2ac20d1af1
|
adds new image + new panel title [fixes SCI-336]
|
2016-08-29 09:28:29 +02:00 |
|
Luka Murn
|
a0311970f8
|
Add missing commits for showing image and not able to preview
|
2016-08-26 16:49:32 +02:00 |
|
zmagod
|
d886d05ccb
|
Merge branch 'zd_SCI_338'
|
2016-08-26 16:32:49 +02:00 |
|
Zmago Devetak
|
0cfc758f43
|
Merge pull request #102 from ZmagoD/zd_SCI_336
implement first time popup logic
|
2016-08-26 09:19:36 +02:00 |
|
zmagod
|
2031c42920
|
fixed confirmation text
|
2016-08-26 09:13:45 +02:00 |
|
zmagod
|
1738ca66d2
|
one-time introductory popup [fixes SCI-336]
|
2016-08-25 18:44:21 +02:00 |
|
zmagod
|
8ff645fb89
|
disabled experiment dropdown actions
|
2016-08-25 15:16:51 +02:00 |
|
Zmago Devetak
|
b090fd8d5b
|
Merge pull request #95 from ZmagoD/zd_SCI_374
adds edit workflow link if no workflow [fixes SCI-374]
|
2016-08-25 14:07:33 +02:00 |
|
zmagod
|
5fabe06b8d
|
implement first time popup logic
|
2016-08-25 11:44:49 +02:00 |
|
zmagod
|
dbdbff12eb
|
add experiment level tutorial step [fixes SCI-338]
|
2016-08-24 19:03:58 +02:00 |
|
Mojca Lorber
|
2a897432e1
|
update buttons on canvas view
|
2016-08-24 17:00:27 +02:00 |
|
zmagod
|
9393a96302
|
adds edit workflow link if no workflow [fixes SCI-374]
|
2016-08-24 14:10:50 +02:00 |
|
Zmago Devetak
|
afaeab492d
|
Merge pull request #87 from ZmagoD/zd_SCI_371
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
|
2016-08-24 11:56:29 +02:00 |
|
zmagod
|
27d77bc73f
|
added new permission for dropdown actions
|
2016-08-24 10:56:30 +02:00 |
|
Zmago Devetak
|
9dc7708b73
|
Merge pull request #85 from ZmagoD/zd_SCI_360
fixes project overview style and add no description link [fixes SCI-360]
|
2016-08-23 16:24:22 +02:00 |
|