Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: OPTIC-277: Move LSE to Monorepo frontend #5184

Merged
merged 122 commits into from
Feb 8, 2024
Merged

feat: OPTIC-277: Move LSE to Monorepo frontend #5184

Changes from 1 commit
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
b25b233
fix: LEAP-1: Start migration to monorepo (#4731)
juliosgarbi Sep 28, 2023
c984dac
feat: LEAP-47: Move datamanager into the monorepo (#4737)
juliosgarbi Sep 28, 2023
e1e0c4e
feat: LEAP-53: Move editor into the monorepo (#4870)
juliosgarbi Oct 18, 2023
5decbe6
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Oct 27, 2023
24fb8f7
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 1, 2023
f06d850
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Nov 1, 2023
11b2b31
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Nov 2, 2023
85d2562
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Nov 6, 2023
20bf775
feat: LEAP-324: Return builds files to LS monorepo (#4997)
juliosgarbi Nov 6, 2023
d5bffe7
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 7, 2023
e358cd8
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Nov 7, 2023
e62ec1d
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Nov 8, 2023
80a6266
fix: LEAP-347: LSF running as standalone app (#5022)
juliosgarbi Nov 9, 2023
40ac7e9
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 9, 2023
c271290
feat: LEAP-54: Move editor e2e tests to the new LS monorepo (#5028)
juliosgarbi Nov 15, 2023
b3401f0
chore: LEAP-50: Update makefile to work with current state of monorep…
Gondragos Nov 16, 2023
4db6a80
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 16, 2023
4d01c3a
feat: LEAP-239: Move ls-frontend-test to monorepo and make cypress te…
juliosgarbi Nov 20, 2023
64cef8c
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 20, 2023
2521775
feat: LEAP-56: Update package scripts to run units e2e and integratio…
juliosgarbi Nov 20, 2023
cefe26f
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 20, 2023
3a33b23
feat: LEAP-325: Implement a mechanism to toggle between the current s…
juliosgarbi Nov 21, 2023
b675217
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 21, 2023
d335d22
ci: CI TEST monorepo (#5064)
robot-ci-heartex Nov 22, 2023
7c9048f
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 22, 2023
a8ff87d
feat: LEAP-379: Add docs to monorepo (#5074)
juliosgarbi Nov 22, 2023
86f73c6
fix: LEAP-409: Update files to match with monorepo monorepo (#5073)
robot-ci-heartex Nov 23, 2023
af167cd
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 23, 2023
3f78429
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Nov 23, 2023
3f33c82
ci: TEST monorepo (#5079)
robot-ci-heartex Nov 23, 2023
0444560
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 23, 2023
89ed52f
fix: LEAP-420: Update README.md and update env files (#5081)
juliosgarbi Nov 24, 2023
8c8e718
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 24, 2023
4f3a6a6
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Nov 24, 2023
53f8257
fix: LEAP-E-1: Merge with development (#5086)
juliosgarbi Nov 24, 2023
350132e
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Nov 24, 2023
694ab41
add post install and change the build to production node_env
juliosgarbi Nov 28, 2023
d69765d
fix annotation not being displayed at the first view in the task
juliosgarbi Nov 28, 2023
1df1e74
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Dec 4, 2023
f62c2cc
fix: LEAP-346: Rework org token to use get_random_string instead of h…
juliosgarbi Dec 4, 2023
937c2f2
fix wasm audio deps copy
bmartel Dec 5, 2023
4adc019
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Dec 6, 2023
e5bd5f1
fix standalone lsf
juliosgarbi Dec 6, 2023
8400577
Merge branch 'develop' of https://github.com/HumanSignal/label-studio…
juliosgarbi Dec 6, 2023
9bd5ed0
merge conflicts
juliosgarbi Dec 6, 2023
54dc8c9
fix standalone and watch method
juliosgarbi Dec 6, 2023
25f54fa
fix unit tests
juliosgarbi Dec 6, 2023
3b1e1dd
fix: OPTIC-341: CSS inconsistencies which cause conflicts in MonoRepo…
robot-ci-heartex Dec 8, 2023
137e98d
adding the ability to override the app js scripts from overriding tem…
bmartel Dec 8, 2023
32e37ea
fix: OPTIC-341: Incorrect icon width causing layout issues with TabPa…
robot-ci-heartex Dec 8, 2023
218e0be
commit dist folder
juliosgarbi Dec 11, 2023
c871cb6
merge
farioas Dec 11, 2023
a058d59
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 11, 2023
0d6d758
add configurations to build options
bmartel Dec 11, 2023
7eec7fa
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 11, 2023
e05bbd8
update editor files
juliosgarbi Dec 11, 2023
89840c3
Merge branch 'fb-leap-452' of https://github.com/HumanSignal/label-st…
juliosgarbi Dec 11, 2023
b2b6bdb
remove console.log
juliosgarbi Dec 11, 2023
e9b33e6
ci: fix job
farioas Dec 11, 2023
931bd3e
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 11, 2023
57efcf5
update datamanager and eraser tool svg id
juliosgarbi Dec 11, 2023
c5b6a15
Merge branch 'fb-leap-452' of https://github.com/HumanSignal/label-st…
juliosgarbi Dec 11, 2023
9ed4665
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 11, 2023
18b184e
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 11, 2023
3293269
Merge branch 'fb-leap-452' of https://github.com/HumanSignal/label-st…
juliosgarbi Dec 11, 2023
28b5692
remove console.log
juliosgarbi Dec 11, 2023
d60f268
Merge remote-tracking branch 'origin/develop' into fb-leap-e-1
bmartel Dec 11, 2023
b8be456
use run-many for production builds for faster parallel execution, fix…
bmartel Dec 11, 2023
e72ad83
move xpath-range to dependencies
bmartel Dec 11, 2023
dc22dd8
change release file to work with poetry
juliosgarbi Dec 12, 2023
bb0a1c3
add toml and update yarn lock
juliosgarbi Dec 12, 2023
237e117
Merge branch 'fb-leap-e-1' of https://github.com/HumanSignal/label-st…
juliosgarbi Dec 12, 2023
1579c39
merge with leap-e-1
juliosgarbi Dec 12, 2023
b750dc0
Test docker build without node-gyp
hlomzik Dec 12, 2023
3f60d6a
Merge branch 'fb-leap-452' of https://github.com/HumanSignal/label-st…
juliosgarbi Dec 12, 2023
41f3cea
fix docker file
juliosgarbi Dec 12, 2023
9cbbfbb
add toml
bmartel Dec 13, 2023
2e2ede5
Merge remote-tracking branch 'origin/develop' into fb-optic-277
bmartel Dec 13, 2023
ad3bed4
change the yarn packageManager
juliosgarbi Dec 13, 2023
caad3b5
Merge remote-tracking branch 'origin/fb-leap-452' into fb-optic-277
bmartel Dec 13, 2023
fbc9bfc
same yarn as LSE
juliosgarbi Dec 13, 2023
2144ce1
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 13, 2023
444c49e
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 13, 2023
53a7ee2
test short build
farioas Dec 13, 2023
8a48e99
restore dockerfile
farioas Dec 13, 2023
09de618
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 14, 2023
6ee674f
test cross compile
farioas Dec 14, 2023
3a9f869
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 14, 2023
2960a8b
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 14, 2023
99d12f6
Merge branch 'fb-leap-452' of https://github.com/HumanSignal/label-st…
juliosgarbi Dec 14, 2023
d997d73
add monorepo env variable set to true
juliosgarbi Dec 14, 2023
ab7da47
Merge remote-tracking branch 'origin/develop' into fb-leap-452
farioas Dec 14, 2023
edd0553
Merge remote-tracking branch 'origin/fb-leap-452' into fb-optic-277
bmartel Dec 15, 2023
24189d0
allow a package.json and yarn.lock to be placed within shared libs
bmartel Dec 18, 2023
c3edb76
[submodule] Copy src label studio frontend to monorepo editor
bmartel Dec 21, 2023
90e9227
[submodule] Copy src datamanager to monorepo datamanager
bmartel Dec 21, 2023
94302b6
taxonomy option for click expansion was incorrect
bmartel Dec 21, 2023
dd89e3c
Merge remote-tracking branch 'origin/develop' into fb-optic-277
bmartel Jan 9, 2024
804114c
ci: Build frontend
robot-ci-heartex Jan 9, 2024
7a5d244
linting
bmartel Jan 9, 2024
edeeeb6
Merge branch 'fb-optic-277' of github.com:heartexlabs/label-studio in…
bmartel Jan 9, 2024
cd33a12
Merge remote-tracking branch 'origin/develop' into fb-optic-277
bmartel Jan 10, 2024
a2bc427
ci: Build frontend
robot-ci-heartex Jan 10, 2024
8a39607
this option conflicts and produces incorrect behaviour
bmartel Jan 10, 2024
311c44c
ci: Build frontend
robot-ci-heartex Jan 10, 2024
2f393b3
Merge remote-tracking branch 'origin/develop' into fb-optic-277
bmartel Jan 10, 2024
34a8d32
Merge branch 'fb-optic-277' of github.com:heartexlabs/label-studio in…
bmartel Jan 10, 2024
21b7252
update label-studio
bmartel Jan 10, 2024
8c04f12
not needed, unsure why this was even changed
bmartel Jan 10, 2024
5596c34
Merge remote-tracking branch 'origin/develop' into fb-optic-277
bmartel Jan 12, 2024
14be053
ci: Build frontend
robot-ci-heartex Jan 12, 2024
ab04e91
Merge remote-tracking branch 'origin/develop' into fb-optic-277
bmartel Jan 22, 2024
9146792
ci: Build frontend
robot-ci-heartex Jan 22, 2024
0ecf5ef
don't commit lib package or lock files if they exist
bmartel Jan 22, 2024
740af1c
Merge branch 'fb-optic-277' of github.com:heartexlabs/label-studio in…
bmartel Jan 22, 2024
2710b99
ci: Build frontend
robot-ci-heartex Jan 22, 2024
17f11e0
Merge branch 'develop' into fb-optic-277
yyassi-heartex Jan 23, 2024
7659da2
ci: Build frontend
robot-ci-heartex Jan 23, 2024
5757a56
Merge branch 'develop' into fb-optic-277
yyassi-heartex Jan 30, 2024
9ea2758
ci: Build frontend
robot-ci-heartex Jan 30, 2024
159fe7a
Merge branch 'develop' into fb-optic-277
yyassi-heartex Feb 8, 2024
bdce882
ci: Build frontend
robot-ci-heartex Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/develop' into fb-optic-277
  • Loading branch information
@bmartel
bmartel committed Jan 22, 2024
commit ab04e91271f9f7fbe415c234f36c676777208504

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.