|
|
db92f5bb44
|
all working for now - no data
|
2015-09-30 22:21:26 +02:00 |
|
|
|
00140a36f8
|
fixed lots of js, more sql
|
2015-09-30 21:38:58 +02:00 |
|
|
|
338ebedc40
|
basic working
|
2015-09-30 21:13:18 +02:00 |
|
|
|
b02ea53bcb
|
fixed css & js
|
2015-09-30 19:58:31 +02:00 |
|
|
|
5cc8bba772
|
updated system, adjusted project accordingly
|
2015-09-30 19:43:37 +02:00 |
|
|
|
67092e2782
|
made uvote work, updated system reference
|
2015-05-23 10:49:46 +02:00 |
|
|
|
a211b58adb
|
added all uvote files, included gitignore
|
2015-05-20 17:39:27 +02:00 |
|
|
|
93a65e66c7
|
removed all uvote files from index
|
2015-05-20 17:38:48 +02:00 |
|
|
|
c32d76ef31
|
system reference updated config excluded, old reference deleted
|
2015-05-20 17:37:24 +02:00 |
|
Naeltard
|
95491115a4
|
Merge branch 'master' of mojotrollz.eu:hosting
Conflicts:
Neopolimatrix/neopolimatrix/page/default_page/tpl/default_page.tpl
|
2015-01-23 17:21:11 +01:00 |
|
|
|
589224566a
|
project properties update for netbeans 8
|
2015-01-05 16:06:01 +01:00 |
|
|
|
24e4696750
|
system fix uvote
|
2014-10-09 04:43:18 +02:00 |
|
Naeltard
|
923400756d
|
smaLi loads default_tpl
uVote needs system to operate
|
2014-09-20 02:31:16 +02:00 |
|
messerbill
|
f878e6ff45
|
fixed query, user accord with party now works fine
|
2014-03-31 16:20:20 +02:00 |
|
messerbill
|
a8f2239f5c
|
Merge branch 'master' of mojotrollz.eu:hosting
|
2014-03-24 00:36:14 +01:00 |
|
messerbill
|
47e782ff72
|
float fix
|
2014-03-24 00:35:50 +01:00 |
|
|
|
15de242721
|
@uvote fixed includes
|
2014-03-23 04:34:27 +01:00 |
|
|
|
01ae7cdcdd
|
@uvote deleted obsolete path objects
|
2014-03-21 14:25:00 +01:00 |
|
|
|
769fe98f8e
|
@uvote cleaned api and split it into several logical purpose orientated files
|
2014-03-21 14:19:52 +01:00 |
|
|
|
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 |
|
