labofsahil/github-event-dataset-2012 huggingface dataset:
Remove j alias for ERB::Util.json_escape
AR::Relation#model would be a better API than AR::Relation#klass
Document default_options configuration in ActionMailer guide [ci skip]
Add extra documentation to the locale file.
Refactored common date and time calculations.

* Added the `DateAndTime::Calculations` module that is included in Time
  and Date. It houses common calculations to reduce duplicated code.
* Simplified and cleaned-up the calculation code.
* Removed duplication in tests by adding a behavior module for shared
  tests. I also added some missing tests.
edit of previous content
 explains how to add/override engine classes in the main rails app via
1) Class#class_eval
2) ActiveSupport::Concern
AM::Validation#validates: ability to pass custom exception to `:strict` option
Update list of finder methods
For adding non css/js files to precompile array
Fix #7191. Remove unnecessary transaction when assigning has_one associations.
add around_create callback documentation for ActiveModel::Callbacks
use a sized buffer to prevent the queue being too large
introduce default_headers config
some tests
Document the namespacing of controller actions per this discussion:

https://github.com/rails/journey/issues/40
initialize instance variables
Merge pull request #7302 from homakov/default_headers

Introduce default_headers. closes #6311 #6515
switch callbacks to minitest hooks
refactor the before_setup hooks to a module
push drawing once to it's own module
Merge remote-tracking branch 'apache/trunk' into trunk
Merge remote-tracking branch 'origin/trunk' into trunk
Update testdoc.txt.txt
Mutable hash tables and plists
Plots:
	new file:   Data1_Nevents.jpg
	new file:   Data2_Jbars.jpg
