scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-15 12:01:47 +08:00
Code Issues Projects Releases Packages Wiki Activity
6776 commits 40 branches 184 tags 168 MiB
Commit graph

1637 commits

Author SHA1 Message Date
Jure Grabnar
9a4cd4fda2 Add file_present true 2019-04-04 16:57:36 +02:00
Jure Grabnar
3b8e6fa47c Test office online 2019-04-04 16:57:36 +02:00
aignatov-bio
a1047f4597
Fix activities wording [SCI-3287] (#1635) 
* Fix activities wording

* Adding project to export protocol
 2019-04-04 10:45:35 +02:00
Alex Kriuchykhin
c86b535a25
Merge pull request #1638 from okriuchykhin/ok_SCI_3289 
Improve large image saving after editing [SCI-3289]
 2019-04-03 16:44:08 +02:00
Oleksii Kriuchykhin
9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +02:00
Jure Grabnar
f00f4d39af Refactor step activities using position_plus_one 
Closes SCI-3273
 2019-04-03 13:10:45 +02:00
Jure Grabnar
26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Alex Kriuchykhin
bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281 
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
 2019-04-03 11:39:59 +02:00
Jure Grabnar
6a9ef8b98d
Merge pull request #1633 from jbargu/jg_sci_3276 
Wrap user sign_in into rescue block [SCI-3276]
 2019-04-03 10:56:56 +02:00
aignatov-bio
e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631) 
* Fix bug with update protocol from repository and modal disable button
 2019-04-03 09:18:18 +02:00
Jure Grabnar
91820ed9c1 Wrap sign_in user into begin/rescue block 
Closes SCI-3276
 2019-04-03 09:09:20 +02:00
Oleksii Kriuchykhin
c47d243b1f Disable WOPI edit button in read only mode [SCI-3281] 2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin
ffa7c5ecb2 Fix permition checks for file editing and make protocol preview files read only [SCI-3281] 2019-04-02 16:38:53 +02:00
Anton Ignatov
94efd2e649 Fix tests 2019-04-02 16:04:50 +02:00
Urban Rotnik
86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Anton Ignatov
c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +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
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
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163 
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
 2019-04-01 14:32:54 +02:00
Mojca Lorber
3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
Oleksii Kriuchykhin
7d4fbcb32e Fix unconfirmed users clean-up issues [SCI-3172] 2019-03-29 11:11:53 +01:00
Alex Kriuchykhin
913bdd91be
Merge pull request #1610 from okriuchykhin/ok_SCI_3251 
Make subject search more precise in global activities [SCI-3251]
 2019-03-29 09:28:13 +01: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
Alex Kriuchykhin
88b4ca0798
Merge pull request #1609 from okriuchykhin/ok_SCI_3213 
Fix role name in change user role in team activity [SCI-3213]
 2019-03-28 17:32:51 +01:00
Alex Kriuchykhin
9137740266
Merge pull request #1607 from okriuchykhin/ok_SCI_3229 
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
 2019-03-28 17:32:24 +01:00
Oleksii Kriuchykhin
58af23e9b5 Make subject search more precise in global activities [SCI-3251] 2019-03-28 17:03:05 +01:00
Oleksii Kriuchykhin
6bc944fcc7 Fix role name in change user role in team activity [SCI-3213] 2019-03-28 16:26:07 +01:00
Oleksii Kriuchykhin
d7d45bec70 Fix links for archived objects in global activities [SCI-3229] 2019-03-28 13:43:50 +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
aignatov-bio
8416d1ab1c
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects 2019-03-28 09:13:34 +01:00
Jure Grabnar
07609d34c8 User/teams are now alphabetically listed 2019-03-27 15:34:01 +01:00
Anton Ignatov
3676aeb83c Adding localization to subjects group name in filters 2019-03-27 15:30:04 +01:00
Mojca Lorber
f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Oleksii Kriuchykhin
dab75d5aec Fix duplicated projects in new report modal [SCI-3173] 2019-03-26 17:24:30 +01:00
Oleksii Kriuchykhin
2ff43a3320 Change filtering logic when no filters are selected [SCI-3223] 2019-03-26 16:04:03 +01:00
Alex Kriuchykhin
935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199 
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
 2019-03-26 16:02:44 +01:00
Miha Mencin
9a30d7be9d SCI-3232 renaming the attribute name so it doesnt get 'constantized' 2019-03-26 11:39:54 +01:00
Oleksii Kriuchykhin
e3a3ec4491 Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225] 2019-03-25 17:38:13 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
aignatov-bio
9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype 
Feature/Image annotation
 2019-03-22 16:31:00 +01:00
