messerbill
|
a79bc90933
|
Merge branch 'master' of mojotrollz.eu:hosting
Conflicts:
uVote/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php
uVote/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php
uVote/uVote/page/default_bulletin/bulletin.tpl
uVote/uVote/page/default_page/full_vote.tpl
uVote/uVote/page/default_page/js/loadtexts.js
uVote/uVote/page/default_page/page.tpl
uVote/uVote/page/default_page/vote.tpl
uVote/uVote/page/default_register/register.tpl
uVote/uVote/page/user_list_active/user_list_active.php
uVote/uVote/page/user_list_ended/user_list_ended.php
uVote/uVote/page/user_main_urVote/all_polls.tpl
|
2014-03-11 01:18:53 +01:00 |
|
Nael
|
9d421ecb22
|
comment
|
2014-03-11 00:11:26 +01:00 |
|
messerbill
|
f026d43b32
|
...
|
2014-03-03 19:00:23 +01:00 |
|
Nael
|
40e34ce9b8
|
new style stuff
|
2014-03-03 18:53:56 +01:00 |
|
Nael
|
c52b4c86d2
|
stats voteweight,
stats users,
new style for vote.tpl
|
2014-02-24 15:27:55 +01:00 |
|
Nael
|
9338b4bc6d
|
styles
|
2014-02-20 13:58:17 +01:00 |
|
Nael
|
e11284e1a4
|
bt to user
|
2014-02-19 22:00:21 +01:00 |
|
Nael
|
825b68b693
|
party icons
|
2014-02-17 13:43:04 +01:00 |
|
Nael
|
10372c53b8
|
bt data input
|
2014-02-17 01:02:49 +01:00 |
|
Nael
|
5742dded64
|
img
|
2014-01-30 13:54:51 +01:00 |
|
Nael
|
2ad90534b3
|
state
|
2014-01-24 22:20:25 +01:00 |
|
Nael
|
6a19f4378c
|
minor img fix
|
2014-01-23 02:39:15 +01:00 |
|
Nael
|
1a20531d4b
|
cover implemented, minor style fixes, started table for strings
|
2014-01-23 02:20:44 +01:00 |
|
Nael
|
b0822c2cfc
|
had to make state
|
2014-01-20 13:09:39 +01:00 |
|