labofsahil/github-event-dataset-2012 huggingface dataset:
Pin versions of devise, devise_invitable, doorkeeper and passphrase_entropy

These are key dependencies of this app and so we should be very careful about any new versions.
Switch back to git version of passphrase_entropy

Apparently the gem version had some problems. Will investigate further later.
Require existing password to set a new password

This is standard good practice and reduces the risk of some common attacks.
Add tests for entering wrong password when trying to change password

As @fatbusinessman pointed out we weren't testing what happened if there was
a bad password confirmation entered, or if you entered the wrong current
password. These extra features cover that.
Extract steps for changing passphrase

Removes a little bit of duplication.
Test whether passphrase has been changed or not

Our tests were checking whether the correct message was displayed but
not whether the underlying behaviour was correct. Fix that.
Tweak Cucumber regex to make intention clearer.
Fix functional tests to use current passwords.
Merge pull request #14 from alphagov/require-password-to-change-password

Require existing password to set a new password
14/11/2012-2:49AM
----------------------------------------
	BETA BACK UP COPY V 1.0
----------------------------------------
ALL: Many changes. Closer to networked movement.

- Needs server state change for all players when the match starts
２３

23
net: wireless: bcmdhd: Set DHD_USE_IDLECOUNT option

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Base class become private, but we maintained Drone.Base as a deprecated alias. We intend to remove it in the future.
Making controller to accept a function that returns a literal object as an argument and permit the use of private attributes/methods
Made the same with Base and View classes
de * para -
jquery
IE CSS and smoothness jquery skin
reset css
Layout enabled
config.ini, Bootstrap and index edited
index view edited
Initial layout
Global CSS added
Index landing page initial setup
Initial images
Global CSS added
fix bug: invalid number of frames when reading/writing multi-channel data
Add vcr ~> 2.2 to Gemfile
Add basic vcr config to spec_helper
Add vcr cassette config to Person#where spec

As each example in the given context makes the same web request we can reuse a
single cassette across all examples. This cuts down on runtime when recording the
cassette and prevents duplicate cassette creation.
Filter api_key in vcr cassette requests

Each person running the tests will have their own TMDb API key but the response
will be the same. By filtering the api_key parameter we can let everyone reuse
the same cassettes or even run the tests without a key. Additionally, we don't
want to disclose any private keys in the committed cassettes.
Warn if TMDB_API_KEY unset and making real request

We can allow tests to be re-run using vcr cassettes but when recording new
cassettes we must have an API key available.
Add person_where_name vcr cassette
Merge branch 'feature/use_vcr'
Updated with a few minor tweaks and adjusted the map and spreadsheet data to be consistent
Updated with a few last tweaks on the route A
removing some unused tmux stuff
Merge branch 'master' of github.com:andrewpthorp/dotfiles
adding fallback for background size on IE8
removed fallback for background-size on IE8
fixing js error on IE8
adding button styles to filter on IE
added account settings page, fixed ie bug
trying to fix isotope on home for results
Renamed README to be markdown
query is ready, preparing export to docx
Installed delimitMate plugin
Adding .idea to .gitignore
Merge pull request #83 from pkozlowski-opensource/gitignore

Adding .idea to .gitignore for people using WebStorm
Setup DB and models for Question and Answer
rename and add aliases for reith proxies
User denied exceptions
save button resize
Merge remote-tracking branch 'origin/master'
include CM File Manager...
OAK-425 Query: improved logging (use +Inf instead of Double.MAX_VALUE)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1421350 13f79535-47bb-0310-9956-ffa450edef68
hacky fix for mojang's service status montior crapping out
finished the failed filter
Fixed when option defaults are applied so that platform specific options don't conflict. Added some more i18n strings.
Added more Belyi maps for genus zero
Bug #19243 Tutorials are not honoring ordered vs unordered lists
simplify manifest
don't require httplib2 if you aren't using GAPDecoratorAuthMethod
simplify the package incantation, so we don't include tests/ in the build
contrib
Changelog
Find serv_
Added code to throw handle errors during Server creation
Added code to handle errors during Server creation
Merge branch 'master' of github.com:sarangbh/libtransport
Merge pull request #8 from sarangbh/master

Handle errors during server creation
Some windows tweaks
Better python generator
cdecl
Fixed export + gen_dynamic_purple can be called repeatedly
Merge branch 'master' of github.com:hanzz/libtransport
define macros also in linux
Merge remote branch 'upstream/master'
Changed SQLite DB and Mturk
m_shun Display shun name correctly in the error message when adding a new shun and it exists
extras/m_ldapauth: CIDR-based whitelisting

Offer host-based whitelisting in the ldap module.

Used to trust clients from internal networks,
whilst requiring authentication from "outsiders".
Adds <options:nosnoticestack> to prevent snotice messages from stacking.
Requested in issue: #40
Reordered the if statement checks after a suggestion by @Pogs.
Merge pull request #48 from Shawn-Smith/insp21+nosnoticestack

[2.1] Option to prevent snotices from stacking. (<options:nosnoticestack>)
Merge pull request #36 from pcarrier/insp21ldap

Insp21ldap
Revert "m_ssl_gnutls: use recommended DH bit sizes instead of user-specified value"

This reverts commit 2b6b98bafe566874ea00abf4b0d35cd8cda5212f.

This uses API which is only available in gnutls 2.12.0, which is very new
(comparatively) - only released in march 2011 - and thus many distros will not
have had the opportunity to update yet, causing compile issues (see issue #49
for instance)

As this isn't really crucial, back it out, for the time being.
Fix unused variables reported by the clang static analyzer.
Show class in connectmsg

Made the connect announcement show the class a client is in, making it
easy to spot if a client is in the right class.
Merge pull request #54 from SaberUK/clang-analyze

[2.1] Fix unused variables reported by the clang static analyzer.
Merge pull request #58 from Justasic/insp21+connectclass

