labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed #17999 -- Added a 'See also' paragraph to OneToOneField doc section.

Thanks creecocde for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed #17947 -- Fixed language restore after management command even when exceptions occur. Thanks andrey@kostenko.name for the report and the patch. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed #17989 -- Made an error message translatable in CH localflavor. Thanks piquadrat for the report and the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed #11150 -- Removed dependency on cStringIO in ImageField validation. Thanks vvd for the report.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed #17870 -- Documented that EmailField default max_length of 75 does not comply with RFCs 3696/5321. Thanks Rotund for the report and the patch and Russell Keith-Magee for the review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed #17811 -- Added connection parameter in call to EmailMessage from send_mass_mail. Thanks fed239 for the report and danielr for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Removed with_statement imports, useless in Python >= 2.6. Refs #17965. Thanks jonash for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Use the class decorator syntax available in Python >= 2.6. Refs #17965.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Removed some Python < 2.6 compatibility code. Refs #17965.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Added stub release notes for 1.5


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Fixed #17999 -- Restored the links to examples from models documentation. Refs #17605. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
changed link path.
Implement padcv

State subs can now be referenced and called.  Most of the tests in
lexsub.t are now passing.  I noticed mistakes in a couple of the
tests and corrected them.  In doing so I got an assertion failure
during compilation, so the tests in question I wrapped in a skipped
string eval.

State subs are now mostly working, but there are a few things to
clean up still.
Allow CVs to point to HEKs rather than GVs

This will allow named lexical subs to exist independent of GVs.
Increase $B::VERSION to 1.37
Lexical stubs should not AUTOLOAD

There is a feature that allows stubs to fall back to their GVs’
CVs when called.  If I reference a stub, e.g., \&bar, and then
bar is autoloaded, the AUTOLOAD sub assigning *bar = *foo or
*bar = sub {...}, I can still call then stub to which I have a refer-
ence, and it will fall back to the overloaded sub.

That is all fine and dandy, but it causes any stub that references a
GV via its CvGV pointer to call that GV’s CV.  If we name a lexical
sub by pointing its CvGV pointer at the GV whose name we want it to
have, then the lexical sub, if undefined, will try to fall back to an
autoloaded sub.

That causes things to gang agley in cases like this:

    use 5.01;
    sub foo { } # package sub
    state sub foo;
    foo(); # calls lexical sub; falls back to package sub

While we could fix this by flagging the sub and checking for the flag
in pp_entersub (as we do with anonymous subs), it is better simply to
use a HEK, instead of a GV.  Since a GV is quite heavyweight for stor-
ing just a name, I was going to do that anyway, eventually.  Doing it
now fixes a bug.
op.c:newMYSUB: inline var used only once

as of the previous commit
op.c:newMYSUB: Remove unused vars
mktables: Convert to BELL meaning U+1F514

As a result of the Unicode 6.0 mistake of using "BELL" to refer to
a different code point, Perl has deprecated use of this name for 2 major
release cycles, while not fully implementing Unicode in the interim, to
allow any affected code to migrate to the new name

This commit now switches to the new meaning of BELL.
remove file fileutil git flag
Added schema.sql file
Threw in a quick login form, UI only
Sign up form UI
Misc updates to homepage
Setting database to autoload in autoload.php config file
Added users table to schema.sql
Set db credentials, autoloaded session class, and set encryption key
Started User_model
Workin' on the sign up process
Adding htaccess file with re-write rule to remove index.php from uri
Don't crash on encoding conversion error for subject
webtide(): accept tformat
remove dependency on hstore
fix bug 775147 - add statsd calls
fix bug 774184 - prevent duplicate slug error message
Merge pull request #437 from groovecoder/statsd-775147

fix bug 775147 - add statsd calls
Merge pull request #435 from darkwing/slug-taken-774184

fix bug 774184 - prevent duplicate slug error message
Merge
cleaning up class structure
checkpoint
Agrego un dataset nuevo
Repaired a few bugs on windows platform
[maven-release-plugin] prepare release rokta-3.0.10
Add gradle build system.
Remove maven build system.
Add gradle files to gitignore.
Add readme.
adding some view opearations, reworking import functions
Add documentation to i386 code
because:

# Consider adding your own code to a new file instead of editing this
# one. Cucumber will automatically load all features/**/*.rb files.
change Link#for_date to accept from & to dates
move Then show me the page to shared_steps.rb
changed Link#for_date filtering
Multiple Deferred and Promise fixes.

Properly adheres to the Promise/A spec now with regard to forwarding of `undefined` values returned by callbacks (rather than swallowing them and passing the previous result as before).
Deft.promise.Promise.all() now 'fails early' when any of the specified Promises/Deferreds are rejected or cancelled.
Deft.promise.Promise.any() notifies failure callback of rejection - fixes minor typo that previously broke this: 'rejector' vs 'rejecter'.
support for flash messages
documentation
forgot tcb
forgot jquery cookie js
Very crappy meeting parsing implementations for eventbrite and facebook
Fixed 'choices' optional parameter type bug
config: use ttyPIGCS everywhere
Savegame - 12.06.2012 - 15:16 Uhr
permissions method on export_channels
sv language
Fix mouse scroll on GtkKnob widget.
Fix trailing whitespaces.
Fix problems found by Coverity scan.

CID #743175 Unchecked return value
CID #743176 Logically dead code
CID #743177 Dereference after null check
CID #743178 Dereference before null check
CID #743179 Uninitialized scalar variable
CID #743180 Uninitialized scalar variable
Require the jaccart similarity
一通り書いた
Fixed checkin edit bug
Need to sleep.
Move CreateIosDevice to Victor.
Add preview field (not yet connected to actions)
Preview updates as prefix is typed.
Full featured preview field
Clean up app
Merge
Fix multi-digit integer parsing, with tests
Added structure for lesson 4
Fixed #18515 -- Conditionally regenerated filename in FileField validation

