Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tubes 4 - Keren #62

Open
wants to merge 160 commits into
base: master
Choose a base branch
from
Open

Tubes 4 - Keren #62

wants to merge 160 commits into from

Conversation

edwardsamuel
Copy link

13510057 - Mario Orlando Teng - marioorlando
13510059 - Yulianti Oenang - YuliantiOenang
13510065 - Edward Samuel Pasaribu - edwardsamuel

edwardsamuel and others added 30 commits February 16, 2013 20:40
@edwardsamuel
Kerangka Dashboard
c5ae16e 
Kerangka halaman dashboard.html
@abrahamks
Halaman profile v0.1 dan antek-anteknya
27d21b8 
profil.html
avatar.png
@abrahamks
halaman pembuatan tugas v0.1
4a550dd 
v0.1 - CSS belum di edit
@abrahamks
CSS + javascript create tugas
5d9e1b8
@edwardsamuel
Halaman Dashboard + Rincian Tugas
1db67a1 
Dashboard sudah selesai
Rincian Tugas belum selesai, baru penambahan komentar
@sthobis
Halaman Utama (dengan CSS+JS)
6ffbb53
@abrahamks
Update src/default.css
1aaffef 
modifikasi CSS untuk halaman create tugas
@abrahamks
createtugas.html FINAL
6dd1e1d 
mediaqueries.css v0.1 - ipad 720px
profil.html FINAL
@sthobis
index.js + index.css
166450c
@abrahamks
mediaqueries.css v0.2
6071344 
dashboard.html -> include mediaqueries.css
default.css v0.3 -> remove float:left

Bram
@abrahamks
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
81f7568
@sthobis
Update index.html
f96da80
@edwardsamuel
dashboard.html --> penyelesaian modul
9079c7b 
tugas.html --> penyelesaian modul
Penambahan link
Perbaikan css
@abrahamks
mediaqueries.css final
9fca188
@edwardsamuel
Validasi dengan validator.w3.org dan Perbaikan Minor
c99cdad
@abrahamks
mediaqueries.css FINAL 720pz
d0d41df
@edwardsamuel
Validasi Registrasi dan Penambahan MEMBER.md
fe099b8
@edwardsamuel
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
d8a3c46
@sthobis
Update form login index.html
b852516
@sthobis
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
b4f00df
@sthobis
Update index.js (validasi login)
e7becd1
@abrahamks
mediaqueries.css 320px v0.1
a33d64b
@sthobis
Upload image index.html
58fd42f
@sthobis
Update index.html index.css (image deskripsi website)
4d77fac
@abrahamks
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
b59f286 
Conflicts:
	src/index.css
	src/index.html
@edwardsamuel
Datetimepicker
59025c5
@abrahamks
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
daad0a3
@edwardsamuel
Perbaikan Minor
a0707d4
@edwardsamuel
Final
e35a650
@wilsonf
ganti member, mulai tubes 2
9c387b7
marioorlandoteng and others added 30 commits April 29, 2013 15:49
@marioorlandoteng
Rest user
06dfab7
@marioorlandoteng
Merge branch 'tubes4' of https://github.com/edwardsamuel/IF3038-2013 …
49afa5b 
…into tubes4
@YuliantiOenang
category rest + comment rest + category soap
c2538bd
@YuliantiOenang
Merge branch 'tubes4' of https://github.com/edwardsamuel/IF3038-2013 …
8f409d8 
…into tubes4
@edwardsamuel
Tugas SOAP + Comment REST
bbf3293
@edwardsamuel
Merge branch 'tubes4' of https://github.com/edwardsamuel/IF3038-2013 …
9643e58 
…into tubes4
@edwardsamuel
Konfigurasi agar bisa diupload di Appfog
9ddd570
@edwardsamuel
Urutan definisi servlet
a95433e
@edwardsamuel
Mendaftarkan UserResource pada WebService
58cf7c2
@YuliantiOenang
comment dao client + tugas dao client
2c8b374
@YuliantiOenang
comment dao client update
e868a3f
@edwardsamuel
Category + User SOAP
73cded8
@edwardsamuel
Merge branch 'tubes4' of https://github.com/edwardsamuel/IF3038-2013 …
56c1a11 
…into tubes4
@edwardsamuel
Perbaikan SOAP Client
b54f586
@edwardsamuel
Perbaikan URL WebService
827c56f
@edwardsamuel
Properties Project
13aaaed
@edwardsamuel
Project Properties
eef9690
@edwardsamuel
Perbaikan Bug + Migrasi ke Local
22fa70a
@YuliantiOenang
git
819ed5f
@YuliantiOenang
Merge branch 'tubes4' of https://github.com/edwardsamuel/IF3038-2013 …
4581278 
…into tubes4
@YuliantiOenang
update search dan tugas
10cb4ca
@YuliantiOenang
delete category
986df72
@edwardsamuel
Perbaikan Model agar busa menghandle null + Perbaikan REST untuk kepe…
a504396 
…rluan rincian tugas
@marioorlandoteng
Perbaikan rest halaman profile
bff43b8
@marioorlandoteng
Merge branch 'tubes4' of https://github.com/edwardsamuel/IF3038-2013 …
7b09c3b 
…into tubes4

Conflicts:
	4-TodolistWebService/WebService/src/java/id/ac/itb/todolist/rest/resource/CategoryResource.java
@edwardsamuel
Merge branch 'tubes4' of https://github.com/edwardsamuel/IF3038-2013 …
0143734 
…into tubes4

Conflicts:
	4-TodolistWebService/WebService/src/java/id/ac/itb/todolist/rest/resource/CategoryResource.java
@edwardsamuel
Migrasi Web Service ke Appfog
554007e
@edwardsamuel
Perbaikan kesalahan pada model Comment dan TugasDao
bb20b07
@edwardsamuel
Model Comment
e71d060
@edwardsamuel
Final Tubes 4
66e887c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@edwardsamuel @abrahamks @sthobis @wilsonf @13510039 @marioorlandoteng @YuliantiOenang