labofsahil/github-event-dataset-2012 huggingface dataset:
Fix `NullPointerException`

Only disconnect from XMPP service if member is not null.
Merge branch 'xmpp_service' of github.com:nookieman/TeamMeet into xmpp_service
beautified XMPPServiceConnection in MainActivity
removed unused TeamMeetServiceConnection
Prepare `AsyncTask`s

 * Add respective package
 * Add draft for a `ConnectTask`
    * Manipulate text of button retrieved via the constructor
Merge branch 'xmpp_service' of github.com:nookieman/TeamMeet into xmpp_service
Merge pull request #9 from 0x64746b/45b795263f7dd0b559a3e1b845c6691a235c1336

Introduce `AsyncTask`s
Merge branch 'xmpp_service' of github.com:nookieman/TeamMeet into xmpp_service
enable sendLocation in LocationService

the LocationService now binds to the XMPPService to broadcast location
updates
added formatter.xml for eclipse
error handling for sendLocation()
Change interface of XMPP tasks

The current examplary implementation handed over the UI element to be
manipulated upon completion of the task via the constructor, while the service
was handed over as a parameter to `execute()`, being passed into
`doInBackground()`.

This commit makes the service a parameter of the constructor as well, the policy
being that arguments to the method called on the service should be handed over
to `execute()` (probably being a `List<String>`) while objects that will
probably be required by every task (the `XMPPService` and a UI element to be
manipulated) should be provided in the constructor.
Merge branch 'xmpp_service' of github.com:nookieman/TeamMeet into xmpp_service
Merge branch 'xmpp_service' into async_xmpp_tasks
fix service name of LocationService in manifest

after renaming of the service package to location the
AndroidManifest.xml needs to be adjusted too
more and more meaningful log and error messages

 - changed Log.e to Log.d where appropriate
 - added context information in log and error messages
 - added more debug logging
fixing the binding workflow

the registering on location updates requires mLocationService that is
set onServiceConnected, which is called asynchronously. therefore the
registering has to take also place in the onServiceConnected.
only call sendLocation if XMPPService is available
Adjust formatting

Use derivate of Eclipse's defaults.
rename mServiceConnection to mXMPPServiceConnection
カメラ操作の変更
first time
Merge branch 'master' of github.com:2C2P/KBank_MPI_DB
tmtwinoe cfe but model name tmtwin in header
	modified:   recipes/technomate/files/tmtwinoe/cfe.bin
Customized_Event implementiert
Merge branch 'master' of github.com:5ilv4n0/s87Server
Customized_Event implementiert
darkroom - final changes and bug fixes
jsu
fix prefix in doap-file
Added peakDetection algorithm.
Trimmed a bunch of extraneous files and pulled in the latest doc stuff from AIPY v1.1.0.  This is the first step on a path toward merging the dev and master branches.
Synchronized unittests with AIPY v1.1.0, which were more modern.  Again, this is prep for a merge.
Trimmed out 3 more junk files.  I think we're clean now.
Added ParAng function to src/pol.py
Reincorporated Danny's fix to src/pol.py
Fixed typo in src/scripting.py
Fixed UnboundLocalError in src/phs.py
Fixed bug in src/amp.py
reverting scripting_test.py to arp original 4afb4eedb3bf5a698ae1141ca536156b2ba78b29
Merge branch 'dev' of github.com:dannyjacobs/aipy into dev
Merge branch 'dev' of github.com:dannyjacobs/aipy into dev.  Accepted dannyjacobs version.

Conflicts:
	src/pol.py
Merge branch 'dev' into dev_master
Moved polarization support code from phs.py into pol.py.  Currently verbatim, but added comments on possible changes to pol.py for the future.  phs.py should now be able to merge with master without breaking anything, and pol support code is still there as it was.
Moved pol-specific code from amp.py into pol.py.  Not quite verbatim, since amp code in pol.py had to be meshed in with the phs code in pol.py that was put there previously.  Also propagated a resolve_src=True hardwire in sim that was introduced in the master branch.  Again, amp.py looks ready to merge with master.
Moved pol-specific code from fit.py into pol.py.  Because fit.py appeared to be a bit out of date wrt the master branch, it has been reverted to the fit.py of the master branch, with one modification (mfreq) passed in from the dev version of fit.py
Removed some files that shouldn't be tracked because they are auto-generated.
Merge branch 'dev_master' into master_dev.  Reverted plot_map.py to the master version.  The other conflicts were easy to resolve with both branches included.

Conflicts:
	scripts/plot_map.py
	scripts/plot_uv.py
	src/_deconv/deconv.cpp
Bugfix to pol.py, changing numpy as np to numpy as n.
Bugfix in _deconv.clean where wrong number of arguments were expected as a result of conflicting merge.  Also changed pos_def to default to False.
Merged miriad.py was segfaulting.  Reverted to master version, which was overwritten in the merge by an outdated version.
Fixes for RTL buttons
ACT-1122: When engine-version is less than db-version, upgrade fails
Update PySync.py
Password recovery is working
Password recovery is working
Merge branch 'master' of github.com:Afnarel/WASP-blog
Password recovery is working
Change camera icon.
added event creation, api key creation, getting host id, post request function
fixes activeConnectionStackTrace.html didn't show data issue
Merge pull request #149 from shrekwang/master

修改了activeConnectionStackTrace无法显示的问题
收到异常打印WARN日志  DUBBO-473 断线时抛出的异常不应被线程池接收到
Merge branch 'master' of https://github.com/AlibabaTech/dubbo
v5.4. patch 5.1
Matt: printfs and fixed Graham's new bug in Recv::recv
Tweak composer file
updated treatment and behavior for project thumbs (related hover)
add time of Month in indexPlanning
new template app
bumped version number to 1.6.5
Merge pull request #191 from shatterednirvana/release-1.6.5

