Sander
|
0b28a5a719
|
Merge branch 'eunji-fix-icons' into 'dev'
fix icons
See merge request ligolang/ligo!110
|
2019-09-30 15:29:27 +00:00 |
|
Sander Spies
|
fad72a680c
|
Tuning.
|
2019-09-30 17:27:10 +02:00 |
|
keiki
|
323efb9383
|
fix icons
|
2019-09-30 16:39:21 +02:00 |
|
Sander
|
879884f3b3
|
Merge branch 'homepage-improvements-2' into 'dev'
Homepage improvements 2
See merge request ligolang/ligo!109
|
2019-09-30 14:32:02 +00:00 |
|
Sander Spies
|
c71c246194
|
Homepage improvements
|
2019-09-30 15:50:10 +02:00 |
|
Tom Jack
|
650d8b32db
|
Merge branch 'build-deps-no-dev' into 'dev'
Always run setup_repos.sh, never setup_dev_switch.sh, upon `make build-deps`
See merge request ligolang/ligo!100
|
2019-09-30 13:21:43 +00:00 |
|
Sander
|
23c9aebf2e
|
Merge branch 'feature/homepage-syntax-highlighting' into 'dev'
Feature/homepage syntax highlighting
See merge request ligolang/ligo!107
|
2019-09-30 10:35:07 +00:00 |
|
Sander Spies
|
8e95b6e4ce
|
Merge
|
2019-09-30 11:56:08 +02:00 |
|
Sander
|
1cdfa797cb
|
Merge branch 'header-footer' into 'dev'
Header footer
See merge request ligolang/ligo!105
|
2019-09-30 09:50:53 +00:00 |
|
Sander Spies
|
59c13dc4ce
|
merge
|
2019-09-28 23:28:19 +02:00 |
|
Sander Spies
|
cb00dd2eac
|
Fix pascaligo highlighting.
|
2019-09-28 23:26:49 +02:00 |
|
Sander Spies
|
4f409cfa1f
|
Add syntax highlighting for Cameligo.
|
2019-09-28 18:06:11 +02:00 |
|
Sander Spies
|
5749123bf6
|
Add syntax highlighting for Cameligo.
|
2019-09-28 18:00:56 +02:00 |
|
keiki
|
128519e281
|
header and footer changes except hamburger menu
|
2019-09-28 16:01:44 +02:00 |
|
Sander Spies
|
9487d21536
|
- Prevent jumping around of elements.
- Set a maximum width for the content.
- Enlarge certain elements for mobile
|
2019-09-28 12:36:42 +02:00 |
|
Sarah Fowler
|
9455d871a1
|
[LIGO-93] redesign profile pics
|
2019-09-27 19:10:48 +02:00 |
|
Rémi Lesenechal
|
bfb2ea6dc4
|
Merge branch 'feature/LIGO-100-map-tests' into 'dev'
Feature/ligo 100 map tests
See merge request ligolang/ligo!99
|
2019-09-27 15:52:40 +00:00 |
|
Rémi Lesenechal
|
6850d21650
|
Feature/ligo 100 map tests
|
2019-09-27 15:52:40 +00:00 |
|
Sander
|
210bd665c0
|
Merge branch 'rinderknecht-dev' into 'dev'
Fixing scanning of integers, removing keywords `storage` and `entrypoint` from PascaLIGO
See merge request ligolang/ligo!94
|
2019-09-27 15:47:56 +00:00 |
|
Christian Rinderknecht
|
889a4d643d
|
Forgot to fully resolved conflict due to removal of keyword fail.
|
2019-09-27 17:08:07 +02:00 |
|
Christian Rinderknecht
|
8257c5e6fe
|
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
|
2019-09-27 17:07:36 +02:00 |
|
Sarah Fowler
|
1023e6c557
|
Merge branch 'css-fixes' into 'dev'
Minor css fixes
See merge request ligolang/ligo!101
|
2019-09-27 14:50:40 +00:00 |
|
Sarah Fowler
|
909dc43dc5
|
Minor css fixes
|
2019-09-27 10:11:05 -04:00 |
|
Tom Jack
|
8e8824c74a
|
Always run setup_repos.sh, never setup_dev_switch.sh, upon make build-deps
|
2019-09-27 08:43:57 -05:00 |
|
Christian Rinderknecht
|
85f267540b
|
Merge branch 'feature/ligodity_shared_parser' into 'dev'
Refactor Ligodity parser to use shared parser.
See merge request ligolang/ligo!65
|
2019-09-27 13:33:25 +00:00 |
|
Sander
|
5bcf3cae6e
|
Refactor Ligodity parser to use shared parser.
|
2019-09-27 13:33:25 +00:00 |
|
Christian Rinderknecht
|
81868ca3b2
|
Merge branch 'rinderknecht-dev' of gitlab.com:ligolang/ligo into rinderknecht-dev
|
2019-09-27 14:36:59 +02:00 |
|
Christian Rinderknecht
|
814a37b477
|
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
|
2019-09-27 14:35:47 +02:00 |
|
Christian Rinderknecht
|
e5e9fb8e2f
|
Merge branch 'dev' into 'rinderknecht-dev'
# Conflicts:
# src/passes/1-parser/pascaligo/AST.ml
# src/passes/1-parser/pascaligo/AST.mli
# src/passes/1-parser/pascaligo/ParToken.mly
|
2019-09-27 11:47:59 +00:00 |
|
Christian Rinderknecht
|
fa4a7cecdf
|
Removed entrypoint. Added back missing error message (string cat).
|
2019-09-27 13:44:29 +02:00 |
|
Gabriel Alfour
|
0c6f233507
|
Merge branch 'feature/auto-field-annotations' into 'dev'
Generate field annotations for sum/record
See merge request ligolang/ligo!78
|
2019-09-27 07:34:51 +00:00 |
|
Gabriel Alfour
|
ebf699cde7
|
Merge branch 'feature/failwith-typed' into 'dev'
Feature/failwith typed
See merge request ligolang/ligo!98
|
2019-09-26 20:25:46 +00:00 |
|
Tom Jack
|
de057bc318
|
Merge branch 'feature/tez-fix' into 'dev'
Add a little bit of tez tests, fix cameligo lexer bug
See merge request ligolang/ligo!97
|
2019-09-26 19:08:07 +00:00 |
|
Sarah Fowler
|
e1503e40ad
|
Merge branch 'site-redesign-init' into 'dev'
[LIGO-91] Add redesign colors, typography, padding, fonts
See merge request ligolang/ligo!84
|
2019-09-26 18:32:27 +00:00 |
|
Tom Jack
|
6fc1b6430b
|
Add a little bit of tez tests, fix cameligo lexer bug
|
2019-09-26 13:31:37 -05:00 |
|
galfour
|
7974469159
|
remove fail
|
2019-09-26 19:30:17 +02:00 |
|
Sarah Fowler
|
519a445a05
|
Merge branch 'LIGO-94-feature-cards' into 'site-redesign-init'
[LIGO 94] Redesign feature cards
See merge request ligolang/ligo!89
|
2019-09-26 17:21:18 +00:00 |
|
galfour
|
ef2f6060d5
|
deprecate fail
|
2019-09-26 19:13:25 +02:00 |
|
galfour
|
08809f8a5d
|
type failwith
|
2019-09-26 19:01:07 +02:00 |
|
galfour
|
e0e5228254
|
failwith test
|
2019-09-26 18:47:46 +02:00 |
|
galfour
|
c4a4942b09
|
minor merge
|
2019-09-26 11:39:35 -05:00 |
|
Tom Jack
|
09496ce4ca
|
Generate field annotations for sum/record
|
2019-09-26 11:39:35 -05:00 |
|
Tom Jack
|
43e75e186b
|
Merge branch 'new-menhir' into 'dev'
Lose another opam battle
See merge request ligolang/ligo!96
|
2019-09-26 16:38:33 +00:00 |
|
Tom Jack
|
be201a5109
|
Lose another opam battle
|
2019-09-26 10:59:18 -05:00 |
|
Sarah Fowler
|
9a1fb0fb81
|
Merge branch 'site-redesign-init' into LIGO-94-feature-cards
|
2019-09-26 11:35:28 -04:00 |
|
Sarah Fowler
|
6cd5f66148
|
[LIGO-94] minor css fix
|
2019-09-26 11:34:57 -04:00 |
|
Sarah Fowler
|
560a93c657
|
Merge branch 'LIGO-95-layout' into 'LIGO-94-feature-cards'
[LIGO-95] Layout and top section
See merge request ligolang/ligo!92
|
2019-09-26 15:33:21 +00:00 |
|
Sarah Fowler
|
581ebf2b7f
|
Merge branch 'LIGO-92-buttons' into 'site-redesign-init'
[LIGO-92] button styles
See merge request ligolang/ligo!85
|
2019-09-26 15:33:01 +00:00 |
|
Christian Rinderknecht
|
68ff421b7d
|
Merge remote-tracking branch 'origin/dev' into rinderknecht-dev
|
2019-09-26 17:11:08 +02:00 |
|
Christian Rinderknecht
|
ca1471612f
|
Merge branch 'pascaligo-tests' into 'dev'
Add Pascaligo tests for not kwd, (commented out) procedure and for loop
See merge request ligolang/ligo!95
|
2019-09-26 15:09:37 +00:00 |
|