Anton Ignatov
65521533b4 change js.erb to js 2019-03-22 13:35:11 +01:00
Anton Ignatov
4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
Anton Ignatov
bc58f0aecd Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload 2019-03-21 11:48:51 +01:00
Mojca Lorber
c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Anton Ignatov
55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov
07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Oleksii Kriuchykhin
0c2b7959b6 Fix smart annotations in RTE [SCI-3111] 2019-03-20 11:41:36 +01:00
Mojca Lorber
4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Jure Grabnar
cf5505d95f Add missing inventory name in notification 
Closes SCI-3149
 2019-03-20 10:52:58 +01:00
Anton Ignatov
29b67be127 Fix team selection in global activities and add link from navbar 2019-03-20 10:33:22 +01:00
Mojca Lorber
cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Mojca Lorber
c476816359 Task activities refactoring, without tests 2019-03-19 15:33:57 +01:00
Mojca Lorber
7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
aignatov-bio
6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] (#1568) 
*Add permission check for assets editing

* Add check for image format
 2019-03-19 13:52:57 +01:00
Anton Ignatov
f606210652 Rubocop fix 2019-03-19 13:52:03 +01:00
Anton Ignatov
87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
aignatov-bio
a0a3c4b97f
Fix file format bug (#1569) 2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin
0c71493fdb Add viewing permissions for global activities [SCI-2997] 2019-03-18 15:38:19 +01:00
Urban Rotnik
5dccdbab17 fixup! Fix failing tests 2019-03-15 11:12:10 +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
Oleksii Kriuchykhin
645930b8d7 Merge branch 'master' into features/note-section 2019-03-14 16:25:51 +01:00
Urban Rotnik
b6a8556601 Add activities for exporting Projects, Inventory items 2019-03-12 09:15:06 +01:00
Urban Rotnik
e7b57aa4f7 Add creating activities for Team actions 2019-03-12 09:15:06 +01:00
Urban Rotnik
3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik
cfe2888bea Repository columns actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
2a7bbac733 Repository actions logging 2019-03-12 09:11:00 +01:00
Urban Rotnik
976831e7d3 Edit and Archive experiment activity logging 2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin
feb75f62e1 Add workaround for image caching in fabric js [SCI-2855] 2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin
80e525fd97 Improve image editor behaviour [SCI-2855] 2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin
89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +01:00
Urban Rotnik
9ed3313f0f Create project activity refactored 2019-03-11 08:36:15 +01:00
Jure Grabnar
eceda4909f Move edit_file permission for wopi file in a special function 
Used for overwritting it in addons.

Closes SCI-2949
 2019-03-08 12:22:35 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521) 
* Adding side pane filtering and top pane
 2019-03-06 10:34:04 +01:00
aignatov-bio
125d2a3b9b
New inline tags editing in task [SCI 3093] (#1529) 
* Adding inline tags selection
 2019-03-06 09:18:45 +01: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
Miha Mencin
9807c80286 move the create action to the tope section of controller 2019-03-05 10:49:36 +01:00
Miha Mencin
67fe486874 put the scheduling logic into session create action 2019-03-05 10:43:39 +01:00
Miha Mencin
fa7bba9de7 scheduling creation of demo project at the sign in time 
remove wrong schema, fix comment, add migration
 2019-03-04 18:26:15 +01:00
Miha Mencin
844303ae7c SCI-3119 schedule the creaton of template 2019-03-01 17:47:04 +01:00
Oleksii Kriuchykhin
61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Miha Mencin
76c3db0b11 added layout, added css, added select2 lib, WIP 2019-02-25 16:50:38 +01:00
Miha Mencin
bcd0b433b6
Merge pull request #1514 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-21 16:38:58 +01:00
aignatov-bio
5f78d83f9c
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513) 
* fix dropdown apperance

* Remove search and fix duplicate bug

* Fix specs for new method
 2019-02-21 16:15:13 +01:00
aignatov-bio
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-19 13:51:18 +01:00
aignatov-bio
8e905b67b2
System notification navbar menu drop down [SCI 2955] (#1498) 
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
 2019-02-19 11:08:59 +01:00
aignatov-bio
c598541e09
System notification modal window [SCI-2957 and SCI-2958] (#1484) 
* Added new system notification modal

* Adding loading system notification on sign in
 2019-02-15 13:07:29 +01:00
mlorb
71e4cc4dbd
Merge branch 'master' into ml-sci-2940 2019-02-13 14:35:03 +01:00
aignatov-bio
5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) 
* System notification view and notification partial (SCI 2956 and SCI 3001)
 2019-02-13 13:06:14 +01:00
Oleksii Kriuchykhin
3376fd012c Improve error loggin in protocol import [SCI-3023] 2019-02-07 14:00:24 +01:00
Urban Rotnik
6f7fcb0831 Refactor method clone_experiment_as_template into service object 
[SCI-2925]
 2019-01-31 07:13:40 +01:00
mz3944
2ae56eb13f
Merge pull request #1448 from mz3944/mz-SCI-2929 
Can not switch team [SCI-2929]
 2019-01-31 04:43:39 +01:00
Urban Rotnik
4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Urban Rotnik
16e9a56874 Add recaptcha to invitation modal 
SCI-2935
 2019-01-25 11:27:01 +01:00
Urban Rotnik
247bae8a9f Refactor export_all_counter increasing/reseting logic 
- Remove daily task
- Add method to user Model
 2019-01-25 11:16:31 +01:00
Mojca Lorber
fa1dff6352 refactor Demo project generation 2019-01-24 13:40:53 +01:00
mz3944
f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903 
Fix (unite) Date and Time display formats [SCI-2903]
 2019-01-21 09:50:34 +01:00
Miha Mencin
0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2 
Fix task tags update on canvas cards [SCI-2875]
 2019-01-16 12:44:50 +01:00
Oleksii Kriuchykhin
3a4b992f4e Code style fixies []SCI-2875] 2019-01-14 16:31:23 +01:00
Matej Zrimšek
a5c1cf4450 Switch user's team if he's no longer a member of the currently selected one 2019-01-12 23:39:31 +01:00
Oleksii Kriuchykhin
89240659a7 Fix task tags update on canvas cards [SCI-2875] 2019-01-11 17:20:39 +01:00
Alex Kriuchykhin
b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776 
Add counters to task inventories dropdown [SCI-2776]
 2019-01-11 16:27:22 +01:00
Oleksii Kriuchykhin
132f46b136 Improve error handling in task inventories dropdown [SCI-2776] 2019-01-10 21:11:20 +01:00
Matej Zrimšek
8070b7f8b5 Fix Date and Time display formats on JS side 2019-01-08 08:07:24 +01:00
Oleksii Kriuchykhin
534866467b Add counters to task inventories dropdown [SCI-2776] 2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin
2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
Alex Kriuchykhin
8a348b8504
Merge pull request #1422 from okriuchykhin/ok_SCI_2910 
Improve rendering speed of inventory table [SCI-2910]
 2018-12-16 19:45:29 +01:00
Oleksii Kriuchykhin
d5c07fd22a Improve rendering speed of inventory table [SCI-2910] 2018-12-13 16:17:22 +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
4e416fe81b
Merge pull request #1404 from okriuchykhin/ok_SCI_2822 
Return task inputs/outputs as references [SCI-2822]
 2018-12-12 11:36:39 +01:00
mlorb
3f79cc5f93
Merge pull request #1418 from mlorb/ml-sci-2905 
Fix due date can not be set [SCI-2905]
 2018-12-12 11:27:57 +01:00
mlorb
426fadc10a Fix due date can not be set 2018-12-11 10:31:13 +01:00
mlorb
4040b31143 Fix behavior when user has no teams 2018-12-10 15:42:05 +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
Oleksii Kriuchykhin
2c96f08b98 Refresh sidebar when project is archived/restored [SCI-2881] 2018-11-29 14:20:20 +01:00
Oleksii Kriuchykhin
5b566b48ae Improve error messages and fix task users/items endpoints [SCI-2886] 2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin
b3a377f949 Return task inputs/outputs as references [SCI-2822] 2018-11-28 11:33:00 +01:00
Alex Kriuchykhin
20e2cbf0ca
Merge pull request #1391 from okriuchykhin/ok_SCI_2880 
Fix smart annotations rendering issues [SCI-2880]
 2018-11-28 09:47:20 +01:00
mlorb
398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676 
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
 2018-11-27 11:06:45 +01:00
mlorb
0b6b3b3609 code simplify 2018-11-27 10:58:51 +01:00
Oleksii Kriuchykhin
d67abfda2c Additional fixies for smart annotations [SCI-2880] 2018-11-26 15:17:18 +01:00
Jure Grabnar
7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix 
Protocols - import from protocols.io doesn't work
 2018-11-26 14:56:25 +01:00
mlorb
18d9ab5888 fixes upon @Ducz0r request 2018-11-26 14:23:26 +01:00
Jure Grabnar
6ec2c99a28 Hound styling 2018-11-26 13:52:01 +01:00
Jure Grabnar
0086e4dcf3 Catch some of templates error when import protocols.io 2018-11-26 13:43:05 +01:00
Jure Grabnar
1c7a051551 Catch all errors on PIO import and show message 2018-11-23 20:47:48 +01:00
mlorb
f61187dd18 Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows 2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin
5deaf25fd9 Prevent user being added to project/task multiple times [SCI-2869] 2018-11-20 14:29:33 +01:00
Alex Kriuchykhin
a6bc02a2cb
Merge pull request #1369 from okriuchykhin/ok_SCI_2830 
Refactor result and step comments [SCI-2830]
 2018-11-20 00:13:15 +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
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
Luka Murn
e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +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
c0940b143a Fix root page bug introduced with merge features/core-api -> master 2018-11-13 21:24:20 +01:00
Oleksii Kriuchykhin
fb309a12b9 Refactor result and step comments initialization [SCI-2830] 2018-11-13 16:57:42 +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
e89d60785f Fix dates on activities and experiments [SCI-2778] 2018-11-12 10:26:48 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
mlorb
75875e5421 fix user_project manage permission 2018-11-09 11:36:44 +01:00
mlorb
a56d22a329
change count to size 2018-11-08 09:43:32 +01:00
Oleksii Kriuchykhin
23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin
30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin
60e78fa868 Improve code style for error handling [SCI-2773] 2018-11-07 15:43:44 +01:00
mlorb
4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
mlorb
ad5f4c2ebb
Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint 
Remove show protocol api endpoint
 2018-10-30 14:04:17 +01:00
Alex Kriuchykhin
2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742 
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
 2018-10-29 16:26:58 +01:00
Alex Kriuchykhin
126fa03305
Merge pull request #1349 from okriuchykhin/ok_SCI_2818 
Fix project index endpoint permission bug [SCI-2818]
 2018-10-29 14:59:22 +01:00
Alex Kriuchykhin
1083ce61fb
Merge pull request #1352 from okriuchykhin/ok_SCI_2814 
Rename user_id to sub in JWT [SCI-2814]
 2018-10-29 14:54:00 +01:00
mlorb
0f8c80172e remove show protocol api endpoint 2018-10-29 11:21:48 +01:00
mz3944
d733f4e357
Merge pull request #1346 from mz3944/mz-SCI-2787 
In project list table table is not updated when archiving/restoring project [SCI-2787]
 2018-10-28 14:36:17 +01:00
Oleksii Kriuchykhin
04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +01:00
Jure Grabnar
0977f5251d
Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export 
Fix zero limit config on export all
 2018-10-28 13:38:21 +01:00
Jure Grabnar
cab0b78afa Fix zero limit config on export all 2018-10-28 09:43:34 +01:00
Oleksii Kriuchykhin
9ad2718f32 Fix project index endpoint permission bug [SCI-2818] 2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin
93e7c3f390 Fix inventory column creation permission check [SCI-2782] 2018-10-26 14:38:47 +02:00
Jure Grabnar
7d2f2c3b5f
Merge pull request #1337 from jbargu/jg_bug_sci_2805 
Add can_export_project? permission to allow archived projects to be exported [SCI-2805]
 2018-10-26 11:23:57 +02:00
Matej Zrimšek
18e52e2c6f Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin
b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Jure Grabnar
bd5a2a43fd Add can_export_project? permission 
Closes [SCI-2805].
 2018-10-19 08:41:39 +02:00
Alex Kriuchykhin
18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772 
Implement inventory column data type name mappings [SCI-2772]
 2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin
e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin
ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin
f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +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
0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +02:00
Luka Murn
1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes 
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
 2018-10-15 15:20:26 +02:00
Oleksii Kriuchykhin
f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00
Luka Murn
a217b11bba
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539 
Created read endpoint for projects and related models [SCI-2539]
 2018-10-11 09:03:18 +02:00
Luka Murn
dd4f7b5d02 Fix project users, activities, comments, reports endpoints 2018-10-10 17:35:09 +02:00
Oleksii Kriuchykhin
af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Alex Kriuchykhin
16b29b50a5
Merge pull request #1321 from okriuchykhin/ok_SCI_2731 
Add Projects view - list/table view [SCI-2731]
 2018-10-08 17:53:35 +02:00
Oleksii Kriuchykhin
77e2371091 Add tests for inventory cell endpoints [SCI-2765] 2018-10-08 13:25:03 +02:00
Luka Murn
a8d56d32e2 Hound is love, Hound is life 2018-10-07 13:28:29 +02:00
Luka Murn
7527dc7352 Fix READ index, READ show, POST create /tasks/:id/results endpoints 2018-10-07 12:58:17 +02:00
Luka Murn
fc5cf33614 Fix GET /tasks/:id/activities endpoint 2018-10-07 11:54:11 +02:00
Luka Murn
fca580face Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints 2018-10-07 11:35:12 +02:00
Luka Murn
239b974fa0 Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts 2018-10-07 11:29:56 +02:00
Luka Murn
24299ef4c0 Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts 2018-10-07 11:10:41 +02:00
Luka Murn
98544f00e8 Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts 2018-10-07 10:20:01 +02:00
Luka Murn
94e80edc9b Minor variable rename in task_groups_controller.rb 2018-10-07 10:16:00 +02:00
Luka Murn
f56e5b1e5a Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts 2018-10-07 10:07:37 +02:00
Luka Murn
0de3c7eb4e Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb 2018-10-07 09:45:24 +02:00
Luka Murn
0643ba216e Fix GET /connections, /connections/:id endpoints 2018-10-07 00:53:39 +02:00
Luka Murn
c9a15db85f Fix GET /task_groups endpoints 2018-10-06 20:11:01 +02:00
Luka Murn
d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn
9e78de6ef2 Update CREATE, PATCH, DELETE inventory_column endpoints 2018-10-06 17:11:59 +02:00
Luka Murn
6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +02:00
Luka Murn
eaa8a627a8 Update GET /inventories, GET /inventories/:inventory_id endpoints 2018-10-06 12:39:44 +02:00
Luka Murn
6faaff550b Update GET /teams, GET teams/:team_id endpoints slightly 2018-10-06 12:18:57 +02:00
Jure Grabnar
d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure 
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
 2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin
0c452f519d Add CRUD endpoints for inventory cells [SCI-2765] 2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin
363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +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
Zanz2
2e0c40ed45 fixed merge 2018-09-26 12:20:13 +02:00
Zanz2
c8ed808920 merged with core-api 2018-09-26 12:17:49 +02:00
Zanz2
1a512698e8
Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2 
( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]
 2018-09-26 12:04:09 +02:00
Alex Kriuchykhin
112343e65d
Merge pull request #1311 from okriuchykhin/ok_SCI_2738 
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
 2018-09-25 11:49:19 +02:00
Oleksii Kriuchykhin
e06684b7cf Few fixes after review [SCI-2718] 2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin
ab3aeac26b Merge latest core-api branch [SCI-2718] 2018-09-24 16:49:27 +02:00
Luka Murn
2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663 
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
 2018-09-24 16:23:28 +02:00
Zanz2
8699761389
Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667 
Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]
 2018-09-24 15:31:47 +02:00
