156 Commits

Author SHA1 Message Date
3ff3f4ddb6 @uvote panel ideas, small fixes 2014-03-21 14:08:32 +01:00
06dad18fcf @uvote fixed navigation, fixed login, fixed logout, deleted stuff 2014-03-21 13:36:07 +01:00
messerbill
45b83e1f99 excluded some stylesheets and implemented tooltip (popover) for the according laws,
but the query is still not correct
2014-03-20 18:26:46 +01:00
messerbill
d6b5c6bd21 dummy tooltip inserted 2014-03-19 15:10:30 +01:00
messerbill
3c52085af8 started to move stylesheets into external files 2014-03-19 01:20:16 +01:00
messerbill
907a030d20 Merge branch 'master' of mojotrollz.eu:hosting
Conflicts:
	uVote/uVote/api/votes/votes.php
	uVote/uVote/dbd/qq/UVOTE_ACCORD_WITH_FRACTION.php
2014-03-18 13:01:02 +01:00
messerbill
e8894444f3 and that one 2014-03-18 12:59:36 +01:00
messerbill
283b038c5b we changed a lot @ ulfs place 2014-03-18 12:58:07 +01:00
Nael
b923badd1c tried hotfix for bootstrap 2014-03-18 02:21:51 +01:00
Nael
2f5e44e10a Merge branch 'master' of mojotrollz.eu:hosting 2014-03-18 00:43:55 +01:00
Nael
0e7df816ae tried sai 2014-03-18 00:43:29 +01:00
dfbc36406b votelist style fix 2014-03-18 00:23:41 +01:00
d507398701 register page with tabs 2014-03-18 00:20:51 +01:00
4d46f59d84 tabs for uvote 2014-03-17 23:23:44 +01:00
792d0ea93c uvote bootstrap update menu fix 2014-03-17 21:11:56 +01:00
3d4649ebe2 colapseables updated bootstrap 2014-03-17 20:49:04 +01:00
e29b6b58cd missing config entry, uvote_accord call fixed 2014-03-17 20:07:11 +01:00
Nael
292d2e7a9e new graph 2014-03-15 23:30:58 +01:00
Nael
1acc2498c9 utf8 fix 2014-03-15 22:50:15 +01:00
Nael
2a18c523d5 didnt work 2014-03-12 21:32:56 +01:00
Nael
ea7262fdbc sum kind of utf-8 prob in comment function. problem is encoding in js 90% sure 2014-03-12 19:53:55 +01:00
Nael
34fdeae9c9 clearstate 2014-03-12 14:33:14 +01:00
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