[2.1] Show class in connectmsg
Fixes for issue #12
Fix some of the include guard names (requested by SaberUK)
Explicitly shut down stdio's stdin/stdout/stderr.

The previous logic here was to only do this if stdio was connected to a controlling
terminal.  However, we must do this always to avoid information leaks and other
problems related to stdio.

The only exception is if we are in debug mode.

Conflicts:

	src/inspircd.cpp
Merge pull request #57 from Justasic/insp21

[2.1] Fixes for bug #12
Fix compilation with GCC 4.7.

GCC 4.7 headers no longer implicitly include unistd.h in many places, see
http://gcc.gnu.org/gcc-4.7/porting_to.html

Fixes #65
Fix compilation on kfreebsd.

Fixes #64.
FileWriter hasn't been non-blocking for a very, very long time.
remove trailing whitespace
Update Doxyfile.

Conflicts:

	docs/Doxyfile
bump dox version

(thanks to Peter Powell for the pointer)
atu_shm_buffer v1.0.1

* Re-organize file structure
Added SQL file to create DB.
ハードモードの追加、デザイン微調整
Added support for unloading the JNI libraries once all strong references are released using the cleanup method from SocketUDT
Merge branch 'master-ccob'

Conflicts:
	barchart-udt-core/src/main/java/com/barchart/udt/SocketUDT.java
New dibbler.sh with separated aftr from PD. Also changed default log mode value for dibbler.
node edit form review, media embed, adh tape module
Added support for Drop Down Lists
Merge branch 'selectbox'
security patches for ruby regex and rails match routes
Fix fallback logic for FQDN determination

Also adds the Beaker Task definition for investigating issues
seen with hostname -f resolution in kickstart %post

Bug: 880440
Change-Id: Ifa8503694fe91988399dafa4d55f0500148deed8
Merge "Replace None with an empty string in csv export." into develop
Update notes for submitted changes

* Move beaker.documentation_link to app.cfg from server.cfg
admin docs for writing kickstart templates, plus Cobbler migration guide

Change-Id: I2e2485d2ef5500121bab5f81eaf86ebb710379bb
Merge "admin docs for writing kickstart templates, plus Cobbler migration guide" into release-0.9.0
Merge branch 'dev-cleanup' into dev
Fixed compatibility bug, added pause code when server running finishes.
Now cleans up server directory and has server quit messages.2
Fixed silly syntax error.
Fixed bad variable name.
Merge branch 'dev-runserver' into dev
Merge branch 'dev' into dev-cleanup
added icon image and made sure it is the game icon
Can now select square
Allow special request params to be sent to the finder
Remove default notes from routes
Added RavenState, reorganized RavenCommand

--HG--
rename : msg/RavenToolCommand.msg => msg/ToolCommand.msg
Added functions ge,le and gt to make comparisions.
rank
ignore development
tag rank interface
disable rest API
form for itemset & unicorrest_user
Summary stats
Modifications css + ajout compression css & js
残り時間から時分秒を算出するように修正
Chat unread bubble now shows correct number
Added synonyms to CTerm.
Added default definitions to includes.inc.php and created local.inc.php.
Fix fuzzy message in russian
First deuce spec.
Silly little message for GUI test.
aquire
Reworked/Completed EditModPackDialog

Changed ChooseDir setup to allow usage in EditModPackDialog
Disable Map pane when launching, add to enableObjects.
Implement Pane Enum

Base enabling of buttons upon pane enum and prevent unwanted results.
Removed unsued imports/code.
Merge pull request #264 from blackevil90/master

Try to use xdg-open for unsupported *NIX desktop environments
Fix output for map loading.
Code started for loading image.

Just need a transparent gif or gif with our background color.
Make launcher on minecraft start.

TODO: Make the console look like the main console. UIManager.
Improve File Clean-up

Forgot to add call for footer update.
Fixed files not closing on extraction.
Swap from ".minecraft" to "minecraft" folders.

Add in compatibility support for .minecraft folders.
Remove code that never executes.
Started work on TexturePack Pane

Fixed issue with Map Pane loading.
Removed old comments.
Cleaned up some code.
Small code clean-up.
Small fix for the scrolling
Finish TexturePackLoader
Scrolling fixed now.
Merge branch 'master' of https://github.com/Slowpoke101/FTBLaunch
Begin work on TexturePackManager

Swap from "maps" to "Maps" folder.
Small commit.

Just wanted to commit all my current work before I went and got food :P
Resize scroll.

Fix issue with scroll not updating on filter.
Apply scroll fix to map and texture pack panes.
Typo on the label sizes (maps/tp)
Began work on localization
Removed author comment from i18n class
Merge branch 'typo_fix' into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Rework error messages. When cloning to existing but folder, automatically delete it.
Merge pull request #1596 from avimar/git-clone-empty-folder

When GIT cloning to existing but empty folder, automatically delete it.
Merge pull request #1595 from blast-hardcheese/develop

Disabled initial socket bind check
Set up owner of ~/.ssh/known_hosts

- Fixed behaviour, when if known_hosts is created by salt, then the
  owner of the file will be the salt process (usually, root)
- On the other hand, non-roots cannot set up ownership, and we skip
  this step for them (useful mostly in tests, though).
Merge pull request #1598 from imankulov/ssh_bugfix

Set up owner of ~/.ssh/known_hosts
Some fixes for better logging and safety
Add logging and checks to cmd_yaml pillar
Init pillar in gem and virtualenv
Merge branch 'develop' of github.com:saltstack/salt into develop
Revert "Merge branch 'doc-autosummary-headings' into develop"

This reverts commit 7997ed4842e4c14134d310939e7e591c2de7dda6, reversing
changes made to 83c901a17448e8557e599e072cf4910905d00ec9.
Merge pull request #1599 from shouse-cars/revert-autosummary

