Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
madjin committed Dec 18, 2024
2 parents cfa38c9 + 8cd5d9f commit 608786c
Show file tree
Hide file tree
Showing 15 changed files with 22,357 additions and 3,460 deletions.
3,723 changes: 3,723 additions & 0 deletions data/contributors_2024_12-17.json

Large diffs are not rendered by default.

4,279 changes: 2,409 additions & 1,870 deletions data/daily/combined.json

Large diffs are not rendered by default.

325 changes: 104 additions & 221 deletions data/daily/commits.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,108 @@
[
{
"sha": "81d027327ebba82ef3ed473d0e914c90e18e362d",
"message": "Merge pull request #1165 from ai16z/fix/start_script\n\nfeat: make script dash compatible",
"committedDate": "2024-12-17T09:08:56Z",
"author": {
"user": {
"login": "shakkernerd"
}
},
"additions": 34,
"deletions": 24,
"changedFiles": 1
},
{
"sha": "a2a079510c0a9f5cd0471b37fbca206fbf42bc90",
"message": "feat: make script dash compatible",
"committedDate": "2024-12-17T09:06:49Z",
"author": {
"user": {
"login": "shakkernerd"
}
},
"additions": 34,
"deletions": 24,
"changedFiles": 1
},
{
"sha": "ea14167a66da4d892802fffa94b474d61daf63bc",
"message": "chore: update changelog",
"committedDate": "2024-12-17T07:18:55Z",
"author": {
"user": {
"login": "actions-user"
}
},
"additions": 13,
"deletions": 0,
"changedFiles": 1
},
{
"sha": "2216ae868b37bcb78f83e8f362f59178a3b478b7",
"message": "Merge pull request #1159 from ai16z/new_version\n\nchore: bump version to 0.1.6-alpha.4",
"committedDate": "2024-12-17T07:17:15Z",
"author": {
"user": {
"login": "shakkernerd"
}
},
"additions": 46,
"deletions": 46,
"changedFiles": 46
},
{
"sha": "2e44768f31f38e0abac443f22fbd0819c6a485a9",
"message": "chore: bump version to 0.1.6-alpha.4",
"committedDate": "2024-12-17T07:16:37Z",
"author": {
"user": {
"login": "shakkernerd"
}
},
"additions": 46,
"deletions": 46,
"changedFiles": 46
},
{
"sha": "798d34c4af979754b88d83d3f354bdbc742af26d",
"message": "Merge pull request #1158 from ai16z/fix/client-twitter\n\nfix: client twitter login and auth handler",
"committedDate": "2024-12-17T07:15:16Z",
"author": {
"user": {
"login": "shakkernerd"
}
},
"additions": 77,
"deletions": 54,
"changedFiles": 1
},
{
"sha": "4111f3f557a109464b41b1533cbba2bd7106035e",
"message": "fix: client twitter login and auth handler",
"committedDate": "2024-12-17T07:11:12Z",
"author": {
"user": {
"login": "shakkernerd"
}
},
"additions": 77,
"deletions": 54,
"changedFiles": 1
},
{
"sha": "65ba827b034508310e7e0c368fc7f9e1b6da46aa",
"message": "chore: fix broken pnpm lockfile",
"committedDate": "2024-12-17T04:16:22Z",
"author": {
"user": {
"login": "shakkernerd"
}
},
"additions": 17935,
"deletions": 22902,
"changedFiles": 1
},
{
"sha": "ed33650a236d3799ba881020ceefcc7f27eb3579",
"message": "chore: update changelog",
Expand Down Expand Up @@ -453,226 +557,5 @@
"additions": 77035,
"deletions": 48588,
"changedFiles": 658
},
{
"sha": "105025a59c7f2d688cd1188f4e63cfacdd858243",
"message": "Merge pull request #1141 from owlcode/clean-newlines-from-new-tweets\n\nclean newlines for new tweet",
"committedDate": "2024-12-16T21:03:45Z",
"author": {
"user": {
"login": "monilpat"
}
},
"additions": 4,
"deletions": 1,
"changedFiles": 1
},
{
"sha": "db9580d9b65b653fed51a6c6fe926417746f37b3",
"message": "clean newlines for new tweet",
"committedDate": "2024-12-16T20:28:31Z",
"author": {
"user": {
"login": "owlcode"
}
},
"additions": 4,
"deletions": 1,
"changedFiles": 1
},
{
"sha": "f2217efc6057786fb4795587000567717179bb96",
"message": "fix tg duplicate functions.",
"committedDate": "2024-12-16T20:17:09Z",
"author": {
"user": {
"login": "azep-ninja"
}
},
"additions": 5,
"deletions": 18,
"changedFiles": 1
},
{
"sha": "1815030635ed62db4aca744e9c22de5f38eb13c8",
"message": "remove docker compose command since Docker file already runs",
"committedDate": "2024-12-16T20:00:14Z",
"author": {
"user": {
"login": "rarepepi"
}
},
"additions": 0,
"deletions": 1,
"changedFiles": 1
},
{
"sha": "9348c979b85ffad34890fb053f54e8c6e477a038",
"message": "Merge pull request #1136 from erise133/feat/handlebars-templating-engine\n\nfeat: add support for handlebars templating engine as an option",
"committedDate": "2024-12-16T17:47:33Z",
"author": {
"user": {
"login": "monilpat"
}
},
"additions": 279,
"deletions": 25,
"changedFiles": 5
},
{
"sha": "4b98e2bb96381ec58178775070cb73ffec65dd71",
"message": "feat: after CR, removing long example",
"committedDate": "2024-12-16T17:31:39Z",
"author": {
"user": {
"login": null
}
},
"additions": 0,
"deletions": 33,
"changedFiles": 1
},
{
"sha": "bb5c4a31d8bce81e612e9fdb50bcbea0102d47b4",
"message": "feat: document advanced usage in md file",
"committedDate": "2024-12-16T17:29:37Z",
"author": {
"user": {
"login": null
}
},
"additions": 64,
"deletions": 23,
"changedFiles": 1
},
{
"sha": "fe71a15437e72eddf4e96dcf84d1a03f345029d1",
"message": "feat: add support for handlebars templating engine as an option",
"committedDate": "2024-12-16T16:44:48Z",
"author": {
"user": {
"login": null
}
},
"additions": 248,
"deletions": 2,
"changedFiles": 4
},
{
"sha": "6453e6257ca154f6c478fe8cba0e4e0b29d84376",
"message": "added FOMO createToken action in plugin-solana",
"committedDate": "2024-12-16T16:12:30Z",
"author": {
"user": {
"login": null
}
},
"additions": 632,
"deletions": 0,
"changedFiles": 3
},
{
"sha": "d0ea22056b26c335b933f5249004a51f7800db1a",
"message": "Merge pull request #1131 from MbBrainz/main\n\nAdd `chatapi.akash.network` to available list of model providers (FREE LLAMA API ACCESS!)",
"committedDate": "2024-12-16T15:40:44Z",
"author": {
"user": {
"login": "monilpat"
}
},
"additions": 33,
"deletions": 0,
"changedFiles": 4
},
{
"sha": "a0c49d861d0f75855a3030cef5da4ceea7e09d3c",
"message": "Merge pull request #1133 from n00b21337/fix/add_example_chars\n\nfix: fix the name",
"committedDate": "2024-12-16T15:39:41Z",
"author": {
"user": {
"login": "monilpat"
}
},
"additions": 0,
"deletions": 0,
"changedFiles": 1
},
{
"sha": "9ac30b1252ab762cb34698c9c05c78db189f9553",
"message": "Merge branch 'develop' into main",
"committedDate": "2024-12-16T15:36:06Z",
"author": {
"user": {
"login": "MbBrainz"
}
},
"additions": 68877,
"deletions": 45994,
"changedFiles": 550
},
{
"sha": "6ecd894a64827b8d91558a5f893172a623a6ec7a",
"message": "add new file name",
"committedDate": "2024-12-16T10:52:05Z",
"author": {
"user": {
"login": "n00b21337"
}
},
"additions": 98,
"deletions": 0,
"changedFiles": 1
},
{
"sha": "a920af946719e24580fd011f69849a534aa0d17d",
"message": "fix name",
"committedDate": "2024-12-16T10:48:48Z",
"author": {
"user": {
"login": "n00b21337"
}
},
"additions": 0,
"deletions": 98,
"changedFiles": 1
},
{
"sha": "aea64d4567db69434928ee66597ef2e6599cfcef",
"message": "Merge branch 'main' of http://github.com/ai16z/eliza into develop",
"committedDate": "2024-12-16T09:49:49Z",
"author": {
"user": {
"login": "lalalune"
}
},
"additions": 0,
"deletions": 0,
"changedFiles": 1
},
{
"sha": "14240832b88774b7d0a0adc211a3e5a7738e2204",
"message": "update banner",
"committedDate": "2024-12-16T09:49:26Z",
"author": {
"user": {
"login": "lalalune"
}
},
"additions": 0,
"deletions": 0,
"changedFiles": 1
},
{
"sha": "de87bfaa308091ff14ff488f5a446cf72b8904c4",
"message": "add chatapi by akash network to model configs",
"committedDate": "2024-12-16T08:19:45Z",
"author": {
"user": {
"login": "MbBrainz"
}
},
"additions": 33,
"deletions": 0,
"changedFiles": 4
}
]
Loading

0 comments on commit 608786c

Please sign in to comment.