Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
0288e24
remove error
lockys Feb 17, 2016
e076579
fix conflict
lockys Feb 17, 2016
b48b4f2
basic template for api
qoojung Feb 21, 2016
7e45d10
basic api key check impl
qoojung Feb 21, 2016
792621f
modify main page's description.
lockys Feb 22, 2016
3ae0dcf
refactor directory.
lockys Feb 22, 2016
0a1f5cb
Merge pull request #6 from hsnl-dev/lockys-dev-branch
lockys Feb 22, 2016
581b1f9
user models and create user api draft.
lockys Feb 22, 2016
cf99901
remove useless deps
lockys Feb 22, 2016
67cd358
basic db impl
qoojung Feb 23, 2016
6aa1a6a
basic verification code impl
qoojung Feb 23, 2016
df8caa2
basic r/w interaction with mongolab in accounts.
lockys Feb 23, 2016
1f68fcc
update/delete/get accounts.
lockys Feb 23, 2016
1cacb8e
template of API
lockys Feb 23, 2016
ce0bd63
Merge pull request #7 from hsnl-dev/lockys-dev-branch
Feb 23, 2016
1087556
add api usage.
lockys Feb 23, 2016
068622f
contact list implementation
lockys Feb 23, 2016
3dda322
Merge pull request #9 from hsnl-dev/lockys-dev-branch
lockys Feb 23, 2016
9105bfc
token authenication
qoojung Feb 23, 2016
ed400ad
Merge pull request #10 from hsnl-dev/henry-basic-token
Feb 23, 2016
0eb973d
code refactor, add routes of RESTful API of /accounts.
lockys Feb 23, 2016
d3d2d3b
add token verify
qoojung Feb 23, 2016
e7ca2fd
add delete route and tokenreq annotation
qoojung Feb 24, 2016
b9a363a
Merge pull request #12 from hsnl-dev/henry-dev-token-2
Feb 24, 2016
7ece200
Merge branch 'dev-branch' of https://github.com/lockys/voicein-web-se…
lockys Feb 24, 2016
09c97d9
unify coding style.
lockys Feb 24, 2016
6bdb7ae
Merge pull request #11 from hsnl-dev/lockys-dev-branch
lockys Feb 24, 2016
5dc3c55
calling API with okhttp
lockys Feb 24, 2016
a6a1484
upload basic
qoojung Feb 24, 2016
4a01517
Merge pull request #13 from hsnl-dev/lockys-dev-branch
lockys Feb 24, 2016
0499695
sms check and upload file to tmp file
qoojung Feb 24, 2016
6c4b948
fix conflict
qoojung Feb 24, 2016
b646d2e
fix the hard coding of calling API.
lockys Feb 24, 2016
7661937
Downloading QRCode image from s3 is added.
lockys Feb 24, 2016
3e83348
generate QRCode image with random uuid and upload to s3.
lockys Feb 25, 2016
ee6982c
fix conflict
qoojung Feb 25, 2016
deabc8c
finish avatar upload
qoojung Feb 25, 2016
c7b3c8d
Merge pull request #15 from hsnl-dev/henry-dev-branch-sms
Feb 25, 2016
e6b5c1b
fix confilct
lockys Feb 25, 2016
6ab0bd2
cs
lockys Feb 25, 2016
d4e8afa
Merge pull request #16 from hsnl-dev/lockys-dev-branch
lockys Feb 25, 2016
f18a0bc
add qrCodeUuid to User collection.
lockys Feb 25, 2016
0d3c0e4
Merge pull request #17 from hsnl-dev/lockys-dev-branch
lockys Feb 25, 2016
1a93e0a
netbeans autu-format
lockys Feb 25, 2016
3e56794
Merge pull request #18 from hsnl-dev/lockys-dev-branch
lockys Feb 25, 2016
cc68d3f
rm nb-action.xml
lockys Feb 25, 2016
1b465eb
Merge pull request #19 from hsnl-dev/lockys-dev-branch
lockys Feb 25, 2016
6c0c699
code refactor and icon basic upload impl
qoojung Feb 26, 2016
632851d
add icon feature, pom update
qoojung Feb 26, 2016
7b5b327
Merge pull request #20 from hsnl-dev/henry-dev
Feb 26, 2016
33b294c
add icon route
qoojung Feb 27, 2016
7fa1a9a
add error response and add avatar route
qoojung Feb 27, 2016
e0b4f91
handle error msg
qoojung Feb 27, 2016
5165e37
Merge pull request #22 from hsnl-dev/henry-dev
Feb 27, 2016
b78f8f9
hotfix
qoojung Feb 27, 2016
1825eb2
Merge pull request #23 from hsnl-dev/henry-dev
Feb 27, 2016
181653c
auto-format
lockys Feb 27, 2016
0a4988c
update readme
lockys Feb 27, 2016
00c8934
Merge pull request #24 from hsnl-dev/lockys-dev-branch
lockys Feb 27, 2016
0e64387
add usage, modify icon routing
lockys Feb 27, 2016
68684a3
Merge pull request #25 from hsnl-dev/lockys-dev-branch
lockys Feb 28, 2016
4d53449
update readme
lockys Feb 28, 2016
30b57c9
Merge pull request #26 from hsnl-dev/lockys-dev-branch
lockys Feb 28, 2016
1efd609
code refator, token required, api key added
qoojung Mar 1, 2016
7896056
Merge pull request #27 from hsnl-dev/henry-dev
Mar 1, 2016
39107db
add apikey authenication
qoojung Mar 1, 2016
285b56e
Merge pull request #28 from hsnl-dev/henry-dev
Mar 1, 2016
8fd4f10
add api/v1/validations/ sandbox route
lockys Mar 1, 2016
e611355
Merge pull request #29 from hsnl-dev/lockys-dev-branch
lockys Mar 1, 2016
482ab93
change the mechanism of create new contact.
lockys Mar 1, 2016
21abf8a
Merge pull request #30 from hsnl-dev/lockys-dev-branch
lockys Mar 1, 2016
5b49908
fix sanbox route
lockys Mar 1, 2016
eed2bcf
Merge pull request #31 from hsnl-dev/lockys-dev-branch
lockys Mar 1, 2016
61f5122
modify contact-related API
lockys Mar 1, 2016
d7e0836
add Contact, User Model Validation.
lockys Mar 2, 2016
b03c18d
add type field to Contact.
lockys Mar 2, 2016
2ea2c4f
add field validation.
lockys Mar 2, 2016
4e55e8d
Merge pull request #32 from hsnl-dev/lockys-dev-branch
lockys Mar 2, 2016
81ba24c
tinyfix of user model validation.
lockys Mar 2, 2016
cefceee
update put API.
lockys Mar 2, 2016
c26a157
Merge pull request #33 from hsnl-dev/lockys-dev-branch
lockys Mar 2, 2016
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
eclipse-launch-profiles/
lib/
target/
nb-configuration.xml
*.iml
13 changes: 13 additions & 0 deletions .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
3 changes: 3 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding/<project>=UTF-8
8 changes: 8 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
9 changes: 9 additions & 0 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="gae-jersey-jackson-objectify">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<property name="context-root" value="gae-jersey-jackson-objectify"/>
<property name="java-output-path" value="/gae-jersey-jackson-objectify/target/gae-jersey-jackson-objectify-1.0/WEB-INF/classes"/>
</wb-module>
</project-modules>
7 changes: 7 additions & 0 deletions .settings/org.eclipse.wst.common.project.facet.core.prefs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<root>
<facet id="jst.jaxrs">
<node name="libprov">
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
</node>
</facet>
</root>
8 changes: 8 additions & 0 deletions .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.7"/>
<installed facet="jst.web" version="2.5"/>
<installed facet="jst.jaxrs" version="2.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.container
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.name
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Window
2 changes: 2 additions & 0 deletions .settings/org.eclipse.wst.validation.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
disabled=06target
eclipse.preferences.version=1
19 changes: 19 additions & 0 deletions nb-configuration.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
</properties>
</project-shared-configuration>
55 changes: 0 additions & 55 deletions nbactions.xml

This file was deleted.

Loading