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 3 - Ranger Enemy #60

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

Tubes 3 - Ranger Enemy #60

wants to merge 111 commits into from

Conversation

edwardsamuel
Copy link

13510015 Wilson Fonda - wilsonfonda
13510039 Felix Terahadi - 13510039
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
edwardsamuel and others added 30 commits April 4, 2013 19:54
@edwardsamuel
Penambahan Connector MySQL + Pembuatan JSON Writer + Perbaikan .gitig…
96fe02e 
…nore

- Penambahan mysql-connector-java-5.1.24-bin.jar
- Penghapusan penggunaan library GSON
@wilsonf
penambahan dashboard awal
df2f894 
-.ditambah dengan ajax kategori
-.masih prototipe
@edwardsamuel
Pelengkapan DetilTugas + Pembuatan UpdateTugas + Penambahan Konstrukt…
c637f7d 
…or pada JSONArray

- DetilTugas sudah mengimplementasikan semua fungsi yg setara dengan detilTugas.php
- UpdateTugas sudah diimplementasikan sebagian hingga penyaranan nama assignee
- JSONArray bisa dibuat dari Collection
@wilsonf
pembenaran header dan dashboard
2c3bb72
@13510039
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
00e1c7b 
…into tubes3
@wilsonf
penyelesaian halaman dashboard
b043825 
hampir semua fungsi pada create tugas selesai, kecuali pada upload multiple file
@edwardsamuel
Perbaikan JSON + Updater Tugas + View Tugas + Perbaikan Register
2271876
@edwardsamuel
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
bbe6795 
…into tubes3

Conflicts:
	TodolistJava/src/java/id/ac/itb/todolist/dao/TugasDao.java
	TodolistJava/web/WEB-INF/includes/header.inc.jsp
@edwardsamuel
Perbaikan Header + Penyelesaian Detil Tugas + Penyesuaian File Berkaitan
a40e941 
-. Memerbaiki link dan tulisan pada header
-. Ajax pada detil tugas
-. Detil tugas terdiri dari 3 level user
-. Penyesuaian link pada berbagai halaman
@wilsonf
menyelesaikan halaman dashboard dan create tugas
9f588f4 
sudah bisa memasukkan attachments
@13510039
profile (-upload avatar) dan search (belum selesai)
c034f83
@13510039
profile ( - upload avatar ) dan search (belum selesai)
99d56c4
@13510039
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
9f37411 
…into tubes3

Conflicts:
	TodolistJava/nbproject/genfiles.properties
	TodolistJava/nbproject/project.properties
	TodolistJava/src/java/id/ac/itb/todolist/dao/TugasDao.java
	TodolistJava/src/java/id/ac/itb/todolist/dao/UserDao.java
	TodolistJava/web/WEB-INF/includes/header.inc.jsp
	TodolistJava/web/WEB-INF/web.xml
@13510039
finalisasi profile
294f2a5
@13510039
fix bug header, updating search(belum sempurna), profile belum sempurna
deaa80c
@wilsonf
pembetulan create tugas saat tidak ada file yang diupload
33fd054
@13510039
Penyempurnaan profile, penyempurnaan search
d0b1c3d
@13510039
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
53dfc0e 
…into tubes3
@13510039
perbaikan bug search
0edff2c
@13510039
autocomplete search dan search berdasarkan tag
c8354e0
@13510039
autocomplete search dan search berdasarkan tag (Not Versioned Files)
f1e6758
@13510039
perbaikan bug minor pada search
f22c600
@13510039
minor bug pada profile dan search
bf67b76
@edwardsamuel
Perbaikan minor Autocomplete
c4c2e33 
-. Menghilangkan kode yang kelebihan
-. Tulisan pada search bar diganti
@wilsonf
pembetulan dashboard
ccef49e 
bahwa delete task oleh assignee ialah delete reference
@wilsonf
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
f670f56 
…into tubes3
@wilsonf
pembetulan
70e73a1 
pemilik tidak dimasukkan ke dalam tabel assignees karena redundan
@13510039
fix bug href assignee pada rincianTugas
43b859f 
fix bug "dapat mengubah status di profile orang lain"
modif susunan search sesuai spesifikasi
@13510039
pengubahan database properties sesuai spek progin_471_13510039
0012c13
@13510039
penambahan file progin_471_13510039.sql
ccae927
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.
5 participants
@edwardsamuel @abrahamks @sthobis @wilsonf @13510039