Zanz2
e5b7d68031 this should fix travis ci 2018-09-24 13:33:44 +02:00
Zanz2
1e8442e22e fixed pull request review, forgot some small thing 2018-09-24 12:50:11 +02:00
Zanz2
1a9890ee0f fixed pull request review 2018-09-24 12:48:53 +02:00
Alex Kriuchykhin
b38e85c282
Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2 
Fix CREATE inventory endpoint [SCI-2693]
 2018-09-24 10:51:13 +02:00
Jure Grabnar
872a1211bb Format according to Houndbot #3 2018-09-23 18:58:56 +02:00
Jure Grabnar
d6f7ec2604 Format according to houndbot #2 2018-09-23 18:53:43 +02:00
Jure Grabnar
869967361c Fix according to Houndbot 2018-09-23 18:48:44 +02:00
Jure Grabnar
59169f882d Add permission check for every project 2018-09-23 14:34:21 +02:00
Jure Grabnar
90b220ddda Format according to Houndbot #4 2018-09-23 12:06:06 +02:00
Oleksii Kriuchykhin
7f7ece2be0 Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738] 2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin
84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Luka Murn
5d6881bae1
Merge pull request #1309 from biosistemika/release-1.14.5 
Merge release-1.14.5 into master
 2018-09-20 08:53:51 +02:00
