labofsahil/github-event-dataset-2012 huggingface dataset:
cron email typos (condition not run); variable not defined
Merge branch 'master' of git://github.com/Fabrik/fabrik.git into german
Merge branch 'master' of git://github.com/Fabrik/fabrik.git into german
Merge branch 'master' of git://github.com/Fabrik/fabrik.git into german
Merge branch 'master' of git://github.com/Fabrik/fabrik.git into german
Merge branch 'master' of git://github.com/Fabrik/fabrik.git into german
Merge branch 'master' of git://github.com/Fabrik/fabrik.git into german
JText for validation rules de-DE
Merge branch 'master' of git://github.com/Fabrik/fabrik.git into german

Conflicts:
	plugins/fabrik_validationrule/emailexists/language/de-DE/de-DE.plg_fabrik_validationrule_emailexists.ini
	plugins/fabrik_validationrule/isnot/language/de-DE/de-DE.plg_fabrik_validationrule_isnot.ini
	plugins/fabrik_validationrule/php/language/de-DE/de-DE.plg_fabrik_validationrule_php.ini
	plugins/fabrik_validationrule/userexists/language/de-DE/de-DE.plg_fabrik_validationrule_userexists.ini
JText in validationrules de-DE
Moved startTag after form intro to avoid <form> tag nesting
Merge pull request #286 from trob/german

validation de-DE files; form templates
Update plugins/fabrik_cron/geocode/geocode.php

There were wrong element name that kept the plugin to retreive correctly the country.
Merge pull request #458 from jfquestiaux/master

Errors in geocode cron plugin
fixed: db join in repeat group, rendered as autocomplete, was not saving or redisplaying the correct values / labels
changed/fixed cdd autocomplete filter in list view would not work or populate with data if observe element not also included in filter. default value was not being shown in autocomplete field after search
removed debug out put from time element
fixed: if list acl set so that user can only edit their reocrds, the form was redirecting (incorrectly) to the details view. Needed to load up form data before doing acl test
merge issue, updated require.js and rest cron plugin (wip)
fixed: timeline bubble tmpl need to backslash quote content
Merge branch 'master' of github.com:Fabrik/fabrik
reverting fix in #ee697dd, as it destroyed legitimate joins on saving the group see http://fabrikar.com/forums/showthread.php?t=29385
Added require_once for the MCAPI.class.php file, which was missing and causing a PHP error. Pretty sure this is correct, but I haven't tested extensively yet.
Merge pull request #279 from rhotog/patch-2

