Commit Graph
41 Commits
Author SHA1 Message Date
WMJ 22d11da345 再次合并 2017-05-04 22:01:30 +08:00
WMJ 5268c877eb 合并: 2017-05-04 21:59:21 +08:00
WMJ 00d97a164d 分享按钮 2017-05-04 21:57:05 +08:00
YouDad c9a922cf06 修改了一下app的style和标题栏的设置
标题栏的设置在MainActivity.java的OnCreate()方法中实现
在setContext之前
2017-05-04 21:54:17 +08:00
WMJ eb4a3728e6 我也不知道为什么提交 2017-05-02 20:24:35 +08:00
WMJ 4dee0c0fa8 烦 2017-05-02 20:20:12 +08:00
YouDad ba50737a76 Merge remote-tracking branch 'origin/dev' into dev 2017-05-02 20:15:52 +08:00
YouDad 7c88f49f51 同步了一下schedule fragment代码 2017-05-02 20:15:24 +08:00
TurnMeOn cd3515b712 ! 2017-05-02 17:34:38 +08:00
TurnMeOn ea53217fc5 Grouplist file 2017-05-02 17:33:23 +08:00
YouDad 74a145fd39 修正日期错误bug 2017-05-01 23:07:09 +08:00
WMJ bc5e86069a +添加活动的界面除了成员控制 2017-04-29 21:39:06 +08:00
WMJ da31e7b67e 我也不知道这是啥 2017-04-29 15:41:30 +08:00
WMJ 6ea89ab5b2 清除垃圾 2017-04-28 19:10:06 +08:00
WMJ 3391e7f8a6 = = 2017-04-28 19:09:17 +08:00
WMJ 03c26d5e68 active 2017-04-28 19:05:21 +08:00
TurnMeOn 4dc4f40457 ??? 2017-04-27 17:58:29 +08:00
TurnMeOn 0da69d8d12 Add group-query function 2017-04-27 17:57:23 +08:00
TurnMeOn 16d1564759 Fixed xml error 2017-04-27 17:00:25 +08:00
TurnMeOn a4df65bfc7 Change age to birthday in 'person-information.xml' 2017-04-27 16:32:45 +08:00
TurnMeOn 44bfa27176 ??? 2017-04-27 16:22:05 +08:00
TurnMeOn 77efca8d91 Improve age 2017-04-27 00:41:43 +08:00
TurnMeOn ffe914fccf lalala 2017-04-26 23:29:08 +08:00
TurnMeOn 29fa5a98f0 Merge branch 'dev' of https://github.com/WeSayAll/TimeManager into dev 2017-04-26 23:27:48 +08:00
TurnMeOn b707892e3c balabala 2017-04-26 23:27:36 +08:00
TurnMeOn 040248048b ~~~ 2017-04-26 23:02:53 +08:00
TurnMeOn de1272d665 ~~ 2017-04-26 23:02:16 +08:00
YouDad 141ccf0000 Update todo.md
just like this
2017-04-26 15:40:36 +08:00
WMJ a9f1d0fad9 更新plan 2017-04-25 20:03:55 +08:00
WMJ 47a5b06bf8 第一个次合并代码 2017-04-25 19:42:55 +08:00
WMJ 71d16852f7 修正Fragment为v4.Fragment 2017-04-25 19:40:37 +08:00
WMJ a90b5d6588 Merge branch 'dev' of github.com:WeSayAll/TimeManager into dev
必要性
2017-04-25 19:35:04 +08:00
WMJ a18899be35 加入课程对话框 2017-04-25 19:34:41 +08:00
YouDad 08aae655b2 Fix some warning. 2017-04-25 19:29:55 +08:00
YouDad 48ff81eb41 Merge Successed.
Don't forget the original data in the code before using.
The original data in the function:'initializing()'.
2017-04-25 18:52:03 +08:00
WMJ 9e78e26c42 合并代码成功 2017-04-24 20:40:11 +08:00
WMJ 93fb4b8e67 活动基础列表 2017-04-22 12:24:44 +08:00
WMJ a82412f1d4 xml文件模块完成 2017-04-21 11:52:50 +08:00
WMJ 3f6fe23eda test 2017-04-21 09:32:50 +08:00
WMJ 8dc2b70262 通用工具包 2017-04-21 08:51:15 +08:00
WMJ 64b2936636 ~ 2017-04-18 17:19:02 +08:00