]>
projects.mako.cc - selectricity-live/log
Benjamin Mako Hill [Sun, 17 Jun 2012 22:59:36 +0000 (18:59 -0400)]
Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live
Conflicts:
README
app/controllers/voter_controller.rb
app/views/layouts/_footer.rhtml
Benjamin Mako Hill [Sun, 17 Jun 2012 22:50:03 +0000 (18:50 -0400)]
update footer to represent the new C4FCM name
Benjamin Mako Hill [Sun, 17 Jun 2012 22:48:16 +0000 (18:48 -0400)]
updated README with new git repository home
We've moved the main repository from gitorious to projects.mako.cc which is a
better permanent home.
Benjamin Mako Hill [Sun, 17 Jun 2012 22:46:32 +0000 (18:46 -0400)]
fix bug/typo in plurality results around candidate.id and candidate_id
Benjamin Mako Hill [Sun, 17 Jun 2012 22:46:11 +0000 (18:46 -0400)]
removed old debugger code that was accidentally committed
Benjamin Mako Hill [Sun, 17 Jun 2012 22:45:25 +0000 (18:45 -0400)]
fix bug that allowed votes with more rankings than candidates to be recorded
Benjamin Mako Hill [Sun, 17 Jun 2012 22:42:57 +0000 (18:42 -0400)]
fixed and re-enabled support for memcache in the production site
justin [Sat, 5 Mar 2011 23:39:47 +0000 (15:39 -0800)]
Added some minor TODO's for increased user funcitonality. Change email, beautify user dashboard, make is possible to cancel elections that haven't been started but have been created.
justin [Sat, 5 Mar 2011 22:14:27 +0000 (14:14 -0800)]
Changed justin's email in README because mit.edu address is out of date.
Benjamin Mako Hill [Tue, 7 Sep 2010 14:05:28 +0000 (10:05 -0400)]
referenced mailing list and gitorious (finally?)
Benjamin Mako Hill [Tue, 7 Sep 2010 14:05:28 +0000 (10:05 -0400)]
referenced mailing list and gitorious
Benjamin Mako Hill [Tue, 7 Sep 2010 14:05:28 +0000 (10:05 -0400)]
referenced mailing list and gitorious
Benjamin Mako Hill [Tue, 7 Sep 2010 14:05:28 +0000 (10:05 -0400)]
referenced mailing list and gitorious
Benjamin Mako Hill [Mon, 6 Sep 2010 17:17:41 +0000 (13:17 -0400)]
improved dependency information
Benjamin Mako Hill [Mon, 6 Sep 2010 16:33:29 +0000 (12:33 -0400)]
Updated readme with better branch information.
In particular, there is no need for the live branch any more so I've
removed that and replaced it with information on switching to the live
branch within the repository.
Benjamin Mako Hill [Mon, 6 Sep 2010 16:36:44 +0000 (12:36 -0400)]
Link to source code more prominently.
I added a more prominent link to the source code.
Benjamin Mako Hill [Mon, 6 Sep 2010 18:32:41 +0000 (14:32 -0400)]
merged in from code from the other master
Benjamin Mako Hill [Mon, 6 Sep 2010 18:09:20 +0000 (14:09 -0400)]
Merge remote branch 'deployment/live' into live
Benjamin Mako Hill [Mon, 6 Sep 2010 18:07:34 +0000 (14:07 -0400)]
removed unnecessary line/
Benjamin Mako Hill [Mon, 6 Sep 2010 17:23:01 +0000 (13:23 -0400)]
Merge remote branch 'remotes/deployment/master' into live
Benjamin Mako Hill [Mon, 6 Sep 2010 17:17:41 +0000 (13:17 -0400)]
improved dependency information
Benjamin Mako Hill [Mon, 6 Sep 2010 16:36:44 +0000 (12:36 -0400)]
Link to source code more prominently.
I added a more prominent link to the source code.
Benjamin Mako Hill [Mon, 6 Sep 2010 16:33:29 +0000 (12:33 -0400)]
Updated readme with better branch information.
In particular, there is no need for the live branch any more so I've
removed that and replaced it with information on switching to the live
branch within the repository.
Benjamin Mako Hill [Mon, 24 May 2010 21:39:59 +0000 (17:39 -0400)]
add votemail
Benjamin Mako Hill [Wed, 23 Dec 2009 06:46:02 +0000 (01:46 -0500)]
fix mispelling in about screen
Benjamin Mako Hill [Wed, 23 Dec 2009 07:49:27 +0000 (02:49 -0500)]
cluster configuration for new machine
Benjamin Mako Hill [Wed, 23 Dec 2009 06:46:02 +0000 (01:46 -0500)]
fix mispelling in about screen
Benjamin Mako Hill [Wed, 23 Dec 2009 06:46:02 +0000 (01:46 -0500)]
fix mispelling in about screen
Benjamin Mako Hill [Wed, 23 Dec 2009 01:49:54 +0000 (20:49 -0500)]
made the license clear
Conflicts:
README
Benjamin Mako Hill [Wed, 23 Dec 2009 01:48:39 +0000 (20:48 -0500)]
made the license clear
Benjamin Mako Hill [Mon, 16 Nov 2009 19:40:55 +0000 (14:40 -0500)]
added a little more installation information
Benjamin Mako Hill [Mon, 26 Oct 2009 23:34:42 +0000 (19:34 -0400)]
move to agplv3
Benjamin Mako Hill [Thu, 18 Jun 2009 00:54:47 +0000 (20:54 -0400)]
added new tests and fixtures
Benjamin Mako Hill [Thu, 18 Jun 2009 00:54:16 +0000 (20:54 -0400)]
added yaml_db plugin
Benjamin Mako Hill [Thu, 18 Jun 2009 00:53:40 +0000 (20:53 -0400)]
fixed up a series of things in prepration for the stress test on friday
Benjamin Mako Hill [Wed, 17 Jun 2009 05:22:34 +0000 (01:22 -0400)]
fixed a large number of bugs in the software (see wiki) over a days work
Benjamin Mako Hill [Tue, 16 Jun 2009 21:11:48 +0000 (17:11 -0400)]
ignore temporary files
Benjamin Mako Hill [Tue, 16 Jun 2009 21:10:32 +0000 (17:10 -0400)]
updated top the the new version of attachment_fu plugin to work out some
rails 2.2 issues
Benjamin Mako Hill [Mon, 15 Jun 2009 14:17:11 +0000 (10:17 -0400)]
switched license to agpl-3
Benjamin Mako Hill [Mon, 15 Jun 2009 14:10:22 +0000 (10:10 -0400)]
switched license to agpl-3
Benjamin Mako Hill [Wed, 10 Jun 2009 14:19:15 +0000 (10:19 -0400)]
updated docs for git
Benjamin Mako Hill [Wed, 10 Jun 2009 14:14:18 +0000 (10:14 -0400)]
updated the git ignore file
Benjamin Mako Hill [Wed, 10 Jun 2009 14:13:19 +0000 (10:13 -0400)]
moved over the git ignore file
<mako@atdot.cc> [Wed, 10 Jun 2009 14:05:40 +0000 (10:05 -0400)]
updated db schema
Benjamin Mako Hill [Wed, 10 Jun 2009 14:04:13 +0000 (10:04 -0400)]
updated and moved ignore file
<mako@atdot.cc> [Mon, 8 Jun 2009 15:45:34 +0000 (11:45 -0400)]
fixed up kiosk mode
<mako@atdot.cc> [Mon, 8 Jun 2009 13:06:58 +0000 (09:06 -0400)]
fix weird bug with showing results from open elections
<mako@atdot.cc> [Sun, 7 Jun 2009 12:48:11 +0000 (08:48 -0400)]
fixed the layout on the account summary page
<mako@atdot.cc> [Sun, 7 Jun 2009 12:30:52 +0000 (08:30 -0400)]
added first stab at a kiosk mode
<mako@atdot.cc> [Sun, 7 Jun 2009 09:44:11 +0000 (05:44 -0400)]
merge everything back from mainline branch
<mako@atdot.cc> [Sun, 7 Jun 2009 09:39:45 +0000 (05:39 -0400)]
merged in licensing changes (we'll have to undo this eventually)
<mako@atdot.cc> [Sat, 14 Feb 2009 17:27:09 +0000 (12:27 -0500)]
fixed licensing information for selectricity
root [Fri, 23 Jan 2009 18:58:28 +0000 (13:58 -0500)]
merged from devel
<mako@atdot.cc> [Sat, 27 Dec 2008 14:23:11 +0000 (09:23 -0500)]
create new open voter to allow open full elections
<mako@atdot.cc> [Sat, 27 Dec 2008 13:30:22 +0000 (08:30 -0500)]
fix bug with token generator
<mako@atdot.cc> [Sat, 27 Dec 2008 12:55:15 +0000 (07:55 -0500)]
merged more fixes from devel
root [Sat, 27 Dec 2008 12:54:39 +0000 (07:54 -0500)]
merged fixes from devel
<mako@atdot.cc> [Fri, 26 Dec 2008 19:39:46 +0000 (14:39 -0500)]
fixed errors with election/class
<mako@atdot.cc> [Fri, 26 Dec 2008 19:37:41 +0000 (14:37 -0500)]
fix issue with db schema content version
<mako@atdot.cc> [Fri, 26 Dec 2008 18:28:02 +0000 (13:28 -0500)]
mergec minor changes from live
root [Fri, 26 Dec 2008 18:27:17 +0000 (13:27 -0500)]
minor changes to clustering software
<mako@atdot.cc> [Fri, 28 Nov 2008 18:35:26 +0000 (13:35 -0500)]
Major update of Selectricity to work with Rails 2.2.2 from 1.2!
This included a large number of changes:
- removal of randarray.rb (features are not in the new version or ruby)
- removal of sparklines plugin and replacement with gemified version of
sparklines and sparklines_generator
- addition of act_as_list plugin which is no longer in rails
- disabling of all API code because action_web_service is deprecated in
favor of active_resource (!!!!)
- large number of miscellaneous updates to do the new rails 2ish
I've commented out the new features in the views (i.e., embedded) as
this is going to replace the LIVE version of Selectricity. We should
then test this well, slowly enable the new features, and get the tests i
old_api_code back work with an active_resource interface.
<mako@atdot.cc> [Thu, 27 Nov 2008 20:12:03 +0000 (15:12 -0500)]
merged in changes from live version
<mako@atdot.cc> [Thu, 27 Nov 2008 20:06:31 +0000 (15:06 -0500)]
fixed colors on graphs
<jlsharps@mit.edu> [Mon, 25 Aug 2008 23:36:54 +0000 (19:36 -0400)]
An @edit=true declaration was missing from edit_voters that prevented the voter delete button from appearing. I palced the declaration back in the controller method rather than in the view file, which is different from the new_voters.rhtml file.
<jlsharps@mit.edu> [Mon, 25 Aug 2008 22:43:30 +0000 (18:43 -0400)]
The account summary page has been updated, though the number of items displayed is still one too many. Choose one to eliminate if we want it all to fit within the colored area on the page.
<jlsharps@mit.edu> [Fri, 22 Aug 2008 22:48:50 +0000 (18:48 -0400)]
Conditional that redircts to user profile page if too many elections in control panel. Coincentally, the user profile needs some work. Removed scroll bar feature from control panel.
<jlsharps@mit.edu> [Thu, 21 Aug 2008 18:09:37 +0000 (14:09 -0400)]
Corrected typo on the 'show' page for election information.
<mako@atdot.cc> [Thu, 21 Aug 2008 17:15:46 +0000 (13:15 -0400)]
fix spelling error
<mako@atdot.cc> [Mon, 18 Aug 2008 20:26:00 +0000 (16:26 -0400)]
fix type in description text
<jlsharps@mit.edu> [Thu, 17 Jul 2008 21:46:20 +0000 (17:46 -0400)]
Scrollbar if someone creates too many electons to fit within defualt given room for control panel. Doesn't look too good yet.
<jlsharps@mit.edu> [Mon, 30 Jun 2008 03:33:56 +0000 (23:33 -0400)]
scrollbar appears if two many electons on control panel. ooks pretty nasty.
<jlsharps@mit.edu> [Wed, 4 Jun 2008 23:28:40 +0000 (19:28 -0400)]
Streamlined and made more consistent the code that checks for custom skin uploads. Add theme method is still pretty ugly though.
<jlsharps@mit.edu> [Wed, 4 Jun 2008 22:07:37 +0000 (18:07 -0400)]
Added code to check for previously uploaded custom images and delete them, the newly uploaded ones can take their places. The code isn't pretty :(
<jlsharps@mit.edu> [Fri, 30 May 2008 02:48:33 +0000 (22:48 -0400)]
custimizable widgets now work for top_bar as well, btu still only with png's.
<jlsharps@mit.edu> [Fri, 30 May 2008 02:43:34 +0000 (22:43 -0400)]
whoops, committed some errant javascript last time, here removed
<jlsharps@mit.edu> [Fri, 30 May 2008 02:42:46 +0000 (22:42 -0400)]
Custom embeddable code works for png's except for top_bar
<jlsharps@mit.edu> [Thu, 29 May 2008 21:01:04 +0000 (17:01 -0400)]
fixed a typo in election controller in the edit_general_information method.
<jlsharps@mit.edu> [Thu, 29 May 2008 20:38:15 +0000 (16:38 -0400)]
save! changed to save for add_theme method, and a check to give the election an embed_custom_string was added to the edit method, in case they decide they want to give it a theme later.
<jlsharps@mit.edu> [Thu, 29 May 2008 20:34:02 +0000 (16:34 -0400)]
Can upload images on the edit_general_information page as well, but has no checks in palce to make sure there's only one kind of each item.
<jlsharps@mit.edu> [Thu, 29 May 2008 17:06:52 +0000 (13:06 -0400)]
File upload system for custom skins almost complete.
<jlsharps@mit.edu> [Wed, 28 May 2008 17:24:40 +0000 (13:24 -0400)]
In the middle of adding custom theme supports. Skin_pictures table added to store metadata but final method of upload not yet complete.
<jlsharps@mit.edu> [Thu, 22 May 2008 19:50:14 +0000 (15:50 -0400)]
minor changes to the election show page, still having trouble figuring out how to display results early for elections.
<jlsharps@mit.edu> [Thu, 22 May 2008 18:29:58 +0000 (14:29 -0400)]
The results page should now work for scaling embeddableelections as well.
<jlsharps@mit.edu> [Thu, 22 May 2008 17:38:38 +0000 (13:38 -0400)]
the embeddable widgets now grow or shrink to accomodate more candidates, there are no scroll bars.
<jlsharps@mit.edu> [Tue, 13 May 2008 00:25:32 +0000 (20:25 -0400)]
added numbering back to embeddables, should count correctly no matter how many candidates there are.
<jlsharps@mit.edu> [Mon, 12 May 2008 23:44:22 +0000 (19:44 -0400)]
Embeddable elctions now scale based on how many candidates in the election there are. However, the iframe adds a scroolbar if there's more than 5 candidates, and shows whitespace at the bottom when there's less than five.
<jlsharps@mit.edu> [Sun, 11 May 2008 01:47:10 +0000 (21:47 -0400)]
individual dark and light weidgets added as .png files, removed psd files
<jlsharps@mit.edu> [Sun, 11 May 2008 01:12:24 +0000 (21:12 -0400)]
Added individual widgets for embeddable voting to images folder, aboutot start editing.
<jlsharps@mit.edu> [Fri, 9 May 2008 23:12:17 +0000 (19:12 -0400)]
elections marked as viewable will now dispaly a link to their results page while the election is on going, but not if there haven't been any voters.
<jlsharps@mit.edu> [Fri, 9 May 2008 21:31:56 +0000 (17:31 -0400)]
QuickVotes are now displayed in the control panel list - and you can click on
them. They aren't specially marked yet though.
<jlsharps@mit.edu> [Fri, 9 May 2008 20:56:16 +0000 (16:56 -0400)]
Added a check to make sure a voter has a valid email address before attempting ot e-mail them.
<jlsharps@mit.edu> [Mon, 5 May 2008 23:33:06 +0000 (19:33 -0400)]
Ordered pref tables so that the smallest margin of vicotry appears first and the largest margin of victory appears last.
<mako@atdot.cc> [Fri, 25 Apr 2008 00:08:55 +0000 (20:08 -0400)]
two minor changes that fix bugs with the quickvote
<jlsharps@mit.edu> [Sat, 12 Apr 2008 20:04:29 +0000 (16:04 -0400)]
Fixed minor spelling errors on results pages, tried to fix quickvotes bug but unsuccesful. NO changes made to application and quickvote controller
<jlsharps@mit.edu> [Mon, 31 Mar 2008 22:09:58 +0000 (18:09 -0400)]
Added a link to open elections off the election's 'show' page
<jlsharps@mit.edu> [Mon, 31 Mar 2008 21:22:29 +0000 (17:22 -0400)]
The schema file should now be correct
<jlsharps@mit.edu> [Mon, 31 Mar 2008 21:06:56 +0000 (17:06 -0400)]
TODO has been modified to relfect bug changes already delt with. Also, autogenerated db/schema.rb file for easy reloading of database structure. use 'rake db:schema:load name_of_file'
<mako@atdot.cc> [Mon, 31 Mar 2008 18:55:53 +0000 (14:55 -0400)]
merge from live
<mako@atdot.cc> [Mon, 31 Mar 2008 18:55:32 +0000 (14:55 -0400)]
fix for bug introduces with full versions
Benjamin Mako Hill || Want to submit a patch?