I don't use mailchimp, no way of testing, so I'll just approve this one.
Adding the initial report for test driver for arum
adding comment to pluck function
Fudge it all
mark function
Merge remote-tracking branch 'origin/master'
mark function update
fix: purge example files
Fix an error in implementation of `has` function.
reusing mock 'messages'
add range query on single mahcine
Added test inspired by #2332
some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover
Removed the header opencv2/photo/denoising.hpp
All the functions from it are moved to the header
opencv2/photo/photo.hpp
Adding addon Flump, for option /flump(raid addon)
remove buildLanguage.mpr usage
remove trash from Generator.getUsedLanguagesReferences()
add devkits to project
add generation languages action in migration group
add generation languages when creating new generator
adjust generator module and templates model creation
Merge branch generation-languages
add generation languages to generators and models
execute "Add Missing Imports"
fix references and dependency in typesystem plugin solutions
execute "Add Missing Imports" on template models
make project
Merge remote branch 'origin/master'
less bang process
Update for setup.py
Reverting…
New release 1.1
Don't call a boolean-variable `num`
Prepare to transform.
Include output in README.
Path is better when local-dependent.
try to implement pagination for food posts
ASM compiler detection: remove debug output (#13270)

This must have been left in accidentially.

Alex
Merge topic 'RemoveASMDebugOutput' into next

0b343cb ASM compiler detection: remove debug output (#13270)
Fix the Makefile of multicorn
Update again the git URL
probne panele logowania
Hack to only keep a single SpecGenerator.
Clarifies LTL compilation message.
Adds MURI 2012 demo specs
Updates SLURP to support conditionals
HttpProtocol stuff
Merge pull request #3 from LeSpocky/master

state I wanted to reach, looked better on paper
Edited battery.cpp comments.
Added reverse mapping for entities.
Made a separate local set for AddressLine, as there is no way to put a variable-length batch of strings into a single localset value.
Improve stability of TestHostConnectionPool
Update for #9
Fixed previous problem with line endings
Mistakenly deleted 62db87a. Re-committing
Added translate mode for #4
New -translate switch causes MASGAU to launch in translate mode, which will currently throw an exception when a string doesn't have a translation for the current language
Changed MASGAU.Main.WPF to launch debug with -translate enabled
Added code to always load (except in translate mode) the English-language string file, then load a general language string file, which is then combined with a region-specific string file.
Merge pull request #5 from sanmadjack/translations

Translations
Merge pull request #19 from AdmiringWorm/translations

Translations
merge multiple initialize into one generic version, that can be correctly aliased
add test
Merge pull request #143 from MagLev/tim/issue-143

backports gem overrides Enumerator#initialize, breaks Enumerators for MagLev
add test for #140
run new test with vmunit tests
allow aliasing of gsub by providing generic version
provide ruby_strdup
add empty definitions for safe functions, sqlite3 gem uses some
Revert "provide ruby_strdup" until I figure out why it fails to compile any C-ext with this

This reverts commit 21ccc204103a3d7ef96a6404aece781432fb6f69.
added missing method PositionableStream>>originalContents
 ignore lock/logs even if they are symlinks
Merge branch 'MagLev-1.1' of github.com:BP2012H1/maglev into MagLev-1.1

* 'MagLev-1.1' of github.com:BP2012H1/maglev:
  added missing method PositionableStream>>originalContents
Fix library name lookup for GemStone shipped dyn libs
Merge branch 'MagLev-1.1' of github.com:MagLev/maglev into MagLev-1.1

* 'MagLev-1.1' of github.com:MagLev/maglev:
  use MAGLEV_HOME in package build
  Remove old hand exploded mcz
  Build old mcz from filetree format packages dir
fix CLibrary>>hasCSymbol: to work around problematic symlink resolving
Merge branch 'MagLev-1.1' of github.com:MagLev/maglev into MagLev-1.1
Changed _findSmallSting... to be _findString...
Added more doc on using topaz to view ruby source and methods
Merge branch 'MagLev-1.1' of github.com:MagLev/maglev into MagLev-1.1
Added accessors for SSLContext and SSLSocket in OpenSSL module.
added the retrieval of vendor string

Retrieved in LEVEL_VENDOR_STRING32.asm. The methods are defined in
FX86.hpp
add missing include in container
initialize position from another position as intended
Remove redundant code in generative functions.

Provides a common protocol for building "size-matter" expression like generative or
reshapers.

This patch includes:
 - an as_size functor building an extent from a random set of values
 - the refactoring of constant and generative under the same umbrella
 - various cleanup of generative function implementation not up-to-date with latest practices.
 - of_size now supports mpl integral as parameters and generate proper static of_size_ instance
 - indices has a proper nt2::over(d,b) paremeter to limit ambiguity
 - all functions using multi entry to compute a size use as_size (expand, reshape etc)
   and thus follow the same shortcut
 - better generative tests.
Added BOOST_SIMD_NO_SIMD flag in fold simd version
first step towards being able to use arbitrary containers: change container_ref to be parametrized on the container type rather than on the value type and settings
New directories structure and minor improvements...

New folders structure, TinyMCE skin is now fine, auth system has been
improved too.
(hw2P4) It works!
Creation des fichiers principaux

fichier sioux.conf et sioux.pl
traitement de la configuration et démarrage du serveur
HTML Setup: Fix loading of ui-multiselect-en.js

Fixes #10910. Refs #10651.
Merge branch 'master' of code.mythtv.org:mythtv
Fix settings overrides. I accidentally broke these when changing the DB connection code.
Only set the BackendServerIP6 setting to ::1 by default if that address is available, otherwise leave it blank
MythCenter-wide: Animate some of the popups
Updated Finnish MythFrontend and all plugins translation
from Ilkka Tengvall.

Thank you Ilkka!

Refs #10577

Signed-off-by: Nicolas Riendeau <nriendeau@mythtv.org>
Merge branch 'master' of code.mythtv.org:mythtv
Update Youtube player API to v3.

Thanks to Alex Halovanic for this change, allows playback for those
videos which attempt to play advertisements first.

Fixes #10463.
Corretti molti bug
corretto
Merge pull request #1023 from Matta95/patch-93

corretto
Update master
Merge pull request #177 from marcofax/patch-24

tradotto
Update master
Merge pull request #74 from Simixp/patch-3

Update master
Tradotte due frasi in italiano
Merge pull request #496 from r3ddr4g0n/patch-20

Tradotte due frasi in italiano
Fix linking bug
Dot was making incorrect symlinks for single files.
Add proper path to socket file
Move config.fish to proper place
Move config.fish to proper place
Remove obsolete file
Switch meta key to command
Handle null restore prefix
Activating frond end optimatlizations that are built into Middleman.
Adding Google analytics
Adding my favicon.
Remove windows.rb file in cookbook root /
Add git to Windows path and improve package install
Remove the call of SendChangeMoney method when a player send a message from chat and close the issue #2 (forgot it the last time => Fix #2)
[remove] the remove command should be called with the right PATH
[update] check the consistency of optional dependencies on updates
[install] improve the display by refixing the build commands which are run by the corresponding package name and version
[opam-mk-repo] Display some progress information and handle .tbz and .tgz archives
[update] check consistency of optional dependencies on update

Forgot to commit some changes
[conf] Add "enable"/"installed" virtual variables (ie. which do not appear in the corresponding .config files)

It is always possible to query for them, even if the package is not installed.

%{foo:enable}% = "enable" if the package "foo" is installed, "disable" othewise
${foo:installed}% = true if the package "foo" is installed, false otherwise
IntervalSkipList tests moved to NUnit.
IntervalSkipList benchmark tests refactored and moved to separate file.
DateInterval test for not included edge added.
Started working on IntervalSkipList function tests.
Added Vvondra IntervalTree implementation https://github.com/vvondra/Interval-Tree
Merge remote-tracking branch 'sidlovskyy/IntervalSkipList' into IntervalSkipList

Conflicts:
	Orc.Tests/IntervalSkipList/IntervalSkipListTest.cs
Fixed: EndPoint CompareTo()

Added: IsMinEndPoint to IEndPoint interface
Fixed: EndPoint CompareTo() had another small bug which is fixed.

IntervalTreeVvondra now uses the Interval class from Orc library.
Improve git prompt with hooks
Get rid of action format
Map
Merge branch 'master' of git@github.com:PPilger/OOP-8.git
re-write. blocking now working
Adding greatCircleLength() method in LineString.
Remove duration() method from Point class, now useless.
Forgot to add .rspec
NF: get_random_seed -- little helper to return a random int for seeding RNG
RF: follow Tiziano's wisdom -- provide seeds to child pprocesses

This way no control over rng for every use of np.random should be needed
and RNGs would provide different sequences in different child processes.

Sideeffect:  searchlight results with nproc=1 and nproc>1 might still differ.
the only solution for that would be to provide seed values per each roi_fid
which might be a bit overkill
is ajax
hacking client 4 to show gmap
move pet after reset right
Fix a lot of compile warnings
vehicle support for special liquid auras
States and losing
Double-click to refresh list
Compress CSS
Add MessageList scrollbar
Implementing GL resource updater.
Vertex buffer & element buffer test codes.
Implementing vertex array.
Fix segv in slurmctld for job step with relative option

Here is the way to reproduce it :
[root@cuzco27 georgioy]# salloc -n64 -N4 --exclusive
salloc: Granted job allocation 8
[root@cuzco27 georgioy]#srun -r 0 -n 30 -N 2 sleep 300&
[root@cuzco27 georgioy]#srun -r 1 -n 40 -N 3 sleep 300&
[root@cuzco27 georgioy]# srun: error: slurm_receive_msg: Zero Bytes were transmitted or received
srun: error: Unable to create job step: Zero Bytes were transmitted or received
Pick step's relative nodes based upon nodes allocated to job, not nodes available to job
Merge branch 'slurm-2.3'
Update pam module to work if using aliases on nodes instead of actual
host names. Like done elsewhere in SLURM
process paper, annotation carse
Updated to 7.0 ...
New ddata
Fix #238: include reference to instance in dgrid-error events
remove "property does not exist" errors
Merge pull request #158 from stanistan/add-property

remove "property does not exist" errors
Use frontend url instead of ipv6 url for boinc server
update apache version to 2.4.2
Commented the hardcoded publickey from a previous test.
Started texturing & rotation
Implemented false/true builtin commands
update tags file
$? now works for simple cases

	- builtin commands.
	- external (simple commands).

I/O stuff is still in rather need of testing/cleaning that I haven't
worried about adding support for $?, and pipes are still disabled :'(.
misc
Add missing declarations for true_bin/false_bin
Thin support for loops and misc tweeks
! fix for sqlite install of boards table.
! fix query so it was multi-db friendly

Signed-off-by: Spuds <spuds@simplemachines.org>
[wip] some bug fixes in the adaptive refinement stuff
[wip] added module with utility functions for fenics
add user functions
Merge branch 'master' of https://github.com/SqrTT/OptoGIS
Signed-off-by: Stefan Baumann <steff_bau@yahoo.de>
Added abs() function
little typo which prevented the tag input to function in other locations than /
added bullets to top of readme
Addition of Director and resourceful
Another attempt to fix the config.
move connections to Grocer module
Miaox - small fix
Fixed missing config file
Minor code clean-up
Removed useless return in __init__

This can just cause confusion.
Fixed a source of non-determinism
PEP8 fixes
Turned errors into warnings for merge
Merge pull request #1100 from delallea/determinism

Fix for a source of non-determinism
make check_blas.py print the nvcc version.
add the check_blas.py timing for C2075 with cuda 4.2
call nvcc only if we init this device.
use the nvcc path found by theano.
Sync the timming when using the GPU. Otherwise, we end up with 0s!
Merge pull request #1040 from nouiz/misc

Misc
Make Archive.BulkArchiveFile.close() distinguish between hidden and
visible files.
Aggiunti i dati mancanti del corpo nero
Modificato lo script R per l'analisi, tuttavia non è affidabile al momento
Foglio di calcolo aggiornato e sistemato
Tabulati i dati per drograggio N e campo fisso per uso con gnuplot
Tabulati i dati per drograggio N e corrente fissa per uso con gnuplot
Tabulati i dati per drograggio P e corrente fissa per uso con gnuplot
Aggiunti script gnuplot per l'analisi e la produzione dei grafici
File collettivi per una prima analisi grafica aggiunti
Aggiunto file di SciDavis giusto per completezza
Start localcluster ip ports at 50000

Webmin runs port 10000 - try to avoid conflicts on some
volt3's.
Fix TestLeaderAppointer and add a test case for failure on replay.
Ad hoc read-only batch detection.
Ad hoc read-only batch detection, with the files missed the first time.
Fixed TestClientInterface.testFinishedAdHocPlanning since read-only is now properly detected.
Add round robin logic to SimpleDtxnInitiator.
ENG-3207 Fix Java7 format mismatch exception

SQL command was calculating format strings based
on VoltType in a way that Java 7 rejects.
Fix the SP metadata for sysprocs.
Renamed @AdHoc system procedures
Fix for @AdHoc routing
sqlcoverage template tweak improves the odds against hsql internal rounding issues.
Merge master to scooper_adhoc_readonly with Ryan's sysproc fix
Merge pull request #41 from VoltDB/scooper_adhoc_readonly

Ad hoc read-only optimization
Uncomment testJoinOrder test
Merge branch 'master' into newrejoin
ENG-3828 use partition mastership process to determine export data source partition masterhip
additional test tweaks for bad start actions
new WS
fixed issue with Featured Tab showing HTML encoding
Creada rutina recibe_valores() y eliminado el codigo utilizado para comprobar comunicaciones mediante LCD
tried to fix the redirect issue for first time users
Support standard gmail folders identified with two backslashes.
Fix typos in home-en.tpl

Whoops...
Add config to zombie working
Fixed undefined variable when dismissing messages
Merge branch 'hotfix/0.4.5'
Fixed some math notation.
Set up timer so that it can't start reducing while previous reduction is still in progress.
Merge remote-tracking branch 'origin/develop' into Reduceless-experimental
Update find parameter.
Small fix that enables code template insertion.
Add remark about the input files.
Merge pull request #10 from dbgrandi/master

added the ability to add generic qualifications to a HIT (compliments of @dbgrandi)
added matrix rep of ac
Globel Serach
added rectangle persistence
scaffold for track functions + track.height field implemented
Versioning for HF2
it's not really a password, it's more of a captcha
enable_record_versioning
better AD support in ldap_auth, thanks Guyris and korylprince
fixed a typo
response.custom_commit patch, thanks Jonathan
SQLFORM.smartdictform
smartdictform again
col3 in grid, thanks Jonathan
better URL errors, thanks Mariano
Merge branch 'master' of github.com:mdipierro/web2py
utilisation adapter dans useDefaultConfigFiles du runner et ajout cas de test
titulo e base_url corrigido
actualizando algunos cambios
Merge branch 'master' of https://github.com/agrass/bitlag

Conflicts:
	Gemfile.lock
	app/controllers/api/events_controller.rb
	app/controllers/events_controller.rb
	app/models/event.rb
Removed google oauth so I can add my own forked version.
cascade creation of object with constructor for embedded and list of embedded
Added basic.html for basic styling

Signed-off-by: Aaron Vanderzwan <akv292@gmail.com>
Merge branch 'master' of https://github.com/akv2/MaxImage

Conflicts:
	lib/js/jquery.maximage.js

Signed-off-by: Aaron Vanderzwan <akv292@gmail.com>
Jquery Version
Hack to demo API use for maps

[#21]
Added first cut on partner sites map widget
[fixes #23693093] First cut on the partner sites map widget.
Merge branch 'develop' into feature/ps_map_widget
[#23693093] Added some details to the marker windows.
Merged with develop

Conflicts:
	akvo/rsr/views_partner_sites/__init__.py
Merge branch 'develop' of github.com:akvo/akvo-rsr into feature/autodeploy
[#22020521] Updated pip requirements for Python 2.7 upgrade: virtualenvwrapper -> 3.1, distribute -> 0.6.25.
[#22020521] Maintenance update to ver 1.4.1 for Fabric deployment tool.
Merge branch 'develop' into feature/ps_map_widget

Conflicts:
	akvo/urls/partner_sites.py
Merge branch 'develop' into feature/ps_map_widget
Merge branch 'develop' of github.com:akvo/akvo-rsr into feature/autodeploy
[#23693093] Rearranged the get a widget pages on partner sites. Still work to do on the second (tweaking) page.
Merge branch 'develop' into feature/ps_map_widget
[#23693093] First cut the get a widget page for PS that sort of work
Merge branch 'release/2.0.5' into feature/ps_map_widget
[#23693093] Fixed various bugs on the PS get a widget page
[#28809041] Changed "Expected outcomes" to "Goals" on project main page
[Fixes #28809041] Changed "Expected outcomes" to "Goals" on project main page at Partner Sites
Merge branch 'release/2.0.5' into develop
Fix spelling error and add transaltion tagging in ProjectComment meta class
[#113] Add new resources for the API driven maps

Add 'map_for_project' and 'map_for_organisation' resources that produce
a lean dataset for use with the API driven maps. The resources don't
include any foreign key data except the locations and also excludes a
number of long text fields.
update: Platinum/Neptune to 0.6.9.1
fixed: Platinum build
fixed: resultant fixes after upgrade
fixed: Platinum linking issues
changed: enable Platinum logging to console during development
prepend Platinum log messages
cosmetic - whitespace
cosmetic: homogenize UPnP log messages
fixed: PLT_MediaServer method signatures had changed causing NOOP
fixed: file serving was broken due to refactor in upgrade
fixed: malformed NPT_HttpUrl's unless pass path
fixed: don't assume album_arts exist for given item
Platinum - log allowed values with state variable errors
reinstated: 'changed: make sure Neptune threads are named' by elupus @ 42d7b6b9180f634f988e12673de655228233b305
reinstated: 'fixed: upnp server's http server would not provide content length on HEAD requests' by elupus @ 9cbcf5063c3af350d385f1992017f6883f37a8e0
reinstated: '[UPnP] use server provided item count to iterate browse req' by elupus @ cb110ea28b7506cb31d6ab4fd347fad1c96ec9ed

all other modifications to libPlatinum/Neptune since codiqs last commit have
been checked and are not required / have been included upstream

the following patches therefore do not need to be reinstated:

5e5156bde70bb4250c9d912e43656a19d008f110
4df0a4cb1cd059f585de289a10ab915ce1bd95a8
a6eaa587174f73c0fdd7a5130774772c7d475fec
964b08aed02ee52d7f88250409b4e3fdd0363be3
2f70d124f75d76813e48ecc26ffd9aa3625072aa
299d326314619aa3a085f2c026e55860a75b3a5c
5bbf59fbc049325ec4205fadaa0903a753b866ee
370c8366ed83115558e4dcb00561207854c4f971
755f17fe4353b7047ca04c16b7461d1ef3b8ed1b
20c1ed61030f7a5bada60821507f29e54821b1a9
0b11444d6e405fa17e73ef0abc9ceba25a559cce
f96d966e7575b4d9f7c864ad153dd9fb968344c9
99479c384176fd3f82d518506e560ba08ad57e40
347aa55b6c55e2801ff7a421e8bcc02ce0314cab
a1993bf0380b9ced60c39064833435e458aa5434
f13f20aaa9493d58264c55f2a5b2cafd09435b0e
95df1d019cb7ea64a6f748a9104db1ecd666af42
887728b93d0a8cddd6a08bfddc4079f4c2ae82f8
66d2daf7bd90f7be2cb4cdbc5088488627953e3f
ec70e260e95becc5bfcd86512b245776ef9653ea
296435b9a9262b23b49cbfb2302e36e730f292e7
99e0a1eaf18ed07625143e4fadc6eb027f822857
588a66a55067433ade77769a39c81552a995b38d
3fd25488ba88b30cfa0f5b834bbde91a21f05a73
first_update(Terminated)
修复判断bean属性的read/write方法的bug
Minify js improvements
improved path validation
Tweeks in thanks to in readme
target: _blank on all changelog links
Created an empty project
add com.sun tools to develop branch
bump versions on the develop branch to distinguish it from the master branch
Merge branch 'master' into develop

Conflicts:
	.gitignore
	pom.xml
Merge remote-tracking branch 'mhgrove/master' into develop

Conflicts:
	core/pom.xml
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'master' into develop
javadoc OWLRDFVocabulary so full URIs show up as tooltips in IDE
add PrimerTurtleRoundTrippingTestCase
rename isAxiom and addAxiom functions to match their meaning and use
Revert "Scripting: redis.NIL to return nil bulk replies."

This reverts commit e061d797d739f2beeb22b9e8ac519d1df070e3a8.

Conflicts:

	src/scripting.c
Diagram gefixt
added dot support to routing
added dot support to routing
added dot support to routing
verified login on api add plus new favicon
restructured API lists
quick fix for string not found problem
Fixed leak that snuck by me
Азат вернул
Взял 30 рублей
Added an option for selecting the VLC binary. Added autodetection on OS
X. If both the binary path is set and it is executed on OS X the bin
path takes precedence. Interfaces and modules seems to change a bit
every release, so Added a placeholder to add custom parameters to
the VLC arg line.
New options means increasing the minor version.
Ignored the gem itself.
WIP adding support for stream
Merge pull request #1 from ssedano/master

Custom arguments in launch command and addition for OS X
Add modulation options as a parameter.
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Fix rounded corners
Position the snippet icon inside the text field
Standard body font size should not be overridden.
fix test cases
fix save button style
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
fix score rule styles
fix milestone not editable on project edit page
use bootstrap legeng styles
remove slimbox, use bootstrap instead
remove logo/css per client
fix resources styles
set content-type in response
Merge branch 'dev' of https://github.com/liufengyun/jobsworth into dev
Update release notes with recent work
Update coverage reporting gem
Remove background grey from the page.
Fix the display of client names in the task edit view. This is a good example of why coding the design into the html is a bad idea.
fix mutiple lines in resource edit view
progress on wrf api
addl. code cleanup
add installation/deps.
extract response setting to a method
push req / res setting to the test runner

Try to avoid making the controller mutate itself so that we can
eventually make the response async
extend the controller with special logic on recycle

For some reason, this special logic is only supposed to be executed on
the second request.  For now, we'll extend on recycle, but we should
figure out why this functionality can't be run on every request
push the cookie writing stuff out of the controller

merging cookies is responsibility of the test runner
Introduce config.action_mailer.default_from=

Allows to easily set :from, :replay_to, etc. options in
config/application.rb using simple syntax:

  config.action_mailer.default_options = {from:"no-replay@example.org"}

This was not possible using #default method because

  config.action_mailer.default(from: "no-replay@example.org")

is interpreated as reader method and just returns nil.
It would not call ActionMailer::Base.default method. The only
way of calling this method from config/application.rb was to use
the direct syntax which looks ugly in my opinion:

  config.assets.enabled = false
  config.assets.version = '1.0'
  config.encoding = "utf-8"
  config.action_mailer.default_url_options= {
    host:"example.org",
    protocol:"https"
  }
  ActionMailer::Base.default(from: "no-replay@example.org")
test should be testing to_param not to_s, remove Array subclass
push functional test specific methods to it's own module
group things that are alike
assing the request on the response only once
make the default environment have actual defaults

instead of deleting keys on every instantiation, create defaults we
actually use.  eventually we can pass an environment in to the request,
and create a new req / res object on each call.
add Mime.fetch so we can have default mime types
push parameter instantiation to one method
Add the options method to action_controller testcase.

Signed-off-by: François de Metz <francois@stormz.me>
Add few information on the field types
Merge branch 'master' into testclean

* master:
  activesupport gem dependencies should reflect the versions we actually use
  fix link and add activeresource link in release notes page [ci skip]
  Update 4.0 Release Notes
  Kill not used constant since removal of runner method
fix quoting for ActiveSupport::Duration instances

This patch fixes quoting for ActiveSupport::Duration instances:

    # before
    >> ActiveRecord::Base.connection.quote 30.minutes
    => "'--- 1800\n...\n'"

    # after
    >> ActiveRecord::Base.connection.quote 30.minutes
    => "1800"

Also, adds a test for type casting ActiveSupport::Duration instances.

Related to #1119.
Use ArgumentError vs. RuntimeError, which is more precise.
Merge pull request #6969 from mkdynamic/patch-1

Use ArgumentError vs. RuntimeError, which is more precise
Merge pull request #6967 from frodsan/quite_as_duration

fix quoting for ActiveSupport::Duration instances
Merge pull request #6959 from robin850/patch-1

Add few information on the field types
Return the same session data object when setting session id

Make sure to return the same hash object instead of returning a new one.
Returning a new one causes failures on cookie store tests, where it
tests for the 'Set-Cookie' header with the session signature.

This is due to the hash ordering changes on Ruby 1.8.7-p358.
Fix 'Security#Mass Assignment' URL typo
apply form_for namespace option to date_select
Merge pull request #5596 from lest/patch-3

apply form_for namespace option to date_select
Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2

Fix build for branch 3-2-stable - return the same session hash object
Merge pull request #2621 from icco/master

Issue with schema dump
If partial is rendered in controller, grab format from template

Previously `rendered_format` was set only based on mime types
passed in Accept header, which was wrong if first type from
Accept was different than rendered partial. The fix is to simply
move setting rendered_format to the place where template
is available and grab format from the template. If it fails
we can fallback to formats passed by Accept header.
Merge pull request #5603 from drogus/fix-rendered-format-for-render-partial

Fix rendered format for render partial
Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.

objectify_options method should be applied to the proper options arg.

See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
Bumping to 3.2.3.rc1
force datetime attributes to be changed

backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable
Merge pull request #5618 from lest/patch-1

force datetime attributes to be changed
Don't break Haml with textarea newline fix.

See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)

Also fix 6 more tests that didn't yet have the newline expectation.
adding a branch to arel
Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml

Textarea newline fix breaks haml (3-2-stable)
Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml

Textarea newline fix breaks haml (3-2-stable)
Check if the options hash already exists and merge it with the another
hash.

Closes #2492 and #5614
Merge pull request #5622 from rafaelfranca/fix-2492-3-2

[3-2-stable] Fix label_tag to merge the options hash with the object hash
Add arel branch to the tests
Merge pull request #5624 from rafaelfranca/fix-build

Fix build
cahnges audit
Adds response body logging
Generated gemspec for new version and name
refactor for use yummi gem
refactor for use yummi gem
layout improvements
loop implemented
using yummi log formatter
Improving test configuration.
Closing listen sockets explicitly during exit.
adding Java project
Register certificates before calling get-classpath.  Fixes #613
replaced  global with  throughout the add_update_course() function
update rundeck/index.md
  unlink to api docs
location
add 
save
temp
temp
add 构造函数
add shopInfo
add
temp
Merge branch 'master' of ssh://git@github.com/automan/fario.git

Conflicts:
	src/main/java/com/taobao/fario/server/db/HibernateSessionFactory.java
	src/main/java/hibernate.cfg.xml
remove shop url
新增构造函数
Remove syntax error from wrapping.
get_tm_cost now returns only a cost
add desmond86 log
add daemon capable model
add willDestroy flag
Bootstrap theme improvements
Created solution for Ebuy

4.5 CS MVC 4 internet template with unit tests
Add finished time to recently finished tasks
Corrects wrong getopt() value (thanks DaJoe!)
Add initial close link.
Point to the actual scorecard.
Style dat close button.
Merge pull request #27 from basho/sdc-close-test-results

Dat close button
Remove whereis check for riak_kv_stat gen_server from riak_kv_status

Update riak_kv_stat docs
Merge pull request #339 from basho/rdb-admin-status

Remove whereis check for riak_kv_stat gen_server from riak_kv_status
Results: only including calculated bets in games with least/most points
Integration with refineryCMS, basic setup though, needs to be configured in order to edit proper pages
Added refinery cms configuration , needs tweaks for main layout though
Overrided some refinery pages like refinery/paes/show
Rendering Refinery's menu
Override of refinery/pages_controller
Modified Refinery's pages_controller in order to only render partials for Ajax request and full page for normal ones.
Loading partial content - a bit of styling
merges
Delete the JSRootIO that just copied before in my workspace.


git-svn-id: https://root.cern.ch/svn/root/branches/dev@46769 27541ba8-7e3a-0410-8455-c3a389f83636
Make a branch of JSRootIO to my workspace.


git-svn-id: https://root.cern.ch/svn/root/branches/dev@46771 27541ba8-7e3a-0410-8455-c3a389f83636
i001_z007
Update abbott.vim
add empty files in tmp to trace dir
- jsdoc updated
- verbose param renamed to verbosity
ignoring target
more realistic mock data
importing Juzu Standalone Simple app
removed the last of the big files, the log in data source downloads. optimized a few things for speed along the way. Generally things should be pretty snappy
Fixed: [Confluence] LiveTV record button in home was mapped to Fast Forward :\
Fixed: [Confluence] Live TV window was missing its background again after recent merges
vdpau redesign
VideoRenerers: add buffering
drop frame counter in application, ask render manager instead
videoplayer: adopt lateness detection and dropping to buffering
videoplayer: update frametime, it might change due to fps detection
videoplayer: give streams with invalid fps a chance for fps detection
dvdplayer: allow rewinding at end of stream, do a seek after rewind
vaapi: adopt to buffering in renderer
ffmpeg: add xvba hwaccel
xvba: add decoder
X11: refresh window after having received xrandr event
X11: reset to resolution stored in DESKTOP when switching back from fullscreen
xrandr: remove method RestoreState
X11: check if windowed when refreshing window after xrandr event
X11: ditch SDL for video and window events
add missing keys to xbmc keytable
X11: move xrandr events to WinEventsX11
xrandr: observe orientation
got sky to show
Fixed the map parser, and made the map accessor slightly nicer.

also, die, trailing whitespace
added .mc dir for mc config
kalua: enable/disable software installation via /etc/config/system
build: prepare_build: implemented + used 'reset_config' 2/2
build: set_build: support for applying patches in openwrt-patches/ dir
build: generalize patching
uploading modals for retargeting flow
xmonad: catch exception properly
keybinding for lessc
vim tweaks from sjl
modify README
README: add cool things to try out list
Update submodules

* .vim/bundle/tagbar eab0e67...f14c817 (2):
  > Fix small bug in RestoreSession
  > Allow the full hierarchy to be displayed in currenttag()

* .vim/bundle/vim-css-color 7c32782...3a2faac (6):
  > get rid of unnecessary XTermColorForRGB call on critical path
  > patch xterm→GUI instead of vice versa
  > use precomputed quantization array
  > use precomputed grayscale ramp
  > precompute color keyword highlights for faster load
  > Revert "only highlight visible lines during initial buffer scan"
use git pull to update
Merge remote-tracking branch 'origin/master' into freebsd
Slightly decreased standoff distance
Successful pacct packaging
Corrigindo TMadridLabel3
parse the map from the choosen file by the user on the ihm
HWELKWJEK:
Merge branch 'master' of https://github.com/bmeans/Banner

Conflicts:
	src/banner/FacultyForm.java
Added in the new pix ball estimate
some minor, but useful, changes
In the tresholded image, we now see debug info
PR#5116: abide english typography in debugger messages.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13022 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
PR#5119: camlp4 now raises a specific exception when 'DELETE_RULE' fails, rather than raising 'Not_found'

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13047 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
add max execution time in debug mode
Merge pull request #8 from bolgovr/debugmode

add max execution time in debug mode
added TV show logo collection PSD
Added simplecov (without spork mode)
Add BlatIO docstrings
Fix HmmerIO docstring typo
Add ExonerateIO docstrings
improve diagnostics when an inconsisten class hierarchy is encountered
add article filter to admin area
spelling
Fix issue #26: mkdir: Unquoted path with whitespace fails
Merge remote-tracking branch 'upstream/master'
New mysql table 'towns' should be also listed for jdbtools unit test
a new cross-compilation mode for Windows
sign error in total_produced
Merge pull request #59 from kristinf/dev

sign error in total_produced

Looks correct.
Bugfix: order of function arguments.

Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.

Also added an ASSERT that may help catch some misuse.
Fix comment.
Table interpolation for default values improved.

If there were no non-defaulted elements in the table, we would crash.
Now, all defaulted elements get the value 0.0 instead.

The usage pattern was encountered for the capillary pressure column
of a SWOF table.
Fix bug in GCONINJE input.
Improve comment.
Merge pull request #60 from atgeirr/master

A small collection of bugfixes
Started coding JS client API
adding f2_primfunks__stdlib.[ch]
Make password authentication more secure.

Update default passwd file to use PBKDF2/SHA1 with per-user salt.  Add
password file utility from java-util to the console.
Add more things to .gitignore.
修改 .gitignore

Signed-off-by: Zhang Jing <byrdkm17@gmail.com>
make ivy / ivysettings the defaults, maker uses unambiguous maker- prefix
Include time that plugin was called
Plugging Riak persistence into Winch server
adding inbox module
removing mustache engine in favor of handlebars based on PR #367 from @mridgway
Added printing of x when monitoring grad_f in Ipopt
Fixed grad_f evaluation for sparse gradients in Ipopt
Merge branch 'develop' of github.com:casadi/casadi into develop
Revert "Revert "Gather statistics: FX option "gather_stats" - implementing statistics for sundials""

This reverts commit 8e0bd7af8fa7466731fcebcd57053d62a631741a.
quitando el index
trunk added
Woo model loading prototype is here!
I've added a package for parsing .obj files and made a quick
example to show it off.

I've started looking into generic functions but havent got far
yet. The generic code in vectors will not work yet.

Ive also restructured the directories a little

As git hasnt tracked a couple of my moves I'm having to do this in two commits
Finished move of matrix and vector files
Fixed file renaming
List shared files that start with .
XDom work.
Version bump.
Warn if an include/exclude can't be found.
DOM work.
Forgot a file.
Added in detection for zip or text data io.
fixed (untested) restart timer
reformulando agregacao dos componentes
[前端]增加uploadify模块组件

Signed-off-by: cevio <evio@vip.qq.com>
Just exit if there is out-of-memory situation

FatalError will try to clean up a lot of resources, but pretty much first thing
it does is xstrdup, so it would end up consuming all stack until crash.
Possible buffer overflow in src/server.c: wrong buffer size passed to snprintf
src/files_select.c: Possible buffer overflow, wrong size passed to snprintf
Merge pull request #251 from kkaempf/master

Possible buffer overflow in src/server.c: wrong buffer size passed to snprintf
Implement basic call-collect so that remote agents can call a hub from
an unreachable location, and then allow the hub to use that socket to
tunnel back to the client and pick up the host

Author: Mark Burgess <mark@cfengine.com>

Squash Commit:
- Add more access control examples to docs
- Add more notes to access control
- Protocol readiness for collect calling
- Add the hook in to the server control loop to do NAT call-back if configured
- Extracting out the server logic into a separate file, so that parts of this module can be used for peering in the server daemon
Added ifdef for Nova only function, to fix broken compilation
(cherry picked from commit c665273d24451ace58601c865356e6f7f04a48a8)
Squashed commit of the following:

    commit edd25fca53c69f2d708e7bedc3a259bf20cf5362
    Author: Mark Burgess <mark@cfengine.com>
    Date:   Fri Jul 6 10:54:13 2012 +0200

        Made the sleep interval in the collect_call algorithm configurable with

    commit c006f1b08929734c961f418fd9fb6523bd7f841f
    Author: Mark Burgess <mark@cfengine.com>
    Date:   Fri Jul 6 10:32:29 2012 +0200

        Documentation for the collect call feature
Merge remote-tracking branch 'upstream/master' into feature/call-collect

Conflicts:
	src/cf-serverd.c
Merge pull request #92 from sigurdteigen/feature/call-collect

Feature/call collect
Add JSON container iterators
The session file stores the current position in document now.
Starting SFML SPIIs.
SFML Sound SPII.
Dox.
Make sure we correctly set the alignment for vector loads and stores associated with vector element lvalues.  Patch by Kevin Schoedel (with some minor modifications by me).



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153285 91177308-0d34-0410-b5e6-96231b3b80d8
Fixed converted ConstantArrayTypeLoc range. Added a missing testcase for ConstructorDecl source range.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167583 91177308-0d34-0410-b5e6-96231b3b80d8
Collapse ASTReader::ReadSLocEntryRecord() into its only caller,
ReadSLocEntry(). No functionality change.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166447 91177308-0d34-0410-b5e6-96231b3b80d8
Added missing test.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163226 91177308-0d34-0410-b5e6-96231b3b80d8
Add -Wloop-analysis.  This warning will fire on for loops which the variables
in the loop conditional do not change.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155835 91177308-0d34-0410-b5e6-96231b3b80d8
Ongoing documentation cleanup: fixed Doxygen markup errors, added \brief
annotations in many places where it involved little change, fixed some
examples and marked code examples with \code...\endcode, and changed a few
nearby mentions of C++0x to refer to C++11.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158486 91177308-0d34-0410-b5e6-96231b3b80d8
objective-c: warn on use of property setters
backing two propeties because proprty names
match except for first letter being of different
case. // rdar://11528439, [PR12936].


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@157435 91177308-0d34-0410-b5e6-96231b3b80d8
Sanitize the names of modules determined based on the names of headers
or directories, to make sure that they are identifiers that are not
keywords in any dialect. Fixes <rdar://problem/12489495>.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165821 91177308-0d34-0410-b5e6-96231b3b80d8
Rename -rewrite-includes to -frewrite-includes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158458 91177308-0d34-0410-b5e6-96231b3b80d8
Fix crash on missing header in -rewrite-includes.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158459 91177308-0d34-0410-b5e6-96231b3b80d8
Support -frewrite-includes as an option while preprocessing.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158460 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Add a very simple test case.  Basically, we're only testing for
crashers at the moment (and coincidentally this case was causing a crash).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161520 91177308-0d34-0410-b5e6-96231b3b80d8
Remove extraneous comment.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161521 91177308-0d34-0410-b5e6-96231b3b80d8
Relax the FileCheck assertions in this test a touch. Previously the test
relied on an artifact of how the inliner and subsequent passes in
clang's -O3 mode happen to treat basic blocks and the labels for the
basic blocks. In my work on the inliner, and changed this fundamental
assumption, and the label that was being checked on the entry basic
block will no longer appear in opt builds. There was no reason to expect
the label to always be present anyways, much to my regret.

I've changed the test to just ensure that we return an immediate
constant. If there are intervening instructions, that's bad, but not
really that relevant to the test.

I'd love it if others have a better way of checking that a function body
contains only a 'ret' instruction that isn't dependent on whether or not
the entry block receives a label...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153243 91177308-0d34-0410-b5e6-96231b3b80d8
Move helper class into an anonymous namespace.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160172 91177308-0d34-0410-b5e6-96231b3b80d8
$.prop should be used to set disabled, not $.attr
修复之前误删的内容
test: uv_queue_work should not use echo statement.
util: fix uv_exepath and uv_cwd
re-ordered nav links to match 3D order
Add binop module

This new module is my first attempt at characterizing all sixteen binary
operators. The 'apply2' method is an implementation of Shannon's
expansion theorem.
Fixed block definition for gecos
Added static registration
Merge branch 'master' of labs.intranet.gonicus.de:gosa-ng
Remove extra container, use divs instead of sections.

- Sections lend themselves towards article/long form types of content and are much harder to define for application markup.
Have footer clear all previous content.

- Fix bug where no links were clickable.
Tidy up admin markup, see #414.
Clean up the items/files-form. See #412.
Replace class description with explanation.

See #412, #414.
Adds filter to allow plugins to control whether the admin-bar shows.

Needed for GuestUser updates.
Change search settings URL. Fix #422
Add spike of new layout
moved easyXDM in to public
added environment file for panix5.panix.com machine
Merge branch 'master' of github.com:clownfysh/bin
package: fix component script name
Prevent unnecessary empty lines in completion list

The 3-space pad between columns should be taken into account
for the calculation of how many columns to use, not just
when adding padding.
Merge pull request #16 from trptcolin/column_calculation

Prevent unnecessary empty lines in completion list
Escape history entries only from the reader

This way we can adhere to the expandEvents configuration.

closes #17
Merge pull request #18 from trptcolin/history_escaping

Escape history entries only from the reader
Change groupId back to jline
Upgrade to jansi 1.8
Fix #23: Do not skip the last character if '\'
Update README.md
Update README.md
Update README.md
Update README.md
Remove commented code
Add javadoc on Terminal#wrapInIfNeeded
Fix #24 where the mask isn't honored
Add some headers / javadocs / @since and @author tags
[maven-release-plugin] prepare release jline-2.6
Move window parsing validator to parsing function
Start to handle model state with neighbours.
Restore the picking, but performance decreased.
Octopress init
Site updated at 2012-07-10 07:30:27 UTC
Site updated at 2012-07-10 07:46:07 UTC
Site updated at 2012-07-10 07:51:07 UTC
Site updated at 2012-07-10 08:49:51 UTC
Site updated at 2012-07-10 08:52:13 UTC
Site updated at 2012-07-10 08:57:26 UTC
Site updated at 2012-07-10 09:23:25 UTC
Site updated at 2012-07-10 09:30:21 UTC
Site updated at 2012-07-10 11:04:17 UTC
Site updated at 2012-07-10 11:07:11 UTC
Site updated at 2012-07-10 11:09:22 UTC
Site updated at 2012-07-10 12:33:33 UTC
Site updated at 2012-07-10 12:35:07 UTC
Site updated at 2012-07-10 12:51:33 UTC
Site updated at 2012-07-10 12:53:25 UTC
Site updated at 2012-07-10 12:54:11 UTC
Site updated at 2012-07-10 13:28:43 UTC
Site updated at 2012-07-10 15:50:09 UTC
Site updated at 2012-07-10 15:53:33 UTC
- Menu analyze WIP
- Menu analyze resume working
dust.sanitizeURL
Remove config section from testing chapter.
Removing message_set because it doesn't appear to exist anymore.
writeup skeleton
script shell pentru administrarea serviciului DHCP
the stack layout work well but attributes settings