bookmarks.
Add aleksei-org-clock-time-to-float.
Remove watchr integration.
Remove roetags.
Remove watchr-related functions.
Add resetrails before be guard to allow start guard by last accessed emacs even
when some other guard is already run.
Change desktop-after-read-hook to add  'tags' and 'gems.tags' files to
`tags-table-list' if available.
Add customization for org-habit's graphs.
Add 2combinators context to gtd, configure LOGBOOK for clock entries.
Remove TODO state from default capture template.
Change browser for ffap and other packages.
Add mapping for ActiveAdmin and Formtastic for ruby-test-mode.
Add mapping for routing tests.
Limit snippets to which I really use.
SPEC file skeleton generation
DinnerTyme1
cerevoを特別協賛に追加
Implemented ADD/SUB with tests.
Merge branch 'master' of github.com:huin/dcpu16go

Conflicts:
	src/model/operation.go
Update stock-trade/src/main/resources/database.properties
add 100x100
Merge pull request #190 from havocp/application-global-config

Change the config option from 'global' to 'application.global' to match docs
Merge pull request #186 from julienrf/lighthouse-254-patch

Add a CacheAPI#remove method
Merge pull request #185 from julienrf/lighthouse-245-patch

Fix java helloworld sample template
Merge pull request #163 from julienrf/boilerplate-context

Provide a shorthand to retrieve the current Http.Context from templates
Merge pull request #142 from julienrf/plugin-init-exn

Better error reporting when the initialization of a plugin fails
Built-in BigDecimal Json serialization/deserialization
Fix PathBindable[Boolean]#unbind
add syntax highlighting to README
remove JsObjectWrites since it's not needed anymore
More understandable error message for value definition of parameters
extracted from path [fixes #138]
fix root logger in empty skeleton [fixes #194]
Merge branch 'lighthouse-230-patch' of https://github.com/julienrf/Play20
Merge branch 'sbt-plugin-settings-fixes' of https://github.com/freekh/Play20 into issue200
Merge branch 'cleaning' of https://github.com/julienrf/Play20 into housecleaning
[fix lh 263] and the previous pull request. New logic: we check for application.global for global class, fall back to global key with deprecation warning, if nothing works, use Global. Also improve error message
[#191] Akka should use application's configuration, not load it's own
no actors needed for redeeming promises
removed promise actors configurations, only dispatcher is necessary
make sure http.port sys variable is respected both before and
after start/run

fix a typo too
waitAll for java
Changed code to use webapp2 routes, changes API error codes.
Removed redundancy in the README
added haml-js
158 Refactoring
add product sort
Don't exit when there aren't any Rapns::App instances, just warn. Fixes #55.
Make change, run specs, see failures... forget and commit anyway???
v2.0.4
Merge branch 'master' into gcm

Conflicts:
	.gitignore
Little more work on GCM.
Build status badge is for master only.
Command Finder: keep selection intact if possible

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Command Finder: show a sortable table

This changed the JList into a JTable, avoiding the "show full information"
checkbox. Thanks to Java 1.6, this also allows users to order by the
different attributes commands can have.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Command Finder: adjust columns; render icons

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Command Finder: show .jar file, too

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Command Finder: execute first item by default again

It was a feature Curtis Rueden wanted to keep that clicking the OK
button executed the first listed command when no command was selected.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Command Finder: make label column wider

Desired by Curtis Rueden.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge branch 'command-launcher'

The Command Finder (AKA Command Launcher, hence the keyboard shortcut
'Ctrl+L') showed a lot of information when the checkbox "Show full
information" is checked.

Let's show them in a sortable table with columns for ease of use.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add grayscale conversion code

During type conversion grayscale images are created whenever the image
has a composite channel count equal to its total number of channels. The
conversion simply averages the existing channels (and thus weighted rgb
conversion is not supported at the moment).
ObjectIndex: add toString() method for debugging
ObjectIndex: use base class for getAll()
ServiceIndex: add a very simple unit test
Improve ObjectIndex documentation
ObjectIndexTest: fix expected/actual assert order

This commit also uses assertEquals and assertSame where appropriate
instead of assertTrue with equality tests.
ObjectIndexTest: add another check to testGetAll

This tests an intermediate layer (Number) of the type hierarchy.
wip: Priority.compare is not a total ordering!
added basic composer.json
various tweaks to composer
Adding Composer support
[FIX] Unavailable msg -> made it more general

 * opened #1115, which aims at providing a specific explanation on a case-by-case basis;
[FIX] Facebook "comment" pop-up - hide it
[IMP] Added BCC capabilities to GenericMailer
[IMP] New WLCG logo and style
[FIX] startHeight used before assignment.
[FIX] 'Booked for' user cannot cancel occurrence
[FIX] Do not force version in webassets

 * `webassets==dev` causes dependency problems;
[FIX] Email body format function (parentheses)

* Fixed missing/unclosed parentheses bug
* Unit tests
[FIX] Qtip display when converting material to PDF

* Fixed missing conversion URL object to string
[FIX] Changed translation method from i18n to _()
[REF] Changed name of permissive format
[FIX] Missing JS/CSS in author index

 * see #1066
Merge branch 'v0.98-series' into v0.99

Conflicts:
	indico/MaKaC/common/mail.py
	indico/MaKaC/contributionReviewing.py
	indico/locale/en_GB/LC_MESSAGES/messages.po
	indico/locale/es_ES/LC_MESSAGES/messages.po
	indico/locale/fr_FR/LC_MESSAGES/messages.po
	indico/locale/messages-js.pot
	indico/locale/messages.pot
[FIX] Email to speakers body format (permissive)
[FIX] Issue in chained pop-up menus

 * Affecting IE9;
[FIX] used set instead of Set contrib author list
[FIX] User abstracts to PDF not logged
[FIX] Session slot no access key
[FIX] Referee contrib list status
[FIX] Abstract modification js error

- Closes #1112
[FIX] Fixed issue - non-capable rooms

 * Contribs are ignored;
block: hot fix
added participation conditions

not pretty, but meh
Fix issues with presentation of null-chains of reference
More attempts to fix query cloning.
SCC w/tarjan
Dynamic links to page / article inside content (from tinyMCE "link" plugin)
Updating demo in gh-pages
Trying to fix encoding problem in index.html
Force UTF-8 enconding of index.html
Fixing display and dom ready-errors
new home view ui
Adding jackson example project
we bulge open source
Merge branch 'master' of github.com:j-v/FaceBulge
Adding the target code
ENH: no more mention of promising in lfw protocol
Refactor code to incorporate pushStyle and popStyle methods
adding readability api section
init event in the applet
corect generation of emma reports
update guava version number
removed unused utility functions
don't start epmd, it might hang up eclipse
add composite repository tool
Distributed debugging options
add BackendData.isinternal property
remove RuntimeInfo.managed (is irrelevant)
remove RuntimeInfo.loadAllNodes (irrelevant)
remove RuntimeInfo.console (irrelevant)
remove RuntimeInfo.workingDir (irrelevant)
simplified runtimeinfo codepath -- can only use -pa
move getCmdLine from RuntimeInfo to BackendData
remove cookie from RuntimeInfo (irrelevant)
moved startShell from RuntmeInfo to BackendData
remove node name suffix from RuntimeInfo
move nodeName from RuntimeInfo to BackendData
remove longName from RuntimeInfo (irrelevant)
add createJavaNodeName(hostName)
Set redraw false in DebugTreeItem setCheck
disabled buttons, added comments
commented out currently unfinished code blocks
looking for the quit bug...
added license header
Uebung 3, Aufgabe 2 implementiert mit Kommentar
Fix JRE pattern as it's not picking up "name"

Thanks sverigedemokraterna-it
Add ability to show issues from any google code project.
better setup instructions
latest version of twitter bootstrap
use 2 space indent in js
migrate to new bootstrap and better login stuff
clock is now working
[maven-release-plugin] prepare release funk-0.1.14
Adding README.md and updating package.json
Adding README.md and updating package.json
point en plus
Removed .gitmodules.
Removed demos
Updated demos.
Merge remote-tracking branch 'upstream/ghc-7.4' into ghc-7.4
Added bulk state update to the pull module for updating passive nodes in an HA setup.
A very basic way to add questions, see Issue #4 for more info on this subject
internacionalização 100% de novo
Supporting asynchronous log functions.
Put should dependency into devDependencies.
Not catching thrown errors in logging function.
Added async test.
Added async doc to README
Added asynchronous logging support.
Merge branch 'async'
Added more exceptions. Improved type checking. Added more ATTRs to Poll.
Added process.env fallbacks for Windows

- Added process.env.USERNAME as a key fallback
- Added process.env.USERPROFILE as a root path fallback

Tested in Windows 7 Enterprise SP1
Fixed type
Merge pull request #3 from insin/patch-1

Added process.env fallbacks for Windows
Merge branch 'master' into private-key
arreglos de pagos
Merge remote-tracking branch 'origin/master'
Pagos - BIND DMZ (Cambio en presentation de estado).
Envio de mails - BIND INT (Ajustes de diseño).
cambios hook tarjetas
prueba de cheque
Merge branch 'master' of https://github.com/jcordero/bind.git
proceso de pago
Merge remote-tracking branch 'origin/master'
Update 0.Front_Matter/abstract.tex
Update 3.Proposed_Method/method.tex
Update 4.Implementation/implementation.tex
Update 5.Results/results.tex
Update 8.Back_Matter/CV.tex
Merge remote-tracking branch 'mike/patch-12'
Merge remote-tracking branch 'mike/patch-13'
Merge remote-tracking branch 'mike/patch-14'
Merge remote-tracking branch 'mike/patch-15'
↑5
Updated research plan for subquestions 3 & 4
Removed test_unit
Improve the README
Fixed JERSEY-1421.

- Fixed concurrent modification exception when accessing sub-resources concurrently.

Change-Id: I831c1ce5eedba7971861fc6c9d2094023e89906c
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>
JERSEY-1338: Added support for BeanParams.
	Patch2: Rebased.

Change-Id: I096e23d5f649dc9fde30df0cae1b073f7d805fda
Merge "Fixed JERSEY-1421."
Fix missing import due to merge conflict
altered view file structure
query memory leaks when query
initial load with CI
mapreduce matrix op
One more try on getting this work with homesick
Update comment to explain __init__ touch
HBASE-7436 addendum (missed change to test)
Eliminated all references to site_name and used 'bf' explicitly
Auto-update: 09-Jul-2012 14:13:30
Auto-update: 17-May-2012 13:07:43
Index and Admin usage determined
adding rotate registerSkin and registerComponent
Added ejabberd module
Added binary distribution of rebar, fixed typos in configure script
Configure script now prints debug information
Workaround for "missing egeoip record"
Module will use a static JID
Simplified compilation step, fixed lists:keyfind usage
Module now exports lookup_ip/1, ucfirst/1 and report_event/2/4
erlc include switch was pointing to a wrong pathh
Fixed parsing of results given by egeoip
Fixed broken paths in configure script
All operations should now happen inside a gen_server
export start_link/2, code_change is of arity 3
Install BSON module as well
Information about user sessions is now being stored into MongoDB
Fixed syntax errors
Parts of JID are now stored in separate properties
Strings have to be encoded with utf8 in order for MongoDB to store them propery
User's IP address isn't available after it closes the connection
Refactored doc_close_connection/3
Fixed syntax errors
Do only the essential laundry for now #4
Change serialization function for ember objects
Sizzle: minor change
* ADD: Added test cases that were missing for postgres
misc
Merge branch 'master' of github.com:jrnold/mcmcS4
Implemented strtoul.
ps: added leaderboard layout
ps: moved general style to application.css and stick footer to the bottom
ps: stick footer at the bottom for leader board
ps: cleanup leaderboard.css
added precompile true to production.rb
Working collection view
Edit and view pages
B60-ZK-1113: Add test case for B60-ZK-1113 in zkmax
Merge pull request #3 from VincentJian/B60-ZK-1113

B60-ZK-1113: Add test case for B60-ZK-1113 in zkmax
added the confirmable module
Amelioration du theme
Merge branch 'master' of github.com:jvoisin/iutbm
Adds two important things

1. A dealloc function to the C API

2. A FluidsStateVector to the Python API
Added support for centralized owner specific content storage
Collection binding working (for rendering at least)
update jquery & jquery-ui libraries
fix set_run
change r8/helper.rb
count device diff1 shares
Merge branch 'main'
Logic fail on queueing multiple requests at once. Just queue one at a time.
myname
icon
design
Added cohort manipulation
Merge branch 'master' of git://github.com/CeON/CoAnSys
Merge branch 'master' of git://github.com/CeON/CoAnSys
Merge pull request #43 from kawaa/master

Changes to make PigUnit test in document-similarity on Jenkins work
- building jar with updated dependencies; files needed for spring in META-INF directory
- acquiring AuditService to obtain logs
- include obtaining logs from AuditService to logs-analysis oozie workflow
Merge branch 'master' of git://github.com/CeON/CoAnSys
Merge pull request #44 from acz-icm/master

Acquiring AuditService
Merge pull request #45 from kawaa/devtools

Devtools
- (logs analysis) bug fix in choosing the biggest values
- (logs analysis) setting stat's date in configuration (for test only)
- (logs analysis) simple test of map-reduce parts of finding the most popular resources
Merge branch 'master' of git://github.com/CeON/CoAnSys
- (logs analysis) removed debugging println
Merge pull request #46 from acz-icm/master

Tests for logs-analysis - finding the most popular resources
- (logs analysis) dependencies needed for tests
Merge pull request #47 from acz-icm/master

mrunit dependency in logs-analysis/pom.xml
- (logs analysis) Created AuditEntryFactory. Refactorings needed to use AuditEntryFactory.
Merge branch 'master' of git://github.com/CeON/CoAnSys
Merge pull request #48 from acz-icm/master

AuditEntryFactory
Removed unused variables.
Documenation - updating readme.md for namespace changes
qtab: phase
Merge branch 'master' of https://github.com/DannyArends/qtlHD
README
phase test files
Renaming section for consitancy
split_line into fields
split_line into fields
Compiles conflict regex and string modules
Compiles conflict regex and string modules
str_split_line
str_split_line
Low level line splitters
Low level line splitters
FIXME
Improving the qtab parser
Introducing phase in the genotype combinator. The internal default is true,
so genotypes are not expanded. This aligns with all other code. The QTAB
default, meanwile, is FALSE.
Forking out plumbing to delegate :)
Forking out plumbing to delegate :)
Refactoring
read_qtab: Refactoring
Modify install names for library and include files

Changing root name of library to json-c, and also the
directory where header files are installed to .../jsdon-c/*.

This avoids clashes with other implementations of JSON libraries.
Ignoring additional build products
readme and updates to support sufixes instead of prefixes
Removed unused md5sum check after download.
edit home.jsp, add css and js
Making flip image better
same line
Merge branch 'master' of https://github.com/kinxz/Canopus.git
Remove .recently-used junk.
valgrind: add suppression for make external thread data
Cleanup Decl Require Test Case
Page as_html method added, some non-working tests
Route path matcher
Is this how RSpec works?
Cleanup, keep comments for reference
Cleanup
Fix requirements
Merge branch 'develop' of git://github.com/klen/Flask-Foundation into develop
do wordwrap on "\n" even with !word_wrap
Added Test class and NewTestCmdlet class.
Port to tls >= 1.0.0
Tweaked CombatPositioning
started implementing attack mode for combat positioning
Removing posts works. Now full CRUD is available for posts
Changed Readme
Changed Frb interface, now exposes bindings object
Version with ADD(0) producess somewhat more efficient code on x86_64.

Though lock prefix is still there.
couldn't have been right
alias for can can
added back in database cleaner
added avatar editing screen
switched over to hamlbars helpers
added a modal for editing the avatar
added a users decorator
removed cycle
bumped gems and switched to jruby
added an empty avatar placeholder for URLs
fixed the notifications actions to not include the '#' sign as the handlebar helpers automatically add
switched up friendship to automatically accept
moved authentication spec to features
added a decorator for sessions that simply calls the user decorator
removing poltergeist in and added in a clean with database cleaner on configuring
removed the JSON serialization and added user avatar deserialization
also save the inverse
removing authorize call for now
updated to a basic whitelisted attribute view for the user decorator
added an avatar view and editing abilities
addition de Bai Lu au projet Blyms
Adding first commit of pkgng module next comes state
Added new ref functions for mapping unit tests
code encryptor
misc changes!
update resilientLog
Dev du soir sur la comm série
Convert page to markdown
Add add top navigation
Make output more pleasant
Examen final.
Merge branch 'master' of https://github.com/leopic/arqcom
Added problem 17 solution.
Fixes discrepancies between code and output
Draw a zigzag if there is an inner lambda below
Added Skin methods to clone a drawable.
Removed pointer param from GestureListener tap and fling. It can only ever be pointer 0.
Added button param for GestureListener touchDown.
Added LetterBoxTest.
Merge remote-tracking branch 'origin/master'
Revert "association_basics, updated how inverse_of works"

This reverts commit 8cb9460437eddde6952fbebbc969203cd4d00294.

Reason: #7377 was merged and it fixes this behavior.
reminder to run bundle after setting up rails-dev-box
postgresql adapter handles quoting of not a number (NaN) and Infinity
Removed max-stale from the tests since it's a request cache-control directive, just for clarity sake.
Removed ActiveSupport#load_all!

This is no longer used and actually raises an error when trying to load
`ActiveSupport::Dependencies`. I removed the related code and added the
`Dependencies` module to the autoload list.
Improve signed cookies documentation
imported options, switched to object composition
use hash fetches to populate the :id value
remove unused ivar
oops, forgot some semicolons
session hash imported
converted session hash to delegation
initialize instance variables
testing session store behavior
extract options finding to a method
bread AD::Request::Session to it's own file, consolidate HASH OF DOOM lookups
Allow ActiveRecord::Relation merges to maintain context of joined associations
Allow configuring a different queue consumer

Also make sure to not use default queue consumer with custom queue
implementation. It is up to the new queue implementation to
start / shutdown the consumer.
Allow overriding exception handling in threaded consumer
Add some docs and changelog entry
Merge pull request #6153 from carlosantoniodasilva/queue-consumer

Configurable queue consumer
extract deprecated dynamic methods
Moved search tot opbar and added security class to all controllers to show proper menu options on each page
Integrated reader comment in article show page  and reject review in control panel page
removed '.md' from web interface
changed image
M Lesson 19
Add mongo store
new version 1....
Comment formula test.
support for all power of 2 frame dimensions in FB
.vimrc: set autoindent for text files
No more use
strict parsing
修改线路调度查询功能
Signed-off-by: zxl <loou@vip.qq.com>
Commit history.
Table translator with a memory.
Memorize committed text phrase by phrase.
Add language property to candidates; heavy refactoring.
Beginners chord-typing.
No comment.
Properly handle backspace during chord-typing.
Better visual effect by concatenating chord prompt to the previous segment.
Space key.
Chord typing schema powered by Spelling Algebra.
Chord-typing by syllable.
Suppress logging.
Directly commit unhandled characters in chord output.
Bug-fix: inserting a chord at home position truncates the input string.
Merge branch 'chord_typing'
Optimize enhanced backspace processing in chord_composer.
Bug-fix: fluency editor won't commit when space is pressed twice.
Bug-fix: unable to select schema with space in switcher.
Bug-fix: invalid keys are produced by importing text user dictionary.
Automatically recover from snapshot file if user db fails to open.
Fix invalid user dict keys created by a buggy version of UserDictManager::Import().
Support mixed pinyin lookup with table input schemas.
* updated libs
refining logged in notifier
ENH Support chars as control sequences
MIN Read Dimen in expanded mode
ENH Implement dimen register lookup
@Override on interface need 1.6 sources
added g:pydoc_use_drop - to better support switching to  __doc__ opened in another window/tab
A very, very simple prototype.
irssi 目录 / pythonstartup / build.ln.sh
Add acceptance test to MIFOS-3534
Comments and TODO list improvements
make cids simplier
Fix new lines at EOF
Fix a faulty if clause in last commit
Support PGXN.

The requirement of PGXN support is, to let users do

 $ pgxn install madlib

to install extension files in postgres install directory.  After that,
users can CREATE EXTENSION in SQL.

The way pgxn client works is download the zip file, unpack it, enter
the directory, configure if any, make install.  To be compatible with
this, we create a Makefile in the top directory when configured, and
let "make install" be "make -C build extension-install".  This becomes
a little surprising behavior to the normal usage out of PGXN, so
the configure creates such Makefile only if the packager indicates,
by creating META.json file in the top directory.  This is automated
with deploy/PGXN/pgxn.sh, which clones an arbitrary git repository and
m4 META.json_in into the cloned directory, then zip it.

We still need to work on the automation of META.json, but for now
we will package as stands and learn how to do it later.

MADLIB-334
Quantile: Suppress assignment from float to integer

Jira: MADLIB-601

quantile_big used BIGINT to store the number of rows. The code
needs to calculate quantile_size by multiplying the total number of
rows with the quantile, whose result type is a FLOAT8. The code
tries to assign this result to a BIGINT directly, and this
operation causes problem. To fix this, we coerce a cast on the
result.
Reworked Kicker. 
Reworked Kicker cards.
Reworked Kicker cards. Deleted MultikickerAbility.
Include performance improvement by Thierry Volpiatto

https://groups.google.com/d/topic/emacs-helm/HBSJyokLNss/discussion

This also fixes problem with using helm-git with multiple
Git repositories as it always displayed only files from first
Git repo.
allow navigations to render with a custom name, set section names as element data attributes, ignore rubymine project folder
version bump
don't show the signup banner if you're logged in
clean up notifications and add a remix notification.  NOTE: use a
seperate flow for creating notifications, hopefully we can end the
NOTIFICATION MONOPOLY
tooltips on tag leaders
Improve pirdump based on 16.jp2
[12309] Check if coordinates are valid for spells with random destination location

Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>
update built-in types section in manual
rename apv and opv types
label opvs
label all built-in functions
actualizando la documentación para los servicios
Merge branch 'master' of git@github.com:manuelj555/k2.git
Update doc/servicios/flash.rst
cpp tests for mapnik parameters and mapnik:boolean -refs #1141
add more test targets
support case insensitive booleans - closes #1141
scons: do not invoke any install or uninstall targets if using SYSTEM_FONTS - closes #1481
Loading bundler group based on environment.
Injects javascripts into page.
List is awesome!
up to 1.10.4
field dependency, bataille n°1
WELD-975 Programmatic lookup with @New qualifier not working

Conflicts:

	impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java
WELD-992 Event of type ProcessObserverMethod not fired while adding observer method via AfterBeanDiscovery

Conflicts:

	impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java
	impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java
	jboss-tck-runner/1.1/src/test/resources/tck-tests.xml
WELD-1071 @Specialized disposer method not recognized as a definition error

Conflicts:

	impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
WELD-1088 Resource definition which specifies an EL name should be definition error

Conflicts:

	impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java
	impl/src/main/java/org/jboss/weld/logging/messages/BeanMessage.java
	impl/src/main/resources/org/jboss/weld/messages/bean_en.properties
	jboss-tck-runner/1.1/src/test/resources/tck-tests.xml
WELD-1138 Interceptor bindings defined on stereotype not working for session beans

Conflicts:

	jboss-tck-runner/1.1/src/test/resources/tck-tests.xml
WELD-1139 Business method interceptor bindings do not include bindings declared as meta-annotations of other interceptor bindings recursively
WELD-1117 Disposer method check too strict

Conflicts:

	impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
WELD-1140 Dependent scoped instances injected into observer method parameters are not destroyed for non-dependent reciever

Conflicts:

	impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
WELD-991 Incorrect check of bean type when obtaining contextual reference via BeanManager#getReference()

Conflicts:

	jboss-tck-runner/1.1/src/test/resources/tck-tests.xml
WELD-1168 remove the unused UserTransaction
WELD-1148 Custom transactional observer not deferred for later invocation

Conflicts:

	impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
	impl/src/main/java/org/jboss/weld/event/GlobalObserverNotifierService.java
	impl/src/main/java/org/jboss/weld/event/ObserverFactory.java
	impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
	impl/src/main/java/org/jboss/weld/event/ObserverNotifier.java
	impl/src/main/java/org/jboss/weld/event/TransactionalObserverMethodImpl.java
	impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
	jboss-tck-runner/1.1/src/test/resources/tck-tests.xml
Remove unessesary use of Singleton in AbstractSharedContext
Don't hard code the bean id in the proxy class, but store it in a field on creation

This resolves an issue when running unit tests, where the same proxy would be re-used
for beans with different bean id's
Added brutforce adding keys
Adding new things
Merge branch 'master' of github.com:masudk/primom
Adding local nav bar
Added getCheckReqsByCaseId query to DocumentsService
Double up tool tip div
fale conosco step 1
[API] use .htaccess files to rewrite URLs (don't reveal implementation details in URL)
ALD class: adjust API URLs
use .htaccess for website, too
fix: do not output errors when validating document
API: improve .htaccess

* only hex numbers, no letters > F
* remove one "subdir" level
once again adjust API URLs
change links to omit file extensions as well
upload.php: do not redirect to HTTPS locally
Fixed Genesis Wave so you can no longer put sorceries or instants onto the battlefield.
Check isInsertable/isUpdatable on batched changes
height request
git ignore was added
Tab size solution found(see and implement todo).
Some sizing bugs fixed.
Tab sizing now is looks like notebook.
Update time snip for neocomplcache-snippets
post generated
.idea removed
commti 3
test git diff branch
test commit
display: fix display_config() and display_register()

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
fix display

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
clearup

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
misc fix

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
omap3: DVI output enable

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
OMAP3 DVI works

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
OMAP3 DVI: fix LCD lines

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
fix coding style

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
misc fix

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
Merge branch 'net'
merge: init

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
remove board idtable

Signed-off-by: Conke Hu <conke.hu@maxwit.com>
crc: Tag position reads and writes are now absolute.
Added module export

Added module export if available.
Improved style.
compat: use -s instead of -q

And also fix variable propagation when ckmake -t is used.

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
compat: Drop redundant udev rules file

udev rules for Ubuntu and the-rest-of-world are the same. Drop one of
them and use the other one.

Signed-off-by: Ozan Çağlayan <ozancag@gmail.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Add mesh manager
Revert "[Fix #64] Remove the clean git-info style"

This reverts commit a06f13f036580fbad31f89e0fd345db87a460e61.

Conflicts:

	modules/git/functions/git-info
	plugins/git/style.zsh
Add an alias to git show-branch
[Fix #101] Add documentation for directory
[Fix #106] Add documentation for history
Edit spelling in history comments
[Fix #111] Add documentation for prompt
Merge remote-tracking branch 'upstream/master'
Fixed a bug caused by the last commit.
latex-template/Makefile: Add support for graphviz dot target
refixed users colors
Bump dev bundle version number. This is a big change, so 0.2.0.
Increment version numbers for all the software we use.
Replace path.existsSync with fs.existsSync
Replace tty.setRawMode with process.stdin.setRawMode.
Add npm "keypress" module
Node now builds openssl statically by default, so we can remove our hacky static linking.
Fix "meteor mongo" and behavior in the Emacs shell

Monkey-patches Node.  This is super ugly!
Fix password prompts
Clean up hack to node.

- clarify comments.
- setNonBlocking -> setBlocking
- add extra safety when calling on a stock node
Bump fibers, new version was just released.
Change password prompt to be emacs-friendly.
Reduce the size of the dev bundle.
Bump version number for final build before merge.
Merge branch 'node-0.8' into devel
Import path of package funcs updated. The gohash package is now go installable.
added heroku google api keys
Merge branch 'master' of github.com:mggjns/foamer into heroku
fixed another typo
turned on debuggin
re-enabled timezone display in events partial
Trying an around_filter for handling proper display of user times
Merge branch 'heroku'
Changed seec::seec_clang::MappedModule to store a lookup for MappedGlobalDecl objects, and add methods to find the MappedGlobalDecl or clang::Decl for a given llvm::Function.
Fix usage of diagnostics for updated LLVM/Clang.

Re-add "-g" to compilation flags for client programs, because we will use the debugging information to determine the scope of variables, to improve the fidelity of the tracing (e.g. remove state when a variable leaves scope).
Fix behaviour of Command+Q for quitting seec-trace-view on Mac OS X.
sorted
add
EventDispatcher and tests
EventDispatcher and tests
Merge branch 'master' of github.com:miknatr/grace
GoogleDriveHelper class mainly implemented.

Methods uploadXlsData(), createSpreadsheetFromXlsData(), downloadXlsData(),
getNewestSpreadsheetKeyByName(), getSpreadsheetUpdateTime() are done.
GoogleDriveHelper tests implemented.

Some parts of them still should be tweaked in future
to be smarter a bit.
Nginx config
presentation
Remove own hack because of insertlessly
refactored reset game
SERVER-7907 Fix typo
SERVER-7802 rename s2d to 2dsphere
durThread should try to commit sooner if data is piling up. hopefully then a commitIfNeeded invocation, which is uglier, is then avoided
Prevent rollbacks when sync source changes SERVER-6398
SERVER-5861 Support for template language-benchRun

Support for #RAND_INT
SERVER-7332 Split command line processing from server startup in mongod.
clarify extractFieldsUnDotted
Moodle release 2.0.8
spotify: Make session manager work with pyspotify 1.9 _and_ 1.10
Prepare for v0.8 development
Add __version__ to mopidy module
Fix use of nonexistant function
It's 'Last.fm', not 'Last.FM'
Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
	mopidy/__init__.py
	tests/version_test.py
Fix typo
Prepare for maintenance release
Release v0.7.2
Vijay, Sush | #140 | adding dummy logs files for tests. fixing build
Sneha, Ashok | #1640 | Seperated out the queries to an enum
V2/Aravind | #149 | Integration test for CSVImporter.
Initial submission of ramp metering game xml files.
Fix imports for new resolve logic
Fix bug 762177 use .get method for browser_config
Merge pull request #7 from moztw/master

Update download links for FxM 16.0.1, pull to prod
Merge branch 'master' into production
Merge branch 'refs/heads/master' into production
Merge branch 'master' into production
Merge remote-tracking branches 'origin/production' and 'origin/master'
MpaDecFilter: updated CMixer
fixed incorrect saving default.mpcpl after r5212

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5240 10f7b99b-c216-0410-bff0-8a66a9350fd8
MpaDecFilter: "Mixer" checkbox was not saved
- Ajustado offset do numero dentro da recompensa, na parte grafica.

- Aumentei o fds para 10.

- Script run.sh nao estava apagando os objetos gerados gfx
assocs.extras: move assocs extras words here.
Use lib folder
Implemented --threads or -t option in gtboltzmann
Modified the existing test case by mocking it and adding corresponding files
emsdigitdescriptor
Improved input validation in MEX files
Mongoose 3.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ledger: update HEAD build to acprep and cmake

The upstream repository switched to acprep and cmake and made
several changes to the build process when building ledger 3.0 (HEAD).

This commit includes:
  Change option to enable python support (disabled by default in acprep)
  Add option to enable debug build
  Add option to apply time-colon patch

Closes #14730.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
aalib: doesn't need any dependencies.
aview: doesn't depend on X11.
sip: fix for Xcode-only install

- Pass in CFLAGS and LDFLAGS. Note, LDFLAGS have to be passed into
  configure.py as "LFLAGS".

Closes #12884.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
sqlite 3.7.14.1

*Note*: the docs tarball was not updated in this release, but I
incremented the version for consistency.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
GMT: Update to 4.5.8
Google-Sparsehash 1.12
groonga 2.0.2

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
wrk 1.0.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mpg123 1.13.7

Closes #11209.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
unrar 4.2.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
libinfinity: add fails_with :clang

Add a fails_with :clang block for the issue raised in #12462:
non-void function `inf_communication_method_received` should return
a value.  This issue has been reported upstream to their Trac:
http://gobby.0x539.de/trac/ticket/595

Closes #12588.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Added linum-relative and related keybindings (replacing unused org-mode bindings)
Updated README: This project is discontinued
Merge branch 'nasadi-master'
collection.generic.WebDocument -> collection.WebDocument; other minor refactoring.
Merge branch 'refactoring'
Published version-1.3.2 artifact
Object files are now built in obj/ directory instead of src/
Merge branch 'master' of ssh://git@github.com/ndejay/mrenci.git
- Fixed bootstrap filtering (now returns the best solution if filtering
eliminates every solution)
- refine.predictors routine now returns the solution with the highest
score per cluster instead of arbitrarily picking one
delivery-check script: add config value for msys and possibility to change max count for option "-s"
support SWIG 2.0.x (but SWIG 1.3.x as fallback), update documentation
Fix compile error "__builtin_avr_delay_cycles expects an integer constant."

Reported by Foka, patch by Michael Hennebry.
http://lists.nongnu.org/archive/html/simulavr-devel/2012-03/msg00010.html
Removed debugging message

Reported by Mathias Kussinger. I used it for debugging simulavr's
thread switching code, forgot to remove it when committing.
http://lists.nongnu.org/archive/html/simulavr-devel/2012-03/msg00000.html
use css transforms for animation, much faster in mobile safari
turn subject list into clickable item selectors when form is active, use them as regular links when not active
sort item list in sidebar by updated_at
use sidebar links as form filler if items is .active
fix typo in items links
小修改select，添加select_close，完成PCD的联表
Rewrap some pydoc blocks.
Cleanup the "Import Projecct" dialog: move most of its settings to the Glade file and set dialog's parent window.
Cleanup GtkDialogs (set default action, move window properties to Glade files, etc.).
Allow to invoke runner_rendezvous subcommand and set alternative port

This diff is triggered by the need of helping David Vanes to debug
what happens with its upstream VPN tunnel.  While reasoning about
how to stimulate the tunnel, I noticed it is useful to run arbitrary
neubot modules.  So, I've re-added this possibility to the new
main common module.  Once that is possible, it is quite simple to
amend runner_rendezvous to allow to choose the port.
FAQ: regen
Add timeout and inherit GPRSHTTP from Stream

The waitFor function will now timeout after 60000 milliseconds,
or a user specified period. The GPRSHTTP class now extends Stream.
change required files paths
Payement refund implementation
Work on refund APIs
Merge branch 'integration' of github.com:ning/killbill into integration
Export Components.manager as Cm

Also QI that thing to nsIComponentRegistry
Work in progress on UI by @espadrine
New game form default to the top of the hour
multi-build command added
dirty fix 1Fxxx for chrome/opera
regenerated font/demo
Add if-modified-since support for assets server
Fix params validation example
Update exo_b.pl
began Scholar::Source::Book specs.
Initial commit of version which will run on Linux/Windows + OpenGL ES 2.0
Update procmail filters.
Add overthemonkey offlineimap config.
Fix reference to limitrules
Verify posted kernel type against a defined list of good values.
Discovered-By: Yann CAM
Sanitize some variables
Discovered-By: Yann CAM
Eliminate system calls here, use PHP instead.
finish off matrix tests, start on a few range tests
Use secure MathJax by default

Should be no harm in doing this, and it sorts out any complaining from
Blackboard and the like.  Fixes #155.  Maybe?
allow steps to be all part types

there was an error in the logic deciding which types a part can be.
Fixes numbas/Numbas#205
correctly load question/exam descriptions on edit page
run content text through John Resig's HTMLtoXML

Makes content valid XML.
See http://ejohn.org/blog/pure-javascript-html-parser/
small update for CVWidgetKnob

if spec.minval == spec.maxval.neg make the knob-display centered around
0 (instead of relying on the spec's name)
(cherry picked from commit f3e132c5e4041c5f743126e80595cb4b418fda8f)

Signed-off-by: Stefan Nussbaumer <st9fan@gmail.com>
Update: crf++ to 0.57
Merge branch 'master' of github.com:oame/homebrew
strict mode
Moved a this flag and added some use strict
pedantic... but now the gargoyle title's in the center already
fix content-type header for IE
fix blocking of macs assigned a static IP from connecting using a different static IP
Tweaked vulns rake task to import and associate vulns
Commit
Changed strange bug
First commit
Minor changes
More changes
Added chain factory
New chain factory test
Added OHandler
OHandler test works
Added JHandler
Everything is working
renamed project
New name
Merge branch 'master' of https://github.com/odedlac/Group.git
first commit
added yasnippet-compatible versions of most* rSpec snippets from textmate.
see the README for differences.
setup file for programmatic inclusion of these snippets.
listed differences between my port and the TextMate versions.
whitespace matters, dammmit.
forgot about the major mode named dir.
desg, describe with a given block
Merge yasnippets-rspec
yasnippets-rspec追加
removed Default directories from public
Handle missing schema...
Changes: 25. erilaisia kelloja: Sanat loppuun, säätöä
Changes: kansiot kuntoon
adding blackberry icon support
Added simple move logic, without checks if the move is valid.
sorted user add -
'jonathan@peoplesized.com' with password 'egg'
Merge branch 'master' into multi_ac
- re-sort the attributes of the type element into alpha order
- add new element <defaultprebuilt>
  * allow users to specify a default location for pre-built boot images
    in the configuration file.
- DB: rebuild documentation:
  include info about new <defaultprebuilt> XML element
- unit test for new <defaultprebuilt> element
- remove unused variable pblt
- do not call the test log internal __reset() method.
  calling __reset() would ignore any potential other states and
  therefore would ignore potential error conditions. Calling
  getState() instead and ignoring the returned value ensures
  that only one state is set in the log as expected after
  calling the getErrorState() method.
- DB: update schema documentation
  include info about new <defaultprebuilt> XML element
Kakadu build for OS X
Move ohmono packages to testing Openhome repo
- Refactored pointless by-hand evaluations of nonfunctions to Cmd.Eval.
draw always
hacks
Made things consistent across modules
Fixed an error with passing arguments through initializers incorrectly
Fixed using wrong class name
Fixed delimiter for tray
git sl -- show counter to better access elements via git dm
some css adjustments - not for looking cool - more for development
Do not rely on core mimetype detection
Implement cleanup
Bump version
split setsystemvalue test
Fix urlencoding in the breadcrumb
Urlencode the share URL

Fixes #63
first version of the new documentation system integration.
Make the redirect_url working again

Fixes #160
Check for redirect_url for logged in users

This checks if there is a redirect_url for logged in users
Remove uneeded new line
Fix warning about redirect_url not set
Merge pull request #182 from owncloud/fix-redirect

Make the redirect_url working again
Cleanup user settings js
Always have the username as string in user admin
Better check and handling of user creation
Better check and handing of user deletion
Better place to check for user removal
Merge pull request #433 from owncloud/user_setting_fixes

User setting fixes
check if directory already exist before executing mkdir
Revert "Core: Fix du dot de combustion"

This reverts commit 71cfbbaf85646a7a2e9fa47f85d5b58076cc7135.
Core: Fix du dot de combustion
- replaces path.exists with fs.exists due to node 0.8 compability
- rename of serverInit to serverBootstrap
- internal refactoring
- sorted routes
- changed route for /init.js to /bootstrap.js
Merge remote-tracking branch 'origin/master'
Now ignores scrap files.
[MENU] Instructions implemented
Release 4.6.0 - Wild Parrots of Telegraph Hill

See http://www.imdb.com/title/tt0424565/

"The first half of the documentary film focuses on Mark Bittner's
relationship with the Parrots living on the Telegraph Hill in the center of
San Francisco and how he came to be their caretakers.  He has a name for
each one and gives the audience stories of how he's interacted with them.
Included in these reminiscences, is general background information on bird
life in San Francisco and the various theories on how these South American
parrots came to exist in the Bay Area.

The second half of Parrots deals with the fate of the birds now that Mark
has to vacate his small home for the last three years.  Apparently, his care
of the birds has attracted world wide attention, especially in Europe.
There is never really any tension in the fate of Mark or the parrots since,
as Mark points out, the birds are perfectly capable of taking care of
themselves.  The viewer probably has a little less confidence in Mark
though, as he says he has no idea what he will do." - imdb review by
kasserine (US)
[GH #879] more gcc -Werror=declaration-after-statement fixes

Note: These errors only appear when the UNUSED(SELF) line is not shimed away
The new pmc2c removes this line, and SHIMs the paramater, so this problem was not detected
[WK2][GTK] Fix issues with WebKitFaviconDatabase in debug builds
https://bugs.webkit.org/show_bug.cgi?id=97966

Reviewed by Carlos Garcia Campos.

Fix failing ASSERTs detected when running the unit tests from
TestWebKitFaviconDatabase in debug builds.

* UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
(webkitFaviconDatabaseDispose): Close IconDatabase here, which is
the right place to do it according to GObject documentation.
(webkitFaviconDatabaseFinalize): Just destroy the private data
structure and chain up to parent class's finalize method.
(webkit_favicon_database_class_init): Override dispose method.

* UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:
(webkitFaviconDatabaseFinalizedCallback): Delete files when the
WebKitFaviconDatabase is being finalized, since by that time the
IconDatabase from WebCore will be already closed.
(afterAll): Add a weak reference to WebKitFaviconDatabase and
provide a GWeakNotify callback (webkitFaviconDatabaseFinalizedCallback).

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@129992 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[Chromium] Test expectation update

Rebaseline for http://trac.webkit.org/changeset/132753

* platform/chromium-linux/fast/forms/week-multiple-fields/week-multiple-fields-appearance-pseudo-elements-expected.png:
* platform/chromium-mac-lion/fast/forms/week-multiple-fields/week-multiple-fields-appearance-pseudo-elements-expected.png:
* platform/chromium-mac-snowleopard/fast/forms/week-multiple-fields/week-multiple-fields-appearance-pseudo-elements-expected.png:
* platform/chromium-mac/fast/forms/week-multiple-fields/week-multiple-fields-appearance-pseudo-elements-expected.png:
* platform/chromium-win/fast/forms/week-multiple-fields/week-multiple-fields-appearance-pseudo-elements-expected.png:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@132756 268f45cc-cd09-0410-ab3c-d52691b4dbfc