Merge branch 'milad-master'
79dee598b2df
Actions

Authored by lintool <jimmylin@umd.edu> on Oct 1 2013, 18:27.

Description

Merge branch 'milad-master'

Committed

lintool <jimmylin@umd.edu>

Oct 1 2013, 18:27

Pushed

dportabella

Oct 19 2016, 16:29

Parents

Branches

Unknown

Tags

Unknown

lintool <jimmylin@umd.edu> committed R1473:79dee598b2df: Merge branch 'milad-master' (authored by lintool <jimmylin@umd.edu>).Oct 1 2013, 18:27

Commit	Author	Details	Committed
127a533cf731	milad621	fixed a baseurl problem	Sep 24 2013
c27fb0fb72d9	milad621	A bug with swf files fixed	Sep 20 2013
8706a55f8e36	milad621	header (navigation bar?) added. Pom update	Sep 17 2013
dc20e4fc805f	milad621	header (navigation bar?) added	Sep 17 2013
24cf7be01bea	milad621	Some url bugs with senate data fixed. A few code refactoring done	Aug 17 2013
392b5d139973	milad621	Some urls fixed. House is OK now	Aug 16 2013
e7a88b5211bb	milad621	urls	Aug 15 2013
55b82f3dcb61	milad621	urls	Aug 15 2013
142aa0c8a34f	milad621	urls	Aug 15 2013
1331620ce670	milad621	urls	Aug 15 2013
ecb3d1dd7e6d	milad621	urls	Aug 15 2013
bb3985aec41a	milad621	urls	Aug 15 2013
9e729d1fc54f	milad621	urls	Aug 15 2013
4f7ad0cbd161	milad621	urls	Aug 15 2013
45b62820e8ca	milad621	urls	Aug 15 2013
d0d442b95fad	milad621	urls	Aug 15 2013
b08e35a91dc0	milad621	urls	Aug 15 2013
24d59470fd5e	milad621	urls	Aug 15 2013
8c2223aca070	milad621	urls	Aug 15 2013
211d4536f4c2	milad621	urls	Aug 15 2013
b293db10c799	milad621	urls for house fixed	Aug 14 2013

		Path
M		pom.xml
D		src/main/java/org/warcbase/ResponseRecord.java
V		src/main/java/org/warcbase/{ → data}/TextDocument2.java
V		src/main/java/org/warcbase/{ → data}/Util.java
D		src/main/java/org/warcbase/WarcHTMLResponseRecord.java
V		src/main/java/org/warcbase/{ → data}/WarcRecord.java
M		src/main/java/org/warcbase/analysis/DetectDuplicates.java
M		src/main/java/org/warcbase/browser/WarcBrowser.java
M		src/main/java/org/warcbase/browser/servlet/WarcbaseServlet.java
A	(dir)	src/main/java/org/warcbase/data/
A		src/main/java/org/warcbase/data/HttpResponseRecord.java
V		src/main/java/org/warcbase/{data ← }/TextDocument2.java
V		src/main/java/org/warcbase/{data ← }/Util.java
V		src/main/java/org/warcbase/{data ← }/WarcRecord.java
M		src/main/java/org/warcbase/ingest/IngestWarcFiles.java
D		src/main/java/org/warcbase/warcRecordParser.java
A	(dir)	src/main/webapp/images/
A		src/main/webapp/images/wm_tb_bk_trns.png
A		src/main/webapp/images/wm_tb_close.png
A		src/main/webapp/images/wm_tb_nxt_on.png
A		src/main/webapp/images/wm_tb_prv_on.png