Code

Merge UI Branch#1

Code

Merged

haoyuan merged 32 commits intomasterAlluxio/alluxio:masterfrom uiAlluxio/alluxio:uiCopy head branch name to clipboardFeb 25, 2013

+655-73

Commits

Commits on Feb 9, 2013

• ui initial commit

  haoyuan

  committed
  3e568ec

Commits on Feb 10, 2013

• Initial UI modifications

  calvinjia

  committed
  580d2f6

Commits on Feb 11, 2013

• Experimenting with servlets

  calvinjia

  committed
  22343a5

• Embedded Jetty with servlets.

  calvinjia

  committed
  1db614e

• twitter bootstrap resources

  calvinjia

  committed
  6762a3a

• moved around some files

  calvinjia

  committed
  cf3e3a8

• Reverting to working model.

  calvinjia

  committed
  fd911ef

Commits on Feb 16, 2013

• Changed jetty version to 7.6.9, added jetty security and webapp libraries for UI, added mortbay jetty plugin for UI

  calvinjia

  committed
  fe30181

• some filekeeping and the base for the browse.jsp page

  calvinjia

  committed
  40abb92

• Starting to populate fields

  calvinjia

  committed
  5f1e170

Commits on Feb 19, 2013

• Resolve the merge confict.

  haoyuan

  committed
  d9c154c

• Adding file system browsing servlet and page, updating general info page

  calvinjia

  committed
  e694987

Commits on Feb 20, 2013

• merge conflict

  calvinjia

  committed
  742e53c

• Fix the build and a big.

  haoyuan

  committed
  a221b12

• Merge branch 'master' into ui

  haoyuan

  committed
  335d524

• Merge branch 'master' into ui

  haoyuan

  committed
  22ba4fe

• populated some more fields

  calvinjia

  committed
  f93a5a5

• Merge branch 'master' into ui

  haoyuan

  committed
  14e937b

Commits on Feb 21, 2013

• removed mortbay plugin

  calvinjia

  committed
  abf3aef

• Format the code a bit.

  haoyuan

  committed
  dd50352

Commits on Feb 22, 2013

• Changed jetty version to 8.1.9, added JSTL libraries, completed basic UI features

  calvinjia

  committed
  4bf5263

• Merge branch 'master' into ui

  haoyuan

  committed
  1f9c507

• Changed mortbay library to the eclipse version and added glassfish, code styling changes

  calvinjia

  committed
  2a1c9e1

• Merge branch 'ui' of https://github.com/amplab/tachyon into ui

  calvinjia

  committed
  900a69d

• merge

  haoyuan

  committed
  829afd9

• Added debugging in UI, fixed bugs in browsing file system

  calvinjia

  committed
  35fc4fa

Commits on Feb 23, 2013

• tune.

  haoyuan

  committed
  83f0ad0

Commits on Feb 24, 2013

• Merge branch 'master' into ui

  haoyuan

  committed
  0aca698

• remove .class from .gitignore. remove unnecessary plugin from pom.xml

  haoyuan

  committed
  6c2f59f

• Clean UI branch for merging it back to the master branch.

  haoyuan

  committed
  101128c

Commits on Feb 25, 2013

• tune ui

  haoyuan

  committed
  4a0c8f4

• put jquery locally to avoid long timeout if the system is not connected to the internet.

  haoyuan

  committed
  143a18e