134 Commits

Author SHA1 Message Date
messerbill
8472f29e48 Merge branch 'master' of mojotrollz.eu:hosting 2014-03-11 02:25:29 +01:00
messerbill
c246d59ec1 feedback now works - there was an error with the JSON return. Feedback function now is set to "async: false" -> data is set into db successfully and no error is fired 2014-03-11 02:25:12 +01:00
Nael
e6436f8abc comment now formatted and working properly 2014-03-11 01:57:54 +01:00
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
messerbill
b7aa816e58 Merge branch 'master' of mojotrollz.eu:hosting
Conflicts:
	system
2014-03-11 01:17:32 +01:00
Nael
fbed342cad Merge branch 'master' of mojotrollz.eu:hosting
Conflicts:
	uVote/uVote/page/default_page/js/loadtexts.js
2014-03-11 00:13:40 +01:00
Nael
9d421ecb22 comment 2014-03-11 00:11:26 +01:00
fdf5fb3a94 uvote js fixes 2014-03-10 20:51:51 +01:00
Nael
cc998349a8 comment function working now 2014-03-10 00:43:00 +01:00
Nael
cb333417a5 fuck js 2014-03-08 21:35:41 +01:00
Nael
abf505ba94 fixed :) <3 ole 2014-03-08 02:44:35 +01:00
Nael
dd2feab740 menu for list. not working though. strange bug in js 2014-03-08 02:37:16 +01:00
Nael
cd21275543 my_vote implemented 2014-03-07 19:41:08 +01:00
Nael
43edfc7db0 hotfix -.- 2014-03-07 03:23:14 +01:00
Nael
b77bd29479 impressum &shitz
nu texts
2014-03-07 03:10:17 +01:00
Nael
07c1b8cf70 Merge branch 'master' of mojotrollz.eu:hosting 2014-03-07 00:21:36 +01:00
Nael
70283bdcb4 formatted open vote 2014-03-07 00:21:16 +01:00
1d27915144 fixed register bug 2014-03-06 19:42:45 +01:00
e935f667e9 fixed poll bt data utf8 2014-03-06 19:38:04 +01:00
5534209eff uVote register "fix" -> not yet completed default page needs 2 use default_register()! 2014-03-06 19:24:47 +01:00
647c3b1010 firefox fix - now ~99.7863% compatible 2014-03-06 17:25:57 +01:00
c47c1bcaf0 umove graph stuff 2014-03-06 17:16:08 +01:00
edff4a4457 uvote fixes @ graph 2014-03-06 17:07:04 +01:00
Nael
0c5b31b459 ff fix 2014-03-06 01:51:30 +01:00
Nael
39f4e347eb oh yeah, its gettin forward bitches! 2014-03-06 01:38:20 +01:00
Nael
98b57e0af4 new fancy statistics 2014-03-05 20:28:48 +01:00
Nael
a0ad586bea new stats, new texts, new awesome 2014-03-04 18:43:13 +01:00
Nael
d18596c322 uvote to bt overall now working 2014-03-04 01:50:38 +01:00
Nael
1b42a206e6 statistics 2014-03-04 00:45:19 +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
e5732455c4 Merge branch 'master' of mojotrollz.eu:hosting
Conflicts:
	uVote/uVote/page/default_bulletin/default_bulletin.php
	uVote/uVote/page/default_page/default_page.php
	uVote/uVote/page/default_page/vote.tpl
2014-03-03 11:02:35 +01:00
Nael
a2c88132fd styles 2014-03-03 11:01:18 +01:00
20f40aec84 uvote fixes 2014-03-03 00:04:14 +01:00
messerbill
d88c36f85d Merge branch 'master' of mojotrollz.eu:hosting 2014-03-02 20:40:47 +01:00
44637112ae cleanup 2014-03-02 18:26:22 +01:00
52c61c5eb4 fixed visibility of vote-results in bulletin 2014-03-02 18:22:16 +01:00
89eac11f93 fixed uvote all-votes-display stuff 2014-03-02 18:07:49 +01:00
Nael
97a3a80150 corrected bar 2014-03-01 16:36:18 +01:00
Nael
c52b4c86d2 stats voteweight,
stats users,
new style for vote.tpl
2014-02-24 15:27:55 +01:00
Nael
fbcde01b67 nice new statistics... oh man world revolution is coming DUDES! 2014-02-23 23:35:53 +01:00
7d3eead162 uvote sql sample 2014-02-23 21:49:30 +01:00
Nael
ebaf058a70 statistics for vote.tpl thx to rylon 2014-02-23 21:48:10 +01:00
Nael
4993da10e9 new data 2014-02-22 11:10:33 +01:00
Nael
41068ea7b0 statistics 2014-02-21 13:00:55 +01:00
messerbill
0a7a0dbd6e urVote works now?^^ 2014-02-21 00:24:43 +01:00
Nael
c286b20cad Merge branch 'master' of mojotrollz.eu:hosting 2014-02-20 15:42:44 +01:00
Nael
7e7aced5a1 poll count 2014-02-20 15:42:14 +01:00
messerbill
347172fac7 fixed uvote feedback 2014-02-20 14:48:10 +01:00
Nael
d8146cf121 Merge branch 'master' of mojotrollz.eu:hosting 2014-02-20 13:58:38 +01:00