Code

Dev#3

Code

Open

kruettlip wants to merge 83 commits intomasterCoffeeCodeSwitzerland/ImageDB:masterfrom devCoffeeCodeSwitzerland/ImageDB:devCopy head branch name to clipboard

+57,492-154

Commits

Commits on Mar 15, 2018

• Create .gitignore

  kruettlip

  authored
  42b08b7

  Copy full SHA for 42b08b7

• test file

  frithjofhoppe

  committed
  a2d48db

  Copy full SHA for a2d48db

• removed test

  frithjofhoppe

  committed
  5b05240

  Copy full SHA for 5b05240

• added sql creation-file

  frithjofhoppe

  committed
  46b17b4

  Copy full SHA for 46b17b4

• added DB table-order

  kruettlip

  committed
  9663241

  Copy full SHA for 9663241

• changed config

  frithjofhoppe

  committed
  42c321d

  Copy full SHA for 42c321d

• Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageDB into dev

  frithjofhoppe

  committed
  5c1d4d1

  Copy full SHA for 5c1d4d1

• worked on registration

  frithjofhoppe

  committed
  f80ccb1

  Copy full SHA for f80ccb1

Commits on Mar 16, 2018

• modified login

  frithjofhoppe

  committed
  9af0b8e

  Copy full SHA for 9af0b8e

• modified registration

  frithjofhoppe

  committed
  2ad52d7

  Copy full SHA for 2ad52d7

• modified registration

  frithjofhoppe

  committed
  cc787dd

  Copy full SHA for cc787dd

Commits on Mar 17, 2018

• Add page User => Overview

  frithjofhoppe

  committed
  bd7f49b

  Copy full SHA for bd7f49b

• Add function to get count of galleries and images

  frithjofhoppe

  committed
  3bd9219

  Copy full SHA for 3bd9219

• Add some status messages

  frithjofhoppe

  committed
  35b7ddc

  Copy full SHA for 35b7ddc

Commits on Mar 22, 2018

• fixed spelling failure

  frithjofhoppe

  committed
  8deaf6f

  Copy full SHA for 8deaf6f

• worked on image-gallery

  frithjofhoppe

  committed
  5bfbe82

  Copy full SHA for 5bfbe82

Commits on Mar 27, 2018

• Add possibility to modify user-account

  frithjofhoppe

  committed
  4bf3d98

  Copy full SHA for 4bf3d98

Commits on Mar 29, 2018

• Started to implement the add progress of a gallery

  frithjofhoppe

  committed
  f258c2e

  Copy full SHA for f258c2e

• Add notification on credtentials changed

  frithjofhoppe

  committed
  83fbee7

  Copy full SHA for 83fbee7

Commits on Apr 23, 2018

• Add posibility to delete users

  frithjofhoppe

  committed
  350691e

  Copy full SHA for 350691e

Commits on Apr 25, 2018

• Add the functionality to add a new gallery

  frithjofhoppe

  committed
  ff10d6d

  Copy full SHA for ff10d6d

• Add the functionality to add a new gallery

  frithjofhoppe

  committed
  14d0a2a

  Copy full SHA for 14d0a2a

• working on admin

  kruettlip

  committed
  cf6a011

  Copy full SHA for cf6a011

• Add the functionality to delete a gallery in the user - and gallery-overview

  frithjofhoppe

  committed
  7f18537

  Copy full SHA for 7f18537

• Merge remote-tracking branch 'origin/dev' into dev

  Show description for e99da28
  frithjofhoppe

  committed
  e99da28

  Copy full SHA for e99da28

• Fixed merge conflicts

  frithjofhoppe

  committed
  f0afed3

  Copy full SHA for f0afed3

• Fixed merge conflicts

  frithjofhoppe

  committed
  ba4e159

  Copy full SHA for ba4e159

• Add galleries_edit file

  frithjofhoppe

  committed
  331817c

  Copy full SHA for 331817c

Commits on Apr 26, 2018

• Update imagedb.sql

  Show description for 95821a3
  kruettlip

  authored
  95821a3

  Copy full SHA for 95821a3

• Add edit model to gallery

  frithjofhoppe

  committed
  7c55852

  Copy full SHA for 7c55852

• changed design of galleries in admin-view

  kruettlip

  committed
  aeb4c29

  Copy full SHA for aeb4c29

• Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageDB into dev

  frithjofhoppe

  committed
  8153adf

  Copy full SHA for 8153adf

• Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageDB into dev

  kruettlip

  committed
  f1559b7

  Copy full SHA for f1559b7

• Add the site to show the image from a gallery

  frithjofhoppe

  committed
  7f8765d

  Copy full SHA for 7f8765d

Commits on Apr 27, 2018

• Alteration:

  Show description for 3be290d
  frithjofhoppe

  committed
  3be290d

  Copy full SHA for 3be290d

• Alteration:

  Show description for 0b605d9
  frithjofhoppe

  committed
  0b605d9

  Copy full SHA for 0b605d9

• PHP Doc

  Show description for 6275842
  frithjofhoppe

  committed
  6275842

  Copy full SHA for 6275842

• Alteration:

  Show description for 6208d2e
  frithjofhoppe

  committed
  6208d2e

  Copy full SHA for 6208d2e

• Add fontawesome css and appen icons to input-tags

  frithjofhoppe

  committed
  80c23b5

  Copy full SHA for 80c23b5

Commits on Apr 28, 2018

• Modified gitignore

  frithjofhoppe

  committed
  fc4c1f5

  Copy full SHA for fc4c1f5

• Modified gitignore

  frithjofhoppe

  committed
  6081ce2

  Copy full SHA for 6081ce2

