repo
string
commit
string
message
string
diff
string
dirkm/asn1
5b87bf69f6dcabc516408edcd916c4e42485dcf4
added some test-cases for lengths
diff --git a/Makefile b/Makefile index d25e55e..212df6c 100644 --- a/Makefile +++ b/Makefile @@ -1,41 +1,42 @@ OBJS:= syntax/generate_static_lex.o TEST_OBJS:=test/syntax.o test/read_from_file.o test/codec.o ALL_OBJS:=$(OBJS) $(TEST_OBJS) BOOST_INC:=/home/dirk/localbuild/boost-trunk #BOOST_LIB:=/home/dirk/loca...
dirkm/asn1
493dbd7a69460ffe6de9ca2c226979d6f29185ea
obvious fixes
diff --git a/codec/tag.hpp b/codec/tag.hpp index 7481285..ae0ddf1 100644 --- a/codec/tag.hpp +++ b/codec/tag.hpp @@ -1,69 +1,69 @@ #ifndef ASN1_CODEC_TAG_HPP #define ASN1_CODEC_TAG_HPP namespace asn1 { - namespace codec - { - class tag - { - public: - typedef unsigned long tag_type; - static ...
dirkm/asn1
dfe6a49928e3608016e20f2cc37b582f3fdc02b8
made latest code compilable
diff --git a/Makefile b/Makefile index 1fad0a8..d25e55e 100644 --- a/Makefile +++ b/Makefile @@ -1,38 +1,41 @@ OBJS:= syntax/generate_static_lex.o -TEST_OBJS:=test/syntax.o test/read_from_file.o +TEST_OBJS:=test/syntax.o test/read_from_file.o test/codec.o ALL_OBJS:=$(OBJS) $(TEST_OBJS) BOOST_INC:=/home/dirk/loc...
dirkm/asn1
96d664bbc9e9c324603cbcdeb57323af1f26f2c9
fix includes
diff --git a/syntax/parse.hpp b/syntax/parse.hpp index d86e0fa..c19d492 100644 --- a/syntax/parse.hpp +++ b/syntax/parse.hpp @@ -1,370 +1,368 @@ #ifndef ASN1_PARSE_HPP #define ASN1_PARSE_HPP -// #include <boost/config/warning_disable.hpp> #include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/lex_s...
dirkm/asn1
a8f0c6787d7443269749207b459e222991741ff4
put rules in correct order
diff --git a/syntax/parse.hpp b/syntax/parse.hpp index 2030511..d86e0fa 100644 --- a/syntax/parse.hpp +++ b/syntax/parse.hpp @@ -1,349 +1,370 @@ #ifndef ASN1_PARSE_HPP #define ASN1_PARSE_HPP // #include <boost/config/warning_disable.hpp> #include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/lex_s...
dirkm/asn1
92bcb9e48ab4ab82e29a81c4e4c3460e95a0eec9
whitespace
diff --git a/test/syntax.cpp b/test/syntax.cpp index c1bdfc0..10febac 100644 --- a/test/syntax.cpp +++ b/test/syntax.cpp @@ -1,77 +1,76 @@ //#define BOOST_SPIRIT_DEBUG //#define BOOST_SPIRIT_LEXERTL_DEBUG //#define BOOST_VARIANT_MINIMIZE_SIZE #include <fstream> #include <string> #define BOOST_TEST_MODULE ASN1...
dirkm/asn1
905111a03c25b2fe7a3c005c7f4ce1c413cc8a5f
cleaned up tests
diff --git a/test/read_from_file.cpp b/test/read_from_file.cpp index 14ca002..d610b13 100644 --- a/test/read_from_file.cpp +++ b/test/read_from_file.cpp @@ -1,29 +1,28 @@ #include <fstream> #include <string> #include "syntax/parse.hpp" #include "syntax/lex.hpp" #include <boost/test/unit_test.hpp> namespace ...
dirkm/asn1
01e585d621851535028b5d637b1395e6cb4a7b66
added helper
diff --git a/Makefile b/Makefile index 10ce532..1fad0a8 100644 --- a/Makefile +++ b/Makefile @@ -1,38 +1,38 @@ OBJS:= syntax/generate_static_lex.o -TEST_OBJS:=test/syntax.o +TEST_OBJS:=test/syntax.o test/read_from_file.o ALL_OBJS:=$(OBJS) $(TEST_OBJS) BOOST_INC:=/home/dirk/localbuild/boost-trunk #BOOST_LIB:=/h...
dirkm/asn1
a4e3707d873f7909250402119eaa48c06829aedc
added for compile speedup
diff --git a/syntax/parse_fwd.hpp b/syntax/parse_fwd.hpp new file mode 100644 index 0000000..aacfb20 --- /dev/null +++ b/syntax/parse_fwd.hpp @@ -0,0 +1,8 @@ +namespace asn1 +{ + namespace syntax + { + template<typename Iterator> + bool parse(Iterator first,Iterator last); + } +}
dirkm/asn1
1d375282e00b5b3279b2684d09055185d267793c
deleted some dead code
diff --git a/Makefile b/Makefile index 1ac2507..10ce532 100644 --- a/Makefile +++ b/Makefile @@ -1,42 +1,38 @@ -OBJS:= syntax/generate_static_lex.o syntax/lex.o +OBJS:= syntax/generate_static_lex.o TEST_OBJS:=test/syntax.o ALL_OBJS:=$(OBJS) $(TEST_OBJS) BOOST_INC:=/home/dirk/localbuild/boost-trunk #BOOST_LIB:=...
dirkm/asn1
09c74bd9112dcbd26dc54a417e15e19adf05c21e
moved to boost unittests
diff --git a/Makefile b/Makefile index 236a099..1ac2507 100644 --- a/Makefile +++ b/Makefile @@ -1,36 +1,42 @@ -OBJS:= syntax/generate_static_lex.o syntax/lex.o syntax/parse.o -BOOST_INC:=/home/dirk/local/boost-trunk +OBJS:= syntax/generate_static_lex.o syntax/lex.o +TEST_OBJS:=test/syntax.o + +ALL_OBJS:=$(OBJS) $(TEST...
dirkm/asn1
1a085ef6de2ac56dcfb0b0d76ca17189732392c2
added namespace
diff --git a/codec/ber.hpp b/codec/ber.hpp new file mode 100644 index 0000000..de436a8 --- /dev/null +++ b/codec/ber.hpp @@ -0,0 +1 @@ +class diff --git a/syntax/generate_static_lex.cpp b/syntax/generate_static_lex.cpp index abdb492..9ae2d1f 100644 --- a/syntax/generate_static_lex.cpp +++ b/syntax/generate_static_lex....
dirkm/asn1
427c83d9008f1ebf22472b03a9730f948156aa41
second example is completely functional
diff --git a/syntax/data/sdhpm.asn1 b/syntax/data/sdhpm.asn1 index 9c49ae0..77e41df 100644 --- a/syntax/data/sdhpm.asn1 +++ b/syntax/data/sdhpm.asn1 @@ -1,51 +1,51 @@ -- http://www.itu.int/ITU-T/formal-language/itu-t/g/g774.1/2001/SDHPMASN1.html -- Module SDHPMASN1 (G.774.1:02/2001) -- See also ITU-T G.774.1 (02/2...
dirkm/asn1
35dcad08f646481b5c32b37182c87603675625eb
getting second example to work
diff --git a/Makefile b/Makefile index face0ac..236a099 100644 --- a/Makefile +++ b/Makefile @@ -1,36 +1,36 @@ OBJS:= syntax/generate_static_lex.o syntax/lex.o syntax/parse.o -BOOST_INC:=/home/dirk/localbuild/boost-trunk +BOOST_INC:=/home/dirk/local/boost-trunk #EXTRAFLAGS:= -O2 -g EXTRAFLAGS:= #derived variable...
dirkm/asn1
55ae1a91e3c94eaa76ab522d0612bbdb22affd37
new files
diff --git a/syntax/data/empty_module.asn1 b/syntax/data/empty_module.asn1 new file mode 100644 index 0000000..c709f32 --- /dev/null +++ b/syntax/data/empty_module.asn1 @@ -0,0 +1,6 @@ +InventoryList {1 2 0 0 6 1} DEFINITIONS ::= +BEGIN +{ + SEQUENCE, SEQUENCE +} +END diff --git a/syntax/data/sdhpm.asn1 b/syntax/da...
dirkm/asn1
072d64e027ffffc12835e4f9c1485669e8913da6
new files
diff --git a/syntax/data/full_example.asn1 b/syntax/data/full_example.asn1 new file mode 100644 index 0000000..e22332a --- /dev/null +++ b/syntax/data/full_example.asn1 @@ -0,0 +1,152 @@ +---------------------------------------------------------------------- +-- +-- file sdpgw.asn1 +-- This is the ...
dirkm/asn1
e0c4be2884164d44818f02d71c7491fe069f4c82
full compile succeeded
diff --git a/Makefile b/Makefile index 524c93a..face0ac 100644 --- a/Makefile +++ b/Makefile @@ -1,36 +1,36 @@ OBJS:= syntax/generate_static_lex.o syntax/lex.o syntax/parse.o BOOST_INC:=/home/dirk/localbuild/boost-trunk #EXTRAFLAGS:= -O2 -g -EXTRAFLAGS:= -g +EXTRAFLAGS:= #derived variables INCLUDES:=-I$(BOOST_I...
dirkm/asn1
99b2befd6035fc6b1e8d69df6e4d8bbe6124c181
full compile succeeded
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index c27e1c5..537e777 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,120 +1,125 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
c8edfecbcc45cf62fefe6bbe7a1ee67dae4b08c5
full compile succeeded
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index dd18242..c27e1c5 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,114 +1,120 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
0da2917031b551635d6f974f0e4fc8c47e389c21
step further
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index 8ff0718..dd18242 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,112 +1,114 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
81f58a93e9bdec89c9cb1d7b4702b6134da983e5
proceeding to parse
diff --git a/syntax/parse.cpp b/syntax/parse.cpp index 4479968..1b1256e 100644 --- a/syntax/parse.cpp +++ b/syntax/parse.cpp @@ -1,56 +1,56 @@ #define BOOST_SPIRIT_DEBUG -// #define BOOST_SPIRIT_LEXERTL_DEBUG +//#define BOOST_SPIRIT_LEXERTL_DEBUG #define BOOST_VARIANT_MINIMIZE_SIZE // #include <boost/config/warn...
dirkm/asn1
cbea5929d503d5c4d1d10bb893620c463b51b63a
compiles
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index 2e7a358..8ff0718 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,98 +1,112 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
9cb06a672ecbe1198f2ff4ea5ac00eb8961309b2
getting some more syntax done
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index d628858..7a5f8e0 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,59 +1,100 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
47c59690974de50457e3aaee52f8f9014cb951f5
toward parsing first grammar
diff --git a/syntax/parse.hpp b/syntax/parse.hpp index ed8c04c..330adf8 100644 --- a/syntax/parse.hpp +++ b/syntax/parse.hpp @@ -1,77 +1,138 @@ #ifndef ASN1_PARSE_HPP #define ASN1_PARSE_HPP #include "syntax/lex_static.hpp" #include "syntax/lex.hpp" #include <boost/spirit/include/qi.hpp> #include <boost/spirit...
dirkm/asn1
6706008d691ba48ed878bee24de11049bc0e3c14
compiles again
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index 2eb3350..d628858 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,53 +1,59 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
c10bbe8485ffacae745562f96b143eb6b4a06157
towards solution
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index e510628..2eb3350 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,47 +1,53 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
adb2d6a2e89a1a88c8d3f8eb53d6ac40a165fa73
towards solution
diff --git a/syntax/parse.cpp b/syntax/parse.cpp index 508df3a..3b1082c 100644 --- a/syntax/parse.cpp +++ b/syntax/parse.cpp @@ -1,60 +1,55 @@ #define BOOST_SPIRIT_DEBUG #define BOOST_SPIRIT_LEXERTL_DEBUG #define BOOST_VARIANT_MINIMIZE_SIZE // #include <boost/config/warning_disable.hpp> #include <boost/spirit/...
dirkm/asn1
f22e90edcc10442abf570b0656b632d70e26fe1b
compiles again
diff --git a/syntax/lex.hpp b/syntax/lex.hpp index 182f65a..e510628 100644 --- a/syntax/lex.hpp +++ b/syntax/lex.hpp @@ -1,35 +1,47 @@ #ifndef ASN1_LEX_HPP #define ASN1_LEX_HPP #include <boost/spirit/include/lex_lexertl.hpp> using namespace boost::spirit; using namespace boost::spirit::lex; enum tokenids ...
dirkm/asn1
6e552966d649a53bf89ce021a0dbc7023a74c32a
towards solution
diff --git a/syntax/data/partial_line_comments.asn1 b/syntax/data/partial_line_comments.asn1 new file mode 100644 index 0000000..bfb969b --- /dev/null +++ b/syntax/data/partial_line_comments.asn1 @@ -0,0 +1 @@ +-- test2 -- diff --git a/syntax/data/asn1_comments.input b/syntax/data/single_line_comments.asn1 similarity i...
dirkm/asn1
7f4108e183bbf7ba6febb191ff7f6a931ada230e
towards solution
diff --git a/syntax/parse.cpp b/syntax/parse.cpp index 081720e..508df3a 100644 --- a/syntax/parse.cpp +++ b/syntax/parse.cpp @@ -1,62 +1,60 @@ #define BOOST_SPIRIT_DEBUG #define BOOST_SPIRIT_LEXERTL_DEBUG #define BOOST_VARIANT_MINIMIZE_SIZE // #include <boost/config/warning_disable.hpp> #include <boost/spirit/...
dirkm/asn1
7c779c76ad87992fdbf61c7576f2fbc15ad8179f
skip parser works
diff --git a/syntax/data/asn1_comments.input b/syntax/data/asn1_comments.input index d0e26d1..89e45e1 100644 --- a/syntax/data/asn1_comments.input +++ b/syntax/data/asn1_comments.input @@ -1,5 +1,3 @@ --- test -- - +-- test -- -- test2 -- -- test2 test - -quark \ No newline at end of file +-- test should fail dif...
dirkm/asn1
9a80a4b69c7179a72fc36e5a84e94cb6542708a7
skipparser seems to be working
diff --git a/syntax/data/asn1_comments.input b/syntax/data/asn1_comments.input index b00f5c2..d0e26d1 100644 --- a/syntax/data/asn1_comments.input +++ b/syntax/data/asn1_comments.input @@ -1,4 +1,5 @@ -- test -- -- test2 test +quark \ No newline at end of file diff --git a/syntax/parse.cpp b/syntax/parse.cpp in...
dirkm/asn1
e888eb1fb7c321d83a3005f728be2512d94202af
add parser
diff --git a/Makefile b/Makefile index 782f266..524c93a 100644 --- a/Makefile +++ b/Makefile @@ -1,36 +1,36 @@ OBJS:= syntax/generate_static_lex.o syntax/lex.o syntax/parse.o BOOST_INC:=/home/dirk/localbuild/boost-trunk #EXTRAFLAGS:= -O2 -g EXTRAFLAGS:= -g #derived variables INCLUDES:=-I$(BOOST_INC) -I. CPPFLA...
dirkm/asn1
19db2092719e4b65701e7ae1cca32c319c928c0b
add data
diff --git a/syntax/data/asn1_comments.input b/syntax/data/asn1_comments.input new file mode 100644 index 0000000..b00f5c2 --- /dev/null +++ b/syntax/data/asn1_comments.input @@ -0,0 +1,4 @@ +-- test -- + +-- test2 test + diff --git a/syntax/data/asn1_comments.input~ b/syntax/data/asn1_comments.input~ new file mode 1...
dirkm/asn1
8140446480d1d051756ba47fa00c58ebd2693f8d
compiles, does not work
diff --git a/Makefile b/Makefile index 0839f60..782f266 100644 --- a/Makefile +++ b/Makefile @@ -1,35 +1,36 @@ OBJS:= syntax/generate_static_lex.o syntax/lex.o syntax/parse.o BOOST_INC:=/home/dirk/localbuild/boost-trunk #EXTRAFLAGS:= -O2 -g EXTRAFLAGS:= -g #derived variables INCLUDES:=-I$(BOOST_INC) -I. CPPFLA...
dirkm/asn1
2178313c3157279b39575521c3200cf4cb67f430
towards solution
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0839f60 --- /dev/null +++ b/Makefile @@ -0,0 +1,35 @@ +OBJS:= syntax/generate_static_lex.o syntax/lex.o syntax/parse.o +BOOST_INC:=/home/dirk/localbuild/boost-trunk +#EXTRAFLAGS:= -O2 -g +EXTRAFLAGS:= -g + +#derived variables +INCLUDES:=-I$(BOOST_INC)...
ryankshaw/image_crush
3a225f38434843e2abd052ae770f5a10b53fb8fa
Regenerated gemspec for version 0.0.4
diff --git a/image_crush.gemspec b/image_crush.gemspec index e302c53..06d0c57 100644 --- a/image_crush.gemspec +++ b/image_crush.gemspec @@ -1,67 +1,67 @@ # Generated by jeweler # DO NOT EDIT THIS FILE # Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec` # -*- encoding: utf-8 -*- Gem::Specification...
ryankshaw/image_crush
0f102bba715dfb360f740236182f74b993ad69d4
Version bump to 0.0.4
diff --git a/VERSION b/VERSION index bcab45a..81340c7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.3 +0.0.4
ryankshaw/image_crush
95a2fe480e2cac7f8e39fe953b397b6aeb549c8b
Regenerated gemspec for version 0.0.3
diff --git a/image_crush.gemspec b/image_crush.gemspec index 5a6c923..e302c53 100644 --- a/image_crush.gemspec +++ b/image_crush.gemspec @@ -1,67 +1,67 @@ # Generated by jeweler # DO NOT EDIT THIS FILE # Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec` # -*- encoding: utf-8 -*- Gem::Specification...
ryankshaw/image_crush
2bd07a459c2307bfd69bbf412d399690e59b519b
Version bump to 0.0.3
diff --git a/VERSION b/VERSION index 4e379d2..bcab45a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.2 +0.0.3
ryankshaw/image_crush
a529f330ed47414fb398f16600dd4095be4f6901
chage readme
diff --git a/README.rdoc b/README.rdoc index 95c538e..b5046ff 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,57 +1,58 @@ = ImageCrush Reduce the size of PNG and JPEG files using the +pngcrush+ and +jpegtran+ tools, as described at http://yuiblog.com/blog/2008/11/14/imageopt-3/ == Usage The tools <b>+pngcru...
ryankshaw/image_crush
5f09fd21d004fb88901941e122fa309b8c1a9321
Regenerated gemspec for version 0.0.2
diff --git a/image_crush.gemspec b/image_crush.gemspec index 3201ecc..5a6c923 100644 --- a/image_crush.gemspec +++ b/image_crush.gemspec @@ -1,67 +1,67 @@ # Generated by jeweler # DO NOT EDIT THIS FILE # Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec` # -*- encoding: utf-8 -*- Gem::Specification...
ryankshaw/image_crush
5085e70a1ea36edc5040c16947e4b9788cd760a7
Version bump to 0.0.2
diff --git a/VERSION b/VERSION index 8acdd82..4e379d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.1 +0.0.2
ryankshaw/image_crush
f7fd5216f27c7d90e1ee0010018c741665f31152
put in Pablo Brasero Moreno's Licence
diff --git a/LICENSE b/LICENSE index 0135419..988dd49 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,46 @@ Copyright (c) 2009 Ryan Shaw Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without...
ryankshaw/image_crush
cc83b9bc56f1ba295e620b0e541b15130cb193d9
Regenerated gemspec for version 0.0.1
diff --git a/image_crush.gemspec b/image_crush.gemspec index 275e6bf..3201ecc 100644 --- a/image_crush.gemspec +++ b/image_crush.gemspec @@ -1,66 +1,67 @@ # Generated by jeweler # DO NOT EDIT THIS FILE # Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec` # -*- encoding: utf-8 -*- Gem::Specification...
ryankshaw/image_crush
f2c814e55dd4b4869b4a42009bbff09f25ad9a65
Version bump to 0.0.1
diff --git a/VERSION b/VERSION index 77d6f4c..8acdd82 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.0 +0.0.1
ryankshaw/image_crush
06d0b55385d54e1347602647a83f443bc7531851
Version bump to 0.0.0
diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..77d6f4c --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.0
marcinn/novaos
195fab90f358a4043b5b49e5359b7a7012c5b718
changed readme
diff --git a/readme.txt b/readme.txt index b7570a7..e2d2d3e 100755 --- a/readme.txt +++ b/readme.txt @@ -1,44 +1,43 @@ .,;%!##########################!%; .-----, ;%!#############!%;,. .___, .___.______ .____.____ / | / \/ 1 __ ]| / / / ,--. | [] ...
marcinn/novaos
dce03ff80634e7dfb13d80aca4b3131582f02a78
changed readme
diff --git a/IMPORTANT b/IMPORTANT new file mode 100644 index 0000000..171e688 --- /dev/null +++ b/IMPORTANT @@ -0,0 +1,2 @@ +USE AT OWN RISK! +I'M NOT RESPONSIBLE FOR ANY HARDWARE DAMAGE OR DATA LOSS BY USING THIS SOFTWARE! diff --git a/readme.txt b/readme.txt index 8150aa1..b7570a7 100755 --- a/readme.txt +++ b/readm...
marcinn/novaos
07ee7d186c6e5b99aae3b9f1d7ff32d315f13029
changed gcc cflags
diff --git a/clib/makefile b/clib/makefile index 03374aa..939123e 100755 --- a/clib/makefile +++ b/clib/makefile @@ -1,22 +1,23 @@ OBJS = do_printf.o strcmp.o strlen.o repc.o atoi.o NOVADIR = $(TOP) DESTDIR = $(NOVADIR)/clib INCDIR = $(NOVADIR)/include GCC = gcc -CFLAGS = -c -nostdinc -nostdlib -I $(INCDIR) -O3 -s...
marcinn/novaos
eca4cbc7511e7600b71c579339a2047468ad923c
fixed core make
diff --git a/core/checkcpu.asm b/core/checkcpu.asm index 5a38823..ad75dea 100755 --- a/core/checkcpu.asm +++ b/core/checkcpu.asm @@ -1,34 +1,34 @@ ; ============================================================== ; SPRAWDZAMY CPU CZY NIE GORSZY NIZ 386 ; ================================================...
mhawkins/wehaveengagedtheb.org
1873a3f65dd6e08a616edf485a234b55cd8b3cdb
trying to fix my damn dreamhost environment
diff --git a/config.ru b/config.ru index 60a39f1..abd21b6 100644 --- a/config.ru +++ b/config.ru @@ -1,18 +1,20 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', '.gem', 'ruby', '1.8') +ENV['GEM_HOME'] = '/home/reillyhawk/.gem' +ENV['GEM_PATH'] = '$GEM_HOME:/usr/lib/ruby/gems/1.8' require 'rubyg...
mhawkins/wehaveengagedtheb.org
dc91cd78e0e914325c1df561d54703536d483439
added clear paths
diff --git a/config.ru b/config.ru index ac98432..60a39f1 100644 --- a/config.ru +++ b/config.ru @@ -1,17 +1,18 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', '.gem', 'ruby', '1.8') require 'rubygems' require 'vendor/rack/lib/rack' require 'vendor/sinatra/lib/sinatra' require 'application'...
mhawkins/wehaveengagedtheb.org
316140d52cee0c0c49ea48cfffad86c205c5ff01
trying to get around rack / rubygems error on first time the sinatra app is loaded into memory
diff --git a/config.ru b/config.ru index 5d96df6..ac98432 100644 --- a/config.ru +++ b/config.ru @@ -1,16 +1,17 @@ $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', '.gem', 'ruby', '1.8') require 'rubygems' require 'vendor/rack/lib/rack' require 'vendor/sinatra/lib/sinatra' require 'application'...
mhawkins/wehaveengagedtheb.org
694fe7411f6237664dc99f8dc5487d5e7ed5a055
trying to get around rack error in loading dm-core the first time
diff --git a/config.ru b/config.ru index f92c2f7..5d96df6 100644 --- a/config.ru +++ b/config.ru @@ -1,15 +1,16 @@ +$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', '.gem', 'ruby', '1.8') require 'rubygems' require 'vendor/rack/lib/rack' require 'vendor/sinatra/lib/sinatra' require 'application'...
mhawkins/wehaveengagedtheb.org
a33c83dd9398f9a6a4da3ac9a52fdbd660d0bf79
added lewar to the list of terms
diff --git a/environment.rb b/environment.rb index 1a0da97..251d575 100644 --- a/environment.rb +++ b/environment.rb @@ -1,29 +1,29 @@ require 'rubygems' require 'dm-core' require 'dm-validations' require 'dm-aggregates' require 'haml' require 'ostruct' require 'twitter' require 'sinatra' unless defined?(Sina...
mhawkins/wehaveengagedtheb.org
3093241b5b2a39bbe850ecd69054bd8b1802d6bf
added additional terms
diff --git a/environment.rb b/environment.rb index e79cc79..1a0da97 100644 --- a/environment.rb +++ b/environment.rb @@ -1,29 +1,29 @@ require 'rubygems' require 'dm-core' require 'dm-validations' require 'dm-aggregates' require 'haml' require 'ostruct' require 'twitter' require 'sinatra' unless defined?(Sina...
mhawkins/wehaveengagedtheb.org
fe20f7af6413c0122b760618134487c42bc622e1
added sample db
diff --git a/.gitignore b/.gitignore index c006b47..61450d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.db log/*.log +config/database.yml config/deploy.rb config/deploy/* .rsync_cache + diff --git a/config/database.yml.sample b/config/database.yml.sample new file mode 100644 index 0000000..f500027 -...
mhawkins/wehaveengagedtheb.org
11dce8b39106b66a25bd5fe4e541d171c9e65c79
added config directory
diff --git a/.gitignore b/.gitignore index c699ed6..497058c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.db log/*.log config/deploy.rb +config/deploy/* diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 0000000..e69de29
mhawkins/wehaveengagedtheb.org
36d959869865a9688d46f7b821a06db3b9d6e279
added link to retweet project
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9734987..a56e874 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1,82 +1,82 @@ * { margin: 0; } html, body { height: 100%; } body { - background: #222; + background: #000;...
mhawkins/wehaveengagedtheb.org
1e2d1d6cc0b94853ae4e4f92f582aef904319aea
removed capistrano configs
diff --git a/.gitignore b/.gitignore index f616653..c699ed6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.db log/*.log +config/deploy.rb diff --git a/config/deploy.rb b/config/deploy.rb deleted file mode 100644 index f0baaad..0000000 --- a/config/deploy.rb +++ /dev/null @@ -1,15 +0,0 @@ -set :application...
mhawkins/wehaveengagedtheb.org
a7821c4fe5f19ff4369d6434bdb6e8add05cbe64
added initial capistrano
diff --git a/Capfile b/Capfile new file mode 100644 index 0000000..c36d48d --- /dev/null +++ b/Capfile @@ -0,0 +1,3 @@ +load 'deploy' if respond_to?(:namespace) # cap2 differentiator +Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } +load 'config/deploy' \ No newline at end of file diff --git a/confi...
mhawkins/wehaveengagedtheb.org
d314e195336f385438ec6f48d6289ec8a043b28d
app will be based off retweet
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f616653 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.db +log/*.log diff --git a/MIT-LICENSE b/MIT-LICENSE new file mode 100644 index 0000000..99995a0 --- /dev/null +++ b/MIT-LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2009 Nick Plante + +Permissi...
joshpuetz/dailyshoot
034e984b6819bf780fab37b3ab808f3b4492f321
Fix the tweet dates advertised on the front page.
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 672bdf0..3d98e55 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,86 +1,87 @@ <div class="span-22 prepend-1 append-1 last" id="second"> <div class="today"> <%= link_to "Today&rsquo;s D...
joshpuetz/dailyshoot
af673f8e9feca83e8fb1ca47bbc8f529d9da861a
Functional tests for api login.
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 49ab6ee..b93c429 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -1,5 +1,5 @@ class Api::BaseController < ApplicationController before_filter :api_user_required ...
joshpuetz/dailyshoot
03ae9ef4868f73753df27d7f0841f70c485109a1
First cut at an API.
diff --git a/app/controllers/api/assignments_controller.rb b/app/controllers/api/assignments_controller.rb new file mode 100644 index 0000000..7a84348 --- /dev/null +++ b/app/controllers/api/assignments_controller.rb @@ -0,0 +1,28 @@ +class Api::AssignmentsController < Api::BaseController + + def index + @assignmen...
joshpuetz/dailyshoot
34cc1e190b5e923427f991f457f3d554f47a5618
Turn the FAQ into a two-column layout. Huzzah!
diff --git a/app/views/welcome/faq.html.erb b/app/views/welcome/faq.html.erb index 605bc54..8d9c5f0 100644 --- a/app/views/welcome/faq.html.erb +++ b/app/views/welcome/faq.html.erb @@ -1,110 +1,117 @@ <div class="span-22 prepend-1 append-1 last" id="second"> <div class="text"> Frequently Asked Questions </div>...
joshpuetz/dailyshoot
370e0861e6347bc068733b305b9e1e41920f6066
Add a FAQ.
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 562a397..90fedbd 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,18 +1,18 @@ class WelcomeController < ApplicationController before_filter :set_cache_control, :only...
joshpuetz/dailyshoot
d0cef062c2cf2dd855a997e96f664146e827fab6
Refactor how service names and handlers are accessed to tidy up some duplication.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dc79e82..111b7bc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,49 +1,49 @@ module ApplicationHelper def page_title(subtitle='') default = "| #{subtitle}" unless subtitle.bla...
joshpuetz/dailyshoot
7ac1c8f51791294f127fed54f16a50a5e772ae33
Go back to generic handling of short URLs to support custom shorteners.
diff --git a/app/models/photo.rb b/app/models/photo.rb index 2675e45..fcb027c 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,303 +1,301 @@ # # Credit: Patrick Lenz (http://github.com/scoop) # Credit: Urban Hafner (http://github.com/ujh) # require 'open-uri' class Photo < ActiveRecord::Base ...
joshpuetz/dailyshoot
290dfd34728c26fb89e98b5dba4903cc78fa6793
Used a short date on the photogs page to avoid the grid layout breaking.
diff --git a/app/controllers/photogs_controller.rb b/app/controllers/photogs_controller.rb index 5ca2d1d..f8ca9f6 100644 --- a/app/controllers/photogs_controller.rb +++ b/app/controllers/photogs_controller.rb @@ -1,32 +1,34 @@ class PhotogsController < ApplicationController before_filter :set_cache_control, :on...
joshpuetz/dailyshoot
4324914b67ef47b87bc6dbfc0b0307254a588371
Change how TweetCollector obtains the last mention to handle Twitter crossing 10 billion tweets!
diff --git a/app/jobs/tweet_collector.rb b/app/jobs/tweet_collector.rb index 0f9dc9d..7ae2055 100644 --- a/app/jobs/tweet_collector.rb +++ b/app/jobs/tweet_collector.rb @@ -1,65 +1,65 @@ class TweetCollector attr_accessor :debug def initialize() @debug = false @count = 0 end def run(max...
joshpuetz/dailyshoot
19a3fb8dfd5506fc0a7bb51c3b62b383b825a65c
Bulk delete unparsed mentions with a checkbox, finally!
diff --git a/app/controllers/mentions_controller.rb b/app/controllers/mentions_controller.rb index 24e6966..e396761 100644 --- a/app/controllers/mentions_controller.rb +++ b/app/controllers/mentions_controller.rb @@ -1,45 +1,50 @@ class MentionsController < ApplicationController before_filter :admin_required ...
joshpuetz/dailyshoot
65e0e7a057e57c59b62e05836748647601990c4c
Add Zenfolio support.
diff --git a/app/models/photo.rb b/app/models/photo.rb index e1cadd6..2675e45 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,276 +1,303 @@ # # Credit: Patrick Lenz (http://github.com/scoop) # Credit: Urban Hafner (http://github.com/ujh) # require 'open-uri' class Photo < ActiveRecord::Base ...
joshpuetz/dailyshoot
38ceaeee7d9d7189ef6057559b6761f2ec1cd75d
Backing out the SSL experiment.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7bb4275..b2d7b63 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,47 +1,33 @@ class ApplicationController < ActionController::Base include Authenticati...
joshpuetz/dailyshoot
4c5c2cfb290b15e07f26f1f13596f3f89bfada5c
Ensure proper protocol across Heroku domains.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b2d7b63..7bb4275 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,33 +1,47 @@ class ApplicationController < ActionController::Base include Authenticati...
joshpuetz/dailyshoot
4bd48f4a3d0921d4554dde385eef76bf78b8fd80
Be explicit about admin being logged in.
diff --git a/app/views/photogs/show.html.erb b/app/views/photogs/show.html.erb index e49628f..e2ed5e7 100644 --- a/app/views/photogs/show.html.erb +++ b/app/views/photogs/show.html.erb @@ -1,14 +1,20 @@ <% @page_title = 'Photog' %> <div class="span-22 prepend-1 append-1 last" id="second"> <h2 style="text-align:cente...
joshpuetz/dailyshoot
5c2599fab55f23960946200fd5c49d66a59b9162
Add service names.
diff --git a/app/models/photo.rb b/app/models/photo.rb index f0b4422..e1cadd6 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,274 +1,276 @@ # # Credit: Patrick Lenz (http://github.com/scoop) # Credit: Urban Hafner (http://github.com/ujh) # require 'open-uri' class Photo < ActiveRecord::Base ...
joshpuetz/dailyshoot
65c7c2ac8a0316cfb95d87e4a6087876a29b369e
Support 365 Project.
diff --git a/app/models/photo.rb b/app/models/photo.rb index 8407e57..f0b4422 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,265 +1,274 @@ # # Credit: Patrick Lenz (http://github.com/scoop) # Credit: Urban Hafner (http://github.com/ujh) # require 'open-uri' class Photo < ActiveRecord::Base ...
joshpuetz/dailyshoot
a457f90f58d7a49063f8e76b7ba6037f591cfcd3
Support TwitSnaps.
diff --git a/app/models/photo.rb b/app/models/photo.rb index 8a8cdb9..8407e57 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,252 +1,265 @@ # # Credit: Patrick Lenz (http://github.com/scoop) # Credit: Urban Hafner (http://github.com/ujh) # require 'open-uri' class Photo < ActiveRecord::Base ...
joshpuetz/dailyshoot
fe12370d51f76694fada150abbad24999fc4842c
Fix typo.
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 931e6a1..af2c2a6 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,83 +1,83 @@ <div class="span-22 prepend-1 append-1 last" id="second"> <div class="today"> <%= link_to "Today&rsquo;s D...
joshpuetz/dailyshoot
01057d7924b926afff6a01e790ddece66eb766e4
Fix count to size issue with Ruby 1.8.6.
diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb index 10a8f51..6a9073c 100644 --- a/app/controllers/assignments_controller.rb +++ b/app/controllers/assignments_controller.rb @@ -1,117 +1,117 @@ class AssignmentsController < ApplicationController before_filter :...
joshpuetz/dailyshoot
44d3e61c01cdf5f0d6fa0f16ea4f431302f95f47
Added a photo count and a hashtag to the assignment page. Rescue StatementInvalid from the bot that's hitting our assignments.
diff --git a/TODO b/TODO index 17e7c20..8c55ac8 100644 --- a/TODO +++ b/TODO @@ -1,2 +1,2 @@ * Upgrade to jQuery 1.4 -* Store medium URLs +* Use pagination better \ No newline at end of file diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb index fb3589e..10a8f51 100644...
joshpuetz/dailyshoot
2c07ed1048c10db56494644c3e60aad0dd623042
Refactor list of supported photo sites onto its own page.
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 77caba5..562a397 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,15 +1,18 @@ class WelcomeController < ApplicationController - before_filter :set_cache_control, :only...
joshpuetz/dailyshoot
228954f6cee10ca5a63a5e411cf2de132bd425af
Support Twitgoo photo service URLs.
diff --git a/app/models/photo.rb b/app/models/photo.rb index 7414016..8a8cdb9 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,231 +1,252 @@ # # Credit: Patrick Lenz (http://github.com/scoop) # Credit: Urban Hafner (http://github.com/ujh) # require 'open-uri' class Photo < ActiveRecord::Base ...
joshpuetz/dailyshoot
d0665383c166fb7f3706d9952e81eb20973c3374
Add a link to the original tweet when viewing unparsed mentions.
diff --git a/app/helpers/mentions_helper.rb b/app/helpers/mentions_helper.rb index 435bdef..b1d13da 100644 --- a/app/helpers/mentions_helper.rb +++ b/app/helpers/mentions_helper.rb @@ -1,2 +1,8 @@ module MentionsHelper + + def link_to_tweet(mention) + link_to mention.screen_name, + "http://twitter.co...
joshpuetz/dailyshoot
db76789e30daa707e12e5174cac21286b1565636
Fix functional test for pagination.
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index f32bb5c..3ebdc68 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -1,48 +1,48 @@ class PhotosController < ApplicationController before_filter :admin_required, :except =...
joshpuetz/dailyshoot
0290655d583790688f6d70bac81be73a112286f6
Correctly redate assignments when reordered
diff --git a/app/models/assignment.rb b/app/models/assignment.rb index e400653..7dbd0d2 100644 --- a/app/models/assignment.rb +++ b/app/models/assignment.rb @@ -1,88 +1,88 @@ class Assignment < ActiveRecord::Base validates_presence_of :text validates_uniqueness_of :tag validates_length_of :text, ...
joshpuetz/dailyshoot
7bed8675705c3b1664b739461ebd84842f984530
Fake out Twitter OAuth in rake task collect:test
diff --git a/lib/tasks/collect.rake b/lib/tasks/collect.rake index 7428099..54a6371 100644 --- a/lib/tasks/collect.rake +++ b/lib/tasks/collect.rake @@ -1,37 +1,43 @@ namespace :collect do desc "Collect tweets and create photos and photogs" task :tweets => :environment do puts "Collecting tweets at #{Time...
joshpuetz/dailyshoot
e2f70f0bbddb710b677b46e3d035794844b017fc
Don't overwrite date on an assignment if one is supplied when tagging. Helpful when loading assignments in the past from a db seed file
diff --git a/app/models/assignment.rb b/app/models/assignment.rb index befe9a9..e400653 100644 --- a/app/models/assignment.rb +++ b/app/models/assignment.rb @@ -1,82 +1,88 @@ class Assignment < ActiveRecord::Base validates_presence_of :text validates_uniqueness_of :tag validates_length_of :text, ...
joshpuetz/dailyshoot
229a43c6e229817ecdf12c5f072f923f9b1ae6f9
Added Phusion Passenger restart file to gitignore
diff --git a/.gitignore b/.gitignore index 5cc8c7f..c87d335 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ db/*.sqlite3 log/*.log tmp/**/* doc/api doc/app config/initializers/env_local.rb db/*.json +tmp/restart.txt
joshpuetz/dailyshoot
36e9692487708a7205ea9eee3dc5b075e6866e7c
Support twitpwr.com and trunc.it shorteners.
diff --git a/app/models/photo.rb b/app/models/photo.rb index 676fb91..7414016 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -1,231 +1,231 @@ # # Credit: Patrick Lenz (http://github.com/scoop) # Credit: Urban Hafner (http://github.com/ujh) # require 'open-uri' class Photo < ActiveRecord::Base ...
joshpuetz/dailyshoot
c862c225fe7dc99d32c499176339a11c28ba8b1a
Revert to cookie store.
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 5507815..d9a47b0 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,22 +1,22 @@ # Be sure to restart your server when you modify this file. # Your secret key for verifying c...
joshpuetz/dailyshoot
9f3f4519a11d7c864837d4cf8443094d1db8c906
Updating Nokogiri gem.
diff --git a/.gems b/.gems index 16d1924..4a69ea0 100644 --- a/.gems +++ b/.gems @@ -1,5 +1,5 @@ twitter -nokogiri +nokogiri --version 1.4.1 base58 ryanb-acts-as-list --source http://gems.github.com
joshpuetz/dailyshoot
382ed6e15d868a430f47319db05d343cf90c78c3
Support TweetPhoto and TwitPic photos in the slideshow.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 302a4c3..dc79e82 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,49 +1,49 @@ module ApplicationHelper def page_title(subtitle='') default = "| #{subtitle}" unless subtitle.bla...
joshpuetz/dailyshoot
05a446c7edee9cbd6457573a560e46c651b8f928
Filter out TweetPhoto pics from slideshow until we have better support.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 93a8436..302a4c3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,49 +1,49 @@ module ApplicationHelper def page_title(subtitle='') default = "| #{subtitle}" unless subtitle.bla...
joshpuetz/dailyshoot
3e96b0c9af684765adb2600d8236f3f91f4886d9
Added keybinding (spacebar or enter key) that will open the original url of the image currently being viewed in the Fancybox slideshow.
diff --git a/public/javascripts/application.js b/public/javascripts/application.js index bcd634b..91049f5 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1,50 +1,65 @@ var CharacterCounter = { max: null, remaining: null, obj: null, start: function() { /...
joshpuetz/dailyshoot
80fad37e6c41eb9191cca81f2a325f3835f94f16
CSS tweaks
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 24ed78b..fbdf1fe 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -1,342 +1,342 @@ p { font-size: 13px; } #top { background-color: #666; margin-bottom: 0px; } #top h1 { margin-top: 15px; tex...
joshpuetz/dailyshoot
60cd3da3d3f377543bf54dbd84e1c79d08b5d1ce
Paginate photogs.
diff --git a/app/controllers/photogs_controller.rb b/app/controllers/photogs_controller.rb index 8296e5b..5ca2d1d 100644 --- a/app/controllers/photogs_controller.rb +++ b/app/controllers/photogs_controller.rb @@ -1,33 +1,32 @@ class PhotogsController < ApplicationController before_filter :set_cache_control, :on...
joshpuetz/dailyshoot
fc0ba64c3636556ad33f439d061f11b5df749c88
Removed the assignment photo count.
diff --git a/app/views/assignments/show.html.erb b/app/views/assignments/show.html.erb index 0ac7ab1..063cbf2 100644 --- a/app/views/assignments/show.html.erb +++ b/app/views/assignments/show.html.erb @@ -1,32 +1,33 @@ <% @page_title = 'Assignment' %> <div class="span-22 prepend-1 append-1 last" id="second"> <div cl...