Code

Merge#8

Code

Merged

thecodeholic merged 37 commits intothecodeholic:masterthecodeholic/Angular-Lobiadmin:masterfrom GiorgiB97:masterGiorgiB97/Angular-Lobiadmin:masterCopy head branch name to clipboardJun 6, 2017

+2,145-190

Commits

Commits on May 12, 2017

• App improved

  Show description for 33a17f3
  GiorgiB97

  committed
  33a17f3

  Copy full SHA for 33a17f3

• App improved

  Show description for b9c80e6
  GiorgiB97

  committed
  b9c80e6

  Copy full SHA for b9c80e6

Commits on May 16, 2017

• Merge branch 'master' of https://github.com/arboshiki/Angular-Lobiadmin

  Show description for 076ab36
  GiorgiB97

  committed
  076ab36

  Copy full SHA for 076ab36

• Generated empty module - chat

  GiorgiB97

  committed
  6ca36f8

  Copy full SHA for 6ca36f8

• om-aside improved

  Show description for 11602ea
  GiorgiB97

  committed
  11602ea

  Copy full SHA for 11602ea

• default.less : added styling for chatAside

  GiorgiB97

  committed
  cfaf407

  Copy full SHA for cfaf407

• file-manager.less : changed styling for Aside menus

  GiorgiB97

  committed
  c531ae1

  Copy full SHA for c531ae1

• chatAside improved

  GiorgiB97

  committed
  06ae4e8

  Copy full SHA for 06ae4e8

• Chat module basic interface created

  GiorgiB97

  committed
  e2fa86e

  Copy full SHA for e2fa86e

• Chatting interface created, Contacts added, Dummy data added

  Show description for ee94086
  GiorgiB97

  committed
  ee94086

  Copy full SHA for ee94086

Commits on May 17, 2017

• Chat JSON files recreated.

  Show description for 8a4295a
  GiorgiB97

  committed
  8a4295a

  Copy full SHA for 8a4295a

• Bug Fix: Chats are now changing on click

  GiorgiB97

  committed
  010dfca

  Copy full SHA for 010dfca

Commits on May 18, 2017

• Chatting views, accordions added

  Show description for b71384f
  GiorgiB97

  committed
  b71384f

  Copy full SHA for b71384f

Commits on May 19, 2017

• Added Message sending function

  Show description for 03a2270
  GiorgiB97

  committed
  03a2270

  Copy full SHA for 03a2270

Commits on May 22, 2017

• Side menu added in chat

  GiorgiB97

  committed
  ecfbd9c

  Copy full SHA for ecfbd9c

• Chat greatly improved

  Show description for 1af6a92
  GiorgiB97

  committed
  1af6a92

  Copy full SHA for 1af6a92

• Merge branch 'master' of https://github.com/arboshiki/Angular-Lobiadmin

  GiorgiB97

  committed
  2d768f4

  Copy full SHA for 2d768f4

• Merge remote-tracking branch 'origin/master' into chat

  Show description for 75d122e
  GiorgiB97

  committed
  75d122e

  Copy full SHA for 75d122e

• Chat deletion promt with lobibox

  GiorgiB97

  committed
  aa40c49

  Copy full SHA for aa40c49

Commits on May 23, 2017

• Chat name editing added

  Show description for 94bc404
  GiorgiB97

  committed
  94bc404

  Copy full SHA for 94bc404

• Small bug fix

  GiorgiB97

  committed
  ec4867d

  Copy full SHA for ec4867d

• Fixed user search

  Show description for b655d63
  GiorgiB97

  committed
  b655d63

  Copy full SHA for b655d63

Commits on May 24, 2017

• Merge pull request #6 from GiorgiB97/chat

  Show description for 7a3d15b
  GiorgiB97

  authored
  7a3d15b

  Copy full SHA for 7a3d15b

• Generated empty module contacts

  Show description for d524682
  GiorgiB97

  committed
  d524682

  Copy full SHA for d524682

• Added contact view, dummy contacts and styled cards

  GiorgiB97

  committed
  e6e3f3e

  Copy full SHA for e6e3f3e

Commits on May 25, 2017

• Added contact filtering

  Show description for 4a54dbd
  GiorgiB97

  committed
  4a54dbd

  Copy full SHA for 4a54dbd

• Filter background color fixed and border-bottom added

  GiorgiB97

  committed
  106187f

  Copy full SHA for 106187f

Commits on May 29, 2017

• Merge pull request #9 from GiorgiB97/chat

  Show description for 2702b18
  thecodeholic

  authored
  2702b18

  Copy full SHA for 2702b18

• Improving chat layout

  thecodeholic

  committed
  9dddfcf

  Copy full SHA for 9dddfcf

• Merge pull request #7 from arboshiki/chat

  Show description for 402af08
  GiorgiB97

  authored
  402af08

  Copy full SHA for 402af08

• Chat redesigned, layout and code improved

  GiorgiB97

  committed
  872a0ce

  Copy full SHA for 872a0ce

Commits on Jun 5, 2017

• Chat message box (textarea) auto increase in gulp watch

  Show description for c05a098
  GiorgiB97

  committed
  c05a098

  Copy full SHA for c05a098

• Merge pull request #8 from GiorgiB97/chat

  Show description for 8e4a506
  GiorgiB97

  authored
  8e4a506

  Copy full SHA for 8e4a506

• Merge pull request #9 from GiorgiB97/contacts

  Show description for ed382f0
  GiorgiB97

  authored
  ed382f0

  Copy full SHA for ed382f0

• Chat i18n added

  GiorgiB97

  committed
  7851495

  Copy full SHA for 7851495

• Calendar i18n added

  GiorgiB97

  committed
  a547682

  Copy full SHA for a547682

• Contacts i18n added

  GiorgiB97

  committed
  3b3d934

  Copy full SHA for 3b3d934