Oleksii Kriuchykhin
872a48082a Remove Samples from search controller [SCI-2739] 2018-09-18 15:03:19 +02:00
Jure Grabnar
449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00
Oleksii Kriuchykhin
49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Oleksii Kriuchykhin
acc00ff3b9 Add CREATE Result endpoint: Create Text result [SCI-2718] 2018-09-13 13:38:11 +02:00
Zanz2
8ac1445ace Fixed hound 2018-09-13 11:37:07 +02:00
Zanz2
7f704c07e3 Created base endpoints for projects and related models 2018-09-13 11:37:07 +02:00
Zanz2
dace81f724 created base projects endpoint 2018-09-13 11:37:07 +02:00
Zanz2
bd49ea56c5 Added results endpoint 2018-09-13 11:16:34 +02:00
Zanz2
426bd129cc Added task inputs and outputs functionality 2018-09-13 11:14:22 +02:00
Oleksii Kriuchykhin
9d9a5d07d8 Fix CREATE inventory endpoint [SCI-2693] 2018-09-13 11:08:58 +02:00
Zanz2
2519a010f6 Created new controllers and serializers for nested task related attributes 2018-09-13 11:04:52 +02:00
Zanz2
765ee25853
Merge pull request #1292 from Zanz2/zz_experiments_api_task_2666 
Created API endpoints for experiments and related data [SCI-2666]
 2018-09-13 10:49:49 +02:00
