labofsahil/github-event-dataset-2012 huggingface dataset:
Updated spatial description syntax for PSD stage 1.

- Compartments are now ids instead of labels.
- Location can be specified at either rule or agent level - agent
  location taking precedence.
- PSD stage 1 acceptance tests - work in progress.
Added more PSD stage 1 acceptance tests.
Input Spatial Kappa now uses (and requires) %agent: declarations

Bug fix - SpatialTranslator correctly outputs ? link types
Bug fix - SpatialTranslator correctly outputs variable declarations in
original order
Bug fix - Spatial Kappa parser can handle end of line comments
Bug fix - Spatial Kappa parser can handle empty input files
Added PSD stage 1 acceptance tests
Substantial modifications to Spatial Kappa syntax, and translation
application.

Changes were made to produce the PSD 2.0 Stage 1 deliverable and
included:
- changed Spatial Kappa grammar to allow located agents and named
channel agent links
- acceptance tests for stage 1
- code modifications to the translation application to make use of new
Spatial Kappa syntax
Added release notes and user manual for the translator.
%channel: declarations are now more consistent and logical.

%channel: declarations now composed of multiple forward only links.
User manual updated to reflect changes in syntax.
Cleaned up use of %channel: in translator.
Relocated some methods from SpatialTranslator to KappaModel.
Removed ComplexMatchingSimulation.

The simulation will not easily handle agent specific locations, so
removing the overhead of maintaining this implementation.
Significant rewrite to handle sub-complex diffusion.

-) Removed ComplexMatchingSimulator as no longer makes sense in context
of sub-complex diffusion. Classes streamlined after removal.
-) Removed separate %transport: declaration. Diffusion is now handled in
normal transition rules.
-) Added :location and :channel constructs to the spatial grammar
syntax.
-) Diffusion rules now specified using ->:channel syntax.
-) As location is now a propert of individual agents, removed all
LocatedXXX classes as redundant.
-) Created phase 2 acceptance test models - work in progress.
-) Updated previous test models to handle evolving syntax.
Continued work on agent based diffusion.
Continued work on agent based diffusion.
Tidied Spatial Kappa grammar
Continued work on multi-location diffusion for stage 2.
Tidied project prior to delivery.
Updated documentation for latest delivery.
Updated user guide PDF.
Code tidy in preparation for PSD stage 3.
Compartment declarations can specify a 2D or 3D shape.

Available 2D shapes are: 
  OpenRectangle, SolidCircle, OpenCircle
Available 2D shapes are: 
  OpenCuboid, SolidSphere, OpenSphere, SolidCylinder, OpenCylinder

Fixed bug in Compartment.getDistributedCellReferences()
Upgraded compartment location validity checking to handle shapes.
success visitor page
增加获取天气例子，以后扩展使用
Merge https://github.com/jinishahpatel/Application into jinishahpatel-LoginScreen
Pulling down Jinisha changes and then putting back after compiler fixes
Initial commit.
Get rid of Acme bundles.
First bundle: team.
Sonata admin config.
Team entities.
Entities now got right.
Fixtures.
Begin use of Sonata Admin.
Sonata Admin seems to be working!
With working translation.
Modified track splitting to work by the ratio of the averages of the levels before and after each point.
Added some banners, fixed a grid view css issue
Merge branch 'master' of github.com:drake1701/Paper-Roll
Super prueba a ver que tal
added namespace to film admin controller locals
retooled that last method to work smarter, not harder
allow capital hex digits
\u needs extra \
allowing to set bold and italic on multiple elements
passing display public test, failing release2
added secure input framework
CSS promo - Uppercase
Updated Screen's edit function it was using a lot of redundant code. Fixed it by assigning fpnum to fieldnum if fpnum is not NULL.
use consistent param named tax
Add YML syntax for initializing judges data.
Update to 1.1
Added Species menu'
Added sub-links
Site updated at 2012-12-01 09:14:18 UTC
adjust carrousel on home
déstupidation des images valiennes
samy
ajout du patern observable
correction Conflicts:
	Jeu.java
Added a lot of content and images to UX presentation
Adjusted RGB values
Initial Rails Project
Move assets to relevant places
Link everything up to get index page working
Added speakers
Select the correct menu item
Select the correct menu item
switched to rails
enclycopedia pages
Merge pull request #3 from eedrummer/develop

Refactored the patient api to include fields now supported in the HDS patient model
changed id reference to json in coded entry to use _id and removed id() function... use id attribute
test Makerule
Add converter
Add flex paper files
Code layout
Cambios en Crop, ahora se puede detarminar la alineación... por el momento se maneja "top" o "center"
Actually send emails
remove overwriting key binding for f8 key
Add config option for network permissions
Add network bank function
Fix incorrect method name
Another fix
Merge pull request #1 from Technius/master

Add network bank permissions
Update README.md

Fix lists
Modelos Modificados
Vista de cursos y gestion de los mismos
solved highlighting of prompts in comint buffers. All prompts are fontified with comint-highlight-prompt face

git-svn-id: https://svn.r-project.org/ESS/trunk@5125 0bbaf3bd-34e0-0310-bf65-c717079852d4
- move "(" away from beginning of line in doc string -- de-confuse font locking
- max-specpdl-size has default of 1000 even in emacs 22
    (setq max-specpdl-size 700))
- SVN keeps track who added what;  really don't need to sign ;-)


git-svn-id: https://svn.r-project.org/ESS/trunk@5126 0bbaf3bd-34e0-0310-bf65-c717079852d4
Rodney forgot to *commit* when renamed to ess-mouse.el

