scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-16 09:53:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
6245 commits 55 branches 189 tags 169 MiB
Commit graph

6245 commits

Author SHA1 Message Date
Miha Mencin
2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
Luka Murn
e719ba48a7
Merge pull request from Ducz0r/lm-fix-api-typos 
Minor typo fix in RSpec tests
 2019-09-05 11:33:32 +02:00
Luka Murn
bff4029e8d Minor typo fix in tests 2019-09-05 11:13:01 +02:00
aignatov-bio
15dc25cee9
Fix handson table initialization [SCI-3749] () 
* Fix handson table initialization

* Fix markup
 2019-09-05 08:35:28 +02:00
aignatov-bio
bc86d5bc40
Fix import items to inventory () 2019-09-05 08:35:11 +02:00
aignatov-bio
b8e68e02a1
Fix error, when cancel tag editing () 2019-09-05 08:34:33 +02:00
Alex Kriuchykhin
59a85d8181
Merge pull request from okriuchykhin/ok_SCI_3778 
Fix new office file creation [SCI-3778]
 2019-09-04 15:40:34 +02:00
Alex Kriuchykhin
77a1df0068
Merge pull request from okriuchykhin/ok_SCI_3817 
Make previewable document filter more strict [SCI-3817]
 2019-09-04 15:40:01 +02:00
mlorb
f5c8680f22
Merge pull request from mlorb/ml-sci-3819 
Fix bug on API endpoint when creating result [SCI-3819]
 2019-09-04 14:16:33 +02:00
Mojca Lorber
a312c0c4b8 fix bug on api endpoint when creating result 2019-09-04 13:41:06 +02:00
Luka Murn
fd99e49fac
Merge pull request from Ducz0r/lm-fix-failing-avatar-upload-test 
Fix the failing Cucumber test for uploading avatar
 2019-09-04 12:43:23 +02:00
Luka Murn
c7a4438bdd Fix the failing Cucumber test for uploading avatar 2019-09-04 11:18:14 +02:00
Oleksii Kriuchykhin
c65c0cf356 Make previewable document filter more strict [SCI-3817] 2019-09-04 10:39:04 +02:00
Oleksii Kriuchykhin
e58d3cf169 Implement Cucumber tests for direct upload [SCI-3771] 2019-09-03 15:14:37 +02:00
Luka Murn
0a8c101c7e
Change the cucumber test image asset 2019-09-03 14:34:42 +02:00
aignatov-bio
481be7b92e
Fix padding to share modal () 2019-09-03 12:06:16 +02:00
mlorb
ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons () 2019-09-02 10:30:29 +02:00
Oleksii Kriuchykhin
419a4c8e8c Update trim_html_tags Postgres function [SCI-3726] 2019-08-30 16:42:03 +02:00
Alex Kriuchykhin
6cc38de747
Merge pull request from okriuchykhin/ok_SCI_3803 
Refactor inventory sharing logic [SCI-3803]
 2019-08-30 13:20:01 +02:00
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
aignatov-bio
d209b3abcd
Update share modal window [SCI-3812] () 
* Update share modal window

* Fix markup
 2019-08-29 13:45:27 +02:00
aignatov-bio
d3ccdbd83e
Create copy permission () 2019-08-29 13:39:22 +02:00
Oleksii Kriuchykhin
940ef5b92f Fix Travis email config [SCI-3786] 2019-08-26 15:05:24 +02:00
aignatov-bio
4d20cd7d55
Fix copy inventory permission () 2019-08-26 14:48:38 +02:00
Miha Mencin
f2a9a4b505
Merge pull request from biosistemika/SCI-3806-shared-status-dropdown 
SCI-3806 Add an icon indicating shared status to dropdown
 2019-08-26 11:55:39 +02:00
Miha Mencin
0058198bb5
Merge branch 'master' into SCI-3806-shared-status-dropdown 2019-08-26 11:55:25 +02:00
mlorb
ffe06d5070
Merge pull request from mlorb/ml-sci-3805 
Add a team name to inventory item card [SCI-3805]
 2019-08-26 11:29:12 +02:00
aignatov-bio
66326d90e5
Fix shared icon show/hidden () 2019-08-26 11:24:22 +02:00
Miha Mencin
a7bb7a1dd8 additional checking for icon: check also if user is guest 2019-08-26 11:20:18 +02:00
aignatov-bio
b3e3c443f0
Fix big gap in title of navbar () 2019-08-26 11:20:03 +02:00
Oleksii Kriuchykhin
e077266151 Explicitly set Rails env for test [SCI-3786] 2019-08-26 11:16:04 +02:00
Miha Mencin
b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00
aignatov-bio
5bf3a5d418
Fix sharing check in service [SCI-3798] () 
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder

* Fix sharing check in service

* Fix rebase conflicts
 2019-08-26 09:36:41 +02:00
Miha Mencin
9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
aignatov-bio
96e132c62e
Hide share button for users with one team () 2019-08-23 11:29:03 +02:00
aignatov-bio
5515bac773
Add assigned items from shared inventories to report () 2019-08-23 11:28:09 +02:00
Mojca Lorber
50c78f182c Add a team name to inventory item card 2019-08-23 11:13:58 +02:00
aignatov-bio
0810699770
Update shared inventory permissions [SCI-3802] () 
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder
 2019-08-23 10:57:02 +02:00
Oleksii Kriuchykhin
e19f92bc70 Fix links in emails [SCI-3786] 2019-08-22 15:03:32 +02:00
Oleksii Kriuchykhin
3a87296c7b Fix cucumber tests, switch to chromium-driver [SCI-3786] 2019-08-22 13:38:02 +02:00
Luka Murn
5d3a0d7eea
Merge pull request from Ducz0r/lm-remove-legacy-projects-views 
Remove legacy projects archive HTML views
 2019-08-21 17:08:27 +02:00
Luka Murn
701bdbd294 Remove archive controller action 2019-08-21 16:01:12 +02:00
Luka Murn
9ad2490285 Remove the deprecated archive endpoint controller rspec test 2019-08-21 16:00:04 +02:00
aignatov-bio
d70b7e2272
Make share status icon dynamic () 2019-08-21 15:32:57 +02:00
aignatov-bio
5e3f1d59f5
Fix inventory rows import () 2019-08-21 15:32:45 +02:00
Oleksii Kriuchykhin
2298ba4e4e Add path method to custom ActiveStorage S3 service [SCI-3765] 2019-08-21 14:33:28 +02:00
Oleksii Kriuchykhin
3918c893db Fix new office file creation [SCI-3778] 2019-08-21 13:26:11 +02:00
Luka Murn
084cdcdd6b Remove old archive endpoint, controller logic 2019-08-21 13:17:19 +02:00
Luka Murn
2db39c049e Remove projects archive page 2019-08-21 13:10:54 +02:00
aignatov-bio
f94b8165dc
Fix marvinjs edit button and icon () 2019-08-21 11:15:57 +02:00