Datasets:
numerata
/
diffs

Dataset card Data Studio Files
xet
 Community
1
repo
string
commit
string
message
string
diff
string
rbonvall/grasp-crew-scheduling
fc9c3c822538ee401c45b30874ecb75ea32e2631
Fancy color debugging data for greedy construction
diff --git a/grasp.py b/grasp.py index 1482f8b..84de028 100644 --- a/grasp.py +++ b/grasp.py @@ -1,70 +1,87 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial range = xrange def DEBUG(s): print s +def DEBUG_RCL(rotations, rcl, selecte...
rbonvall/grasp-crew-scheduling
07b022b5d5595a5c1757f4a613d0fdc68be103fe
RCL alpha parameter implementation
diff --git a/grasp.py b/grasp.py index cca0b28..1482f8b 100644 --- a/grasp.py +++ b/grasp.py @@ -1,65 +1,70 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice, random from functools import partial range = xrange def DEBUG(s): print s def rotation_cost(r, per_task_bonif...
rbonvall/grasp-crew-scheduling
f702e0aa58ca8c2405b1cfe5aefec4f68b12d740
chmod +x csp.py grasp.py
diff --git a/csp.py b/csp.py old mode 100644 new mode 100755 diff --git a/grasp.py b/grasp.py old mode 100644 new mode 100755
rbonvall/grasp-crew-scheduling
3d8f2fef21f9524b442c26c84a4b1d570fcf2447
Generic greedy cost function
diff --git a/grasp.py b/grasp.py index 6054ede..cca0b28 100644 --- a/grasp.py +++ b/grasp.py @@ -1,66 +1,65 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem -from random import choice +from random import choice, random +from functools import partial range = xrange -# parameter for greedy cost funct...
rbonvall/grasp-crew-scheduling
3cec9bcdc0c52c5ec24d9eb869bced128685ef00
Problem file as command line arg
diff --git a/grasp.py b/grasp.py index c69356b..6054ede 100644 --- a/grasp.py +++ b/grasp.py @@ -1,62 +1,66 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice range = xrange # parameter for greedy cost function per_task_bonification = 300 def DEBUG(s): print s def e...
rbonvall/grasp-crew-scheduling
2072cfd5ec019fc12b953d54cecc3b42e3bf3b5a
Debug message with tells solution size
diff --git a/grasp.py b/grasp.py index 3c6989f..c69356b 100644 --- a/grasp.py +++ b/grasp.py @@ -1,62 +1,62 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice range = xrange # parameter for greedy cost function per_task_bonification = 300 def DEBUG(s): print s def e...
rbonvall/grasp-crew-scheduling
22fc643eeebd2dda52c39a58665bb22b1a03ee66
Greedy cost takes nr of tasks into account
diff --git a/grasp.py b/grasp.py index bf9070e..3c6989f 100644 --- a/grasp.py +++ b/grasp.py @@ -1,59 +1,62 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem from random import choice range = xrange +# parameter for greedy cost function +per_task_bonification = 300 + def DEBUG(s): print s def e...
rbonvall/grasp-crew-scheduling
c4d4cd19c8221842d28cad7d973eb1d51316e5c4
Greedy construction prototype
diff --git a/grasp.py b/grasp.py index 49518a1..bf9070e 100644 --- a/grasp.py +++ b/grasp.py @@ -1,29 +1,59 @@ #!/usr/bin/env python from csp import CrewSchedulingProblem +from random import choice range = xrange +def DEBUG(s): print s + +def element_cost(r): + """Cost of adding an element to a solution""" + ...
rbonvall/grasp-crew-scheduling
cb736c7c8f8d124b197df92fbcb903a564c2b96b
set -> frozenset in Rotation
diff --git a/csp.py b/csp.py index fa9feab..7777766 100644 --- a/csp.py +++ b/csp.py @@ -1,94 +1,94 @@ #!/usr/bin/env python from collections import defaultdict from itertools import izip as zip range = xrange try: from collections import namedtuple except ImportError: from namedtuple import namedtupl...
rbonvall/grasp-crew-scheduling
f37c737aad46b3314a0686dfbb9ed476a78703ce
GRASP outline
diff --git a/grasp.py b/grasp.py new file mode 100644 index 0000000..49518a1 --- /dev/null +++ b/grasp.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python + +from csp import CrewSchedulingProblem +range = xrange + +def construct_solution(rotations, csp): + pass + +def local_search(solution): + return solution + +def grasp...
rbonvall/grasp-crew-scheduling
d4f18c615d03de8366cc80bce9c790bdf1f6724d
Hack for a nicer set visualization
diff --git a/csp.py b/csp.py index 60595e9..fa9feab 100644 --- a/csp.py +++ b/csp.py @@ -1,90 +1,94 @@ #!/usr/bin/env python from collections import defaultdict from itertools import izip as zip range = xrange try: from collections import namedtuple except ImportError: from namedtuple import namedtupl...
rbonvall/grasp-crew-scheduling
1b5790d484132f30f07bb2e721146e980d5826cf
Rotation tasks as set, not tuple
diff --git a/csp.py b/csp.py index f4fb21e..60595e9 100644 --- a/csp.py +++ b/csp.py @@ -1,91 +1,90 @@ #!/usr/bin/env python from collections import defaultdict from itertools import izip as zip range = xrange try: from collections import namedtuple except ImportError: from namedtuple import namedtupl...
rbonvall/grasp-crew-scheduling
15b64d66d4a86e9329910fc8d6ab6781491c0f6c
rm data lista
diff --git a/csp.py b/csp.py index 020be7f..f4fb21e 100644 --- a/csp.py +++ b/csp.py @@ -1,92 +1,91 @@ #!/usr/bin/env python from collections import defaultdict from itertools import izip as zip range = xrange try: from collections import namedtuple except ImportError: from namedtuple import namedtupl...
rbonvall/grasp-crew-scheduling
592a9ac1caac40d0982cf1c6569bef900fb11e33
Rotation as namedtuple, with cost and duration
diff --git a/csp.py b/csp.py index 6317c19..020be7f 100644 --- a/csp.py +++ b/csp.py @@ -1,95 +1,92 @@ #!/usr/bin/env python from collections import defaultdict +from itertools import izip as zip range = xrange try: from collections import namedtuple except ImportError: from namedtuple import namedtupl...
rbonvall/grasp-crew-scheduling
52e71156d0a9e4be99beafba8772acc32c0253c1
Gitignore vim swap files
diff --git a/.gitignore b/.gitignore index 8f9be5c..eb5f003 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc ptable.py +.*.swp
rbonvall/grasp-crew-scheduling
7605b0290324f08eba5a5a2178bdd74268c99cab
Namedtuple support for python < 2.6
diff --git a/csp.py b/csp.py index 67af2f7..6317c19 100644 --- a/csp.py +++ b/csp.py @@ -1,92 +1,95 @@ #!/usr/bin/env python from collections import defaultdict range = xrange -from collections import namedtuple +try: + from collections import namedtuple +except ImportError: + from namedtuple import namedtup...
rbonvall/grasp-crew-scheduling
78f0af46aa22d40c4e49128c0c18a6f8a2f4f185
Namedtuple for tasks (python2.6)
diff --git a/csp.py b/csp.py index ca91c2e..67af2f7 100644 --- a/csp.py +++ b/csp.py @@ -1,89 +1,92 @@ #!/usr/bin/env python from collections import defaultdict range = xrange +from collections import namedtuple + +Task = namedtuple('Task', ['start', 'finish']) class CrewSchedulingProblem: """Crew Scheduli...
rbonvall/grasp-crew-scheduling
088180b39ff8663aa93e763aa208c1e8260c4784
Gitignore Python bytecode and helper module
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f9be5c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +ptable.py
rbonvall/grasp-crew-scheduling
102ba5f474767eb1a2b911b88908ce738348d03d
Rotation generation method
diff --git a/csp.py b/csp.py index 3d29ea1..ca91c2e 100644 --- a/csp.py +++ b/csp.py @@ -1,47 +1,89 @@ #!/usr/bin/env python from collections import defaultdict +range = xrange class CrewSchedulingProblem: """Crew Scheduling problem instance from ORLIB.""" def __init__(self, input_file): file_...
rbonvall/grasp-crew-scheduling
7a906eca7e71a61ffd2c2a329797540768063080
Class for Crew Scheduling instance from ORLIB
diff --git a/csp.py b/csp.py new file mode 100644 index 0000000..3d29ea1 --- /dev/null +++ b/csp.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python + +from collections import defaultdict + +class CrewSchedulingProblem: + """Crew Scheduling problem instance from ORLIB.""" + def __init__(self, input_file): + file_co...
wjwwood/Auburn-Lunar-Excavator
6e9e0348d6c49720f7e2f46d110910ca54c58ba0
Added vlc source files.
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc diff --git a/controlcenter.py b/controlcenter.py index f700e60..8a825d2 100755 --- a/controlcenter.py +++ b/controlcenter.py @@ -1,552 +1,552 @@ #!/usr/bin/env python # encoding: utf-8 ...
hadley/toc-vis
a25304d5b810126a1e0b0763269c4b7ceee550fd
A few more tweaks
diff --git a/3-download-pages.r b/3-download-pages.r index bd35193..3393c89 100644 --- a/3-download-pages.r +++ b/3-download-pages.r @@ -1,30 +1,31 @@ library(plyr) isbn <- scan("isbns.txt", "") url <- paste("http://search.barnesandnoble.com///e/", isbn, sep = "") -# Download html file +# Download html file from...
hadley/toc-vis
8488a4df63a9aaf6907c02de1ddd116de7176fb6
Refine extractor parselet
diff --git a/extract-toc.json b/extract-toc.json index 6132bad..7f657d0 100644 --- a/extract-toc.json +++ b/extract-toc.json @@ -1,16 +1,22 @@ { - "title": "h1", - "published?": "#product-info .pubDate", - "series?": ".series a", + "title?": "replace(h1, ' by.*', '', '')", "authors?": [".nl a"], + + "published...
hadley/toc-vis
d2494cdfc7de274d9452715caeff136bf7accc80
Parse json files
diff --git a/.gitignore b/.gitignore index 447c403..0b64a7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -books \ No newline at end of file +books +json \ No newline at end of file diff --git a/3-download-pages.r b/3-download-pages.r index 5561799..bd35193 100644 --- a/3-download-pages.r +++ b/3-download-page...
niner/CiderCMS
1d794aff95807836eed0f072dbc05ed79d5db71e
Add missing templates needed for tests
diff --git a/t/test.example/templates/types/site.zpt b/t/test.example/templates/types/site.zpt new file mode 100644 index 0000000..5af9ce2 --- /dev/null +++ b/t/test.example/templates/types/site.zpt @@ -0,0 +1,6 @@ +<div xmlns:tal="http://purl.org/petal/1.0/" xmlns:i18n="http://xml.zope.org/namespaces/i18n" i18n:domain...
niner/CiderCMS
350359218f227332ffc8c1c7b2e7dd34b77059fd
Make authentication a little more flexible
diff --git a/lib/CiderCMS/User.pm b/lib/CiderCMS/User.pm index 2aca511..89086ba 100644 --- a/lib/CiderCMS/User.pm +++ b/lib/CiderCMS/User.pm @@ -1,231 +1,232 @@ package CiderCMS::User; use Moose; use namespace::autoclean; extends 'Catalyst::Authentication::User'; use List::MoreUtils 'all'; use Try::Tiny; use...
niner/CiderCMS
ec90617da68bdea03306fcf28d1305b8135040b8
Fix pasting a single element
diff --git a/root/static/js/scripts.js b/root/static/js/scripts.js index 1f0138c..3b39ef9 100644 --- a/root/static/js/scripts.js +++ b/root/static/js/scripts.js @@ -1,54 +1,54 @@ 'use strict;' function find_selected_ids() { var checkboxes = document.querySelectorAll('input.cidercms_multi_selector'); var i...
niner/CiderCMS
54b4ee182ca0b2a40da18d963e77b0ae2017a8d3
Make reservation limits available to JS
diff --git a/root/templates/custom/reservation/reservations.zpt b/root/templates/custom/reservation/reservations.zpt index fd6e523..09bd297 100644 --- a/root/templates/custom/reservation/reservations.zpt +++ b/root/templates/custom/reservation/reservations.zpt @@ -1,48 +1,50 @@ <div xmlns:tal="http://purl.org/pet...
niner/CiderCMS
09853db260f7d63fadfbe1ce9c58a9557ead24fd
Support weekday restrictions in reservation
diff --git a/lib/CiderCMS/Controller/Custom/Reservation.pm b/lib/CiderCMS/Controller/Custom/Reservation.pm index 6eb5a72..7a9c8f4 100644 --- a/lib/CiderCMS/Controller/Custom/Reservation.pm +++ b/lib/CiderCMS/Controller/Custom/Reservation.pm @@ -1,168 +1,185 @@ package CiderCMS::Controller::Custom::Reservation; use ...
niner/CiderCMS
3c634147cf1e386dc5e87ab862b6ca94b30d8378
Support end time limit in reservation
diff --git a/lib/CiderCMS/Controller/Custom/Reservation.pm b/lib/CiderCMS/Controller/Custom/Reservation.pm index db023f1..6eb5a72 100644 --- a/lib/CiderCMS/Controller/Custom/Reservation.pm +++ b/lib/CiderCMS/Controller/Custom/Reservation.pm @@ -1,152 +1,168 @@ package CiderCMS::Controller::Custom::Reservation; use ...
niner/CiderCMS
894206124adce5e86631f625ec3876b300ae7a16
Port t/07controller_Content-Management.t to CiderCMS::Test
diff --git a/lib/CiderCMS/Test.pm b/lib/CiderCMS/Test.pm index 5218bbb..1ec15ef 100644 --- a/lib/CiderCMS/Test.pm +++ b/lib/CiderCMS/Test.pm @@ -1,246 +1,247 @@ package CiderCMS::Test; use strict; use warnings; use utf8; use Test::More; use Exporter; use FindBin qw($Bin); ## no critic (ProhibitPackageVars) ...
niner/CiderCMS
8045c611f0c3e2b956eaa6ad4ce072acbe4d909b
Port t/06controller_Root.t to CiderCMS::Test
diff --git a/t/06controller_Root.t b/t/06controller_Root.t deleted file mode 100644 index 531a2d4..0000000 --- a/t/06controller_Root.t +++ /dev/null @@ -1,14 +0,0 @@ -use strict; -use warnings; -use Test::More; - -eval "use Test::WWW::Mechanize::Catalyst 'CiderCMS'"; -plan $@ - ? ( skip_all => 'Test::WWW::Mechanize:...
niner/CiderCMS
7e38131ae1bbc8dcd042f9a6eecf2dd787b135cd
Port t/12Attribute-Recipient.t to CiderCMS::Test
diff --git a/t/12Attribute-Recipient.t b/t/12Attribute-Recipient.t deleted file mode 100644 index 67d4877..0000000 --- a/t/12Attribute-Recipient.t +++ /dev/null @@ -1,73 +0,0 @@ -use strict; -use warnings; -use Test::More; -use FindBin qw($Bin); -use MIME::Lite; -use utf8; - -eval "use Test::WWW::Mechanize::Catalyst 'C...
niner/CiderCMS
3d0bfb378f4160a71ce07457506b2fd069af8d70
Make clean_sort_ids.pl more agressive
diff --git a/script/clean_sort_ids.pl b/script/clean_sort_ids.pl index f71fc43..0108355 100644 --- a/script/clean_sort_ids.pl +++ b/script/clean_sort_ids.pl @@ -1,43 +1,47 @@ use 5.14.0; use warnings; use utf8; use FindBin qw($Bin); use lib "$Bin/../lib"; use CiderCMS::Test; my $c = CiderCMS::Test::context; ...
niner/CiderCMS
820d60e5187bf3a0bfd9886a04ac0b5e21522a91
Replace CIDERCMS_INSTANCE ENV variable by HTTP header
diff --git a/lib/CiderCMS.pm b/lib/CiderCMS.pm index dd7788c..c47b910 100644 --- a/lib/CiderCMS.pm +++ b/lib/CiderCMS.pm @@ -1,187 +1,180 @@ package CiderCMS; use strict; use warnings; use Catalyst::Runtime 5.80; use Catalyst::DispatchType::CiderCMS; # Set flags and add plugins for the application # # C...
niner/CiderCMS
a23444f77dc0feab551055f0384154a0b36e6bf6
Actually survive exceptions in txn_do
diff --git a/lib/CiderCMS/Model/DB.pm b/lib/CiderCMS/Model/DB.pm index 4b07ea9..0d9a280 100644 --- a/lib/CiderCMS/Model/DB.pm +++ b/lib/CiderCMS/Model/DB.pm @@ -34,543 +34,543 @@ CiderCMS::Model::DB - DBI Model Class Creates a new instance including schema and instance directory =cut sub create_instance { m...
niner/CiderCMS
b9db19a0461b8e95c77657207193ba6227c35b16
Allow cut&pasting multiple objects at once
diff --git a/lib/CiderCMS/Controller/Content/Management.pm b/lib/CiderCMS/Controller/Content/Management.pm index de7f4a9..d2881e2 100644 --- a/lib/CiderCMS/Controller/Content/Management.pm +++ b/lib/CiderCMS/Controller/Content/Management.pm @@ -1,171 +1,187 @@ package CiderCMS::Controller::Content::Management; use ...
niner/CiderCMS
d07d9a2dd26438356d569bcb232f56e3f9bea067
Reduce duplicated test code for creating common types
diff --git a/lib/CiderCMS/Test.pm b/lib/CiderCMS/Test.pm index 4921110..995108e 100644 --- a/lib/CiderCMS/Test.pm +++ b/lib/CiderCMS/Test.pm @@ -1,205 +1,245 @@ package CiderCMS::Test; use strict; use warnings; use utf8; use Test::More; use Exporter; use FindBin qw($Bin); ## no critic (ProhibitPackageVars) ...
niner/CiderCMS
152a011a73118558262699fdd7d29ab3ff5b0cff
Port gallery_import.t to parallel test infrastructure
diff --git a/t/14_gallery_import.t b/t/14_gallery_import.t deleted file mode 100644 index b8ff317..0000000 --- a/t/14_gallery_import.t +++ /dev/null @@ -1,79 +0,0 @@ -use strict; -use warnings; -use utf8; - -use Test::More; -use FindBin qw($Bin); - -eval "use Test::WWW::Mechanize::Catalyst 'CiderCMS'"; -plan skip_all =...
niner/CiderCMS
9fb1952aa14e8b0f274e46b77c585d59b9c77d67
Decouple user list from registration to allow making user list private
diff --git a/lib/CiderCMS/Controller/Custom/Registration.pm b/lib/CiderCMS/Controller/Custom/Registration.pm index a42459c..44612ce 100644 --- a/lib/CiderCMS/Controller/Custom/Registration.pm +++ b/lib/CiderCMS/Controller/Custom/Registration.pm @@ -1,105 +1,111 @@ package CiderCMS::Controller::Custom::Registration; ...
niner/CiderCMS
e2dd3f08af8c12c43f5778c915e67854ff9e5426
Script to clean up holes in sort_ids
diff --git a/lib/CiderCMS/Model/DB.pm b/lib/CiderCMS/Model/DB.pm index fd6f6f8..4b07ea9 100644 --- a/lib/CiderCMS/Model/DB.pm +++ b/lib/CiderCMS/Model/DB.pm @@ -1,559 +1,576 @@ package CiderCMS::Model::DB; use strict; use warnings; use base 'Catalyst::Model::DBI'; use File::Slurp qw(read_file); use File::Path...
niner/CiderCMS
0ffa7bf97a0d61cdb53c4186e76c0a7f3b4e9a63
More tests for sort_ids
diff --git a/t/paste.t b/t/paste.t index 5bbfff6..d9e9582 100644 --- a/t/paste.t +++ b/t/paste.t @@ -1,75 +1,106 @@ use strict; use warnings; use utf8; use CiderCMS::Test (test_instance => 1, mechanize => 1); use Test::More; CiderCMS::Test->populate_types({ folder => { name => 'Folder', ...
niner/CiderCMS
2264afeae9cbd4ea95d55c4b8ea7bdb84b35cdf9
Fix unique key violations on paste
diff --git a/lib/CiderCMS/Model/DB.pm b/lib/CiderCMS/Model/DB.pm index ff36a2b..fd6f6f8 100644 --- a/lib/CiderCMS/Model/DB.pm +++ b/lib/CiderCMS/Model/DB.pm @@ -1,539 +1,559 @@ package CiderCMS::Model::DB; use strict; use warnings; use base 'Catalyst::Model::DBI'; use File::Slurp qw(read_file); use File::Path...
niner/CiderCMS
108d0b7b90f6b5dc71bea6966865ad67cada2b6e
Fix CiderCMS::Test failing with current Catalyst
diff --git a/lib/CiderCMS/Test.pm b/lib/CiderCMS/Test.pm index b355023..4921110 100644 --- a/lib/CiderCMS/Test.pm +++ b/lib/CiderCMS/Test.pm @@ -1,189 +1,205 @@ package CiderCMS::Test; use strict; use warnings; use utf8; use Test::More; use Exporter; use FindBin qw($Bin); ## no critic (ProhibitPackageVars) ...
niner/CiderCMS
1b3a7bc9f6b2a02ac415c4bddb7ae5a42bb2295d
Make thumbnail on non-existing images non-fatal
diff --git a/lib/CiderCMS/Attribute/Image.pm b/lib/CiderCMS/Attribute/Image.pm index dbebfe2..3039fe6 100644 --- a/lib/CiderCMS/Attribute/Image.pm +++ b/lib/CiderCMS/Attribute/Image.pm @@ -1,67 +1,68 @@ package CiderCMS::Attribute::Image; use strict; use warnings; use File::Path qw(mkpath rmtree); use Image::I...
niner/CiderCMS
4134c91f59bcb7d294a8970960fe3bbeb730047c
Fix error on pasting as new first child
diff --git a/root/static/js/scripts.js b/root/static/js/scripts.js index 1788844..5b1467a 100644 --- a/root/static/js/scripts.js +++ b/root/static/js/scripts.js @@ -1,32 +1,35 @@ function cut(id) { document.cookie = 'id=' + id + '; path=/' return; } function paste(link, after) { id = document.cookie...
niner/CiderCMS
3ea3179b7bd0451674aa580dfcab4d71087b90a1
Implement inheritance of restrictions from parent folders
diff --git a/lib/CiderCMS/Object.pm b/lib/CiderCMS/Object.pm index 5be5ac7..9db0fc9 100644 --- a/lib/CiderCMS/Object.pm +++ b/lib/CiderCMS/Object.pm @@ -1,570 +1,588 @@ package CiderCMS::Object; use strict; use warnings; use Scalar::Util qw(weaken); -use List::MoreUtils qw(any); +use List::MoreUtils qw(any none...
niner/CiderCMS
e1f4e3446a43cc0d3d068a0875dadcd43d5e270b
Fix registration failing with PostgreSQL 9.3
diff --git a/root/initial_schema.sql b/root/initial_schema.sql index 506ad20..3b38466 100644 --- a/root/initial_schema.sql +++ b/root/initial_schema.sql @@ -1,103 +1,103 @@ SET statement_timeout = 0; SET client_encoding = 'UTF8'; SET standard_conforming_strings = off; SET check_function_bodies = false; SET client_...
niner/CiderCMS
2475d24b128d3cf357c35cba2d728be408c5900c
Unicode::Encoding no longer needed on Catalyst 5.90070
diff --git a/Makefile.PL b/Makefile.PL index dea47e8..cd4f817 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,46 +1,46 @@ #!/usr/bin/env perl # IMPORTANT: if you delete this file your app will not work as # expected. You have been warned. use inc::Module::Install; name 'CiderCMS'; all_from 'lib/CiderCMS.pm'; ...
niner/CiderCMS
0075252fd9780975310f910fd337ab013fca1bdc
Fix "Can't call method "delete" on an undefined value during global destruction" in tests
diff --git a/lib/CiderCMS/Test.pm b/lib/CiderCMS/Test.pm index 18bdb13..b355023 100644 --- a/lib/CiderCMS/Test.pm +++ b/lib/CiderCMS/Test.pm @@ -1,188 +1,189 @@ package CiderCMS::Test; use strict; use warnings; use utf8; use Test::More; use Exporter; use FindBin qw($Bin); ## no critic (ProhibitPackageVars) ...
niner/CiderCMS
303552867c269d530d9e5c0986cc9ff9868442ec
Fix test failing with Catalyst 5.90070
diff --git a/lib/CiderCMS/Test.pm b/lib/CiderCMS/Test.pm index 0ac75d3..18bdb13 100644 --- a/lib/CiderCMS/Test.pm +++ b/lib/CiderCMS/Test.pm @@ -1,187 +1,188 @@ package CiderCMS::Test; use strict; use warnings; use utf8; use Test::More; use Exporter; use FindBin qw($Bin); ## no critic (ProhibitPackageVars) ...
niner/CiderCMS
a2d74fefeb5d0d252553b3b559b4019a97d153c8
Allow new DateTime flexibility for reservation as well
diff --git a/lib/CiderCMS/Attribute/DateTime.pm b/lib/CiderCMS/Attribute/DateTime.pm index 14debb2..a21790e 100644 --- a/lib/CiderCMS/Attribute/DateTime.pm +++ b/lib/CiderCMS/Attribute/DateTime.pm @@ -1,170 +1,171 @@ package CiderCMS::Attribute::DateTime; use strict; use warnings; use v5.14; use DateTime; use...
niner/CiderCMS
21177f6a57228095a1c477b14ff80675e40f939c
Be far more flexible when reading DateTime input
diff --git a/Makefile.PL b/Makefile.PL index c0d5cb8..dea47e8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,45 +1,46 @@ #!/usr/bin/env perl # IMPORTANT: if you delete this file your app will not work as # expected. You have been warned. use inc::Module::Install; name 'CiderCMS'; all_from 'lib/CiderCMS.pm'; ...
niner/CiderCMS
2f4c74a17e39af38aaccf8a9c268da26176ba122
Better error message for non-whitelisted email addresses
diff --git a/lib/CiderCMS/Controller/Custom/Registration.pm b/lib/CiderCMS/Controller/Custom/Registration.pm index d63c427..a42459c 100644 --- a/lib/CiderCMS/Controller/Custom/Registration.pm +++ b/lib/CiderCMS/Controller/Custom/Registration.pm @@ -1,105 +1,105 @@ package CiderCMS::Controller::Custom::Registration; ...
niner/CiderCMS
1821cc9caaa9a740ec4741485f3e35a2eb2bfc29
Check for duplicate user names on registration
diff --git a/lib/CiderCMS/Controller/Custom/Registration.pm b/lib/CiderCMS/Controller/Custom/Registration.pm index 88cd867..d63c427 100644 --- a/lib/CiderCMS/Controller/Custom/Registration.pm +++ b/lib/CiderCMS/Controller/Custom/Registration.pm @@ -1,90 +1,105 @@ package CiderCMS::Controller::Custom::Registration; ...
niner/CiderCMS
ff750a08d6934410d6e3f5952dc5816891b46e6f
Implement an email whitelist for registration
diff --git a/cidercms_test.yml b/cidercms_test.yml new file mode 100644 index 0000000..7013434 --- /dev/null +++ b/cidercms_test.yml @@ -0,0 +1,2 @@ +registration_email_whitelist: + - test@localhost diff --git a/lib/CiderCMS/Controller/Custom/Registration.pm b/lib/CiderCMS/Controller/Custom/Registration.pm index dfd...
niner/CiderCMS
a8af13fbda0ba7594afd2c1c59b989b41121a68c
Unbreak /system/types with CIDERCMS_INSTANCE
diff --git a/lib/CiderCMS.pm b/lib/CiderCMS.pm index 52af7da..4bb1659 100644 --- a/lib/CiderCMS.pm +++ b/lib/CiderCMS.pm @@ -1,188 +1,188 @@ package CiderCMS; use strict; use warnings; use Catalyst::Runtime 5.80; use Catalyst::DispatchType::CiderCMS; # Set flags and add plugins for the application # # C...
niner/CiderCMS
04e4146c11bb762bd19171fd8e40ae84766ad412
Except /system from adding the instance path to allow /system/logout
diff --git a/lib/CiderCMS.pm b/lib/CiderCMS.pm index 4bb1659..52af7da 100644 --- a/lib/CiderCMS.pm +++ b/lib/CiderCMS.pm @@ -1,188 +1,188 @@ package CiderCMS; use strict; use warnings; use Catalyst::Runtime 5.80; use Catalyst::DispatchType::CiderCMS; # Set flags and add plugins for the application # # C...
niner/CiderCMS
3f1f339fa6f7d54ba2124b76302559615a3a08a0
Rules in registration email
diff --git a/cidercms.yml b/cidercms.yml index f1d5ff6..00f96d1 100644 --- a/cidercms.yml +++ b/cidercms.yml @@ -1,10 +1,43 @@ name: CiderCMS Plugin::Authentication: default: credential: class: Password password_type: hashed password_hash_type: SHA-256 s...
niner/CiderCMS
87f5754cad549eb69fd70678417eda198b3d617e
Rules in registration email
diff --git a/lib/CiderCMS/Controller/Custom/Registration.pm b/lib/CiderCMS/Controller/Custom/Registration.pm index 74fb38e..90abd18 100644 --- a/lib/CiderCMS/Controller/Custom/Registration.pm +++ b/lib/CiderCMS/Controller/Custom/Registration.pm @@ -1,72 +1,108 @@ package CiderCMS::Controller::Custom::Registration; ...
niner/CiderCMS
48be80811b17c7a4e0409557a399c46dc670481b
Require authenticated user for cancelling a reservation
diff --git a/lib/CiderCMS/Controller/Custom/Reservation.pm b/lib/CiderCMS/Controller/Custom/Reservation.pm index acdb4b5..c3f9949 100644 --- a/lib/CiderCMS/Controller/Custom/Reservation.pm +++ b/lib/CiderCMS/Controller/Custom/Reservation.pm @@ -1,153 +1,155 @@ package CiderCMS::Controller::Custom::Reservation; use ...
niner/CiderCMS
d430a130d0bbbaf322443fc05f1cf1ea3bb587e6
Don't conflict with cancelled reservations
diff --git a/lib/CiderCMS/Controller/Custom/Reservation.pm b/lib/CiderCMS/Controller/Custom/Reservation.pm index b6afcdf..acdb4b5 100644 --- a/lib/CiderCMS/Controller/Custom/Reservation.pm +++ b/lib/CiderCMS/Controller/Custom/Reservation.pm @@ -1,153 +1,153 @@ package CiderCMS::Controller::Custom::Reservation; use ...
niner/CiderCMS
513911ab2fa1b37048af024007a201faba559ae1
Placeholders for usability
diff --git a/root/templates/custom/reservation/reserve.zpt b/root/templates/custom/reservation/reserve.zpt index 0a41700..733809f 100644 --- a/root/templates/custom/reservation/reserve.zpt +++ b/root/templates/custom/reservation/reserve.zpt @@ -1,40 +1,40 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:t...
niner/CiderCMS
8821ecc7d04b21af3741f5ccb3b0bbf83f56d4bd
Make new reservation link better stylable by adding a class
diff --git a/root/templates/custom/reservation/reservations.zpt b/root/templates/custom/reservation/reservations.zpt index e9ef64b..fd6e523 100644 --- a/root/templates/custom/reservation/reservations.zpt +++ b/root/templates/custom/reservation/reservations.zpt @@ -1,48 +1,48 @@ <div xmlns:tal="http://purl.org/pet...
niner/CiderCMS
ad8721e4beb67984717d944ce4274dbf79678298
croak instead of die for better error diagnosis
diff --git a/lib/CiderCMS/Object.pm b/lib/CiderCMS/Object.pm index e4fdd92..5be5ac7 100644 --- a/lib/CiderCMS/Object.pm +++ b/lib/CiderCMS/Object.pm @@ -1,570 +1,570 @@ package CiderCMS::Object; use strict; use warnings; use Scalar::Util qw(weaken); use List::MoreUtils qw(any); use File::Path qw(mkpath); use...
niner/CiderCMS
5037c0175049711f17820716d8a98eae32908a8c
Another stash variable for templates to tailor output
diff --git a/lib/CiderCMS/Controller/Custom/Reservation.pm b/lib/CiderCMS/Controller/Custom/Reservation.pm index 7cb9828..b6afcdf 100644 --- a/lib/CiderCMS/Controller/Custom/Reservation.pm +++ b/lib/CiderCMS/Controller/Custom/Reservation.pm @@ -1,152 +1,153 @@ package CiderCMS::Controller::Custom::Reservation; use ...
niner/CiderCMS
1f067fafc77a901e313a6e8170abe773737609c1
Javascript confirm for cancelling reservations
diff --git a/root/templates/custom/reservation/reservations.zpt b/root/templates/custom/reservation/reservations.zpt index 629d715..e9ef64b 100644 --- a/root/templates/custom/reservation/reservations.zpt +++ b/root/templates/custom/reservation/reservations.zpt @@ -1,48 +1,48 @@ <div xmlns:tal="http://purl.org/pet...
niner/CiderCMS
8e2e4982d0cde81bb66ffe752d93af487cd2cf9f
Implement validation of Integer attributes
diff --git a/lib/CiderCMS/Attribute/Integer.pm b/lib/CiderCMS/Attribute/Integer.pm index 8432896..a671821 100644 --- a/lib/CiderCMS/Attribute/Integer.pm +++ b/lib/CiderCMS/Attribute/Integer.pm @@ -1,54 +1,69 @@ package CiderCMS::Attribute::Integer; use strict; use warnings; use base qw(CiderCMS::Attribute); ...
niner/CiderCMS
6ab30894b2a6dfada54fdafe6e1f28d1fbbc4589
Implement validation of Integer attributes
diff --git a/lib/CiderCMS/Attribute/Integer.pm b/lib/CiderCMS/Attribute/Integer.pm index 8432896..a671821 100644 --- a/lib/CiderCMS/Attribute/Integer.pm +++ b/lib/CiderCMS/Attribute/Integer.pm @@ -1,54 +1,69 @@ package CiderCMS::Attribute::Integer; use strict; use warnings; use base qw(CiderCMS::Attribute); ...
niner/CiderCMS
5533bf5ebfb9ec4171226b38080280e0aca6483e
Implement /system/logout
diff --git a/lib/CiderCMS/Controller/System.pm b/lib/CiderCMS/Controller/System.pm index b41ea45..ffa630c 100644 --- a/lib/CiderCMS/Controller/System.pm +++ b/lib/CiderCMS/Controller/System.pm @@ -1,74 +1,89 @@ package CiderCMS::Controller::System; use strict; use warnings; use parent 'Catalyst::Controller'; =...
niner/CiderCMS
0d9c047f6b842aa3b2f42f08c553719b1904ea9e
Implement Email attributes
diff --git a/lib/CiderCMS/Attribute/Email.pm b/lib/CiderCMS/Attribute/Email.pm new file mode 100644 index 0000000..1c6036a --- /dev/null +++ b/lib/CiderCMS/Attribute/Email.pm @@ -0,0 +1,50 @@ +package CiderCMS::Attribute::Email; + +use strict; +use warnings; + +use base qw(CiderCMS::Attribute::String); + +use Regexp::C...
niner/CiderCMS
d24b5b73b8378903f4e4b0eb85da2a1e779712e2
Check for missing mandatory fields in user registration
diff --git a/lib/CiderCMS/Attribute/String.pm b/lib/CiderCMS/Attribute/String.pm index 0f83d68..ea9bf34 100644 --- a/lib/CiderCMS/Attribute/String.pm +++ b/lib/CiderCMS/Attribute/String.pm @@ -1,57 +1,70 @@ package CiderCMS::Attribute::String; use strict; use warnings; use base qw(CiderCMS::Attribute); =head...
niner/CiderCMS
c62b7622cdc39ae63260ea55dc53dd13ef5a904b
Don't copy root/static/instances to blib
diff --git a/Makefile.PL b/Makefile.PL index 85c18d6..c0d5cb8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,44 +1,45 @@ #!/usr/bin/env perl # IMPORTANT: if you delete this file your app will not work as # expected. You have been warned. use inc::Module::Install; name 'CiderCMS'; all_from 'lib/CiderCMS.pm'; ...
niner/CiderCMS
dca6018382e90ab654634cb4a8fc6fe441d73dc9
Implement email verification for user registration
diff --git a/Makefile.PL b/Makefile.PL index cd61dde..85c18d6 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,41 +1,44 @@ #!/usr/bin/env perl # IMPORTANT: if you delete this file your app will not work as # expected. You have been warned. use inc::Module::Install; name 'CiderCMS'; all_from 'lib/CiderCMS.pm'; ...
niner/CiderCMS
f520988d64f938df366f76d41400fdff4adbe128
Implement simple registration of users
diff --git a/lib/CiderCMS/Controller/Custom/Registration.pm b/lib/CiderCMS/Controller/Custom/Registration.pm new file mode 100644 index 0000000..4c164cb --- /dev/null +++ b/lib/CiderCMS/Controller/Custom/Registration.pm @@ -0,0 +1,39 @@ +package CiderCMS::Controller::Custom::Registration; + +use strict; +use warnings; ...
niner/CiderCMS
01432ebf83c75a0f1d24c45bf8648c15b1d69d3e
Catch creating child with invalid attribute names
diff --git a/lib/CiderCMS/Object.pm b/lib/CiderCMS/Object.pm index 7d33d54..6cc3d26 100644 --- a/lib/CiderCMS/Object.pm +++ b/lib/CiderCMS/Object.pm @@ -1,566 +1,570 @@ package CiderCMS::Object; use strict; use warnings; use Scalar::Util qw(weaken); use List::MoreUtils qw(any); use File::Path qw(mkpath); use...
niner/CiderCMS
aa3e17937bb1793a380bec14663bf38648a6fd75
Offer a link to user registration on login screen
diff --git a/root/templates/login.zpt b/root/templates/login.zpt index cb48a57..629666f 100644 --- a/root/templates/login.zpt +++ b/root/templates/login.zpt @@ -1,35 +1,40 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xml:lang="en" lan...
niner/CiderCMS
ab609f038c9437d4c62cbab8d66e29d5effa70b7
Fix tests failing after 4fccfee3
diff --git a/root/templates/custom/reservation/reservations.zpt b/root/templates/custom/reservation/reservations.zpt index 08961fa..629d715 100644 --- a/root/templates/custom/reservation/reservations.zpt +++ b/root/templates/custom/reservation/reservations.zpt @@ -1,48 +1,48 @@ <div xmlns:tal="http://purl.org/pet...
niner/CiderCMS
92ecf16ef60d52a0508f42a84929f0032582ed22
Plain text attributes
diff --git a/lib/CiderCMS/Attribute/Plaintext.pm b/lib/CiderCMS/Attribute/Plaintext.pm new file mode 100644 index 0000000..168de76 --- /dev/null +++ b/lib/CiderCMS/Attribute/Plaintext.pm @@ -0,0 +1,33 @@ +package CiderCMS::Attribute::Plaintext; + +use strict; +use warnings; + +use base qw(CiderCMS::Attribute::String); ...
niner/CiderCMS
080bd4ff9b4c07cc8abdf3bad0ca9731b9b85be3
Fix date picker in reservation system
diff --git a/root/templates/custom/reservation/reserve.zpt b/root/templates/custom/reservation/reserve.zpt index 6c511b9..0a41700 100644 --- a/root/templates/custom/reservation/reserve.zpt +++ b/root/templates/custom/reservation/reserve.zpt @@ -1,40 +1,40 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:t...
niner/CiderCMS
4fccfee34efd1a59b122ef318be50f221df7a98a
Remove invalid nesting of tbody in reservations list
diff --git a/root/templates/custom/reservation/reservations.zpt b/root/templates/custom/reservation/reservations.zpt index cee82a1..08961fa 100644 --- a/root/templates/custom/reservation/reservations.zpt +++ b/root/templates/custom/reservation/reservations.zpt @@ -1,48 +1,48 @@ <div xmlns:tal="http://purl.org/pet...
niner/CiderCMS
a55bcb8bc58decb120e713ca74052d4a0cfc5a7c
Fix date picker for DateTime attributes
diff --git a/root/templates/attributes/datetime.zpt b/root/templates/attributes/datetime.zpt index 66377fa..0625d4e 100644 --- a/root/templates/attributes/datetime.zpt +++ b/root/templates/attributes/datetime.zpt @@ -1,7 +1,7 @@ <label xmlns:tal="http://purl.org/petal/1.0/" xmlns:i18n="http://xml.zope.org/namespaces/i...
niner/CiderCMS
45bfb967fcbcbec907e649b455364fa6c426d521
Add vim swap files to .gitignore
diff --git a/.gitignore b/.gitignore index a3fd0d9..0998a95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,14 @@ Makefile.old META.yml MYMETA.json MYMETA.yml Makefile Makefile.old blib/ cover_db/ inc/ pm_to_blib root/instances/ import.sh .prove +.*.swp
webcracy/activity_streams-workshop
a8d9d1efa1385e7d5b6519796e112285d836c724
added verb to json output
diff --git a/app/models/activity.rb b/app/models/activity.rb index 2dadeb4..f6a2cd0 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -1,132 +1,133 @@ class Activity < ActiveRecord::Base include ActionView::Helpers include ActionController::UrlWriter default_url_options[:host] = APP_CONFIG[:...
webcracy/activity_streams-workshop
1f37156eff3032b06a2f4c91d61bef78119f4cf7
created privacy page. further integrated janrain engage
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index bfccb48..64f52ea 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,6 +1,8 @@ class HomeController < ApplicationController def index end def faq end + def privacy + end ...
webcracy/activity_streams-workshop
0ce34aa28daaa0db1bec310afd49f0f912768948
added Streamed Authentication using Janrain Engage
diff --git a/app/controllers/oauth_consumers_controller.rb b/app/controllers/oauth_consumers_controller.rb index 3218f87..8cc87c5 100644 --- a/app/controllers/oauth_consumers_controller.rb +++ b/app/controllers/oauth_consumers_controller.rb @@ -1,92 +1,92 @@ require 'oauth/controllers/consumer_controller' class Oauth...
webcracy/activity_streams-workshop
c348d3e76572cdef670d966ab7499cb19c47ea45
tweaked the styles a little bit
diff --git a/app/models/activity.rb b/app/models/activity.rb index 773c8b0..2dadeb4 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -1,128 +1,132 @@ class Activity < ActiveRecord::Base include ActionView::Helpers include ActionController::UrlWriter default_url_options[:host] = APP_CONFIG[:...
webcracy/activity_streams-workshop
3b347f809ddccc7d34498ddfd4a17bb1dadaa8fe
Implemented share activity stream with public
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 3ce3b88..212e585 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -1,82 +1,90 @@ class ActivitiesController < ApplicationController before_filter :login_or_oa...
webcracy/activity_streams-workshop
7da6eac5b0bc0596ec1f489a3e5b3c4982af0a5d
tidy the Activity#index view
diff --git a/app/views/activities/index.html.haml b/app/views/activities/index.html.haml index 7e0a9ec..dfbae0e 100644 --- a/app/views/activities/index.html.haml +++ b/app/views/activities/index.html.haml @@ -1,23 +1,25 @@ - title "Activities" %p.manage.x-l-margin= link_to "New Activity", new_activity_path, :class ...
webcracy/activity_streams-workshop
ba4d124ca081ef1a7218ce11c0a2b5464b8af0a3
Moved Activity#to_sentence to a helper where it belongs
diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb index 4e9784c..d38072f 100644 --- a/app/helpers/activities_helper.rb +++ b/app/helpers/activities_helper.rb @@ -1,2 +1,12 @@ module ActivitiesHelper + def activity_to_sentence(activity) + [ + link_to(activity.object.title, activi...
webcracy/activity_streams-workshop
e7f7df9b307ebc4ea20124e476d1bc13f292cab7
fixed problem with remember_token
diff --git a/lib/authenticated_system.rb b/lib/authenticated_system.rb index f993adc..74d58d0 100644 --- a/lib/authenticated_system.rb +++ b/lib/authenticated_system.rb @@ -1,189 +1,192 @@ module AuthenticatedSystem protected # Returns true or false if the user is logged in. # Preloads @current_user with ...
webcracy/activity_streams-workshop
10900989db7eb4d5669b12f381e1e3489188c046
started to implement the example activites / your activities separation
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 24f9689..3ce3b88 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -1,82 +1,82 @@ class ActivitiesController < ApplicationController before_filter :login_or_oa...
webcracy/activity_streams-workshop
d149aaf6dab336cf1a0532f487cb4d33ec1ebb24
restyled the activities some more
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 0bc0853..24f9689 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -1,82 +1,82 @@ class ActivitiesController < ApplicationController before_filter :login_or_oa...
webcracy/activity_streams-workshop
cb3d58c6966876977c4822cd7ea96dafc18fb7ac
edited activity page
diff --git a/app/views/activities/_activity.html.haml b/app/views/activities/_activity.html.haml new file mode 100644 index 0000000..22a05ba --- /dev/null +++ b/app/views/activities/_activity.html.haml @@ -0,0 +1,22 @@ +- link_to activity.actor.url_id do + = activity.actor.title.present? ? activity.actor.title : activ...
webcracy/activity_streams-workshop
a08734de46e118adb2d887c0ded5b4b4db1573c3
added a footer and changed the styles again
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index b5c5019..a3e9baa 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,24 +1,24 @@ - title "Welcome" %p <strong>Activity Streams Workshop</strong> is a place to play and test with the %a{:href...
webcracy/activity_streams-workshop
5eea4f3acc10c63c4ba058604d560044e8608a14
changed the name of a couple css classes and html element ids
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 88ce82d..4847d8e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,38 +1,38 @@ !!! Strict %html{html_attrs} %head %title = h(yield(:title).to_s + '...
webcracy/activity_streams-workshop
2e76faabf44d8b860718194d9195ae033fd66db3
edited styles a little further
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index d0d4791..88ce82d 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,34 +1,38 @@ !!! Strict %html{html_attrs} %head %title - = h(yield(:title) + ' - Ac...
webcracy/activity_streams-workshop
242bbc6d755734b8f2b46253c4f2c372206bc382
created home controller and first drafts of home and faq pages
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb new file mode 100644 index 0000000..bfccb48 --- /dev/null +++ b/app/controllers/home_controller.rb @@ -0,0 +1,6 @@ +class HomeController < ApplicationController + def index + end + def faq + end +end diff --git a/app/helpers/home_h...
webcracy/activity_streams-workshop
dc27db6c409b3cf877f1788a6dde4fac85c7a420
edited layout
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 96f5f8e..b478de2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,34 +1,34 @@ !!! Strict %html{html_attrs} %head %title - = h(yield(:title) || "Acti...
webcracy/activity_streams-workshop
643e43e744567c854277b1bb1e77d51303ac18f5
added is_public and public_name fields to activities. require db:migrate. also added nav menu
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 015df71..0bc0853 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -1,81 +1,82 @@ class ActivitiesController < ApplicationController before_filter :login_or_oa...