Commit graph

117 commits

Author SHA1 Message Date
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
Urban Rotnik
8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
aignatov-bio
fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02: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
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Zanz2
4e55fdc9b5 Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662 2018-08-21 12:09:05 +02:00
Zanz2
601335a807 Fixed non .js errors hound 2018-08-21 12:08:14 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
zmagod
a7e47faa61 sanitizes the report name on repors index page [fixes SCI-2600] 2018-07-10 10:58:39 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +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
zmagod
9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
Oleksii Kriuchykhin
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02: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
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
zmagod
4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +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
5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +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
Oleksii Kriuchykhin
070711917e Code fixes [SCI-1873] 2018-01-04 11:25:34 +01:00
Oleksii Kriuchykhin
512ee07bde Fix repositories [SCI-1873] 2017-12-19 17:53:45 +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
zmagod
1f45123d51 removes unneeded comments 2017-08-21 13:34:39 +02:00
Luka Murn
ae5bccf709 Merge branch 'master' into rails-5.1
Conflicts:
	Gemfile.lock
	app/datatables/repository_datatable.rb
	app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
okriuchykhin
af4b310754 Add ordering for column mappings in repositories 2017-07-26 13:35:54 +02:00
zmagod
506e47a595 fixes sorting of assigned column [fixes SCI-1483] 2017-07-14 09:45:36 +02:00
Mojca Lorber
ec76873e95 fix sorting by assigned causes ajax error 2017-07-13 11:41:19 +02:00
Oleksii Kriuchykhin
b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
Oleksii Kriuchykhin
115ce91d8d Handle column mappings in task repository [SCI-1381] 2017-06-20 15:58:52 +02:00
Oleksii Kriuchykhin
9a9f8b9c41 Fix total number of records in task repository [SCI-1381] 2017-06-19 16:45:57 +02:00
mlorb
14429a270c Merge pull request #689 from mlorb/ml_sci_1354
Truncate and display text in tooltip in custom repository fields [SCI-1354]
2017-06-19 15:50:38 +02:00
Mojca Lorber
39dd6daabb small fixes 2017-06-19 15:30:38 +02:00
Matej Zrimšek
6b284d8c89 Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357] 2017-06-16 16:02:31 +02:00
Matej Zrimšek
1f0eeeaecb Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357] 2017-06-16 14:31:31 +02:00
okriuchykhin
05ea00a5d3 Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2
Fix bug when reordering column to the first position in repositories [SCI-1346]
2017-06-16 14:29:08 +02:00
Oleksii Kriuchykhin
94d74b8101 Make assigned column always visible in repositories [SCI-1346] 2017-06-16 11:47:41 +02:00
Mojca Lorber
a195c9a5af truncate and display text in tooltip in custom repository fields 2017-06-15 15:08:33 +02:00
Luka Murn
3df034ff21 Merge pull request #687 from mz3944/mz-SCI-1357
Repository management - filter on custom columns [SCI-1357]
2017-06-15 13:30:42 +02:00
Matej Zrimšek
bae1e298d7 Fixed repositories search to only search the current repository. [SCI-1357] 2017-06-14 19:49:08 +02:00