repo
string
commit
string
message
string
diff
string
simonhn/pav-api
91764f79dbed0d36527bc2d5ab3a7fc2f0e9b6ec
updating gemfile
diff --git a/Gemfile.lock b/Gemfile.lock index 7a71b32..f33a9a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,114 +1,117 @@ GEM remote: http://rubygems.org/ specs: activesupport (3.0.9) addressable (2.2.6) beanstalk-client (1.1.0) builder (3.0.0) chronic (0.6.2) chronic_duratio...
simonhn/pav-api
156a6d5fc9d2dd5171fc2e3bc9483eaa004c8e51
enabling CORS. a bit too open now, must tweak later
diff --git a/Gemfile b/Gemfile index 962ed9a..665e758 100644 --- a/Gemfile +++ b/Gemfile @@ -1,36 +1,37 @@ source :rubygems gem 'sinatra' gem 'json' gem 'rack' gem 'rack-contrib', :require => 'rack/contrib' gem 'builder' gem 'rbrainz' gem 'rchardet19' gem 'rest-client', :require=>'rest_client' gem 'crac...
simonhn/pav-api
7f1bad0eaaf5a3f2f5aa5ef501fc7c3d3731baac
removing group by from query, multiple artists for a track will appear twice from now on, but muuuuch better performance
diff --git a/routes/play.rb b/routes/play.rb index 3914a9a..8458890 100644 --- a/routes/play.rb +++ b/routes/play.rb @@ -1,34 +1,34 @@ #PLAY get "/#{@version}/plays" do #DATE_FORMAT(playedtime, '%d %m %Y %H %i %S') artist_query = get_artist_query(params[:artist_query]) track_query = get_track_query(params[:t...
simonhn/pav-api
ce002a54341f5938d94a4b9a961df8c702507396
adding programs to /details
diff --git a/routes/artist.rb b/routes/artist.rb index 60b3a40..4f257a4 100644 --- a/routes/artist.rb +++ b/routes/artist.rb @@ -1,211 +1,220 @@ #show all artists, defaults to 10, ordered by created date get "/#{@version}/artists" do limit = get_limit(params[:limit]) channel = params[:channel] if channel ...
simonhn/pav-api
5cf960a97083b3889265620e7347a1e21f44d562
styling the toc
diff --git a/public/css/master.css b/public/css/master.css index 45d66e9..77bf135 100644 --- a/public/css/master.css +++ b/public/css/master.css @@ -1,23 +1,24 @@ h1{ font-size: 3em; font-weight: 300; } ul li a{ font-weight: normal; } ul li ul li a{ font-weight: normal; } .row .span5{ - background-co...
simonhn/pav-api
b5a2e63a3f290cb882a8613639f20b89da29b0a4
styling the documentation
diff --git a/public/css/master.css b/public/css/master.css index 2284b6b..45d66e9 100644 --- a/public/css/master.css +++ b/public/css/master.css @@ -1,63 +1,23 @@ -body { font-family: " Georgia, serif"; margin: 0; padding: 0; } -header, article, section, aside, footer { display: block; } -h1, h2, h3, h4, h5, h6, p { ma...
simonhn/pav-api
d9eef49110f4057e5faddcc931bc1a50229d3eb4
adding artist/id/albums and artist/id/plays to the mix
diff --git a/routes/artist.rb b/routes/artist.rb index e3230de..60b3a40 100644 --- a/routes/artist.rb +++ b/routes/artist.rb @@ -1,202 +1,211 @@ #show all artists, defaults to 10, ordered by created date get "/#{@version}/artists" do limit = get_limit(params[:limit]) channel = params[:channel] if channel ...
simonhn/pav-api
9d59250fc1feb31db074fd3af5a1d6dae3c82fe5
making programs null in db if no program available. tweaking details output
diff --git a/jobs.rb b/jobs.rb index a4c81d0..eaba3da 100644 --- a/jobs.rb +++ b/jobs.rb @@ -1,252 +1,257 @@ #datamapper stuff require 'dm-core' require 'dm-timestamps' require 'dm-aggregates' require 'dm-migrations' #require #Models - to be moved to individual files class Artist include DataMapper::Re...
simonhn/pav-api
58e740cf734a7088daaf1b36f28fd165c292d486
adding some missing output data to xml template etc
diff --git a/routes/demo.rb b/routes/demo.rb index 4df1038..24ce176 100644 --- a/routes/demo.rb +++ b/routes/demo.rb @@ -1,124 +1,124 @@ -get '/demo' do +get '/demo/?' do respond_to do |wants| wants.html{erb :demo} end end get '/demo/album-charts' do from_date = DateTime.now - 7 @from_date_string =...
simonhn/pav-api
b624a988e29fc6f4223894e14034ef0d776b16ab
adding artist detail and demo that uses it
diff --git a/public/css/bootstrap-1.0.0.css b/public/css/bootstrap-1.0.0.css index e9453dc..ef78c6c 100644 --- a/public/css/bootstrap-1.0.0.css +++ b/public/css/bootstrap-1.0.0.css @@ -1,227 +1,227 @@ html,body{margin:0;padding:0;} h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s...
simonhn/pav-api
6dec397fa6e17f768dcca0dfd5f4972738f9931b
styling enmasse
diff --git a/public/css/bootstrap-1.0.0.css b/public/css/bootstrap-1.0.0.css index d5e3434..e9453dc 100644 --- a/public/css/bootstrap-1.0.0.css +++ b/public/css/bootstrap-1.0.0.css @@ -1,223 +1,227 @@ html,body{margin:0;padding:0;} h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s...
simonhn/pav-api
c0545bfc6bc62ea93f0e187c95e07a9fed7e3dfd
styling some more
diff --git a/views/admin.html.erb b/views/admin.html.erb index 3ef163c..51fb6cf 100644 --- a/views/admin.html.erb +++ b/views/admin.html.erb @@ -1,7 +1,7 @@ -<h1>Admin dashboard</h1> +<h2>Admin dashboard</h2> <ul> <li><a href="/admin/stats">Stats</a></li> <li><a href="/admin/duplicate/artist">Duplicate artists</a>...
simonhn/pav-api
9c634fca5952fe8fc3480a4049ce002011965dba
styling
diff --git a/views/plays.html.erb b/views/plays.html.erb index a35654f..a2006a1 100644 --- a/views/plays.html.erb +++ b/views/plays.html.erb @@ -1,290 +1,30 @@ - -<style type="text/css"> - -body{font-size: 0.75em;} -#just_played #song_list { - float: left; - margin: 2px 0 10px; - } - - #just_played ...
simonhn/pav-api
218c9a80b2eec1de7da9d50323ef7dc9b5321d30
styling up the demos a bit
diff --git a/public/css/bootstrap-1.0.0.css b/public/css/bootstrap-1.0.0.css new file mode 100644 index 0000000..d5e3434 --- /dev/null +++ b/public/css/bootstrap-1.0.0.css @@ -0,0 +1,223 @@ +html,body{margin:0;padding:0;} +h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small...
simonhn/pav-api
dea965c035045ac3d96c8c3a02b3869c07f8ac7b
linting the js
diff --git a/views/program_chart.html.erb b/views/program_chart.html.erb index 28ecdd3..cf11777 100644 --- a/views/program_chart.html.erb +++ b/views/program_chart.html.erb @@ -1,173 +1,172 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script> <style> .s...
simonhn/pav-api
e7de1906a7af9a593f35d0a939181b33a3163254
using track id to compare
diff --git a/views/program_chart.html.erb b/views/program_chart.html.erb index d52f977..28ecdd3 100644 --- a/views/program_chart.html.erb +++ b/views/program_chart.html.erb @@ -1,175 +1,173 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script> <style> .s...
simonhn/pav-api
b331a29507bd037482716d87ca437949848b41f8
adding program chart to demos
diff --git a/public/images/down_icon.png b/public/images/down_icon.png new file mode 100644 index 0000000..698e9e7 Binary files /dev/null and b/public/images/down_icon.png differ diff --git a/public/images/new_icon.png b/public/images/new_icon.png new file mode 100644 index 0000000..bd2dbd7 Binary files /dev/null and b...
simonhn/pav-api
14a29193aed2fffbb56b5bee71964a5e33457de3
new track chart query
diff --git a/pavapi.rb b/pavapi.rb index ebae49f..9131321 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,279 +1,279 @@ #versioning @version = "v1" #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_j...
simonhn/pav-api
060271a5f9cba9079776bc4d8ef963e340a03120
adding program filter to artist album and plays
diff --git a/routes/chart.rb b/routes/chart.rb index c9669d4..2ae357d 100644 --- a/routes/chart.rb +++ b/routes/chart.rb @@ -1,46 +1,48 @@ # chart of top tracks get "/#{@version}/chart/track" do program = get_program(params[:program]) limit = get_limit(params[:limit]) to_from = make_to_from(params[:from], pa...
simonhn/pav-api
df39666d0657f735cabdb338ad1f8a6dddd4bee0
adding program as a parameter to track chart
diff --git a/pavapi.rb b/pavapi.rb index 79ceb82..ebae49f 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,281 +1,279 @@ #versioning @version = "v1" #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_j...
simonhn/pav-api
47850c618d30d566a3f7e0fa5ef7ad1af45dac3f
adding programs into the mix
diff --git a/Gemfile.lock b/Gemfile.lock index 98d3732..7a71b32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,114 +1,114 @@ GEM remote: http://rubygems.org/ specs: activesupport (3.0.9) addressable (2.2.6) beanstalk-client (1.1.0) builder (3.0.0) - chronic (0.5.0) + chronic (0.6.2)...
simonhn/pav-api
45d849d90b452d8db3eb7102dc89395a2135a24a
massive refactoring and admin paths
diff --git a/pavapi.rb b/pavapi.rb index 2ea99bc..982893f 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,789 +1,279 @@ +#versioning +@version = "v1" + #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' - #Queueing with delayed job #require 'delayed_job' #require 'delayed...
simonhn/pav-api
7b63724b768cf3347ee29b56314f645939cb3f0b
adding better merging
diff --git a/pavapi.rb b/pavapi.rb index 80ea982..2ea99bc 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,805 +1,789 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
8464b12cbae964a74eff52de9d0d4616b7eb3fb6
better album merge
diff --git a/pavapi.rb b/pavapi.rb index cab1b91..80ea982 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,770 +1,805 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
df5cf42b77f347088b41560eff50f268041442df
adding merge functionality
diff --git a/pavapi.rb b/pavapi.rb index ee19d63..cab1b91 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -73,616 +73,698 @@ before '/*' do end before '/demo/*' do cache_control :public, :must_revalidate, :max_age => 3600 unless development? end before '*/chart/*' do cache_control :public, :must_revalidate, :ma...
simonhn/pav-api
77119c65768472f61a736af0c4a89d3967f25ff8
refarcoring of charts and adding artist merge-functionality
diff --git a/pavapi.rb b/pavapi.rb index 39cadf4..ee19d63 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,669 +1,688 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
165e9305ea23db428cfac86f92db909aa39edfe1
fixing some template inconcistence
diff --git a/pavapi.rb b/pavapi.rb index 882d324..39cadf4 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -20,649 +20,650 @@ use Rack::JSONP require 'rest_client' require 'crack' #musicbrainz stuff require 'rbrainz' include MusicBrainz require 'rchardet19' require 'logger' #time parsing require 'chronic_duration...
simonhn/pav-api
9c7d41a57cf8037908fedc051bfc1b4db6f79a5b
fixing typo
diff --git a/pavapi.rb b/pavapi.rb index 01cc30e..882d324 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -9,660 +9,660 @@ require './store_methods' #require 'delayed_job_data_mapper' #require './storetrackjob' require 'stalker' #template systems require 'yajl/json_gem' require 'rack/contrib/jsonp' require 'builder'...
simonhn/pav-api
527348266488785991f2c97f992214b2d05f9be3
adding order by and search to play resource path
diff --git a/pavapi.rb b/pavapi.rb index a2a45f1..01cc30e 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,632 +1,668 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
21652f8e71cbc1c282c14570199fbd807157bb7a
fixing line break
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb index f2666eb..45053a5 100644 --- a/views/album_chart_all.html.erb +++ b/views/album_chart_all.html.erb @@ -1,292 +1,292 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script> <scri...
simonhn/pav-api
a1a0e8d8808fdc3c9e5a6a9179459ae2ff22094f
fixing line break
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb index 89c8894..f2666eb 100644 --- a/views/album_chart_all.html.erb +++ b/views/album_chart_all.html.erb @@ -1,290 +1,292 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script> <scri...
simonhn/pav-api
ae29bb8ee14cd24fbfe244d9118f8b6ce7d3afd1
more expire tweaks
diff --git a/pavapi.rb b/pavapi.rb index b267dd6..a2a45f1 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,592 +1,595 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
11c1b1d5c94d632cd146fb6de758d45c6a14b3f0
adjusting expire values for better caching
diff --git a/pavapi.rb b/pavapi.rb index fa307a6..b267dd6 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,584 +1,590 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
7cd6ff6309ee33b35896988785ee45120e7e5f18
updating gems to latest versions
diff --git a/Gemfile.lock b/Gemfile.lock index d12ba4f..98d3732 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,114 +1,114 @@ GEM remote: http://rubygems.org/ specs: - activesupport (3.0.7) + activesupport (3.0.9) addressable (2.2.6) beanstalk-client (1.1.0) builder (3.0.0) - chronic (...
simonhn/pav-api
a957f6677c46280731fcebc1ecba09dd7e8806e1
setting fixed height for ie
diff --git a/views/album_chart_all.html.erb b/views/album_chart_all.html.erb index 123c623..b6f83c6 100644 --- a/views/album_chart_all.html.erb +++ b/views/album_chart_all.html.erb @@ -1,279 +1,280 @@ <script src="http://jmar777.googlecode.com/svn/trunk/js/jquery-1.2.6.js" type="text/javascript"></script> <script src...
simonhn/pav-api
740a7e6602e14983d8be74104453e9829644c897
adding album chart demo
diff --git a/pavapi.rb b/pavapi.rb index 90bcc4d..fa307a6 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,611 +1,623 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
9c0fd6130d1b7bb80b9c5e27c4918a5d7ad9ee1e
fixing slight mistakes
diff --git a/jobs.rb b/jobs.rb index 5472c44..2b4af26 100644 --- a/jobs.rb +++ b/jobs.rb @@ -1,250 +1,250 @@ #datamapper stuff require 'dm-core' require 'dm-timestamps' require 'dm-aggregates' require 'dm-migrations' #require #Models - to be moved to individual files class Artist include DataMapper::Re...
simonhn/pav-api
12e358304991bb72c04e0be07d3f3cb11244f511
using release group instead of release
diff --git a/jobs.rb b/jobs.rb index 79390f9..5472c44 100644 --- a/jobs.rb +++ b/jobs.rb @@ -1,243 +1,250 @@ #datamapper stuff require 'dm-core' require 'dm-timestamps' require 'dm-aggregates' require 'dm-migrations' #require #Models - to be moved to individual files class Artist include DataMapper::Re...
simonhn/pav-api
53bd4f6dfcc6768f8820bb87fc0457bc5437a1c4
adding artistname to album chart
diff --git a/views/album_chart.xml.builder b/views/album_chart.xml.builder index 3b182dc..faebd5c 100644 --- a/views/album_chart.xml.builder +++ b/views/album_chart.xml.builder @@ -1,6 +1,6 @@ xml.instruct! :xml, :version => '1.0' xml.chart do @albums.each do |album| - xml.album :count => album.cnt.to_i, :albumname...
simonhn/pav-api
a565243b300a19da706d08adba54f97ec092419e
adding artistname to album chart
diff --git a/pavapi.rb b/pavapi.rb index 7fba480..90bcc4d 100644 --- a/pavapi.rb +++ b/pavapi.rb @@ -1,611 +1,611 @@ #core stuff require 'rubygems' require 'sinatra' require './models' require './store_methods' #Queueing with delayed job #require 'delayed_job' #require 'delayed_job_data_mapper' #require './s...
simonhn/pav-api
4ae3eb539b64ce39064407ea7c7e89b3920481c0
use foreman to daemonize
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ab90ad8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +log/*.log +config/settings.yml +config/deploy.rb +config/deploy/* +.bundle\n diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..962ed9a --- /dev/null +++ b/Gemfile @@ -0,0 +1,...
drzazga/wspolbiezne_projekt
99f934762d8bbe6966d58e97576cb97a02fafa51
sprawdzanie przekroczenia limitu graczy
diff --git a/bsd.c b/bsd.c deleted file mode 100644 index dcb3640..0000000 --- a/bsd.c +++ /dev/null @@ -1,37 +0,0 @@ -#include <stdio.h> -#include <sys/socket.h> -#include <sys/types.h> -#include <netinet/in.h> -#include <signal.h> - -int main(int argc, char* argv[]) -{ - int sd,buff=3,clen; - struct sockaddr_in sad...
drzazga/wspolbiezne_projekt
caf95ce2c29ba5305686a009026803625b37f502
ver 0.1 do oddania
diff --git a/Makefile b/Makefile index bb21f14..1efcb91 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -CFLAGS=-L/usr/X11R6/lib -lX11 -lpthread +CFLAGS=-L/usr/X11R6/lib -lX11 -lpthread -lm programy= klient server all: klient server clean : rm -f *~ \#* $(programy) diff --git a/dokumentacja.txt b/dokume...
drzazga/wspolbiezne_projekt
973f242a4dd131a9b580cf53e59b1ae3e4137162
wstepna dokumentacja
diff --git a/dokumentacja.txt b/dokumentacja.txt new file mode 100644 index 0000000..3148373 --- /dev/null +++ b/dokumentacja.txt @@ -0,0 +1,15 @@ +Imię i nazwisko: Bartosz Drzazgowski +Zadanie: Przesuwanie koła przez wielu użytkowników. + +Uzasadnienie: Do komunikacji pomiędzy klientem a serwerem wybrałem gniazd...
drzazga/wspolbiezne_projekt
ab37102fcddc3b424ed52ee3242df3426cfad2f1
poprawne rysowanie na podstawie danych z serwera, pozostaje algorytm wyliczania wsp
diff --git a/server.c b/server.c index e9391b2..49d5263 100644 --- a/server.c +++ b/server.c @@ -1,175 +1,181 @@ #define _REENTRANT #include <pthread.h> #include <stdio.h> #include <stdlib.h> #include <sys/socket.h> #include <sys/types.h> #include <netinet/in.h> #include <signal.h> typedef struct { int i...
drzazga/wspolbiezne_projekt
5dee5f4333bd0a2e10b867cb657bc72c304039fe
proba wyslania i pobierania wartosci z serwera
diff --git a/server.c b/server.c index 3b868e6..e9391b2 100644 --- a/server.c +++ b/server.c @@ -1,130 +1,175 @@ #define _REENTRANT #include <pthread.h> #include <stdio.h> #include <stdlib.h> #include <sys/socket.h> #include <sys/types.h> #include <netinet/in.h> #include <signal.h> typedef struct { int i...
drzazga/wspolbiezne_projekt
726e3ed1415f7856cfa020518e7733ebedb41d39
wysylanie wspolrzednych do serwera, odbior i rysowanie wg odebranych danych
diff --git a/klient.c b/klient.c index ece4e8e..e84d5aa 100644 --- a/klient.c +++ b/klient.c @@ -1,191 +1,263 @@ #include <X11/Xlib.h> #include <X11/X.h> #include <stdio.h> #include <stdlib.h> #include <sys/socket.h> #include <sys/types.h> #include <netinet/in.h> #include <signal.h> Display *mydisplay; Wind...
drzazga/wspolbiezne_projekt
0bd410badaa1150a5d8eafcc40f0780089e32981
pobieranie poczatkowych wspolrzednych i idZawodnika z serwera
diff --git a/klient.c b/klient.c index 04068ea..ece4e8e 100644 --- a/klient.c +++ b/klient.c @@ -1,125 +1,191 @@ #include <X11/Xlib.h> #include <X11/X.h> #include <stdio.h> #include <stdlib.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <netinet/in.h> +#include <signal.h> Display *mydisplay; Wind...
drzazga/wspolbiezne_projekt
627cbc6dad7175fa5ae0d83810de6b5ac59cde10
dodano plik servera, mozna mozna przesuwac kolko
diff --git a/.gitignore b/.gitignore index 8ffea3f..ca59c93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ a.out -projekt +server +klient diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..bb21f14 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +CFLAGS=-L/usr/X11R6/lib -lX11 -lpthread + ...
drzazga/wspolbiezne_projekt
8b5ad7709e319baed2835ae8b42340d7a6400620
init commit
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ffea3f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*~ +a.out +projekt + diff --git a/projekt.c b/projekt.c new file mode 100644 index 0000000..6d7296d --- /dev/null +++ b/projekt.c @@ -0,0 +1,80 @@ +#include <X11/Xlib.h> +#include <X11/X.h> +...
xenda/raphaelrb
1490a4d7c00bf9e216c683c5b4c67c922fcb5236
Fixed small typo
diff --git a/lib/app/helpers/raphael_helper.rb b/lib/app/helpers/raphael_helper.rb index 66c4241..a675e6e 100644 --- a/lib/app/helpers/raphael_helper.rb +++ b/lib/app/helpers/raphael_helper.rb @@ -1,280 +1,276 @@ # Raphaelrb module RaphaelHelper def render_chart(dom_id,chart_title,type="line") if ty...
xenda/raphaelrb
7ac8123955ef2146442fcb2f71d4ad2a34078483
Added initial suppor through helper to Raphael. TODO: Create proper object approach
diff --git a/MIT-LICENSE b/MIT-LICENSE new file mode 100644 index 0000000..9376605 --- /dev/null +++ b/MIT-LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2009 [name of plugin creator] + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Sof...
cstim/carcomm
ecbdc44689ce0ad1bbba9dbe121def667f081c31
cleanup
diff --git a/webapp/config/database.yml b/webapp/config/database.yml index 93bbfb6..20595e5 100644 --- a/webapp/config/database.yml +++ b/webapp/config/database.yml @@ -1,26 +1,22 @@ # SQLite version 3.x # gem install sqlite3 development: adapter: sqlite3 database: db/development.sqlite3 pool: 5 timeou...
cstim/carcomm
b4fa0d356152e7dabf43fe44e88f4fab496364c3
Prepare for bundler deployment
diff --git a/ftp-command.txt b/ftp-command.txt index e4f79dd..e43f9d2 100644 --- a/ftp-command.txt +++ b/ftp-command.txt @@ -1,49 +1,49 @@ # Local directory is carcomm/ lftp 17573-ftp@ftp.cstim.de cd webapps/ cd carcomm/ -mirror -R -x .git -x '.*~' -x '.*\.log' -x environment.rb -n . +mirror -R -x .git -x '.*...
cstim/carcomm
69dfbf38f0b6fea947a132749ad0afc35917d44c
Last fix for pagination: Choose a new enough gem. 3
diff --git a/webapp/Gemfile b/webapp/Gemfile index 5cee876..53c7bad 100644 --- a/webapp/Gemfile +++ b/webapp/Gemfile @@ -1,34 +1,34 @@ source 'http://rubygems.org' gem 'rails', '3.0.4' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' gem 'sqlite3' source 'http://gemcu...
cstim/carcomm
e61f74f8cb089ead59f22b6dae64ba04d36d0cc5
Last fixup for rails 3.0.0
diff --git a/webapp/config/routes.rb b/webapp/config/routes.rb index a915f93..14c85f4 100644 --- a/webapp/config/routes.rb +++ b/webapp/config/routes.rb @@ -1,66 +1,67 @@ Webapp::Application.routes.draw do + resources :slices # The priority is based upon order of creation: # first created -> highest priority. ...
cstim/carcomm
fd7e73ad364ad8761c4e87d614ba0c921c65185f
extra mime type
diff --git a/webapp/config/application.rb b/webapp/config/application.rb index 7cd5ec5..42b2869 100644 --- a/webapp/config/application.rb +++ b/webapp/config/application.rb @@ -1,42 +1,45 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' # If you have a Gemfile, require the gems listed there, ...
cstim/carcomm
4d72824ef077aebc477b73d0ee5434f7339e9be0
Add framework where the actual prediction algorithms should be inserted.
diff --git a/ftp-command.txt b/ftp-command.txt index 67b4871..e4f79dd 100644 --- a/ftp-command.txt +++ b/ftp-command.txt @@ -1,49 +1,49 @@ # Local directory is carcomm/ lftp 17573-ftp@ftp.cstim.de cd webapps/ cd carcomm/ -mirror -R -x .git -x '.*~' -n . +mirror -R -x .git -x '.*~' -x '.*\.log' -x environment....
cstim/carcomm
08e944e41dad4fd4a4e5eb895d94f99118df30e6
Let the returned string start with a number.
diff --git a/ftp-command.txt b/ftp-command.txt index b25481f..67b4871 100644 --- a/ftp-command.txt +++ b/ftp-command.txt @@ -1,42 +1,49 @@ # Local directory is carcomm/ lftp 17573-ftp@ftp.cstim.de cd webapps/ cd carcomm/ -mirror -R -x .git -n . +mirror -R -x .git -x '.*~' -n . # -x REGEX - to exclude REGE...
cstim/carcomm
829fdbee8e20b69b1308b9de500875741d81194d
Report a parsed floating point number to the App layout.
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index ad33776..51796c3 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" pack...
cstim/carcomm
763689593bcecda1447a7eb25b1bfc36cba43a73
Set http connection parameter timeouts to some lower values.
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java index dfa1486..36db1e8 100644 --- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java +++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java @@ -1,1...
cstim/carcomm
d8aedd59088c46d3010d56ccf2c5e60b65ba02ce
Add parsing of HTTPResponse to String.
diff --git a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java index f2fed68..6b606ff 100644 --- a/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java +++ b/konphidroid/src/de/cstimming/konphidroid/SliceSenderTask.java @@ -1,84 +1,94 ...
cstim/carcomm
eaef19990f561f7cc90734c93c7f9f7d23c8fabc
Write out categoryId as well.
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java index 13cf8a3..cd59f45 100644 --- a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java +++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java @@ ...
cstim/carcomm
9a9af9ea0493d80e558ce3d9c0ce1579ca544c39
More gitignores. Add GPX example file for upload.
diff --git a/.gitignore b/.gitignore index 1b32385..8748330 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,12 @@ -db/development.sqlite3 *~ -log/development.log .metadata +db/development.sqlite3 +doc/abfotografiert/05_umgebungsmodell_raster2.jpg +gps-tracks/slices-hessen-2011-01-27.gpx +konphidroid/*pid*.log +lo...
cstim/carcomm
54db5adf9682365f01beaf03a38878690f7d9a27
Refactor gpx and nmea upload into separate ruby files.
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb index 24965af..94532c1 100644 --- a/webapp/app/controllers/home_controller.rb +++ b/webapp/app/controllers/home_controller.rb @@ -1,193 +1,33 @@ -require 'rexml/document' -require 'time' -require 'date' - -# Represents on...
cstim/carcomm
681b1cc4bc0e014235b9f75a641fd412b486a2a0
Some rudimentary unittesting
diff --git a/webapp/test/test_helper.rb b/webapp/test/test_helper.rb index 9f19269..73eecbb 100644 --- a/webapp/test/test_helper.rb +++ b/webapp/test/test_helper.rb @@ -1,38 +1,38 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' class Tes...
cstim/carcomm
b476371653ffa432048b966cfaa819dc1bddc41e
Here we add the algo code
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb index a1af5ca..24965af 100644 --- a/webapp/app/controllers/home_controller.rb +++ b/webapp/app/controllers/home_controller.rb @@ -1,189 +1,193 @@ require 'rexml/document' require 'time' require 'date' # Represents o...
cstim/carcomm
f299a378b3765492466d2dcb6ee2cc4d25fbdd87
Refactoring into separate file.
diff --git a/webapp/app/models/slice.rb b/webapp/app/models/slice.rb index f8cebd3..b84de99 100644 --- a/webapp/app/models/slice.rb +++ b/webapp/app/models/slice.rb @@ -1,72 +1,59 @@ +require "geo" + class Slice < ActiveRecord::Base validates_presence_of :time, :lat, :lon, :avgvel validates_numericality_of :avgv...
cstim/carcomm
4ee9de78314c239163643769d4039993cf67d223
Add icons "Stautimer".
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index 4fe90bc..ad33776 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" pack...
cstim/carcomm
047d325851d4a08ac08e828a94d15e367f11c8e0
Set minimum target API to 4 to avoid requesting phone calls permission.
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index b2db3d2..4fe90bc 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - ...
cstim/carcomm
e811f3f72e038a4b5c844f820516d3368b144152
Add download buttons on website: Download as GPX or as CSV. Add CSV renderer.
diff --git a/webapp/app/controllers/slices_controller.rb b/webapp/app/controllers/slices_controller.rb index 18f29d0..495cd00 100644 --- a/webapp/app/controllers/slices_controller.rb +++ b/webapp/app/controllers/slices_controller.rb @@ -1,117 +1,118 @@ class SlicesController < ApplicationController before_filter :f...
cstim/carcomm
467a8bfe3c73690480f2cba855914dfdcab9a2c1
Fix broken instanceID in constructor. Fix item id default.
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index 1e66279..b2db3d2 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" ...
cstim/carcomm
1067edc8f495f5e84ab1f1a3d70bf0a81fcb27f0
Final cleanups. Increase version number to 0.6.
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index 33de089..1e66279 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" ...
cstim/carcomm
a4314c704351f99a8ea679c223654720209808af
Add separate button for recording/transmission interval.
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml index 8a5dcfa..2cea2f1 100644 --- a/konphidroid/res/layout/main.xml +++ b/konphidroid/res/layout/main.xml @@ -1,97 +1,100 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" ...
cstim/carcomm
2d59f3bd1588fbd3052d6119c5f6aea358248d45
Finally get the collection upload to work.
diff --git a/ftp-command.txt b/ftp-command.txt index c16aa3e..b25481f 100644 --- a/ftp-command.txt +++ b/ftp-command.txt @@ -1,30 +1,42 @@ # Local directory is carcomm/ lftp 17573-ftp@ftp.cstim.de cd webapps/ cd carcomm/ mirror -R -x .git -n . # -x REGEX - to exclude REGEX from transfer # -n - to...
cstim/carcomm
fa8689a71fdce3d84a66e694ef857aea651191ee
Fix gpx upload from app: Allow non-authenticated upload. Accept unknown original filename.
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb index 750bb8d..a1af5ca 100644 --- a/webapp/app/controllers/home_controller.rb +++ b/webapp/app/controllers/home_controller.rb @@ -1,187 +1,189 @@ require 'rexml/document' require 'time' require 'date' # Represents o...
cstim/carcomm
e072288354c3e8c0ce14a1a8534bd8b7696d0396
Integrate the new LocationCollector into the main activity.
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java index 7280f39..e2ae95b 100644 --- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java +++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java @@ -1,349 +1,351 @@...
cstim/carcomm
cec0b8938035452976c4ec3474c71c8784082e23
Choose the correct Http StringEntity which hopefully gets our correct data.
diff --git a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java index c470c03..5e90c1f 100644 --- a/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java +++ b/konphidroid/src/de/cstimming/konphidroid/LocationCollector.java @@ -1,1...
cstim/carcomm
094d828b2163e319ce39714c7235b19f2e4d66d8
Finish the GPX file creation so that it contains all data that we want.
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java index cceebb9..13cf8a3 100644 --- a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java +++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java @@ ...
cstim/carcomm
395b6747f0459fb6ab697e2e2bd45edc043db0db
Fix GPX file uploading which was broken since e3eb81957d7ad7117f284f2f15cbbf9e4ef7e944
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb index 0b9c9f7..750bb8d 100644 --- a/webapp/app/controllers/home_controller.rb +++ b/webapp/app/controllers/home_controller.rb @@ -1,185 +1,187 @@ require 'rexml/document' require 'time' require 'date' # Represents o...
cstim/carcomm
fd4d77e5cfa03e6d1c055940db8a55519b6dafcd
Add junit testcase for our android app, now to test the gpx writer.
diff --git a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java index 6498936..cceebb9 100644 --- a/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java +++ b/konphidroid/src/de/cstimming/konphidroid/GpxCharArrayWriter.java @@ ...
cstim/carcomm
177e62782590ecaf678e195c2e105f67e75bb33e
Fix line endings.
diff --git a/579651/C2C low_cost beacon/messages/32623592.html b/579651/C2C low_cost beacon/messages/32623592.html index 616f14e..d8f5148 100644 --- a/579651/C2C low_cost beacon/messages/32623592.html +++ b/579651/C2C low_cost beacon/messages/32623592.html @@ -1,70 +1,70 @@ <!DOCTYPE html> <html> <head> <ti...
cstim/carcomm
788332cf69520c0926cc0b8ef96b44848a921158
Implement new LocationCollector class that should take over the location collection instead of the activity.
diff --git a/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java b/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java deleted file mode 100644 index a833538..0000000 --- a/konphidroid/src/de/cstimming/konphidroid/FollowGpsException.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.cstimming.kon...
cstim/carcomm
5a2163767d98c856f1b613e47f218354e11d37fb
In GPX upload also receive the new data fields accuracy etc., and accept the velocity from the points, too.
diff --git a/webapp/app/controllers/home_controller.rb b/webapp/app/controllers/home_controller.rb index e188f6f..0b9c9f7 100644 --- a/webapp/app/controllers/home_controller.rb +++ b/webapp/app/controllers/home_controller.rb @@ -1,152 +1,185 @@ require 'rexml/document' require 'time' require 'date' # Represents o...
cstim/carcomm
028c954b28e4746de0e013b667bc9c1dac7f78ca
Refactor way slice into separate class.
diff --git a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java index 417ee5b..6836a44 100644 --- a/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java +++ b/konphidroid/src/de/cstimming/konphidroid/KonPhiActivity.java @@ -1,376 +1,349 @@...
cstim/carcomm
bd8c4cc1e7974fe4e064c23218c9b16717110976
More SQL command notes.
diff --git a/ftp-command.txt b/ftp-command.txt index 617ef3b..c16aa3e 100644 --- a/ftp-command.txt +++ b/ftp-command.txt @@ -1,24 +1,30 @@ # Local directory is carcomm/ lftp 17573-ftp@ftp.cstim.de cd webapps/ cd carcomm/ mirror -R -x .git -n . # -x REGEX - to exclude REGEX from transfer # -n - to...
cstim/carcomm
cad9c77e71538d1875b370f5f076681ebcf09a21
Add pop-up menu for choosing the sending time interval
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml index b2950d6..8a5dcfa 100644 --- a/konphidroid/res/layout/main.xml +++ b/konphidroid/res/layout/main.xml @@ -1,98 +1,97 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" a...
cstim/carcomm
9c7e6ec4cc720fd93a7c9d4c19e5c9adad053cd8
Refactor network connection into separate AsyncTask. Ignore new GPS positions while sending.
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index f629a8c..33de089 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" ...
cstim/carcomm
12fb60fc581e8e3f600e17109541c38cfa365e4a
Implement the new accuracy and category fields. Add speed and version display.
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index bc7ff71..f629a8c 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,23 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" ...
cstim/carcomm
1ac5f04a9686e2b43c3b0c21bbf6a345401f8d1e
Add documents from basecamp into git.
diff --git a/579651/C2C low_cost beacon/messages.html b/579651/C2C low_cost beacon/messages.html new file mode 100644 index 0000000..c9e7229 --- /dev/null +++ b/579651/C2C low_cost beacon/messages.html @@ -0,0 +1,96 @@ +<!DOCTYPE html> +<html> + <head> + <title>C2C low-cost beacon - All messages</title> + <meta...
cstim/carcomm
ed61c20d5c6947e190bb1602b607212f92b3b882
Add new table columns for accuracy and instance id.
diff --git a/webapp/app/views/slices/_form.html.erb b/webapp/app/views/slices/_form.html.erb index 1cd4958..009a39e 100644 --- a/webapp/app/views/slices/_form.html.erb +++ b/webapp/app/views/slices/_form.html.erb @@ -1,43 +1,59 @@ <% form_for(@slice) do |f| %> <%= f.error_messages %> <p> <%= f.label :time...
cstim/carcomm
e8fb66bb23c0fe14fc6ca51d8d3e551245065656
Fix sending after intervals without GPS.
diff --git a/konphidroid/AndroidManifest.xml b/konphidroid/AndroidManifest.xml index c3fab87..bc7ff71 100644 --- a/konphidroid/AndroidManifest.xml +++ b/konphidroid/AndroidManifest.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" ...
cstim/carcomm
7ca607a80c4f8df95be83be3e18359b9f700e276
Add HTML page that only shows the map, but doesn't send anything to the server.
diff --git a/webapp/public/map.html b/webapp/public/map.html index 2d62680..fa25a90 100644 --- a/webapp/public/map.html +++ b/webapp/public/map.html @@ -1,430 +1,430 @@ <html> <head> <meta name="viewport" content="width = device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;"> <title>Car Commu...
cstim/carcomm
97ab4fc234998fa20ecddecc856a272bbd3b63ee
Add i18n of the strings.
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml index 1f7203b..6bf7b6a 100644 --- a/konphidroid/res/layout/main.xml +++ b/konphidroid/res/layout/main.xml @@ -1,78 +1,83 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" a...
cstim/carcomm
c5a89aba1404efcdcb7079096c053d57fd50e4d2
Final polishing of the transmission of the App.
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml index 005cc38..1f7203b 100644 --- a/konphidroid/res/layout/main.xml +++ b/konphidroid/res/layout/main.xml @@ -1,78 +1,78 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" a...
cstim/carcomm
096c972b64abf1076df9b3e3bf39ca18b91e2b4a
Implement sending of the slices to the server. Yay, this really works!
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml index b41edff..005cc38 100644 --- a/konphidroid/res/layout/main.xml +++ b/konphidroid/res/layout/main.xml @@ -1,51 +1,78 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" a...
cstim/carcomm
1291c0165d8c3e946349f8d5362661a85451638e
Really fix receiving of GPS locations.
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml index 7b90023..b41edff 100644 --- a/konphidroid/res/layout/main.xml +++ b/konphidroid/res/layout/main.xml @@ -1,51 +1,51 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" a...
cstim/carcomm
47fc8b234c79dcb79c05584626de0d9a0f3e8677
We can now receive the GPS points and show something in the display.
diff --git a/konphidroid/res/layout/main.xml b/konphidroid/res/layout/main.xml index cfe36a8..7b90023 100644 --- a/konphidroid/res/layout/main.xml +++ b/konphidroid/res/layout/main.xml @@ -1,37 +1,51 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" a...
cstim/carcomm
92cc473355fa1f4021002d845226bf04a4e015c6
Another new try for an android app.
diff --git a/konphidroid/.classpath b/konphidroid/.classpath new file mode 100644 index 0000000..609aa00 --- /dev/null +++ b/konphidroid/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="gen"/> + <classpathentry k...
cstim/carcomm
353579b3befab532eea0c781a450ce77b38401bc
Second try: Now add the OSM view widget as a new eclipse-based project. This now runs fine.
diff --git a/.gitignore b/.gitignore index f9021d8..1b32385 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ db/development.sqlite3 *~ log/development.log +.metadata diff --git a/konphidroid/.classpath b/konphidroid/.classpath new file mode 100644 index 0000000..8fc01c9 --- /dev/null +++ b/konphidroid/.class...