Revert autosummary experiment
initial wempy template support (json and yaml); minimal testing
fix help text: typo, capitalize key words and add jinja example for using results
Fix jinga typo
Diversas alteracoes
Varias correcoes
Convert from tabs to spaces for identation.
Version 1.3
Version 1.4
Merge tag 'ex3'
Merge tag 'ex4'
add notes
Enabled ARC for facebook-ios-sdk files now that that repository has been converted to ARC
build: switch to gyp
iconv: don't use strncasecmp()

Don't use strncasecmp(), it's not available on Windows.
Update validators/UniqueBoolValueValidator/README.textile
added support for loading from framework root with a prefix in m_require. e.g. -/lib/surface.so.php
removed uniqueVersion -> not supported in maven 3
added .DS_Store ignore
added documentation:
- vision
- glossary

added templates for doc:
- design_model
- domain_model
- use_case_model
- supplementary_specification
Revert "dont require path for configs, get it from config data"

This reverts commit 9b8fc841a4e7241776c613441ae921c26c547f92.
tweak solutions page
Example modules updates
sitemaintenance
Clean up user managment menu rights
Merge remote-tracking branch 'origin/master'
Update. include protocol
dashboard reports for career seekers
Merge branch 'master' of https://github.com/bpocareerhub/BCH-v2.0.git
Use AREL AST instead of to_sql for wrapping group_by 
for downstream sanity.
Version bump to 0.5.2
Regenerate gemspec for version 0.5.2
No more ApplyChanges for EntityModified event. Chat example improvements.
Clean up for ICS
Clean up for ICS
Fix some Lint issues, add xhdpi images
Update Preferences to use PreferenceActivity instead of custom activity

-Remove support library as we can use the native version of the APIs
Use Constants settings
Use proper constant for calendar data

Also, store all calendar ids using a StringSet so that parsing is
handled automatically
Remove unused layout file, update version

Disable landscape special version for now...
Update icons to the ICS icons

-Remove unnecessary strings
-Add Action Menu information for ICS
Make things look nicer in Holo devices
Add v alias, remove .gitconfig since Github is awful and wants my secret token to be in there.
gh-76 Updated the orientdb version to 1.0.1.
Cache UGI objects since as they used for file system creation and have instance equals() logic
release version 1
Merge branch 'release-1.0' into develop
start of redesign
restyled menu
adjusted navbar styling
remove hashbang from url in index.jade
Merge pull request #1 from sambao21/master

update url paths to reflect the change off of the hashbang urls.
Initial load of cfml-portlets
remove type-matrices.tex from version control since it's automatically generated
update .gitignore
wmrun: dont output to console
Client and Server now communicates
navbar links should set text-shadow to none
obanyc-1717 service data of archive BundleManagementServer now considers
timezone
Merge branch 'master' of github.com:camsys/onebusaway-nyc
-type:q
prevent global variables leaking
Finish crawler for pills
Fix SHA1 checksum of aws-sns-cli zip file
moved some template code into headers and footers
brazzify.me credit
delete javaAnnotation.iml
Add gator.js
Main status menu fleshed out with name, hp, level, xp, stats, and
equipped items. 

Combat now displays the monster name briefly at the start, and a spoils
panel when a monster is defeated.
StringUtils.equalsIgnoreCase() instead of StringUtils()
Fixes #2087, Favorite points in cache list limited to 3 digits

Extended the resppective fields in the layout to allow one more digit
XML Cleanup: Popup and themes

Rename transparent to popup and remove unneeded settings.
Move common items in dark and light to cgeo
XML Cleanup: Button and Edittext parents

Removed duplicated instances of button and edittext styles
but making one the parent for the other.
Merge remote-tracking branch 'campbeb/xmlCleanup' into upstream
Added a prototype driver for Arnold
added jdk1.5 docs&sources
fixed definition of no_proxy
Change parent class from CActiveRecord to TrackStarActiveRecord
change log
add more tests in testCreate method
trying to implement spring application context
the ugen associated with an effect is dirtied when the fx is dirtied, but only if the fx is added with the addFX method. Can't see anyway to get around this unfortunately...
err... ok, figured it out
some sugar for manipulating pitch/amp/fx of drums
step sequencer for gibberish... need to port to Gibber
fix for drums and change to default rhythm script
Fixed configure.ac and Makefile.common files.
We don't need libGPRS and makefile for GPRS directory anymore.
prevent error and make sure matchhihglighting is deleted
make sure, signs are placed on start up
Add keep awake rake
Initial commit for PageRank
Merge branch 'master' of github.com:christofferh/fub-code
Fixes two bugs in Python docstring pattern:
1) The multiline flag wasn't in place
2) As JavaScript does not implement the dotall flag, dot will never match linebreaks. Uses [\s\S] as a working substitute.

Additionally, adds test of the docstring pattern in the Python test page.
Add apt

And do some testing
Re-added devide width meta tag as width=device-width
Added Roles to system
Prevent selection on dragging resizer
Merge pull request #15 from danyaPostfactum/resizer-preventselect

Prevent selection on dragging resizer.
Fixed minor doc inconvenience in magicline plugin.
Magicline: added accessibility support by keyboard access.
Magicline: Improved access space command to ignore accessible siblings.
Merge branch 't/9481'
Use textfield dialog only for inputs of type text and password (as well as empty ones)
Added support for HTML5 input types: tel,email,search,url.
Updated forms plugin translations.
Merge branch 't/9503'
Fixed: Buggy mouseout support in magicline in IE.
able to complete the reverse exercise
specs
fixes
Use class instead of inline style.
CCheckBoxColumn prepared to work in conjuction witjh TbJsonGridView
Merge pull request #32 from mihan007/TbJsonCheckBoxColumn.php

CCheckBoxColumn prepared to work in conjuction witjh TbJsonGridView
Merge pull request #35 from Wiseon3/master

