35 Commits

Author SHA1 Message Date
messerbill
8472f29e48 Merge branch 'master' of mojotrollz.eu:hosting 2014-03-11 02:25:29 +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
Nael
9d421ecb22 comment 2014-03-11 00:11:26 +01:00
Nael
cb333417a5 fuck js 2014-03-08 21:35:41 +01:00
Nael
cd21275543 my_vote implemented 2014-03-07 19:41:08 +01:00
Nael
70283bdcb4 formatted open vote 2014-03-07 00:21:16 +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
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
7e7aced5a1 poll count 2014-02-20 15:42:14 +01:00
Nael
dd4fcffb82 Merge branch 'master' of mojotrollz.eu:hosting
Conflicts:
	uVote/uVote/api/votes/votes.php
2014-02-19 22:01:58 +01:00
Nael
e11284e1a4 bt to user 2014-02-19 22:00:21 +01:00
ed7020c347 unanimated timer 2014-02-18 23:42:19 +01:00
f2fe3108a6 querys and vis for uvote tab 2014-02-16 22:50:36 +01:00
5a8c846c84 uVote fixes 2014-02-16 03:27:00 +01:00
Nael
4c28d3890e urvote data 2014-02-13 02:21:08 +01:00
Nael
e52abd4988 major db queries 2014-02-13 01:45:56 +01:00
Nael
8059716e46 multiple api functionality for statistics on fronted
various style changes for buttons and bars (still bootstrap though)
vote functionality restored
switched list and main frame positions and reversed floats (looks same as before!)
2014-02-12 22:39:27 +01:00
Nael
1a20531d4b cover implemented, minor style fixes, started table for strings 2014-01-23 02:20:44 +01:00
92d6d20bf4 sys table name convention fix, updated system reference 2014-01-20 03:30:22 +01:00
2a7683d509 updated system reference, corrected autoloads to match new system requirements 2013-08-01 14:59:17 +02:00
Nael
0afc5798f6 account create and login working 2013-06-29 22:43:11 +02:00
34fdf36231 updated uvote + updated system reference 2013-06-14 01:06:39 +02:00