Commit Graph

152 Commits

Author SHA1 Message Date
Sola
95278ccbb9 ticketlog 2015-12-19 18:41:05 +08:00
Sola
c973f0c63a fix ticket track order 2015-12-19 15:31:35 +08:00
Sola
66c04d42f1 update modify parameter 2015-12-18 20:55:33 +08:00
Sola
b4065be9e1 Merge branch 'develop'
* develop:
  update command modify
2015-12-18 16:31:14 +08:00
Sola
288ac607c8 update command modify 2015-12-18 16:25:40 +08:00
Sola
89f3c5cbca Merge branch 'develop'
* develop:
  update profile link
2015-12-18 16:13:43 +08:00
Sola
6a465ba1e5 update profile link 2015-12-18 16:11:43 +08:00
Sola
05ea96bd9b Merge branch 'develop' 2015-12-18 15:00:16 +08:00
Sola
d85408bcdd Merge branch 'feature/tickettracker' into develop 2015-12-18 14:59:59 +08:00
Sola
def90117e2 tickettracker feature 2015-12-18 14:58:23 +08:00
Sola
a3c36d265c Merge branch 'master' into develop
* master:
  solve 'manage may never expire session' issue
2015-12-18 03:22:50 +08:00
Sola
5ef112711c solve 'manage may never expire session' issue 2015-12-18 03:22:24 +08:00
Sola
b309876428 Merge branch 'develop'
* develop:
  add more information to profile edit
2015-12-18 03:12:40 +08:00
Sola
58381fa3e1 add more information to profile edit 2015-12-18 03:12:20 +08:00
Sola
16135a8158 Merge branch 'develop'
* develop:
  fix incorrect command while submit
2015-12-18 02:49:08 +08:00
Sola
485e80ef5b fix incorrect command while submit 2015-12-18 02:48:40 +08:00
Sola
e861304b7f Merge branch 'master' into develop
* master:
  fix bypass
2015-12-18 02:18:30 +08:00
Sola
d1baddc963 fix bypass 2015-12-18 01:18:45 +08:00
Sola
3a6a2428a2 Merge branch 'develop' 2015-12-18 01:06:19 +08:00
Sola
2d2ec438a7 add bypasswechat debug api 2015-12-18 01:06:04 +08:00
Sola
6aeb1947cd update pom 2015-12-17 23:14:27 +08:00
Sola
931c3f6c0d Merge branch 'develop' 2015-12-17 09:46:20 +08:00
Sola
a91903e6c4 fix parameters order 2015-12-17 09:46:07 +08:00
Sola
7f72d9198c Merge branch 'develop' 2015-12-17 09:43:01 +08:00
Sola
bff0a4af7f add login page url 2015-12-17 09:42:37 +08:00
Sola
1082e75e94 Merge branch 'develop' 2015-12-16 16:57:04 +08:00
Sola
73b2a2fab6 Merge branch 'feature/ticket_lookup' into develop 2015-12-16 16:55:26 +08:00
Sola
45f08b9b36 ticket lookup api 2015-12-16 16:54:45 +08:00
Sola
d518492caa init 2015-12-16 16:38:17 +08:00
Sola
8aee2a047d improve exception handle 2015-12-16 15:57:38 +08:00
Sola
0032e1a1fa Merge branch 'develop' 2015-12-16 03:20:26 +08:00
Sola
805e9c7837 correct register response 2015-12-16 02:36:09 +08:00
Sola
cc9749149e Merge branch 'develop' 2015-12-15 21:35:23 +08:00
Sola
eb24ea4e72 fix header 2015-12-15 21:34:49 +08:00
Sola
1878bdf296 Merge remote-tracking branch 'origin/develop' into develop 2015-12-15 21:32:54 +08:00
Sola
35402b4064 Merge pull request #4 from SolaKun/feature/profilemodify
Feature/profilemodify
2015-12-15 21:31:47 +08:00
Sola
b1fe03b669 Merge branch 'feature/profilemodify' into develop 2015-12-15 21:30:07 +08:00
Sola
b13ec99ddf profile modify command 2015-12-15 21:26:48 +08:00
Sola
fa572b2d36 improve room check 2015-12-15 19:30:53 +08:00
Sola
72d92748f0 init 2015-12-15 17:29:53 +08:00
Sola
5299d06f5f improve login 2015-12-15 16:48:01 +08:00
Sola
005382b0ce Merge pull request #3 from SolaKun/develop
dashboard feature
2015-12-15 15:48:48 +08:00
Sola
17628ce1e1 dashboard feature 2015-12-15 15:46:37 +08:00
Sola
3c570a3f2b Merge pull request #2 from SolaKun/develop
add bypass parameter to login
2015-12-15 15:16:48 +08:00
Sola
13fb43f8d3 add bypass parameter to login 2015-12-15 15:10:42 +08:00
Sola
357cf53608 invalidate session appropriately 2015-12-14 22:53:53 +08:00
Sola
723566c1ee remove operator login 2015-12-14 22:48:32 +08:00
Sola
0cfe01e4d1 refact login command 2015-12-14 21:31:59 +08:00
Sola
7c7a9461b3 token session 2015-12-14 19:15:45 +08:00
Sola
584331329b add other sip 2015-12-13 21:22:49 +08:00