When a FileField value has been saved, a new validation should not
regenerate a new filename when checking the length. Refs #9893.
Fixed #19378 -- Ensured get_success_url returns a non-lazy URL
Fixed #19518 -- Documented the deprecation of localflavor.

Also moved the contrib deprecations at the top of their section and made
minor markup fixes.
added Shader::ShaderSource::define/undefine
resetting nextTextureUnit when binding new shader
changed textureunit assignment
added camera::Create
minor changes to fbo for more flexibilitz
geo_cube now can generate line geometry
extended texture2darray
added undefines for near and far to gl.h when under windows
extended visualizer with box and frustum primitibe
Merge branch 'master' of github.com:dkoerner/base
More improvements to the RavenDB behavior at the TCP layer
Updating NetTopologySuite and dependencies to latest.
Fixing a race condition inside NtsGeometryServices
Remove all warnings
No more warnings
Updating the spatial dlls again
We can't close the connection, otherwise the changes API won't work
Making sure that we can get an error on optimistic concurrency delete inside transaction using munin
Making sure that we can get an error on optimistic concurrency delete inside transaction using munin

Conflicts:

	Raven.Database/Storage/Managed/TransactionStorageActions.cs
	Raven.Tests/Raven.Tests.csproj
Fixing issue with validating licenses
Force test dispose to clear the db dir
Making sure that we can identify the id property even in queries including projections
Allowing to use int.Equals method
We need an exception for string here
Merge branch '1.2' of git://github.com/DanielDar/ravendb into 1.2
Properly handling hiding new db creation dialog when using embedded
Adding passing tests
Add OrderByDescending support
fix tabs so that build script completes
Failing test when using Suggest in Linq API
Taking specified field and term into account when suggesting over a Linq query
Provide ability to disable style and documentation checks from within the RakeTask
Created project structure. Added main functionality.
README: one more site in demo
restored everything with scrollablity
Return rbenv paths from zshenv to zshrc
давно не коммитил. много.
[#2733,js][s]: data viewer working with new (v2) DataStore.

* Upgraded to latest recline.js which has support for new CKAN datastore
* Refactor application.js setup code to use this plus new datastore_active flag
Merge branch '2733-feature-datastore' of https://github.com/okfn/ckan into 2733-feature-datastore
initial trunk import
changed type for shflags to executable
New save javascript message with support for embedding assembly metadata
New boo.lang.compiler version supporting overriding of the assembly locator
Some love for the command line compiler
Fixed the binary assembly generation
changed about
Merged
Testing deploying to server
merged with server
Add nodetype searchable index for Nodes fixes #111

Allows nodetype:name to find Nodes with a particular NodeType name.
Also includes nodetype: in the default "all" query field.

NodeType objects are no longer included in search results.

Added tests for the SearchController to test the nodetype query and some
other basic tests.
Merge pull request #115 from gschueler/i111

Add nodetype searchable index for Nodes fixes #111
exponential tree size
Added latency estimation to buffer
Signal gets window inside rbtGenerateSignal
Error check in revtime
Used is_string utility method
Support notifications on fetch errors.
Refactored config some and added example for new options.
Added negative matching.
parse_generated.py: modularized hacks so they can be fixed easier

run-batch: changed parameters around

documents.py: formatted output

Main.java: added an error check (should probably be handled elsewhere)

Lda.java: includes test paper indices with predictions

test: disabled PLSI (for speed issues)
Colored highlighting in WeScheme upon clicking the links in error messages
Error message highlighting in interactions, gradient in definitions
Arity error highlighting works
highlights all arguments of function definition now
More highlighting
Static highlighting beginning to work
more progress
fixed a latent error in interactions regarding args and message. refactored renderError as well
refactored rendererrorasdom again
the plan we must stick to
Fixed line undefined, col undefined bug
updated the plan
Merge branch 'master' of github.com:bootstrapworld/wescheme2012
Adding our list of tests
fixed a bug where highlighting didn't work
changed coloring to match design docs- colors cycle and are more colorblind-friendly
fixed bug where symbols were not being converted to strings
updated the plan to reflect work so far
More minor changes
Merge branch 'master' of github.com:bootstrapworld/wescheme2012
check whether db is in a state to import (see #191)
Fix typos in the installer.
Revert "Removed all the cats"

This reverts commit 77da21c0a108a4700e66dd224aef5e72cde2ce97.
Revert "Add all the octocat txt files"

This reverts commit 980955b2729c3be32815f967cee589685299b585.
architecture modifiaction

+camera 3rd person
+scene loading + ressources
framework for friend functionality
Merge branch 'master' of github.com:eddieh/Circle
fast forward, include all standard files
Produce a basis for a vector space.
Some house cleaning to pave way for the setup script
修复hdgl.db.client中的错误（由于修改了MutableGraph接口引起的）
修复了BSP中的一个bug
App - save a working state
Default logging level is now error.
Merge branch 'develop' of github.com:ellzey/RProxy into develop
Merge branch 'release/2.0.8' into develop
Merge branch 'develop' of github.com:ellzey/RProxy into develop
Set "downstream down" messages log at level 'info'.
Add strip-headers config, see commit msg for details.

- In the vhost section of the config, a new configuration variable has been
  added named "strip-headers". The value of which is an array of strings. These
  strings represent headers that should be stripped out of the response that the
  downstream had set.

  For example, if your downstream server sends the header "Sean: Cunningham",
  and you have the config 'strip-headers = { "Sean" }', if the Sean key exists,
  it will be removed.
Release v2.0.9, see ChangeLog for details.
Merge branch 'release/2.0.9'
dist metric assignment 2
CartaPerDue: cambiata rappresentazione data scadenza
CartaPerDue: implementazione manuale properties scadenza
Coupon: corretto formato countdown
Offerta: corretto formato countdown
LoginController.xib: modifiche grafiche
file xcode
IAPHelper: manager per l'in app purchase
AcquistoOnlineController: aggiunto oggetto per collegamento al db remoto
AcquistoOnlineController: inserito controllo per presenza rete
DatabaseAccess: inserito metodo per recupero catalogo iap
IAPHelper: rimosso array inutile
AcquistoOnlineController: inserita chiamata a gestore IAP per lanciare richiesta prodotti
AcqustoOnlineController: inserito hud spinner e suoi metodi
MBProgressHUD: inserita claase per hud spinner
boots+footbal
red sort of works...
Merge pull request #5 from wwaites/master

red... kindof... kludge..
agora sim
Merge branch 'task/1236' into feature/123

Conflicts:
	README
B-02750: Memberships Graph: Create ExtJS component
- Refactoring update() -> setGraphData()
- Removed unused code
Content Types 2.0: Second commit of work on domain model and json generating and parsing
WARNING: work in progress - DO NOT USE!
B-02946: Update changes to rest services in wem-ce.
Fixed NPE when display name not set in group.
Add extra constructor for Query.
Updated some modules to dev versions, installed some more & added boost
typo + Charka is referered to simply as Chakra, not Chakra GNU/Linux
* data update (ampelschaltung)
* ProgressSplash: improved progress speed calculation
  (TK_SPLASH_COMPUTE)

  For example, there's a descriptive string about the
  progress step.

  Also added some documentation how to use the TK_SPLASH_COMPUTE
  output.
* ampelschaltung_postprocessing: added -filter-year option
* ampelschaltung-orig: manually fixed directions
* ampelschaltung_postprocessing: added -with-summary option
* data update (minor)
* new method: neighbor_by_direction
* new function BBBikeCalc::norm_deg
* new test script for StrassenNetzHeavy
* removed unused Hyper.pm code
* new RelaxNG schema for bbbike.cgi result (output_as=xml)

  First generated with the help of trang, then manually optimized and
  documented.
* removed usused is_in_path definition
* cgi.t: schema check for output_as=xml

  There's a new schema check function in BBBikeTest:
  validate_bbbikecgires_xml_string
* validate_bbbikecgires_xml_string also used in t/cgi-mechanize.t and
  t/cgi-test.t
* removed unused and obsolete wap_test.pl
* use is_in_path from BBBikeUtil
* removed unused cvs updating code in Update.pm
put in links for fast math
added test
Merge branch 'master' of https://github.com/esli/learning
ultima add do teste.txt
ultima add do novo
Temporary fix, hacky
fixed race condition in tcase
adapt controllers to core\mvc\AbstractController class
add Box\Controller\GetSimulatorController class
no need for broker functionality, PluginManager class is sufficient.
change box/get-simulator/dashboard >> box/get-simulator/index
implement NoLayoutViewModel
implement interface Modulable & classes Module, ModuleFactory
implement GetSimulator module class skeletton, implement processRequestAction used when form is sent in box/get-simulator/index
Merge branch 'impl-module_base'
maintenance code
fix parasoup encoding
Moved according to order in task description
change pom to add test
Do not override package configuration, but uses .local files
porting to py3k: fixed print statements
better py3k porting mantaining 2.5 compatibility
fixed 2.5 print backwards compatibility
Merge remote-tracking branch 'pr0gg3d/master'
Attribution re #704
Cut 1.3.6
* tests/java/codegraph/String.java: import java.lang.* by default
* tests/java/parsing/Annotations.java: support
* tests/java/parsing/EntryGenerics.java: support for type parameters
* lang_java/parsing/ast_java.ml: extend can take a type, not only a name
* lang_java/parsing/conflicts.txt:
* tests/java/parsing/ImportStatic.java:
* tests/java/parsing/: some TODOs
* lang_java/parsing/parser_java.mly: partial support for generics with
parsing trick
* tests/java/parsing/GenericQuestion.java:
* tests/java/parsing/Foreach:
* tests/java/parsing/VoidDots:
* tests/java/parsing/WildcardExtend.java:
* tests/java/parsing/: add Todos
* tests/java/parsing/GenericConstraint.java:
* tests/java/parsing/WildcardExtend.java:
* tests/java/parsing/GenericConstraint.java: support
Added warning to README about having a pydas.pxd file on your $PYTHONPATH
Fix style left
neue Kontakte
allow to set the sep char
ignore netbeans ide meta files
removes dbg output
#596: Set language in constructor of language object in install.php, too.
Merge branch 'fluxbb-1.4' into fluxbb-2.0

Conflicts:
	include/functions.php
Fix duplicate global variable in include/functions.php.
Revert changing default values for language names to short language codes.

Use "English" again instead of "en".
More stringent fixup.
Don't use setjmp/longjmp for verification.
Don't use setjmp/longjmp for verification.
Nicer project start.
Updated ensime to the new build.
named column leave to leaves
[PATCH]
CONFIG.INI = CONFIGURAÇÃO DE DB E BOOTSTRAP
Commit from LuCI Translation Portal by user jow.: 815 of 815 messages translated (0 fuzzy).

git-svn-id: http://svn.luci.subsignal.org/luci/trunk@8973 ab181a69-ba2e-0410-a84d-ff88ab4c47bc
re-constructe
update myself
BOSH OpenStack Agent
Added toolbar with image buttons. Increased Visualizer size
Google App Engine Version
Animations working for Detail view
Uebung 2 ref
Proper throw statements
Initial case file reader implementation.
Ignore eclipse project files
Receive response at POST
Also at PUT
bad coffeescript habit
2012.12.28 1720
Development version 2.0-dev
Minor changes - Add metrics, update version checking.
Fixed last push,
Removed a lot more code, cleaned up the old use of settings.
Correct Push.
Fix for version check.
Resolve Issue #111, Issue #104.
Implement Issue #110.
Simplified the date format config option.
Added config option surrounding world containers, ability to disable this inside backups.
This should resolve issues with WorldEdit.  Issue #114. -  Test

Completely re-wrote the backup code.
This resolves Issue #116.
Added multiline messages Closes #103
Added size checking on old backups. Closes #51
Added another check for closing scheduled tasks. Closes #109.
Posssible fix for Issue #114.
World Seperation FILE_SEPERATOR Added.
Updated Settings to include defaults for all settings.
Minor general code changes.
Various fixes.
Large issue with world backups only completeing the first time, then not after that.
This is fixed in this commit.
Re-structured some more backup code to be more readable.
Preparing for release :)
Beta Build - Almost ready for release!
Various Fixes, Please I need to check this well.
As long as there are no major issues with it, this will be pushed to master.
Add backup in progress variable, Only one backup can run at once.
Add comments and clean up logger class.
Clean up and simplify the preparebackup class.
Removed unneeded classes and methods.
Release v2.0

Conflicts:
	pom.xml
	src/main/resources/config.yml
	src/main/resources/plugin.yml
	src/main/resources/strings.yml
get infomation from website
Fix for lack of proper cloud-side shared directory support.
Working shared directory solution; first attempt.
FORGE-680
Corregido bugs de Eliminacion de libros
Version bump to 0.9.0
Regenerate gemspec for version 0.9.0
Minor performance improvement
Add pry to development requirement, support new_methods_only and old_methods_only
Apply to selected methods only
Version bump to 0.9.1
Regenerate gemspec for version 0.9.1
Change around implementation
Add support for looped effects.
Fix #11795, #10470: keep scripts in DOM; execute only on first insertion. Close gh-864.
fix Safari test failures
git周りのプラグインを更新
Decreased indent in bash code blocks.
small change to controllers.js
Improvements

- Publish all button goes away when there's no more unpublished
messages.
- Added to more fonts to choose from when adding a text message
a little more style on the axes
tc078 and tc126 are no longer expect_broken (6096 is fixed)
update max_bytes_used for T4801 on 64-bit
no need to force -O here any more (#3966)
Arrow wibbles
added sinh/cosh/tanh
added dvda --> casadi module
removed deprecated DMatrix/SXMatrix
added sxmToList/sxmToLists and removed sxmAt bug
allow SXFunctions to have empty inputs
put SXM/SXFunction/NLPSolver in hidden module Types and re-export only __type__ constuctors to user
implement DAEs
added test package
added Cvodes and Idas integrators
creatSXFunction' where outputsEmpty was looking at inputs
merged hcasadi and hcasadi-dvda
sxFunctionCreate now takes as inputs things which are traversable and returns function with inputs/outputs of that same traversable type
got DAE working - needed to refactor SXFunction a bit
added Idas/Cvodes options
added visualization to pendulum DAE
mala poprawa w nazewnictwie tworzonej bazy
update readme
Minor cleanup to remove all existing jshint errors.

- No extra commas after last object or array item.
- default must be in quotes because it's a reserved word.
- jshint is crazy and wants to see '0' before all decimal literals.
Merge branch jslint-errors.
A very basic text geometry.

- Positioning x, y based on scaled data values.
- Very simple text format for interpolating data values into the text displayed. See examples.
- SVG implementation somewhat questionable: currently they hover over everything but are transparent, but that will mess up hover events for other things down the line.
Merge pull request #6 from asolove/text-geom

Text geometry begins
Upgrading d3 to 2.10.0.
show max. 5 lines in collapsed view
paginas web filtrando sin probar
busqueda filtrando de pagina web funcionando
Added Pygments.start to initialize Pygments on startup
Merge pull request #467 from jamesduncombe/pygments_initialize

Added Pygments.start to initialize Pygments on startup, fixes #465
bit of testing info
svd updates
bugfixes
Warn on window close
Merge branch 'bugfixes' into staging
active plot window drawn with border
fixed wifi percentage > 100 bug
create lesson category changes plus signup & login styling
hola vite
0.0.11 announcement and feature improvements
Refactor search indexing into plugin. Refs EMP-132
Fix sort order of comments on tickets. Refs EMP-151
Fix date created in all JSON formats and fix create date of comment
events.
Get the new ticket template up to snuff. Refs EMP-103
Rename some vars.
Add user profile and some new fields. Refs EMP-148
Improved timeline and user bits. Refs EMP-148
Date formatting and timeline improvements. Refs EMP-148
More timeline improvements including actually using the utility template
on the timeline page and adding pagination. Refs EMP-153
Timezones added. Refs EMP-143
Convert to joda time. Refs EMP-143
Fix busted date formatting in search indexing. Refs EMP-147
More timezone work. Refs EMP-143
Read as UTC from the DB and add the timeago.
Version bump and timezone dealings. Refs EMP-143
Revamp ticket screen a bit to show project (with link) and whatnot. Refs
EMP-60.
Get rid of the cog, not needed.
Get rid of useless include, do it inline.
Various fixes related to a new installation of Emperor. Refs EMP-156
Remove useless comment.
add hover subscribe button to podcast directory
use post request for chaning default privacy settings
use post request for changing podcast privacy settings
updated jQuery from 1.7.1 to 1.8.1
Added task to run integration tests with parallel executer
Downgraded temporary logging warn->info
Update UserGuideSamplesRunner so that it is tolerant of Parallel execution warning
Fixed deadlock in DefaultCacheAccess resulting from incorrect nesting of operations
- Use ThreadLocal OperationStack to track stack of operations for a thread.
Improvements to DefaultCacheAccess operation stack
Fixed ExecutionOptions so that we will use more than 1 parallel executor thread
Updated docs for new GenerateIvyDescriptor task
REVIEW-240: Use JUnitTestExecutionResult testfixture for validating executed tests.
polishing
added support for filtering and sorting of multi-tests

- in particular, this allows to run a single method of MultiVersionIntegrationSpec's and the like
- after a fix in Spock, IDEs will also display this correctly
added spec for Scala incremental compilation
GRADLE-2456: fix ci build & simplify string formatting
bug fixes for shipment management
styling for pdf rHeader
org logo in rHeader
push gambit
Background invoker
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	gen/com/example/R.java
	src/com/example/MyActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hearme/locator/gps/GPSActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hearme/locator/gps/GPSActivity.java
Make grnxx::FlagsImpl<T> a POD type.

Explicit initialization is required for zero-fill.
Add grnxx::FlagsImpl<T>::none() to get a zero flags.
Criando cadastro de eventos
Merge branch 'master' of https://github.com/grupo3rpv/rpv
con el principio de shmem
changed float to use template type
Clear Ethernet header when reading packets from a tun device.

This fixes a warning from valgrind about uninitialized bytes, which were being
sent to other nodes.
Fix memory leaks found by valgrind.
Require namespace::autoclean again.
Merge branch 'master' of https://github.com/theory/sqitch
Merge branch 'master' of https://github.com/theory/sqitch
fixing a typo in README
fixing a typo
Add `bundle` to `sqitchcommands`.

And update the comments about it in `sqitch.pod`.
Note `bundle` doc fixes.
Timestamp v0.922.
Increment to v0.923.
Move refpunct directly into the name regex.
Add forward and backward change references.

You can now search for changes and append ^ to mean the change before the
change you're searching for, and ~ to mean the change afteward. Use ^^ and ~~
to go two steps. Use ^n and ~n to go n steps. Works for symbolic references
and tags, too.
Make "FIRST" and "LAST" reserved words.
Add `earliest_change()` support to engine.

Complements the existing `latest_change()` method.
Add support for @FIRST and @LAST.

These new symbolic tags refer to the first and last (earliest and latest)
changes deployed to the database from the current project.
Use `@LAST` in reverts in the tutorial.
Mention the other symbolic tags in the tutorial.
Show actual change name when deploying or reverting to a target.

Rather than the name specified for the target option. So rather than
"Reverting to @LAST^", we now display something like "Reverting to users_table
@alpha".
Tweak reversion message.
Tweak revert message a bit more.
Move To Dos to GitHub Issues.

Relevant issues:

* [Add Custom Formats to Status Commands](https://github.com/theory/sqitch/issues/41)
* [Implement Plan Command](https://github.com/theory/sqitch/issues/31)
* [Make Config Command Exit Codes Consistent](https://github.com/theory/sqitch/issues/42)
Fix error when the new sitemap is the first on being created.
Updating PostgreSQL uninstall file.
Some UI fixes on Joomla 3.0 and fixed search on sitemaps view
Small fixes on UI for Joomla 3
Registering XmapHelper on JLoader to allow the app to find the class if needed
Adding images and page breaks on article menu items
Making content plugin compatible with Postgres
입력기가 처리할 수 있는 키만 골라서 처리

issue #21 #22
integer, bool 설정 저장

issue #20
Allow configuration to be specified on a service descriptor

An example of this would be:
<param name="curl.CURLOPT_CONNECTTIMEOUT" default="100" />

This would override the configuration set by the instantiation:

new Client(
    'http://www.example.com',
    array('curl.CURLOPT_CONNECTTIMEOUT' => 100)
);
[Http] Minor perf improvement to CurlMulti
Merge remote-tracking branch 'benmatselby/command-based-override-config'
Minor cleanup
now using meteor
refresh modify
Wasn't correctly vectorizing store nodes.
Basic front-end support for reductions

Lowering doesn't produce the update step yet
There's no update() handle to schedule the update step yet
Unneeded deps
Spelling error
Formatting
1 test set
harder. faster. [two things are missing]
elephants are impossible. a statement on life?
Lab 4 Commit

Final submit of the files, everything is working for the most part
adding option to use single icon for all values
switched to secure karma port (sic)
Update notes for submitted changes

* Rename CloudFormation service to heat-cfn
install.sh: Modify progress messages
install.sh: Remove part of other task
install.sh: Add .osx tasks
HY: change rear view width to 100
fix postgresql install
Made it possible to change restriction sets.
Also sent out a stateElementModified-event when changing restrictions.
Made an example project where we change the restrictions.
Made combobox respond to updates in restriction sets.
Added radiobuttons to the restriction example.
Made radiobuttons respect update of restriction set in QT
Made a helpful loading text.
Not sending updates when we are receiving.
Reading in new restriction set.
Support for changing restriction set in ExposedModel in JavaScript.
Made it possible to change restriction sets for combobox. Radiobuttons still lacking.
Enabled serving static admin media.
Removed the links to the experts list from the webpage and admin interface.
fixed 'ongeldig' back to light_red
fixed cucumber
fixed cucumber
Number of attempts and number of successes are now correctly printed
after migration.
Fix spec description.
Merge branch 'master' of ssh://10.2.12.24/home/git/trunk
AddInventionField:complete
HasId for contain id
DeleteInventionField:completed
ViewInventionFields:compeleted
get report of all users(bug find in forghani codes! :) )
initial hookup from motion detection to leaves engine, using simple distance to determine coordinate pairs
2 del commit
Fix memory pool. Still slower than malloc.
$ luajit ../test/benchmark-ping-pongs.lua
ping_pongs: 152527 roundtrips/s
$ luajit ../test/benchmark-ping-pongs.lua
ping_pongs: 158737 roundtrips/s
$ luajit ../test/benchmark-ping-pongs.lua
ping_pongs: 147202 roundtrips/s
$ luajit ../test/benchmark-ping-pongs.lua
ping_pongs: 145879 roundtrips/s
$ luajit ../test/benchmark-ping-pongs.lua
ping_pongs: 144427 roundtrips/s

And sometimes an error occurs on server.
$ luajit ../examples/tcp-echo-server.lua
luajit: /home/hnakamur/couv/deps/uv/src/unix/stream.c:934: uv__read: Assertion `!uv__io_active(&stream->read_watcher)' failed.
Aborted
starting to do listwise integration
remove years from Apache header
Removed gzip, as it is in the basic build environment
Gitignore binaries
Factor socketcan to separate files
Merge branch 'achStructureMod' of github.com:hubo/hubo-ach into achStructureMod
Let's ignore them pyc files
We have been comparing two process life lengths.

Turns out that there are some subtleties that we missed in regards to
accounting for process life-lengths.  Specifically, what happens if a
process dies mid-period?  We thought we'd accounted for it, but
apparently not.

So, I'll soon add a similar -20 data file.
NFC: minor data file formatting consistencies.
Whoops!  A data inconsistency fixed.

The printed version had 1400, whereas what we were actually running had
2000 for the cost of E01 in 1990.  Go figure!
Add missing TechOutputSplit constraint to dat file.

We hadn't noticed it because SRE is not used.  But that's not excuse for
not comparing apples to apples.
The -20 data file, with appropriate changes.

Will note -- again -- that we still don't completely match MARKAL, so
some of this data file is a kludge.  Like forcing the 3 TXD MaxCapacity
to the various values.
Minor update, biggest is making output "-15.ods"

Changes include:
 * Being a little Pythonic about creating the Zip file
 * Cleaning up after itself
 * Making output "utopia-15.ods"
Simple rename to -15.py
Copy script for creating -15.ods to -20.ods.

Given how this script currently naively creates the ODS file for
comparison, the quick and dirty approach of copying and changing the
input values (in the large base64 encoded block) was my route of choice
at this time.
Update README text.
hxfsc changes Property.html
Change AmbiPi to use UDP instead of TCP.  TCP was a bit overkill, however now there is no method to turn off all the LEDs when a client disconnects.
Updated version to 1.4.5-R0.2-SNAPSHOT for development towards next release.
Add DamageCause for FallingBlocks. Adds BUKKIT-2781
Updated version to 1.4.5-R0.2 in pom.xml for Beta.
Merge tag '1.4.5-R0.2' into 1.4

Jenkins build #2488

Conflicts:
	pom.xml
Force values in ranges series to be numeric
Clip region before plotting

This avoids drawing highlighted regions outside of the plot area.
Remove webmock, external requests will fail anyway
Configuration of Sinatra is done externally anyway
Newly edited paper, still needs navigation section
added Doxygen system to the code
Fix problem when json data was loaded only once and then would not reload
Fix infinite reloading after displaying map view
to github
to github
Adding a create dir fun
Cleaning up vimrc a little.
note.
Fixed asset tables and created stubs for user assets.
75 Hello world on MeCab
Use Stream Server instead of pinging MasterServer to get games info
WIP 2: WIP's revenge
update template with admin path, change width of column, etc
Fix: Possible exception due to recent move of compiled dll to CryMono temp dir.
BPMS-992: Functionality to view tasks process wise from process tab
BPMS-975: Intalio-Workflow portlet for Liferay-606
Merge pull request #4 from khyatidesai/6.5.x

Merge changes made for BPMS-992  and BMPS-975 to branch 6.5.x
Changed version number to 6.3.0.004
add readme to ppt
Added constructor functionality; Property call to Property;
...
eblob_iterate_send build update
Fix CSS comment parsing in transformer
隐藏verticalHeader;调整行高;符合替换规则的请求加背景色;修复rulemanager中对\的转义bug

TODO: 符合规则的请求颜色自定义
Exercices 3, 4 and 5
many changes, fixes, etc; still working on docs. ;)
completed online eyelink event handling + more

- eyelink event handling is now almost complete, button and message
events are remaining.
- added ability to retrieve events for a specific device by access the
client side device object's getEvent method directly.
- added a getEvents and clearEvents convienience method to the
simpleExperimentRuntime class. These can be used to easily get or clear
the global device event queue or a specific devices event deque if the
device's label is provided. User can also indicate if the retrieved
events should be in list, dict, or ioHubEvent Object format (each
increases the time to get the events; getting the events as dict's does
not seems to add any significant time to baseline, so it may be the way
to go by default, we will see.
- other misc. fixed.
- sorting the global event list by time was causing a random int out of
bounds error in python ( apparently a known bug in python 2.x), so that
is disabled for now and a bug is raised in github to look into how to
fix it.
resize schema by Imagine
Changes for IZPACK-451 customize size of pack in the install.xml
Merge pull request #45 from unb/IZPACK-451

Changes for IZPACK-451 customize size of pack in the install.xml
osx/homebrew
osx packages
tmux, formulae
bug
Merge branch 'album_affine' into album_rootaffine
Update gecko
Revert update to a gecko that has a busted merge in the RIL.

This reverts commit dbb92de98645bb2fc130da0c09e8503b8bdff1b3.
Merge upstream gecko
Update marionette
Update system/core for new mimetype
Update gecko (fix build?)
fix for https://bugzilla.mozilla.org/show_bug.cgi?id=727803
Update gaia
Add makefile helpers for perf
Update google for marionette changes
Merge branch 'perf_helper'
Add |update-time| make target
Merge pull request #192 from kanru/issue-191

Add |update-time| make target
Update gecko and gaia
Use our own kernel config for toro devices
Update gaia and gecko
Make wpa supplicant less verbose on toro
Update gaia and gecko
Modify Makefile to simplify oprofile usage. You can use below commands to obtain device's oprofile log.
"make op_setup"
"make op_start"
"make op_status"
"make op_stop"
"make op_pull"
"make op_show"
Merge branch 'master' into oprofile

Conflicts:
	Makefile
总结页面匹配两个url，总结提交前必须输入

Change-Id: I5719410236590d4d0db43e39d72b154a90c5a73b
update webkit draw search text
Added books of management
Adds functionality to create new pages under the Course info menu
Month mockup
Add favicon
Updates to content.
hide platform-specific members
Tarjetas - BIND DMZ (Cambios en en campos listados).
Tarjetas - BIND DMZ (Cambios en el alta de nuevas tarjetas).
Merge remote-tracking branch 'origin/master'
Cambios varios.
Merge branch 'master' of https://github.com/jcordero/bind.git
Cheques - BIND DMZ (Filtro de transferencias).
Pagos - BIND DMZ (Validaciones fecha de emision, carga manual).
Merge branch 'master' of https://github.com/jcordero/bind.git
Saco DATECOMBO
Added rapid prototyping document
javadoc

Change-Id: I080951d13d1f55fbe6266c106b1ddc1ceb31dbfa
Merge branch 'master' of ssh://sysifos-lin.cz.oracle.com:29418/jersey
Added tests to reproduce JAX_RS_SPEC-235 and JAX_RS_SPEC-236

Change-Id: I040b8e122f5e825c33b6b82a161b9a0ccc058a8e
Merge "Added tests to reproduce JAX_RS_SPEC-235 and JAX_RS_SPEC-236"
reflection for persistencemanager
dolem trzy pliki z z zadaniami z C
Fixing button height.
Added space for the filters.
Merge pull request #1 from jihaia/extjs-theme-facade

Extjs theme facade
GEOT-4169

modulo function
add ModuloFunction to list of existing functions instead of creating a new FunctionFactory
Refactored ogr datastore into jni and bridj based implementations
creating underlying ogr instance on demand rather than in constructor
GEOT-4209 - Fix WPS AnnotationDrivenProcessFactory to populate process Title correctly
some robustness checks, checking for null when determining driver, and logging exception during the scanning of typenames
GEOT-4029 Added unit test
Merge pull request #5 from guymers/modulo

GEOT-4169, adding a modulo function
GEOT-4170: Support for URL query component in app-schema-resolver cache (part 2: AppSchemaCache.patch plus minor formatting)
better grep clause to match exactly the specified release
GEOT-4205: add org.opengis.filter.expression.InternalFunction
Initial Commit
Added Gitignore
Added C# VS 2010 sim project
removed debug folder for MS C# project
update sim to match structure in fixed point on host target
Added S/U32 defines for variable types
Fixed servo interface to simpler inputs, less push pop this way
Updated camera method, needs working ADC still
updated init code with rodata section, and starting a packet transfer mechnisim for uart telem
Updated Sim to have loopback telem
main inits not properly turns on ADC pins
removed some drivers udpated comms
updated cal struct
proper PID control, anti wind, camera has second opinion now
Using the Led to feedback on param mod
Included target to Apex code, need target to exit code still,
Moved the camera back to 16 bit adc array, better dynmaic res
SBC initializtaion to get CAN driver working
Camera back to 10mSec Task, added LED camTarget debug
Added user controled adjust of +-100% of the PID, and speed gains, still need to show LIght status of gains
add data.js support and turn into component
removed yepnope with own custom async function
numerous improvments. Google analytics and Disqus script are both proxied now
// the post type actually shows what it saving now...
Bug 815836 - fix attentionhide event timing.
Bug 816933 - [Contacts] contacts app calls querySelectorAll() on every key press
Merge pull request #6752 from ttaubert/contacts/bug-816933-querySelectorAll-on-keypress

Bug 816933 - [Contacts] contacts app calls querySelectorAll() on every key press
Bug 805333 - Audio Channels Permission, r=timdream, a=blocking-basecamp
Merge pull request #6778 from alivedise/bugzilla/815836/fullscreen-attention

Bug 815836 - fix attentionhide event timing, r=timdream, a=blocking-basecamp
Merge pull request #6796 from alivedise/bugzilla/805333/blocker-of-gecko-audio-competing-policy

Bug 805333 - Audio Channels Permission
Merge remote-tracking branch 'b2g-gaia/master'
Move the Dialer application in-process in order to get the vibrator
Merge pull request #4863 from vingtetun/merge-nightly

Merge nightly
Merge branch 'master' into merge-nightly
Merge pull request #4911 from vingtetun/merge-nightly

Merge nightly
[#4829][#4700][email] account detail settings
Merge pull request #4829 from dominickuo/email-account-details

[Email] account detail settings
[#4920] Email - Refine the compose view layout with bubble style in receiver inputs.
Merge pull request #4835 from steveck-chung/email-compose-layout

Compose style will be refined with changeable display name in next pull request.
Email account setup polishing and bug fixing.
[Email] Add delete/move option in edit mode and context menu.
Merge pull request #4918 from steveck-chung/email-edit-layout

[Email] Add delete/move option in edit mode and context menu.
Merge pull request #4891 from steveck-chung/email-setup

[#4718] Email - Account setup UI polishing and bug fixing.
Revert "Merge pull request #4891 from steveck-chung/email-setup"

This reverts commit 872f9177c34c9dc3b4157e0abf4d69f87f42740f, reversing
changes made to 16c42f396895257f51148739643b609d6cd025aa.
Revert "Merge pull request #4918 from steveck-chung/email-edit-layout"

This reverts commit 16c42f396895257f51148739643b609d6cd025aa, reversing
changes made to 52d5dec3a82a5b652b7197bf48e75afee956e632.
Revert "Merge pull request #4835 from steveck-chung/email-compose-layout"

This reverts commit 52d5dec3a82a5b652b7197bf48e75afee956e632, reversing
changes made to fcf3ee431a47caf77c5c10cd111aa6819da7173f.
Revert "Merge pull request #4829 from dominickuo/email-account-details"

This reverts commit fcf3ee431a47caf77c5c10cd111aa6819da7173f, reversing
changes made to 322e73388b6790cd9e98f342150e9493cb623992.
Merge pull request #4937 from asutherland/fix-nightly-snafu

[#4940] Revert e-mail pushes pushed to nightly rather than master owing to confusion
Merge pull request #1 from johnshih/nightly

Nightly
English, mo***er, do you speak it?
added product test for blank weights
- Added translations for datatable
- Added noBelongsTo attribute to form
- Fixed name= bug in domainObject autocomplete tag
composition/reply/save draft/discard draft details
updates
toggle "reuse" on !
new page!

- new photo
- new favicon
- new alignment
- iphone-compatible
- autocorrect, autocapitalize
Add a custom implementation of the BFGS algorithm.

Mostly for testing purposes.

The performance is significantly worse than scipy lbfgs and a little
worse than scipy bfgs.
Add custom lbfgs implementation

The performance is terrible.  I'm not sure if it's a bug or
a crappy way to implement it.
Fix bug in customized lbfgs

It runs much more stably and consistently now.
Fix another bug in custom lbfgs
updates to custom lbfgs and bfgs
Take out line search in custom lbfgs

Add Hessian update (this it the step that was necessary to get it to
work without line search).

It now runs with about the same number of function calls as scipy lbfgs
Add wrapper function for custom lbfgs
start to add a rigid body sandbox rewritten in python
fix a bug in rotations.py function q_multiply
python sandbox can calculate energy
fix bug with python sandbox potential

A quench with numerical derivatives now works
Impliment getEnergyGradient for python sandbox

Testing gives agreement with numeric gradient for LWOTP
Improvements for tree algorithms.
Do not warn about extra commas in ES5 sparse arrays.

Closes GH-551.
gender possesives
dcpu-ide: Implement apiReadFile and refine apiDirList.
Major restructuring of code, Makefile and build data.
dcpu-ide: Major refactoring to make the server work with websockets. This should drastically improve our client/server response times which will be necessary to get real-time emulation working.
dcpu-ide: More refactoring and fixes.
Split dcpu-ide off into a separate repository. This means this repo can be build without the use of Makefiles again.
Fixes lexer to accept any ident as a stitch name.
This makes it easier to add new stitch types.
Fixes parser to check for validity of supplied stitch name.

Adds two new stitch types: KnitOn and PurlOn.
These are varieties on the general-purpose CastOn stitch.
separate upVer script dependency
update version to 6.5.0
Merge branch 'master' into F6.5
update .gitignore for eclipse settings
add browser vendor to zk object
add to show processing mask when onClientInfo event triggered in touch devices
update gmaps to 3.0.0
Merge branch 'B65-update-gmaps-to-3.0.0_02' of https://github.com/benbai123/zk
Forgot to add vervar script.
The updated CSS for previous commit
Adding up support in all activities

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Added about screen, holding basic license information, copyright etc

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Fixing up navigation. Now uses TaskStackBuilder and NavUtils

Signed-off-by: John Lawson <john@jwlawson.co.uk>
New home screen, on first run loads up options etc, otherwise provides
buttons for entering data or viewing graphs.

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Fixed links

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Added home screen button

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Changed spacing

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Throws runtime exception if created at wrong time

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Extracted lots of strings

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Added receiver permission

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Fixing links

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Disabled home button

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Fixing about text

Signed-off-by: John Lawson <john@jwlawson.co.uk>
Generalize approach to saving list of social plugin render methods.
Updated RiftAddon.toc
map and bsunit add
Blog static editing implemented
api.c data structure rather than raw sprintf - 1st test
Adding FITS Liberator keywords
temp - I am going to class.
fixed issue where stateID's weren't being incremented properly sometimes - resulting in duplicate pk's in the output db.
Fixes issues with segfaulting when models 'delete this' by changing the way children are iterated over in InstModel. Fixed duplicate pk for resource states by eliminating code that checked for the state already existing.  This should resolve all your issues matt.
all input files for Geniusv2 benchmarks added
fixed isotope issue in buildtest's recipebook
reverted test.recipebook.xml, must have been mangled in a previous commit
fixed problem matt saw regarding decomissioning of reactors in his buildtest3.xml.  The problem was an artifact of looping over a vector that was being modified in the process.
fixed issue with cycle timing in the batch reactor p1v1.xml in the vision v1 benchmarks now correctly matches the expected hand calculation
The BatchReactor now offers the correct recipe. However, because we do no checking of identical recipes, it now takes the simulation very long to run. This should be a priority change in the future. Also, a bug has been fixed in the pushOne() method of the ResourceBuffer.
Add guessing function
Add documentation for link and linkplain tag.
Add support for @since tag
Repair small mistake in Genres
bordo img hover
added ignoring files related with IntelliJ iDEA to .gitignore