Zanz2
1159ce519c Review changes 2018-09-13 09:25:16 +02:00
Luka Murn
0b68a670c2 Fix the inventory_columns_controller#create action 
Based on unit tests, fix the create inventory columns endpoint
to work as intended. Also add another unit test case.
 2018-09-12 13:44:10 +02:00
Zanz2
4c2c92445c fixed oversight, added paging to connections 2018-09-11 13:07:28 +02:00
Zanz2
7cb50145a0
Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621 
Fixed table add and remove crash [SCI-2621]
 2018-09-11 09:37:07 +02:00
Zanz2
e64aee5db0 Completed the functionality for experiments and related endpoints 2018-09-07 11:58:02 +02:00
Zanz2
1589cfb1b2 saving work 2018-09-06 15:38:48 +02:00
Luka Murn
586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2
f9d55f913a trying to fix display of my modules data 2018-09-05 12:54:08 +02:00
Zanz2
5ada21725f inital experiments api functionality 2018-09-05 09:55:04 +02:00
Zanz2
1bed2c2a3c Partially fixed according to pull request review, added comments to code review 2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663 
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
 2018-08-31 11:42:26 +02:00
Zanz2
728b1fe491 Reverted deleted lines by accident 2018-08-28 14:51:05 +02:00
Zanz2
b26530a02f Found a new, and more elegant fix inside controller with Luka 2018-08-28 14:48:23 +02:00
Alex Kriuchykhin
18dfeb537b
Merge pull request #1269 from okriuchykhin/ok_SCI_2604 
Improve health check endpoint [SCI-2604]
 2018-08-24 16:55:47 +02:00
