Skip to content

Milestone 0.5#1

Open
Anysysjgw wants to merge 92 commits intocomen:masterfrom
Anysysjgw:master
Open

Milestone 0.5#1
Anysysjgw wants to merge 92 commits intocomen:masterfrom
Anysysjgw:master

Conversation

@Anysysjgw
Copy link

@Anysysjgw Anysysjgw commented Nov 17, 2014

  1. Implement User and Data classes.
  2. But Servlet, Processor and Handler not understood how to implement well, will continue to work on it tonight.

Anysysjgw and others added 30 commits November 16, 2014 22:59
@Anysysjgw
First commit
dbae65f
@Anysysjgw
Update
93db568
@Anysysjgw
Update .gitignore II
f5aeb23
@Anysysjgw
Update again
44c7251
@Anysysjgw
Update again
75b4e0e
@Anysysjgw
Update .gitingore to ignore /build and /upload
aeab3f0
@Anysysjgw
Reverse .gitignore to comen/map's version
7c45355
@Anysysjgw
Implement User and Data classes
712657a
@Anysysjgw
Understand the whole architecture by implementing user's Login
f772a0a
@Anysysjgw
Solve conflict between Anysysjgw/map and comen/map
e95ad2a
@Anysysjgw
Merge branch 'comen-master'
d2ee123
@Anysysjgw
Synchronize from comen/map
d184869
@Anysysjgw
Merge branch 'master' of github.com:comen/map into comen-master
f7a0350
@Anysysjgw
Merge branch 'comen-master'
905b94d
@Anysysjgw
DWZ framework is used
4a846a9
Merge remote with my local version
215756e
Merge branch 'comen-master'
dc8fa5c
Static web pages finished.
dd44559 
Signed-off-by: Shelwin <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Merge branch 'master' of github.com:comen/map into comen-master
68d5f96 
Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebContent/index.jsp
	src/cn/com/chinatelecom/map/process/DataProcessor.java
Practice merge if confilcts
4b50775
Merge with new functions of comen/master
9d303b3
Merge branch 'comen-master'
df7dc30
Dynamic pages partially implemented
0914412 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Save work - Done with Change password & Add user & Edit user.
02f3166 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
30ce804
Newest map code from comen
9f308e0
Merge branch 'comen-master'
6a11ebf
Re-arrange
b2c4ac3
Merge with newest map.jsp & Fix display error of map.jsp
3e101ff
Save work - Change DataProcessor's Logic
0c9fe6f 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
unknown and others added 30 commits December 14, 2014 01:27
Delete record by code and date
e5d1d00 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Move jar to /WebContent/WEB-INF/lib/, and update .gitignore
acbe3f4 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Merge with comen-master, and fix issues of FileUtils.readFile()
410a258
Merge branch 'comen-master'
59c8b1d
Released for Unit Test
389964c 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Change TimeZone to 'Asia/Shanghai', and use BasicDBObject for User/Data
c993b0e 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Display zero in fields for grid that has no sales data
10cd740 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Merge with comen/master to upgrade excel uploading
d047c23
Merge branch 'comen-master'
c329a62
Add authority check for deleting records
767b303 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Merge with comen-master
7060c33
Merge branch 'comen-master'
1f02aeb
Update login.jsp
624b377
Final release
070e769 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Fix xls file uploading error, replace System.out.println with logger,…
9287105 
… add uploadGrid operation

Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Remove uploadGrid
8807cea 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
Modify desc for uploading page, fix issue when searching GridList
8d5e918 
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>
@Anysysjgw
Show friendly message in grid edit page if new grid code already exists
36de1c6 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Add help document
7bc9836 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Update program according to revision suggestion
665990b 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Dialog page modification
481a875 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Add sales data deleting operation
150f3b4 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Add uploadDate field to Data Entity; Add uploadDate to sales data del…
22645f0 
…etion

Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Fix some bugs.
a6b1a12 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Help document added
e76d640 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Help document updated
2b25e94 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Help document modified
77469d3 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Modify timeout settings
f8cb748 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Fix issue of special display in Office/Suboffice level
36281a6 
Signed-off-by: swei019 <1158048493@qq.com>
@Anysysjgw
Fix issue of grid's special display in week/month level
6b1f44b 
Signed-off-by: swei019 <1158048493@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Anysysjgw