scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
14770 commits 31 branches 181 tags 166 MiB
Commit graph

484 commits

Author SHA1 Message Date
aignatov-bio
21e4dcd96a Add wopi preview for office files 2020-08-25 13:22:36 +02:00
Mojca Lorber
059c8c88d9 Fix css for modal-body 2020-08-20 14:12:45 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
aignatov-bio
15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
Mojca Lorber
10e607c281 Implement Status labels on a Task card 2020-07-17 14:48:45 +02:00
aignatov-bio
88c092dc98 Add i18n and constants 2020-07-07 15:59:02 +02:00
aignatov-bio
8b10d49118 Clean up CSS 2020-06-18 14:08:24 +02:00
aignatov-bio
aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
aignatov-bio
8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
Mojca Lorber
6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +02:00
aignatov-bio
338f3a0192 Fix css 2020-04-14 13:08:07 +02:00
aignatov-bio
ab6001c068 Fix scroll 2020-03-25 12:56:01 +01:00
aignatov-bio
a7e4083ef1 Fix team dropdown 2020-03-25 12:31:47 +01:00
Mojca Lorber
7e36a4e357 Small support dropdown fixes 2020-03-17 15:44:57 +01:00
Mojca Lorber
6bf191d124 Remove academy link from navigation and move about modal to support menu 2020-03-06 14:36:22 +01:00
aignatov-bio
b87d6a22a7 Add checkboard background for transparent images 2020-02-19 10:48:31 +01:00
aignatov-bio
0381fef05b Move notifications to top navbar 2020-02-12 14:58:48 +01:00
aignatov-bio
26783e64da Fix protocols table CSS 2020-02-11 15:58:17 +01:00
mlorb
49bfb603c8
Merge pull request #2357 from mlorb/ml-sci-4130 
Sidebar redesign [SCI-4130]
 2020-02-04 09:55:00 +01:00
mlorb
415abf8968
Merge pull request #2382 from mlorb/ml-sci-4283 
Implement missing style guide changes [SCI-4283]
 2020-02-04 09:37:48 +01:00
mlorb
7ad3527338
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes 
Visual fixes [SCI-4274]
 2020-02-03 09:44:48 +01:00
Mojca Lorber
e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
mlorb
a2afa11fef
Merge pull request #2378 from mlorb/ml-sci-4311 
Fix scroll position on protocol and result page [SCI-4311]
 2020-01-30 13:39:16 +01:00
Mojca Lorber
9388883479 Fix scroll position on protocol and result page 2020-01-29 14:28:52 +01:00
Urban Rotnik
875515121b Fix Share button in repositories 2020-01-29 14:15:47 +01:00
Urban Rotnik
6c50b514f3 Put Academy icon back, resize team switch 2020-01-27 17:15:22 +01:00
Mojca Lorber
f5d245e7cc Sidebar redesign 2020-01-24 13:22:04 +01:00
Mojca Lorber
981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
aignatov-bio
e022f7a096 Fix small css issues 2020-01-20 15:48:51 +01:00
Mojca Lorber
36ecfbf7bf Redesign flash alerts 2020-01-16 19:08:14 +01:00
aignatov-bio
b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
mlorb
e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +01:00
aignatov-bio
79b020b97e Update table header color and update checkboxes 2020-01-14 11:39:15 +01:00
Mojca Lorber
9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
aignatov-bio
38eaf19dde Prevent editing 2 items 2020-01-09 15:19:04 +01:00
aignatov-bio
54c78cf4d1
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles 
Update colors and buttons
 2020-01-08 12:30:51 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
aignatov-bio
464d03558a Fix markup, replace buttons and add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio
e714787c38 Fix markup 2020-01-06 10:40:20 +01:00
aignatov-bio
18a8be43f5 Add new logo 2020-01-06 10:40:20 +01:00
aignatov-bio
a281f09e7f Add reports and missed modals 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
Oleksii Kriuchykhin
ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Oleksii Kriuchykhin
338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
Mojca Lorber
f1487561be Reafactor javascript repository column 2019-11-29 10:17:48 +01:00
Anton Ignatov
fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
aignatov-bio
ae0db3a7bc Update avatars and small CSS fixes 2019-11-05 10:43:02 +01:00
Mojca Lorber
a3ded83292 Small css change 2019-10-30 15:42:11 +01:00
Mojca Lorber
7b86a3932a Additional avatar small fixes 2019-10-30 15:23:14 +01:00
Mojca Lorber
a0873cb16d Small improvements in the avatar settings 2019-10-29 13:21:22 +01:00
aignatov-bio
c2c8343c57
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search 
Fix MarvinJS representation in global search [SCI-3943]
 2019-10-04 09:16:34 +02:00