Oleksii Kriuchykhin
4d49671ae8 Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][SCI-2693][SCI-2694][SCI-2695] 2018-08-24 16:41:26 +02:00
Oleksii Kriuchykhin
c8efa4bffc Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689] 2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
5488fc66fc Refactor JSON API mime type registration [SCI-2687] 2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin
490376513b Add inventory item CREATE endpoint [SCI-2687] 2018-08-24 15:36:19 +02:00
Oleksii Kriuchykhin
c8abb3d9b8 Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686] 2018-08-24 15:27:59 +02:00
Alex Kriuchykhin
eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613 
Add READ user endpoint [SCI-2613]
 2018-08-24 15:23:05 +02:00
Alex Kriuchykhin
427ab5fb41
Merge pull request #1264 from okriuchykhin/ok_SCI_2615 
Add GET inventory columns API endpoint [SCI-2615]
 2018-08-24 15:22:35 +02:00
Alex Kriuchykhin
1832c0e806
Merge pull request #1262 from okriuchykhin/ok_SCI_2614 
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
 2018-08-24 15:22:13 +02:00
Alex Kriuchykhin
0ca9972905
Merge pull request #1271 from okriuchykhin/ok_SCI_2628 
Fix error on activities page when user doesn't have any [SCI-2628]
 2018-08-22 14:21:18 +02:00
