repo string | commit string | message string | diff string |
|---|---|---|---|
gpeipman/Visual-Studio-Experiments | d0f9e9b22bc00edd9427e303fd8f7cc3b348c1ee | added WebAppThreading solution to repository | diff --git a/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.cs b/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.cs
index 0662d25..6be7a6d 100644
--- a/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.cs
+++ b/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.cs
@@ -1,48 +1... |
gpeipman/Visual-Studio-Experiments | eb1e3457b750f6f2b595a01f2b5b63f9f2ca72bd | added modeling project with class diagram draft (illustrative) | diff --git a/Experiments.MemBus.Forms/Experiments.MemBus.Forms.Models/DesignDraft.classdiagram b/Experiments.MemBus.Forms/Experiments.MemBus.Forms.Models/DesignDraft.classdiagram
new file mode 100644
index 0000000..bc79743
--- /dev/null
+++ b/Experiments.MemBus.Forms/Experiments.MemBus.Forms.Models/DesignDraft.classdia... |
gpeipman/Visual-Studio-Experiments | 270336af9cd20a2c2e52ae4a453aa0b0c8f651e4 | main form "unregisters" observer when mdi child is closed, added menu to tile child windows horizontally | diff --git a/Experiments.MemBus.Forms/Experiments.MemBus.Forms/MainForm.Designer.cs b/Experiments.MemBus.Forms/Experiments.MemBus.Forms/MainForm.Designer.cs
index 699dbb1..41b7c1a 100644
--- a/Experiments.MemBus.Forms/Experiments.MemBus.Forms/MainForm.Designer.cs
+++ b/Experiments.MemBus.Forms/Experiments.MemBus.Forms/... |
gpeipman/Visual-Studio-Experiments | c0dd494320758391c33aeb9399ca6c3b6c53e272 | data moves from bus to child window and child window is able to display it | diff --git a/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.Designer.cs b/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.Designer.cs
index 734e26d..889538a 100644
--- a/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.Designer.cs
+++ b/Experiments.MemBus.Forms/Experiments.MemBus.For... |
gpeipman/Visual-Studio-Experiments | 79600b09f86646277936e8c75c1a9e4d97028f0f | added mdi child that workd as observer for bus, new window menu opens new mdi child window | diff --git a/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.Designer.cs b/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.Designer.cs
new file mode 100644
index 0000000..734e26d
--- /dev/null
+++ b/Experiments.MemBus.Forms/Experiments.MemBus.Forms/ChildForm.Designer.cs
@@ -0,0 +1,73 @@
+name... |
gpeipman/Visual-Studio-Experiments | 6094404d8ecb8b0434be678daeae82916e3fc6ac | added reference to membus.dll, main form is now mdi parent, added menu to main form, exit choise works | diff --git a/Experiments.MemBus.Forms/Experiments.MemBus.Forms.sln b/Experiments.MemBus.Forms/Experiments.MemBus.Forms.sln
index 04daafc..9eaa682 100644
--- a/Experiments.MemBus.Forms/Experiments.MemBus.Forms.sln
+++ b/Experiments.MemBus.Forms/Experiments.MemBus.Forms.sln
@@ -1,20 +1,26 @@

