Skip to content
Snippets Groups Projects
  1. Mar 29, 2023
  2. Mar 24, 2023
  3. Mar 23, 2023
  4. Mar 22, 2023
  5. Mar 21, 2023
  6. Mar 17, 2023
  7. Mar 15, 2023
  8. Mar 14, 2023
  9. Mar 12, 2023
  10. Mar 10, 2023
    • Dan Duran's avatar
      Fixed compile bug · 6b12a6f2
      Dan Duran authored
      6b12a6f2
    • Dan Duran's avatar
    • Dan Duran's avatar
      Merge remote-tracking branch 'origin/sprint2' into origin/Katex_Support · 0454b594
      Dan Duran authored
      # Conflicts:
      #	.gradle/7.3.3/executionHistory/executionHistory.bin
      #	.gradle/7.3.3/executionHistory/executionHistory.lock
      #	.gradle/7.3.3/fileHashes/fileHashes.bin
      #	.gradle/7.3.3/fileHashes/fileHashes.lock
      #	.gradle/7.3.3/fileHashes/resourceHashesCache.bin
      #	.gradle/buildOutputCleanup/buildOutputCleanup.lock
      #	.gradle/buildOutputCleanup/outputFiles.bin
      #	.gradle/file-system.probe
      #	application/build.gradle.kts
      #	application/build/classes/kotlin/main/module-info.class
      #	application/build/classes/kotlin/main/net/codebot/application/Main.class
      #	application/build/classes/merged/module-info.class
      #	application/build/classes/merged/net/codebot/application/FolderView.class
      #	application/build/classes/merged/net/codebot/application/Main.class
      #	application/build/kotlin/application100jar-classes.txt
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
      #	application/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
      #	application/build/kotlin/compileKotlin/cacheable/last-build.bin
      #	application/build/kotlin/compileKotlin/localstate/build-history.bin
      #	application/build/libs/application-1.0.0.jar
      #	application/build/tmp/compileJava/previous-compilation-data.bin
      #	application/src/main/java/module-info.java
      #	application/src/main/kotlin/net/codebot/application/Main.kt
      #	console/build/kotlin/compileKotlin/cacheable/last-build.bin
      #	console/build/kotlin/compileKotlin/localstate/build-history.bin
      #	console/build/libs/console-1.0.0.jar
      #	shared/build/kotlin/compileKotlin/cacheable/last-build.bin
      #	shared/build/kotlin/compileKotlin/localstate/build-history.bin
      #	shared/build/kotlin/shared100jar-classes.txt
      #	shared/build/libs/shared-1.0.0.jar
      0454b594
    • Dan Duran's avatar
    • Simon Wang's avatar
      Merge branch '33-store-user-config-file-locally' into 'sprint2' · 33e90e4a
      Simon Wang authored
      Redo the User Config Function
      
      See merge request !17
      33e90e4a
    • Simon Wang's avatar
      Merge branch '33-store-user-config-file-locally' into 'main' · 948ec5fa
      Simon Wang authored
      Re-Implemented the User Config Files
      
      Closes #33
      
      See merge request !16
      948ec5fa
Loading