labofsahil/github-event-dataset-2012 huggingface dataset:
added api method stubs.
README tweak: performance.
some fold doctests
more work on projections
_'d unused variable
trying out projections for _head and _tail (issue #132)
test fixes
Data.Complex.Lens: Use ≈ to make doctests more readable
Effective no longer abuses Isomorphic. (closes issue #135)
unused imports
merged Control.Lens.Isomorphic into Control.Lens.Iso
Data.Complex.Lens consistency (closes #137)

Rename lenses after Data.Complex counterparts with a _ prefix.

• real      → _realPart
• imaginary → _imagPart
• polarize  → _polar
Zipper cleanup
Eliminated Zipper.Level (inlined into Zipper)
Zipper cleanup (alpha-renamed, documentated)
thanks ion. thion.
Obliterate trailing spaces
Implement a number of HLint suggestions
Changed (^..) to use toListOf
Force encoding only if required
Make packaging jobs use set -e
Configure embedded broker with KahaDB recovery opts

The broker can automatically recover from corrupted journal files, but
only if a few additional options are enabled:

http://activemq.apache.org/kahadb.html

This patchset changes the broker defaults to supply the correct recovery
options.

Signed-off-by: Deepak Giridharagopal <deepak@puppetlabs.com>
Additional KahaDB recovery options

After further discussion and research, it seems prudent to archive
corrupt journal files on startup (instead of aborting startup, or simply
deleting them). As those are binary files, there's not much that's
recoverable by end-users anyway.

Signed-off-by: Deepak Giridharagopal <deepak@puppetlabs.com>
Merge pull request #340 from grimradical/kaha_recovery_opts

Configure embedded broker with KahaDB recovery opts
Added string constants. Changed name of error delegate callback and added reference to parser. Moved release calls to dealloc.
Fix: branches with dots.
Merge pull request #3 from abangratz/master

Fix: branches with dots
discontinuing snakefood support because it is not compatible to python 3 and is not maintained
added title to the readme of haystack solr presentation
Updated FTP code to get files and log stuff
In fast_sentence_parser.h local variable start was shadowing member function name. Renamed to begin.
valgrind/valgrind.h is no longer a symbolic link but a copy of /usr/include/valgrind/valgrind.h. Thanks lool0 for pointing that out :)
pas de classification on a dit
coop_geo app is now loaded from base settings
Merge branch 'master' of github.com:quinode/django-coop
Fleshing out the mapperRec GUI window layout.
comment out line with patch for removing testing installation profile
Merge branch 'hotfix-testing_profile_patch'
Moved template creation resource right after package install, to address issue with conflicting config files already existing, per COOK-1416.
Update src/MvcPaging/PaginationModel.cs
created state transitions in the HTTPParser
Fixed issue in 5e4b65e
remove multiprocessing dependency
Update README.rst

Added easy_install installation instructions.
Update ansi2html/__init__.py
Update ansi2html/converter.py
Update ansi2html/converter.py
Update ansi2html/style.py

used ternary operator as available python2.4
('true', 'false')[condition]
Update ansi2html/style.py

fixed typo
Update ansi2html/style.py
Update ansi2html/style.py
Update ansi2html/converter.py

removed use of format
Update ansi2html/converter.py

fixed typo
Update README.rst
Update ansi2html/converter.py

fixed typo
Update ansi2html/converter.py

correct import (for python3)
Update ansi2html/__init__.py

correct import (for python3)
reset README.rst
added python 2.4 to travis.yml
travis does not (and won't) support python 2.4
Merge pull request #23 from JensTimmerman/python2.4

Python2.4
Adding middle_name and id attributes to the User model
Updating the GenericDAO class to be truly generic
Code sections in README.md
Fixed test

Note for the future:

Always stop the patches. It will cause errors.
changed a line in browse recipes feature to make it consistent across feature files
Merge branch 'master' of https://github.com/rawrjustin/foodprep
PAHMA-375: Add capability to specify a sort key for fields in app layer config.
PAHMA-374: Commented where we should look to make changes for ILIKE query.
CSPACE-4228,PAHMA-374: Advanced search on text fields is once again case-insensitive. Formerly it was so only if wildcards were included in the search string.
CSPACE-4228,PAHMA-374: Remove FIXME-type comment.
CSPACE-4228,PAHMA-374: Remove additional comment.
PAHMA-400: Add homeCrate field to anthropology-collectionobject.xml.
PAHMA-412: Add anthropology-procedure-acquisition.xml.
PAHMA-412: Add section to acquisitionDescription field.
UCJEPS-279: Added loanoutItems to naturalhistory-procedure-loanout.xml
Merge branch 'ucb-deploy_2.3' into ucb-deploy_2.4
UCJEPS-277: Fixing de-urning of Display Name to allow apostrophes
UCJEPS-277: Removing cruft added in previous commit...Distribution and Repository blocks not needed in cspi-services pom.xml
UCJEPS-278, UCJEPS-286: Adding Determination ... Kind 'previously filed as' and '\!' value to Taxonomical Determination Qualifier.
UCJEPS-286: modified id value - removed underscores between words
UCJEPS-277: Add repository location, so org.collectionspace.services.common-api can be downloaded.
UCJEPS-287: Adding counties in UK (from http://www.rahbarnes.demon.co.uk/Counties/list.htm) and additional counties submitted by Margriet.
UCJEPS-304: Adding four values to fieldLocState options
UCJEPS-274: Adding eight country names to fieldLocCountry options
Merge branch 'ucb-deploy_2.3' into ucb-deploy_2.4
PAHMA-469: Refactor merge field computation to account for fields being in different schemas.
Removed more useless beanstalkd interactions
Split requirements between production and development
Development settings run on reduced amount of dependencies
and pip requirements files allow for including other requirement
files.
Use reqs directory
Add missing file
Fix a typo that got in after renaming
Merge pull request #3 from nanonyme/master

Splitted requirements files in a directory
Add annotation to force the validation of web services
Separate project files

Because Modelsim is silly and uses absolute filepaths
Code reduction on LCD Class
issue #13
Start validator implementation
Moar secure? :P
php-horde-horde: fix locale
php-pear-XML-SVG: new package
title needs to be in quotes

Conflicts:

	core/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb
Remove uneeded instruction about hbs configuration
Merge branch 'master' of http://github.com/resthub/resthub.org
In reference to #163. Looks like unistd is necessary on some platforms to use getppid
Merge branch 'next' into sam_164
Interlinking script fixes/improvements
signin form modified
- Removed typo for the Cell class,  instead of popping once, it was
popping multiple Operators, leaving a emptyStack reference when calling
the second operator
Added diagnostics.
Added immutability for toggles.
Added nuget package information.
Removed asset pipeline from Gemfile.
org.json.* third party package is added to rhogen-wizard
Fixing something apparently.
Yet another markdown error
copy update
removed "fork me" badge as it obscures the nav in narrow screen mode - will redo this in CSS and make conditional
make reference to backbone.min
removed socketio ref
add about contact & admin
improved tests and fixed subtle issues
moved browser tests to integration tests
limit contact state and postal code fields
use template in this cookbook even when lwrp is used in another cookbook
Rijesen bug u Xcodeu za BookExtractor, Slozena slikovnica sa bookom iz baze
tests for search controller (at last)
Safe amqp adapter
use stable version of snakeyaml
update version number for release
css + images
adding navbar example, for fixed and static navbars
document .lead per #3213
removed default files from gh-pages
Improved ProjectViews tests, fixed KeyError on unknown packages in project views.

 * The test for unknown packages did not test the value error raised on
   unknown packages because it issued a missing parser error instead.
 * Splitted tests a bit for easier testing and better overview about
   test responsibilities
workaround for issue #7.  hard-code 'facts' table to dump first
added module enum value to object types.
change in pom.xml to deploy dictionar-core-api
Update to 776
Update to 416
ajax:error testcase was failing on Firefox 8.0

The browser was sending 'Forbidden ' with trailing whitespace.
Make it possible to override the way we get the href, add test for it.
Merge pull request #251 from webmat/issue-246

Make it possible to override the way we get the href, add test for it.
handleRemote - move crossDomain and dataType statements to read from data attribute after 'ajax:before' event, to give it an opportunity to change these values dynamically

added tests for dataType and crossDomain modifiable in ajax:before
Merge branch 'ajaxbefore.data-attr' of https://github.com/ronalchn/jquery-ujs into ronalchn-ajaxbefore.data-attr
Merge branch 'fix-ajax-error-testcase' of https://github.com/alassek/jquery-ujs into alassek-fix-ajax-error-testcase
Added note to test for special Firefox 8 case
Fixed formatting in test files
Added jquery 1.7.2 to test suite
Updated changelog
small fix for CSRF tokens 
Merge pull request #255 from homakov/patch-1

small fix for CSRF tokens 
Fixed input name selector in csrf form update
Modified form button click selector. Fixes #63.
Added rails:attachBindings event to enable customization of binding selectors. Fixes #263.
Added ajax:send event to provide access to jqXHR object for ajax requests. Fixes #254.
Make crossDomain respect data-cross-domain=false on element. Fixes #232.
Detect and throw error when jquery-ujs is included in document more than once.
Use :checked for required checkbox and radio inputs. Fixes #236.
Disable form elements when form falls back to regular submit for file-fields. Fixes #231.
Created orphaned branch patches/release/rosbash
Updated patches.conf
Updated patches.conf
Updated patches.conf
Rebase from 'release/rqt_nav_view' @ version '0.2.3'
Generated debian files for quantal
Retirada de linha nao mais necessaria
Adcionando exemplo para analise da taxa maxima de amostragem
Handle "blank files" slightly better.

 * Currently, the indexer creates references for the special files
   <built-in> and <scratch space>, which I believe are buffer names.
   It also creates references to the blank filename, "".  I don't really
   know *why* it does this, and I really ought to figure out why, but
   until I have more time to look at it, use the name "<blank>" instead,
   because it looks less wrong in the GUI.

   At some point, I'm still thinking that some special processing could
   be done for <built-in> to intelligently merge the built-in definitions
   of all the different translation units, but I don't expect to get around
   to it anytime soon.

 * Make sure that portableRealPath behaves consistently when the argument
   is NULL.  I don't actually know whether it can be NULL.  It looks like
   realpath will return NULL for a NULL argument (on Linux, at least?), but
   I don't know about _fullpath at all.  A NULL return value from
   portableRealPath is correctly handled.
Correct a (harmless?) mistake in the C++11 compatibility test.

 * The copy constructor and copy assignment operator methods should take a
   const reference.

 * Using a non-const reference didn't break anything.  I just happened to
   be looking at the code.
Change the wording in configure.
OS X: Pass -spec to qmake by default.

 * By default, qmake generates an Xcode project, but we need it to
   generate a Makefile instead.

 * If QMAKESPEC is set, then we assume the user is overriding the
   script, so we don't pass -spec to qmake.
Make the cxx11-compat-test work on OS X.  Stop copying the source files.

 * Enable C++11 support by including ../enable-cxx11.pri.  This include
   does not work if the cxx11-compat-test directory was copied, but we
   don't actually need to do that, so stop doing that.
Fixed minor sample code issues
added 2 new HistoryGraph data points for commit range f92c899-4c49cf
Don't show projects that a user doesn't have permission to see. Personal note - I need to fix the signing up feature. It breaks, I posted a question on experts exchange about it, waiting on feedback.
Used split instead of line
Add Yarder::ActiveResource::LogSubscriber tests
Updating runTarget in gwt-maven-plugin configuration for showcase.
Added license file to project root
Merge pull request #90 from rwl/runTarget

Updating runTarget in gwt-maven-plugin configuration for showcase.
test
-added a new map widget to the showcase
-Update in the css for the stage panel of the new map widget
-Added the new map widget which is called MultipleKmlMapWidget
-corrected a small mistake in the css .dialogTour
-cleaned up code
-added a few descriptions
Merge pull request #95 from cyclingthealps/ShowCaseUpdates

Show case updates
Adding Travis CI config.
Fix resize for different aspect ratios
Retrieves guild for given character
Add :second_signature_line option

When set to a true-ish value, the CheckWriter will include a second
signature line.
Version bump to 0.4.2
Regenerate gemspec for version 0.4.2
non hardcoded bool swap
removed overlapping styles
Move the unordered library into 'branches' now that it has been accepted.

SVN-Revision: 42181
Actually, there are some things in the unordered code that aren't ready for
trunk, so I'll rename the branch and create another one to be added to trunk
later.

SVN-Revision: 42182
Restore the extra warnings in the unit tests.

SVN-Revision: 42198
Use 'BOOST_UNORDERED' prefix for macros.

SVN-Revision: 42203
Merge in changes.

SVN-Revision: 42210
I messed up the last commit, this fixes it.

SVN-Revision: 42216
Use node_count to implement group_count.

SVN-Revision: 42219
Some minor changes for Visual C++.

SVN-Revision: 42231
Some of the changes to the introduction mention in the review. Hopefully this
will make it a little clearer.

SVN-Revision: 42335
Specify the namespace for 'std::out_of_range' in the reference documentation.

SVN-Revision: 42339
Move the table summarizing methods for controlling bucket size next to the discussion of these methods. The paragraphs about insert and invalidating iterator moves on to something else.

SVN-Revision: 42346
We now have cbegin and cend for local iterators.

SVN-Revision: 42349
Merge.

SVN-Revision: 42728
Development branch of unordered.

SVN-Revision: 42731
Workaround Open BSD's incorrect numeric_limits.

SVN-Revision: 42732
Move the hash extensions into their own file.

SVN-Revision: 42735
Work in progress equality operators + hash_value for unordered.

SVN-Revision: 42736
Merged revisions 42740-43816,43819-43838 via svnmerge from 
https://svn.boost.org/svn/boost/branches/unordered/trunk

SVN-Revision: 43839
Add equality compile test for unordered_set/multiset.

SVN-Revision: 43841
Revert the last change. I was already calling the equality tests.

SVN-Revision: 43842
edit vimrc
Merge branch 'master' of github.com:s-tajima/MY-RCFILES
этот файл изменялся
Added in Warranty Company and Warranty Expiration dates.

Also changed behavior for all dates (Manufacturing, Installation, and Warranty Expiration) to show the current date if no valid date is set.

Signed-off-by: samilliken <scott@themillikens.com>
Small cleanup to parameters of feed update method.
Adding stathat stats for feed fetching and parsing.
Se implementa la clase Cliente
Se implementa la clase Articulo
Se implementa la clase ArticuloInventario
Se modifican atributos de id por nulos
Se agrega atributo entregado
Se implementa clase Abono
Se implementa la clase Pedido
Se implementan clases faltantes
Se homogeniza el enfoque para getters y setters
Se implementa la clase Foto
Se implementa metaclase Singleton
Se crea script de creación de la base de datos
Se crean primeros métodos de consulta, actualización y guardado
Se implementan todos los métodos necesarios vacios
Se agrega atributo cantidad a la clase Articulo
Se corrigen nombres en algunas tablas
Mejoras varias a la implementación de los objetos
Se implementan más métodos
Se cambian nombres en base de datos y tabla de procesos
Se cambia nombre pedido por pedidos acorde ala tabla de la base de datos
compression fixes to map
Not sure what change is here.  Probably incidental.
run.all.test.R no longer sources a settings file. Updated my settings file to get cluster settings from environment inspection.
Changes in goog.math.Line: correction of the getIntersectOfSegments method; add getAngle and minAngleBetweenTwoLines methods.
line correction; vec2 getSegmentInterpolation() etc.
fix #10 Adding distribution of models in percent type
example plugin working
added .gitignore for elinks
Updated to latest codebase (Mon Jul 30 06:06:49 CEST 2012).
Octopress init
Site updated at 2012-10-26 22:12:27 UTC
add waf-run target to run tests
Fixed character movement offset on back and right animations, added on move effect to projectile effect
position selectionDots above/below selection, following iOS
position popup triangle above or below cursor, depending on viewport and cursor position
Added double KOs
temporarily create the user in cobalt as well - until we've merged them completely
reorder require
Improve the readability of content editor tabs.
Align hover styles of the content editor tabs with the main navigation tabs.
Merge pull request #3 from thisgeek/master

Improve content editor tab styles
bug fix in the SDE plugin
init the database

create pojo and dao
增加了demo图片，本应该在服务器中的uploads下的，现在为了方便放在了项目的uploads，但是实际情况还是会在服务器保存着所有上传的图片。请注意备份。
Update .gitattributes

Changed EoL in .gitattributes
PKGBUILD setup desktop xsession
Small bug fix in overriding
Changed gitignore
h1 must return something between 0 and M-1 whereas h2 must return
something odd between 1 and M-1. This was fixed in the code.

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
The hash table also prints memory allocation information when
printing its status.

Also, the heuristics for when to call defragment() were changed.

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
Begins DBLogger implementation using squeryl ORM
Remove trailling new line
Set interval second as 10 rather than 5
Show gravatar image in mojo for first time load
Do not use absoulute path for additional css
Merge pull request #14 from keedi/feature/preload-gravatar-in-mojo

Feature/preload gravatar in mojo
Changed APIs for #35
Fixed issue #17 Scaladoc Improvement
Emit 'expired' when flushing object due to TTL.
Merge pull request #4 from coreyjewett/master

Emit 'expired' when flushing object due to TTL
remove duplicated docs
Add package gitignore files
Quick fix: Fix admin login layout template
schema dispatch returns privileges
FFmpegwriter: Validate output pixel format

This checks if the selected output pixel format is available for the
selected codec and automatically selects an appropriate one if not.
FFmpegwriter: Do not flip view in multiThreadProcessImage
Fixing make for pooling code
Fixed rotation bug for now, but as I said previously I will try moving things into a UIViewController and see if this is better performant.
Add Tony's new copy for the rates section.
Multi-WAN 翻译
use {before/after}-save-hook instead of separate functions

before-save-hook will call stylish before save
after-save-hook will call hasktags after file was saved

both hooks are made file-local, to be called only in the haskell-mode
fixed a bug in haskell-indentation-goto-least-indentation
Fix incorrect parsing of identifiers in haskell-indentation-peek-token
derive haskell-mode from prog-mode
Remove errornous accessor functions
Fixed #93 Moved Janrain API key from LoginModule to config. Values still left in there to ease development

Fixed #85 Removed database config from release.config
Merge pull request #94 from Code52/configcleanup

Fixed config values
added baseline package
changed xcopy parameters in script
Merge pull request #95 from shiftkey/BuildFix

AppHarbor build fix
ah, there it is
Merge pull request #96 from shiftkey/BuildFix

AppHarbor build fix - post-build event
removed old package to ensure it isn't an upstream issue
remove imvirt requirement and fix rngd to work in openvz restricted containers

imvirt is broken in openvz and it is possible to make rngd work properly
in openvz.  changed rngd to use /dev/random and set output to
/dev/urandom and now it stays alive and provides entropy.  script ran ok
in testing.
More scope work

Refactor the scopes a bit more.
Make different db scopes tests pass.
Fixed partial recognition of gestures when it's "too late".
16. line
Move test configuration into test directory
added patched version of adm-zip
first version
Merge branch 'master' of https://github.com/silencedrop/rssFeed
add readme
reset Mistakenly test-url for local debugging
Added a getPlotAt() method in ColoniesWorld.
Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Исправлен баг с открытием экрана настроек на маленьком разрешении
Fix the input file options
Slides for Session #1
Merge branch 'gh-pages' of github.com:sjockers/gim-slides
added syntax highlighting to README.markdown
gmailUnlabelled2: Catching up with google's changes.
Helper for passing input data to an NSTask.
Merge pull request #1127 from tiennou/nstask-addition

Helper for passing input data to an NSTask.
Tidy up NSTask methods (from @tiennou)

* Fix indentation
* Use normal convention of always calling most complete method with extra parameters as `nil`
Ensured that list-ips actually caches the IP, not only uses an existing cached IP... DOH!
ece-build - added additional items to the list of approved plugins
added fatfs_dent.cpp to autoconf
Update index.html

Just a bit of cleaning up..
Removed some duplicated files.
Removed 100 frame limit check from the make_xxx.php files
COMSEJBInterface project removed. COMSEE project added
changed J2EE version to 1.5
line draws in correct color now. also round capped the lines
show progress #3
Merge branch 'master' of git@github.com:sokra/grunt-webpack.git
Filter empty module (again!)
add experimental genotype search class.
change path for cassava static files.
BasePath Uri..
Merge branch 'master' of git@github.com:soluvas/soluvas-web.git
atuyeyeyemvrtv
Merge branch 'master' of https://github.com/sonico999/sisjungla
Improve the instruction.
Unnecessary include
Implement GXDrawDrawArc using Cairo
more work on accoun page
djust styles to better space the footer, more work on account page
format and fill info section for the account page
Remove numeric extension for performance reasons
Add back numeric.rb with commented out code in order to not change the gem's main file
Add performance test
Add benchmark tests
memoize unit_label_regex, unit_symbol_regex, unit_name_regex, and unit_j_science_regex
Add Quantity instantiation to benchmark suite
Add guard and spork for faster testing
refactor dimensions class (wip)
Make Volt act as equivalent unit
remove guard and spork
shortcut for dimensions#pow! -> return self if power == 1
Shortcut for base_unit#pow -> return clone if power == 1
Optimizations for Dimensions class

Main optimization: Use @base_quantity_hash variable for storing dimensions instead of dynamically adding, removing, and enumerating instance variables
Use #gsub! instead of gsub in String extensions to avoid unnecessary object cloning
remove profiling results from git
cache si_prefixes and non_si_prefixes
Add benchmarking and profiling tests
Reorganize specs and introduce spec_helper
Add .gitignore
Add guard and spork for faster testing
Rename "geo" JTS Geometry variables to "geom" as to not confuse with the word geospatial.
Ignore IntelliJ files
Some refactoring / renames related to JtsGeometry.relate()
Merge remote-tracking branch 'origin/master'
Test rectangle intersect with JtsGeometry (a polygon).  Added caching of getBoundingBox but have yet to leverage it in relate()
remove unnecessary jQuery method
fix the default position of last loading information.
fixed urxvt transparency in .Xresources
start work on target hardware def test - complete DAO test [23650083]
tasks filter
status 1
added method for calculation of tribonacci numbers
Hopefully the merging of Simons requests was successfull
Fixed merge error: nun kommt wieder das richtige raus
added Javadoc
minor
minor changes
minor edits
array initialization unnecessary
correction of code
Correction of code+parameter validation
Added basic fall-back functionality for plotting with Gnuplot without
the dependency on gnuplot-mode.  However, gnuplot-mode will still be
used if it is available.
Corrected use of scan user in template
Expanded scan-to-print linkage possibilities in scans table
Populating print_id, print_page_number and print_href in scans table correctly
ICTexture2D ivar name refactoring
Issue #3: initWithCoder initializer for ICHostViewControllerIOS (IB storyboard support)
+ ‘notes/folder-layout.md’
+ ‘EngRoadmap.xlsx’
minor, at last
komit na master
mklsdfkl
Fixed nav builder

I think the Candy::Options()->set(); method was out of scope, using the
CandyDB::q method instead
tried fixing code sharing between projects; current setup works
added link to sample from readme
Added the validation of the mapping in the profiler panel
Improved the toolbar display
There's no need to show query time when we don't have any queries done
Merge pull request #113 from dlsniper/wdt-small-improvement

There's no need to show query time when we don't have any queries done
Added return codes for doctrine:database:[create|drop] commands
Merge pull request #118 from hason/return_codes

Added return codes for doctrine:database:[create|drop] commands
Update Resources/config/schema/doctrine-1.0.xsd

Missing config
English mistake "an entity" not "a entity"
English mistake "an entity" not "a entity"
English mistake "an entity" not "a entity"
Merge pull request #120 from tristanbes/patch-2

English mistake "an entity" not "a entity"
Merge pull request #119 from tristanbes/patch-1

English mistake "an entity" not "a entity"
Merge pull request #121 from tristanbes/patch-3

English mistake "an entity" not "a entity"
removed composer download
Merge pull request #122 from bamarni/patch-4

removed composer download
allowed symfony 2.2-dev
Merge pull request #123 from bamarni/patch-5

allowed symfony 2.2-dev
Fixed some CS
Moved the caching of the calculated value to the collector

Caching the value because of the calculation should not be the
responsibility of the template.
Merge pull request #112 from stof/validation_mapping

Added the validation of the mapping in the profiler panel
test update #2
Corrected syntax - part 2
qimage2ndarray: Added a patch to support Qt framework builds on mac
Treat NSNull as nil
wywołania dao w jsf
Setup carrierwave with amazon
Merge branch 'master' of github.com:supherman/instafood

* 'master' of github.com:supherman/instafood:
  Add seeds
  Add variants update to the shchema
  Modals base

Conflicts:
	db/schema.rb
brought in sample lookback grid app
added the config file.
Changed just the auto-login parameters of /etc/lightdm/lightdm.conf
TestCreateProblemIntergation: previewWindowTester no longer global
do we need the parameters for getRouteByName?
patmos: support non-zero addend for ABS32 and FREL32

* for all others assert zero addend
Do not remove live-initramfs package
Version 2012.05.28~kazsid0
edit page error bug fixed
/
Merge branch 'masterFTJ' into kralle
Bugs behoben.
Testfälle erweitert.
projekt angelegt.
utf8
name geändert.
projekt umbenannt.
Observer hinzugefügt.
Observer angepasst.
Observer und state implementiert. Fehler in calculateVisibleParts
entdeckt.
Mehrere Sachen - aber Testfälle gehen jetzt.
isInArea() - wir müssen bei setParent() nicht nur überprüfen ob sich die
Flächen überschneiden, sondern ob die Fläche wirklich im Parent liegt
und nicht nur ein Teil der Fläche.
cutToSize() - ich berechne zunächst einmal die Fläche, die wirklich auf
dem Fenster liegt, damit die ganzen Überlappungen nicht mehr betrachtet
werden müssen.
calculateVisibleParts() nach dem Alex'schen Schema aufgebaut.
Leeres NFA Projekt hinzugefügt.
Merge branch 'florian' into masterFTJ
delete unneccessary files & add new project
* Fixed bug #737438
* Changed the navbar font to OpenSans
* Changed quote to double quote
Merge pull request #207 from daker/master

Use OpenSans on navbar
Clean up nav bar and uplevel Edit Profile button. bug 743709
fixes to review comment
Merge pull request #209 from sammybahamas/master

Clean up nav bar and uplevel Edit Profile button. bug 743709
f
Add Heroku gem to Gemfile
added options part 1
updated references
Updated
add LANG variables
update gitconfig
fix .vimrc.bundle
warningler duzeltildi
ufak bir degisiklik
user_programs/bin derlenme hatasi durumunda duzeltme
ASSERT(task_curr) kontrolu kaldirildi, task_curr NULL olamaz
init_programs, gitten silindi
data file fix, file reader ready, c++0x turn on
Changed help command.
Updated Examples section.

Updated program output to the latest version. Mentioned spdycli.
Fixed compiler warning with stricter warning options
Renamed index in spdylay_get_credential_cert prototype to idx

This is because compiler may warn that name `index` shadows global
declaration if the application code uses the prototype argument names
as is.
Updated NEWS for 0.2.0 release
Corrected name of unit test method
Added utility class dealing with dates
Added occurrence time to exceptions
Version of the Catcher client that compiles.  Impossible to imagine it works right yet.
Added more spout code
Added some server code.  Now things *really* don't work for sure.
fixed semaphore on macosx
fixed some targets within mac building
made the client not play the chat sound for empty chat messages. Closes #967
switched filenames of highlight and client chat message to prevent some misunderstanding there. #966
made building tw with the SDK of the minimum mac os x version a config option. #964
more functionality
new code
Удаление главной страницы Рельсов
Finish lauout and routers
Adds libxml condition to test_dotted_version in test_document_encoding.rb
Made animals wander in all directions
Fixed a bug in adjacent locations which wasn't returning adjacent in all directions (OBOB)
Added toString()
Added appCache for storing references to loaded apps
finished implementing description box preview
added existance check for user before printing info onto page
added repeating event object to models
added files and functions for repeating events
replaced sendgrid :imp: with mandrill :angel:
removed access to in-progress repeating events code
removed non-working button from gui and called callback from email.send
fixed mandrill api usage in email.js
stupid ;...
I hate the fact that i mispell every single critical variable name...
Added secret raffle feature
fixed 403 for org-admins
message sample
Use attacks in 'examples' folder in cukes to keep them in sync (close #37)

Also consolidate http_methods and cookies attacks into curl
http derp
Remove JSLint config item.
Update Vundle.
Treat booleans more strictly
clean up whitespace
don't print newlines for empty values
fix broken _snip filter
Merge branch 'master' of github.com:thepeterstone/sauce
Set up publishing
Bump version to 0.2.9 and update changelog.
Merge branch 'release/0.2.9' into develop
Added some comments, no code changes
Gemfile for 1.8 and 1.9 Ruby
introducing debugging group in the Gemfile
817946 - API not accessible from browser
869575 - changeset add_product - correctly handle product request

This change addresses an issue where the request to the
server for the product was not including the product 'name'
query parameter.  As a result, the server returned all products
resulting in the error described by the bugzilla.

Ref: https://bugzilla.redhat.com/show_bug.cgi?id=869575
Revert "headpin-system-groups - fence pulp hooks in system model"

This reverts commit 916e9d3801283ae29697d0c190721b29a17a4090.
Merge pull request #914 from jsomara/systemgrouprevert

Revert "headpin-system-groups - fence pulp hooks in system model"

NoooooOOooOOoooooo! Well, alright
Revert "headpin-system-groups - adding system groups to headpin"

This reverts commit 09e1779c348c561b69cbd6313361084f918a88c3.
Merge pull request #915 from jsomara/systemgrouprevert2

Revert "headpin-system-groups - adding system groups to headpin"
869575 - CLI - changeset - fix error during add/remove repo/pkg/errata

This is a small change to address an issue observed with CLI when
user would update a changeset to add/remove repo/pkg/errata.

The behavior observed was similar to:

changeset update --org=org_OXKraZbhpR6X --environment=env OXKraZbhpR6X --name=changeset_2_OXKraZbhpR6X --from_product=fewups_product_OXKraZbhpR6X --add_package=monkey-0.3-0.8.noarch
Could not find product [ monkey-0.3-0.8.noarch ] within organization [ org_OXKraZbhpR6X ]

changeset update --org=org_OXKraZbhpR6X --environment=env OXKraZbhpR6X --name=changeset_2_OXKraZbhpR6X --from_product=fewups_product_OXKraZbhpR6X --add_erratum=RHEA-2010:0001
Could not find product [ RHEA-2010:0001 ] within organization [ org_OXKraZbhpR6X ]

changeset update --org=org_OXKraZbhpR6X --environment=env OXKraZbhpR6X --name=changeset_2_OXKraZbhpR6X --from_product=fewups_product_OXKraZbhpR6X --add_repo=repo_OXKraZbhpR6X
Could not find product [ repo_OXKraZbhpR6X ] within organization [ org_OXKraZbhpR6X ]
adding more strict versions in the Gemfile
Merge pull request #911 from komidore64/http-auth

817946 - API not accessible from browser
866995 - additional fix for ping controller
Merge pull request #919 from lzap/ping-user-fix

866995 - additional fix for ping controller
Merge pull request #913 from bbuckingham/fork-869575

869575 - changeset add_product - correctly handle product request
Merge pull request #886 from lzap/gemfile-19

Gemfile for 1.8 and 1.9 Ruby
Fix historic name
Add text from chapter 1 of original manual (Overview of EM algorithms)
Fix a couple of bugs in new merge sorter: priority queue acting wrong, not handling uneven run counts correctly
Add pipelining_sort_test
Support setting memory limit in sort_speed_test
Update README.md

Threw in f# example for later.
to console output
TestRelationshipLoadingProblems is pretty good at reproducing the problem, and there's a fix for it. Now it's time to write a specific unit test for it
Fix entity spawning bug
1.9.3 on dreamhost"
Finish user signup
Add SSL in production
Finish chapter 7 exercises
Finish sign in
Do not start timer if already started
Novi vcgraphtex
Brisanje grane
update
Euler Problem 8
adding diff file and baseline 225 results for versioning
merge conflict
moved proctor metadata from vendor to product_test
changed failing measure results to be bold as well as red for 508c compliance
change md_src to src
initial commit of a README
Refactor-Action!
Refactoring..
Make those lists of links a little tighter
small corrections to june meetup post
removed extraneous animation arguments and switched to arc4random_uniform
if there is no boarder image draw one with the CALayer, also rasterize the photo view for faster drawing and smooth edges
added flipToNextImage, fix #2
flickAway:withVelocity: already calls willFlickAwayPhotoAtIndex
always set the raster scale and change the default shadow to 0.5
change the will flip delegate to pass fromIndex and toIndex
exposing indexOfTopPhoto
rename flipToNextImage to flipToNextPhoto
flip the direction flipToNextPhoto pushes the photo
Added optional data source delegate method for photo size
switch to cocoa types for int and float
removing method and synthosize declarations that are no longer needed in modern obj-c
changing aways from defines because they are global
I ran into problems with setting the photo center based on the contentView center after residing the root view. I stripped out contentView because it was extraneous but still had the problem so I switched away from view.center because it's a trap and doesn't always represent the true view center.
Merge pull request #1 from kgn/master

CALayer default boarder and aliased edges
transformando em um projeto eclipse
Subir calificaciones
Added padrino app
implemented my_history page on server side
The websocket tests never work for me.
Fix association between items and entities
Improve German translations

The changes were mostly suggested by Lutz, but since he didn't send a
patch, I manually applied them.

Suggested-by: Lutz Vieweg <lvml@5t9.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Change character encoding from iso-8859-1 to UTF8

Finnish translation was with wrong character encoding resulting in
compile error.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
dive.c: set some of units for localization

get_pressure_units() and get_volume_units() should
return localized strings.

[Dirk Hohndel: updated to use the correct macro]

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
info.c: set units for translation in the "depth box"

[Dirk Hohndel: fixed to use the correct macro]

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Tradução final
formatting, bib file
Adding funding information
Merge pull request #13 from ethanwhite/funding

Adding funding information
add support KR
Merge pull request #15 from tpoisot/master

Modifs de Tim
add hochberg ref
add references
Made some corrections and changes to the language.
Merge pull request #17 from karthikram/master

Added corrections
merge DGs file
merge Dom, improve Git and figshare sections
minor
add refs
fix typo
add Titus story
fix titus part
merge
TP funding
Shortening and tightening Current Offerings section and removing license discussion
Merge pull request #22 from ethanwhite/currentofferingscleanup

Shortening and tightening Current Offerings section and removing license info
Merge pull request #9 from tpruvot/master

somes fixes
Sort by Syatem app or not
Bulgarian translation : SFisherBG
Slovak-Slovakia translations : pepcisko
Fixed changelog markdown
Fix typo in db
Format source
Merge branch 'master' into ics
Giving a sample properties file if someone wants to use the ANT script.
Documenting ANT.
Changing test to be the main page for directory.
Tweaking build file to more properly strip out unneeded files.
fix filter buttons and reorganize some classes
fix styling of filter links in team members list. also fix remove invitation button.
paginated team members now set to 13
PEP8: Clean E201 & E202

* E201 whitespace after '[' - (and other brackers (. {, etc)
* E202 whitespace before ']' - ditto
PEP8: clean E211 whitespace before '('
PEP8: clean E231 missing whitespace after ','
PEP8: clean E241 multiple spaces after ',' (, ':')
PEP8: E251 no spaces around parameter equals
PEP8: E262 inline comment should start with '# '
PEP8: E261 two spaces bfore inline comment

* E261 at least two spaces before inline comment
PEP8: E111 indentation is not a multiple of four
Merge pull request #457 from aderyabin/clean_up_en_locale

Removing active_admin tail
Merge branch 'master' of github.com:travis-ci/travis-ci
updates to spanish translations
init translation
polish translation made less clumsy
polish translations finished
localeapp update
Merge branch 'master' of github.com:travis-ci/travis-ci

Conflicts:
	log/localeapp.yml
localization updates
localeapp log does not belong in the repo
gitignore localeapp log and a small update to pl locale.
remove obsolete admin rake task, readme reference and layout integration
Better french and some typos
Merge remote-tracking branch 'upstream/master'
and some grammatical french errors
All jasmine specs now properly use js mocks in spec/javascript/helpers/factories.js We no longer need to seed data or use FactoryGirl.
Merge pull request #460 from pastjean/master

Last pull request on french
remove left over string letting people know about the sponsor box.
Many thanks to everyone who noticed!
MOAR translations!
some locale updates
Configure sidekiq.
Use user_id only when triggering Sidekiq.
Reraise error when sync failed.
Add logging.
Allow flipping Sidekiq sync for single users.
Sort problems and solutions by vote, add solution_id to comments
Fix for textareas
Small fixes of HTML5Mobile quickstart documentation. AEROGEAR-469
New project

Signed-off-by: thanh.nn <teddythanh123@gmail.com>
Merge branch 'master' of git@github.com:trungnt13/SPProject.git into thanhnn
Signed-off-by: VietTQ <mynameisenvil@gmail.com>
add Xiance to word list
added password reset basics and added setsite command to manage.py
fixed slight bug with pw reset
added welcome email functionaltiy
removed some debug stuff
all tests pass for sms join cmd with email as additional arg
(Kind of) working operator system.
demo of uiviewcontroller lifecycle
Remove linux hardware and app_manager.
setup default Nodesyncfiledir

git-svn-id: https://xcat.svn.sourceforge.net/svnroot/xcat/xcat-core/trunk@13091 35838ccf-6b3d-0410-a007-ed7a3c9b06b9
Vimeo simple api functionality.
Add image ordering by date
enumerized attributes in a module
Reorganized when Google is searched

Now dependent upon the Twitter being searched first.

Also attempting a version without localStorage
Start of frozen-flask setup.
Import journal entries. Need to correct paths.
Basic rails-backbone scaffold
Validation form errors
Show validation with map
Fix when there is no validations for an area
added spec to task
upgrade remoteStorage.js to v0.6.5
Added a podspec for SocketRocket (see #4)
Merge pull request #10 from lukeredpath/podspec

Added Podspec for project (see #4)

Fixes #4
Made handshake checking case insensitive

fixes #9
Set the tab/indent settings in the project to 4 chars, to match the code style
and ensure any code I write keeps to this style.
Fix broken import when using a case-sensitive file system
Merge pull request #14 from danielctull-forks/master

Fix broken import when using a case-sensitive file system
Fixing argument for test target
Cleaning up build warnings and comments
Assert that the ready state is not in "connecting" phase when calling send

Fixes #15
Bumping pages submodule
Adding xcuserdata to .gitignore

Fixes #12
Style cleanup
Adding checking to make sure open: is called once

Fixes #11

This makes the websocket object behave similar to how clients should
behave in a web agent.
A WebSocket should not call didClose after a fail
Adding receiving of close messages to demo app
Fixed close handling in SRWebSocket

Before it wasn't sending a close message when there was an unclean
disconnect
Changing strong to retain so header is compatibile with GCC
better symbol stripping
better symbol stripping
Merge branch 'master' of github.com:square/SocketRocket
Connection management + views work
Finished parsing the kernel directive
added dpr functionality
Implemented single user model with devise and actve_admin
Added ru locale for devise
Changed prepare_data rake task to collect imgs
zenitbet
ISPN-2192 - Tests are prepared for new implementation.
use parametrized method instead of Object
better parameterization
Initial import

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
ray and picking
Updated TODO
Updated the version of Midje
Tweaked the test for inserting - i think it reads better now - still unsure if it is really good
fixed wrong html
Merge branch 'master' of github.com:vgulaev/sitenewwave
Del google and ya analytics
Finished implementation of all functionals for disjoint sets. Onto print
and destroy.
freebsd: make it compile and work on real FreeBSD systems

lldpd now also runs on FreeBSD. Tested on FreeBSD 8.3.
bumped version, log_file's for message_processor and import_logs
eliminar archivo de OS X
about-production
Assigment 5, hw 5-3 driving me crazy!!
readme changes
Version bump to 0.2.8
Regenerate gemspec for version 0.2.8
minor map updates
added hemi keyword to getallcodes
Merge branch 'master' of github.com:vtsuperdarn/davitpy
Merge branch 'master' of github.com:vtsuperdarn/davitpy into grid
added sphinx files
Rm unnecessary import julToDatetime command.
fixed fan docstring
v2.1.2; Add remote dns support; rename DIRECT to FORWARD; explain proxy.ini
add some public appids to proxy.ini
more js restructuring
Support multi-row INSERTs (bit nasty)
Use odbc_result instead of odbc_fetch_array in some places
Sort out transactions and ::queryBatch
Use ODBC brace escapes instead of Virtuoso stringdate()
fix the select button
Changed EDIT ACCOUNT to only be able to edit name, you can edit balance by editing STARTING BALANCE transaction
read img url
+ RTMP cleanup
Added test for exclude mode
Update master
Added docs folder
Removed docs to put in docs branch
Merge branch 'master' of github.com:wilkesalex/shoelace
Merge branch 'master' into docs
Added SITE references
finished implementing linkedlists
minimum required to get dsa6000 compare working, calEquip lines are blank.
Fun with transition plugin.
Fix showing code blocks.

Do conversion of vertical-bar code blocks to standard markdown syntax before calling markdown processor, and handle code block indentation similarly to how nested lists are handled, so that unwanted indentation (and the vertical bar character) are removed, but desired indentation is preserved.
working on flashError service
Removed <ins> style. No longer used.
Removed FitNesseRoot/properties from repo. It's a generated file.
Simplified saving FitNesseRoot/properties file.
Load FitNesse version from (generated) resource file.

This way the FitNesseVersion.java does not have to be generated every time
(causing commit difficulty and merge conflicts) and the git hash is also part
of the non-release versions. If this command is ran on a tagged version the tag
name is used as version.
Removed obsolete templates/ folder.
Fallback on timestamp, instead of "unknown"
Revert use of git-describe to determine version
Revert "Removed obsolete templates/ folder."

This reverts commit 77a039199150970c0884ce2c632a5436ca619437.
Only remove FitNesseVersion.java.template
unused import
Log exceptions to STDERR instead of completely ignoring them
Committing new failure navigator functionality for Josh Pordon (aka pordonj).  Now possible to navigate quickly to failures in test and suite results (including failures in collapsed sections and scenario tables).
Added Release Note
Made pass/error/fail color scheme more in line with bootstrap.
Merge branch 'master' of https://github.com/unclebob/fitnesse into new_failure_navigator

Conflicts:
	src/fitnesse/resources/css/fitnesse_straight.css
	src/fitnesse/resources/javascript/fitnesse.js

Conflicts were CRLF vs LF type.  Resolved.
Revert "Fixed Unicode Wiki Word issue. Github issue #144"

This reverts commit 973c82793e6701735a0d4358c94ee1db6b78d27d.
Removed unneeded "throws Exception" from TestResponder and friends.
Remove unused javascript (tree control)
Wysiwyg editor should use display style property to change between textarea and wysiwyg editor
Incorporate textarea edit buttons with wysiwyg editor

Remove some workarounds from editPage, remove *Support.js files.
Reverts therubyracer version
Merge pull request #141 from releod/libv8

Locked therubyracer and libv8 versions
add all params in DescribeImages #14
wp admin bar margin top disable
Moved some strings to strings.xml
Changed AppSettings from using a HashMap to a List (since I wanted it to be utterable, and didn't need to do lookups).
Added synchronisation to the singleton generators in the DBInterface to try to make it a bit more thread safe.
Added substantial logging to the 'detail' part of the app, to track down saving issues.
Fixed saving of settings back to PDroid core.
Added alphabetic sorting of apps.
Merge pull request #10 from wtsi-npg/master

Pull in changes from wtsi-npg master up to release 0.6.1
Merge pull request #11 from iainrb/master

Pull in changes from master up to release 0.6.1
Bug fix; do not attempt xydiff scatterplot if --no-intensity in effect
Merge pull request #63 from iainrb/devel

Bug fix for hotfix release 0.6.2
Fixed bug with user profile validation
Generated profile controller
Update profile and added scoped status updates
Fixed crucial crash exploit.
Fix MySQL assembly. Also added the install binary for easy use.
添加数据库支持:w
Revisados os nomes das classes, metodos e propriedades
add hrl
depend on recent pacer gems and version bump
+ change example scope
Fix test
Improve progress
Add raymond to receivers emails
text-no2を変更した
text-no2を変更した
Merge branch 'yamashita-no2' of github.com:yamayoshi/yama-repo into yamashita-no2
Merge pull request #12 from yamayoshi/yamashita-no2

Yamashita no2
Recording button seems to mostly work. Will kick off recording when you turn it on, and will record every time a tab completes loading.
Imported Upstream version 3.193.5
15 章の「はじめに」をわかりやすく書き直し。
DIY section. show_description.
小谷さんの指摘を受けてちょっと修正。
[feature] prioritize errors - fixes #2
login sign up almost functional