scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
7296 commits 70 branches 179 tags 165 MiB
Commit graph

7296 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin 6841cdd6a6
Merge pull request #2415 from aignatov-bio/ai-sci-4365-new-description-to-import-items 
New description to import items modal window [SCI-4365]
 2020-02-26 17:34:57 +01:00
Alex Kriuchykhin 9917a547ce
Merge pull request #2417 from aignatov-bio/ai-sci-4364-add-border-to-add-column-button 
Add border to add column button [SCI-4363]
 2020-02-26 17:33:47 +01:00
Oleksii Kriuchykhin 62c19f7c02 Add invite users to the team permission check [SCI-4381] 2020-02-26 17:25:38 +01:00
aignatov-bio df51140d2d
Merge pull request #2424 from aignatov-bio/ai-sci-add-calendar-widget 
Add calendar widget [SCI-4373][SCI-4371][SCI-4372]
 2020-02-26 12:04:57 +01:00
Mojca Lorber f29ce66bea Refactor backend, add empty state and fix some small scc changes 2020-02-26 11:07:17 +01:00
aignatov-bio 8e05908753 Small fixes 2020-02-25 17:19:11 +01:00
aignatov-bio 294328887a Fix typo 2020-02-25 13:51:54 +01:00
aignatov-bio 3588fb3445 Fix markup 2020-02-25 13:49:35 +01:00
aignatov-bio 32d6f9a43a Split my_module create service to seperate services 2020-02-25 13:46:44 +01:00
Alex Kriuchykhin b4c6be4bf5
Merge pull request #2429 from biosistemika/dependabot/bundler/nokogiri-1.10.8 
Bump nokogiri from 1.10.4 to 1.10.8
 2020-02-25 09:29:54 +01:00
dependabot[bot] cac9580d99
Bump nokogiri from 1.10.4 to 1.10.8 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.4 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.4...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-25 04:38:49 +00:00
aignatov-bio a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
aignatov-bio a92bac19e1 Add service for task creating 2020-02-24 15:57:22 +01:00
aignatov-bio 5385a25665 Merge branch 'features/dashboard' into ai-sci-add-calendar-widget 2020-02-24 13:04:49 +01:00
aignatov-bio 18f6c68524 Add license to clndr library 2020-02-24 12:58:38 +01:00
aignatov-bio 0675b137ad Add team and task status for calendars scope 2020-02-22 18:15:18 +01:00
aignatov-bio 3d408ba7a1 Fix typo 2020-02-22 13:11:36 +01:00
aignatov-bio de30193030 Typo fix 2020-02-22 13:06:34 +01:00
aignatov-bio b664c88819 Remove clndr from package.json 2020-02-22 13:03:51 +01:00
Mojca Lorber 9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio 3b679bc53d
Merge pull request #2416 from aignatov-bio/ai-sci-4349-progress-bar-research 
Add progress bar for current tasks [SCI-4349]
 2020-02-21 10:01:57 +01:00
aignatov-bio 2cbac634bf Add localization 2020-02-21 10:00:32 +01:00
aignatov-bio cf4dbd5ff4 Add calendar widget 2020-02-20 17:02:38 +01:00
Oleksii Kriuchykhin 8c50fe7d4c Add variables with TLS CA configuration for mail [SCI-4370] 2020-02-20 11:10:20 +01:00
aignatov-bio 01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
Miha Mencin f2ce01db75
Bump version to 1.18.3 2020-02-19 12:33:53 +01:00
aignatov-bio b87d6a22a7 Add checkboard background for transparent images 2020-02-19 10:48:31 +01:00
aignatov-bio f11b051715 Merge branch 'develop' into features/dashboard 2020-02-19 10:29:50 +01:00
Alex Kriuchykhin b99a466b21
Merge pull request #2420 from aignatov-bio/ai-sci-travis-check 
Fix travis
 2020-02-19 10:27:39 +01:00
aignatov-bio e252b1e1de Add default postgres user to dev env 2020-02-19 10:26:37 +01:00
Alex Kriuchykhin d73ea73b04
Merge pull request #2411 from okriuchykhin/ok_SCI_4319_v2 
Fix unfolding of the active element in sidebar [SCI-4319]
 2020-02-19 10:24:13 +01:00
aignatov-bio ae3db4c1fd Remove db logs 2020-02-19 10:23:32 +01:00
aignatov-bio 0d584c29f5 Add default password to DB 2020-02-19 09:54:40 +01:00
aignatov-bio c2050a8500 Check travis 2020-02-18 16:59:52 +01:00
aignatov-bio 47a86f2cf9 Hide tooltip if parent object disabled or hidden 2020-02-18 15:40:05 +01:00
aignatov-bio bbd48c9e08 Add border to add column button 2020-02-18 14:40:16 +01:00
aignatov-bio 5545d7da1a Add progress bar for current tasks 2020-02-18 14:28:06 +01:00
aignatov-bio 5886f2cf90 New description to import items modal window 2020-02-18 12:13:52 +01:00
aignatov-bio 57c665dbdd
Merge pull request #2413 from aignatov-bio/ai-sci-4350-dashboard-current-tasks-filters 
Dashboard current tasks fitler [SCI-4350]
 2020-02-18 11:51:22 +01:00
aignatov-bio 0117b577f4 Fix typo 2020-02-18 09:27:07 +01:00
aignatov-bio ff45b17b53 Fix localization and small markup fixes 2020-02-17 15:32:43 +01:00
aignatov-bio a438f6b4f0 Finished filters 2020-02-17 10:47:10 +01:00
aignatov-bio 485597a9ef Add front-end part 2020-02-14 12:07:40 +01:00
mlorb 618aa698d5
Merge pull request #2407 from mlorb/ml-sci-4329 
Fix adding too small/big number to input... [SCI-4329]
 2020-02-14 10:40:20 +01:00
mlorb 9f23f11dca
Merge pull request #2410 from mlorb/ml-sci-4309 
Hide pencil for shared inventory [SCI-4309]
 2020-02-13 15:12:17 +01:00
aignatov-bio f36e1cb8f4
Merge pull request #2412 from aignatov-bio/ai-sci-4357-dashboard-general-layout 
General dashboard layout [SCI-4357][SCI-4359]
 2020-02-13 15:10:09 +01:00
aignatov-bio 95c9479f54 Add page title 2020-02-13 14:54:58 +01:00
aignatov-bio a6186fba67 Change break limit 2020-02-13 14:44:59 +01:00
aignatov-bio 87d4c18ff7
Merge pull request #2409 from aignatov-bio/ai-sci-4235-refactor-notifications 
Move notifications to top navbar [SCI-4235]
 2020-02-13 14:32:16 +01:00
aignatov-bio 8e8f21969a Fix markup 2020-02-13 13:55:25 +01:00