Bumped version number to 1.6.5
bug when testing variables in if statements
remove UAA scope attribute

Change-Id: I453ac92585ee13521d98265422a3251184a18631
fix v1 App#env=(Array)

Change-Id: I38f3be49bea1da42ce80c56866e80bd75ae21efc
fix unnecessary mutation

Change-Id: I672ba7c5960c4d2ce64bec3c4080ed4fae26c313
Merge "remove UAA scope attribute"
Merge "fix v1 App#env=(Array)"
Merge "fix unnecessary mutation"
Added qr encoder and route
Server using Socket, not Request printing
Bootstrapified and simplified
[MOD] HTTP: switched to latest Jetty version
[MOD] XQuery, Session Module: refactored from Request Module and updated
[MOD] XQuery, Session Module: new functions added:
      http://docs.basex.org/wiki/Session_Module
[Desktop] no rigo must be in it
added comments for margin
Cleaned up printf statements from assembler.c
Revert "Avoid duplicated missions by not loading them with the characters"

This reverts commit 249d026a365f73904b9f59ed22ba90de9aba1268.
Load mission refs directly, and don't re-populate mission screen

Mission screen is now saved through Characters.lua
Fix phpunit dep version
Enabled CLASS alias
Update stochdelay~
Index pointer in the same way that item metadata with authority
Made Error HTML Template overwritable in /lib/htmlform.go!
render POD parse errors section if ?show_errors=1
Merge pull request #215 from grantm/show-pod-errors

render POD parse errors section on request
added features included in this release and features to be included
Merge https://github.com/CSPshala/BeatWars
Merge branch 'JeremyDesha'
fixed three bugs 2 3 4 and i think 10 basically the xbox is fixed and buffered and the credits was fixed so you can skip it with the keyboard
Merge https://github.com/CSPshala/BeatWars

Conflicts:
	Phat Beats/source/Managers/CBeatManager.cpp
	Phat Beats/source/States/COptionsState.cpp
Added "shined" beat notes - JC
Made some changes - JTS
Merge https://github.com/CSPshala/BeatWars

Conflicts:
	Phat Beats/CLevelManager.cpp
Merge https://github.com/CSPshala/BeatWars
HUD Adjusted
Merge branch 'RalphConcepcion'
FMOD loading is now streaming? but doesn't change load times....-JC
worked on volume saving and credit state
Merge branch 'master' into JeremyDesha
created the save for volume controls trc
saving user setting is good
FMOD streaming, binary loading, and OGG files are loading.  - JC
Added star wars credits - JTS
Merge https://github.com/CSPshala/BeatWars

Conflicts:
	Phat Beats/source/States/CCredit_State.cpp
Merge branch 'JC'

Conflicts:
	BeatMaker/BeatMaker/bin/Debug/BeatMaker.exe
	BeatMaker/BeatMaker/bin/Debug/BeatMaker.pdb
	Phat Beats/CLevelManager.cpp
	Phat Beats/source/States/CMenu_State.cpp
finished the saving settings
okay there is a lot of updates with the input arcade is finalized and XBOX is about 75% done
Multiple notes can't now be hit by a single key press.  It's checking the front of the the list now instead of cycling through it.  Also hittable list is now a list instead of vector. -JC
Merge branch 'master' of github.com:CSPshala/BeatWars
Merge branch 'master' into JC

Conflicts:
	Phat Beats/CLevelManager.cpp
Wurt
facebook oauth login implemented
Adding the MigrationDependencyGraph class utility.
Adding initial implementation of dependencies, tests added.
Correcting error when app dir has a hyphen (-) and/or period (.) in it.
i.e. "PHP Fatal error:  Class 'Website-1.0Schema' not found"
Now escaping schema class name the same way the cake schema shell does it.
Merge branch 'develop' into feature/dependencies
Merge branch 'feature/dependencies' into develop
Fixes #33
Added support for migration errors #38
Added Italian Locale
Merge pull request #46 from Lanodd/2.0

2.0
make plugin working for cake 2.1
Merge branch 'master' of https://github.com/mikesmullin/migrations into develop

Conflicts:
	vendors/shells/migration.php
