labofsahil/github-event-dataset-2012 huggingface dataset:
Remove code duplication by using is_section_heading?
Handle sections whose title contains backticks

This occurs in git-fast-import
Handle double backticks before single backticks

This fixes rendering of the "fixup" section of git-fast-import,
see issue #208.
Allow the 'line' under a section heading to be arbitrarily long

This is consistent with how asciidoc seems to work, and fixes
rendering of the "filecopy" section of git-fast-import.
Merge pull request #209 from fingolfin/asciidoc-fixes

Asciidoc fixes
Fix log and bump up to v0.4.3.1
[RefactoringPingSleep] Moving the sleep from the ping the the app
[ConfigPath] Fix
Merge branch 'i26-config-path' into develop
docs: added documentation files

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Fix author tests errors
Fixed typos in tests assertions.
Makes it even clearer.
allow compiling with assert=no
expect warning instead of error
add student code for ORF finder, Lua filtering and match parsing

as the original commits were partially non-compiling etc, this
is squashed into one commit
add tag_value_map_remove()
rename types in idxlocali*.[ch]
add gt_interval_tree_remove()
add gt_feature_node_remove_attribute()
introduce database-backed annotation indices
encapsulate filter scripts into separate class
add GtArray(In,Out)Stream
move gt_style_get_color() to API
move gt_fasta_show_entry() to API
move gt_genome_nodes_sort_*() to API
move gt_feature_node_number_of_children*() to API
add translate tool
add and move GtFeatureNode marking functions
add GtClusteredSet
rename GtMatch -> GtIdxMatch

in preparation of introducing a generic GtMatch type
add GtMatch interface, OpenMatch and BLAST implementations
add GtLTRClusterStream
+ fcl-xml, implemented TDOMNode.BaseURI property.
* Moved element loading procedure from xmlread.pp to dom.pp, speeds things up a bit.

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20558 3ad0048d-3df7-0310-abae-a5850022a9f2
+ add debian armel library search path
+ for armhf, use the more canonical ld-linux-armhf.so.3 as defdynlinker

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22416 3ad0048d-3df7-0310-abae-a5850022a9f2
fix a couple javadoc warnings
Update api/2.0/restfully-tutorial.rb
Fix npm test config
GROOVY-5480: Type inference doesn't infer correct generic return type when method is an extension method
Fix previous init animation
minor tweaks to landing page and added favicon
[update]merge
check perl version and fatpack path.
rebuild.
captcha alternatives finished - as of now no failing tests
Only allow candidates which are visible unless ace-jump-allow-invisible is set
Add parse match data method
Merge branch 'master' of https://github.com/h-ack/from-stadium
Updated .gitignore, moved media to static
Updated README and demo to reflect the static move
bumping version
better sass naming
Merge branch 'release/T20121005' into develop
test fredo
Merge branch 'master' of https://github.com/haflinger/comulien

Conflicts:
	docs/Test.txt
Merge branch 'master' of https://github.com/haflinger/comulien

Conflicts:
	docs/Test.txt
Fix syntax regression
Add donate button, switch to calender, flash tasks' logo on load
Initial version

Offers HTML stripping in certain tags and removal of specific keywords via hard coded lists.
Logging and rudimentary error checking included.
here we go
Merge branch 'master' of https://github.com/hamburgers/adaptIC
Fix escaping on ruby 1.8. Thanks to kinumi
New methods in tests
numpy2tex
Merge branch 'master' of github.com:hanslovsky/scripts
Log4cxx is optional dependency now
order update
Merge branch 'development' of https://github.com/hao3039032/Symagic.git into development
since I still need autolink stuff, so maybe I just need to escape html tags
i
i
i
Fix indentation of README
moved login tests to samples directory
Excluded .TAGS_* files from find command in function __emacs_search
Removed extra `:` causing urls to be invalid and break in Linux while still working in OSX.  `http:://opower.com/.well-known/host-meta` instead of `http://opower.com/.well-known/host-meta`.  
Merge pull request #68 from dylang/patch-1

Extra : in url breaks OpenId in Linux.
Remove crufty .bnsignore
api documentation

added API documentation so you can view it from Github (even though the
user could generate the API docs using 'sbt doc')
front page
Fix spaces in generated scaffold haml
condense prompt
Boom. Tutorial code. Committing the Window tutorial
attributes gitlab
set default tramp to ssh
Merge branch 'master' of github.com:heychenbin/emacs.d
Use staticMapLite from OSM. See bug #381.
Google map zoom query parameter is "z"
The link to the map must span over the image.
Call POV class from index.html
POV test
Fix param value of Jump button
Fix script tags
Add Panorama class
Change class name
User Panorama class
Call warpRandom method
Implement Jump & Warp Function
Avoid starting action while another action is active.
Merge branch 'master' of git@github.com:hisashin/astrowalk.git
Add onResize action
Merge branch 'master' of git@github.com:hisashin/astrowalk.git
Oops, bad migration fix.
Add composer.json.
[auto] Merge from Console

    • #487915e — Oops, bad migration fix. (Ivan Enderlin, 2012-09-03)
    • #aae37dd — Add composer.json. (Ivan Enderlin, 2012-09-03)

---

Merge remote branch 'library-console/master'
Bug 2817: condor monitor missing PREEMPT parameter
summary - > report
12,19
currency
Merge branch 'master6' of https://github.com/hoyoji/HoYoJiMoney.git into master6
[maven-release-plugin] prepare release huahin-core-0.1.2
[rouring] removed old /tags route
[fix] fixed tweet button iframe resizing in homepage
Modificado el acceso de actores globales a actores que pertenecen a la
escena actual.
Eliminados comentarios innecesarios.
commit from hxflyer Xcode
Put that up there.
minibuf expl as submodule
lol
Revert "lol"

This reverts commit 9a1afd3794390fc8c7e0bb2269baba2791f7133d.
Revert "minibuf expl as submodule"

