labofsahil/github-event-dataset-2012 huggingface dataset:
Complete documentation for helpers
Remove business-specific helper
Add original doc (should merge with README)
Add dependency 'async'
Remove calls to undefined '_', you should use your own copies of default templates
Always add ability to parse forms
Ignore leaks until handlebars is updated
Make option 'values' not crash in case of non-Mongoose objects
Add unit tests for CRUD
logger: remove dependency to winston, add information for third-party transports
Bump version (removed dependency, broke back-compat)
amqp: Make 'jobId' and 'jobAt' available in agent's callbacks
Bump version (add jobId and jobAt in amqp agent callbacks)
Merge pull request #44 from naholyr/logger-transports

Remove internal dependency to winston
Merge pull request #45 from naholyr/amqp-jobinfo

Make job id and date available in agent callbacks
correct minor spelling issues
Merge pull request #1 from jeremybryant/spelling

correct minor spelling issues
only run in optimized
slow down DKStep
Improve path_helper documentation
Fix typo that prevents using make
Fix diction in a comment
[#171] Add templates and README for all rc files
[#171] Move environment variables into zshenv
[#171] Move launchd setenv into zlogin
[#171] Move Zsh file compilation into zlogin
[#171] Update installation information, formatting
[Fix #171] Background non-session affecting code
[Fix #104] Add documentation for environment
Remove the Less encoding environment variable

LESSCHARSET is not needed since Less automatically detects the locale.
Enable the Less history file
Use the default editor in Less
Replace Vim with nano

The default keymap used in Oh My Zsh is Emacs. As such, the editor
should not be set to Vim. Unfortunately, the editor cannot be set to
Emacs because it is not always installed by default.

Set the default editor to nano.
Remove the home directory from $cdpath

It is not necessary to add the home directory to cdpath.

Since nothing is added to $cdpath by default, comment it out.
Move the completion module loading information
[Fix #99] Add documentation for archive
Improve diction in documentation
Check operating system in osx
Check operating system in macports
change netmount default session name to "elFinderNetVolumes"
added jasmine examples and updated some specs
use ZMQ/NOBLOCK when sending messages. this fixes #420
Display `dotfiles` options in a table
autenticación para administradores
clear text box after adding post
a slight flourish of the hand
mail: refactoring of IMAP
Making the admin interface a little simpler for appointments
added mapping link
my config file
Merge branch 'gh-pages' of github.com:nickleefly/prose into gh-pages
onel iner for fg
Commiting changes to Transportation Type (from luggage to baggage) and
creation of number of baggage claims rule checking
Test runs ok on every browser
Test runs ok on every browser
almost done the PHP parte, refactored js
функция linked_fields
	new file:   README.md
	modified:   otmes.html
	modified:   otmes.js
Added a prototype for batching requests within the same event loop - still needs docs on the rendered page to explain the point
main html file to point to showcase projects
minzoom/maxzoom for layers and other stuff
Updated project page link in README
MaxConns not used in accept_connection
mark unused OptsVsn
Command merge.
Update WxH text when new background opened
fixed projection, default config
ca fix
comment realn alfa
class Storage
нагрузим его полезными в хозяйстве мотодами
db_types
инкапс украшательства
del comment
упс
comment
list
comment
украшательства
admin::static_list
author
privs
newPageFormHlr
db_type
new privs
author
new privs
comments
hdlr fix
comments
FIX!!
db_types
ORDER by
author
define('SITE_OAUTH_ID', false) -> config.php
db_types
editor
final
cultivator
final
db_types
cat counter
Add notification.
Update sudmobule.
v0.8 almost donez
Added create, update and delete actions to customer page
Finished Customers page (tests WIP); updated datatables sorting for transaction, reservation and page
class nOutOfFour renamed to BoardHeuristic, function getBoardUtilities added, replaced function fo board utility in AlphaBeta
Updated with A B C.
more updates
rename EasyBlock -> EasyConfig
Merge pull request #85 from nudded/rename-easyblock

rename EasyBlock to EasyConfig
Все переписал, исправил все работает, осталось больше тестов и скрипт для работы.
updated change_grade to a function
Added methods for disabling/enabling proxy in SSH config file
Adding job states when processing job items
Updated extension to v0.5.14
Added support for Contains method.
Added RuntimeUtils.java.
Added documentation for the weight field.
Merge pull request #36 from johmanx10/master

Added documentation for the weight field.
[fix] Removed unused variables
[fix] Make sure we push the correct variable in to the dependencies
[test] Adding tests for preprocessors
econovation conf
No complex forms for iPad
Pane 1 youtube
Presenter MS styles
Assign user to role: fall back to session user
change vararg of StringFunctor.concat to Object
调整权限不足时的提示信息。
copyedit
Charles Proxy links
Updated copyright year and README.
dropped solarized agian
Fix an expression in the final rule.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Put the original rules below so that list numbers are corrected.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Merge branch 'ja-translation' into gh-pages
-h オプションをテストで保護
invoke_task を再定義して help option を処理
Merge pull request #30 from tomykaira/concise-help

Concise help
milk のサブコマンドヘルプの調整

1. grep -h はそのまま横流し
2. add で引数無しの時もヘルプを表示
依存関係の記述をGemfileに移動
Add Database#cleanup_package_name
[cdstk] milk update 時に cleanup も行うように
index.haml は layout.haml を使わないように
Add Twitter bootstrap
#toppage にトップページ専用の設定を追加出来るように
topページの再デザイン案、その1
[cdstk] milk add 'git@...' も可能に
Add PackageList mock
デザイン調整
次へにしてみた。
文言の調整
Add milkode/database/groonga_database 
Add PackagesTable methods.
[database] PackagesTable -> PackageTable
Add def[], each
custom columnizer added
install numpy dependencies
Validation works, but is slow. #185
Made Cystoid Macular Oedema doodle unique
GEOT-4270 Made MouseDragBox constructor and methods public
Merge branch 'master' of git://github.com/geotools/geotools
GEOT-4246 Upgrade ImageIO-Ext dependency to 1.1.5
Merge branch '8.x' of https://github.com/geotools/geotools into upstream_8.x
integrating async http library
BC: Init
Update common.

policy.py is not updated as it causes test failures. I will investigate
that separately.

Change-Id: I9936137c1ab5b368ba6c3c35c423568b38bf913f
Merge "Update common."
Revert explicit usage of tgt-adm --conf option.

Fixes bug 1056246.

This reverts commit 0903603971033536751ba40df98a3c39175d3189.

This ensures that we fail-fast if the tgtd configuration does
not include the directory for volume iscsi target configs,
instead of only blowing up when tgtd is restarted.

Change-Id: I30aa3f1d8944eb33cd4a42d65e227031023406b4
Merge "Revert explicit usage of tgt-adm --conf option." into milestone-proposed
Update notes for submitted changes

* Remove extraneous whitespace in config files
Update notes for submitted changes

* Add in missing image collection schema link.
Load schema properties when v2 API starts

* Read properties from etc/schema-image.json and etc/schema-access.json
* Gracefully handle the lack of custom schema property files
* Partially implements bp api-v2-schemas

Change-Id: Ida1a5afe48be9bce8a5d8faeeda9ed03848a4fd0
rf fite situation region & template
#9411. галлерея файлов
using a looser parser so that this will work in 1.8 and 1.9
version bump
Update view
Fix monitoring control
Slightly change route clusterization
Fix critical bug with roundabout
New variation system
Witamy janka
Sending work to github so i can get it from home later.
The code of the Yang book, corrected to comply fully with C++98
prova AM
modificato
dasddsada
sperom
prov
commitatta
seee
dsadada
dsddsds
partito da un D
add hot_post
InvalidateRect erase flag to false because everything is redrawn anyways; fmt
improved error message when unique fields do not exist
Merge branch 'master' of git://github.com/molgenis/molgenis
libatomic_ops, split packag + add depo
Merge branch 'master' of github.com:pardus-anka/2013
rxvt-unicode version bump
fix blueray apps
update bluedevil to stable relaese
Merge branch 'master' of github.com:pardus-anka/2013
mate-applets remove cycle
Changed so if catchall project the project name will be "-" otherwise it will give the proper project name
Added page to view running analyses
Added file_type to AnalysisResults model
Updated running workflows using chords and monitoring
copies the isa_archive and pre_isa_archive files into the file_store
Modified a little, removed results

Subj
 On branch master
 Changes to be committed:
	deleted:    111
	deleted:    222
	modified:   curl.sh
	modified:   vkplay-curl.py
fix comparability issue with empty paths
Whoops forgot to use new pilot control command in pilot stop
Getting the tmux config file into a better place.
Adding command-t as a submodule.
Adding pathogen as a vim plugin manager.
tmux doesn't place nice with my vim when i set it to 256 colors.
Following pep8 more closely and using 4 spaces for tabs in vim when
using python.
stock boot animation nexus 7

another thing I didnt change.

	modified:   bootanimation-stock-nexus.zip
Make Officers table on Members page striped

I moved the "State Charity" row down one because the rowspan made it
look kinda nasty when the row was gray.
Refactor some tests

Moved the list of the Page controller's actions to the helper, made
title constant in the Photos spec.
Add tests for new version number in footer
cygwin: petty changes to ascertain build under cygwin
Extract frame buffer size as a preference
Publish unapproved subs when moving videos between teams.

For https://unisubs.sifterapp.com/projects/12298/issues/574325/comments
Merge remote-tracking branch 'origin/staging' into staging
Be more explicit about the warning when moving team videos.

For https://unisubs.sifterapp.com/projects/12298/issues/574325/comments
Merge branch 'staging' into dev
Fixed recovery srt generation
Vimeo can't play nicely at the moment. Disable seeking in translation panel.

For: https://unisubs.sifterapp.com/projects/12298/issues/611304/comments
Merge branch 'staging' of github.com:pculture/unisubs into staging
More specific equality checking.
Caught by sjl's eagle-eye via https://github.com/pculture/unisubs/commit/9a57db5a89d2be5e7c6ce6074a7553465fe5f7e0#commitcomment-2177212
Fixed SubtitleSet usage
Log gdata exception when pushing to yt fails
Merge branch 'staging' into dev
added .vim/bundle/vim-gnupg
readme and javadoc
RF: close each stimulus window in tests, now that pygame isn't being tested
Merge branch 'refactor-pytest' of github.com:peircej/psychopy into refactor-pytest
TEST: moved testHardware/testPorts to test_hardware/test_ports
TEST: fix to handling of data file in test_Xlsx
Add SPI for getting statistics from the underlying database (number of rows in a table, number of unique values in a column). SPI is mondrian.spi.StatisticsProvider, and there are implementations JdbcStatisticsProvider (uses information from JDBC, mostly from indexes) and SqlStatisticsProvider (gets statistics by executing queries, as at present).

Which provider is used depends on a new property, mondrian.statistics.provider.
Oops. Broke JDK 1.5 and earlier.
Oops, again.
Fix statistics provider on Vertica. (Vertica does not support distinct-count.)

Also fix DialectTest for Postgres.
Merge branch 'lagunitas' of github.com:pentaho/mondrian into lagunitas.
Merge branch 'lagunitas' of github.com:pentaho/mondrian into lagunitas
MONDRIAN-1141 - refactoring for a more fluid API for test cases
No need to break this line
FIX: bootstrap 2.01
FIX: register page
starting on index spec
perforce: update to 2012.1.459601
Add skeleton icon.
Fix command line param for starting instances
Restricting creating tickets to only users who have permissions to  do it
A decent working version from home!
[add]function_core调整
Add some errors to show formatters output
Test failure-demo on travis for demonstration purposes
Fix typo in branch name
Merge pull request #12 from phyper/master

Commits for alpha 9
Story 852: "HeaderTooltips and focus to Close-button"
Fixed nullpointer when added effort for task with story in product level
Story 1144: "Bug in iteration velocity calculation"
Story 1207: "Bug: in standalone iteration: creating a story, when topmost story has parent story in project, doesn't work at all"
doing price change div

abstract append div in php
3 files
del php exel lib

it is the evil source
del
精简注释
bio Caike
Merge pull request #4 from caike/master

Atualização bio Caike
Merge pull request #3 from pigor/master

Alteração das cores!
inserindo chamadas de talks
Merge branch 'master' of git://github.com/felipeik/tasafoconf
datas
mare de agilidade
adicionando google analitycs
fix conflitos
Merge pull request #6 from paulociecomp/master

Google analytics
added link to sponsors + blank target in links
Reenable full paypal
Ghost list sending working.
- pl for new modules, proper description for mod_authz_core
- cifs requires network, move it to proper package
- rel 2
introduce cpplint and cppcheck
RFC ABI introduce iscsi_task struct

This patch introduces an iscsi_task struct and changes the calling
convention to all scsi_cdb_*, iscsi_task_* and iscsi_task_*_sync
calls to carry pointer to a preallocated scsi_task, iscsi_task object respectively.

The following new functions are introduced to achieve
this:

struct iscsi_task* iscsi_create_task(struct iscsi_context *iscsi);
void iscsi_clear_task(struct iscsi_task *task);
void iscsi_free_task(struct iscsi_task *task);

struct scsi_task* scsi_create_task(void);
void scsi_free_task(struct scsi_task *task);

The iscsi_clear_task() function can be used to recycle an iscsi_task
object across multiple calls (see src/ld_iscsi.c for example).

All created tasks are tracked and eventually freed at the end.
If the application leaks iscsi_task objects a warning is issued.

The introduction of iscsi_task struct also fixes a flaw that
datain buffers are allocated by the iscsi part of libiscsi while
they where freed by scsi_free_scsi_task().
entities for template system (eventprototype, pluginconfig, templatemap, etc.)
template support on service/controller level
support for plugin tabs; first draft
support for plcaeholders
implement add/remove plugin
Merge branch 'devel' of https://github.com/ecamp/ecamp3 into feature/plugin

Conflicts:
	application/CoreApi/Entity/Plugin.php
Renderer implementation
New Entity: Medium

EventService::CreateRenderEvent()
RenderPluginInstance::render()
move plugin code into a single folder
add sql file
Changed Bootstrap to Register Repositories and Services automatically
merge forte/feature/plugin into smiley/feature/plugin
Plugin BaseController in CoreApi verschoben
Finished Class-renaming
finalize plugin architecture
merge devel
Merge pull request #114 from usu/feature/plugin

Feature/plugin
update DB
fix event/plugin rendering
add/remove plugins
test db address
updated CHANGELOG
Update Rails to 3.2.7
Fix `ActionView::Template::Error`

Undefined method `year' for 457296839.0:Float
Fix `work_time` method

`Tomato::DURATION` constant is expressed in seconds so `work_time`
doesn't require conversion to seconds.
bump version number to 0.6.52
Merge branch 'release/0.6.52' into develop
we want psr-0 autoloading here
added top level directories
initial check in
implement parser, but right now we miss the final production loop
implemented basic new non-stack based parsing algorithm
split up of parser implementation file
updated, but errors with left recursion, this project is stopped for now
commited local changes, converted project to VS9
updated
context gets renamed to parser state
renamed context to state and used arrays in the parser state instead of lists
first version that supports left recursion
updated
finally implemented left recursion
moved try / end left recursion encapsulation down to production where it is actually used
some cleanup
new version, does not use stack space anymore, statistics and supports all recursion types
removed unused stuff
closure function, support to reset production state and so increased cache hits
cosmetic
hacked in the javascript syntax and supported new unary rule lookahead not of 1
add css for buttom next & back
still working out issues
Added binary for windows
minimum version is R13B
write helpful comment into torrc if logging is enabled
A few view fixes
转换图片正则调整
Added 'Testing dependencies'
fixed bug with new Border.cornerRadius handling.
removed the alpha suffix from the pubspec version.
fixed range error in tokenizer.
Add gems and higher jumps
add solarized
Merge branch 'master' of github.com:pschorf/dotfiles
Fixin shit for 'clipe yo
removed vertx start stop deploy
CsvWriter fails if UseInvariantCulture is set - fixed.
Addign signup form
add kuji category script
add sicp notes
CSS : draw row
doxygen & indentation fixes
Marked symbologyv2 test as expected to fail
update the copyright.txt
添加页边距设置
setContent overloaded with tests
improving website content editing
customizing the themes, reordering js files, optimizing
adding simplifyer plugin
adding back script where they belongs
adding translation files
update wp-multilingual-slider
adding missing files
remove trailing white space
adding compression main.js
removing trailing commas
adding new them and new CSS
modifying trailing /
modifying trailing /
adding stuff
modifying qtranslate option
handle external link menu
separate js files for actions
remove html5 conditional tags
adding back xmlns
adding html5 shim
Remove temporary keystone and roles solution for RS Auth 1.1.  This was originally added to support Nova but Nova is now using the OpenStack Auth Filter.
Merge pull request #395 from rackspace/fran

Remove temporary keystone and roles solution for RS Auth 1.1.  This was ...
Removed unused import
Merge branch 'master' of github.com:rackspace/repose into daley
Merge branch 'master' of github.com:rackspace/repose into daley
Merge branch 'master' of github.com:rackspace/repose into daley
Added suppresswarning annotation for array store directly
Merge branch 'master' of github.com:rackspace/repose into malconis
Added client-auth filter for node3 in regression environment to point to a keystone instance
Merge pull request #439 from rackspace/malconis

Malconis
Send length prior to sending message to ensure entire message is read
Merge branch 'master' of github.com:rackspace/repose into daley
Merge branch 'daley', remote-tracking branch 'origin'
jmeter test for upenstack keystone auth n
jmeter test for openstack Keystone auth z
Merge branch 'master' of github.com:rackspace/repose
Removed commented code and unused functions that are listed in Sonar
Update replicated datastore to consolidate notification queue prior to sending notifications
Resolve merge conflict
RRemoved X-PP-Rate-Limited header.  This header is no longer used since rate limiting delegation was removed.
Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'master' of github.com:rackspace/repose into daley
Add junit coverage to ning proxy classes
Merge branch 'daley' of github.com:rackspace/repose
Merge branch 'master' of github.com:rackspace/repose
melhora nos angulos
Arquivo requirements.txt criado. Adicionado módulo psycopg2 no mesmo.
added new folder for xml test
Documentation: spelling fixes

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-commit-tree(1): update synopsis

Even with many new kinds of options, the command still takes the
single <tree> as the first argument.

Probably we would want to update the command to allow it to take
<tree>-ish at the end for consistency.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Make collectd-interval into a CLI argument.
Converted fedmsg-collectd to use the moksha-hub machinery (efficiency).
Testing on someone else's machine helps ;)
adding classes

gestionnaire de date, de shared preferences, convertisseur html
light cleanup, prep for event segments
just fucking keepalived
エラーが出ている状態を一旦回避、ここから修正
remove file
MONGOやめた
Default tab-behavior now and autoremove trailing white space
Texture map only requested meshes.

The previous iteration of the code did not unbind the texture
so polygons that did not need texturing got textured with the
previously bound texture.

This iteration allows for a mix of textured and untextured
meshes in the rendering tree. Just leave out the texture field
of the node in the rendering tree and it will remain untextured.
Add automatic normal generation.

Given that all this engine is capable of handling is triangles,
it makes it easy to automatically generate normals. Do this at
load time and bind them to a normal attribute in the shader.

The shader currently does something silly with the attribute to
prevent the shader compiler from removing unused attributes.
Yeah, shader compilers are sort of advanced.
UCJEPS-201: Add naturalhistory organization extension.
UCJEPS-201: Fix namespace uri's.
cambios para version1
cambio para servidor parte1
complete collections list screen
Removed object and moc files
Adds Tags, some Tests
Adds a couple of tags, as well as updates the documentation for
node.  Adds a few basic bbcode tests.
add dummy schema node
Initial commit - project setup

Signed-off-by: refnode <refnode@gmail.com>
refactor base data into a fixture
Added unit test for builtins. Updated TODO
Added lemolsoft.
Merge pull request #158 from lemol/master

Add lemolsoft
removing ST peripheral library
Adding vim, and bash dotfiles
wm: RhoElements license screen fixed
wm: passSipPositionToEngine
Implementovaná funkcionalita jednoduchého replikovania formulárov na každom riadku - veľmi dobrá využitelnosť napr. pri malom shope.
Použitie:
$callback = function($id, $control) use ($self) {
               $form = new \Nette\Application\UI\Form($control, $id);
               return $form;
            }
$dg->addForms($callback);

Signed-off-by: Samuel Kelemen <kelemen.samuel@gmail.com>
refactored CLI data access functions into new module
HW8 Initial Commit
HW8 - Added inputs, state machine
Merge branch 'master' of https://github.com/rlewelle/csci400
AutoReferee 1.0
Fixed missing remove in processCompletedOps
inicio decompor assercao
Decompor assercao
split incremental test method
Merge branch 'testsmells' of git@github.com:rmonico/Neutrino.git into fixture

Conflicts:
	META-INF/MANIFEST.MF
	build.properties
	plugin.xml
	src/org/ita/neutrino/junitgenericparser/JUnitAssertion.java

Signed-off-by: Bruno Demboscki <demboscki@yahoo.com.br>
Refatorações para tornar TestCodeSmell um tipo genérico e para tornar o core da detecção de mau cheiros independente de IDE
Renomeando algumas classes para melhor entendimento do código
Removendo import indevido no junit3parser.JUnitTestSuite
Removendo possivel ambiguidade entre a classe ser tratada como do JUnit3 e do JUnit4
Associando refatorações que faltaram
Unificando ações para JUnit3 e JUnit4
Renomeando ProvidesEclipseQuickFix para ProvidesEclipseRefactoring
Correção de bug no parsing de importações estáticas com wildcard.
Adicionados testes para os métodos StringUtils.extractPackageName e
StringUtils.extractTypeName para o caso de receberem nomes de
tipos genéricos
Adequação dos métodos extractPackageName e extractTypeName para
funcionarem com tipos genéricos.
Codificação prévia das funcionalidades necessárias para a uma tipagem
genérica mínima.
Novos métodos em StringUtils
Novo método
Correção no StringUtils: método getGenericParameterList, não estava
copiando corretamente a string de lista de parametros genéricos
Correções na criação de fixture com tipos genéricos
Pegando localização do junit.jar de arquivo properties
by begin
Merge branch 'master' of https://github.com/roban2012/gamma3
17/06/2012 00:48
remove hackers-client and wormhole dep
openbox autostart.sh - commented out the conky startup script

conky is being overloaded it seems and tends to be chewing through the cpu
therefore disabling the autostart until this is figured out
Fixed notifications counter working when not on notifications page
Transacciones habilitadas en el connecitonManager
Merge branch 'master' of github.com:rockiano/vet-tec
Add I18N. Iteration J1: Selecting the locale.
reads the hacker news home page
Merge branch 'master' of https://github.com/rohshall/hnewspy

Merge to add README
Subiendo fondo
[AS7-5364] Allow WebService deployments as OSGi bundles
[AS7-5430] Add support for Bundle redeployment
[AS7-5066] Allow REST deployments as OSGi bundles
[AS7-5469] Initial capabilities may not resolve
[AS7-5453] Server restart fails with persistent WAB deployment
[AS7-5481] No web context created for OSGi WebApp with *.jar extension
[AS7-5486] Cannot access resources from OSGi WebApp with *.jar extension
[AS7-5139] Allow @Resource injection for OSGi components
[AS7-5405] Initial Enterprise OSGi JPA implementation
[AS7-5531] Add JAXB support for OSGi Bundles
Move OSGi smoke tests to their respective tech packages
Minor fixes based on comments on [AS7-5486],[AS7-5139],[AS7-5481]
AS7-5581 Enable security on EJBs if they are marked for security restrictions, even in the absence of an explicit security domain configuration on the bean
AS7-5581 Fix the testcase to make sure it takes into account this new feature
AS7-5581 Fix the EJB3 bean failover with security testcase which potentially would lead to intermittent failures
AS7-5581 Don't blindly apply interceptors when default security domain is configured since the security interceptors are "heavy" and can lead to performance issues. Only apply the interceptors when some EJB security metadata is configured on the bean
fix typo
1.7.3
add .gitignore to ignore *.js
remove *.js
added tests for validating usernames and emails
Remove duplicated featured_image block. props koke.



git-svn-id: http://core.svn.wordpress.org/trunk@20406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
AMT changes
Added automatic CUA mode (with improvements)
Add VS2012 and Intel C++ 2013 compatibility (Requires Boost.Assignment
Apache 2 removing added if any
Merge pull request #16 from ryanpitts/search

Initial implementation of haystack for search
Merge remote branch 'ryanpitts/master' into development
Fixing some additional http: embed URLs that had fallen through the cracks
Merge pull request #18 from rossbruniges/development

Local merge of pull request #17 and an additional cheeky bug-fix
Merge pull request #19 from ryanpitts/search

Fix search index templates
Merge pull request #20 from ryanpitts/search

adjust disqus code on article_detail
Merge in from ryanpitts search branch to resolve conflict
Merge branch 'development' of github.com:mozilla/source into development
Merge pull request #23 from rossbruniges/development

Merge in from rossbruniges/development - which contains fixed conflict from ryanpitts/search
Merge pull request #24 from ryanpitts/search

fixing disqus_url as https
Merge pull request #25 from ryanpitts/master

add flatpages app, collapse nav article categories
Merge pull request #26 from ryanpitts/master

apply linebreaks filter to body text
Merge pull request #27 from ryanpitts/images

Add sorl-thumbnail and image support
Merge pull request #28 from ryanpitts/images

derp add missing missing.png to repo
Merge pull request #30 from ryanpitts/images

template fixes
Resolve conflicts from ryanpitts/images merge
Merge pull request #55 from rossbruniges/development

Merge in from local development - with conflicts resolved
Merge pull request #58 from ryanpitts/images

fix CATEGORY_MAP for articles
Merge pull request #59 from ryanpitts/master

absolute URL for comment count link
Merge remote branch 'ryanpitts/images' into development
Improve documentation of how to reboot
Adb and busybox.
dirty hack to embed the shop
switching back to bash
Merge branch 'master' of github.com:sagargp/dotfiles
added Tankeintrag Menu Layout, TankAdapter etc.
commit after Tabhost change
Теперь можно просто процедуры на каллбэки вещать

Signed-off-by: saintbyte <admin@dotsb.net.ru>
Gymkhnaa redesing
Gymkhnaa redesing
Gymkhanan redesing:
Ignore keys
And again
ignore
Ignore
Ignore
Merge branch 'master' into github

Conflicts:
	.gitignore
Config
Merge branch 'master' into github

Conflicts:
	.gitignore
Config 2
libsalsitaextension uses libhtmlpanel
test removing.
knowledge manager created
Merge branch 'devel' of github.com:samelat/Swarming into devel
RESTRUCT delete obsolete comments and bad function names

Those are there from the previous implementation using elrang forms instead of
syntax tools
some outlining is going on
working on publish
change getPublication Method to mange the type of publication
working on publication
add test on extractNewsletterContent and correct of course
working on publication
adding spring ldap, confgure it and begining authent via ldap
finishing ldap authentication
cleaning user to remove password
test user before check and create user with USER role instead admin
Buffer file writes.
DNSBL check redux, now with local scripting (I thought I'd have to modify PO to be able to have this functionality--turns out, I don't).
Merge branch 'master' of github.com:sarenji/poserver
DNSBL check redux, now with local scripting (I thought I'd have to modify PO to be able to have this functionality--turns out, I don't).
ignore updated
updated
Added README
Reading of Mills Ch1 :audio
Work around SI-6500 by unspecializing StringBuffer

Strings work again, yay!
Rename sequential collections' Basic*Ops to Common*Ops

and factor implicit conversions into reusable provider classes.
added a builder to make the guava table class into a javafx model
destroy old db, create new db
use print()
make (/ int int) return float
make get_options() a static method
Fix docspec compilation issue
Removes plus sign from filenames for safety
Updates StarterKits submodule
Corrects an amusing typo
Merge pull request #354 from kungfubanana/starter_kits

Updates StarterKits submodule
Merge pull request #353 from sdancer/develop

Add sleep for fixed time step in order to release the processor when fix...
Merge pull request #348 from kungfubanana/ios_landscape

develop - Improves iOS landscape support
Trying to clean up they way the orientation stuff works for android it should be working like WP7.
only  Scenario #3: of the orientaton Samples does not work at the moment. This
Added both architectures in project properties.
Updates to support automated tests on iOS

Game
- Changes the handling of the Exiting event so that it is raised *after*
  the final Update/Draw round, instead of during it.

SpriteBatch
- Stops the clearing of non-screen framebuffers before each draw into
  them.  I'm not sure why this was being done before, maybe this change
  will break something important.  Without it, tests only showed one
  'layer' of drawn items.

iOSGamePlatform
- Improves the reliability of game-loop exiting logic.

iOSGameView
- Replaces an unsafe cast from IGraphicsDeviceManager (as object) to
  GraphicsDeviceManager with a query for IGraphicsDeviceService, which
  is what was actually needed.
- Cleans up some unused variables.
Adds exception handler to iOSGamePlatform.Tick

Since iOSGamePlatform.Tick is invoked on the main thread, it is
important that it never throw an exception and crash the whole program.
Instead, we write the error with Console.WriteLine and 'cleanly' exit
the Game.
Updates Tests submodule for iOS testing
Merge remote-tracking branch 'upstream/develop' into develop
Changed fonts in AlienGame to allow it to run.
Merge pull request #357 from kungfubanana/ios_tests

develop - iOS Tests
Update README.md
Added code to support reading the ScreenOrientation from the ActivityAttribute
Added Decompose Support for Matrix
Added a small fix to only set the _preferredBackBufferSetByUser flag if the SupportedOrientations is left as default
Merge remote-tracking branch 'upstream/develop' into develop
Fixed a memory leak in the ESTexture2D.cs for Android
New Guid.
Merge pull request #359 from CartBlanche/develop

Changed fonts in AlienGame to allow it to run.
rbsp plot added terminator
Update share/2012/08.07/README.md
add test=case
Thumbnails working for conference mode
Visible cursors with graphics
Added initial schema rev work.
Forgot a few files in previous commit.
reformat page. Need a good 1-page design
working with cute graphics
smooth animation, and tiles with angbandtk
sort languages.
tmux: typo fix
bash: phpenv
Merge branch 'master' of github.com:seiichi/dotfiles

Conflicts:
	.bash/bashrc
饭饭的暗牧监视
Refs ##4643. Checking if ftok function exists, to also support windows servers.
The rest of Book II
Added the sortedforwardindex implementation
removed a few unnecessary regexp pattern modifiers.
modified:   js/sunflower.test.js
tirei o 5.3
Added friction and fixed ball in hole detection
Create the project

Signed-off-by: Ivan <Ivan@172.29.34.204>
redmine#1217: simple fix modifying CF_CLASSRANGE
redmine#1217: add test for a variable name in the class expression
Robustify against wrong GREP_OPTIONS in environment
De-hardcode mkdir, touch and ln from testsuite
Test files needs default.cf.sub included
Clean in verbose test output, get rid of 'extra 2>/dev/null argument'
Add a helper function for finding strings in arrays
Add missing qualification variable by namespace in some edge cases
Add new files from things promise attributes
Update documentation on things promises
Merge pull request #177 from markburgess/master

Commits on bugfix for redmine 1223, documentation patches, 
Fixed invalid memory read in Agent2Type

Calling Agent2Type with a string which is not in the CF_AGENTTYPES array
would cause the loop to run from 0 to (int)cf_notype - which is 16 right
now. However, the CF_AGENTTYPES array doesn't have that many entries.
It's not a valid enum value of the cfagenttype enum either.  This looks
like a copy & paste issues from Typename2Datatype.

The code should rather loop until the largest value in the cfagenttype
enum: cf_noagent.
Made Str2ServicePolicy yield correct enum value for "restart"

The 'for' loop terminated to early, it didn't check the entire array so
the function decided that 'restart' is not a valid string in which case
the function yielded the default value: cfsrv_start. So "start" and
"restart" mapped to the same enum value even though "restart" has a
dedicated value.

I suspect this is not intended, so let's fix it by adjusting the for
loop so that 'restart' gets mapped to cfsrv_restart.
Squashed commit of the following:

commit 19d89537fe17e4eb45c9bcb236438cd7f2cf7280
Author: Ted Zlatanov <tzz@lifelogs.com>
Date:   Fri Sep 21 22:17:23 2012 -0400

    redmine#1161: adjust test to reflect new namespace usage

commit 9e6ff35dc25ea8e8ad308daf2e166440e9ac5a8b
Author: Ted Zlatanov <tzz@lifelogs.com>
Date:   Sun Sep 16 06:54:41 2012 -0400

    Move test for passing of namespaced common bundle classes to 02_classes/

commit d4475b035d0ac7dab5922db6a0a953bbbe202fbb
Author: Ted Zlatanov <tzz@lifelogs.com>
Date:   Sun Sep 16 06:42:41 2012 -0400

    Add test for passing of namespaced common bundle classes

commit 3305cd2ed10644f0872f1fc6dabb5dd21a49659d
Author: Ted Zlatanov <tzz@lifelogs.com>
Date:   Sun Sep 16 06:01:29 2012 -0400

    Add test for passing of namespaced variables
Merge pull request #178 from frerich/master

Two bugfixes for src/conversion.c
Always call edit_line/edit_xml bundles from ScheduleEditOperations

Previously an uninitialized variable resulted in bundles not being always
found. Thanks to Shauna Thomas for the debugging.
Merge branch 'master' into features-files-xml
Merge branch 'release/v0.1.15' into develop
only use source to determine version when publishing
v0.1.16
CHANGELOG
Merge branch 'release/v0.1.16'
Make game stop on gameover; refactored PlatformFactory
Make PlatformBuilder make initial platforms too
Now shows score count
add stack getter/setter
first commit murakumo to github
实现了OpenNI的基本操作及显示图像
add libraries which I'm using.

1.Just #import "SQLibs.h"
2.ColorUtils DebugUtils StringUtils
3.AlertView, LoadingView MaskView
4.GridView
5.TabBar(custom,  not common:Maybe You should custom it yourself.)
6.SoundManager
Elimine graficos sin uso y optimize otros.
Merge branch 'master' of https://github.com/shkz/MicroStudio.git
rearragement
rps_game
drivers/char/tpm: Add new device driver to support IBM vTPM

This patch adds a new device driver to support IBM virtual TPM
(vTPM) for PPC64.  IBM vTPM is supported through the adjunct
partition with firmware release 740 or higher.  With vTPM
support, each lpar is able to have its own vTPM without the
physical TPM hardware.

This driver provides TPM functionalities by communicating with
the vTPM adjunct partition through Hypervisor calls (Hcalls)
and Command/Response Queue (CRQ) commands.

Signed-off-by: Ashley Lai <adlai@us.ibm.com>
PPC64: Add support for instantiating SML from Open Firmware

This patch instantiate Stored Measurement Log (SML) and put the
log address and size in the device tree.

Signed-off-by: Ashley Lai <adlai@us.ibm.com>
drivers/char/tpm: Add securityfs support for event log

This patch retrieves the event log data from the device tree
during file open. The event log data will then displayed through
securityfs.

Signed-off-by: Ashley Lai <adlai@us.ibm.com>
Adding ability to delete padding whitespaces form object header
Update new file key binding in Sublime Text
fixed bot to work with external links
Merge branch 'master' of github.com:siegleal/Crawler
added correct e-mail and config reader
added csproj to gitignore
Merge branch 'master' of github.com:siegleal/Crawler
BOOKKEEPER-270: Review documentation on bookie cookie (ivank via fpj)



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1343981 13f79535-47bb-0310-9956-ffa450edef68
BOOKKEEPER-271: Review documentation for message bounding (ivank via fpj)



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1343996 13f79535-47bb-0310-9956-ffa450edef68
BOOKKEEPER-281: BKClient is failing when zkclient connection delays (ivank via sijie)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1346247 13f79535-47bb-0310-9956-ffa450edef68
BOOKKEEPER-279: LocalBookKeeper is failing intermittently due to zkclient connection establishment delay (Rakesh R via sijie)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1346257 13f79535-47bb-0310-9956-ffa450edef68
BOOKKEEPER-285: TestZkSubscriptionManager quits due to NPE, so other tests are not run in hedwig server. (sijie)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1346321 13f79535-47bb-0310-9956-ffa450edef68
BOOKKEEPER-286: Compilation warning (ivank via sijie)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1346340 13f79535-47bb-0310-9956-ffa450edef68
BOOKKEEPER-271: Review documentation for message bounding (ivank via fpj)



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1343996 13f79535-47bb-0310-9956-ffa450edef68
BOOKKEEPER-271: Review documentation for message bounding (ivank via fpj)



git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1343996 13f79535-47bb-0310-9956-ffa450edef68
.mplayerを追加
Lock nanoc version
README: Update for branch.
Added info about 3th speaker on meet.php#6.
Change in saving structure of privileges(deleted grouping by allow deny and transfered it to ACE). Can load from file. to_s doesnt work. Can add and delete ACE. Ease implementation of check method (works only for exact ACE). Unfinish atempt for ful check method
test job_worker
Squashed 'vim/vim.symlink/bundle/Command-T/' content from commit e926704

git-subtree-dir: vim/vim.symlink/bundle/Command-T
git-subtree-split: e9267044261481fbb6717b482c2f3811eb61b409
Merge commit '6009fad1bf01445514f10152e93a8f02f5aa4934' as 'vim/vim.symlink/bundle/Command-T'
Squashed 'vim/vim.symlink/bundle/Gundo/' content from commit ca348aa

git-subtree-dir: vim/vim.symlink/bundle/Gundo
git-subtree-split: ca348aa81fa12aac55277f4c83c73e616fef0089
Merge commit 'cec475c0edbe28ea9a4a9b719dd41fc1618e25a0' as 'vim/vim.symlink/bundle/Gundo'
Squashed 'vim/vim.symlink/bundle/vim-fugitive/' content from commit 0abe1fb

git-subtree-dir: vim/vim.symlink/bundle/vim-fugitive
git-subtree-split: 0abe1fb12232abe5b7bdfa4d244f04faf3450ba3
Merge commit '5b977ce467b22ac93aa5126a8497094c2c29a402' as 'vim/vim.symlink/bundle/vim-fugitive'
Squashed 'vim/vim.symlink/bundle/vim-surround/' content from commit 1a73f60

git-subtree-dir: vim/vim.symlink/bundle/vim-surround
git-subtree-split: 1a73f607f8f5477d6942df2eb6e7245c4864f4d3
Merge commit '39209479dcbc46c1d44274c6bbfe717db77e5cec' as 'vim/vim.symlink/bundle/vim-surround'
Squashed 'vim/vim.symlink/bundle/vim-unimpaired/' content from commit e801372

git-subtree-dir: vim/vim.symlink/bundle/vim-unimpaired
git-subtree-split: e8013727a008a68664a789fe0d2b5c2ab2ecf657
Merge commit '03c6fec6a501f2d02049b2c96f3f99a5c59e539c' as 'vim/vim.symlink/bundle/vim-unimpaired'
Squashed 'vim/vim.symlink/bundle/vim-coffee-script/' content from commit d6dcb9b

git-subtree-dir: vim/vim.symlink/bundle/vim-coffee-script
git-subtree-split: d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
Merge commit '8090b8c7d3d57de646520d553affefcdeb79fe97' as 'vim/vim.symlink/bundle/vim-coffee-script'
Squashed 'vim/vim.symlink/bundle/neocomplcache/' content from commit da5cec2

git-subtree-dir: vim/vim.symlink/bundle/neocomplcache
git-subtree-split: da5cec2fe399e577c9d38ebfbf512870a73c06ac
Merge commit '351f9bff9a0a1faf0ba4bac2ff31d8a2f5568724' as 'vim/vim.symlink/bundle/neocomplcache'
Squashed 'vim/vim.symlink/bundle/vim-taglist/' content from commit 381e39c

git-subtree-dir: vim/vim.symlink/bundle/vim-taglist
git-subtree-split: 381e39c142d5f2781bad3735386eed1dfafb4443
Merge commit '2f927851c586bb9d1d4f1ae4849e806e3833dc30' as 'vim/vim.symlink/bundle/vim-taglist'
Squashed 'vim/vim.symlink/bundle/vim-powerline/' content from commit 7f53b5c

git-subtree-dir: vim/vim.symlink/bundle/vim-powerline
git-subtree-split: 7f53b5c3919bde9a4259d0c725d453ef2337a4ed
Merge commit '146c171a434030e9e0dd8cdc1337ca6d1f5adf5e' as 'vim/vim.symlink/bundle/vim-powerline'
starting to setup vim and the subtrees
added command-t stuffs back
data parse bugfix
Added another push message subtask
Made test compilable - FIXME
make test
text and select widgets now implement standard GWT Focusable interface
Merge branch 'master' of github.com:sksamuel/jqm4gwt
add travis buildscript
add getMacros.lua & myio.c
foldの設定をinputに移動
foldmethod=marker対応
v0.9.7.4 - add missing classes
FIX: el entitytype se visualiza en un span con class snappminds_utils_form_type_choice, en lugar de un div.

Atención que este cambio podría afectar a las vistas donde se lo utilice
add new monitoring flag (Load flag)
CHG: base url for repo page
Revert "Fix for multiple file upload"

This reverts commit 58b7858a7619717fe76243e1ff6afcf8efb776cb.
Fix for multiple file upload: a better implementation
Arreglado un fallo sin importancia en la funcion ayuda()
added critical path check
Fix versioning & remove brew
Fixes for trip registration error.  Looks like that one slipped by me...
Some more audio waveform work. Still not OK for compressed formats though :'(
Finally have audio waveform preview working
Added latest Heikki's fixes to build in Windows

Added a debug window for those systems that doesn't support shell output
messages
added default QT gitignore with some QLC+ tunings
Fix main to compile on Linux

Added an extra consistency check when updating the shows view
added Task::Dancer portfile
modernizr touch detection
who likes docs?
Add TODO section to README
fixing formatting in README for MAPS -> MAP OBJECTS
readme erneut geändert
adding additional todos
Added parameter to title
Add index.php to show phpinfo
corrected default site template icon size
corrected rightcolumn layout
Commit Readme
Commit readme
embedded content of post.install_setup_data
now snippets/post.embed_base64_file contains the content of snippets/post.install_setup_data
added modprobe conf for nested KVM (intel)
Pool manager now posts nodes to API server

Change-Id: I6d53a87e53a4272c26f77f5b28bc83651cb075cf
Merge "Pool manager now posts nodes to API server"
A better docs option cross-reference fix

Change-Id: I41459cb0569181cabfe824cd7f81ae1fef81da9f
io-sbcl.lisp(copy-mem): Don't touch more memory than needed.
io-sbcl.lisp: Refactor string writing.
Added array_hash_set tests
Lots of vim/gvim/conque improvements
merged steeeveb's count fork, made some stylistic changes and moved a few things around
Updated to Version 1.0, added count to docs
fixed issue #12: joinWheres should use parenthesis to preserve precedence
Added function to join a list of where clauses
Added check on argument in joinMultipleWheres
Added some tests for joinMultipleWheres
Test cleaning
Fixed docstring in joinMultipleWheres
Fixed argument checking in joinMultipleWheres
Fix column quoting for postgres.
fixed code / tests for propper escaping in postgresql
Merge branch 'master' of https://github.com/flaviogrossi/twistar into flaviogrossi
fixed typo in joinMultipleWheres code
fixed issue #14 - Non-working BelongsTo.clear
fixed issue #18 - missing import in dbconfig/base.py
fixed issue with logging unicode strings
fixed bug in unicode debugging printouts, added test
implementation of pyodbc support
added a reconnecting mysql connection pool
updated error message for mysql reconnect
added point/multiplier displays over explosions
added web fonts for text overlays
adding link to Google Play
emit stats of current, change, and per-sec
only show full stats output every once in awhile
only emit full stats separated when needed
The current network implementation expects the xml on a single line. So any new lines has been stripped away
Removed toString() from Enums
Other minor changes
Changed loogic in the output
removes require shit from specs
Merge branch 'development' into chore/remove-requires

Conflicts:
	spec/javascripts/unit/slotcars/home/views/home_screen_view_spec.js.coffee
removes requires in upstream specs
Merge pull request #127 from stravid/chore/remove-requires

Pull Request: chore/remove-requires. see #120
authorized keys example in the readme
added ignore list
allowed dynamically change object color
Add points on mesh vertexes and keep associations
Merge branch 'master' of git://github.com/maowenzhang/vexport into maowenzhang-master
fixed conflicts
Verify id is valid before changing PDA jobs.

We got a runtime regarding this a while back.  @SkyMarshal helped
me understand just what was going on under the covers; thanks!
Fixes part of issue #21.
Move livestock to unused/ and clean up "uses."

Not that there were any livestock in the game, but apparently to handle
them a whole bunch of the 'eating' code was copy-pasted.  And had, of
course, bitrotted due to lack of consistent changes.  Woo.  Getting
rid of it is a pretty obvious win.
Move unused WIP mainspipe code out.
Show active player character name and stats only
Removing exess whitespace, fovy hack, and altering default FOV
Merge branch 'master' into deadking
WIP - Wrapper class for easy DB operations on a SQLite based DB
Working specimen
Allow notmuch to work with emacs-snapshot
bugid: 46630 -- use correct json function

git-svn-id: https://svn.wikia-code.com/wikia/trunk@59575 e846bd91-c042-42a7-a218-4b65e2c1904d
StructuredData: showObjects controller (bugid:50375)

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61606 e846bd91-c042-42a7-a218-4b65e2c1904d
BugId:51174 fix for Invalid URL:  warning

git-svn-id: https://svn.wikia-code.com/wikia/trunk@62022 e846bd91-c042-42a7-a218-4b65e2c1904d
ad driver refactoring

git-svn-id: https://svn.wikia-code.com/wikia/trunk@60092 e846bd91-c042-42a7-a218-4b65e2c1904d
Video: update maintenance script for video_info

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61103 e846bd91-c042-42a7-a218-4b65e2c1904d
Fix for Welcome bot substitutes templates when welcoming BugId: 45249

git-svn-id: https://svn.wikia-code.com/wikia/trunk@61281 e846bd91-c042-42a7-a218-4b65e2c1904d
Better testing for stubbed functions.
Switch from testng to Junit4.

Here is the rational:
* testng is running all tests in the same threads. In javasci, we are loading / unloading the Scilab engine many time
it causes segmentations in the memory  and crashing under 32 bits Linux
* junit has way less dependencies (not qdox, jcommander, bsh, etc)
* it produces nicer reports
* testng is a huge pain to package in distro

Change-Id: Ib83cca73f359779f3bf9e23375e6eac22cd9a21a
move some dependencies as references already present (warning with visual studio 2011 beta)

Change-Id: Ic506908191bb3a3a6407c51c269085d6503e7c9b