Datasets:
numerata
/
diffs

Dataset card Data Studio Files
xet
 Community
1
repo
string
commit
string
message
string
diff
string
danigb/ringtwice
f407a1062804616865aa5c4395ae3075d6891b19
styles
diff --git a/app/controllers/gateways_controller.rb b/app/controllers/gateways_controller.rb index 86ced7f..bdc0d3d 100644 --- a/app/controllers/gateways_controller.rb +++ b/app/controllers/gateways_controller.rb @@ -1,12 +1,12 @@ class GatewaysController < ApplicationController before_filter :require_user inh...
danigb/ringtwice
88642a335442ab493260a28a4c3201ea0f100e0f
deliver model and test, first api call
diff --git a/app/controllers/delivers_controller.rb b/app/controllers/delivers_controller.rb new file mode 100644 index 0000000..a3ca381 --- /dev/null +++ b/app/controllers/delivers_controller.rb @@ -0,0 +1,20 @@ +class DeliversController < ApplicationController + + def show + mail_template = MailTemplate.find(para...
danigb/ringtwice
5637112fa0ab3931d8b0c5d2134366b9864300d0
we need more testing
diff --git a/app/models/mail_template.rb b/app/models/mail_template.rb index 29a6b3d..86174cb 100644 --- a/app/models/mail_template.rb +++ b/app/models/mail_template.rb @@ -1,60 +1,61 @@ class MailTemplate < ActiveRecord::Base belongs_to :project validates_presence_of :name, :project, :processor DEFAULTS ...
danigb/ringtwice
b5ffc7b875a03f56a24c35a8ac8bfee5e3d4bb8b
mustache plg
diff --git a/config/environment.rb b/config/environment.rb index d6eb351..efbc08f 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,17 +1,17 @@ RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| ...
danigb/ringtwice
a278b46e5469c58e2a020b355597582b22d85e20
mustache plugin
diff --git a/vendor/plugins/mustache/.kick b/vendor/plugins/mustache/.kick new file mode 100644 index 0000000..02ec9b7 --- /dev/null +++ b/vendor/plugins/mustache/.kick @@ -0,0 +1,26 @@ +# take control of the growl notifications +module GrowlHacks + def growl(type, subject, body, *args, &block) + case type + whe...
danigb/ringtwice
489a46b6fba45ae7b0cbefbecde86bdf04065b9b
ruby 1.8.7 compatible, css
diff --git a/app/stylesheets/basic.less b/app/stylesheets/basic.less index 318936a..2831db8 100644 --- a/app/stylesheets/basic.less +++ b/app/stylesheets/basic.less @@ -1,56 +1,59 @@ /* Copyright (c) 2008, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.t...
danigb/ringtwice
391a4eadc95848f250d36a1259fef5ff11f3dd63
playing with mustache
diff --git a/app/controllers/templates_controller.rb b/app/controllers/mail_templates_controller.rb similarity index 55% rename from app/controllers/templates_controller.rb rename to app/controllers/mail_templates_controller.rb index dffad8b..1677cc1 100644 --- a/app/controllers/templates_controller.rb +++ b/app/contro...
danigb/ringtwice
784e8243eab676752f1cedb43033789770113cf7
start with mustache
diff --git a/config/environment.rb b/config/environment.rb index 6dc01da..73f0da6 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,15 +1,16 @@ RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| ...
danigb/ringtwice
98c29d1db9d3bf4d2443c2cd9f2176a9f01962f9
first mail sent
diff --git a/.gitignore b/.gitignore index 02284c4..3902da4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,15 @@ .DS_Store log/*.log tmp/**/* config/database.yml config/cyl.yml db/*.sqlite3 public/assets/** nbproject db/data.yml backups/*.bz2 config/git.yml +db/seeds.rb + diff --git a/app/controlle...
danigb/ringtwice
c5048556839d7a3a5d9e747e691903c64538a405
gateways
diff --git a/app/controllers/gateways_controller.rb b/app/controllers/gateways_controller.rb new file mode 100644 index 0000000..86ced7f --- /dev/null +++ b/app/controllers/gateways_controller.rb @@ -0,0 +1,12 @@ +class GatewaysController < ApplicationController + before_filter :require_user + + inherit_resources + ...
danigb/ringtwice
e3d14a793145974f2ee6f5c1057069fbe05ed36f
templates
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb new file mode 100644 index 0000000..b0625e4 --- /dev/null +++ b/app/controllers/templates_controller.rb @@ -0,0 +1,25 @@ +class TemplatesController < ApplicationController + before_filter :require_user + + inherit_resources...
danigb/ringtwice
fe55227821dceed0f7c69fc3066391e2766bae54
basic structure
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index b552bf5..4dcb0d1 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,8 +1,26 @@ class MembersController < ApplicationController before_filter :require_user inherit_r...
danigb/ringtwice
49a0f3fffb9af3d871665514ac7a2f3840befb91
groups
diff --git a/app/controllers/audience_lists_controller.rb b/app/controllers/groups_controller.rb similarity index 81% rename from app/controllers/audience_lists_controller.rb rename to app/controllers/groups_controller.rb index be775ad..c788cde 100644 --- a/app/controllers/audience_lists_controller.rb +++ b/app/control...
danigb/ringtwice
4afd336f6b72916eab727b3342e10a675ed983c7
lists and members
diff --git a/app/controllers/audience_lists_controller.rb b/app/controllers/audience_lists_controller.rb new file mode 100644 index 0000000..be775ad --- /dev/null +++ b/app/controllers/audience_lists_controller.rb @@ -0,0 +1,14 @@ +class AudienceListsController < ApplicationController + before_filter :require_user + +...
danigb/ringtwice
8d1e5dd41928065b4fdc8360710074b1cd39f70e
projects
diff --git a/app/controllers/authentication_module.rb b/app/controllers/authentication_module.rb index 3678855..4459ef2 100644 --- a/app/controllers/authentication_module.rb +++ b/app/controllers/authentication_module.rb @@ -1,35 +1,37 @@ module AuthenticationModule def redirect_to_stored_or(default) redir...
danigb/ringtwice
cfa83933b3c6b31afb0c002d20e145da67842597
session works
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 22a0fb6..6463523 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,12 +1,13 @@ # Filters added to this controller apply to all controllers in the applicati...
danigb/ringtwice
69d954bddf1b06f031d158b3bf4c0234fe095b00
user creation
diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb index 1a54ac9..6c4eea1 100644 --- a/app/controllers/user_sessions_controller.rb +++ b/app/controllers/user_sessions_controller.rb @@ -1,15 +1,15 @@ class UserSessionsController < ApplicationController inherit_reso...
danigb/ringtwice
9196f1e0a0e3a627f9b620678554d0ba3eb81a8f
prepared to deploy
diff --git a/config/deploy.rb b/config/deploy.rb index f0baaad..9271a0e 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,15 +1,49 @@ -set :application, "set your application name here" -set :repository, "set your repository location here" +# SOURCES setup users: http://www.viget.com/extend/building-an-enviro...
danigb/ringtwice
a2effc4e4a12375be3f8f25802c15cdeeba9ca6d
inherit resources
diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb index 8ac8dbc..1a54ac9 100644 --- a/app/controllers/user_sessions_controller.rb +++ b/app/controllers/user_sessions_controller.rb @@ -1,37 +1,15 @@ class UserSessionsController < ApplicationController - before_filte...
danigb/ringtwice
7923370817bf0a1c28b3872789c1bf4874821f81
translator trick
diff --git a/app/controllers/authentication_module.rb b/app/controllers/authentication_module.rb index c296b56..3678855 100644 --- a/app/controllers/authentication_module.rb +++ b/app/controllers/authentication_module.rb @@ -1,31 +1,35 @@ module AuthenticationModule def redirect_to_stored_or(default) redir...
danigb/ringtwice
35ebf04872fb3d31679096cdf71bbc21d09c8d30
translator
diff --git a/app/views/user_sessions/new.html.erb b/app/views/user_sessions/new.html.erb index 64312e5..c094aee 100644 --- a/app/views/user_sessions/new.html.erb +++ b/app/views/user_sessions/new.html.erb @@ -1,19 +1,18 @@ <h1><%= t(:title) %></h1> <% form_for(@user_session) do |f| %> <%= f.error_messages %> ...
danigb/ringtwice
6457d7814bde65fcc171978a705d45e79a2d909e
users and sessions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6635a3f..22a0fb6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,10 +1,12 @@ # Filters added to this controller apply to all controllers in the applicati...
danigb/ringtwice
a3f3ce51481ab396e0ca8c29c1913c9c5d008276
rails 2.3.4 project
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..02284c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +.DS_Store +log/*.log +tmp/**/* +config/database.yml +config/cyl.yml +db/*.sqlite3 +public/assets/** +nbproject +db/data.yml +backups/*.bz2 +config/git.yml + + diff --git a/Capfile b/Capfile ...
danigb/ringtwice
4c2efda260235cefd7f4cf8363fe3f2f6ef99ded
init repo
diff --git a/README b/README new file mode 100644 index 0000000..e69de29
eliaskg/EKSound
34cecda85291cd205d6b99da3c830515a896ca17
Minor changes
diff --git a/EKSound.j b/EKSound.j index 45940b7..0d763ec 100644 --- a/EKSound.j +++ b/EKSound.j @@ -1,261 +1,248 @@ /* * CPSound.j * * Created by Elias Klughammer on December 21, 2009. * * The MIT License * * Copyright (c) 2009 Elias Klughammer * * Permission is hereby granted, free of charge, to...
eliaskg/EKSound
fd6234717221887866138066c8c674561cb65e13
Multi browser support
diff --git a/EKSound.j b/EKSound.j index f8524a9..45940b7 100644 --- a/EKSound.j +++ b/EKSound.j @@ -1,261 +1,261 @@ /* * CPSound.j * * Created by Elias Klughammer on December 21, 2009. * * The MIT License * * Copyright (c) 2009 Elias Klughammer * * Permission is hereby granted, free of charge, to...
eliaskg/EKSound
d0e1ad60f11f5530c8e99824b2ca1b5eddddb383
Multi browser support
diff --git a/EKSound.j b/EKSound.j index d77517b..f8524a9 100644 --- a/EKSound.j +++ b/EKSound.j @@ -1,208 +1,261 @@ /* * CPSound.j * * Created by Elias Klughammer on December 21, 2009. * * The MIT License * * Copyright (c) 2009 Elias Klughammer * * Permission is hereby granted, free of charge, to...
eliaskg/EKSound
d5b24d7e0cf83402034692f4eabc8dd1d18cd9eb
added licence
diff --git a/EKSound.j b/EKSound.j index c08e663..d77517b 100644 --- a/EKSound.j +++ b/EKSound.j @@ -1,179 +1,208 @@ +/* + * CPSound.j + * + * Created by Elias Klughammer on December 21, 2009. + * + * The MIT License + * + * Copyright (c) 2009 Elias Klughammer + * + * Permission is hereby granted, free of charge, to...
eliaskg/EKSound
b9e1c1d6ef00c8e1033678cd1b8c377f0c0c3dd8
fixed typo
diff --git a/readme.markdown b/readme.markdown index 3c7ce7b..febd9cc 100644 --- a/readme.markdown +++ b/readme.markdown @@ -1,49 +1,49 @@ EKSound ========== This is port of NSSound for the [Cappuccino](http://www.cappuccino.org) framework. It works with the HTML5 "audio" tag. Please have in mind that this tech...
eliaskg/EKSound
e2db5e417edb682480cb53cbab484a0483cea5fd
fixed typo
diff --git a/EKSound.j b/EKSound.j index e9e1a91..c08e663 100644 --- a/EKSound.j +++ b/EKSound.j @@ -1,179 +1,179 @@ EKSoundDidFinishPlayingNotification = @"EKSoundDidFinishPlayingNotification"; @implementation EKSound : CPObject { id _delegate; DOMElement _sound; BOOL _isPlaying; BOOL _isPaused; BOO...
alexanderfunke/bigsource_zarkov
71a0f820e6523bac373bc1df13e5cd974c627090
Added Translation
diff --git a/feature/feature.xml b/feature/feature.xml index 3931a63..97364e0 100755 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="de.bigsource.zarkov" label="BigSource Zarkov" - version="0.9.0.4" + version="0.9.0.5" ...
alexanderfunke/bigsource_zarkov
3ae7d14c58c6b29e69ba01a5cf12166979ef53c6
General Changes
diff --git a/update_site/features/de.bigsource.zarkov_0.9.0.4.jar b/update_site/features/de.bigsource.zarkov_0.9.0.4.jar new file mode 100644 index 0000000..c4a3809 Binary files /dev/null and b/update_site/features/de.bigsource.zarkov_0.9.0.4.jar differ diff --git a/update_site/plugins/de.bigsource.zarkov_0.9.0.4.jar b...
alexanderfunke/bigsource_zarkov
1464cb0cfc3119d57e560bfd8515be9025874f6d
General Changes
diff --git a/feature/feature.xml b/feature/feature.xml index fa7a73b..3931a63 100755 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="de.bigsource.zarkov" label="BigSource Zarkov" - version="0.9.0.3" + version="0.9.0.4" ...
alexanderfunke/bigsource_zarkov
f0483f10b654bfa1adc2ade2cc936d38651cb64f
General Changes
diff --git a/plugin/bin/de/bigsource/zarkov/translations/TranslationUtil.class b/plugin/bin/de/bigsource/zarkov/translations/TranslationUtil.class new file mode 100644 index 0000000..1ffc0b6 Binary files /dev/null and b/plugin/bin/de/bigsource/zarkov/translations/TranslationUtil.class differ diff --git a/update_site/fe...
alexanderfunke/bigsource_zarkov
7cd199d1a80bec0137171818e464e71304247589
General Changes
diff --git a/feature/feature.xml b/feature/feature.xml index a03f0a8..fa7a73b 100755 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="de.bigsource.zarkov" label="BigSource Zarkov" - version="0.9.0.2" + version="0.9.0.3" ...
alexanderfunke/bigsource_zarkov
91900c76544af497ac9e9795a95ba10f58b26009
General Changes
diff --git a/plugin/bin/de/bigsource/zarkov/Zarkov.properties b/plugin/bin/de/bigsource/zarkov/Zarkov.properties new file mode 100644 index 0000000..22521ca --- /dev/null +++ b/plugin/bin/de/bigsource/zarkov/Zarkov.properties @@ -0,0 +1,47 @@ +general.max_execution_time = Max execution time reached! +general.specify_fi...
alexanderfunke/bigsource_zarkov
6b98b2e9380c2045428f8c55c2ae19be96db5845
General Changes
diff --git a/feature/feature.xml b/feature/feature.xml index e914e70..a03f0a8 100755 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="de.bigsource.zarkov" label="BigSource Zarkov" - version="0.9.0.1" + version="0.9.0.2" ...
alexanderfunke/bigsource_zarkov
b2a74c74b4d70a88b3518056bd7acb8f55a2db45
General Changes
diff --git a/feature/feature.xml b/feature/feature.xml index faf2e3c..e914e70 100755 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="de.bigsource.zarkov" label="BigSource Zarkov" - version="0.9.0.0" + version="0.9.0.1" ...
alexanderfunke/bigsource_zarkov
6c89a6566cd69f17875c7957bc4dfcff9b173bb7
Runtime Shared Library Path changed
diff --git a/plugin/bin/Zarkov.properties b/plugin/bin/Zarkov.properties index 0106651..22521ca 100644 --- a/plugin/bin/Zarkov.properties +++ b/plugin/bin/Zarkov.properties @@ -1,46 +1,47 @@ general.max_execution_time = Max execution time reached! general.specify_file_specs = Please specify the main class with <file_...
alexanderfunke/bigsource_zarkov
a761011ef9b8f2dc5b596bc787b370aee9cad372
Folders added
diff --git a/standalone/resources b/standalone/resources new file mode 120000 index 0000000..a24ee99 --- /dev/null +++ b/standalone/resources @@ -0,0 +1 @@ +../plugin/resources \ No newline at end of file diff --git a/testproject/zarkov/.DS_Store b/testproject/zarkov/.DS_Store new file mode 100644 index 0000000..52b0f1...
alexanderfunke/bigsource_zarkov
0b53ea7ded6d4ff1eede37872d760137917e7b7b
General Changes
diff --git a/plugin/.classpath b/plugin/.classpath index 39a0daf..cf54ffb 100644 --- a/plugin/.classpath +++ b/plugin/.classpath @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="resources"/> <classpathentry kind="con" p...
alexanderfunke/bigsource_zarkov
cafa37014588fc17890ca6b0a7377fee7898a805
standalone updated
diff --git a/standalone/src/de/bigsource/zarkov/ant b/standalone/src/de/bigsource/zarkov/ant new file mode 120000 index 0000000..9ce6c43 --- /dev/null +++ b/standalone/src/de/bigsource/zarkov/ant @@ -0,0 +1 @@ +../../../../../plugin/src/de/bigsource/zarkov/ant \ No newline at end of file diff --git a/standalone/src/de/...
alexanderfunke/bigsource_zarkov
5d02d9e23669ace73d057e21d921c8a7dc3c3dfc
General Changes
diff --git a/plugin/bin/Zarkov.properties b/plugin/bin/Zarkov.properties new file mode 100644 index 0000000..adc8052 --- /dev/null +++ b/plugin/bin/Zarkov.properties @@ -0,0 +1,40 @@ +general.max_execution_time = Max execution time reached! +general.specify_file_specs = Please specify the main class with <file_specs......
alexanderfunke/bigsource_zarkov
abaa90753baa57c3a84d02b10d8bca6890960977
resources added
diff --git a/feature/feature.xml b/feature/feature.xml index 2d5dcd5..faf2e3c 100755 --- a/feature/feature.xml +++ b/feature/feature.xml @@ -1,45 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> <feature id="de.bigsource.zarkov" label="BigSource Zarkov" - version="0.8.5.5" + version="0.9.0.0" ...
alexanderfunke/bigsource_zarkov
b88e7a591465785cae17370350a1493d881cbfed
fchs and wrapper in plugin integrated
diff --git a/plugin/src/de/bigsource/zarkov/wrapper/CompilerWrapper.java b/plugin/src/de/bigsource/zarkov/wrapper/CompilerWrapper.java index 038bd8c..abc4710 100644 --- a/plugin/src/de/bigsource/zarkov/wrapper/CompilerWrapper.java +++ b/plugin/src/de/bigsource/zarkov/wrapper/CompilerWrapper.java @@ -1,69 +1,159 @@ pac...
alexanderfunke/bigsource_zarkov
391a3498ce941f3ff0a8b8793baab07d5b668f52
base in plugin integrated
diff --git a/plugin/src/de/bigsource/zarkov/base/FlexStandardTask.java b/plugin/src/de/bigsource/zarkov/base/FlexStandardTask.java index 622112c..1d3aa2f 100644 --- a/plugin/src/de/bigsource/zarkov/base/FlexStandardTask.java +++ b/plugin/src/de/bigsource/zarkov/base/FlexStandardTask.java @@ -1341,536 +1341,536 @@ publi...
alexanderfunke/bigsource_zarkov
249105e1892e80377ea013ac6393b78acaf1c2a7
ant updated
diff --git a/plugin/src/de/bigsource/zarkov/ant/AAsDoc.java b/plugin/src/de/bigsource/zarkov/ant/AAsDoc.java index 2f6dde1..1657e87 100644 --- a/plugin/src/de/bigsource/zarkov/ant/AAsDoc.java +++ b/plugin/src/de/bigsource/zarkov/ant/AAsDoc.java @@ -1,53 +1,53 @@ package de.bigsource.zarkov.ant; import java.util.Arr...
strategix333/demo_app
ed97477891714f127da049057d140d941feb20a1
Done with the demo app
diff --git a/app/controllers/microposts_controller.rb b/app/controllers/microposts_controller.rb new file mode 100644 index 0000000..759e03a --- /dev/null +++ b/app/controllers/microposts_controller.rb @@ -0,0 +1,83 @@ +class MicropostsController < ApplicationController + # GET /microposts + # GET /microposts.xml + ...
thejoshwolfe/repatriator
81c5dec79a08d39b25fa6bbf72618cde7452d8df
fix bug: can't un-admin somebody
diff --git a/client/AdminWindow.cpp b/client/AdminWindow.cpp index a0a5dc2..7f036ac 100644 --- a/client/AdminWindow.cpp +++ b/client/AdminWindow.cpp @@ -1,266 +1,285 @@ #include "AdminWindow.h" #include "ui_AdminWindow.h" #include "OutgoingMessage.h" #include "PasswordInputWindow.h" #include "EditUserAccountWind...
thejoshwolfe/repatriator
912eeb0a224332fb91f32aa65edc7d5ee037c5df
vain attempts to get motor B to settle down
diff --git a/server/server.py b/server/server.py index a7728c7..115aaf8 100755 --- a/server/server.py +++ b/server/server.py @@ -266,543 +266,553 @@ def move_motor(motor, intended_position): @must_have_privilege(Privilege.OperateHardware) def handle_DirectoryListingRequest(msg): global server, user debug(...
thejoshwolfe/repatriator
8f2ef30e2fdd0d76a5348105dec51b63f1c806f9
delete trash.jpg after it is taken
diff --git a/server/server.py b/server/server.py index a7728c7..eee88d6 100755 --- a/server/server.py +++ b/server/server.py @@ -78,731 +78,733 @@ class Server: msg_size = struct.unpack_from(">q", header, 1)[0] return header + self._read_amt(msg_size - 9) def _run_writer(self): while T...
thejoshwolfe/repatriator
b1f745d4075a02b2dfa9edc88ef26b02bfd4d9a0
motor B should have no encoder and no holding current
diff --git a/server/server.py b/server/server.py index 7559d3f..23caf71 100755 --- a/server/server.py +++ b/server/server.py @@ -233,574 +233,576 @@ edsdk._make_thread = make_thread @must_have_privilege(Privilege.OperateHardware) def handle_TakePicture(msg): debug("Got take picture message") def unique_fi...
thejoshwolfe/repatriator
41e8896ea591de2b3e1a861d51e88b9dc70c5325
motor_console updates
diff --git a/server/motor_console.py b/server/motor_console.py index 4e5c162..40fc5d4 100644 --- a/server/motor_console.py +++ b/server/motor_console.py @@ -1,157 +1,170 @@ #!/usr/bin/env python import sys import time import optparse import silverpak def createA(): motor = silverpak.Silverpak() mo...
thejoshwolfe/repatriator
f847d7ab31fe6110adbfe1b2bcb8da8af3f06270
up the version number to 1.0.0
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index 0c57f0c..b6f8f73 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,784 +1,791 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include "EditBookmarkDialog.h" #include "Ch...
thejoshwolfe/repatriator
ea3ed3d72f822cf8450dd068de831d6366975274
Add mac icon file
diff --git a/client/RepatriatorClient.pro b/client/RepatriatorClient.pro index 845d09a..5281792 100644 --- a/client/RepatriatorClient.pro +++ b/client/RepatriatorClient.pro @@ -1,58 +1,59 @@ # ------------------------------------------------- # Project created by QtCreator 2010-12-17T16:29:53 # -------------------...
thejoshwolfe/repatriator
8ad350357a1997b238cc756bee69e006ed0bd3a9
documentation for building and setting up a server
diff --git a/docs/hardware.html b/docs/hardware.html index 141b2be..2d4b087 100644 --- a/docs/hardware.html +++ b/docs/hardware.html @@ -1,12 +1,173 @@ <html> <head> -<title>Building a Server - Repatriator Documentation</title> + <title>Building a Server - Repatriator Documentation</title> </head> <body> -<h1>Bu...
thejoshwolfe/repatriator
f22c7f0cbba51c2575ff616512492603f44ba992
client support for edit motor bounds
diff --git a/client/EditMotorBoundsDialog.cpp b/client/EditMotorBoundsDialog.cpp new file mode 100644 index 0000000..b73eb93 --- /dev/null +++ b/client/EditMotorBoundsDialog.cpp @@ -0,0 +1,99 @@ +#include "EditMotorBoundsDialog.h" +#include "ui_EditMotorBoundsDialog.h" + +EditMotorBoundsDialog * EditMotorBoundsDialog::...
thejoshwolfe/repatriator
3fee8dd539809a34b92a807e0f8453916dc1104f
use better defaults for driver address
diff --git a/server/settings.py b/server/settings.py index c70d6e4..ed66363 100644 --- a/server/settings.py +++ b/server/settings.py @@ -1,72 +1,72 @@ import socket import os, sys # settings dict. # name: default # use a file called config.py to override these settings settings = { # address to bind the se...
thejoshwolfe/repatriator
5a84738c135d4d3a2c53be74e58b9d02dac323e0
save the user input to settings if it was blank
diff --git a/client/Connector.cpp b/client/Connector.cpp index ffa67f6..489d3f0 100644 --- a/client/Connector.cpp +++ b/client/Connector.cpp @@ -1,112 +1,116 @@ #include "Connector.h" #include "PasswordInputWindow.h" #include "IncomingMessage.h" +#include "Settings.h" #include <QMessageBox> Connector::Connec...
thejoshwolfe/repatriator
efd0ae3217d94f25ac25284afa3c70fa49ae5fa0
client can handle url as a parameter
diff --git a/client/AdminWindow.cpp b/client/AdminWindow.cpp index cabd4d1..a0a5dc2 100644 --- a/client/AdminWindow.cpp +++ b/client/AdminWindow.cpp @@ -1,265 +1,266 @@ #include "AdminWindow.h" #include "ui_AdminWindow.h" #include "OutgoingMessage.h" #include "PasswordInputWindow.h" #include "EditUserAccountWind...
thejoshwolfe/repatriator
1f0a43d58d2e1f15791865d391ba7f32b82d761f
using integer division
diff --git a/server/admin.py b/server/admin.py index 63aefe3..d39ce5e 100644 --- a/server/admin.py +++ b/server/admin.py @@ -1,221 +1,221 @@ import json import string import random import hashlib import threading import shutil from settings import settings import os, sys from logging import debug, warning, err...
thejoshwolfe/repatriator
5546adb1a8cbd551b345dd775a7aa9db7171008f
moving motor bounds from config.py to config.json
diff --git a/server/README b/server/README index 7145721..c775929 100644 --- a/server/README +++ b/server/README @@ -1,328 +1,342 @@ Installation: install python 3.1 32-bit to C:\Python31 or somewhere else. install pywin32-214.win32-py3.1.exe. copy C:\Python31\Lib\site-packages\pywin32_system32\py...
thejoshwolfe/repatriator
29fff5be3943cf1856da9d68131aad2666de2f6e
look for repatriator.ini in the folder of the executable
diff --git a/client/Settings.cpp b/client/Settings.cpp index cf14dd2..1929a37 100644 --- a/client/Settings.cpp +++ b/client/Settings.cpp @@ -1,89 +1,92 @@ #include "Settings.h" #include <QSettings> +#include <QCoreApplication> +#include <QDir> const char * Settings::settings_file = "repatriator.ini"; QSettings * ...
thejoshwolfe/repatriator
dbed3c7c8cc80e322eed7cb3474a1a3533c2b49b
docs skeleton
diff --git a/README.txt b/README.txt index 288706e..1294ee4 100644 --- a/README.txt +++ b/README.txt @@ -1,27 +1,28 @@ The Repatriator developers: - Josh Wolfe <thejoshwolfe@gmail.com> - Andrew Kelley <andrew.r.kelley@gmail.com> This software allows remote users to control a Repatriator aparatus, which contains...
thejoshwolfe/repatriator
6170f489f4120deed28262e22fa2d3d196fa4338
installer hooks up RepatriatorClient to handle repatriator:// urls
diff --git a/client/install.nsi b/client/install.nsi index 0d83cc5..4dc1981 100644 --- a/client/install.nsi +++ b/client/install.nsi @@ -1,75 +1,82 @@ Name "RepatriatorClient" OutFile "RepatriatorClientSetup.exe" InstallDir "$PROGRAMFILES\RepatriatorClient" InstallDirRegKey HKLM "Software\RepatriatorClient" "...
thejoshwolfe/repatriator
e01a6e1a98381c7e2a9786cb8ca2d8fc7a4bfc66
add NSIS install script
diff --git a/client/install.nsi b/client/install.nsi new file mode 100644 index 0000000..0d83cc5 --- /dev/null +++ b/client/install.nsi @@ -0,0 +1,75 @@ +Name "RepatriatorClient" +OutFile "RepatriatorClientSetup.exe" + +InstallDir "$PROGRAMFILES\RepatriatorClient" +InstallDirRegKey HKLM "Software\RepatriatorClient"...
thejoshwolfe/repatriator
be7823d95f9fcff95ca56a18c8683d5f8cefccd2
add new message to handler
diff --git a/server/server.py b/server/server.py index 89a3aed..505d466 100755 --- a/server/server.py +++ b/server/server.py @@ -1,793 +1,794 @@ #!/usr/bin/env python3 # set up logging first from settings import settings import logging import os, sys def set_up_logging(): log_levels = { 'DEBUG': l...
thejoshwolfe/repatriator
458a988ad4dfa2b317a59f0fded9e9a8caa5f788
add exposure compensation message and hook it up to ui
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index fd910e1..d431dd8 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,695 +1,730 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include "EditBookmarkDialog.h" #include "Ch...
thejoshwolfe/repatriator
eb5bd05a0e21f6cb06e7bf8767525edb13d2ab07
setting the title of the bookmarks dock to 'Edit Locations' when in admin mode
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index f22e9db..19b6a06 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,652 +1,654 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include "EditBookmarkDialog.h" #include "Ch...
thejoshwolfe/repatriator
b148c079548982de09b523b8411acb2ba1a03541
editing static bookmarks updates the buttons.
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index 7fef24b..f22e9db 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,715 +1,731 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include "EditBookmarkDialog.h" #include "Ch...
thejoshwolfe/repatriator
6f616a4ff053f5f91ed0c788abd77c48c33f1ba6
New Bookmark... button works.
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index fd910e1..7fef24b 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -110,586 +110,606 @@ void MainWindow::showWithConnection(ConnectionSettings *connection) success = connect(m_server.data(), SIGNAL(messageReceived(QSharedPointer<Incom...
thejoshwolfe/repatriator
39d877ab794ce4fec27f2288881ea76466e0c8d5
made Here and Ignore buttons work on the edit bookmark dialog
diff --git a/client/EditBookmarkDialog.cpp b/client/EditBookmarkDialog.cpp index dd9a3f3..238cf3a 100644 --- a/client/EditBookmarkDialog.cpp +++ b/client/EditBookmarkDialog.cpp @@ -1,122 +1,133 @@ #include "EditBookmarkDialog.h" #include "ui_EditBookmarkDialog.h" EditBookmarkDialog * EditBookmarkDialog::s_instance...
thejoshwolfe/repatriator
b046d2b419958be22d35ed638ec01fcf9a98d0b9
warn if we don't have jpeg plugin
diff --git a/client/main.cpp b/client/main.cpp index a6b55ef..345efb2 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -1,13 +1,28 @@ -#include <QtGui/QApplication> +#include <QApplication> +#include <QImageReader> +#include <QMessageBox> +#include <QDebug> + #include "ConnectionWindow.h" #include "Settings.h" ...
thejoshwolfe/repatriator
e15554981a9e3312a49bf12130a39b35f224fd2b
fix a couple windows incompatibilities
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index 1e571b2..fd910e1 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,634 +1,634 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include "EditBookmarkDialog.h" #include "Ch...
thejoshwolfe/repatriator
f4c464b14135559eac89faf9a41775eb4a9082ec
get rid of rotate3d widget
diff --git a/client/RepatriatorClient.pro b/client/RepatriatorClient.pro index 5a6b587..845d09a 100644 --- a/client/RepatriatorClient.pro +++ b/client/RepatriatorClient.pro @@ -1,60 +1,58 @@ -# ------------------------------------------------- -# Project created by QtCreator 2010-12-17T16:29:53 -# ---------------------...
thejoshwolfe/repatriator
76c49591232156b46ea9244e593e8ad7ecb44982
fix problem with change password message
diff --git a/server/server.py b/server/server.py index 44ebc40..e53b4cd 100755 --- a/server/server.py +++ b/server/server.py @@ -1,787 +1,787 @@ #!/usr/bin/env python3 # set up logging first from settings import settings import logging import os, sys def set_up_logging(): log_levels = { 'DEBUG': l...
thejoshwolfe/repatriator
a51f8c7337a6aa4520d4f57553298064fad8afc3
sliders respond to arrow keys
diff --git a/client/ShadowMinimap.cpp b/client/ShadowMinimap.cpp index 234f8c3..c4bcaf6 100644 --- a/client/ShadowMinimap.cpp +++ b/client/ShadowMinimap.cpp @@ -1,157 +1,164 @@ #include "ShadowMinimap.h" #include <QPainter> #include <QCursor> #include <QApplication> #include <QDebug> #include <QToolTip> Shad...
thejoshwolfe/repatriator
d21873c32157c1eb7ee305b1e6ca4926ef6eaf71
fix race condition with deleting files
diff --git a/server/messages.py b/server/messages.py index 1922594..b9f0c49 100644 --- a/server/messages.py +++ b/server/messages.py @@ -1,498 +1,499 @@ from version import version import struct import os, sys import logging from logging import debug, warning, error __all__ = [] __all__.append('ClientMessage...
thejoshwolfe/repatriator
8c0dd44a66cb6401ab1ca16d3df106d4b9d0a78b
draw helpful text and graphics in image display widget
diff --git a/client/ImageDisplayWidget.cpp b/client/ImageDisplayWidget.cpp index 9210f90..38ffe7d 100644 --- a/client/ImageDisplayWidget.cpp +++ b/client/ImageDisplayWidget.cpp @@ -1,109 +1,125 @@ #include "ImageDisplayWidget.h" #include <QPainter> ImageDisplayWidget::ImageDisplayWidget(QWidget *parent) : Q...
thejoshwolfe/repatriator
e5324da98a760f4db9987599c5ab5cd9fd588d5f
adjust timing of incantation
diff --git a/server/server.py b/server/server.py index 087a17d..44ebc40 100755 --- a/server/server.py +++ b/server/server.py @@ -85,703 +85,703 @@ class Server: if item.message_type == ServerMessage.DummyCloseConnection: debug("closing connection and exiting thread") ...
thejoshwolfe/repatriator
cf2c70b56af3e87f73e85e6e84c4ce7d8278dce6
server automatically performs magical incantation to fix auto focus
diff --git a/server/server.py b/server/server.py index 19d4f83..087a17d 100755 --- a/server/server.py +++ b/server/server.py @@ -58,711 +58,730 @@ class Server: raw_data = message.serialize() debug("writing outgoing message of type " + message.__class__.__name__) self.request.sendall(raw_data...
thejoshwolfe/repatriator
2fc51deb53f4fa0b1f4eb72b91933b3c1199124e
refactor control enabling in main window
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index b8c6c47..cbdf1a3 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,696 +1,692 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include "EditBookmarkDialog.h" #include "Ch...
thejoshwolfe/repatriator
71fa64cf554d6e18a9dcedcdfbc697fdf9184298
more accurate focus box - takes into account aspect ratio
diff --git a/client/ImageDisplayWidget.cpp b/client/ImageDisplayWidget.cpp index d037ba6..9210f90 100644 --- a/client/ImageDisplayWidget.cpp +++ b/client/ImageDisplayWidget.cpp @@ -1,107 +1,109 @@ #include "ImageDisplayWidget.h" #include <QPainter> ImageDisplayWidget::ImageDisplayWidget(QWidget *parent) : Q...
thejoshwolfe/repatriator
15a9f4878c15fff644cd087ebca5807b7c08c965
never auto focus when taking picture
diff --git a/server/server.py b/server/server.py index 6e56e84..19d4f83 100755 --- a/server/server.py +++ b/server/server.py @@ -1,771 +1,768 @@ #!/usr/bin/env python3 # set up logging first from settings import settings import logging import os, sys def set_up_logging(): log_levels = { 'DEBUG': l...
thejoshwolfe/repatriator
8d90e2c223ea6400a6c6642bbaff13e625acb80c
allow clients to change their passwords
diff --git a/client/AdminWindow.cpp b/client/AdminWindow.cpp index 2818813..cabd4d1 100644 --- a/client/AdminWindow.cpp +++ b/client/AdminWindow.cpp @@ -1,275 +1,265 @@ #include "AdminWindow.h" #include "ui_AdminWindow.h" #include "OutgoingMessage.h" #include "PasswordInputWindow.h" #include "EditUserAccountWind...
thejoshwolfe/repatriator
ced4c52509dbe00aa11c2473498c7a6d98c07d4f
move download directory to settings, not per connection
diff --git a/client/ConnectionSettings.cpp b/client/ConnectionSettings.cpp index 7ce21a9..d3e74b8 100644 --- a/client/ConnectionSettings.cpp +++ b/client/ConnectionSettings.cpp @@ -1,31 +1,28 @@ #include "ConnectionSettings.h" #include <QSettings> ConnectionSettings::ConnectionSettings() : host(), port...
thejoshwolfe/repatriator
c1c7e77352dae48f0ba43cb1c16d55cc4978a4db
Edit... works. edit bookmark dialog partly works.
diff --git a/client/EditBookmarkDialog.cpp b/client/EditBookmarkDialog.cpp new file mode 100644 index 0000000..dd9a3f3 --- /dev/null +++ b/client/EditBookmarkDialog.cpp @@ -0,0 +1,122 @@ +#include "EditBookmarkDialog.h" +#include "ui_EditBookmarkDialog.h" + +EditBookmarkDialog * EditBookmarkDialog::s_instance = NULL; +...
thejoshwolfe/repatriator
d4d9206832d773f896c6e27be80fae94fccc25c2
snazzy looking focus location
diff --git a/client/ImageDisplayWidget.cpp b/client/ImageDisplayWidget.cpp index d3d0c66..d037ba6 100644 --- a/client/ImageDisplayWidget.cpp +++ b/client/ImageDisplayWidget.cpp @@ -1,91 +1,107 @@ #include "ImageDisplayWidget.h" #include <QPainter> ImageDisplayWidget::ImageDisplayWidget(QWidget *parent) : QW...
thejoshwolfe/repatriator
d016aaac5d56edc32b49b843f4420a669af11cf3
ability to set focus point
diff --git a/client/ImageDisplayWidget.cpp b/client/ImageDisplayWidget.cpp index 68b5a46..d3d0c66 100644 --- a/client/ImageDisplayWidget.cpp +++ b/client/ImageDisplayWidget.cpp @@ -1,91 +1,91 @@ #include "ImageDisplayWidget.h" #include <QPainter> ImageDisplayWidget::ImageDisplayWidget(QWidget *parent) : QWi...
thejoshwolfe/repatriator
3506470305ccc8f3a31c663e52167712c5f3be91
draw a focus rectangle on display widget
diff --git a/client/ImageDisplayWidget.cpp b/client/ImageDisplayWidget.cpp index c7199a5..68b5a46 100644 --- a/client/ImageDisplayWidget.cpp +++ b/client/ImageDisplayWidget.cpp @@ -1,52 +1,91 @@ #include "ImageDisplayWidget.h" #include <QPainter> ImageDisplayWidget::ImageDisplayWidget(QWidget *parent) : QWi...
thejoshwolfe/repatriator
21bafea9ac6dd6f08a85d475c0d665d9dfe7a88f
turn off auto focus while shooting if auto focus is disabled
diff --git a/server/server.py b/server/server.py index 46f325e..8bb4b67 100755 --- a/server/server.py +++ b/server/server.py @@ -1,754 +1,760 @@ #!/usr/bin/env python3 # set up logging first from settings import settings import logging import os, sys def set_up_logging(): log_levels = { 'DEBUG': l...
thejoshwolfe/repatriator
9352cd3e8b6766ee68b0a2a41a2f246b289df206
deleteing bookmarks works
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index c252084..ef97d69 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,628 +1,636 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include <QFile> #include <QDir> #include...
thejoshwolfe/repatriator
cf206a23f8393179677ceb36d4c5f95d9bd05dae
turning encoder back on for motor B
diff --git a/server/settings.py b/server/settings.py index ab4fe7d..2241534 100644 --- a/server/settings.py +++ b/server/settings.py @@ -1,92 +1,92 @@ import socket import os, sys # settings dict. # name: default # use a file called config.py to override these settings settings = { # address to bind the se...
thejoshwolfe/repatriator
062ccff349e44d8caf3f1c1af94a556cf489301a
bookmarks are persistent
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index 257020c..c252084 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,626 +1,628 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include <QFile> #include <QDir> #include...
thejoshwolfe/repatriator
cbb1e7cf6625c01705741f280302230a81685c59
Bookmark Here and Go To buttons work. bookmarks aren't saved yet
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp index 02438f9..257020c 100644 --- a/client/MainWindow.cpp +++ b/client/MainWindow.cpp @@ -1,592 +1,626 @@ #include "MainWindow.h" #include "ui_MainWindow.h" #include "ConnectionWindow.h" #include "Settings.h" #include <QFile> #include <QDir> #include...
thejoshwolfe/repatriator
0be7307009e02af14aebfcfe0352b54d48205588
not echoing anything in the run_server scripts
diff --git a/server/run_server.bat b/server/run_server.bat index 6929edb..a735feb 100644 --- a/server/run_server.bat +++ b/server/run_server.bat @@ -1,6 +1,5 @@ @echo off -echo entering infinite loop :LoopForever python %~dp0\server.py goto LoopForever diff --git a/server/run_server.sh b/server/run_server.sh inde...
thejoshwolfe/repatriator
e8b6036a0cbd0718c166d28a26b353371d54774a
use edsdk._make_thread
diff --git a/server/server.py b/server/server.py index c697877..46f325e 100755 --- a/server/server.py +++ b/server/server.py @@ -1,743 +1,743 @@ #!/usr/bin/env python3 # set up logging first from settings import settings import logging import os, sys def set_up_logging(): log_levels = { 'DEBUG': l...
thejoshwolfe/repatriator
a9fb546f9c2db902fdd46699327f53d4b82f842e
adding motor_console.py
diff --git a/server/motor_console.py b/server/motor_console.py new file mode 100644 index 0000000..4e5c162 --- /dev/null +++ b/server/motor_console.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python + +import sys +import time +import optparse + +import silverpak + +def createA(): + motor = silverpak.Silverpak() + motor....
thejoshwolfe/repatriator
09e3d153bff567aaec4dba87b7dd9a5a74c2dceb
delete duplicated code
diff --git a/server/server.py b/server/server.py index 59383a8..c697877 100755 --- a/server/server.py +++ b/server/server.py @@ -1,756 +1,754 @@ #!/usr/bin/env python3 # set up logging first from settings import settings import logging import os, sys def set_up_logging(): log_levels = { 'DEBUG': l...
thejoshwolfe/repatriator
e24a3bb586eb2d4e9b354308847f075534e03fa5
do live view in another thread
diff --git a/server/server.py b/server/server.py index 7efc382..59383a8 100755 --- a/server/server.py +++ b/server/server.py @@ -1,744 +1,756 @@ #!/usr/bin/env python3 # set up logging first from settings import settings import logging import os, sys def set_up_logging(): log_levels = { 'DEBUG': l...