Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | network has fixed and can reach settingsAct | Goblin911 | 2013-08-26 |
| | |||
* | Merge branch 'master' of ssh://github.com/Determinant/piztor | Goblin911 | 2013-08-26 |
|\ | |||
| * | Merge branch 'master' of github.com:Determinant/piztor | Teddy | 2013-08-26 |
| |\ | |||
| * | | ... | Teddy | 2013-08-26 |
| | | | |||
| * | | ... | Teddy | 2013-08-26 |
| | | | |||
* | | | fix some bugs of socket thread | Goblin911 | 2013-08-26 |
| |/ |/| | |||
* | | Merge branch 'master' of ssh://github.com/Determinant/piztor | Goblin911 | 2013-08-26 |
|\ \ | |||
| * | | add basic touch controller | sjtufs | 2013-08-26 |
| | | | |||
| * | | update ui | sjtufs | 2013-08-26 |
| |/ | |||
| * | removed redundant code | Teddy | 2013-08-26 |
| | | |||
* | | add error token jump! | Goblin911 | 2013-08-26 |
|/ | |||
* | Merge branch 'master' of ssh://github.com/Determinant/piztor | Goblin911 | 2013-08-26 |
|\ | |||
| * | fixed a bug in server | Teddy | 2013-08-26 |
| | | |||
| * | Merge branch 'master' of github.com:Determinant/piztor | Teddy | 2013-08-26 |
| |\ | |||
| * | | ptp v0.4 and std-compliant server | Teddy | 2013-08-26 |
| | | | |||
* | | | add new network, but userinfo need to rewrite. | Goblin911 | 2013-08-26 |
| |/ |/| | |||
* | | init | Goblin911 | 2013-08-26 |
| | | |||
* | | test | Goblin911 | 2013-08-26 |
|/ | |||
* | cleaned hidden files | Teddy | 2013-08-26 |
| | |||
* | purged the repo | Teddy | 2013-08-26 |
| | |||
* | ptp fixed | Teddy | 2013-08-25 |
| | |||
* | ... | goblin911 | 2013-08-25 |
| | |||
* | Merge branch 'master' of https://github.com/Determinant/piztor | goblin911 | 2013-08-25 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class client/Piztor/bin/classes/com/macaroon/piztor/R$id.class client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class client/Piztor/bin/classes/com/macaroon/piztor/R$string.class client/Piztor/gen/com/macaroon/piztor/R.java client/Piztor/res/values/strings.xml client/bin/classes/com/macaroon/piztor/ActStatus.class client/bin/classes/com/macaroon/piztor/EmptyStatus.class client/bin/classes/com/macaroon/piztor/Setting.class client/src/com/macaroon/piztor/AppMgr.java client/src/com/macaroon/piztor/Setting.java | ||
| * | restructured the project | Teddy | 2013-08-25 |
| | | |||
| * | removed obsolete dir | Teddy | 2013-08-25 |
| | | |||
| * | ptp v3.0a fixed | Teddy | 2013-08-25 |
| | | |||
| * | ptp v3.0a & server timeout support | Teddy | 2013-08-25 |
| | | |||
| * | place the lastest server files in the correct location | Teddy | 2013-08-25 |
| | | |||
| * | Merge branch 'master' of github.com:Determinant/piztor | Teddy | 2013-08-25 |
| |\ | |||
| | * | add main activity ui logic | sjtufs | 2013-08-25 |
| | | | |||
| | * | Alpha version & fix name | sjtufs | 2013-08-25 |
| | | | |||
| | * | This is alpha | sjtufs | 2013-08-25 |
| | | | |||
| * | | ptp v0.3 and std-compliant new server! | Teddy | 2013-08-25 |
| |/ | |||
| * | ptp: add TODO | Teddy | 2013-08-25 |
| | | |||
| * | ptp v0.2 | Teddy | 2013-08-25 |
| | | |||
| * | ptp revised | Teddy | 2013-08-25 |
| | | |||
* | | Main is working.... | goblin911 | 2013-08-25 |
| | | |||
* | | hahahahhahahahaha | goblin911 | 2013-08-25 |
|/ | |||
* | new project! | goblin911 | 2013-08-25 |
| | |||
* | new implementation | Teddy | 2013-08-24 |
| | |||
* | Merge branch 'master' of github.com:Determinant/piztor | Teddy | 2013-08-24 |
|\ | |||
| * | Merge branch 'master' of https://github.com/Determinant/piztor | Myth Yang | 2013-08-23 |
| |\ | |||
| * | | nice | Myth Yang | 2013-08-23 |
| | | | |||
* | | | ptp revised | Teddy | 2013-08-24 |
| |/ |/| | |||
* | | Merge branch 'master' of github.com:Determinant/piztor | Teddy | 2013-08-23 |
|\| | |||
| * | jiong | Myth Yang | 2013-08-23 |
| | | |||
| * | idiot | Myth Yang | 2013-08-23 |
| | | |||
| * | idiot | Myth Yang | 2013-08-23 |
| | | |||
| * | idiot | Myth Yang | 2013-08-23 |
| | | |||
| * | asdf | goblin911 | 2013-08-23 |
| | |