git-svn-id: https://svn.r-project.org/ESS/trunk@5127 0bbaf3bd-34e0-0310-bf65-c717079852d4
Add a scipy implementation of the quasi1D nozzle problem.
"Real" solution to silence pylint
[#1] Fixed error in Function.back.
[#1] Added support on Function.inScope() without arguments.
[#1] Fixed applyIf and applyIfn.
Update README.md
x
Merge branch 'master' of https://github.com/epha/pharmacokinetic.git

Conflicts:
	README.md
Add French translation from Jiehong Ma

BUG=None
TEST=Make

Review URL: https://codereview.appspot.com/5865049
bump version 1.4.93
Complete content
Complete footer
Cleanup
Add figure numbers
Face!
Periods.
More and less things
New things!
Ignore things
Update slides
Add video, clean up the shit
Improve pen caption
MessageHandler now reads unsigned ints, not signed. Issue #18.
Added the project plan.
Fix in sequence
lisp version of descent.c
adapt xsd-directory
added xml elements around ingest response
Sorted files
Changed next responder chains
Added a compile file and a findings.txt file answering assignment questions.
Fix language typo in Migrations library

lang and line were out of order
Initial Page
Bug fix
More build changes; prep for next release
PLF-3207: Update the instruction to use Office service in Admin Guide
delayed_job calls
mongo service and scaffold
Site updated at 2012-07-16 10:53:52 UTC
Update Travis CI images
Fix an exception in Ponder comment saving.

Summary:
Add a `setViewer()` so that PHID loading doesn't throw.

Also remove a period from a button because none of the others have one.

Test Plan: Saved a comment successfully.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D4202
Fix missing inline comments issue

Summary:
some inline comments are missing in the revision page. The
reason is that the inline comments got overwritten if multiple groups of
comments are modifying the same file
(https://secure.phabricator.com/diffusion/P/browse/master/src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php;f6748bc1907d946ffe5a0957964a5eb5fe90514f$299).

Test Plan: the comments used to be missing renders now.

Reviewers: epriestley, nh

Reviewed By: epriestley

CC: hwang, aran

Differential Revision: https://secure.phabricator.com/D2135
Allow installs to require email verification

Summary:
Allow installs to require users to verify email addresses before they can use Phabricator. If a user logs in without a verified email address, they're given instructions to verify their address.

This isn't too useful on its own since we don't actually have arbitrary email registration, but the next step is to allow installs to restrict email to only some domains (e.g., @mycompany.com).

Test Plan:
  - Verification
    - Set verification requirement to `true`.
    - Tried to use Phabricator with an unverified account, was told to verify.
    - Tried to use Conduit, was given a verification error.
    - Verified account, used Phabricator.
    - Unverified account, reset password, verified implicit verification, used Phabricator.
  - People Admin Interface
    - Viewed as admin. Clicked "Administrate User".
    - Viewed as non-admin
  - Sanity Checks
    - Used Conduit normally from web/CLI with a verified account.
    - Logged in/out.
    - Sent password reset email.
    - Created a new user.
    - Logged in with an unverified user but with the configuration set to off.

Reviewers: btrahan, vrana, jungejason

Reviewed By: btrahan

CC: aran, csilvers

Maniphest Tasks: T1184

Differential Revision: https://secure.phabricator.com/D2520
Fix display of admin "new value" in `accountadmin` script

Summary: I broke this when converting to PhabricatorUserEditor.

Test Plan:
Ran `accountadmin`, created an admin account, verified the "new value" column showed "Y".

  ACCOUNT SUMMARY

                 OLD VALUE                        NEW VALUE
      Username                                    derp
     Real Name                                    derprp
         Email                                    derp@derp.com
      Password                                    Unchanged
         Admin   N                                Y

Reviewers: btrahan, nikil

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T1434

Differential Revision: https://secure.phabricator.com/D2908
new inital value
refactor cli, debugging nontermination with some failure tolerances
for new layout and search with keyword+loc
loc in search api
seguindo a sugestão do Bruno, removi o bibabnt da árvore pois os próprios autores originais do iiufrgs recomendam o uso de outra biblioteca, e por isso movi o conteúdo do diretório iiufrgs/ para a raiz
add unit tests, update sample app
compat
cmpat
Unser static-Content wird jetzt vom Default-Servlet geservt
#22 Logo: Implements <svg> or <sources>
Merge branch 'master' of https://github.com/flycode/chico-mobile
Merge pull request #30 from flycode/master

Version 0.4.1
Merge pull request #36 from flycode/master

Version 0.4.3
#40 Icons: Add the apple touch precomposed icons
The member function _getTokenIds in application/controllers/admin/tokens.php references a $iSurveyId variable which is not declared or initialised anywhere. The only reference to the function seems to be on line 1022, where such a variable is available. Adjusting the method to take an extra survey Id parameter seems to fix the problem I encountered when working with tokens in v2.0b1
Dev Working on a new admin style (gringegreen)
Dev Working on a new admin style (gringegreen)
Merge pull request #6 from fmestrone/patch-1

Fixed issue: Missing parameter in _getTokenIds - patch kindly provided by fmestrone
Fixed issue 05799: When adding participants to a survey, options are disabled. Redesigned UI as per discussion.
Dev: Language additions and translation updates required
Dev Working on a new admin style (gringegreen)
Dev Working on a new admin style (gringegreen)
Merge remote-tracking branch 'origin/Yii' into Yii
Fixed issue: Images inserted into HTML emails were not properly linked to the server
Dev Working on a new admin style (gringegreen)
Dev Working on a new admin style (gringegreen)
Dev Working on a new admin style (gringegreen)
Dev Working on a new admin style (gringegreen)
Dev Working on a new admin style (gringegreen)
New feature: New admin style
Dev Restored images/CSS for classic gartergrey theme
Fixed issue: edit icon not visible in participant attribute edit subgrid, also added comments
New feature: Ability to change admin theme in global settings
Dev More fixes to gartergrey
Dev : Fixed some issue with languagechanger
Dev : force defaultlang in restrictToLanguages
Dev: fixed issue if refurl is not set
Dev : fix the fix: $defaultlanguage/$defaultlang
status oppdatering
Laget skallet til Server og koblet til databasehandler
Merge branch 'master' of github.com:fpg44/fellesprosjekt
go back to simplistic synthesis
Bite the bullet and celebrate Control's working in Pharo with a v1.1 release.

ConfigurationOfControl-fbs.19
2012-08-30T21:24:50
Fix BPF_JITTER code broken by r235746.

Pointed by:       jkim
Reviewed by:      jkim (except locking changes)
Approved by:      (mentor)
MFC after:        2 weeks


git-svn-id: svn+ssh://svn.freebsd.org/base/head@236231 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Check that scheme is not already registered. This may happens when a
KLD is preloaded with loader(8) and leads to infinity loops.

Also do not return EEXIST error code from MOD_LOAD handler, because
we have undocumented(?) ability replace kernel's module with preloaded one.
And if we have so, then preloaded module will be initialized first.
Thus error in MOD_LOAD handler will be triggered for the kernel.

PR:		kern/165573
MFC after:	3 weeks


git-svn-id: svn+ssh://svn.freebsd.org/base/head@233342 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
As noted by Peter Jeremy, r234528 only partially fixed the infinite
loop bug introduced in r187302.  This completes the fix.

PR:		167039
MFC after:	3 days


git-svn-id: svn+ssh://svn.freebsd.org/base/head@234536 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Merge r132141 and r111272 from amd64/i386:
  Reduce the size of a PV entry by eliminating pv_ptem.  There is no need
  to store a pointer to the page table page in the PV entry because it is
  easily computed during the walk down the page table.

  Eliminate the ptphint from the pmap.  Long, long ago, page table pages
  belonged to a vm object, and we would look up page table pages based
  upon their offset within this vm object.  In those days, this hint may
  have had tangible benefits.

Tested by:	jchandra


git-svn-id: svn+ssh://svn.freebsd.org/base/head@239152 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
- Add knlist_init_rw_reader() function to kqueue(9).
Function acquired reader lock if needed.
Assert check for reader or writer lock (RA_LOCKED / RA_UNLOCKED)
- While here, add knlist_init_mtx.9 to MLINKS and fix some style(9) issues

Reviewed by:    glebius
Approved by:    ae(mentor)

MFC after:      2 weeks


git-svn-id: svn+ssh://svn.freebsd.org/base/head@233505 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix a totally bone-headed, last minute bounds check snafu that somehow
I must've missed when booting a test kernel.

This has been validated on the AR7161.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@234941 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
update changelog; use secure travis link
1.3.1
making the database connections work
up to 39
typeof is an operator, so treat it as such.
Upgrade gem structure
new free type (damn you mt. lion)
for now, remove the class preprocessor

It breaks syntax checking a bit - this should probably be fixed in the
preprocessor, eventually
Update features/challenges/browse_challenges.rb

fixed indentation error
add grove motor shield block support
Update the database profiles selection to remove the activeByDefault usage
Update the profile management to use the gatein.dev property activation and remove the activeByDefault activation
GTNPORTAL-2405 : Build activation improvement
Corrected a typo in creation/printer
Bumped version number to match Okku
Changed name of KEY_USERNAME to KEY_NAME.
Further work on capistrano staging-evironment
weird
This will list all the files in the given directory, it will also go through all the subdirectories as well
Working \o/
另一个版本
删除不必要的信息
Added JSV to package.json (needed for JSON Game Validation)
Small modifications to make schemas consistent with the JSV validator (it now validates correctly and completely!)
Config file used for validation (with paths to the game schemas)
Schema defined only for test purposes.
Game validation + tests added
fix the bug in remove node C routine
webpage almost good but weekday is wrong if a sunday (printing
December???)
Merge branch 'master' of https://github.com/ggaavv/Equinox-Clock.git

Conflicts:
	Equinox/Main.cpp
string examples 2
Adicionei as estatisticas finais
Biglietti da visita e cartelline
TONNELLATE
WP_HTTP: Curl: Handle Redirections in PHP rather than internally in Curl, Simplifies code flow between safe_mode On and Off, and works around certain bugs. Props simonwheatley for initial patch. Fixes #20219, Fixes #17490
Media: Display WordPress and plupload error messages whenever an upload fails. see #22243, #22186, #21390.
Media: Make the pre-upload-ui hooks share an element with the post-upload-ui hooks. see #22186, #21390.
Compress scripts/styles: 3.5-beta3-22819.
Media: Make friends with media_upload_form. Adds notices for browser incompatibility, upload limits, maximum file size, and large file issues to the uploader. fixes #22243, see #22186, #21390.
Twenty Twelve: add styles for common HTML elements in comment content, and also style up password protected form. Props drewstrojny, fixes #21242.
Twenty Twelve: minor comment text fix, props griffinjt. Closes #21291.
Twenty Twelve: Update full-width handling with a missing CSS selector, and add case of no sidebar to the content_width calculation. Props obenland, fixes #21254.
Twenty Twelve: update theme options file to use PHP5 constructor and visibility keywords, and also minor DocBlock cleanup. Props Mamaduka and obenland, closes #21297.
Widgets UI: make the whole "header" clickable to open/close the widget (same as postboxes), remove deprecated jQuery .live(), part props lessbloat, fixes #21247
Compress scripts/styles: 3.5-alpha-21282.
Add i386 to VALID_ARCHS on ReactiveCocoa-iOS target.
Merge pull request #6 from akiland/master

Add i386 to the VALID_ARCH list.
bogus new stuff
Autogenerated manpages for v1.7.10-280-gaa39
Updated project model with comments from Paul
Updated RFC length on the form
added key word
Tune booth.css for narrow windows
Add missing conditional social iframe
adding in some more code to look for services
fixing the naming now that we break it down to radios
Added FSM states and memory module
typos
Quoted size param in content disposition no longer raises exception
Fix find_free_name (Related: #219)
Merge pull request #213 from Erkan-Yilmaz/master

Fixed typos
Merge pull request #220 from LessonPlanet/master

Fixed handling a quoted content-disposition size parameter
Fix mistakes in changelog
Updated CHANGELOG for #213
Updated changelog for #220
Input uris for the AuthStore are now converted to URIs.  #222
Merge branch 'master' of git://github.com/tenderlove/mechanize into fix_find_free_name
Ruby 1.8.7 and 1.9.2 raise an exception upon URI URI "http://example"
Fixed another bug in find_free_name, updated test cases
Merge branch 'master' of git://github.com/tenderlove/mechanize into fix_find_free_name
Mechanize now ignores a missing gzip footer like browsers do.  #224

Date trailing the deflate content no longer corrupts the response bodies.

Improved messages for bad gzip footers.

Reduced handled gzip error log messages from error level to warn level.
Merge pull request #223 from godfreykfc/fix_find_free_name

Fixed find_free_name (Related: #219)
destroyed report scaffold and generated new with additional columns
handle true/false
added more javadocs in the login managed bean
Got rid of release folder.
Added forgotten files.
Added forgotten files.
Moved format specific files to their own folder
fixed xcode proj, fixed png includes
added bacon ipsum script
ast macros to use the return value of a call, trying to spawn an entity, setting a member, and reading the member back, using print+ftos to print it then
ir_block_create_store_op checks whether or not the storetype is an SSA value - do not do that for storeP instructions
use the correct STORE instruction, make pawn a local
Allow regular AND used on non-float types
map link to google
Table stripped
placeholder on textarea
Merge branch 'master' of https://github.com/grimborg/hackatonweb
design e added
Remove vanilla NetBSD -current files that are not modified anymore.
Fixed more compilation problems.
20120612 need learn more
teh errrorsos

asc
Initial commit
Merge github.com:hairisonfire/mybooks
more checkstylin & a testdir with empty files
Add hr shadow styling
Add hr markup to homepage
Upgrades for compatible with Juzu 0.6-SNAPSHOT
[Space Activity] Fix bug to make application run on juzu 0.6.0 SNAPSHOT and PLF-4.0
More crap. Changing quantities work.
update collision step punch
Add some more explanations to the README.md
Add helper files for running tests
Add tests for running without a fallback ex-post
Create transaction for borrowing book
Issue #10 - Added messages for configuration pages
added table headers to comments pages
Added navigation rules
Standard validation model
Styling fixes

Signed-off-by: David Fisher <deiform87@gmail.com>
added vertical cylinder
Revert "Remove instance variable from home_controller, and use content_for to render header."

This reverts commit b0b12c6bb1af35d8120a36fedc3c846f9db6d8e1.
Revert "Big bootstrap-ish header on frontpage."

This reverts commit e88f2b95f5b34d787c94cc358025cce14cf8190d.
Remove debug logging.
Use before_filter for topic#votes, fix indent.
Fix import error.
When connecting promises, move the checkbox to a third column but keep the text clickable.
Match the Setting help to a valid setting.

Previously the help example for setting was

SETTING public_registration true.

However, the setting key tkellem is looking for
is user_registration, checking that it's not 'closed'
So a more helpful example would be:

SETTING user_registration open
Add some information on device-based backlogs

This information was lacking in the Readme, making it
hard for new users of tkellem to take advantage of
per-device backlogs.
add .hilite css with a conditionnal variable
Add ref_id to resource (it is optional but must be unique for the repository); also make identifier optional for resource;
Make new i18n path creator in helper handle inevitable sub sub record paths
fix: remove page number checking in displaying TOC

Former showTOC() method checks the page number in each
entry and only display entry whose page number is greater
than the previous one. However, I think this is too
"clever", we should better leave the TOC untouched to keep
consistent with other pdf readers.
Add Japanese to list of supported languages
Added type of transit to De Lijn
fix #104: chinese in ed2k
rename spotlight domains-controllers and views
Fixed a bug in AND streams
Removed debug info when session is invalidated
Trying to fix href issues
Removed lined
it is possible to mark 0 accents
Sun 21-25
FileLocator now finds FrontendBundle routing.yml. Navigation can be edited again
Stupid DS_Store files
2426 wanboot openssl needs to not call cast function pointers
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Approved by: Gordon Ross <gwr@nexenta.com>
2080 cpr doesn't even nearly work if built with gcc
2425 don't pretend to use Sun as on amd64
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Gordon Ross <gwr@nexenta.com>
- small fixes. Preparing 12.10 release
second change to this file
this is more plus third change
changes to readme - original file
Added highlighted property to OEGridViewCell
Doesn't really do anything important yet
Fixed infinite loop madness
Restore appcache
Contact form demo with its description and steps to follow
Added function for tf_viewer.
Updates to MaskedCorpus class.
v1.1.14

- new demo added
document how to spoof
database status
Merge branch 'master' of https://github.com/irhamnurhalim/dephub
file structure
file structure update
Added Web Project, refined solution to report steps
Container Web MVC example working
Working well single container page.
Add more tests instances for simple alternatives using
parentheses (e.g. 1502-11-22 (1503-02-07))
Add handling for simple alternatives using parentheses (e.g.
1502-11-22 (1503-02-07))
Теститрование класса DistList
- added action body attrs
- added contain body attrs
- added copy_from body attrs
- added volume body attrs
- added mount body attrs
- added service_method body attrs
- added database_server  body attrs
- added environment_resources body attrs
- added match_value body attrs
bugs and some improvements
KOKU-1283: Rekisterointi

Changed portaluser service to use pic as customerid. Fixed bugs and removed service-level authentication at some points. Changed to use fixed version of portaluser service api and altered database ddl
Merge branch 'develop' of github.com:ixonos/koku-services into develop
Primeira versão do Exercício 05 - Composite.

Dupla: Jackeline Dantas e Fabiano Ferreira.
Signed-off-by: QiuJingLiang <532277343@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Signed-off-by: whoseyourdady <307971173@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Merge pull request #6 from jackzpj/master

06_28_PJ_修改3

没有冲突

同意整合
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Signed-off-by: Seaweed123 <540496185@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl

Conflicts:
	VoiceControl/src/com/scut/vc/identifysemantic/SemanticIdentify.java

Signed-off-by: Seaweed123 <540496185@qq.com>
Merge pull request #7 from Seaweed123/master

讯飞文字分段问题

没有冲突

同意整合
Signed-off-by: whoseyourdady <307971173@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl
Signed-off-by: whoseyourdady <307971173@qq.com>
Signed-off-by: QiuJingLiang <532277343@qq.com>
Merge pull request #8 from QiuJingLiang/master

6.28改动界面

没有冲突

顺利通过
Signed-off-by: jackzpj <jackzpj@gmail.com>
Signed-off-by: whoseyourdady <307971173@qq.com>
Merge branch 'master' of https://github.com/whoseyourdady/VoiceControl

Conflicts:
	VoiceControl/src/com/scut/vc/utility/DeviceControl.java

Signed-off-by: whoseyourdady <307971173@qq.com>
Signed-off-by: jackzpj <jackzpj@gmail.com>
pegjs 0.7 compatibility and parser variables removed from serction function on pegjs files, this makes the parser more independent.
Add second notebook
Updated reame with a Todo section.
Per-discipline fee jump for non-eaerly reg MASKC
Add support for id attribute to message and presence elements.
Adds Parse library
Add simplejson as requirement for python 2.5
Started ember model
Rename to topojson.neighbors.
Fixed world to only report a player error if it actually didnt exists during a disconnect
Updated the player to talk directly to the game for player controls/actions, also sorting of the player list on the client was fixed
RR:I2:S3:V3
Delete friendships
adding tiny to do and adding items
adding movies information to database and adding queries.
Fix duplication of hidden tasks
[Blog]: Splitting normal actions
using lesser memory and execute faster
Local Changes
Rectified Conflicts
Finished Open_Namev
Merge branch 'master' of github.com:jayanthsilesh/weenix
fixed problems with browser back and forward buttons
Remove uneeded str()
validator ported to p3k
exercise 3 finished
Really escape empty space in g:rplugin_home.
New command:  RAddLibToList.
switched favicons
Add default files for gem
fix #1814 set __file__ when running .ipy files
add size-limiting to the DictDB backend
fix #1814 set __file__ when running [i]python files through interactiveshell
fix #1814 set __file__ when running [i]python files through interactiveshell
Updating parallel options pricing example.
Allow direct print of the notebook.

this improve the current css of the print page and add css to the
classical notebook with print as target to get a better print view ant
the ability to directly print a notebook without going through the print
view
conform to pep 3110

brutally replace all `exeption <type>, <name>:` by
`exception <type> as <name> :`

`exception <type>, <type> :` should not be present anywhere in the code
anymore, or should be present with explicit tuple as
`exception (<type>, <type>)`
allows password and prefix for notebook

fixes #1997
Make BG color of inline plot configurable

pylabtools.print_figure respects the facecolor/edgecolor setting in
the figure instance, instead of overriding by hard-coded color.
Now user can set color by matplotlibt API (e.g., fig.set_facecolor)
or IPython configuration.
fix more exeptions

2to3 makes a better job than regexp
use full base_url in html and js
Skip notebook 'static' dir in test suite.

There's nothing there we should be running python tests on, and
occasionally python files may appear there that cause problems to nose
(e.g. mathjax ships a non-py3 valid conf.py that breaks py3 testing).
Merge pull request #2076 from fperez/exclude-static-tests

Skip notebook 'static' dir in test suite.

There's nothing there we should be running python tests on, and
occasionally python files may appear there that cause problems to nose
(e.g. mathjax ships a non-py3 valid conf.py that breaks py3 testing).

Closes #2075
Fix Python 3.2 test failures (ResourceWarnings from unclosed files).

Closes gh-2083.
Ensure files are closed after reading.
Clean up TemporaryDirectory (prevent ResourceWarning)
Added new short key for cell execution
%prun: Restore `stats.stream` after running `print_stream`.

When profiling, the output from `print_stream` is captured so that the
output can be paged. To do so, the `stream` attribute is set to a
`StringIO` object but was not restored after the output was captured.
As a result, the stats object returned by `%prun -r` did not display
any output when calling its `print_stream` method.

In addition, the `pstats.Stats` class has the `stream` attribute for
all currently supported Python versions, so the extra branch of code
can be removed.
disable some specific 2to3 fixes whith setup.py

this should allow a more compatible codebase between python 2.x and 3.x
fix english in comment
Corection bug activite.php

Signed-off-by: Jean FRUITET <jean.fruitet@free.fr>
lexer is working. did some work on the grammar file
Added index padding to dir/file listings
Testbench naming of components
subiendo 2do parcial
rmagick: resize photos to height 133
join ministries finished
fix text area being aligned center in mobile layout
Added ebin/ and priv/ and put .gitignore there to prevent files there to be included in the branch
Deleted ebin/tinymt.app
add shell script codes
update to guard api version 1.1
extra reverse lookup functionality
README.md: correct reference to file with #defines
Make ScheduledSubject more flexible by allowing a custom ISubject.
added a teacher website link
bugfix for DIRECTIONVAR variable
made AreaBombs direction to null
initial try to have hill in box
Clean up of the code, additional comments and
increased clarity
updated README.md

- added note on new yum cookbook dep
- added instructions for new attributes
- added list of platforms this cookbook has been tested on
Merging in a pull.
Adding river width computation and GeoTIFF support. Need to move geocoding logic out from Extractor::main() and into the relevant places next.
user admin working
random recipe
connects to a webpage and fetchs some json
advanced mockups + push note method to the server
add files for the network communication forgetted the last time. Oups.
gettig ready for the merge
merge
moved tests, fixed bug

Seems like the convention is to put rspec tests in a 'spec'
directory, instead of 'test'. Moved.

In some environments Matrix's each_with_index doesn't like being
called with an argument. Fine, because the desired argument (:all)
is the default one.
upped gemspec version number.
kj as Esc to normal mode
Use \ to complement ; for reverse character search
Update fugitive and py.test
Ignore tags in .vim
pep8 the tmpl.py
Incorrect SQL.
Add a function to modify field value
trimmed commands file
add problem5 solution
Write ahead log hook to batch mutations.  Basic keyspace login.
Upgrade to cassandra 1.0.6
lui-fools: Typo fix, invisibiel -> invisible
Nickserv: Rename *-nickserv-name to *-nickserv-mask.

It's a regular expression matching the nickserv. The term "name"
is confusing here.
Networks: New design centered around network/server configuration.

Circe now does not use the network as a central key to look up
network-specific information anymore. Instead, network-specific
information is collected and local variables in a Circe server
buffer are set appropriately. This makes the code easily
extensible to future plugins.

The network-specific options are taken from the options passed
to the `circe' function, from a user-setable variable
`circe-network-options' and a Circe-supplied network defaults
variable `circe-networks'.

An example, because that says more than anything:

(circe "Freenode"
       :nick "forcer"
       :channels '("#emacs-circe")
       :nickserv-password freenode-password)

This will create the server buffer and set the following local
variables:

circe-server-nick to "forcer"
circe-server-auto-join-channels to '("#emacs-circe")
circe-nickserv-password to the value of that variable

This function accepts any keyword, actually. A keyword :foo
will be translated to a variable named `circe-foo'. Some
keywords have special variables attached to them (like :nick
becomes `circe-server-nick'), but they all get translated
to buffer-local variables in the server buffer.

Furthermore, this will use the "Freenode" network name to
look up various values not set here directly from
`circe-network-options' and `circe-networks'. The latter
contains the nickserv configuration, for example.

Finally, a number of variables have defaults if none are
specified. For example, `circe-nickserv-nick' is initialized
from `circe-server-nick' (set by :nick) if not given separately.

The following code is exactly equivalent to the above, too:

(setq circe-network-options
      `(("Freenode"
         :nick "forcer"
         :channels '("#emacs-circe")
         :nickserv-password ,freenode-password)))
(circe "Freenode")

All network-dependent variables have been changed to use the new
code.
Nickserv: Rename nickserv options to be more consistent.

IDENTIFY-related options are now :nickserv-identify-{challenge,
command,confirmation}, GHOST-related options are now
:nickserv-ghost-{command,confirmation}.
circe-ghost: Also pass a :password formatting option.
Add firewall script v13
Added "save as stencil" and "delete stencil" buttons to console
Return to stable version of paper.js (argh.)
rework get_world_view architecture, show a world status
Load content without reload the page
Show last tweet in the footer
Fake content for the the other pages
drag and drop interfaces don't require IFeathersControl.
updated build script to include swf-version and target-player. also made starling.swc an external library to feathers.swc.
Turn off annoying debug message.
#87 renamed "changeX" to "setX" to keep with convention
#87 implemented setWidth()
#87 implemented getScale()
#87 get/setZoom
#87 made get/set for Size
adjust spacing for homepage banner to fit spanish better
Proper login credentials, disabled maintenance mode
Translation
Panel: flipple overlay shadows, reduced blur and removed from transition
Docs: Replaces beta with RC1
Merge pull request #5012 from MauriceG/patch-1

Docs: Replaces beta with RC1
fix up tests for phantom, green
Label user-select rule gets superfluous if ui-btn-text has it already
Make ui-btn-text unselectable at all
Merge pull request #4431 from MauriceG/patch-110

Text on buttons should not be selectable Rev 2
Added comment explaining empty setTimeout in test.
Prevents positioning context bug for close buttons within popups in Opera Mini.
Merge branch 'master' of github.com:jquery/jquery-mobile
Adding GameTutorial project and basic game
Adding some Eclipse-related files to .gitignore
ENH: Make kosher for wrapped results
BUG: Fix indexing bug for margeff at == all
allow running tests against apps in dropbox mode
player z-index is dynamic now!
Corrected normals so they point outwards.  This made a small change, but the code crashes after three iterations now
backup: Rewrites README
filediff: Adds datarow function
filediff: Adds intersection function
Added fetchDNS
Removing text that is not needed.
starting Event Reporter
Removed second return declaration in the MyView::render() method as it is not needed.
Merge pull request #3 from ochekurishvili/patch-1

Removed second return declaration in the MyView::render() method.
Introduction and installation
styling of example page
added readme
Merge branch 'master' of https://github.com/kattunga/zfs-scripts
save both show master and slave status
ver++
Section::test_name implemented.
Style::test_name implemented.
mimized root readme
improving SemCrawl
amend patch to drop correct column name can_pre_close
return back http error code instead of java stacktrace when no tenant identifier is provided in request.
delete a saving product
Merge pull request #7 from madhukar547/master

Deleting a Saving Product
Moved application sources into a new app folder
Moved all test logic into its own script
Added coffeescript compiler
Added ability to append text to content section by typing
Added font for content section
Moved scripts to end of main index
Use pywsgi.py instead of wsgi (better chunked handling)
Use gevent.sleep to make the program non-blocking
Merge pull request #58 from mnunberg/master

Some fixes
change the ed2k regexp to make the tail "/" is not mandatory,because the tail "/" will be eaten in some cases,even the input ed2k url ends with "/"
added colors and client-side javascript example code
Fix colour of table headers that are now links
Remove excess whitespace
Removed unused code
Extra warning if the user autocompletes with ID
Made email and url validation trigger in IE
Will update valid and invalid classes in supporting browsers
Config variable touchSupporting, true by default
some small changes to layouts and stuff. added a home page. trying to figure out why refreshing the page won't kill the socket, think it could be because it's a local host connection?
oh yeah, have to swap over the connection string when we go to heroku
started styling position page
Started with MPI
adjusted bcast
Bug fixes + cleanup

- Fixed rank->stars bug
- Remove the chemistry demo module
- Added missing jquery dep for utilities
- Back links look better without underline
Really removed chem demo
Brought in latest arithmetic module
Added barith's latest lessons (proper maxRates) + removed backlink underline
Implemented StopWord DAO, pseudocode in Streamer

Next commit will contain TweetCleaner :)

Signed-off-by: Kevin Panuelos <kevin.panuelos@gmail.com>
latest mockups (school creation, registration popups)
add cookie salt to 3.1 guides bootstrap
Add 3.3 release, add 3.3 documentation
remove stupid netbeans folder
fix 3.3 index to point to 3.3 submodule for docs
fix index file for 3.3 docs
Add cache and log dirs to writable
point 3.3 docs
updated: provide progress feedback for akmod and initramfs rebuild, minor code shuffle.
removed engines for now
may have fixed percent done readout
Conception visuelle des cas modif infos et consult fiches terminé
database pass added (in env)
ver handy parallel collections that were not in a book (new in 2.9)
JAABA_plot: added feature to run classifiers on experiments
Merge branch 'master' of https://github.com/kristinbranson/JAABA
JAABA_plot: fixed bug in BehaviorBarChart, per Fly, grouped
JAABA_plot: catch cancel on ClassifierAdd
Merge branch 'master' of https://github.com/kristinbranson/JAABA
add aspectOf-factory method for using aspectj with spring and managing
apsects by spring (newer aspectj versions)
add aspectjrt to classpath
OpenGraph setup, local configurations.
credit to a better version by @thejandroman
add ant build file for command-line compiling
DWDS
Heh.  Sorry.
Working out some bugs.
updating navigation and header
hej
merged
test
Added PUL files for debugging purposes.
Protected import of cvxopt and subclassed test
cleaned up printview
Version 0.0.197
Version 0.0.198
more vim style key bindings for navigating the show in presentation mode
presentation mode button and slight modify to style to make it look better zoomed in for presentation
presentation class that makes the sidebar font-size smaller
Working RepositoryClone.
Bug fixing & processor work.

- Fixed bug in db:populate where some keys were added with a trailing '\n' char.
- Implemented Clone & Pull in the project model.
- Added classes to be Localization Processors responsible for each different project type.
[maven-release-plugin] prepare release atlas-parent-1.11.12
[maven-release-plugin] prepare for next development iteration
bug fix for V1-D-05495
[maven-release-plugin] prepare release atlas-parent-1.11.13
pom update
[maven-release-plugin] prepare release atlas-parent-1.11.14
[maven-release-plugin] prepare for next development iteration
....small bug fix...
Merge branch '1.11-candidate' of github.com:lbrackspace/atlas-lb into 1.11-candidate
[maven-release-plugin] prepare release atlas-parent-1.11.15
[maven-release-plugin] prepare for next development iteration
merge fix
fixing param
some updates for content caching V1-B-17648
Merge branch 'internal-master' into node-meta-data
First draft of solarizedDark colorscheme
Added/updated solarizedDark
Made solarizedDarkLC usable
Updated darkLC scheme
Made the relativeshort feature in functions, updated LC colorscheme
LC version starting to take shape
solarizedLightLC added, temp holds a nonLC ctrlp idea
Updated lightLC
Merge branch 'develop' of http://github.com/Lokaltog/vim-powerline into develop
add git push tips
Better LaTeX output for SymPy card
Make integral work with multiple limits and add example
fmpz_mod_poly_factor: fix some tests
nmod_poly: add function factor_distinct_deg
nmod_poly: add function factor_kaltofen_shoup
arm: at91sam9xcm: add specific nand pinctrl

the nand is on d16 and 8bit

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
separation du script et correction html
adding html/css framework
Merge pull request #1 from creatifyme/dev

adding html/css framework
stream operator package changes; allow fewer result values in tests
QuitMainLoop - suggestion only
remove suggestion
cosmetics in XPower plugin
Merge pull request #102 from ims21/master

cosmetics in XPower plugin
commit application.js for merge
for meger
solve conflict
has_post_thumbnail() is a function
adding field to the URL to retrieve only a subset of a given service
temporary bugfixing of xenserver plugin
changes to ie8 css
Merge branch 'master' of github.com:lodfelt/blog_example
Removing hanging spaces at end of comments

Lines for function name, whitespace, and params all contained unneeded
trailing spaces at end.
2.50_3160  Sat Aug 04 14:11:00 2012
	Significant changes to configuration subsystem.
	-Helios::Config->init() now clears all already parsed config
	 data structures.  The init() method should normally only be
	 called once.
	-Helios::Service: significant changes to how Helios::Service
	 interacts with Helios::Config.
	 -Added ConfigClass() method to specify alternate config modules
	  (like JobClass() and Helios::Job).
	 -Added initConfig() method to call init() for whatever config
	  module is specified and $INIT_CONFIG_CLASS to keep track of what
	  config module has been initialized.
	 -The prep() method will now only call initConfig() to initialize
	  the config module once, but will always call parseConfig() to
	  update current config parameters (unless a cached config was
	  given when LAZY_CONFIG_UPDATE is active).
	 -getConfigFromIni() and getConfigFromDb() have been rewritten
	  to use Helios::Config (or whatever ConfigClass() is set).
	  However, use of these methods is now deprecated, as
	  Helios::Config and its subclasses can be used directly.
	-t/1.t and t/2.t have been updated to test Helios::Config
	 functionality.
guardando datos
guardando datos
get tests running on ruby 1.8.7
* Creada clase Widget
* Convertida la Table en un Widget
* Añadidas imágenes de fondo y de la mesa
ETag!!! Yuppi!
a bit of description on how it works
Base template
template uses the base template
fixed bugged lambda
Detailed view, fixed another lambda
added haystack
Added support for ~/.ssh/config
Added support for ~/.gitconfig
Make some aliases consistent amongst distros.
Added a 'bugfixes' file.

Currently used to fix flasplayer bug.
trying 1.2.5
probando
Merge branch 'master' of github.com:luiscrespo11/SemLuis
probando probando
sub ejem
JSON: handle list of objects at root, and empty string
Alert on no internet
Merge branch 'master' of https://github.com/lurraca/MastercardBB
实现登录注册，及登录注册的判断Filter
first git commit of drupal concert module
fixed error messages concert_submit()
Bugfix: hours and minutes are now leftpadded when necessary
Removed some debug stuff
Added basic admin form and loads of code cleaning
CSS fixes
Install fixes
Merge branch 'master' of git://github.com/maartenstorm/concert
Converted All projects to .NET 4.0.

Mostly the solution compiled without much change. Two changes did have to be made however:

1. String.Join() is a static method in .NET 4.0 so instances where this was used as an instance method had to be modified.

2. A "Tuple" generic type was added to the System namespace in the GitCommands project. In .NET 4.0 Tuple was added to the system namespace natively so the System.cs file which only contained the "Tuple" type was removed.
VS-Plugin: Treat WiX files as regular files

This allows things like 'commit' and so forth to work.
Merge pull request #1015 from mabako/vs-treat-wix-as-files

VS-Plugin: Treat WiX files as regular files
Commit message box context menu improved

* Removed suggestions list when word in dictionary
* Reduced number of suggestions to 5
* Suggestions highlighted with Bold text
* Clipboard commands moved after suggestions commands
* Removed Undo/Redo commands
Separate icon if only submodules dirty in repository
Remove ' ' before '+' and '-' to not remove valid spaces
Merge pull request #1017 from jbialobr/upstream

Remove ' ' before '+' and '-' to not remove valid spaces
Update master
Resources moved from Form resources to GitUI project resources

* Removed GitPlugin debug messages
Changelog updated
Added line and column position to commit window.

- Added some interactive reformatting based on template settings.
- If there is a character limit on a line words typed after that limit
will be wrapped to the next line.
- If the 2nd line should be empty, anything typed there will be
automatically wrapped to the next line, and a bullet will be added.
Autoresolve git editor fixed. Closes #1018
Added [Browsable(false)] to EditNetSpell's CurrentLine and CurrentColumn properties.
Commit box spellcheck now works correctly on resize.
Minor TranslationUtl changes
Default pull action button
toolStripButtonPull ToolTipText
LastPullAction - per repository setting
Commit dialog bug fix at resize
Merge branch 'pr/n1019_paviad'
Update app/admin/tickets.rb

Fixed bug where "All Tickets" listing would show tickets from deactivated projects.
Integration of: LibGit2

Updating LibGit2
    From: libgit2/libgit2@4cbe9a1be18338b7e223b42e6019c58181204123
    To:   libgit2/libgit2@55325efa1d1dbe821da990ec9245ff0653944faa

Russell Belfer (2):
      Clean up iterator APIs
      Fix iterator reset and add reset ranges

Vicent Martí (1):
      Merge pull request #1133 from arrbee/more-iterator-cleanup
Schema changes. Dummy keys added. Surrogate ids used.
VertexArrays are now managed with the renderer's new resource manager.
Cleanup.
Shaders are now managed using the renderer's new resource manager.
完成皮肤预览窗口
文件名调整
初步完成样式编辑器的布局
优化样式预览图片的创建代码
reverted changes in Main.js controller of RegExtjs4
add htaccess for Maintenance mode
add tr_TR
checking problem with toolpathviz
removed redundant tests
basic move processing set up. Not done taking or kings yet though
changed format of readme form md to rdoc
refs #5628. Final date the old IDF.