• Modified gitignore

  frithjofhoppe

  committed
  8cdee89

  Copy full SHA for 8cdee89

• Modified gitignore

  frithjofhoppe

  committed
  463ad75

  Copy full SHA for 463ad75

• Test .gitignore

  frithjofhoppe

  committed
  26bf87b

  Copy full SHA for 26bf87b

• Updated imagedb.sql by removing a constraint

  frithjofhoppe

  committed
  949cbdd

  Copy full SHA for 949cbdd

Commits on Apr 30, 2018

• Fixed path issues

  frithjofhoppe

  committed
  795ac92

  Copy full SHA for 795ac92

• Fixed path issues

  frithjofhoppe

  committed
  c533206

  Copy full SHA for c533206

Commits on May 3, 2018

• working on admin-user-edit

  kruettlip

  committed
  8cf01cc

  Copy full SHA for 8cf01cc

• Limited the image types which can be uploaded

  frithjofhoppe

  committed
  77a33d3

  Copy full SHA for 77a33d3

• Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageDB into dev

  frithjofhoppe

  committed
  1e0bf59

  Copy full SHA for 1e0bf59

• Image can now be shown with the lightbox

  frithjofhoppe

  committed
  1499a65

  Copy full SHA for 1499a65

Commits on May 4, 2018

• -Thumbnails have now the same width and height independent of the origin file dimensions

  Show description for 619dbce
  frithjofhoppe

  committed
  619dbce

  Copy full SHA for 619dbce

Commits on May 17, 2018

• administrator user deletion and edit

  kruettlip

  committed
  3b10e39

  Copy full SHA for 3b10e39

Commits on May 18, 2018

• Add sorting by tag

  frithjofhoppe

  committed
  8b5b0dc

  Copy full SHA for 8b5b0dc

• Merge remote-tracking branch 'origin/dev' into dev

  Show description for 9c8126c
  frithjofhoppe

  committed
  9c8126c

  Copy full SHA for 9c8126c

• Add sorting by tag

  frithjofhoppe

  committed
  d27cb9e

  Copy full SHA for d27cb9e

• Add button to remove the sort filter

  frithjofhoppe

  committed
  31c1060

  Copy full SHA for 31c1060

Commits on May 19, 2018

• Replaced ordinary with prepared statements

  frithjofhoppe

  committed
  c4d6d11

  Copy full SHA for c4d6d11

• Add method header

  frithjofhoppe

  committed
  c403d35

  Copy full SHA for c403d35

Commits on May 20, 2018

• Add tag edit/add/delete functionality

  frithjofhoppe

  committed
  120998e

  Copy full SHA for 120998e

• Modified database add column 'CreatorId' in table

  frithjofhoppe

  committed
  aee1709

  Copy full SHA for aee1709

• Updated .simp and .png file

  frithjofhoppe

  committed
  cb47782

  Copy full SHA for cb47782

• Improved sorting of images:

  Show description for 380af73
  frithjofhoppe

  committed
  380af73

  Copy full SHA for 380af73

Commits on May 24, 2018

• removed [0] due to prepared statements

  kruettlip

  committed
  0aa2a07

  Copy full SHA for 0aa2a07

• full administration funcionality done

  kruettlip

  committed
  4993896

  Copy full SHA for 4993896

• Started to add tag functionality

  frithjofhoppe

  committed
  b4fe43d

  Copy full SHA for b4fe43d

• Merge remote-tracking branch 'origin/dev' into dev

  frithjofhoppe

  committed
  027b1c6

  Copy full SHA for 027b1c6

• Create XamppMailSetup.md

  frithjofhoppe

  authored
  b18b0c7

  Copy full SHA for b18b0c7

• Update XamppMailSetup.md

  frithjofhoppe

  authored
  d389da3

  Copy full SHA for d389da3

• Update XamppMailSetup.md

  frithjofhoppe

  authored
  021c193

  Copy full SHA for 021c193

Commits on May 25, 2018

• Reset password with mail delivery

  frithjofhoppe

  committed
  5c78b76

  Copy full SHA for 5c78b76

• Merge remote-tracking branch 'origin/dev' into dev

  frithjofhoppe

  committed
  b6a4254

  Copy full SHA for b6a4254

• Add js to password reset progress

  frithjofhoppe

  committed
  cd42abe

  Copy full SHA for cd42abe

Commits on May 29, 2018

• Merge branch 'master' into dev

  kruettlip

  authored
  a1a2ed0

  Copy full SHA for a1a2ed0

Commits on Jun 7, 2018

• outsourced whole functionality

  kruettlip

  committed
  083cf36

  Copy full SHA for 083cf36

• Add files via upload

  frithjofhoppe

  authored
  8d38234

  Copy full SHA for 8d38234

• Added Change-Request

  Show description for 9e76696
  kruettlip

  authored
  9e76696

  Copy full SHA for 9e76696

• Add files via upload

  frithjofhoppe

  authored
  48a170e

  Copy full SHA for 48a170e

Commits on Jun 9, 2018

• Sace changes

  frithjofhoppe

  committed
  2f4b5f2

  Copy full SHA for 2f4b5f2

• Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageDB into dev

  frithjofhoppe

  committed
  1dd4759

  Copy full SHA for 1dd4759

• Removed obsolet detailstudie

  frithjofhoppe

  committed
  be867b3

  Copy full SHA for be867b3

• Add Detailstudie pdf

  frithjofhoppe

  committed
  ab53f8e

  Copy full SHA for ab53f8e

• changed name

  frithjofhoppe

  committed
  af3749b

  Copy full SHA for af3749b