Microsoft Visual Studio... |
gpeipman/Visual-Studio-Experiments | 05f3dd67b17684362e18efe36eb3512ec0f62988 | empty Windows Forms project, prepared for experiments | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3529ad9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,29 @@
+
+#ignore thumbnails created by windows
+Thumbs.db
+#Ignore files build by Visual Studio
+*.obj
+*.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak... |
bricooke/rooswitch-nl-plugin | d6b102e51e0843c910e10bc7a7ea88c13deeb389 | Converted to Sidekick compatible plugin. Removed a few NSLogs | diff --git a/Info.plist b/Info.plist
index 802336a..19c462d 100644
--- a/Info.plist
+++ b/Info.plist
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopment... |
bricooke/rooswitch-nl-plugin | acc93c7a8e46eea3b17ba79b746d5c83cb3b8c65 | Fixed up the project bundle, added a proper .gitignore | diff --git a/.gitignore b/.gitignore
index 4c3e33f..6ad73d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-rooSwitchNLPlugin.xcodeproj/bcooke.*
+build/
+.DS_Store
+*.xcodeproj/*.mode?v3
+*.xcodeproj/*.pbxuser
diff --git a/rooSwitchNLPlugin.xcodeproj/bcooke.perspective b/rooSwitchNLPlugin.xcodeproj/bcooke.persp... |
bricooke/rooswitch-nl-plugin | 06e0045f55b28f4c461f9ba5097db2dfa97a91a9 | setting up ignore and fixing up the applescript so it makes sure the document is open before switching. | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c3e33f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+rooSwitchNLPlugin.xcodeproj/bcooke.*
diff --git a/SwitchAction.m b/SwitchAction.m
index e637714..c71cae1 100644
--- a/SwitchAction.m
+++ b/SwitchAction.m
@@ -1,92 +1,96 @@
//
// NLTestAction... |
bricooke/rooswitch-nl-plugin | 361210b2db500c7d1968cdfb0d2517700b16bbe8 | initial import | diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000..186e179
Binary files /dev/null and b/English.lproj/InfoPlist.strings differ
diff --git a/Info.plist b/Info.plist
new file mode 100644
index 0000000..20e1aaf
--- /dev/null
+++ b/Info.plist
@@ -0,0 +1,26 @@
... |
nathanpitman/us_states_select.pi.ee_addon | 61e7e28c284f284cd7a084f1a7417203e9f98e91 | initial import | diff --git a/system/plugins/pi.np_us_states_select.php b/system/plugins/pi.np_us_states_select.php
new file mode 100644
index 0000000..4d30bbf
--- /dev/null
+++ b/system/plugins/pi.np_us_states_select.php
@@ -0,0 +1,108 @@
+<?php
+
+$plugin_info = array(
+ 'pi_name' => 'US States Select',
+ 'pi_version' => '1.0',
+ ... |
prajnashi/gst-ffmpeg | b7c318a7137b2e40b506e4b7d199d8d753d0cc5e | refine code | diff --git a/android/config.h b/android/config.h
index 8ba8277..620ebda 100644
--- a/android/config.h
+++ b/android/config.h
@@ -1,154 +1,154 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helpe... |
prajnashi/gst-ffmpeg | 239568d659947faf767103cd6ce09ec1eded8d3a | 1) refine code 2) in order to make ffdec_aac loaded by playbin2, change its rank from NONE to MARGINAL | diff --git a/android/config.h b/android/config.h
index 40df085..8ba8277 100644
--- a/android/config.h
+++ b/android/config.h
@@ -1,150 +1,154 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helpe... |
prajnashi/gst-ffmpeg | 537f261bca3a161a8de07cc187f050825774ba13 | Use libav* static libraries | diff --git a/ext/ffmpeg/Android.mk b/ext/ffmpeg/Android.mk
index d6589d7..eb04a06 100644
--- a/ext/ffmpeg/Android.mk
+++ b/ext/ffmpeg/Android.mk
@@ -1,51 +1,53 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
gstffmpeg.c \
gstffmpegprotocol.c \
gstffmpegcodecmap.c \
... |
prajnashi/gst-ffmpeg | 07803a5b4ea0d025127bd0ae97d431ed713f911d | Android: Autogenerate config.h | diff --git a/android/config.h b/android/config.h
new file mode 100644
index 0000000..40df085
--- /dev/null
+++ b/android/config.h
@@ -0,0 +1,150 @@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define if building universal (internal he... |
prajnashi/gst-ffmpeg | 89994665b07243128257a325952c1e7dd3e96114 | Android makefiles using external ffmpeg | diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..c8a11c4
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,7 @@
+LOCAL_PATH := $(call my-dir)
+
+GST_FFMPEG_TOP := $(LOCAL_PATH)
+
+include $(CLEAR_VARS)
+
+include $(GST_FFMPEG_TOP)/ext/ffmpeg/Android.mk
\ No newline at end of file
diff --git a/ext/ffmpeg... |
prajnashi/gst-ffmpeg | c6f7d6005f579a1ce7fddb485770334c5cb624c2 | gstffmpeg.c: Only initialize decoders and encoders for Android | diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/ffmpeg/gstffmpeg.c
index 98c262a..919e77c 100644
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/ffmpeg/gstffmpeg.c
@@ -1,166 +1,172 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
*
* This library is free software; you can redistribute it and/or
* mo... |
prajnashi/gst-ffmpeg | a44f5b4df3c7c806820358d0c4913cc53c44da46 | ffenc: Add support for I-frame request. | diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index 8980d1d..8b36334 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -1,1087 +1,1124 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
*
* This library is free software; you can redistribute it... |
prajnashi/gst-ffmpeg | 3fcef3b6a7799f32b213b486ec80b9acf356e9d7 | ffmux: Actually set caps on the srcpad instead of working with NULL caps | diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index a72497c..e1324f0 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -1,736 +1,737 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
*
* This library is free software; you can redistribute it a... |
prajnashi/gst-ffmpeg | 178b421f0a6ef0237e71ddba551115707defd814 | back to development -> 0.10.7.1 | diff --git a/configure.ac b/configure.ac
index 5297739..1d57be8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,379 +1,379 @@
AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT... |
prajnashi/gst-ffmpeg | 4223919d5092e4365c2123a29600d7365d9a086f | 0.10.6.4 pre-release | diff --git a/configure.ac b/configure.ac
index a88b17e..b687586 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,379 +1,379 @@
AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT... |
prajnashi/gst-ffmpeg | 7ca2836193baa85387484d1f85aa56dc7e02ba5d | Take into account ticks_per_frame for framerate calculation. Fixes #575759 | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index bd59498..57f2e09 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1,704 +1,705 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* This file:
* Copyright (c) 2002-2004 R... |
prajnashi/gst-ffmpeg | 983d2f2b36d029f3b64531c1f6ba1de022e746cb | Re-enable amr muxer. It's a muxer after all. Fixes #575664 | diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index fe16c0a..a72497c 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -286,603 +286,602 @@ gst_ffmpegmux_get_property (GObject * object, guint prop_id, GValue * value,
static void
gst_ffmpegmux_finalize (GObject * object... |
prajnashi/gst-ffmpeg | d23028e301e260cc23b2248c1feccc574503509e | 0.10.6.3 pre-release | diff --git a/configure.ac b/configure.ac
index d03d752..a88b17e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,379 +1,379 @@
AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT... |
prajnashi/gst-ffmpeg | 59796dd0bc0e4e985d5c31777648dd01d01c1184 | gstffmpegdec: Disable vdpau decoders. Fixes #573400 | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index c330dc1..ee1c71e 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -2049,621 +2049,634 @@ gst_ffmpegdec_flush_pcache (GstFFMpegDec * ffmpegdec)
static gboolean
gst_ffmpegdec_sink_event (GstPad * pad, GstEvent * event)
{
... |
prajnashi/gst-ffmpeg | 2df7d3e960d71045da096e67225b008005b4576e | pixfmt: Stop using PIX_FMT that were marked as deprecated 3 years ago. | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 5874116..bd59498 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -219,3227 +219,3227 @@ gst_ff_vid_caps_new (AVCodecContext * context, enum CodecID codec_id,
for (i = 0; i < n_sizes; i++) {
... |
prajnashi/gst-ffmpeg | 916d1a8b8d5f447b16992d3211da0c0d6ba5aff8 | ffmpegrev: bump up upstream revision to the *exact* release revision. | diff --git a/ffmpegrev b/ffmpegrev
index 2344415..3235f87 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=17805
+FFMPEG_REVISION=17887
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/branches/0.5
# Because ffmpeg checks out libswscale via an svn:externals, checking
#... |
prajnashi/gst-ffmpeg | 45ec23e37c90f189fdb5d2ddda7154647c1d0be3 | codecmapping: Fix caps for ATRAC3. Fixes #574663 | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 3ac1272..5874116 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -81,1025 +81,1027 @@ static const struct
CH_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}, {
CH_FRONT_CENTER, GST_AUDIO_CHA... |
prajnashi/gst-ffmpeg | 1e689f057ff8969ae6cda8093d5a92a5490dedaa | Disable exposing decoder/encoder using external library. Fixes #574746 | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 131a252..c330dc1 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -2039,621 +2039,631 @@ gst_ffmpegdec_flush_pcache (GstFFMpegDec * ffmpegdec)
if (ffmpegdec->pctx) {
GstFFMpegDecClass *oclass;
oclass = (GstF... |
prajnashi/gst-ffmpeg | ca1321b22405d0c5a70ded97d0e30ff6db533894 | blacklist bogus demuxer/muxer/typefind. Fixes #567336 and #574814 | diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index ae0caf6..bd3ed2b 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1297,665 +1297,679 @@ gst_ffmpegdemux_loop (GstFFMpegDemux * demux)
/* get more stuff belonging to this stream */
avstream = stream->avstre... |
prajnashi/gst-ffmpeg | b4513f0a700be604fc47f180b92e2965cfb66c47 | 0.10.6.2 pre-release | diff --git a/configure.ac b/configure.ac
index bd8e46a..d03d752 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,379 +1,379 @@
AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT... |
prajnashi/gst-ffmpeg | e1818583e611b5874e33ab478a93319ef780a9ca | Automatic update of common submodule | diff --git a/common b/common
index 7032163..f8b3d91 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 703216354ea3d21fb87b43a160497c0ccd7bc30a
+Subproject commit f8b3d9167a75c5acb514d43173d8d29d413a6e9c
|
prajnashi/gst-ffmpeg | 8cfa2c43147cef1e3245824ed5e0757ea24ab5d7 | gstffmpegdec: Use 64bit scaling function to avoid overflows detected in some situations. | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 019140c..131a252 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1325,1025 +1325,1025 @@ beach:
static gboolean
check_keyframe (GstFFMpegDec * ffmpegdec)
{
GstFFMpegDecClass *oclass;
gboolean is_itype = FALSE;
... |
prajnashi/gst-ffmpeg | 146aab9dcb6016303503a35483cb7b7d6a4f242f | demux: If the demuxer isn't initialized yet, forward serialized events without waiting. | diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index cc99f0b..ae0caf6 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1006,951 +1006,956 @@ gst_ffmpegdemux_get_stream (GstFFMpegDemux * demux, AVStream * avstream)
tmp = gst_ffmpeg_time_ff_to_gst (avstream->du... |
prajnashi/gst-ffmpeg | f8e3a0007f0dd14135820e802c8e68d835a8a747 | demuxers: Blacklist push-mode for avformat demuxers which aren't reliable in push-mode. | diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 62943e1..cc99f0b 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1,794 +1,804 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>,
* <2006> Edward Hervey <bilboed@bilboed... |
prajnashi/gst-ffmpeg | 3f34bf8ef466ee44527309c995e58ff6134c480f | demuxers: Add more debugging | diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 528782f..62943e1 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1072,867 +1072,870 @@ gst_ffmpegdemux_read_tags (GstFFMpegDemux * demux)
gst_tag_list_add (tlist, GST_TAG_MERGE_REPLACE,
GST_TAG_COPY... |
prajnashi/gst-ffmpeg | b75a3f325a688d71ae71ab5492a6627b7f62a27f | ffmpegrev: and update once more for last-minute fixes to upstream release branch | diff --git a/ffmpegrev b/ffmpegrev
index 95315e5..2344415 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=17754
+FFMPEG_REVISION=17805
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/branches/0.5
# Because ffmpeg checks out libswscale via an svn:externals, checking
#... |
prajnashi/gst-ffmpeg | cc9dace674c56d348cc31ee2bed92869ebc26847 | gstffmpegcodecmap: Add proper caps for Fraps video codec | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 7717ef1..3ac1272 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -371,1024 +371,1027 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
* the list of channel layouts suppo... |
prajnashi/gst-ffmpeg | 4cf88b2c32e42fff273303dffca1937d8ac078fb | Automatic update of common submodule | diff --git a/common b/common
index ffa738d..7032163 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ffa738d61030479238df49b9ced88bdd6efb3b78
+Subproject commit 703216354ea3d21fb87b43a160497c0ccd7bc30a
|
prajnashi/gst-ffmpeg | f919b14e61b679c0122f2bd726ea2ae6d679a026 | Automatic update of common submodule | diff --git a/common b/common
index 3f13e4e..ffa738d 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3f13e4e1a1de4fd0482d4fdc7f6f8e4c4f462daf
+Subproject commit ffa738d61030479238df49b9ced88bdd6efb3b78
|
prajnashi/gst-ffmpeg | bc11713dc1a92e0310a62ee2ca70b8b77e45961c | Automatic update of common submodule | diff --git a/common b/common
index 3c7456b..3f13e4e 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3c7456ba75fced5a08e6ea97a25e5356570685c7
+Subproject commit 3f13e4e1a1de4fd0482d4fdc7f6f8e4c4f462daf
|
prajnashi/gst-ffmpeg | 46acf5266a0bfc1b8c7f364d94b0f2a3d6243923 | Automatic update of common submodule | diff --git a/common b/common
index 57c83f2..3c7456b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 57c83f2ced9890f1f8c4c64cd6c0b70f952e6a59
+Subproject commit 3c7456ba75fced5a08e6ea97a25e5356570685c7
|
prajnashi/gst-ffmpeg | 7553796d3a62dd8af6e7c7d016444f6cef8c8973 | configure: require a released version of gstreamer, to avoid confusion | diff --git a/configure.ac b/configure.ac
index 4fab590..bd8e46a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,379 +1,379 @@
AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AC_INIT... |
prajnashi/gst-ffmpeg | 98167578c45b91b5b73f4e1165fb68d03b10ed92 | ffmpegdec: Make sure we provide 16 byte aligned data to ffmpeg. Fixes #572863 | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index aeec910..019140c 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1285,1026 +1285,1030 @@ clip_video_buffer (GstFFMpegDec * dec, GstBuffer * buf, GstClockTime in_ts,
goto beach;
/* we need a start time */
if ... |
prajnashi/gst-ffmpeg | df6fb6867ed19bfc5f735518452153d5e81efc04 | ffaudioresample: Add padding to output buffer. Fixes #573649 | diff --git a/ext/ffmpeg/gstffmpegaudioresample.c b/ext/ffmpeg/gstffmpegaudioresample.c
index f1d3260..7900ed4 100644
--- a/ext/ffmpeg/gstffmpegaudioresample.c
+++ b/ext/ffmpeg/gstffmpegaudioresample.c
@@ -1,297 +1,299 @@
/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* This file:
* Copyr... |
prajnashi/gst-ffmpeg | c389f49295fff27e6ce5dbbf1e6369983617040b | ffmpegdec: post an error message on the bus when decoding fails | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 638df3d..aeec910 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1352,1025 +1352,1026 @@ check_keyframe (GstFFMpegDec * ffmpegdec)
GST_LOG_OBJECT (ffmpegdec,
"current picture: type: %d, is_keyframe:%d, is_ity... |
prajnashi/gst-ffmpeg | eeffd7b87feaa1e6076b6110419fd0455bf64b6f | gstffmpegdec: Set the rank of the AAC decoder to NONE. | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 7d80931..638df3d 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -2113,536 +2113,542 @@ gst_ffmpegdec_sink_event (GstPad * pad, GstEvent * event)
/* create new converted time segment */
fmt = GST_F... |
prajnashi/gst-ffmpeg | ac82da060acb9f6d42deba15191efbd692662a75 | Make bz2 requirement optional. Fixes #564867 | diff --git a/configure.ac b/configure.ac
index aedfd43..4fab590 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,375 +1,379 @@
AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AC_INIT... |
prajnashi/gst-ffmpeg | c7458545f301554d14cbdc04b6b1a216b0719a81 | gstffmpegmux: Expose the 'preload' and 'maxdelay' properties, add dvd mux mapping. | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index ce608f9..7717ef1 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1874,1024 +1874,1035 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
#endif
}
}
} else if (strcmp (gst_structure_ge... |
prajnashi/gst-ffmpeg | 8dcbe4f7e866258483639e9153936bcaf7b81bf0 | codecmap. The VC1 decoder can also handle the Advanced Profile. | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 6b8b0e8..ce608f9 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -2123,1025 +2123,1026 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
else if (!strcmp (mime, "video/mpeg"))
con... |
prajnashi/gst-ffmpeg | 30805cd2c476020d929954af263e4aa85dbe9759 | ffdec: fix build | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 304604b..7d80931 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1272,1168 +1272,1168 @@ static gboolean
clip_video_buffer (GstFFMpegDec * dec, GstBuffer * buf, GstClockTime in_ts,
GstClockTime in_dur)
{
gboole... |
prajnashi/gst-ffmpeg | 9eb48ddcdab4982106c595508f96704e0cff5610 | gstffmpegdec: Abort on first failure by AAC decoder. Fixes #566250. | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 0bd5879..304604b 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1349,1024 +1349,1031 @@ check_keyframe (GstFFMpegDec * ffmpegdec)
|| (oclass->in_plugin->id == CODEC_ID_ZLIB)
|| (oclass->in_plugin->id == CO... |
prajnashi/gst-ffmpeg | ec1ff94e7bdf1a9964a8d6807251caa53b37fe64 | gstffmpegdec: Bring the real decoders up to GST_RANK_PRIMARY. | diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 8b451a4..0bd5879 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -2091,545 +2091,551 @@ gst_ffmpegdec_sink_event (GstPad * pad, GstEvent * event)
if (!bit_rate)
goto no_bitrate;
GST_DE... |
prajnashi/gst-ffmpeg | 778df9cae02f3cf62c15e6a37021df601cede767 | ffmpeg: Don't register the MXF typefinder, we have our own in -base | diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 8c3e94f..528782f 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1310,628 +1310,629 @@ gst_ffmpegdemux_loop (GstFFMpegDemux * demux)
/* check start_time */
if (demux->start_time != -1 && demux->start_time >... |
prajnashi/gst-ffmpeg | b50cc134873dd967800e30e8894248393ce2d93b | ffmpeg: mxf_d10 is application/mxf too, it only specifies the used mapping | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 49c5209..6b8b0e8 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1812,1025 +1812,1025 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
GST_DEBUG ("converting caps %" GST_PTR_FORMAT, caps);
... |
prajnashi/gst-ffmpeg | a57ffa07c42eb9023cb9196bf55fbcfdd9ed6d15 | ffmpegrev: Update to actual ffmpeg 0.5 release branch | diff --git a/ffmpegrev b/ffmpegrev
index 960336d..95315e5 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=17727
+FFMPEG_REVISION=17754
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
-FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
+FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/branches/0.5
# Because ffmpeg checks ou... |
prajnashi/gst-ffmpeg | 62c179ee503735b049f1feb5f1f9c912155945b6 | ffmpegrev: Switch to 0.5 ffmpeg release branch | diff --git a/ffmpegrev b/ffmpegrev
index 16bdc19..960336d 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=17634
+FFMPEG_REVISION=17727
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking
# out an... |
prajnashi/gst-ffmpeg | 65cf8cc061e8b0345dc835ad3070b794fcb56c8e | ffmpeg: Bump up to current upstream HEAD of ffmpeg and swscale | diff --git a/ffmpegrev b/ffmpegrev
index 2f6508d..16bdc19 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=17524
+FFMPEG_REVISION=17634
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking
# out an... |
prajnashi/gst-ffmpeg | 269698f02089d1ea3bfe4740256526e48be08574 | ffmpegmux: Use information from AVOutputFormat to expose more muxers. | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 233702b..49c5209 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1835,1151 +1835,1167 @@ gst_ffmpeg_caps_to_pixfmt (const GstCaps * caps,
context->sample_aspect_ratio.num = gst_value_get_fracti... |
prajnashi/gst-ffmpeg | 2334478f8d167b04170fdc4764492692cb2fea0c | build: Update shave init statement for changes in common. Bump common. | diff --git a/common b/common
index a6ce5c6..57c83f2 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a6ce5c6139d128d95cfa6acfbcdb9e6ca7a5ffe2
+Subproject commit 57c83f2ced9890f1f8c4c64cd6c0b70f952e6a59
diff --git a/configure.ac b/configure.ac
index e0c7d37..aedfd43 100644
--- a/configure.ac
+++ b/configu... |
prajnashi/gst-ffmpeg | a960a70afb8058046a00140407afa67ad36946c9 | Automatic update of common submodule | diff --git a/common b/common
index 9cf8c9b..a6ce5c6 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 9cf8c9b62f6b2d9e43b7fb0cb9dcfb86b8ceba01
+Subproject commit a6ce5c6139d128d95cfa6acfbcdb9e6ca7a5ffe2
|
prajnashi/gst-ffmpeg | 51b5bc131bc5e1013a37e7a81960acd9bcc2e803 | Use shave for the build | diff --git a/configure.ac b/configure.ac
index 801a70b..e0c7d37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,371 +1,375 @@
AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
AC_INIT... |
prajnashi/gst-ffmpeg | 87494eb94931af1f554bd7afab03f4bde8070ecc | And remove unused variable | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 3854d97..233702b 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1559,1025 +1559,1024 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context,
} else {
caps = ... |
prajnashi/gst-ffmpeg | 0a697e42d1c04f32ca4bc32602d117581a776a09 | Remove unreachable code | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 915c178..3854d97 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1591,1027 +1591,1024 @@ static GstCaps *
gst_ffmpeg_smpfmt_to_caps (enum SampleFormat sample_fmt,
AVCodecContext * context, enum ... |
prajnashi/gst-ffmpeg | 6fc19a2c4990bb852d2552e361ac34f43bdb29cb | Cast const GstBuffer * to GstBuffer * before unreffing | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 6ecaecd..915c178 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1592,1025 +1592,1025 @@ gst_ffmpeg_smpfmt_to_caps (enum SampleFormat sample_fmt,
AVCodecContext * context, enum CodecID codec_id)
... |
prajnashi/gst-ffmpeg | f436bc68d8dac2e393651f1b8bb14e9679275b0e | Automatic update of common submodule | diff --git a/common b/common
index 5d7c9cc..9cf8c9b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 5d7c9cc163b211f5f3a9b8663e055c03bdacb343
+Subproject commit 9cf8c9b62f6b2d9e43b7fb0cb9dcfb86b8ceba01
|
prajnashi/gst-ffmpeg | d6e6d39e01e9c47e73fb2591866394ea9024d402 | ffmpegrev: Update upstream revisions used | diff --git a/ffmpegrev b/ffmpegrev
index 8e4819b..2f6508d 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=17434
+FFMPEG_REVISION=17524
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking
# out an... |
prajnashi/gst-ffmpeg | 8fad59c86fa8224ee02c70637d94323de0b679d9 | Automatic update of common submodule | diff --git a/common b/common
index 80c627d..5d7c9cc 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 80c627dfabb45c3f40727dce755c81bed1e38e3d
+Subproject commit 5d7c9cc163b211f5f3a9b8663e055c03bdacb343
|
prajnashi/gst-ffmpeg | de4496b2744d086b3be1e0f7a910a486b5ea0d3a | codecmap: map more codecs | diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 4b2c123..6ecaecd 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -518,1220 +518,1240 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
break;
case CODEC_ID_RV20:
vers... |
prajnashi/gst-ffmpeg | f0d485d28b3b6c1ba3e83742101574d729b9fba2 | ffmpegrev: update upstream ffmpeg/libswscale revisions to use. | diff --git a/ffmpegrev b/ffmpegrev
index a577866..8e4819b 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=17128
+FFMPEG_REVISION=17434
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking
# out an... |
prajnashi/gst-ffmpeg | 3867dc01f62261100bf60ec188d6943d4173b430 | Fix 'make distcheck'. | diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index 915a16f..cbafe3a 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -1,63 +1,63 @@
# we have to put in a little hack here for integration to work well
# ffmpeg can't be in SUBDIRS, because then automake will try to descend in ... |
prajnashi/gst-ffmpeg | 13d9e1cee0821c9f95bd322a9bc51b16d87db4c5 | Bump upstream ffmpeg revision to use. | diff --git a/ffmpegrev b/ffmpegrev
index fb711e8..a577866 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,8 +1,8 @@
-FFMPEG_REVISION=16753
+FFMPEG_REVISION=17128
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking
# out an... |
prajnashi/gst-ffmpeg | 0a676df0a6bdde8fe9e708f4f92d96f9a64de505 | Bump revision to use for common submodule. | diff --git a/common b/common
index f7bd42d..80c627d 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f7bd42d4fa7f9b976fe5e697ff914e25f25e8853
+Subproject commit 80c627dfabb45c3f40727dce755c81bed1e38e3d
|
ank/bookr | 59d4fe2d8deec41f5d88ce4d87056e24807a3dbf | more docs | diff --git a/README.rdoc b/README.rdoc
index f38e2f7..1c62548 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,34 +1,34 @@
= Bookr -- simple iphone webapp for e-book libraries
This is ideally suited to pdf e-book colletions.
-
== Usage
$ gem install sequel sinatra amazon-ecs
Modify environment.rb
Po... |
ank/bookr | 8e6f92b026812cbceb87d9bd24db97a9959255ba | a few (hopefully) helpful comments | diff --git a/README.rdoc b/README.rdoc
new file mode 100644
index 0000000..f38e2f7
--- /dev/null
+++ b/README.rdoc
@@ -0,0 +1,34 @@
+= Bookr -- simple iphone webapp for e-book libraries
+
+This is ideally suited to pdf e-book colletions.
+
+
+== Usage
+
+ $ gem install sequel sinatra amazon-ecs
+
+Modify environment... |
ank/bookr | cb07712d11fcfb00d4a9d5235159309b5a0facfd | prepare for release | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c9a06f7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+*~
+*.log
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index a7190c5..f4f6510 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,116 +1,116 @@
require "fileutils"
require... |
ank/bookr | 1020275491ca084ebc57b384db70ae55f8ec1867 | working | diff --git a/public/css/img/backButton.png b/public/css/img/backButton.png
new file mode 100644
index 0000000..e27ea8c
Binary files /dev/null and b/public/css/img/backButton.png differ
diff --git a/public/css/img/blueButton.png b/public/css/img/blueButton.png
new file mode 100644
index 0000000..0f92dfd
Binary files /de... |
ank/bookr | 4248ca317cea7919f4da641b557234edc5205ea7 | mostly working except title search | diff --git a/views/about.erb b/views/about.erb
new file mode 100644
index 0000000..4831aa4
--- /dev/null
+++ b/views/about.erb
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<head>
+ <meta http-equiv="Content-type" content="text/html; c... |
ank/bookr | 121fb31c0a3a5cbc65e91b76acc40dc379bf5bba | mostly working except title search | diff --git a/environment.rb b/environment.rb
index 6f46a8e..5814f29 100644
--- a/environment.rb
+++ b/environment.rb
@@ -1,6 +1,7 @@
require "sequel"
+require "logger"
ROOT = "/mnt/arr/eBooks"
DB = Sequel.connect("postgres://kraut:sqlKRAUT@localhost/books")
-
+DB.loggers << Logger.new($stdout)
Sequel.extension :p... |
brampitoyo/haderach | 830f92447cacb40e92d9af515902e1708001622c | Added more proper nouns and regular words | diff --git a/db/universes/dune.rb b/db/universes/dune.rb
index 581079c..ccfa4d5 100644
--- a/db/universes/dune.rb
+++ b/db/universes/dune.rb
@@ -1,29 +1,31 @@
dune = Universe.find_by_name("dune")
##############
## Proper Nouns
%w(shaddam corrino atreides alia ghanima leto muad'dib kwisatz_haderach bene_gesserit d... |
brampitoyo/haderach | d257e9074120150a1346cba77174ed2ca9fa9592 | Add Google Analytics | diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 948c953..fdc6443 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,64 +1,73 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.o... |
brampitoyo/haderach | f6adebd4b7f864fa724169b86392a18cd7bfc0c7 | Change Dune universe website | diff --git a/db/seeds.rb b/db/seeds.rb
index 872e516..2db4507 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,36 +1,36 @@
# This file should contain all the record creation needed to seed the database with its default values.
# The data can then be loaded with the rake db:seed (or created alongside the db with db:se... |
brampitoyo/haderach | a49bbddd52353ea35780b21eafa8343e19fe73f8 | Add sentences to Word model and make paragraphs have sentences with periods | diff --git a/app/controllers/paragraphs_controller.rb b/app/controllers/paragraphs_controller.rb
index 86a267b..af8ccd1 100644
--- a/app/controllers/paragraphs_controller.rb
+++ b/app/controllers/paragraphs_controller.rb
@@ -1,35 +1,35 @@
class ParagraphsController < ApplicationController
def paragraph
@para... |
brampitoyo/haderach | d40019d44f70822a3f47997a6602c660ec37c2d5 | Add list of fictional universes to wordlist page | diff --git a/app/views/home/wordlist.html.erb b/app/views/home/wordlist.html.erb
index 43815a8..b6034dc 100644
--- a/app/views/home/wordlist.html.erb
+++ b/app/views/home/wordlist.html.erb
@@ -1,31 +1,34 @@
<h2>The Breeding Program</h2>
<p><Strong>Help make the Kwisatz Haderach!</strong></p>
If you have a favorite... |
brampitoyo/haderach | 870fe9c11b08d171176bce170672d1dbefcec85a | Fix spelling in title | diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b4749c9..948c953 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,64 +1,64 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.o... |
brampitoyo/haderach | 80f356cb9f8d3b68b394b0c50b7834a60ab92091 | Link to Lorem Ipsum Wikipedia reference | diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index fe118aa..b4749c9 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,64 +1,64 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.o... |
brampitoyo/haderach | a3bcbbc7a163766af43cce0d42c485ba0c5593a7 | minor layout changes, add some Kwisatz to the front page | diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index ba38884..4699b0f 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,11 +1,15 @@
class HomeController < ApplicationController
def index
- #render :home
end
def show
p... |
brampitoyo/haderach | 52d6bacdb47160b34dda338f24fdd36ba5a82554 | Add managers, helpers and other goodies | diff --git a/app/controllers/managers_controller.rb b/app/controllers/managers_controller.rb
new file mode 100644
index 0000000..526450f
--- /dev/null
+++ b/app/controllers/managers_controller.rb
@@ -0,0 +1,85 @@
+class ManagersController < ApplicationController
+ # GET /managers
+ # GET /managers.xml
+ def index
+ ... |
brampitoyo/haderach | 4fe770f5bcc26286f51a00078eab0a5c6e448086 | Add random universe to application and some documentation for wordlists | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8367ebe..ce19e8d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,12 +1,18 @@
# Filters added to this controller apply to all controllers in the applicati... |
brampitoyo/haderach | 40929c1f4af456deadedc2d1f2ea18fb12527bdb | Visual modifications, add manager to universes | diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 36b125d..8367ebe 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,11 +1,12 @@
# Filters added to this controller apply to all controllers in the applicati... |
brampitoyo/haderach | aa26abd345f6fa9c0bc0d15621137fad5862bb44 | Add contact and minor about text | diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 4fa4171..87cccdb 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,32 +1,29 @@
<div id="getting-started">
<h1>Bookmark It!</h1>
<h2>Here’s how to get placeholder text<br/> that doesn't comple... |
brampitoyo/haderach | 1a65efe513b485088b664ed484ae4690320574f3 | Add home controller for index and clean up layout, add instructions | diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
new file mode 100644
index 0000000..ba38884
--- /dev/null
+++ b/app/controllers/home_controller.rb
@@ -0,0 +1,11 @@
+class HomeController < ApplicationController
+ def index
+ #render :home
+ end
+
+ def show
+ page = params[:... |
brampitoyo/haderach | 09c776bb5299e0b1165cbedd722ccca5336c06b3 | Separate out seed data into db/universes | diff --git a/db/seeds.rb b/db/seeds.rb
index c9b6e23..c9512e9 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,52 +1,28 @@
# This file should contain all the record creation needed to seed the database with its default values.
# The data can then be loaded with the rake db:seed (or created alongside the db with db:se... |
brampitoyo/haderach | 9c03b56b6b0b6736e9d3493d00fe3aee721302d1 | More login necessities, disallow anonymous user creation | diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d1ec583..c86c830 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,15 +1,21 @@
class UsersController < ApplicationController
+ before_filter :login_required, :except => [:index, ... |
brampitoyo/haderach | 4b50c155617f2a3ce63135918bffcc0a09a5edce | Add login necessary for changes | diff --git a/app/controllers/paragraphs_controller.rb b/app/controllers/paragraphs_controller.rb
index 59ceafb..86a267b 100644
--- a/app/controllers/paragraphs_controller.rb
+++ b/app/controllers/paragraphs_controller.rb
@@ -1,35 +1,35 @@
class ParagraphsController < ApplicationController
- def paragraph
- @... |
brampitoyo/haderach | 1cc8494c3bc5cc6273bdfab66d1774806a6d7d27 | Add word count to universes | diff --git a/app/models/universe.rb b/app/models/universe.rb
index 66d2f09..9ee9812 100644
--- a/app/models/universe.rb
+++ b/app/models/universe.rb
@@ -1,24 +1,32 @@
class Universe < ActiveRecord::Base
belongs_to :genre
has_many :words
has_many :phrases
validates_presence_of :name, :genre_id
b... |
brampitoyo/haderach | 8db34df5cdb4226575539165847034178afda3ef | Fix readme | diff --git a/README.markdown b/README.markdown
index 7a34b2d..b71950b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,35 +1,35 @@
-h1 Kwisatz Haderach
+# Kwisatz Haderach
The placeholder text that can be in all places simultaneously.
-Basically, it's a stupid waste of time. You see, I'm really bored with ... |
brampitoyo/haderach | 40d6a8100c77c4af0b029234c55f4448aab9840c | Changes to front-end | diff --git a/Capfile b/Capfile
new file mode 100644
index 0000000..e04728e
--- /dev/null
+++ b/Capfile
@@ -0,0 +1,4 @@
+load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+
+load 'config/deploy' # remove this line to skip loading any of th... |
brampitoyo/haderach | f4c50eddd182d136d3bfe0e1331b218db32f1612 | Add acronym boolean to Word model, update seeds | diff --git a/app/models/word.rb b/app/models/word.rb
index fabd541..08e1b91 100644
--- a/app/models/word.rb
+++ b/app/models/word.rb
@@ -1,43 +1,49 @@
class Word < ActiveRecord::Base
belongs_to :universe
validates_presence_of :word, :universe_id
before_validation :downcase!
def self.some
Wo... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.