This reverts commit 847495a23025b14ebc4241fe6ae0c0dc94df43c3.
Removed erroneous label from iPad storyboard
Reversed John Dalton's fix
Some changes towards issue #46.
Basic addition of hierarchical packages and resources and reading them works.
PATCH and DELETE now works as well.
Nearly there on completing issue #46.
Hier. packaging tot dusver, deletion, creation werkt, al moet het nog grondig getest worden. Back-end is op toplevel veranderd zie comments op commit.
Deleted some dev left-overs.
Small bug fix, reading and patching resources works now.
New SQL controller with parser (tokenizer and grammar). It converts an SQLQuery to an universalFilters-tree.
Fixed issue #104 issue #105 issue #106.
Merge branch 'iSoc12' of https://github.com/iRail/The-DataTank into iSoc12
Merge conflicts.
Temporary commit: Basic functionality universalfilter working. + Fixed some bugs in SQL parser.
Merge branch 'iSoc12' of https://github.com/iRail/The-DataTank into iSoc12
Necessary commit before switching branch.
Implemented issue #107.
Merge branch 'hierarchical_packaging' into iSoc12
Only follow 1 subpackage deeper.
Merge branch 'hierarchical_packaging' into iSoc12
Merge branch 'iSoc12' of https://github.com/iRail/The-DataTank into iSoc12
Some includes missed.
Some changes towards issue #46.
Basic addition of hierarchical packages and resources and reading them works.
PATCH and DELETE now works as well.
Nearly there on completing issue #46.
Hier. packaging tot dusver, deletion, creation werkt, al moet het nog grondig getest worden. Back-end is op toplevel veranderd zie comments op commit.
Deleted some dev left-overs.
Small bug fix, reading and patching resources works now.
Merge conflicts.
testing code for remote_controller on Android
open source images
Refactored indexable property into separate class.
Renamed SimpleProperty to NonIndexableProperty.
IndexableProperty now gets index with each call, rather than caching it in a member variable.
Refactor to Event::Wrappable
Added Dispatcher and MainWindow. Developed models.
Complementation for svn.
integration test code

to read in html, parse it and output csv
First final submittal
fixed overlapped output
Correct the amdjs define() invocation
implement arrayaccess.
Implement save as panel
Serialize to xml and save to file
suicide spot command for the scout
added support for list relations
Added soft delete documentation back in
Docv for Image::flip()
Merge pull request #464 from indigofeather/1.5/develop

Fixed syntax highlighting and link
Typo on created_at in database table SQL
Merge pull request #466 from tevfik6/1.5/develop

Typo on created_at in database table SQL
fix deprecated usage
deprecated usage fix 
deprecated usage fix
Merge pull request #467 from tevfik6/1.5/develop

deprecated usage fix in ORM Observers
Added docs for join::and_on and join::or_on
Fixed notice in Upload class
Added method index to simpleauth acl, login, groups pages
Merge pull request #471 from SCIF/1.5/develop

1.5/develop
Added FuelPHP tutorials
Merge pull request #468 from ronan-gloo/1.5/develop

Doc for Image::flip()
Merge pull request #472 from marcopax/1.5/develop

Added FuelPHP tutorials
updated the fieldset documentation with a tabular form example
clarified how to enable db profiling
fixed typo
update of the view intro docs page
revert to twitter theme
switc to dinky theme
left fling fix, also account for scrolled deckpicker when many decks - issue 1306
First update after fork
small urdf bugfix
Merge branch 'master' of github.com:abubeck/cob_common
Merge remote-tracking branch 'origin-ipa320/master' into automerge
changed kinect configuration for fuerte, changed stlb links to stl
Merge https://github.com/abubeck/cob_common
Merge pull request #12 from abubeck/master

fuerte support, compatible with electric
Merge branch 'master' of github.com:ipa320/cob_common
fixed field of view for kinect
テンプレート作成コピー
Dropboxのテンプレート作成画面をコピー、一時的にwindow/new.htmlとして保存
window/new.html.erbに名前変更
微修正
微修正
Add a test that hits an npm registry as well
Adding dynamic css generation to disable caching.
Imported v25d from http://www.drchip.org/astronaut/vim/index.html#ZOOMWIN
Add Last contract

Copied last contract from:
    https://raw.github.com/iuridiniz/thoonk.py/119ba6ebf0d1a17bc973c9ac6bd7ad0b362b5cb1/contract.txt
Makin' changes. Stuck trying to figure out the Love feature.
missing spec and doc for guage
Diseño de la interfaz para el archivo de noticias

Aun estoy trabajando en la visualización del archivo de noticias.
En lo que respecta al editor hice algunos cambios mínimos, en la
interfaz, falta poner la parte de definir una imagen como la principal
de la noticia, para poderla visualizar en el carusel de imagenes.
Interfaz del archivo de noticias terminada
Posible cambio de editor en noticias y secciones
Merge branch 'master' of github.com:j2deme/PosgradoMSC
Add libsndfile to the Makefile so that PyDAW(with offline export) and Euphoria can be debugged
Add a yet-untested-but-probably-working offline export function...
Part one of freeing the engine from any reliance on the UI for initialization...  At least one bug is known from OSC dropping early messages...
add new data to value_positive
Modify the tool introduction.
Upstream commits and contributions.
DATA_TYPES array instead of many constants.
fix #1 #2 test pull request
fixed name for nodelink.js
set max width on the content
Document and test Collection#text() manipulation.
modified default post #
Use the new version of snipmate.
add z-index to observatory_panel
Ignore selenium tests when deploying to AppHarbor
Add :discard_page_details option to further reduce memory consumption
Updated Awsome Algorism
Added .powrc.
Cucumber works.
UI adjustments.
Add commented out dotfiles installation. Not yet sure if this can really happen before anything else as it depends on Rake. Most likely will but would like to test it first.
Update node installation to the latest stable version (0.6.17) and clone into the same install directory as shown in the node documentation. I didn't think we could do this but seems safe so we'll go with it.
Tested that with the default Ruby install on Mac the Rakefile will run just fine. This is great since we can have our dot files in place.
Reload the bash session so we will use our new dotfiles
Remove no rdoc and no ri arguments as our dotfiles already specify this globally.
Update ruby-build installation to install as an rbenv plugin since we won't use it any other way.
Update Ruby installation to now be 1.9.3-p194 (no need to worry about GCC anymore)
Add installation of foreman gem (its awesome!) and clean up some comments.
fix: TypeScript generation
Added initWithCoder:(NSCoder*)