Use css class instead of inline style in TbRelationalColumn.
commits previous update to 1.0.1
Merge remote-tracking branch 'origin/master'
Merge branch '1.0.1-wip'
gentoo.org updates Sun Jun 17 09:07:42 IST 2012 update
Se agrega validación en oferta para que siempre se tenga que poner
un lugar, ya sea en linea o sucursal
Se corrige el ws carr para que existan 60 carrouseles en memcache cada
uno con 50 al azar
Se corrigen cosas en la búsqueda, en el indice y en busqueda de ofertas
Se agregan timetolives a los webservice de home
Se agregan webservices para home, detalle oferta, micrositio y
sucursales
* src/clj/cljs/core.clj: type-hint first arg of all extend-type implementation fns
list
setting
Rewritten functions to accept a callback handler for processing
solutions.
Extract parameter from opt-out-url
put source of quote in bottom right
added small yellow quotes at beginning and slightly above each quote
Copy ExampleGame to RoboGame
1) Review background
Version bump + deploy script
made the scare warning less scary
Added JCrop Css
XAMPP added to server starter
Scrub ft-gahp sandbox ids of problem characters. #3294

We use COLLECTOR_HOST as part of a sandbox id for the ft-gahp. This
sandbox id becomes the name of a directory, which is given to the blahp
and the batch system behind it. Certain characters that can appear in
COLLECTOR_HOST will cause problems when part of a file path, so we need
to scrub them from the sandbox id.
Tunnel ft-gahp file transfers over ssh. #3293

When we run the ft-gahp via ssh, tell ssh to set up port forwarding from
the remote machine back to the gridmanager's command port. Then, have
the ft-gahp use the forwarded port when it needs to connect to the
gridmanager for file transfers.
set version of V7_8-branch to 7.8.6, set pre-release tag
Improved configuration. Fixed issue with not responding with json.
Updated web configuration.
Monadic view variables in an mvc structure
more format fixes.
Autocomplete product names
Killing warnings and updating all libraries to be iOS 6 and armv7s conforming.
fixed local repos to auto generate.
back to sample
Adding table view and text field functionality to the user signup controller.  Almost finished with login/signup sequence UI
We have to avoid NULL frees in the destroy functions.

Also we do not have to free the parameters in the Passthrough
functions because the pointer should be valid.
UTF-8 everywhere. Closes #251
added cases to forwarding
Added some support for saving versions of files with the includes already solved, plus for calculating transitive information for magic methods (i.e., how many are included into files that do not use them already)
Merge
Fix memory leak and error function invocation
Testdevice created to play with, Major bug fix

There was a evil bug in the message system. its fixed, but the code
looks awful. cleanup will follow.
New testdev.device implemented to test some functions and to show how a
device should work with QUICK IO and NON QUICK IO.
Initial Commit
Eerste commit
app icon
Blue dot without function showMarker
button current location and beginning autocomplete search bar
Werkende autocomplete searchbar
Run Universal (iPhone & iPad)
Autozoom upon launch.
http://www.raywenderlich.com/13160/using-the-google-places-api-with-mapkit
app icon iPad
Merge remote-tracking branch 'assembla/master'
Made and bound 2 buttons to the same method 'buttonPressed'
solution warning setDelegate
Merge remote-tracking branch 'assembla/master'
Fixed double button
Merge remote-tracking branch 'origin'
Implemented Google Places request
Night_club, restaurant, pub buttons
Pins & Buttons work
Buttons
layout buttons fix (landscape kwamen de knoppen niet allemaal naast elkaar) + zoom out fix na veel inzoomen
change the class name from X3DPoint to XOctPoint
modified readme
fixed typo
added new line
Merge branch 'master' of github.com:daniel-uzunu/UploadJS
Improved Permissions

- Fixed some Bugs in DataObject with Data-actuality
- Fixed some Ajax-Bugs in leftandmain.js
- Fixed some Bugs with naming in ViewAccessAbleData and added
hasChanged-Method
- History now a bit better
- pages now support Hierarchally Permissions - Beta now!
- Permissions now automatically get inheritted data
- Fixed some Bugs with inheritting in Permissions
- Added Upgrade-Script for these Permission-Fixes
- Version updated
expand to occupy what used to be the sides of an interface
Removed deprecated firmware
-added  CompareToBus() to Calc
jordo testing
in accordance with jslint.
generate linebox in fullscreen only if useAttachBox is true
generate linebox in fullscreen only if useAttachBox is true
Merge remote branch 'origin/development' into development
Merge branch 'development'
fullscreen's shortcut key(Ctrl+M) doesn't working.
add a keyEvent handler to load async fullscreen tool
fullscreen's shortcut key(Ctrl+M) doesn't working.
add a keyEvent handler to load async fullscreen tool
row and column of table must be greater than 0
fix image links in testrunner.html
added Email field, added edit/del buttons, double-click to edit
added projects dir shortcut; updated glog format
added bootstrap to project and verified by making a dummy controller
Working on BDSInpainting rings.
adds score method to vote
fixes to score()
shells out js classes
wait only 2 seconds for test to complete
High: fencing: On failure, only try a topology device once from the remote level.
Ein bischen Doku schadet nie.
Effects of optimization

Negligible
Update: cleanup specs
Update: cleanup specs further
minor corrections
Add French translation

Thanks to: @MoOx @Darklg @tanguy-martin @gorhgorh and @thenew.

Close #39
Update comment block style

Minor update to use a Doxygen-style comment block in the examples.

Close #11
Add formatting note for comma-separated values
Merge remote-tracking branch 'upstream/master'
Updated to reflect recent changes in the english
delete fieles
Merge pull request #852 from cloudedge/pull-req-master-e7e5fe18ed