Jure Grabnar
295c6a9432 Add export all functionality (basic skeleton) 2018-08-21 21:07:45 +02:00
Luka Murn
92eab25a07
Merge pull request #1261 from mlorb/ml-sci-2634 
fix editing of inventory items of hidden columns [SCI-2634]
 2018-08-21 16:59:37 +02:00
Luka Murn
92a4a54ae7 Slighty change the parameter parsing of removed file cells 2018-08-21 16:46:47 +02:00
Oleksii Kriuchykhin
a8013118d4 Add READ user endpoint [SCI-2613] 2018-08-21 13:56:14 +02:00
Zanz2
ab3b15e13e Found the bug and fixed it 2018-08-21 13:26:16 +02:00
Zanz2
817d09ad5f fixed hound 2018-08-21 11:29:38 +02:00
Zanz2
beb1d02914 Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always 2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin
3a5238f6f3 Fix error on activities page when user doesn't have any [SCI-2628] 2018-08-20 14:26:42 +02:00
Oleksii Kriuchykhin
1a57289009 Improve health check endpoint [SCI-2604] 2018-08-17 16:13:21 +02:00
Oleksii Kriuchykhin
ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin
ef7e0ac489 Add GET inventory columns API endpoint [SCI-2615] 2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin
4df9a4c9ca Fix code style warnings [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
8d11e03d47 Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611 
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
 2018-08-08 16:59:42 +02:00
mlorb
f52ccfd606 fix editing of inventory items of hidden columns 2018-08-07 11:47:26 +02:00
okriuchykhin
29f0f2afeb
Merge pull request #1257 from okriuchykhin/ok_SCI_2609 
Refactor tasks tree API endpoint [SCI-2609]
 2018-08-02 17:10:55 +02:00
okriuchykhin
dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608 
Adds API authentication with Azure AD [SCI-2608]
 2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin
22e12d8fc3 Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin
26b0bd9e11 Refactor tasks tree API endpoint [SCI-2609] 2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin
0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
zmagod
29e0ecbc89 move FirstTimeDataGenerator helper from applictaion controller 2018-07-11 11:19:39 +02:00
zmagod
8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
zmagod
28bac14667 first working version of the edit form object 2018-07-03 12:57:39 +02:00
ZmagoD
23de3abd61 Fixes repository items edit action, adds additional event listener for file upload 2018-06-29 16:59:26 +02:00
zmagod
db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
zmagod
6a6ff534c0 fixes import flash message [fixes SCI-2398] 2018-06-15 11:12:11 +02:00
zmagod
f8ac083d39 adds an additional check if some other user has added/removed repository columns [fixes SCI-2408] 2018-06-12 15:28:03 +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
f769215468 fixes assign items flash message [fixes SCI-2487] 2018-06-08 10:02:57 +02:00
Zmago Devetak
fad67d7730
Merge pull request #1185 from ZmagoD/zd_SCI_2468 
Limits the max. amount of rows when importing into inventories [fixes…
 2018-06-04 16:29:33 +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
zmagod
9abf50e7c5 Limits the max. amount of rows when importing into inventories [fixes SCI-2468] 2018-05-31 10:45:31 +02:00
Oleksii Kriuchykhin
6cf9149baa Add user id tracking when discarding repository [SCI-2462] 2018-05-29 15:33:02 +02:00
zmagod
89046e9787 fixes items assign flash message [fixes SCI-2395] 2018-05-29 12:54:41 +02:00
okriuchykhin
6deaa7235b
Merge pull request #1136 from okriuchykhin/ok_SCI_2396 
Handle situation with smart annotations and zero inventories [SCI-2396]
 2018-05-28 17:23:29 +02:00
Zmago Devetak
147e74b4a5
Merge pull request #1164 from ZmagoD/zd_SCI_2448 
adds discard gem, move deletion of repositories in a rake task to run…
 2018-05-28 15:04:54 +02:00
Zmago Devetak
ad5114090f
Merge pull request #1165 from ZmagoD/zd_SCI_2433 
fixes tast description/due-date modal [fixes SCI-2433]
 2018-05-28 13:10:15 +02:00
okriuchykhin
0e6c89c3de
Merge pull request #1166 from okriuchykhin/ok_SCI_2342 
Fix WOPI controller to support repositories [SCI-2342]
 2018-05-28 13:07:17 +02:00
zmagod
c683cfdbd7 triggers the delayed job in the controller action, fixes smart annotations 2018-05-25 11:41:43 +02:00
Oleksii Kriuchykhin
46d6accf78 Fix search in repositories [SCI-2428] 2018-05-24 17:14:40 +02:00
Oleksii Kriuchykhin
b019ab8f61 Fix WOPI controller to support repositories [SCI-2342] 2018-05-24 16:51:25 +02:00
zmagod
10351bbf83 fixes tast description/due-date modal [fixes SCI-2433] 2018-05-24 16:44:10 +02:00
zmagod
1f8db7bc49 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2340 2018-05-24 15:00:59 +02:00
okriuchykhin
7b08529e39
Merge pull request #1156 from okriuchykhin/ok_SCI_2342 
Enable editing office online files in inventories [SCI-2342]
 2018-05-23 12:59:12 +02:00
Luka Murn
31a1641b42
Merge pull request #1155 from Ducz0r/lm-sci-2436-fix 
Update new repository row code so file columns work again [SCI-2436]
 2018-05-22 09:27:32 +02:00
Oleksii Kriuchykhin
5c41527b92 Enable editing office online files in inventories [SCI-2342] 2018-05-21 15:48:48 +02:00
Luka Murn
6135081a71 Update new repository row code so file columns work again 
Also fix backend code a bit (so update & create of repository rows
are more similar in their behavior), and fix line in JS:
_initSelectPicker() was called a reduntant amount of times when
editing repository row.

Closes SCI-2436.
 2018-05-21 14:46:30 +02:00
zmagod
ba2aafae39 fix access to public reports [fixes SCI-2340] 2018-05-21 14:45:18 +02:00
zmagod
5514683f96 shorten project name [fixes SCI-2344] 2018-05-18 14:12:12 +02:00
zmagod
38b0cb742c removes empty space 2018-05-17 15:21:45 +02:00
zmagod
e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod
b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
Zmago Devetak
9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321 
fixes images preview in repository/library [fixes SCI-2321]
 2018-05-16 12:05:33 +02:00
okriuchykhin
19ed711ce2
Merge pull request #1142 from okriuchykhin/ok_SCI_2411 
Fix pagination in global search inside repositories [SCI-2411]
 2018-05-16 10:19:05 +02:00
okriuchykhin
3e2b455d2c
Merge pull request #1139 from okriuchykhin/ok_SCI_2385 
Fix task resore permissions [SCI-2385]
 2018-05-16 10:17:51 +02:00
zmagod
4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
Oleksii Kriuchykhin
0ca0884937 Fix pagination in global search inside repositories [SCI-2411] 2018-05-15 17:48:48 +02:00
Oleksii Kriuchykhin
1d0536b064 Fix task resore permissions [SCI-2385] 2018-05-15 11:51:53 +02:00
Oleksii Kriuchykhin
addf4cfe5e Handle situation with smart annotations and zero inventories [SCI-2396] 2018-05-14 15:34:23 +02:00
Oleksii Kriuchykhin
a92abc5995 Fix editing of inventory rows with existing files [SCI-2394] 2018-05-14 14:26:01 +02:00
okriuchykhin
3b4d9fe744
Merge pull request #1132 from okriuchykhin/ok_SCI_2301 
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
 2018-05-10 10:46:25 +02:00
zmagod
e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +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
Oleksii Kriuchykhin
8ec643c54b Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301] 2018-05-09 18:03:16 +02:00
Zmago Devetak
a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344 
adds new string truncation method [fixes SCI-2344]
 2018-05-07 16:30:12 +02:00
zmagod
fa30278153 change dropdown lenght 2018-05-03 16:25:59 +02:00
zmagod
0b721d86b1 adds new string truncation method [fixes SCI-2344] 2018-05-03 14:24:23 +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
66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
zmagod
0afe461962 fixes download link 2018-04-26 17:00:51 +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
zmagod
ca539cdce8 remove samples from search 2018-04-26 14:25:02 +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
Zmago Devetak
a6b2bb0228
Merge pull request #1120 from ZmagoD/zd_SCI_2338 
add permission check to repostiory show action [fixes SCI-2338]
 2018-04-26 09:41:43 +02:00
mlorb
9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
Luka Murn
cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
zmagod
12365b3f0f add permission check to repostiory show action [fixes SCI-2338] 2018-04-25 11:56:30 +02:00
zmagod
c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
Zmago Devetak
096167c125
Merge pull request #1101 from ZmagoD/zd_SCI_2124 
adds new reports index page [fixes SCI-2124]
 2018-04-23 12:42:24 +02:00
zmagod
199a2a23bf fixes per @mlorb 's request 2018-04-23 12:26:21 +02:00