Oleksii Kriuchykhin
6a6a43f5ff Improve file processing indicator [SCI-3938] 2019-10-01 15:20:46 +02:00
aignatov-bio
675d5eb088 Fix MarvinJS representation in global search 2019-10-01 14:20:20 +02:00
Urban Rotnik
b13c429d26 SystemNotifications count position fixed 2019-09-30 13:12:35 +02:00
aignatov-bio
11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
mlorb
ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
aignatov-bio
b3e3c443f0
Fix big gap in title of navbar (#2015) 2019-08-26 11:20:03 +02:00
aignatov-bio
4730e7bfee
Change notification counter position (#2000) 2019-08-21 10:39:56 +02:00
aignatov-bio
e2ad383c69
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998) 
* Fix ux for task inventory dropdown and big task title

* Fix markup
 2019-08-21 10:39:37 +02:00
aignatov-bio
2cf7f52f15
Add inline editing for inventories [SCI-3763] (#1991) 
* Add inline editing for inventories

* Remove old locals

* Markup fix
 2019-08-19 13:30:56 +02:00
aignatov-bio
d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
Anton Ignatov
ec57e0aa91 Fix assign/unassign buttons 2019-08-16 10:05:01 +02:00
Urban Rotnik
466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
Mojca Lorber
7d4941015f Update global search, so it will be able to search through shared inventories 2019-08-09 14:13:01 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +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
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
aignatov-bio
a8623002e6
Small UI changes [SCI-3699] (#1935) 
* Small ui changes

* Markup fix

* Add class for addons
 2019-07-15 13:28:20 +02:00
mlorb
5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641 
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
 2019-07-12 15:52:40 +02:00
Anton Ignatov
7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
aignatov-bio
26ef970a1e
Add academy button (#1924) 2019-07-12 11:15:34 +02:00
Mojca Lorber
f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
Oleksii Kriuchykhin
64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
mlorb
23270393b0
Merge branch 'master' into ml-sci-3634 2019-07-09 14:38:00 +02:00
Mojca Lorber
7bb82e2fc2 Fix eternal protocols tab visuals 2019-07-09 14:35:40 +02:00
aignatov-bio
6d423ed986
Make Navbar icons bigger [SCI-3663] (#1900) 
* Make Navbar icons bigger
 2019-07-08 12:53:43 +02:00
Mojca Lorber
989c10872c Fixes visual bugs on protocols.io and home page 2019-07-04 18:22:51 +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
aignatov-bio
0b3b6d593b
Small style fixes [SCI-3498] (#1799) 
* Adding error, if TinyMCE asset not in text, when we copy anything

* Small style fixes
 2019-05-27 16:27:27 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] (#1787) 
* Refactor avatar appearance across Scinote
 2019-05-21 15:19:44 +02:00
aignatov-bio
f970eea525
Some gui fixes (#1757) 2019-05-14 09:43:02 +02:00
aignatov-bio
71b3228310
Update protocol preview style [SCI-3416] (#1729) 
* Update protocol appearance
 2019-05-13 10:45:12 +02:00
Urban Rotnik
11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +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
6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
aignatov-bio
ffb0db06b9
Add scroll to team selector (#1659) 2019-04-12 09:17:14 +02:00
Urban Rotnik
a3932cc67f New asset box style update 2019-04-09 14:17:40 +02:00
Urban Rotnik
26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Miha Mencin
1b19e67c07 Revert "Step header changes, removed vertical line" 
This reverts commit b0f0ded87d.
 2019-03-27 10:21:40 +01:00
Urban Rotnik
b0f0ded87d Step header changes, removed vertical line 
SCI-3134
 2019-03-25 17:25:13 +01:00
Oleksii Kriuchykhin
ded74044de Fix circle icon in image editor [SCI-2855] 2019-03-11 15:10:38 +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
aignatov-bio
aa8a2b040a
Merge pull request #1518 from biosistemika/features/system-notifications 
Notification changes on settings page [SCI 3084] (#1517)
 2019-02-22 14:01:38 +01:00
aignatov-bio
606708987f
Notification changes on settings page [SCI 3084] (#1517) 
* Fix css and update text settings
 2019-02-22 13:20:51 +01:00
aignatov-bio
5fdba554d2
Merge pull request #1510 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-20 17:22:57 +01:00
aignatov-bio
35268252c8
After reading What’s new notification and reloading the page, gift status is unseen again [SCI 3051] (#1504) 
* Change relative path to absolute to mark_as_read and make clickable whole system notification with hover effecr
 2019-02-20 13:15:16 +01:00
Mojca Lorber
ebfacdd62c change experiments title color 2019-02-19 14:24:23 +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
mlorb
8bad68c854
Merge pull request #1457 from mlorb/ml-sci-2933 
Change experiment cards look and feel [SCI-2933]
 2019-02-12 11:49:24 +01:00
Urban Rotnik
16e9a56874 Add recaptcha to invitation modal 
SCI-2935
 2019-01-25 11:27:01 +01:00
mlorb
a297ef2094
Merge pull request #1443 from mlorb/ml-sci-2914 
Allow org. administrators to invite them onto all projects [SCI-2914]
 2019-01-24 16:24:57 +01:00
mlorb
7fdef4d3ec Change experiment cards look and feel 2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin
ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +01:00
mlorb
06b1e5cf20 Allow org. administrators to invite them onto all projects 2019-01-08 16:30:52 +01:00
mlorb
4040b31143 Fix behavior when user has no teams 2018-12-10 15:42:05 +01:00
mlorb
3031fb7a4b
Merge pull request #1398 from mlorb/ml-sci-2786 
Fix projects table css [SCI-2786]
 2018-12-06 09:15:51 +01:00
mlorb
c7f5c17e7e change css again 2018-12-04 11:21:54 +01:00
Luka Murn
8b1449b5a2 Add bottom margin to OAuth authorize page, for better mobile xp 2018-11-28 21:46:33 +01:00
mlorb
15ddd0ab91 fix projects table css 2018-11-27 12:37:10 +01:00
Oleksii Kriuchykhin
79544e789d Fix support menu for Safari [SCI-2885] 2018-11-26 18:47:21 +01:00
Alex Kriuchykhin
95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859 
Refactor & restyle the API authorization screen [SCI-2859]
 2018-11-22 13:06:13 +01:00
Oleksii Kriuchykhin
59fb971394 Change text color on project cards tabs [SCI-2872] 2018-11-20 17:31:27 +01:00
Oleksii Kriuchykhin
d98f11abdc Refactor & restyle the API authorization screen [SCI-2859] 2018-11-20 17:02:45 +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
Luka Murn
42793d25b7 Add bottom padding to sign in/up/forgot password pages 
Closes SCI-2764.
 2018-10-24 13:57:58 +02:00
Oleksii Kriuchykhin
ba58eec2e2 Merge latest features/export-all [SCI-2731] 2018-10-03 11:04:44 +02:00
Oleksii Kriuchykhin
53874c4680 Fix Hound config and CSS code styling [SCI-2730] 2018-10-03 10:39:22 +02:00
Oleksii Kriuchykhin
7d995189bd Fixies after code review [SCI-2730] 2018-10-02 14:24:44 +02:00
Luka Murn
d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +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
Luka Murn
63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
 2018-09-24 16:23:53 +02:00
Zanz2
87d2b0db14 fixed accordign to pr review 2018-09-24 15:57:31 +02:00
Zanz2
07757e382a fixed hound 2018-09-14 13:43:31 +02:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Zanz2
db610f146f fixed hound 2018-08-29 11:41:07 +02:00
Zanz2
c84ff3d9fe Small oversight fix 2018-08-29 11:37:07 +02:00
Zanz2
ed5a5e7390 Fixed blue block in dropdown, now its a full line 2018-08-29 11:33:20 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Luka Murn
f23cc36803
Merge pull request #1224 from ZmagoD/zd_SCI_2429 
fixes setting sidebar teams link[fixes SCI-2429]
 2018-07-13 14:55:24 +02:00
zmagod
6585eaa338 fixes hound 2018-07-09 12:55:25 +02:00
zmagod
14254fbde3 fixes per @mlorb 's request 2018-07-09 12:54:02 +02:00
zmagod
dd00de928c fixes css for new repository item field field [fixes SCI-2593] 2018-07-09 10:33:19 +02:00
Zmago Devetak
db90736c62
Merge pull request #1237 from ZmagoD/zd_SCI_2512 
fixes list item height on columns management page [fixes SCI-2512]
 2018-07-06 10:47:29 +02:00
zmagod
f1833b9bc1 fixes list item height on columns management page [fixes SCI-2512] 2018-07-06 09:28:03 +02:00
zmagod
a55d0b9c85 fixes file name label in repository file field [fixes SCI-2592] 2018-07-05 16:59:59 +02:00
zmagod
c9dd8b356a fixes locale, fixes custom file upload style 2018-07-04 13:43:45 +02:00
zmagod
8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
zmagod
1a15ac7acf fixes setting sidebar teams link[fixes SCI-2429] 2018-06-26 13:09:56 +02:00
zmagod
4b81c2c4db fixes tagsinput text-area on long input [fixes SCI-2566] 2018-06-26 09:52:07 +02:00
Zmago Devetak
2eb6613c6a
Merge pull request #1206 from ZmagoD/zd_SCI_2442 
make manage columns page more responsive [fixes SCI-2442]
 2018-06-13 11:14:35 +02:00
Zmago Devetak
50c1a712d8
Merge pull request #1204 from ZmagoD/zd_SCI_2434 
fixes bug with repository items dropdown [fixes SCI-2434]
 2018-06-13 08:42:13 +02:00
zmagod
1cff4a5060 make manage columns page more responsive [fixes SCI-2442] 2018-06-12 10:22:48 +02:00
zmagod
256e502982 fixes bug with repository items dropdown [fixes SCI-2434] 2018-06-11 14:57:27 +02:00