Pull back family view for MVP, fix defect on so Pie was not a lie [2/5]
Merge branch 'master' into hadoop-os-build
Pull in latest crowbar ref
Merge branch 'master' into hadoop-os-build
Merge pull request #859 from galthaus/pull-req-hadoop-os-build-f601c94c93

Make sure refs are updated. [4/4]
Remove option to use tiered payment (registration)
Revert "Adding donation copy."

This reverts commit cfc17144fff62cb9be95cf4af2f746dd47b14441.
Ajustes para funcionar na versão 2.3.0-Beta2.
Ajuste na nomenclatura dos pacotes.
Merge branch 'master' of git@github.com:demoiselle/laboratory.git
Ajustes para deixar o exemplo TwoPhaseCommit compatível com a versão
2.3.0-BETA2 do Demoiselle
refactor and htmlsanitizer
Clear out the existing migrations, and replace them with a migration
to initialize the database and another to create the vestal versions
table
Added language support for Italian. Thanks Paolo!
Removed count of done_with_errors from overviews and settings
Fix broken ribbon URL

Seems like GitHub moved them a while ago.
Remove distro-links

There is no point of keeping them, and they tend to get outdated.
Add Wiki link
Add alt text for screenshots
creating directory when it doesnt exist
add deleteAction and make the edit action to a create/edit action
Revert Issue #210 Only show enemies in line of sight
Remove default config for reverted Issue #210
Merge pull request #214 from dorkster/bugfixes

Clear HUDLog upon respawn
Added MALLOC macro for making allocation of structs easier.
Attempted buildbot fix
Merge branch 'master' of github.com:drewcrawford/buildbot
Merge branch 'master' into work-4885
core implemented. needs email support. will defer
Added Amber color scheme
refactor
multiple calls to update status protected
Removed EnrollmentService
Declare support for Inno Setup 5.5.2

Data format is still version 5.5.0.
chinese zh-hans translations by User:Shizhao
Merge branch 'master' of toolserver:git/wmajs

Conflicts:
	wikiminiatlas_i18n.inc
Updates to the storyboard and initial connection
Added new enquiry search form
Merge branch 'master' of https://github.com/dturczanski/farmathon
Updated legal in about
decorate status box
Moving css to its own file
Remove unneeded ivy config
Pad color hex codes with 0 instead of space
to: Avoid completing a directory when subdirectory candidates exist.
removed unecessary fixed-position iPad solution for flash messages and fixed min-width
changed quick-edit to render from a placeholder element versus inline js
added body_tag helper to simplify layouts
Pushing
Merge commit '50d0e4a29d545f4f7373d4a2f97a422e4af0f2d4' into gh-pages

Conflicts:
	index.html
Testing
tweets3
tweets4
Edited background transparency: about, privacy, and terms.
bolded coolest new free apps
"twenty four or so"
use placeholders for choosen select
merged Jon's edits
remove artifacts resources from distro
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
jetty-9 reduced LazyList usage
Implement method to test forecast changes
Fix formula to display graphic-ammount
Merge branch 'master' of github.com:edie/MallManiaAndroid
Photo filter added
move sessions to config
add rtl_tcp fmradio sample
update samples
Add a module file and fix the configure command.
Changing inverse_kinematics_sanity_checker to take planning scene and to call self collision detection on the results
adds smoothing to octomap normals; needs better testing
Fixing constraints test
more robust checking of joint names in joint constraints
Fixed bugs in PositionConstraint, documented Position and Orientation constraint, extended tests for Position and OrientationConstraint and started working on tests for VisibilityConstraint
moves refineNormals to new file in collision_detection
stylistic changes
Adding docs for utils.h, adding docs for KinematicConstraintSet, and adding some tests for KinematicConstraintSet
fixing some bugs in visibility, adding some tests, and adding a lot of sweet documentation for visibility
Should have included with last commit
Adding Doxyfile for now
Adding some additional tests, fixing some doc things, changing equality behavior in PositionConstraint and KinematicConstraintSet, and dealing with remaining TODOs
Need to duplicate public keyword before EIGEN defines, which got moves to due to Doxygen issue
Merge remote-tracking branch 'upstream/fuerte-devel' into fuerte-devel
Adding constraint sampler test
Merging from fuerte-devel to groovy-devel
Fixing compile errors in tests, which mostly involves porting to new code.  Tests don't run correctly using make run_tests
Bug 781946 - Clean up notifications usage; r=rnewman
Bug 781952 - Part 1: Refactor engine syncing logic out of service.js; r=rnewman
Bug 781952 - Part 2: Move cluster management out of service.js; r=rnewman
Bug 781952 - Part 3: Remove unused Service._updateCluster; r=rnewman
Merge mozilla-central into services-central
Merge mozilla-central into services-central
Bug 759130 - Avoid duplicate accesskey in Sync preferences; r=gps
Bug 800878 - EvalInFrame, Check debug mode before iterating the stack. r=luke,decoder
Bug 790677 - Fix xpcshell test packaging for B2G, r=ted
Bug 801801: Fix runapp argument for B2G Desktop; r=fabrice
Back out bug 802239

--HG--
extra : rebase_source : 7401ba8d97f88f0aef2edf2f63e245a116e897cc
Bug 803518; add Painted() to BasicShadowableCanvasLayer::Paint; r=jgilbert

--HG--
extra : rebase_source : 2cad76436370ec2bf1d52208a732e638e62435d5
bug 802616 - don't use software floating point math on ARMv6 r=glandium

--HG--
rename : dom/bindings/ExampleGen.py => dom/bindings/BindingGen.py
extra : rebase_source : 4171bc4cccbd6cc82d50a1d2544e362bd615fdf9
Bug 802436: fix test from bug 800817, r=smaug

--HG--
extra : rebase_source : be57519e1085fab2bd0c9ff6de0514715c817b72
(no bug): Fix comment in UpdateDepth in js/src/frontend/BytecodeEmitter.cpp (DONTBUILD) rs=waldo
Bug 744686 - Comment out unused |alpha_bits| variable to fix a compile warning.  r=jmuizelaar.