Enables using the calendar with Xcode's Interface Builder.
Merge pull request #19 from akikoskinen/initwithcoder

Added initWithCoder:(NSCoder*)
Add max_load option to Worker class

Setting max_load will cause a worker to wait until the system 1-minute
loadavg is < max_load before taking a new job (linux only).
Combined getUniversal*() and getSystem*() into getParallel*()
Created UniversalObject class
Removed parallelObject/parallelScene stuff
Wrote UniversalObject tests
added bugtracker pointing to GH/issues
Updated to latest dependencies
added the atsintegration example
Follow up to f06d273 that addresses pull request comments.

* Adds region to the listMetrics and getMetricStatisticsV2
* Fixed hashCode implementations
* Fixed typo in Datapoint.equals()
[validate][compare] fix: fail wg. mehrfachem auftreten eines Feldnamen (z.b. durch hashvalue..)
Chugging along...
Add support to WinstoneOutputStream for files larger than 2 GB
Merge pull request #3 from AndreGross/master

JENKINS: WINSTONE: [JIRA 12854] Add support for large files (> 2 GB) to OutputStream
Code Review Feedback: Andre Gross' proposed changes look straight forward to me in addressing the issue described in JENKINS-12854: Large Artifacts can not be downloaded over WebInterface at https://issues.jenkins-ci.org/browse/JENKINS-12854
Signed-off-by: Lloyd Chang <lloydchang@gmail.com>
Adds CSS fill-mode support.
Adds a PNG of the basic app mock.
Add :connection_handling=>:disconnect option for threaded connection pools

This option always disconnects the connection, instead of returning
it to the pool.  The expected use case is for people who want to
manually control all checkouts.

For example, let's say you have a web application that modifies
the connection state in each action.  You don't want a connection
used by one action to be used by another action, since you don't
know the state of the connection.  Also, later queries in the same
action may depend upon the state of the connection set previously
in the action, so you need to use a consistent connection for the
entire action.  In this case, a rack middleware that used
Database#synchronize around each action and used
:connection_handling=>:disconnect when connecting should work.
Add :where option to validates_unique, for custom uniqueness filters

validates_unique already takes a block, but the block is used for
scoping the existing uniqueness filter to a subset of the model's
dataset (for example, only validating uniqueness for active users
as opposed to all users).  This doesn't allow you to change the
actual filter used for uniqueness, which is necessary if you want
to do a case insensitive uniqueness validation for a database
that is case sensitive by default.

The :where option is used instead of the default filter, allowing
custom uniqueness checks.  In addition to case insensitive
uniqueness validations, it probably could be used for validations
of PostgreSQL exclusion constraints.
Allow subclasses plugin to take a block, which is called with all subclasses created

This is useful if you are creating subclasses at runtime.
Previously, if you wanted to make a specific change on a per
class basis to each subclass, you would have had to
periodically check descendents and look for new classes.
With this change, you can easily make such a change as soon
as the subclass is created.
Cleanup created tables in the integration tests
Cleanup created tables in the mysql, mssql, postgres, and sqlite adapter specs
Add bin/sequel -c support, for running code string instead of using an IRB prompt

You could previously have done this by piping the code to the
standard input, but this is definitely easier.  Would have
preferred to use the -e option so that executing code is similar
to ruby, but since that was taken, I choose to use -c since that
is similar to sh.
Cleanup created tables in the oracle adapter specs
Fix validation_helpers spec after code change
More cleanup in the oracle adapter specs
chmod 644 source files
fix my email address
Revert "Simple build process"

Beeing able to compile is a nice feature to have ;)
This reverts commit 9c52f0345414c2bbbbda54e41cd868db073f44ca.
ignore *.o files
do not include compiled binary
updated REST file
major cleanup
roxygenized
before new home API
github authentiation works
github authentication + config
moved detach commands to earlier in the process
unlink bug
install user packages
userstore working
lots of stuff
switched from varnish to nginx
minor fixes
moved pages into lib
fixed some issues
some apps pages
updated user apps
nginx
small fixes
cron eol fix
Added Todo tools
Add multiple and all delete options, and routine to get count. Improve GTK+ versioning
Fix packing error in julia_pixbuf and selection error in hl_list1
Merge pull request #9 from jespino/master

Simplification and corrections on wiki section
Initial work on permissions.
Work in progress on permissions.
Move static and remove old files.
Minor changes on requirements.txt
Permissions work in progress.
Minor changes.
Remove redis cache stats url.
Fixes on project forms.
Work in progress.
Messages system reimplemented with backbonejs views.
Remove file.
Work in progress (new test case)
Minor changes on permission module.
Bug fixes on generic view. Related with permissions.
reference.md: Github not rendering pound sign (workaround)
First pass as parameterising the whole of the XSLT library on string_type is done
Update home-timeline function

