Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge UI Branch #1

Merged
merged 32 commits into from
Feb 25, 2013
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3e568ec
ui initial commit
haoyuan Feb 9, 2013
580d2f6
Initial UI modifications
calvinjia Feb 10, 2013
22343a5
Experimenting with servlets
calvinjia Feb 11, 2013
1db614e
Embedded Jetty with servlets.
calvinjia Feb 11, 2013
6762a3a
twitter bootstrap resources
calvinjia Feb 11, 2013
cf3e3a8
moved around some files
calvinjia Feb 11, 2013
fd911ef
Reverting to working model.
calvinjia Feb 11, 2013
fe30181
Changed jetty version to 7.6.9, added jetty security and webapp libra…
calvinjia Feb 16, 2013
40abb92
some filekeeping and the base for the browse.jsp page
calvinjia Feb 16, 2013
5f1e170
Starting to populate fields
calvinjia Feb 16, 2013
d9c154c
Resolve the merge confict.
haoyuan Feb 19, 2013
e694987
Adding file system browsing servlet and page, updating general info page
calvinjia Feb 19, 2013
742e53c
merge conflict
calvinjia Feb 20, 2013
a221b12
Fix the build and a big.
haoyuan Feb 20, 2013
335d524
Merge branch 'master' into ui
haoyuan Feb 20, 2013
22ba4fe
Merge branch 'master' into ui
haoyuan Feb 20, 2013
f93a5a5
populated some more fields
calvinjia Feb 20, 2013
14e937b
Merge branch 'master' into ui
haoyuan Feb 20, 2013
abf3aef
removed mortbay plugin
calvinjia Feb 21, 2013
dd50352
Format the code a bit.
haoyuan Feb 21, 2013
4bf5263
Changed jetty version to 8.1.9, added JSTL libraries, completed basic…
calvinjia Feb 22, 2013
1f9c507
Merge branch 'master' into ui
haoyuan Feb 22, 2013
2a1c9e1
Changed mortbay library to the eclipse version and added glassfish, c…
calvinjia Feb 22, 2013
900a69d
Merge branch 'ui' of https://github.com/amplab/tachyon into ui
calvinjia Feb 22, 2013
829afd9
merge
haoyuan Feb 22, 2013
35fc4fa
Added debugging in UI, fixed bugs in browsing file system
calvinjia Feb 22, 2013
83f0ad0
tune.
haoyuan Feb 23, 2013
0aca698
Merge branch 'master' into ui
haoyuan Feb 24, 2013
6c2f59f
remove .class from .gitignore. remove unnecessary plugin from pom.xml
haoyuan Feb 24, 2013
101128c
Clean UI branch for merging it back to the master branch.
haoyuan Feb 24, 2013
4a0c8f4
tune ui
haoyuan Feb 25, 2013
143a18e
put jquery locally to avoid long timeout if the system is not connect…
haoyuan Feb 25, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into ui
  • Loading branch information
haoyuan committed Feb 22, 2013

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 1f9c5070d39bac16fd39cfd4d6b5d8742b699bbb

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.