Commit Graph

  • 1a97658718 Merge branch 'main' of https://dev.azure.com/stockerer/MarmeladenLaden/_git/MarmeladenLaden into main main irisrb 2022-06-04 08:37:40 +02:00
  • 750d5f0b71 app.ts weil iris deppat is irisrb 2022-06-04 08:37:18 +02:00
  • 47130313ff Merged PR 4: add: features contact, about, imprint + minor changes/refactoring Iris Raab 2022-06-04 06:31:36 +00:00
  • 9ab162a8b4 minor changes irisrb 2022-06-02 20:43:59 +02:00
  • c41a7c69c5 added about, contact, imprint irisrb 2022-06-02 20:42:11 +02:00
  • bd5e702782 ordersubmit StockiP 2022-06-02 08:09:40 +02:00
  • dd12b3f6ee added product & shop StockiP 2022-05-23 09:26:57 +02:00
  • 8b0044470e edited dbAccess StockiP 2022-05-12 18:55:45 +02:00
  • f1185ade0c integrated EVERYTHING! StockiP 2022-05-12 18:48:58 +02:00
  • 8e91e4a8f6 changed a lot StockiP 2022-05-02 12:24:22 +02:00
  • 9e28e83146 hm? StockiP 2022-05-02 10:13:28 +02:00
  • 5385fb5b70 changes datahandler & Form StockiP 2022-05-02 10:04:02 +02:00
  • a8d8bccfc0 changed sql statement StockiP 2022-05-02 09:34:35 +02:00
  • 7d9a78bc92 fuck StockiP 2022-05-02 09:21:44 +02:00
  • 4e6af105f5 added logic / Form stuff StockiP 2022-05-02 09:21:19 +02:00
  • 664bf41c91 added logic / Form StockiP 2022-05-02 09:21:13 +02:00
  • b5ca73f018 navigation and pages StockiP 2022-05-01 19:02:52 +02:00
  • 2b4612bf80 deleted app.js StockiP 2022-04-29 16:49:52 +02:00
  • cefac0c252 added stuff in pair programming session StockiP 2022-04-29 16:49:07 +02:00
  • c2789efcdc Merged PR 3: added models Iris Raab 2022-04-29 08:39:33 +00:00
  • 3867575c3a added models irisrb 2022-04-28 20:47:11 +02:00
  • 3e52d6fdbd delete app.js StockiP 2022-04-26 17:54:46 +02:00
  • 4e646b3858 added login modal and registration modal StockiP 2022-04-26 17:54:09 +02:00
  • 5bb598bbcb added login modal & registration modal StockiP 2022-04-26 17:54:01 +02:00
  • fc0f7b29c0 Merged PR 2: added login modal Philip Stockerer 2022-04-25 17:23:18 +00:00
  • 2304b723c5 added login modal StockiP 2022-04-25 19:16:16 +02:00
  • 2324b1988a added some images, added banner and featuredproduc StockiP 2022-04-21 14:44:42 +02:00
  • 32d2d15db4 fixed stuff? StockiP 2022-04-20 22:25:40 +02:00
  • e14a966b07 added modal StockiP 2022-04-20 20:50:13 +02:00
  • ff3af4f005 added modal StockiP 2022-04-20 20:50:09 +02:00
  • 9bb82d2864 reverted changes StockiP 2022-04-20 20:37:22 +02:00
  • 20d478c7fc trying out something StockiP 2022-04-20 20:30:55 +02:00
  • 7f315add85 media queries to css - slight changes to main nav StockiP 2022-04-19 20:47:37 +02:00
  • 863ee03c7a added stuff.... idk StockiP 2022-04-19 20:33:35 +02:00
  • 8aff5f74fe added more components StockiP 2022-04-19 20:26:43 +02:00
  • 6c249df479 added more components, loading via JavaScript StockiP 2022-04-19 20:26:37 +02:00
  • f3218bb1fd i did stupid StockiP 2022-04-19 20:05:44 +02:00
  • 6e84bb3826 test StockiP 2022-04-19 20:03:07 +02:00
  • d5c4ccfb3f changed a LOT StockiP 2022-04-19 20:02:43 +02:00
  • d121a3af3e Merged PR 1: merge landingpage into main Philip Stockerer 2022-04-19 17:28:26 +00:00
  • 07bde5efdf added footer styled StockiP 2022-04-19 19:25:27 +02:00
  • 1efc05e051 added footer StockiP 2022-04-19 19:22:32 +02:00
  • 8a7a272127 added styles for main nav, edited nav.php StockiP 2022-04-19 18:38:07 +02:00
  • a7b601d49c created branch landingpage StockiP 2022-04-19 18:23:53 +02:00
  • 473e155d90 test StockiP 2022-04-19 17:42:08 +02:00
  • 874d897a20 edited some stuff StockiP 2022-04-19 17:42:00 +02:00
  • 252651b6d4 added navbar StockiP 2022-04-19 17:13:58 +02:00
  • fa4d9a202b Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 14:57:49 +00:00
  • 072ef157fd Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:52:44 +00:00
  • 2686b36144 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:50:20 +00:00
  • 76fd0bda71 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:48:54 +00:00
  • 5410fa985e Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:47:41 +00:00
  • e98d7e1b77 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:45:23 +00:00
  • 89d9a64a75 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:43:25 +00:00
  • 082d123c4b Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:39:10 +00:00
  • 439a0ef6c5 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:35:34 +00:00
  • 1e6f6084e0 test StockiP 2022-04-19 15:29:23 +02:00
  • ff9a99dd5f Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:27:58 +00:00
  • caa1610d12 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:25:43 +00:00
  • 219ca08091 pipeline matching now correct? Philip Stockerer 2022-04-19 13:24:15 +00:00
  • 76791b4c3d trying out pattern matching Philip Stockerer 2022-04-19 13:22:35 +00:00
  • ce60d44f2c Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:13:47 +00:00
  • 4706c467ef Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:12:45 +00:00
  • ddbb1076e8 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 13:06:56 +00:00
  • b6c812ad9b testing out ftp upload Philip Stockerer 2022-04-19 13:06:09 +00:00
  • 6d10b944af edited package.json StockiP 2022-04-19 14:56:39 +02:00
  • 1a97a85dcf edited pipeline StockiP 2022-04-19 14:53:01 +02:00
  • 276d80781e edited pipeline StockiP 2022-04-19 14:52:32 +02:00
  • a890dcd177 Merge branch 'main' of https://dev.azure.com/stockerer/MarmeladenLaden/_git/MarmeladenLaden StockiP 2022-04-19 14:51:40 +02:00
  • de2b011cad added build step to scripts StockiP 2022-04-19 14:51:38 +02:00
  • ab67cf4c04 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 12:46:06 +00:00
  • 263635e4d1 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 12:44:34 +00:00
  • 9e9416b049 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 12:32:48 +00:00
  • f5efd100f4 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 12:30:46 +00:00
  • abd31a09a9 Merge branch 'main' of https://dev.azure.com/stockerer/MarmeladenLaden/_git/MarmeladenLaden StockiP 2022-04-19 14:26:54 +02:00
  • 7ffdc9149a test commit StockiP 2022-04-19 14:26:52 +02:00
  • b31531fe11 Update azure-pipelines.yml for Azure Pipelines Philip Stockerer 2022-04-19 12:06:00 +00:00
  • 2dfc9642e4 Merge branch 'main' of https://dev.azure.com/stockerer/MarmeladenLaden/_git/MarmeladenLaden StockiP 2022-04-17 22:37:18 +02:00
  • 3ec17aa13d added some php stuff to try things StockiP 2022-04-17 22:37:16 +02:00
  • a21ebfdd98 Set up CI with Azure Pipelines Philip Stockerer 2022-04-17 20:02:10 +00:00
  • e0408934a9 add: header Test irisrb 2022-04-05 17:14:01 +02:00
  • 07acf9c862 added jQuery dependency. StockiP 2022-04-05 14:53:10 +02:00
  • 73a36e80c1 added some demo files to create folder structure StockiP 2022-04-05 13:03:15 +02:00
  • a2c016e4fb added basic file structure, typescript stuff, css StockiP 2022-04-02 22:55:00 +02:00
  • 2f3757a94c edited the readme. StockiP 2022-04-02 19:08:36 +02:00
  • 97edaad37a Added .gitignore Philip Stockerer 2022-04-02 17:02:23 +00:00
  • 324c23470f Added README.md Philip Stockerer 2022-04-02 17:01:53 +00:00