Code

Carlotta branch#8

Code

Open

Totta-Git wants to merge 77 commits intomimuc:mastermimuc/mememuc-template:masterfrom karin-lu:Carlotta-Branchkarin-lu/meme-generator:Carlotta-BranchCopy head branch name to clipboard

+6,959-1,164

Commits

Commits on Dec 5, 2022

• npm install

  karin-lu

  committed
  0dc7add

Commits on Jan 17, 2023

• Create WYSIWYG_editor.js

  Totta-Git

  committed
  227e78d

• WYSIWYG_editor vers 2

  Totta-Git

  committed
  232714e

Commits on Jan 20, 2023

• create_comment

  sast5859

  committed
  0172f1b

Commits on Jan 21, 2023

• nav bar

  karin-lu

  committed
  dcea0d7

• Delete footer.jsx

  karin-lu

  committed
  43369bb

Commits on Jan 23, 2023

• Merge pull request #1 from karin-lu/karin_test4

  Show description for c238922
  karin-lu

  authored
  c238922

Commits on Jan 27, 2023

• Delete OLD WYSIWYG Editor

  Totta-Git

  committed
  d19b5ed

Commits on Jan 28, 2023

• back improvment

  sast5859

  committed
  9db9377

Commits on Feb 4, 2023

• add post,get functions

  sast5859

  committed
  6ed0e72

• Merge branch 'master' into sam_Test

  sast5859

  authored
  309df1b

• adding front to back code

  sast5859

  committed
  fd80d65

Commits on Feb 5, 2023

• initial changes

  karin-lu

  committed
  e34f5c6

• Merge pull request #2 from karin-lu/karin_test5

  Show description for bf0abf1
  karin-lu

  authored
  bf0abf1

• update discover page

  karin-lu

  committed
  a6c9185

• post component

  Show description for 2ab92af
  karin-lu

  committed
  2ab92af

Commits on Feb 6, 2023

• Merge branch 'master' into karin_test5

  karin-lu

  committed
  fe40258

• scrollable div

  karin-lu

  committed
  19a81e0

• sticky nav and post component changes

  karin-lu

  committed
  648a0b5

• Merge pull request #4 from karin-lu/karin_test7

  Show description for 816eb57
  karin-lu

  authored
  816eb57

Commits on Feb 7, 2023

• STEP 1: Create Page Figma to React

  Show description for dc4f1c2
  Totta-Git

  committed
  dc4f1c2

• Comment: Terminology of Figma with explanations

  Show description for 3641264
  Totta-Git

  committed
  3641264

Commits on Feb 8, 2023

• STEP 2: Improved code but still buggy

  Totta-Git

  committed
  ce463de

• STEP 3: Meme Editor vers 2 (Youtube video)

  Show description for 5163016
  Totta-Git

  committed
  5163016

• Merge branch 'sam_Test' of https://github.com/karin-lu/meme-generator into sam_Test

  sast5859

  committed
  8b68b7e

• Merge pull request #5 from karin-lu/sam_Test

  Show description for 9d9e284
  sast5859

  authored
  9d9e284

• Merge branch 'master' into sam_Test

  sast5859

  committed
  f7685fe

Commits on Feb 10, 2023

• STEP 4: Edit Text and movable (To complete)

  Totta-Git

  committed
  37b6cea

• STEP 5: Finished the Video Tutorial

  Totta-Git

  committed
  3af854b

Commits on Feb 12, 2023

• update

  sast5859

  committed
  0693f23

Commits on Feb 13, 2023

• hello

  sast5859

  committed
  8a5ea62

• hello

  sast5859

  committed
  9d0fae0

Commits on Feb 16, 2023

• discover page

  sast5859

  committed
  d4c0863

• Merge pull request #6 from karin-lu/Sam_Test2

  Show description for fb0f46a
  sast5859

  authored
  fb0f46a

• Create Update

  Totta-Git

  committed
  f9d7a54

• Create Update Fine tuning 1

  Totta-Git

  committed
  1439d53

• Merge branch 'master' into Carlotta-Branch

  Totta-Git

  authored
  07931ff

• Merge pull request #7 from karin-lu/Carlotta-Branch

  Show description for 0353c1f
  Totta-Git

  authored
  0353c1f

• Update package.json

  Totta-Git

  committed
  7967249

• Merge pull request #8 from karin-lu/Carlotta-Branch

  Show description for 94d680f
  Totta-Git

  authored
  94d680f

Commits on Feb 21, 2023

• add post and comments mechanism

  sast5859

  committed
  41c6630

• resolved comments issue

  sast5859

  committed
  98308e4

• Improved Layout of the Create Page (still to improve)

  Totta-Git

  committed
  85717db

• Small Update of the create layout

  Totta-Git

  committed
  afd1428

• Image upload from device, Image upload from URL, Take a Picture from device

  Totta-Git

  committed
  5a6316a

Commits on Feb 22, 2023

• Complete Task 5 - To improve point 1 and 3

  Totta-Git

  committed
  3cdc1d0

• likes bug

  sast5859

  committed
  88352ba

• login ?

  sast5859

  committed
  930ba36

• can create comments on post

  sast5859

  committed
  431b455

• login and sign up functions

  karin-lu

  committed
  fc15b86

• login layout

  karin-lu

  committed
  3119ae5

• colour change

  karin-lu

  committed
  7e7da65

• EDITOR: Need to implement The change between the templates

  Totta-Git

  committed
  7cda26a

• Changed the URL image upload (To Do: Switch Buttons for Templates)

  Totta-Git

  committed
  569ae6c

Commits on Feb 23, 2023

• TO DO: Improve Switch Buttons and maintain changes when switching

  Totta-Git

  committed
  fe8d228

• Merge branch 'sam_Test'

  sast5859

  committed
  768b294

• login and signup done

  sast5859

  committed
  af19f0f

• Merge pull request #10 from karin-lu/sam_Test

  Show description for 9669606
  sast5859

  authored
  9669606

• gethistory done

  sast5859

  committed
  5112b85

Commits on Feb 24, 2023

• ToDo: "Keep already entered text or other settings"

  Totta-Git

  committed
  52dece4

• Merge branch 'master' into Carlotta-Branch

  Totta-Git

  authored
  438e160

• Merge pull request #11 from karin-lu/Carlotta-Branch

  Show description for 912e90d
  Totta-Git

  authored
  912e90d

• Changed the App.js (NO LOGIN)

  Totta-Git

  committed
  6547bea

• SOLVED: Keep already entered text or other settings

  Totta-Git

  committed
  39fc6c2

• part 2

  sast5859

  committed
  44f0535

• Grid with 5 memes per row

  Totta-Git

  committed
  8d269b7

• Merge pull request #12 from karin-lu/Carlotta-Branch

  Show description for e484282
  Totta-Git

  authored
  e484282

• login bug

  sast5859

  committed
  8f98bae

• login

  karin-lu

  committed
  ff5db4e

• editor and styles changes

  karin-lu

  committed
  f63d3aa

• Design final tuning

  Totta-Git

  committed
  88db3f3

• Merge pull request #13 from karin-lu/Carlotta-Branch

  Show description for 3401470
  Totta-Git

  authored
  3401470

• mongoserver

  sast5859

  committed
  4b435a7

• Merge branch 'master' of https://github.com/karin-lu/meme-generator

  sast5859

  committed
  74c8ba8

• Merge branch 'sam_Test'

  sast5859

  committed
  819e398

• Re-labeling and Save Button

  Totta-Git

  committed
  ebb3c39

• Merge branch 'master' into Carlotta-Branch

  Totta-Git

  authored
  90932db