--HG--
extra : rebase_source : 48be31fe3eab889e6f7930f44b96140ba076c389
Bug 802884 - Fix a build failure in Visual C++ 2012 because of what seems to be a compiler bug; r=me
Bug 800249 - Patch 1: Add ability to store/retrieve address to UnixSocket; r=cjones
Bug 800249 - Patch 2: Add ability to retreive connected socket address as a string; r=cjones
Bug 742570 followup - fix typos. DONTBUILD.
Config dir rename
Config dir updated for Croogo 1.4x
move over chosen, scrolling-parallax, and application js files - recipient dropdown looks good, star type dropdown still has an error (.dialog is not a function)
IE9 Video player fix
removed console.log foo
Merge branch 'master' of github.com:electricgraffitti/bsp
Add clear() to the map interface.

Add clear to the map interface, and implement it in hashmap and smallintmap.
core: Remove spurious newline in task::run_with documentation
core: Give task::spawn_with the documentation from task::run_with
docs: In rust.md, replace inert @dfn{foo} formatting with _foo_
docs: In rust.md, replace 'print' with 'println' to match points example
core: Formatting fix in documentation for task::unkillable
core: New closure syntax for comm.rs/task.rs docs
rustc: Switch to the new resolution pass
change borrowck error msg: 'declared in outer block' -> 'captured in a closure' (properly this time)
rustc: Add some changes I missed
tutorial: pointer -> box
test: Remove failing parts of the failing test (requires intertwining of resolve and typechecking)
Fix metadata serialization of foreign functions. Properly take the value of foreign functions from other crates to fix #1840.
Merge pull request #2846 from gwillen/1c882842e06431767676887f97f9dcc0ee50a7b9

Add map::clear
test: xfail-fast extern-crosscrate
Merge pull request #2847 from ben0x539/incoming

Tiny documentation fixes in rust.md and src/libcore/task.rs
rustc: Conditionally compile view items. #2357
Add clear methods to the tests that make maps.
register new snapshot b5f5676
Remove xfail-test from (now functional) test.  Fixes #2323.
modified zeller code
revisar carga de archivos
updated w3-prepare with css settings 

git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7758 bb5eec90-091a-0410-bc89-db79c2cf2c7b
added custom.css

git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7759 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7760 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7761 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7762 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7763 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7764 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7765 bb5eec90-091a-0410-bc89-db79c2cf2c7b


git-svn-id: http://emacspeak.googlecode.com/svn/trunk@7766 bb5eec90-091a-0410-bc89-db79c2cf2c7b
cfg: build for armv7 only.
MKAudio: disable echo cancellation on iOS 6; VPIO is broken.
cfg, 3rdparty: fix xcconfigs to use iOS 5 deployment target.
3rdparty/openssl: sync.
Merge branch 'master' of git://github.com/mumble-voip/mumblekit
Adding support for range keys which will soon enable us to have .keys() operation. This is not yet tested
Hash keys are used for map name, range-keys are used for keys. tests all pass
have simple __iter__ for keys in a not cache-onl map. it has a passing test
Fixed issue with the seed-based BasicNetwork.reset method.
Fixed bug where wrong activation function might be used, must go to C#
too
Moved sine from RPROP to general util.
Calls to system() leak stdout into the command output. Use backticks with $?
Bump versions for release 2.0.5
Add .pre for next release
In suggestions, show --app instead of --app=
display_* functions
Small fix so debug mode compiles
Created Product Controller

Created the ProductController
Adding the IPrdouctRepostory instance
Added a ViewResult to diplay a list of products
Created a View for the List of Products
Completed View List

Added Razor directives for displaying a list of products
Added HTML to for each item in the list
jgjfgjhgj

Change-Id: I28fc981fe438fe9e2536dbb03131b24a951426d0
Use inconsolata font in Windows
Don't show line numbers
Add vimwiki for windows-configuration
add metric test
added extra loopback mount to placate grub 2 on Precise
removing exit(1) that was added for catching a rare condition
Merge branch 'dev/dmitrii/EUCA-2250' into testing
Use $JAVA_PATH during execution.
Imported v2.3.3 and added a component.json file
Test buttons removed
Add unicode whitespace handling.

ref.  http://guides.rubyonrails.org/3_2_release_notes.html#active-support
Added TODO items to top of the list.
Fixed mass-assignment of attrs
syncing commonlibs again

git-svn-id: http://wush.net/svn/range/software/public/smqueue/trunk@4677 19bc5d8c-e614-43d4-8b26-e1612bc8e597
fixed method to transform parameters in dictionary
Deployment changes2
deployment configs
Rename Point to Point2D and make its value integers
Finished Delaune Triangulation incremental algorithm
Added setting for triangulation (points count), updated readme
Capturas en Ráfagas para JAMediaVideo
deferred loading of metrics #38
Start of new theme FTB Earth.
Adicionado o novo site, e removido os arquivos antigos.
Fixing some typos commented by Thanh
added the existing phone gap work
Portfolio style, not done yet
merge pgbouncer branch into develop
merge from develop at origin
sldkfjsdklj done!
Revert "prettier breadcrumb, fixes #30009"

* breaks if @project is nil which it is on almost every admin page