skip_user has been axed from the twitter API,
use trim_user
nametab script
updated z
Added 86px icon for BlackBerry
adding a very simple skip log for skipped commands
Adding several Installation Pages
Adding S3 and Chef Pages
Update library set
Processing 2.0a8 -> 2.0b5
Add ProScene 1.1.93
Checkpoint
Added helper routines to extract CHARMM cards and mol.list from HDF5 database
Fixed some bugs in Firefox and some heading styles for regular pages.
Merge branch 'release/0.0.4' into develop
don't try to convert unidata record to model instance when record doesn't exist
Version Bump
Merge branch 'release/0.0.5'
adding viewmodels
implement message parsing
Start implementing ExecutionContext.
Refactored Matcher into a separate file.
I think I might actually be getting somewhere.
Merged the change to project name.
Add tracing routines.
Enable Trace measurements in tests.
g
a
a
a
a
Justin's MS1
Justin Branch done
Justin Branch done1
Commit-nisarga
Commit-nisarga
Justin Try to merging
Merge remote branch 'origin/nisarga' into kex-develop

Conflicts:
	pom.xml
	src/main/resources/hellobioqa/hellobioqa.yaml
	target/classes/hellobioqa/hellobioqa.yaml
Merge branch 'shangqiz' into kex-develop

Conflicts:
	data/oaqa-eval.db3
	pom.xml
	src/main/resources/hellobioqa/hellobioqa.yaml
	target/classes/hellobioqa/hellobioqa.yaml
Merge branch 'Justin' into kex-develop

Conflicts:
	data/oaqa-eval.db3
	pom.xml
	src/main/resources/hellobioqa/hellobioqa.yaml
	target/classes/hellobioqa/hellobioqa.yaml
change in the behavior of the reporting function
add autodependency for edbind
added search feature for building search.
Merge branch 'master' into Kevin
Push after merge.
Search ushahidi instance using bbox, a couple more things need to go in here, atom feeds for the search, dealing with several ushahidi services, and flags for between osm and ushahidi
german translation changes
add storage account
Make Twitter::Status#full_text safer
Add travis build status info to readme.
setHeader method introduced allowing runtime setting of HTTP headers
Auto-update: 19-Apr-2012 16:49:51
JoelDroid 1.3 Settings.apk changes

Changed Branding in Settings.apk
Added server email to the settings
Add 'Add button' icon to action bar
Merge branch 'sprint4' of github.com:johanbrook/watchme into sprint4
Added drmaa jobrunner reqs to AlignWithBwa
Tried to explain rebasing

All concrete examples are in italics. I want the text to be understandable
without the examples though.
merge
merge
added csrf-tags worked on slideshows
Merge branch 'master' of github.com:johdirr/SlideCloud
solved merging conflicts
section min-height change
css bug fix
Added GetCount to Async List and LinkedList
Implement focus
Add a CSS injection to override WebInspector styles
Guests list.
About to change name
CreateAssemblyViewCommand.as

