134 Commits

Author SHA1 Message Date
Sola
9e77961666 Merge branch 'release/1.3' 1.3 2015-12-27 14:41:04 +08:00
Sola
78beb09ca6 update pom 2015-12-27 14:40:09 +08:00
Sola
caf83b3e70 change block 60,61 to 34,35 2015-12-27 14:37:37 +08:00
Sola
cc3c9d30be Flush cache & some refactors 2015-12-27 11:21:10 +08:00
Sola
710fa28ada fix 'duplicate association path' 2015-12-27 01:06:19 +08:00
Sola
633a3b184a fix 'could not resolve property' 2015-12-27 01:01:33 +08:00
Sola
9c2856e358 add function to query all unsolved 2015-12-27 00:55:07 +08:00
Sola
6483a39b63 fix BM_11 421 room doesn't exists 2015-12-26 17:17:37 +08:00
Sola
ccdffd01d7 add duplicated check for member sign 2015-12-26 15:55:47 +08:00
Sola
1e3a0754a4 fixed issue 'returned null for key' 2015-12-26 15:30:36 +08:00
Sola
1ce14b7d1a member sign 2015-12-26 15:04:44 +08:00
Sola
3e0c907655 improve - subscribe event pop up register links automatically 2015-12-26 00:39:15 +08:00
Sola
a506a7742f better langs 2015-12-23 18:33:20 +08:00
Sola
df0034f2ea refactors 2015-12-23 17:23:54 +08:00
Sola
940bcaad8c update pom 2015-12-23 02:26:29 +08:00
Sola
4ddc2281b4 Merge branch 'feature/ticketpush' into develop 2015-12-23 02:25:59 +08:00
Sola
23f98e1951 ticket push 2015-12-23 02:25:32 +08:00
Sola
25ae59c5e0 Merge branch 'release/1.2' into develop 2015-12-23 02:24:04 +08:00
Sola
e929c69fdb Merge branch 'release/1.2' 2015-12-23 02:23:28 +08:00
Sola
d1956bae82 update pom 2015-12-23 02:21:41 +08:00
Sola
813a4a2b37 update lang 2015-12-23 02:21:16 +08:00
Sola
8f8e9cd620 update lang 2015-12-22 18:14:16 +08:00
Sola
a6cee3a0a6 fix escape issue 2015-12-22 17:56:35 +08:00
Sola
f883c7dbf8 fix aes key 2015-12-22 17:26:37 +08:00
Sola
a7393ea772 update lang 2015-12-22 17:12:01 +08:00
Sola
29cbd4ae86 pre-release 2015-12-22 16:53:22 +08:00
Sola
bad7bdbe45 fix issue that date isn't updated 2015-12-22 16:25:02 +08:00
Sola
0e14911650 add check token api 2015-12-22 01:24:11 +08:00
Sola
37691b71c1 add setpass 2015-12-21 02:30:57 +08:00
Sola
5d4a420a7b fix end date incorrect 2015-12-20 11:56:20 +08:00
Sola
3c4b9bd80a fix java.util.Date cannot be cast to java.lang.Long 2015-12-19 18:58:39 +08:00
Sola
183b3ec8d2 Merge branch 'feature/ticketlog' into develop 2015-12-19 18:44:22 +08:00
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