Fixed testRunWithFailures, testGenerateDump tests and added testGetSchema test
Merge remote-tracking branch 'origin/2.0' into 2.1
Fixing broken tests
added App::uses('String', 'Utility'); on MigrationShell.php
Fixing fatal error, removing dead code
Merge branch '2.1' of https://github.com/CakeDC/migrations into 2.1
Chaging param semantic to avoid issue
Getting rid of map file, now migration files are ordered by timestamp
Making all tests pass again
updated .gitignore
Merge branch 'master' into myBranch
added search.xml
Merge branch 'master' of https://github.com/CarJuice/CarJuice
Adding description to tables. Table search now using postgres full text search capabilities.
table sql view mode
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop
added relevantText to Location init
Added new group Banned
ObjectCaptureModule: Move leafsize parameter initialization in KinectCapture and Registering to constructors, making it easier to configure.
Add gNet Model and Modify iCache Model
Changed package to objSpec.
Created Biome class and added code.
Added TerrainGen class to generate basic terrain.
Tested and fixed terrain generating.
Allow HTML in Layer Names (issue #1009)
fix indent symbols
Merge pull request #1055 from aparshin/layers-control-html

Allow HTML in Layer Names (issue #1009)
this.edit is not always set for polygons - this happens to us for example when loading from geojson.  This patch makes sure that this.editing is set before checking whether editing is enabled.
Merge pull request #669 from cfis/editingFix

Check this.edit is set
Added CWallet* parameter to RPC test suite and a CWalletMap instance to test_bitcoin.cpp
Fixed RPC issues detected by test suite.
Some more on full reductions
Changed class names to meet PEP8 naming conventions.
Added shooting of bullets. Positioned correctly and moving in a correct angle. Updated bullet graphic.
now to get rows to show up.
Overwriting the activation email template. Add a new settings templatetag for getting settings variables when there is no context processors running
this is the first file
Merge branch 'master' of github.com:CycloneChen/demo1
pep8 ...
Signed-off-by: Armin Wieser <armin.wieser@gmail.com>
Update xml.ini

delted section 0 that appeared twice
修改可以上传空文件夹~

Signed-off-by: DanielZhu <enterzhu@gmail.com>
rewrite test scripts with Ruby's built-in unit test tool
Some queue managment on /queue
WYIL: started work on the problem of identifying constraints to quantify.
WYIL: added an interesting test case.
WYIL: added yet another test case.
More jQuery removal

Removed some more jQuery
Added animation lib
initial rails setup
added logo and home page
started styling
Songs scaffolding
Adding the first code files
Merge branch 'master' of https://github.com/Deusdies/pythonbo
Support for document download
Fix: Panicum module for supplier accountancy code
Fix: Overwritting code is not role of a template but of a module.
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
Qual: Remove hidden option so is not efficient and not used files.
Qual: Uniformize code
Fix: strict mode hurricane
Fix: Permissions to see project

Conflicts:
	htdocs/projet/fiche.php
Fix: Bad action reset
Qual: Removed useless code
Qual: Serious clean of code of formconfirm method. This also solve bugs
of ecm module when using ajax.
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
Check for existing view/layout in custom theme. Then if needed, get the
default one.
?
Persit current theme data
added bg_busy
Added ToA to App
Syncing the last 60 days, unless specified
Added basic command line interface... this still needs to be implemented properly...
Agregados 'Diagramas' a Iteración II en la carpeta docs.
Added all servo function encapsulations

DONE! Finally.
Make it clearer how finding items works
Update git-library docs
Merge remote-tracking branch 'gitolite/master'
git-library: change docs for 'update'
aim task updated, target now holds coordinates instead of pixels
Cambiar el dominio de traducción
Merge branch 'develop' of https://github.com/FATac/fatac.forms into develop
update ultim dia
Merge branch 'develop' of https://github.com/FATac/fatac.theme into develop
afegim link per veure imatges en mida real
correccions maquetació i funcionament fullscreen
Bug: visualització del vídeo a vista previa
raw-in in architectural design.
Merge branch 'master' of github.com:FelixAkk/synthbio
Scrum 4 update.
Merge pull request #18 from Felmer/master

First Bricklets are translated
Unify and fix the placement of 'sich' in german callback descriptions
Make programming language specific documentation part more translatable
corrected page content rotation
Animation script is refactored
Animation script is refactored

Added ability to scale field
Added ability to apply events on battle field
Split the functionality.
Changed package name from Database to DBAL
Fixed function compiling
use the built-in length to find the total number of friends.
Merge branch 'master' of https://github.com/Gaurav0/WTFEngine
Fix 'Invalid argument supplied for foreach()' when no file for download
Filter coupons by type. Closes #1909.
Merge pull request #1923 from Geczy/fix-invalid-foreach-dll

Fix 'Invalid argument supplied for foreach()' when no file for download
#ocd #1923
minor adjustments to api authentication
Added line numbers to formatted code at the top of the page
merged
Slight prettification.
Added /about/ with some content.
Added /recent/ with no content.
Rudimentary implementation of issue #9 by adding a new dedicated EditPaste view, and renaming Paste to ViewPaste
Deleting binaries and unused view
Better ignores
Changed 'edit' to 'fork'
Added some syntax highlighting via prettify.js
Improved the colors.
Fixed recent pastes.
Added ELMAH
Added some code for source code highlighting.
Fixed Elmah.
Added private pastes.
Added successful and failed fizzbuzz implementations
Added SubSonic.Core to solution. Added "My Recent Pastes" feature.
Identity cookies now expire 1 year in the future instead of session :|
Improved markup/styles for code/output
Added personal paste list.
C#pad now runs on .NET 4
Missed 1 file move.
Some starting work on adding multiple languages
Missed a file for multiple languages.
refactored code creation of a DB
Smarter timbre driver
Work around a magic automatic TAB key arriving the pulldown grid editor if the user got into this cell via TAB. Only seen for a TComboBox with style=csDropDown. Fixes issue #2809.

git-svn-id: http://heidisql.googlecode.com/svn/trunk@4119 560a3889-bb33-0410-9f33-43a8a102dc09
Detect --skip-name-resolve server option in usermanager, and disable users where that would cause "There is no such grant..." errors when firing "SHOW GRANTS FOR ...". On older servers there is no server variable for that detection, so as a fallback the "SHOW GRANTS FOR ..." errors are try/caught and the user node gets disabled lately. See r4101 and http://www.heidisql.com/forum.php

git-svn-id: http://heidisql.googlecode.com/svn/trunk@4120 560a3889-bb33-0410-9f33-43a8a102dc09
Finish user signup
Add SSL in production
Added some more test cases and fixed error messages.
Removed pointers to the missing "new" command.
Bumped revision.
CXF libs update, edited rest delete method

Updated CXF libs, edited delete method logic (there was some
unmarshalling exception, have other work to do than that). Minor
changes.
Renamed deprecated QDeclarative* class to QQml*

Signed-off-by: Tomaz Noleto <tomaz.noleto@openbossa.org>
Fixed initialization order in Layer class

So the compiler no longer complains.

Signed-off-by: Tomaz Noleto <tomaz.noleto@openbossa.org>
Some include adjustments according to Qt coding conventions

* Reordering from more specific to more generic.
* Using Qt library prefix on includes.

Signed-off-by: Tomaz Noleto <tomaz.noleto@openbossa.org>
Restart updateTime on GameItem when updateInterval is changed

Also fixed a typo on notify signal emission:

updateScriptChanged -> updateIntervalChanged

Signed-off-by: Tomaz Noleto <tomaz.noleto@openbossa.org>
Added finishing when reached maxBid
Rename the JPEG decompression struct to "dinfo".
Rename the input file stream to "ifs". What the hell did "fb" stand for originally?!?
Added and modified files from proj.linux to get it compiling and running on linux. Note: rock-mutt root folder must be placed inside cocos2dx to work, otherwise the Makefile needs to be modified.
some more additions to regulator role.
Merge remote-tracking branch 'joern/master'
Merge pull request #14 from PCBhagwat/master

Regulator
created partials and condensed rspec tests
Finish layout and routes
Whoops. :s
removed sitemap mixin from virtualsite ( QA-3739 )
Add Password digest translation
20120820-html5dw
20120909-sdcc/demos
Ho aggiunto la funzionalità di cancellazione account.
Merge branch 'jei_new'

Conflicts:
	src/client/model/User.java

Risolto conflict su login?
I need to change main_analysis so R doesn't blow up
a better subsetting by prefix
prefix an root frequencies
Add brackets in makeutype.c, add codes that got missed earlier.

Noted double brackets comment while updating unicoderanges to 2012 ver6.2
unit32 did not match utype.c already there now - need to ensure >= 32bit
Partial update to LICENSE. Still need to go through more files later...
modified cc-other-file-alist to make default *.cpp file not *.c file when it cannot find corresponding source code for a header.
use ${PROJECT_NAME} for cmake snippet
now begin to use org-capture instead of org-remember
added snippes
added org-toodledo.el got from chacha's site
Builging changes
Building changes
added form sample, ribbons,...
One tom many camera sharing application for blackberry playbook.
It has not been tested on a playbook, and it is not in the Blackberry-s App World.
ajout de doc
ajout de doc
rendu tout ce qui doit être serialisable serialisable
Merge branch 'master' of github.com:KaneRoot/pdisem6a
Test
Merge branch 'new_branch_name', remote-tracking branch 'origin' into ics
Added attr_accessible to relevant attributes in Comment.rb and Post.rb
Merge branch 'bug/accessibleAttributes'
Fixed path for binstubs
Inget ändrat
Added autocomplpop, supertab and replaced autoclose with a hopefully better alternative
Fixed page alias bug again. Added new Tab style. Renamed some object property names.
Added new object entry points admin/backend/{field-object, browser-object}.
Proceedings for #93, baseUrl used in javascript uses http/https accordingly to connection.
#1123 Missing file path
Merge pull request #1142 from xillibit/bugs10

#1123 Missing file path
reference JS
solve conflicts
commit des problemes de parenthese
ONT MODEL PReoblem resolved
ONT MODEL PReoblem resolved
template code for the window which add a group
template code for the main window
mass commit for windows showing in good order
clear list when connect
Hilarious first implementation of after images.
Add couple images and stylesheet
merge complete - Todo add player strat
Added range arrays, a cheap way to work with very large
arrays of sequential integers
/*
 *本来写了一个bfs，每一个状态的扩展状态用结构体储存在优先队列中。
 *但没想到后来的规模实在太大了，是9的指数规模，
 *细细想想，最终结果与顺序无关，且每一次变换最多三次，
 *完全可以用dfs来写
 */
qudratic: debugging
vector: added methods for vectorsolutions
tan3: implementation of algorithm to accept lines
quadratic: fixed ctor
quadratic: debugging hyperbola
Added Concept Work & mood Boards
uneven whitespace
Added checks to ensure there are teams still remaining before forcing you to stay in spawn.
added mode vector information in result returned by neighbors function
IPSShadowing - Added Component for EIB
Merge pull request #4 from brownson/Development

IPSShadowing - Added Component for EIB
egresados, cambios roles
hack035
Added xqmodeData.
change application.js
Merge branch 'master' of https://github.com/Martin91/foodsafe
Merge branch 'master' of https://github.com/Martin91/foodsafe
Primera version preliminar
Profile image for 'Youth Programs' client
Merge branch 'master' of github.com:mckoss/StreetCode
Remove app.yaml path to jquery mobile
Fix saving float in admin page
fix app.yaml conflict
CSS changes for fitting in and formatting around JCI logo (aspect ratio differs from test data
Remove width from CSS 'page' elements... this may fix some horizontal scrolling issues in some mobile browses
Add ability for external links; Add link to AppCodes wordpress page
Bind app clicks to mousedown. This event is most widely supported... see javacript comments
Added updatable gauge for donations page
Merge branch 'master' of github.com:mckoss/StreetCode
Integrate mobile.css for donations page
Fix the comment (not "transaction" but "translation"...)

--HG--
branch : stm-thread
Merge commit 'fde8635589c33012f4baf35d78b8ba8885d3ac38' into yakuport

Conflicts:
	mjcore/yaku/yaku.cpp
Merge commit '491e7796176d9684d9f58cbfe6e0082cf9a25468' into yakuport

Conflicts:
	mjcore/mjcore.vcxproj
	mjcore/mjcore.vcxproj.filters
	mjcore/yaku/yaku.h
cherry-pick f4c6d146b9df9b93e33c75db5bc69ec20b2bae02 喰い断などへの対応

Conflicts:

	mjcore/yaku/catalog/yaojiu.cpp
定数を追加(門前役満)
Merge branch 'yakuport' into yaku_concrete

Conflicts:
	mjcore/mjcore.vcxproj
	mjcore/mjcore.vcxproj.filters
	mjcore/yaku/yaku.h
unconfirmed finished java (04)
finished java (04)
#50 (3) Agregar entradas en el blog [IN PROGRESS]
We found the old texts \o/

Signed-off-by: Meldanor <Bhaals@gmx.de>
Send a message to all player in support channel when supporter has
joined

Signed-off-by: Meldanor <Bhaals@gmx.de>
Add Markdown files

Add markdown.php library and lisence file.
Implement markdown parsing

Parse every post through markdown when the index page is created.
Merge branch 'markdown'
Update src/com/utilis/Utilis.java
overworked the reservationcontroller for loading an saving the reservation (for saving i am more guessing because of the lack of a saving method)
[TER] 5.0.0
Nambah route user,controler user, view user.git
небольшая оптимизация, в singleimage прирост скорости до 50%, в тайлах примерно 20%, в апдейтах хз
Vim submodule updates.

Signed-off-by: Claudio Ortolina <claudio@jumpzero.com>
don't rely on timeout
Oops, print warnings/errors to stderr ;)
Oops, properly build a 64bit OpenSSL on x86_64...
Build OpenSSL-0.9.8 static builds first, so I end up with a useable binary (on my system) in the working directory...
More typo in comments...
fixed create component
Programmieraufgabe fertig.
added postid to query
add github tags
added UDP network receiver
add more files
Added link to play the game.
scripts ready for processing
Added init values to all model classes
Added init values to all wrapper classes
Made ProtocolBinding and AssertionConsumerServiceURL optionable and configurable to aid testing conext saml testing
Finalizando as alteracoes da parte visual
Added a wow helper
OOPS: texture_atlas_delete called text_font_delete
Completed OpenID Login Handler Merge

Resolved the longstanding issue with infinite recursion on
users.create_login_url() and enabled url forwarding, bypassing the need
for AJAX logins.
Ignore slab cache age and delay in direct reclaim

When memory pressure triggers direct memory reclaim, a slab's age and
delay should not prevent it from being freed. This patch ensures these
values are ignored, allowing an empty slab to be freed in this code path
no matter the value of it's age and delay.

In addition, the number of slabs reclaimed from each slab cache has been
modified to avoid removing more than is necessary. Previously, all empty
caches would be removed from each slab in the cache. Now the number of
slabs freed is derived from nr_to_scan and skc_slab_objs.

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Merge pull request #220 from ProCynic/master

Fixed js for user about page.
Merge pull request #222 from ProCynic/master

readded about me
Document the SDI API.
set default site title to Substance D
test password_validator
test ChangePasswordView
add a dumber-n-dirt action processor without any conflict resolution semantics or proper exception handling; require actions to carry around the indexing mode
fix menu export issues
Don't let coloring info take up space in the prompt.
Minor code cleanup.
Add charging/discharging info.

Only uses the last battery ATM.
Re-unify the prompt now that it's not oversized.
用户注册表单修改，修改了css，register.php

用户注册表单修改，修改了css，register.php
pass test for (get mat [...] c)
Delete variables: OK.
Updated Greek Translations 1.3.5
Merge pull request #569 from vasitsiv/master

Updated Greek Translation 1.3.5
The Persian translation was updated.
Merge pull request #532 from srazi/master

Updated, Persian translation.
Fixed issue with infinite opening mailto: links in QupZilla
- when xdg-open tries to open mailto: links again in QupZilla
admin admin admin
Added click handlers for the list items in the mastermind page
Coding up the mastermind details page
Changed the way the login button is displayed. Now it is better but still the image gets resized by the browser
Global style changes and tweaks
Left for doing
The facebook login button is now scaled properly and positioned properly. Hooray!
switch app id
Merge branch 'demo' of github.com:RadoRado/PMFS-App into new_ui
Change the + navigation button with dropbox/mastermind/Menu2_right
Commented out console.log and console.error
Modified ui form
Bugs e routes corrigidas, implementacao de funcionalidades, eliminacao de ficheiros desnecessarios.
Forgot to push this with the last push.
Merge branch 'levels' of git@github.com:RavensKrag/WireFu.git
Make input handling dependent on current gamestate.
Set input state based on state class not separate state variable.
Set variable to track if player is alive.  Set to false when player falls below level.
Merge branch 'master' of git@github.com:RavensKrag/WireFu.git
options can turn on/off music and sound by clicking
when sound/music is turned off from options, it won't play during the game
Load level from menu in new state system.
Correctly create menu state.  Also, stop music from previous state on push.
volume control is now available from main menu screen
changed variable styles from camel case to underscore delineated
volume control controls the entire sound/music, not just bgm
Switch through music tracks depending on current gamestate.
Merge remote-tracking branch 'origin/master'

Conflicts:
	WireFu.py
Create delete() so that states can detach things like physics objects.
Remove now obsolete level loading method.
Implement level restart functionality.

Fixes #20
Implement level reloading method to manage the state juggling in one place.
Options screen is available. Turn on/off sound by clicking the text
Merge branch 'master' of git@github.com:RavensKrag/WireFu.git
Less code is better

Always!
Merge pull request #1 from Ralt/patch-1

Less code is better
Testing online/offline events
Добавил упоминание об ограничении на 10 файлов-картинок
Changes to the Boundary Web Services and Web Service Clients

Significant changes to the Web Service Clients to remove
direct dependencies on the mocking classes as well as to
ensure complete testing of the web service client classes
including exception management is possible.

Also updated the Web Service interface classes to ensure
every method raises faults consistent with the purpose
of the method.

Also made modifications to exception management to catch
Exception rather than Throwable to remove a major issue
from the SONAR validations.
Cmake stuff
Removing most of the external dependencies from the master cmake file, moving those to the concrete projects depending on them
Moved scne into folder
Removed sonar violations, like magical numbers and such
Resolved conflicts
Further tweaks to the test framework

Signed-off-by: Aaron Willey <awilley1@gmail.com>
Conflict resolution

Signed-off-by: Aaron Willey <awilley1@gmail.com>
Updated README.md and small fixes
binlog: fixed checkpatch errors
data-sort: fixed checkpatch errors
Atualizada lista de membros da Equipe Ambire
[#2782] review fix.
initial commit of col_vb
improved tex.snip
Merge pull request #108 from syngan/master

improved tex.snip
does not trigger now then the sign is the source
readme update and dropchallenges script
Merge branch 'master' of github.com:SlexAxton/rhokgho
Updated searching for new shows to also query each word individually
Remove unnecessary include
Change to https://github.com when used with urllib2.urlopen

When accessing http://github.com the url gets redirected to https.
Urllib2.urlopen intermittently results in
Errno 104 Connection reset by peer
Upgrading tablesorter 2.0.3 -> 2.1.3 (actively maintained by Mottie -- worked with him to improve our use of tablesorter as well)
Rewrote data extraction method to take advantage of several improvements in the new tablesorter.
Now use localStorage (html5) instead of cookies for recalling sorting order on home page. Fallback support
Using a few widgets within tablesorter to enhance a few pages.
 - stickyHeaders on home/manage/history pages
 -filter on history/comingEp pages (select filter fields disabled for usability on comingEp)

Upgraded our cookie lib to the latest off github. Code was re-factored and much simpler, appears to work as it did previously.
  -- no longer required for tablesorter (only used for pathbrowser)
Merge pull request #335 from itofzo/change_urllib2_https_github

Change to https://github.com when used with urllib2.urlopen
Merge pull request #336 from thezoggy/tablesorter-fixes

Tablesorter related upgrade and tweaks
Did some minor code cleanup and added a bunch of comments.
Inital->Initial spelling correction on quality chooser.
Added nowrap class to time field on history page.
Worked with tablesorter dev and got him to make it so that isoDate will ignore empty values. Thus sorting on homepage is a bit more efficient (empty row stay to the bottom). Also, removed the 'filter' from the comingEp page and put stickyHeaders in its place.
Converted cookie references over to localStorage (html5).
This saves HTTP requests and keeps the scope of the data local to the machine.
DOM storage has been around for awhile and basically any browser EXCEPT IE6/7 is supported (oh no!).
This means we could retire the use of the cookie/cookiejar/JSON js libs.. *However, I've left them alone for now.*
Start migrating people away from nzbs.org and to the new site
Fix an error when saving the provider config, changed the wording of the error
Minor tweaks to tablesorter css and code.
Added missing synology metadata config logic.
Allow the old NZBs.org to remain enabled but throw an error saying to switch to the new one. Removed the config for the old one.
Merge pull request #330 from bramp/master

Issue 1541: Multi shift-select checkboxes
Merge branch 'keyword-search' of https://github.com/dstjacques/Sick-Beard
Don't show duplicate results in the show search
Merge pull request #338 from thezoggy/ui-corrections

Minor corrections
Merge pull request #339 from thezoggy/browser-localStorage

Converted cookie references over to localStorage (html5).
SONAR-3352 Change boolean columns to non-nullable in migration script
SONAR-3126 Fix side effect of this ticket: PropertiesBackup

=> As now Sonar batch relies on "sonar.core.id" property to check
   that the batch connects to the same DB as the configured remote
   server, this property should not be cleared when restoring a
   backup from the UI.
   Actually, every "sonar.core.*" property should not be cleared.
SONAR-3074 Improve the logging when duplicate FB plugin is loaded
Added the TechInc SpaceAPI
Merge pull request #12 from webmind/master

Add TechInc to main.
Update src/net/xereo/spacertk/PanelListener.java
adding more rimedo workflow config
using Maven again, for project structure management; adding POM for
Rimedo
adding documentation wrt project structure mgnt in Mavn and Ivy; adding DOAP subsumption extension schema
Added SQL functions to the entity logging system.

The code may be a little rough around the edges, so if you want to
refine it, by all means do so.
Added SignalObjectDelegate to have access to protected methods in SignalObject, added additional test case
Remove some useless class checks (addComponent had it covered). Improve
documentation of getOrCreate.

Signed-off-by: Chris Sanders <zidane@outlook.com>
Added additional matrix functions for normals
Merge branch 'master' of github.com:Sproats992/MGLESX
spell el
mise en place d'un test des virements
KAPPA: Reinsert a comma in a component list (from 2012-08-03).
Qt Assistant class for documentation
Added a shield for the power sense board.
Updated the control and rudder shields to be single-sided on the top for a
board run.
Also updated their documentation.
New Athletes header
Fix for attachments with duplicate filenames, thanks to @revaxarts, fixes #15
Ещё добавление модулей
[SL example] synchronized jks with tesb container
add CM Theme repos

Change-Id: I85ec0392206825ef77cf1aae07f4f4a2bcef28c0
Make sure the runonce.php scripts are deletable
Bump to version 0.6.6
Fix commit 3de43987d00ff8f9a22d71fef64edd890ef31746.
Added fewtile-all.html which uses iframes to display the grouped build filters in one screen
switched index to inline-block so the buttons aren't just one big vertical list
Moved CSS to a new file. Used correct @import syntax.
Merge pull request #13 from TheSpyder/Combined_View

Combined view
Minor UI tweaks.

- Changed clickable area (to expand department)
- Changed pointers to more clearly indicate what to do

fixes #11
added left and right panel
use web instead of app
deleted scripts
update Applic servlet
Merge branch 'master' of https://github.com/Tomty/3emeGestion

Conflicts:
	SGBD/MCD/rennequinepolis.lun
Fixes a couple of bugs in findAltStart. Main.pl now imports subroutines correctly.

One bug caused warning messages to appear when translating genes that had internal stop codons.
This was caused by bad stop codon analysis in the findAltStart algorithm. As a result, the portion
of the code responsible for this analysis has been remade into its own subroutine and improved.

Main.pl used to incorrectly import a couple of subroutines (it looked in the wrong modules for them).
This has also been fixed.
mistake configured
[12059] Add grid searcher for OPvP Capture Points

Might be based on work of original OPvP authors

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>

Conflicts:

	src/game/Player.cpp
	src/shared/revision_nr.h
[12061] Assert correct loading of GO_TYPE_CAPTURE_POINT

This will assert controlled behaviour when loading a `gameobject_template` entry of type Capture Point with bad data
Patch improved by stfx

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12063] Fix Typo in SpellTemplate storage checks
Merge remote branch 'remotes/mangosR2.mangos/master'
[TESTING] Implement WorldStateMgr stage 1 (initial commit). based on my work in 2011 year.
- usability at least 80% of all possibilityes
- WorldPvP required continue work
- need find and move to SQL some WorldStates
- thx to Schmoozerd for very old try
- first ALPHA version. required testing and some help with work finalize.
[TESTING] Implement WorldStateMgr stage 2.
- some corrects to WS template loading
- not send WS updates from current second
- send zone updates same way as world.
- World OPvP requre continue work.
[TESTING] Implement WorldStateMgr stage 3
- started GO_CAPTURE_POINT rework
- implement pending lists (not finished).
- implement some WS MapUpdates (not finished).
[TESTING] WorldStateMgr - some fixes to Alterac Valley, thx to Undergarun.
[TESTING] Fix some incorrect work methods with MovementFlag (cause client problems), created EjectMovementGenerator. related to #1082, also may solve some problems from #1067. close #1070
Removed the welcome controller and started to implement themes
Miltiprocessing 2
Q1 : Modif & Démo  EQ.Diff Charles
make homepage work again without about:home
Added method to truncate strings for messages.
Improved exception error messages.
Significantly improved hostname validation to take account of RFCs and MS restrictions.
Fixed bug in MAC address validation (didn't anchor to start and end of string).
Now uses configuration for setting min and max lengths.
Improved exception error messages.
Improved exception messages.
Fixed circular import issue.
Uses conf to validate.
Pulled out config values into one method.
Converts config values to ints as they'll be of type str from config.
Uses a conf dictionary rather than hardcoded values.
Added method to load a configuration and return a dictionary of conf.
Added tests for actual config variables.
模型中增加gps定位部分
use the proper encoding for cppcheck_vs2010.sln
tabs to spaces
use the proper encoding for cppcheck_vs2010.sln
clean up VS2010 projects, use /LTCG for Release builds
Add metadataparser templatetags (bootstrap_form)
health powerup and fire pushback
Merge branch 'master' of https://github.com/luciotorre/spacecraft
Merge remote-tracking branch 'upstream/master'
add sesstion
Revert "add sesstion"

This reverts commit 8aa7b189945a9cbff9ff88419f8d3ec19353c46a.
Revert "Revert "add sesstion""

This reverts commit 6eef0a92bdeb90def6bf9d8a1c97403475473c74.
Update src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java

Attempted at allowing /region select to be run via console.
Tapando información molesta
Adding desperately needed async/sync documentation.
Merge branch 'master' into gh-pages
Updating JavaDoc to include sync/async information.
Adds a "My Comments" column to a user's review request list.

Fixed bug #2163.
Removed recursive comment wrapping

- Nested elements are no longer wrapped for commenting.
- Removed some CSS code which is now applied through JS instead.
add description
add description 2
Merge branch 'hotfix'
Add an alternate way to build the library using CMake (for non-python people)
client connects to server and client receives message
serializing client boundary and sending it to client
Ticket #2495 (show info about macros)

    Display extended info about compiled-in paths for internal/external macros.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Merge branch '2495_show_addition_info_about_macros'

* 2495_show_addition_info_about_macros:
  Ticket #2495 (show info about macros)
Ticket #2313: CK_History removes CK_HistoryNext entries

Steps to reproduce:

1. traverse through some directories,
2. press alt-y multiple times,
3. press alt-u multiple times,
4. press alt-y again a few times,
5. press alt-shift-h (notice no dirs to forward to), press esc,
6. press alt-u - nothing happens.

Initial step: (directory_history_add): make static and use vfs_path_t as argument.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle history of input line.

Added pointer to the current history item and use to walk in history.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle directory history of panel.

Added pointer to the current history item and use to walk in history.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Merge branch '2313_history'

* 2313_history:
  Handle directory history of panel.
  Handle history of input line.
  Ticket #2313: CK_History removes CK_HistoryNext entries
Ticket #2751: Support *.lib artifacts generated by gputils utility

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Merge branch '2751_gputils_lib'

* 2751_gputils_lib:
  Ticket #2751: Support *.lib artifacts generated by gputils utility
Ticket #????: simple event queue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle CK_Edit command using event queue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle CK_EditNew command in file manager not in panel using event queue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle CK_EditForceInternal command using event queue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle CK_View command using event queue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle CK_ViewFile command using event queue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Handle CK_ViewRaw command in file manager not in panel using event queue.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
add ui for controller-emitter
add svg logo + png 600x600
update svg logo
Merge pull request #3 from Oskarus/master

svg logo
add a working TODO list
Correction erreur dans le cas nom utilisateur est pris à partir de l'email
same for DELETE @ secgrp & rules
Fixed SGMFastScanConfiguration to save a database pointer to the fast scan parameters. Now reloaded scans work properly. If the fast scan is too old to have this feature, a warning will be brought up when the scan is copied.
Merge branch 'master' of github.com:acquaman/acquaman
remove the axes ticks from the faceted and node interp styles
Phasing out build test data plugin
Fixed; skipped multi-line commits in CHANGES.txt
Merge pull request #1 from gamb/master

Missing multi-line commits
Copia e move agora verbose
bug fixes after CIRA middleware refresh
Fix typo (lenght)
More robust vertical movement

Detect when new position falls outside of a line, and retry. Also
replaces the kludgy widget compensation code.

Closes #886
Stop using methods on lines

Simply use top-level functions + a plain object.
Stop using methods on history object
Move some properties from doc to view

The reason for putting them in doc turned out to be misguided
Add a flattenSpans option
fix fullscreen demo to use wrapper, not scroll
Merged JavaScript and TypeScript mode as marijnh suggested
Make typescript mode recognize type declarations
Fix refactoring mistake
Don't use innerHTML = "" on content in IE<10

It messes up parent relationships in inner nodes, and we'll re-use
the marker and widget nodes later.

Closes #890
Widen scrollbar area on OS X Mountain Lion

Issue #811
Yet another attempt at feature-detecting wheel delta values

Removes the kludge with the vertical scrollbar trying to handle
all wheel events.

Issue #810
Fix removing of spans
Remove copyright header

(git is the authoritative source of who wrote what)
Add defineInitHook functionality
Cache DOM dimensions when building up content

To save round-trips on layout.

Speeds up rendering by 33% on Chrome.

Issue #892
Cache token style-to-class mangling
Don't hide/show the line area during redraw when the change is minor

Because laying out the whole thing again is more work than what is
saved by manipulating it in hidden state.

Issue #892
On highlighting, only re-render lines that were actually changed

Issue #892
progress barr
Adding Context Menu: updated apply_options function
dwm check moved to crontab
better magnet links handler
less space between letters in urxvt
Merge branch 'master' into netbook
Added conditional use for linux pkg detect, refs #16
Revert "Pallá que va"

This reverts commit 73cdd1db53bdfbbc94e7c6438b28420952317148.
Add Basic Driver for 595+138 with SPI
generalized janus vimrc to all rc files
Merge remote-tracking branch 'remotes/airbook/master'

Conflicts:
	views/index.html
Merge remote-tracking branch 'remotes/airbook/master'

Conflicts:
	controllers/contact.js
Merge remote-tracking branch 'remotes/airbook/master'

Conflicts:
	controllers/contact.js
zzz
Use HTTP service as source of raw messages
Remove an unnecessary dependency on prototype.js
match reviewer fixed... I think
match reviewer fixed... I think
Fixing a path issue with Login control
mysql confs in gitignore, again and still this may not work :(
twilio requirement added
Merge branch 'master' of https://github.com/alabid/bedbattles
fixing crash
Merge branch 'master' of heroku.com:freezing-day-7773
doctweax
Mosaic Library
cmake: Bug fix for qi_use_lib dependency computation

* Fix cache preseveration when running `cmake ..` after `qibuild configure`
* Remove half-implemented optimization with _FLAT_DEPENDS,
  and add a working one, storing the parameters of qi_use_lib call
  inside the cache

Change-Id: I2bcbe08c791ff04a58f8e7da5e8f922aa1ab7634
Reviewed-on: http://gerrit.aldebaran.lan:8080/478
Reviewed-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
Tested-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
qi_use_lib: optimize dependency handling

We also remove duplicates *after* each call to qi_use_lib.

Change-Id: I86a843585e86296083cabdcf920d05e9f91c625c
Reviewed-on: http://gerrit.aldebaran.lan:8080/483
Reviewed-by: cgestes <gestes@aldebaran-robotics.com>
Tested-by: cgestes <gestes@aldebaran-robotics.com>
Reviewed-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
Tested-by: dmerejkowsky <dmerejkowsky@aldebaran-robotics.com>
generate configuration for nginx http proxy
fill polygon changed (almost work)
Bumping Boomslang documentation version to 1.0
Initial structure
Initial structure
Add home as StaticPages controller
Change Deploy DB
main request docs
namespace shortcuts
move command to restore cursor position to augroup
Link to section about /government
Show error message for invalid or blank postcode.

Also tidied up location form partial to remove empty divs from when we
used JavaScript for location.
WIP for making it create all indexes at the same time
Add detailed guidance backend configuration
Merge pull request #29 from alphagov/multi-index-configuration

Multi index configuration
Editor: made active camera changes be reflected in Object properties UI.
CW-48 convert symbol to string before comparing
Update README.md

Please help. Github's quirks. The quirks.
Post Excerpts added to the index
Minor CSS changes
The parser returns a null reference, from this crawler loops. Corrected.
Documentation added in the HowTo section.
Add details to the group view to help debugging.
Stage I of fixing a bug that prevents seeing sequences such as:

2 3 4 3 4 5 5 6 7 7 8 9 11 12 13

(Where sequence is length 3 groups starting at primes).

This had to do with how categories are copied when bindings are created. This change
does not fix it all, the next one will get the job done.
Stage II of modifications to get bindings right. The code is a bit hacky and needs cleanup,
but the sequence in that example works.

What doesn't work yet:

1 2 3 1 2 3 4 5 1 2 3 4 5 6 7

because the length is not copied and does not get annotated yet as a prime.
A big refactor of code to find mapping. It is much cleaner now and more
robust.
Turn on by default the ability to have multiple mappings between objects.
Added the testing sequences.
Déplacement du webservice dans un projet exterieur à l'entreprise application.

Passage du projet website à l'encodage ISO 8859-1 suite à une incompatibilité avec l'UTF-8 et le code généré pour le proxy client du webservice.
Ajout d'une vérif par le webservice lors du passage de la commande.
Merge branch 'master' of github.com:amaniago/BooXtore
Make the main page render the map.

Convert all the JS for the map into CoffeeScript, and put it into bike.js.coffee.
Copy the CSS into application.css.
Make BikeController#home call stopInfo() to read the list of stops.
Pull all the helper functions from the Sinatra helpers block into ApplicationHelper, and add stops.csv which ApplicationHelper#stopInfo reads.
Make home.html.erb output a JS array of the stops from @stops, plus the map div and so on.
Make the layout file application.html.erb include the web font and the Google Maps API.
deleted old validation stuff