This reverts commit 57fef6941bb458728158cbaa5d5977b442e59ca8.
do not return the ancestor links for new projects
[#1025] Fix Rails vulnerability (CVE-2012-2660)
Fix SQL injection via nested hashes in conditions (CVE-2012-2694) #1036
Fix SQL injection via nested hashes in conditions. CVE-2012-2695 #1037
Merge pull request #20 from finnlabs/mass_assignment

Security Fixes
fixed homepage icons
Merge branch 'home-page-icons'
Lots of changes, mainly adding index page
Pushed latest revision 14870
Update src/glfw.nim

I updated TMouseButtonCallback and TKeyCallback to use an enum as the second arg.
We don't have to be slaves to ugly C APIs, not all the time at least
server_cleanup.fsm, removed some debug code
Minor changes.
Now we update window title...
- Fix plist

Pointed out by:	pointyhat (via linimon)
Pointyhat to:	swills
Approved by:	maintianer (implicit)
- Update to 0.9.3.2

PR:		ports/171829
Submitted by:	Masaki TAGAWA <masaki@club.kyutech.ac.jp> (maintainer)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304641 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 1.202
- Restore %%VAR%%s inadvertently replaced in a previous commit (r300533),
  and remove trailing whitespaces (files/mapyrus.in)

BuildLog:	http://goo.gl/32Z0f
- Add LICENSE
- Mark MAKE_JOBS_SAFE
- Update pkg-descr
- Convert Makefile header to new format
- Pass maintainership to submitter

PR:		ports/172186
Submitted by:	nemysis <nemysis@gmx.ch>
Approved by:	makc (mentor)
- Add LICENSE
- Mark MAKE_JOBS_SAFE
- Update pkg-descr
- Convert Makefile header to new format
- Pass maintainership to submitter

PR:		ports/172188
Submitted by:	nemysis <nemysis@gmx.ch>
Approved by:	makc (mentor)
- Remove LICENSE_FILES as the GPLv2 license is in the ports tree
- Update pkg-descr
- Convert Makefile header to new format
- Pass maintainership to submitter

PR:		ports/172192
Submitted by:	nemysis <nemysis@gmx.ch>
Approved by:	makc (mentor)
- Update to 9671

Changes:	http://svn.tartarus.org/sgt/agedu/?view=log
- Unbreak sysutils/py-psutil on 7.x
Update to 1.7.11.2

Changes: https://raw.github.com/git/git/master/Documentation/RelNotes/1.7.11.2.txt
1) Started to make changes to support functions as rule conditions
1) Added unit test to test function conditions
1) Just some simple bug fixes
1) Modified cakefile
1) Updated the script referances in JSUnifyLangUnitTests.html
1) Removed duplicate code
1) Function Conditions are now working but need more testing
Don't make a copy of string, OK to modify in-memory one

Copy alloc'd by readline is passed up to the iniread functions and the
get_section() call modifies this, since it is on the heap this is OK.
new pambase-20120417, hardmasked!!!
FL-66, FL-74, new openrc ebuild, masked for tests
way to verify ssl socket transport is installed
Merge branch 'framework' into nonce
better testing to make sure apc is setup right
start up php-cgi from env, not absolute path
Merge branch 'framework' into nonce
News section title now just "Cooling Towers"
Vorlesungsscripte zusammengeführt

V11 zusammengeführt
V9, 10 und 11 mit korrekten Kopfzeilen ausgestattet
Neues Unicodezeichen in der main.tex definiert.
Nervsoftware...
Replace reserved character with unicode character sequence
Number figures
Handle missing image source references
Merge pull request #194 from jhinkey/cleanup

Cleanup user guide chapter markdown
LRDOCS-225 fix number-headers bug
Source formatting
Remove multiple IDs from headers
Match devGuide preface chapter header with existing URL value on liferay.com
Merge pull request #195 from jhinkey/number-headers

LRDOCS-225 Number headers
v 0.2 -  cuda compliant

Moved whole program to CUDA compliant model. Modified matrix A to single
dimension with 'x * width + y' to access elements in order to ease copy
to device. Moved forward and backward substitution to CUDA kernels - now
run entirely on card - created new files 'Kernel.*' for this. Most error
checking has been added to program, includeing CUDA status checks.
Incomplete: kernel does not complete in parallel, each parallel thread
completes identical operations.
Added a local json file, going to test Pull Request
Merge pull request #1 from kevinrenskers/develop

Added a local json file, going to test Pull Request
fix a bug of Mini Scenario
moved cms into the www directory (just the index) and added ZF to the whole project
moved cms into the www directory (just the index) and added ZF to the whole project
Address some unused value warnings.
Don't query DB for a recordings total frame count, we don't use the value anyway.
Merge remote-tracking branch 'upstream/master'
Don't strip unnecessary white space from title when creating the title list. Fixes #11200
Treat POLLHUP as EOF not an error, fixes IVTV (PVR-) recorders failing. Based on patch from ltskinol@gmail.com Fixes #10732
Fix deletes on Slave backends. Remove references to deleted_set and
initialise dont_expire_set properly which conflicted with 'deleted'
recgroup behaviour since 0.25. Fixes #10704

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
Fix playback of DVDs which feature an empty audio stream. Discovered
by Paul Harrison
Set palette correctly when DVD menu highlight changes to ensure highlights are the right colour/have the correct transparency.

Fixes #11265

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
Merge remote-tracking branch 'upstream/master'
Better handling of disconnects. Connected/disconnected icon in server list. Servers will not be deleted if they don't work when you start rcontool
Removed print
Added RubyGems page to README
Update dependency versions