Signed-off-by: johnnyeven_home <johnnyeven@gmail.com>
Updated all_instr.asm
Fixed form showing
- rename :env to :environment_variable for the public interface.
  This keeps consistency in naming (:attribute_name is long-form, so
  :environment_variable should be as well) (#19)
mdificaciones en la validadcion de los calculos
bugfix equals code gen
First pass at object browser - prints non-interactive tree
Merge branch 'ruby8-object-browser'

* ruby8-object-browser:
  First pass at object browser - prints non-interactive tree
Expose to the app if the device is rooted
Don't allow advanced mode if device is not rooted
By default don't show symlinks
Made escaping a little less zealous, as per the roadmap.

You may still want to test various combinations, however; the set of
escaped characters may need some extending. Also fixed small spelling
mistake in roadmap.
I made a mistake. Also added minified version.
Merge pull request #3 from minitech/master

Made the escaping a little less zealous, as per the roadmap.
Added PayPal functionality to pull customer info
Continue putting output on single line.
reset config for db
Fixed View Controller to be correct type
Fix the unread count issue noticed by Drew.
Add building channels for Windows and stubs for clipboard reader.
cache root count to RGB calculation
test after build
no test host (testing)
put test host back.
non-fail test.
only let coverage report get built once
Removing unneeded files and make download builder work in IE
Changing the images.
Added NMEA grabbing and polling
Autoconf, Automake and Libtool

We need these now for Xcode-4.3/CLT4X installations.

Also prevent m4 error in installer. And prevent brew doctor complaining if we're Xcode 4.3 or above.

Closes #10349. Fixes #10423. Refs #9179.
depends_on "automake" where necessary

Had to remove full paths, since we have two options for location now.
Set ACLOCAL_PATH so that things work

This should mean all those formula that pass options to aclocal don't need to anymore, but I'm not risking changing them.
Do not edit code as popular as Homebrew at 4am
atlassian-plugin-sdk 3.8

Closes #10516.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Add gettext bottle.
Force GCC-LLVM when compiling with the Xcode 4.3+ developer tools

Closes #10519.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Fix typo in libmikmod

Closes #10528.

Signed-off-by: Max Howell <max@methylblue.com>
automake: update to 1.11.3

Closes #10520.

Signed-off-by: Max Howell <max@methylblue.com>
Put dirlist in the right place

I fixed this last night, and then somehow committed the wrong version. Don't watch the Oscars while doing Homebrew.
Force autoreconf to use glibtoolize and not libtoolize
Fix fuse4x autoreconf errors

Also removed the ENV vars since we set this stuff higher up now, and it compiled. So I'm guessing we're good.

Closes #10524.
Pass configure since Xcode 4.3

Refs #10508.
libvpx: determine correct build target

Adjust the formula for libvpx to determine the correct target.
This was tested on 32bit and 64bit Snow Leopard 10.6.8 using
all three compilers from XCode-4.0.2, and it was tested on Lion
using both compilers from XCode-4.2.1 and 4.3.

Closes #10249.
autogen 5.15

Fixes #9651.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Add mirrors to new autotools formulae

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Use cellar paths in tests

This lets `brew test` work when these are keg-only, etc. Also fix a
couple of typos and style things.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
recode: help the linker find libiconv

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Removed code duplication from Batsir::Config
增加Util类
Reinstate building
Features:
	Added DebugBar which, when enabled, displays at the bottom of each loaded form and provides a link to the underlying DataDocument.
Other:
	Changed FormFlow.flowId to a String.
	Now reusing a single instance of FormParser and RemoteSubmissionHelper.
Add automated tests w/ Guard and Spork
Revert "FoBo integration done."

This reverts commit 00876f4833e9320bc555783ade4a957f37b298f4.
if given $options->{log}, will display it along with message stating that spawned program failed
Added shell escaping to test runner
[Zend\Uri] Changed unreserved char definition a match RFC-3986
巡检点和巡检项的修改
主界面的修改。使用xPanderPanel 和DockPannel。修改刚刚进行。何芳丽同学要合并
界面
主界面
巡检项修改继承
巡检点项，修改好
巡检项 修改成功。下一步。界面开始
界面功能之初步完成
Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/Properties/licenses.licx
	Application/WorkStation.csproj
	Application/frmItem.cs
	Application/frmMain.Designer.cs
	Application/frmPlanExamine.Designer.cs
	Application/frmPlanToTask.Designer.cs
	Application/frmPoint.cs
	Application/frmReportAnalysisByEmployee.Designer.cs
	Application/frmReportAnalysisByEmployee.cs
	Application/frmReportAnalysisByEmployee.resx
	Application/frmRoute.Designer.cs
	Application/frmRoute.cs
	Application/frmRouteNew.cs
Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/Properties/licenses.licx
	Application/WorkStation.csproj
	Application/frmItem.cs
	Application/frmMain.Designer.cs
	Application/frmPlanExamine.Designer.cs
	Application/frmPlanToTask.Designer.cs
	Application/frmPoint.cs
	Application/frmReportAnalysisByEmployee.Designer.cs
	Application/frmReportAnalysisByEmployee.cs
	Application/frmReportAnalysisByEmployee.resx
	Application/frmRoute.Designer.cs
	Application/frmRoute.cs
	Application/frmRouteNew.cs
SWITCHYARD-1184 Modularize switchyard-test
SWITCHYARD-775 Add quick start for camel-jpa

Conflicts:

	pom.xml
SWITCHYARD-1158 Quickstart demonstrating the usage of Camel AMQP

Author: Eduardo de Vera <eduardo.devera@zimory.com>
Signed-off-by: Lukasz Dywicki <luke@code-house.org>
[SWITCHYARD-1100] - Enabled endpoint address override in camel-soap-proxy QS
SWITCHYARD-1213 Split camel bindings into separate modules.

Signed-off-by: Lukasz Dywicki <luke@code-house.org>
Lab 7.5
Tweaking View path.
Make our own copy of the categories sidebar based.

The one in ding event had some logic regarding the path that didn't
mesh well with our three-way filtering.
setting weibull distribution
Disabled lead dumping as it reports many false positives.

Signed-off-by: Kristian Duske <kristian.duske@gmail.com>
fixed line breaks for dkim
Solution to an issue I had with DNS and Avahi.
移动版修正
adjusts .zshrc
Snapshot updates for build version refactoring to better support pattern changes.
Add: Base dialect compiler object

This base dialect should be fairly reusable in terms of compiling
the individual query elements. This allows additional dialects to
extend the base and only overwrite the elements that don't match.

Overall, this should be a useful addition to the project.

Signed-off-by: Kevin Conway <kevinjacobconway@gmail.com>
changed range of count
minhand
another try
Merge branch 'master' into deploy
Dodawanie gatunków, platform i developerów
bar graph v0
postgres db!
fixes
Merge pull request #3 from martin-horvath/master

fixes
added note on dependencies
No longer a dependency to EventEmitter
Expose Simple.Events
Improved comments on events
Allow URLs to be defined with a function
Add local events to Simple.View
Add changelog
Site updated at 2012-05-05 01:17:10 UTC
testing has_draw
[slist] stamped out basic functions

* stamped out the basic functions that slist is going to provide
[slist] implemented new slist functions

* implemented steel_slist_insert_head
* implemented steel_slist_insert_after
[build] Made cmake commands consistend
[dlist] Fixed comment

* Fixed a commend about which #ifdef was being closed in dlist.h
story_view now takes a category in the html location  string
Kevin - Deleted matts crap
Kevin - deleted crap
Merge remote-tracking branch 'origin/master'
for ehroku
unicorn
gemfile
asdfads
latest 9/1
added embers as a basic fronted start
remove uncompressed ember file for now
Make basic user model
Finish user signup
add SSL in production
Revisi III

Signed-off-by: Ahcha <ahcha@Ahcha.(none)>
Added .gitkeep to sencha_app directory
Fixed string.h include resolve - 2
Fix order confirm issues
xml parser begin and load from file
starting book test
better handling of different plugins/handlers
implement import command
Trivia bugfix
skip test_gc in s_x_x
more glEnable/Disable emulation ignores
nicer browser test harness text
re-enable parallelization of js optimizer on windows
Image and URL support in shell replay
Keep all includes in the util folder
Resolved minor issues with data pulls
Mms change to stop the removal of notifications
CM kernel update
repo sync 7-2
Remove unsued items
Enable uploadify
Fixing minor issues
Strip trailing characters from mspgcc
echo_sock
ping.c
Evaluate jabbernet client code (broken for now).
new application help command
JASocket applications are really protocols
Merge pull request #23 from laiam/UserInterface

User interface
Update src/librecatalog/Item.java
Update src/librecatalog/Item.java
Update src/librecatalog/Item.java
Update src/librecatalog/UserInterface.java
Update src/librecatalog/Item.java
Update src/librecatalog/UserInterface.java
Update src/librecatalog/UserInterface.java
User Interface updates.
User Interface updates.
User Interface updates.
Update src/librecatalog/Item.java
Update src/librecatalog/UserInterface.java
Merge pull request #29 from laiam/crossdavidl

Crossdavidl
initial commit with wordpress and simplesamlphp
slime-annot add
Merge branch 'master' of github.com:lambdasakura/emacs
added db init data
model单独定义
删除原来的models定义
Tidied whole project folder
Secure less byte request without HTTP Referrer, http://wiki.whatwg.org/wiki/Meta_referrer
[maven-release-plugin] prepare release hw2-team04-0.0.80
add readme

test03
Adding description of changes made to the file "README"
Added the time moment
added a primary key to ORDERS table
Use new functions appendToGlobalCtors() and appendToGlobalDtors.

This simplifies the code in module.cpp a bit. But it is also the base to implement a pragma to place an arbitrary function in llvm.global_ctors and llvm.global_dtors.
Fix size returned by os_critsecsize() and construct type for D_CRITIAL_SECTION on Windows.
config do pacaur
initial files for a POC of web client
client concept site for checking the different file types
client concept now works offline from src
client serving app set up - not tested yet
config changes that now run
now serving svg images as well
Merge remote-tracking branch 'origin/web_client'
Merge branch 'release/0.9.3' into develop
fix rebar.config
Change version of libs
Replace a function from proplists to leo_misc
Change version
Merge branch 'release/0.9.4'
vimrc: relativenumber only since vim 7.3
map view with cities implemented
map view with cities implemented
Rather obvious optimisation.
Kohana coding style fixes.
Merge pull request #8 from levymetal/layout_tweaks

layout tweaks
Testing .aliases
uv export on unix
fixed a mistack
add css_color
add custom xsl file.
[window-list] Add move-to-monitor menu items. Refactor the menus to be populated on demand.
[window-list] Window-list should not call Main._checkWorkspaces.
Merge pull request #1295 from autarkper/window-list-menus

[window list] Overview of menus. Add move-to-monitor menu options.
Revert "Menu applet search: don't use app id for pattern matching"

This reverts commit 06ec39f0325d5069e06114338b2c1b93b4a9d5f0.
bugfix: can not update host_status in some cases
do some thing to multi_user_game
bookmark url for profile
add 8 filters
Constraining type of People.parent at least a little bit, to ModelObject.
(Its index.jelly does assume getDisplayName is available.)
[FIXED JENKINS-15226] Log recorders do not work reliably.
Merge branch 'master' of github.com:jenkinsci/jenkins
testValidateAntFileMask
[FIXED JENKINS-7214] FilePath.validateAntFileMask too slow for /configure.
linking to subprojects
Добавлен проект Sublime
1.4.5 Update

Updated mod for 1.4.5. Added a proxy, entity now renders properly in
multiplayer.
Better notification function
added some style overrides.
removed array and string prototype extensions
EventCommentMapper::getCommentById() should return false when a comment is not found
TalkCommentMapper::getCommentById() should return false when a comment is not found
TalkMapper::getTalkById() should return false when a talk is not found
removing spurious changes from .htaccess, committed in error
sounds and sprite cleanup
fixed mem leak in linked list
Another attempt at linking + iframes
AO shader cleanup
server works
Merge branch 'master' of github.com:lsankar4033/Papako
small database
Change MacVim font size and line spacing to match Terminal
#6 upgrading lucene version
#6 updating lucene index version and creating a new searcher on every demand
fix small file size reading problemns
Userinterface preparation
starting position can be edited
- Add method for creating database table.
- Make generic backend op functions, and reimplement the current json
  create,delete,modify,read as BackendOp.
[zsh] Enable dot expansion
Enable "stat" ZSH module to get the zstat builtin
[zsh] Enable zmv function
Ask for forgiveness instead for permission
added function to remove operations
Update HelloGit.txt

Pull git
random cell test
Refactor 'Carrer' to 'Carer'

Mass typo
Include mssql db

Username: Test:test123!
Added role: Doctor
Added support for passing in custom data in the options when creating a new URL. This will store any meta-information on that URL that you might want to track. A possible use for this would be an ecommerce store with a shortened URL, but you might want to track that this URL was generated for a specific micro-site or even a specific customer.
covering reloading race
プロフィールページを一部作成
event echoing
Atualizando POM.XML
2nd commit; fixed looking at
Changed message syntax
Fixing bullets on readme
image removed
list formated
change
leftovers from yesterday
creating udp stuffs for broadcasting shiet
added UDPsend and receive to broadcast messages.
some more work on the communications part.
git status
smoothing output signal TODO:triangular wave polish
Removed no-longer-relevant debug message
fix session var
fix some youtube issues with filenames
added javascript extension
Fixes <base> href in demo
Merge branch 'master' into gh-pages
Fix mapcache_http_clone()

Fixed the allocation size to be the size of the allocated object
not only the size of the pointer to it and copy the connection_timeout
member too.
Merge pull request #44 from aeichner/d47e7de9f787f5b3c4835598162c7b489bc8b7d1

fix cloning of http structure
- BpmnDeployer: log which deployment is being processed.
- JuelExpression: exceptions now include the expression that caused the problem.
- SerializableType: fix spelling error in exception message.
added templates and logins
move os-specific stuff to zshrc
add hglu alias
Updated BaseString
+ modul: fontyourface
+ basic theme stuff (z.b. less-file einbinden)
Try not to send duplicate tweets
add caen waveforms to websnoed
Explode method is no longer for TNT only. If anyone else wants to explode (eg. creepers, beds in nether, griefing plugins) they just need to use Explosion::explode();
Merge branch 'master' of github.com:mat8913/mineserver
TNT when hit: creates primed TNT entity, waits 4 seconds, removes primed TNT entity, explodes.
Add source dir to CDPATH
caught a few others
cleaned up and added a filter
Added license headers to each file
Merge branch 'master' of github.com:matthagy/PyLJFluid
Added reference tests for the QuickStart examples.
Merge branch 'master' of git@github.com:cylc/cylc
first work
Fix hold-on-startup bug
Merge branch 'master' into gcontrol_fix_hold_on_startup
change title
Restore suite example
Merge pull request #130 from benfitzpatrick/gcontrol_fix_hold_on_startup

gcontrol fix hold on startup.  Closes #125
Merge pull request #129 from benfitzpatrick/gcontrol_runahead_host_status_bar

gcontrol - indicate runahead and remote host (if any). Closes #102
Updated change log.
Display an overlay while recording
- Improve messagelist (and headers-table) header


git-svn-id: https://svn.roundcube.net/trunk/roundcubemail@6001 208e9e7b-5314-0410-a742-e7e81cd9613c
XMLRPC: In mw_newPost check to see if the post_status has been supplied before trying to use it to avoid undefined array access notices. Fixes #19774 props maxcutler. 


git-svn-id: http://core.svn.wordpress.org/trunk@20323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Allow wp_update_post() to accept the same second argument as wp_insert_post(), allowing for WP_Error return values on failure. props scribu, mikeschinkel. fixes #15036.



git-svn-id: http://core.svn.wordpress.org/trunk@21213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Increase the z-index of widgets so they don't appear behind menu portions while dragging. props jkudish. fixes #20300

git-svn-id: http://core.svn.wordpress.org/trunk@21214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Remove deleted files on upgrade, including wp-app.php and class-wp-atom-server.php.

props duck_
see #22855
for trunk



git-svn-id: http://core.svn.wordpress.org/trunk@23203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Correct the deprecated notice in AtomPub's deprecated class. see #22855.



git-svn-id: http://core.svn.wordpress.org/trunk@23204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Show plugin activation message when activating a network only plugin on a single site installation.

Props nacin
fixes #22576


git-svn-id: http://core.svn.wordpress.org/trunk@22871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Always send nocache_headers() for admin-ajax.php. This prevents iOS from caching ajax calls. http://stackoverflow.com/questions/12506897/is-safari-on-ios-6-caching-ajax-results

Turn off multi selection uploads for mobile devices. Currently Plupload cannot upload multiple files in iOS Safari. Only the first file makes it to the queue. 

Empty wp on unload to work around caching in iOS Safari.

Props azaozz, miqrogroove, nacin

fixes #22552


git-svn-id: http://core.svn.wordpress.org/trunk@22872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
More design tweaks
Merge branch 'master' of github.com:mayhem/spotibrainz
Tweaks to the constructors
Some work on the session stuff for install
Add the new templates to the update script.
[#29048] Update Joomla 3.0 to Bootstrap 2.1 LESS, CSS & JS
Consolidate tooltip loading
Remove tooltip, devs can render themselves
Rename loadTooltip to tooltip for consistency
Move popover method to Bootstrap
Add JHtmlBootstrap::framework(), modify JHtml::includeRelativeFiles()

Add conditional in includeRelativeFiles to check for files in format name.min.ext
Add framework method for jQuery

Added JHtmlJquerybehavior::framework() method, added dependency to JHtmlBootstrap::framework(), added Bootstrap dependencies to other methods
Finish implementing frameworks, use them
Need to load noConflict directly after jQuery
Add support methods for most Bootstrap JS plugins
Fix the relative files change
Load the helper methods in install
Quick icons depend on jQuery, remove hard coded load in Hathor
Rename jQuery helper, some dependency management
Improve loaded checks
Repackage jQuery UI
Update unit test suite
Modify method caching for jquery.ui
Fix for caching and file names
CStub: test5  if bug includeTest fails on teamcity solved
some fixed is build scripts
Made the README mo betta
Basis incremental fitting.
Add `from` scope with specs
fix spec
Merge branch '55minutes-master'
add tests from folder branch and add missing tmpdir dependency
trying to find better names...
Add Matt Brictson to contributors, thanks for the patch!
bump version to 0.1.11
add documentation for from
Fix exception in some cases when `from` nested within `folder`

Consider a one-argument call to `folder` or `file` used within a `from` block, which itself is nested within a `folder`, like so:

```
folder 'vendor/assets/javascripts' do
  from 'https://github.com/harvesthq/chosen.git' do
    folder 'chosen'
  end
end
```

In this case `folder 'chosen'` is a shortcut for `folder 'chosen', 'chosen'`.

However, due a bug, this was incorrectly being interpreted as:

```
folder 'vendor/assets/javascripts/chosen', 'chosen'
```

As a result, an exception would be thrown:

```
'vendor/assets/javascripts/chosen' not found in https://github.com/harvesthq/chosen.git (RuntimeError)
```

This commit fixes this bug by preventing the folder block from affecting the source path. It still affects the target path, as intended.
Merge pull request #13 from 55minutes/implied-src-within-from

Fix exception in some cases when `from` nested within `folder`
fix tests failing on osx
bump version to 0.1.12
nasm/MacOSX working
Merge branch 'master' of github.com:mcandre/scriptname
Revert "MDL-32880 - Trying to use convert API in specific block instance."

This reverts commit 1012e75e1d018d761eb0c551c5fed05e372376f9.
Added command line options to extract and localize 3dm files.
Localization doesn't work because layer name changes are not saved in the file.
Revamped Program.cs to allow both extract and localize options.
The two possible calling methods are:
localize_3dm.exe -action:extract -3dm:MyModel.3dm -xml:ExtractedStrings.xml

localize_3dm.exe -action:localize -3dm:MyModel.3dm -xml:LocalizedStrings.xml -targetDir:PathToOutputFileDirectory

localize takes a target ouptut directory instead of a output file because the output filename is embedded in the XML file so translators can translate the name.
Removed the weird character from AGTS
many new supplementary functions for parsing and reporting fsf_files
added multithreader
refactoring query string to not be super brittle
building static assets
MANY changes to fix tests (at least on Linux):

- No more dependency on filemanip
- Added CPP defines for OS type in test package
- Bug fix: FSNotify was calling listen (wrong) instead of rlisten (right) in recursive case
- Linux code refactored to retain canonicalized base directory for file notifications (allows events to store fully canonicalized file path)
- Some commented-out tracing code included in Linux module
- Path canonicalizing in Path module now slightly more elaborate
- Added note-to-self that Windows still needs to be tested for canonicalized paths in reported events
- Added more system-level test cases for FSNotify
- Added more Path module test cases
- Test Util module now uses an MVar to store the latest test result; this allows for outputting the latest result on timeout
Trimmed some fat and fixed a few bugs
Established the Reporter interface.
修正补全了模板
resizable可以使用了

Signed-off-by: Meathill <meathill@gmail.com>
事件还有点问题，bootstrap用侦听body.click的方式来触发下拉菜单，和我常用的会时不时的小冲突下，得再改改
修复了bug，开始做菜单

Signed-off-by: Meathill <meathill@gmail.com>
完成调试
现在css也会编译了
added a few more fields to data records table template. fixed close bug that stick a hash in the url.
Updated getForm to return undefined if the format is not recognized, and
included it in a couple tests.
Fixed default getCallbackPath handling, so we generally return the db
path to save something.
Mainly if smsforms[form].data_record_merge is not present we use appdb
for path.
Added junk_form test.
Shuffled around some debug statements.
wp-setp.php の修正
layout: some layouts improvements
pptx Generation with 3 layouts done
finalization
add 1.8.1 upgrade tests

Change-Id: I407cf1f6407f5b00d634b5dacdce7ed279b21b0c
Reviewed-on: http://review.couchbase.org/14367
Reviewed-by: Keith Batten <kbatten@gmail.com>
Tested-by: Keith Batten <kbatten@gmail.com>
Added mixed suv 4-8

Change-Id: I6fe59bb8160ec6387a6d5a3c9f8a6f201e6ebce8
Reviewed-on: http://review.couchbase.org/16036
Reviewed-by: Ronnie Sun <ronnie@couchbase.com>
Tested-by: Ronnie Sun <ronnie@couchbase.com>
bug with js in repositories controller fixed
Update _config.yml.

Add Github and twitter 3rd part config.
Locked state should be networked beetween clients
Fixed errors, when LocalPlayer is NULL

It appears to happen on the first frames when playing in a server
Added WScoreBoard, separated HUD to its own file
ajustes
incidencia mostrando
Tweak JSON search logic, improve error handling
Some changes
merged
Minor Aesthetic changes
WIP: allow injection of services into directives directly
fix(document): accidental clobbering of document.getAttribute

Closes #877
chore(logo): added angular shield logo
Nova verzia Qt
Merge branch 'master' into adaptiveFloodFill

Conflicts:
	Makefile
remove ambiguous whitespace
Update of metadata details.
I think all thats left with the server recipe is to rename it.
client configuration search now uses an attribute to search for a role that your collectd server should have. If that search is empty the log will have more relevant details.
enable or disable fqdnlookup through attribute. update attributes to reflect other updates. change ordering on entries and remove ambiguous whitespace.
Update directory attribute names and values. add fqdn_lookup and server_role with appropriate defaults. Update checksum for source tarball to sha256 as ark and chef use that. reorder entries.
Update notify to use new 0.9.10+ syntax. use attributes instead of hardcoded path.
drop un-needed directory resources. removed service details. updated package resource to install collectd
Add autoconf_opts to ark resource. we still need to run configure before this will work. I need to determine best way here. add build-essential inclusion
set up collectd as a standard service.
ignore vim swap files.
runit support
Add name to metadata.
remove collectd_web apache configuration file.
Added the CMakeList files provided by Filip Brcic <brcha@gna.org>.  Thanks!
replaced the old code with my current version made in MoreTestsOnMobileMap.

Signed-off-by: Joe Ross <jsross11@iastate.edu>
Initial resolution refactor work
update squid
added new fuctionality in profile editing
fixed enrollment problem on list pages
First commit
Merge https://github.com/mikechau/kurotrade
Updated TTT namespace on minimax_players and player spec
Add a StaticPages controller
Finish static pages
Change to Postgre SQL
Add a full_title helper
Finish layout and routes
Changes from chapter 5 exercises
Misc boring tweaks to templates
Implemented detail views, with most appropriate related entities,
for Collection, Repository, and Authority models. There is still
lots and lots of scope for refactoring to remove code duplication
and running asyncronous Neo4j requests in parallel.
Set the name as a separate step. [GH-669]
Uncolorize puppet server output since it does it for us [GH-685]
Call xpg4/bin/id on Solaris [GH-679]
Add missing translation for chef binary missing [GH-687]
Fix some puppet translation
add vbox driver support for creating transient shared folders
More accurate VBoxManage error detection.
Merge pull request #688 from schisamo/transient-shared-folder-support

add vbox driver support for creating transient shared folders
Update CHANGELOG
Change middleware internals to make plugin lives easier [GH-684]
Registry will now cache result values.

This is actually required so that we can do things like this
in plugins:

Vagrant.actions[:up].insert(Foo, Bar)
v0.9.4
Update version for dev
Fix crashing issue when all networks don't aut config [GH-689]
The type of nic can be set for bridged network.

:nic_type can be specified in the network bridged type. Its value can
be Am79C970A, Am79C973, 82540EM, 82543GC, 82545EM, virtio.
Update changelog for GH-690
Allow user to choose NFS protocol version, defaulting to 3

NFSv4 has siginificant added complexity in the form of ID-mapping which
can cause problems with applications without extra setup. Best to
force version 3 unless the user requests it.

Conflicts:

	lib/vagrant/systems/linux.rb
Update CHANGELOG
Fix some issues with NFS version selecting
Select NFS version with :nfs_version