rake became out of date with the release of 10.0.0.
there is no good reason for this class to be a MessageStore (technically a public interface break, but users shouldn't be using this class)
issue #93 - bugfix: change 'h' to 'n' in Message.IsAdminMsgType
Merge pull request #126 from gbirchmeier/93_admintype

close #93 - bugfix: change 'h' to 'n' in Message.IsAdminMsgType
load step code from instance repo
made source image storage work with app engine
Changing start() to boot() on an Extension for consistency. Getting Extensions to start nicely.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Starting admin routing.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Integrated feature <6005>
Restore namp
admin object sorting, open stats
でーもんかにそなえて
Update src/jszlib.
Improve Readme.md of main repository
Merge branch 'master' of github.com:globaleaks/GlobaLeaks

Conflicts:
	README.md
generate spec file.
xmlrpc get_nbh for OT, O, MT .. rudimendtary work
Merge pull request #6 from johnsonc/master

xmlrpc get_nbh for OT, O, MT .. rudimendtary work
initial project version
Merge branch 'master' of https://github.com/golgotha/numizmatclub
Core/Log: some changes
More fish configuration.
Fish configuration.
Disabled auto complete and removed borders around input field.
Compiler flags fix
Add ddSlick component
use list<Cards> instead of list<String> for more oo.
use gallery to display the face and back of one card.
FIX AN BIG PROBLEM.
-- List is a points list which one point to another
point, so be careful when modify it's value.
finish ver. 0.01.
use viewpager instead of gallery.
TODO:delete function.

Signed-off-by: Aaron Xu <greatsnows@gmail.com>
Switched docs for DSL#included from resource to dsl
Setting migration ACTIVE state outside of launch

We explicitly manage the state of the instance during
migration and need to ensure that the bless/launch code
paths do not affect the instance's state. As a result
the instance will only become ACTIVE once the migration
has completed.
Merge pull request #139 from dscannell/stable/2.3-diablo-active-after-mig

Setting migration ACTIVE state outside of launch
updated jade again to deal with includes properly without discarding filename option
Merge pull request #18 from jgoodall/master

jade filename fix
Add tests for Events#oneTimeListenTo
Explicitly pick timezone
Merge branch 'master' of https://github.com/gshort/eriemakerspace
Changed date format to be a more normal year-month-day format
Added freq counter to ExtGPS code… rate/sec displayed to see sample rate.
understand basic structure
instancia de controller em GUIAdapter
This is time delayed chat client
Stop setting dirty when received your own message
Merge branch 'develop' into feature/logs
super basic working functionality
less mkdir, fix writeReturns
validate password with js #19

 cases in concern:

 1. user submit "username "-->before_validation :strip_blanks
 2. empty email is allowed -->"".strip won't be a error in :strip_blanks
 3. blank field check --> with all the error field
 4. user name uniqueness is validated on server, error msg  throgh <%= f.error_messages %>
 5. validates_presence_of :password is now done with js, now the github user can create their local account without a password
Adds ez switch case snippet
added session ID at signup to take user to home page
redone with hashmap - possible multithreading
fix the printing
Update symbols.dat
move ＜＞﹤﹥≦≧∩∪ to mathmatical symbols (according to http://www.fileformat.info/info/unicode/char/ff1c/index.htm etc.)
move 〈〉to left-right pairs (they were at up-down pairs)
tune braces/brackets/parentheses order
Merge pull request #3 from buganini/patch-1

Update symbols.dat
README: Add HIME, which is a development fork of gcin
Tune order for 常用符號, move ＄％＠＆＃＊ to the end as they are easy to type with full width mode.
README: add fcitx bridge support
Merge pull request #4 from buganini/patch-2

Tune order for 常用符號, move ＄％＠＆＃＊ to the end as they are easy to type wit...
string追加
bemax_layout追加
found database issue was related to redis, next step logins
return only one value in ReaderToc:cleanUpTocTitle(title)
1. It is customary to call DjVu context by the name of the program.
2. When changing DjVu page rendering mode there is no need to clear DjVu cache, only our own tile cache.

Conflicts:

	djvureader.lua
move -l argument to the end of GCC call
update readme
rename README.TXT to README.md

for better rendering in Github
remove leading tab in command in README
fix comment in crereader
Add build number to health instance names
Merge commit 'a0bfb0eefb825de46cf528cd85b4dc96ed1dda4a'
Initial commit of flavors API
Added flavors endpoints
Added index_details to match Openstack API
Some more naming tweaks
Fixed novaclient references and links; flavors API now working properly
Instance operations now return flavor information (list, show, create). 
Updated tests to match
Added support for multiple flavors
Fixed tests
Added migration script for flavors, changed API to use DB instead of
Nova calls
Bug fixes
Fixed test
Merge branch 'flavors' into build

Conflicts:
	reddwarf/database/service.py
	reddwarf/database/views.py
Add ValFilter to bracket.
Loads config, added makefile
Add new links in deliveries (be-zen)
Merge branch 'master' of github.com:hsablonniere/markleft into gh-pages
Publishing new links (be zen)
Add dump render frames and fps.

Signed-off-by: Wu Xiaoyong <wuxy@marvell.com>
allow _ (underscore) character on var names
updated DCD with 1 for singleton
Merge branch 'master' of github.com:hypesystem/SliceOfPie
merge
Updated two-color arros
Fix incompatibility with endwise

I don't fully understand what's going on here, but here are the references:

 * https://github.com/ervandew/supertab/issues/4#comment_378000
 * https://github.com/tpope/vim-endwise/pull/16
Don't warn about redefining func
Visual mode * and #
Clean, start search with *next* match
Merge pull request #6 from ifightcrime/master

fix issue #5
documentation
Bumped version v1.1.0
RUBYAPI-20 now passing in 1.9.2
added glob method to filesystem.
Merge branch 'master' of https://github.com/illuminate/filesystem
share application instance with blade.
test redirect session setting.
test redirect with method.
add an artisan facade.
update cookie service provider.
tweaks to the frame header change
make the videofeed resume in chrome
Change step size to 2.5 when using metric units
Some docs
	new file:   getting_started/README.txt
	new file:   getting_started/overview_diagram.png
	new file:   getting_started/overview_diagram.svg
fixed lib pathes for linux
アニメ詳細情報のparse処理修正
ca also teamplay_mode 1
I18N to my app.
Update release.py script to generate the zip file to publish.
Dodane boje i pokloni
Height resolution code

SNR plots for 2008-10-20 included
better way of preventing mod saves from opening in tpt, a way to fix mod saves in the future when PT_NUM is increased (untested)
add Binding.java
Escribiendo el modelo Link