labofsahil/github-event-dataset-2012 huggingface dataset:
Fetchable models are Database_Result
CLeaned up the configurations

Signed-off-by: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
fixed created_at trouble
Modified example to use revised tourmlref element.
v 078.2
Propagate breeze.debug.js and Breeze.WebApi.dll to DocCode and Breeze.Inspector
Merge branch 'master' of https://github.com/IdeaBlade/Breeze
added __getitem__ to lazyflow source
When a layer is dirty, only tiles that intersect the dirty region are marked dirty.
Also, avoid marking tiles as dirty if the dirty layer isn't visible.
SliceSource: isDirty signal emits the area of the datasource's dirty region projected onto the slicesource's abscissa and ordinat$
ImageSources: Connect to isDirty instead of areaDirty.
Added unit test for handling dirtiness of out-of-view slices.
out-of-slice dirtyness test: some cleanups
Merge branch 'master' of github.com:Ilastik/volumina
Revert "Revert "When a layer is dirty, only tiles that intersect the dirty region are marked dirty.""

This reverts commit 07af0c89322170f0127146ec1efbf7b7b0a80178.

Conflicts:

	volumina/tiling.py
Revert "Revert "Fixed typos that broke dirty propagation.""

This reverts commit 8e11116da8f5a2a1c2d3b9422e26e99698d2cf21.

Conflicts:

	volumina/tiling.py
IEE754 floats in python client
Change the homepage back [ci skip]
handleLoginRandTriggerMessage implementiert.
Fix kerfuffle with case indentation.

My bad.  Thought our application diverged from the standard for
some unknown reason.
Updated views for Help page and About page with an Embedded Ruby title
Oops, forgot the cabin in a few places
Huge Refactor in collision handling. Using ArrayList instead of array now.
When you make someone a new moderator, take away mod-ship, become a fan or remove it, the guest list now updates to reflect those changes. #33
remove files
Merge branch 'master' of https://github.com/JAFB/cpsc301Proj into JAFB-master

Conflicts:
	ProjSRC/Public/gui/mainWindow/app.js
	ProjSRC/Public/gui/mainWindow/controller/Discussions.js
	ProjSRC/Public/gui/mainWindow/controller/IM.js
	ProjSRC/Public/gui/mainWindow/controller/Main.js
	ProjSRC/Public/gui/mainWindow/store/Discussions.js
	ProjSRC/Public/gui/mainWindow/view/discussions/DiscussionsPanel.js
	ProjSRC/Public/gui/mainWindow/view/discussions/PostThreadWindow.js
	ProjSRC/Public/gui/mainWindow/view/mainpanel/MainPanel.js
	ProjSRC/Public/gui/sampleGrid/app.js
	ProjSRC/SystemLogs/server.log
add images
Merge pull request #36 from Slashfaith/master

tested
Rain moves as the screen moves.
Fix double tests and fix implementation.
Commenting and code tidying
Major rewrite of most files.
Ignore project file
Cleanup ignore file
Circumvent complicated import
Tweak retrieve_title and retrieve ARK
Solve imports in unittests
Incorrect automatic implementing of extension function has been fixed.
Incorrect automatic implementing of extension property has been fixed.
Merge pull request #47 from Frostman/impl-ext-fun-fix

Fix for KT-1888 Incorrect automatic implementing of extension member
Extracted method in LibraryNavigationRegressionTest.
Added test case in LibraryNavigationRegressionTest to test references to library sources for functions with vararg parameter.
translateToKotlin method
merge analyzeBodies functions from JS and JVM backend
add ConcurrencyTask1 project
recompile formulae after each change. should resolve formula edits that do not stick properly
Global result table
Replace tab with 4 spaces in globalvar.rst
v0.2.7 - 2012-07-24
- If color parameter is used without specifying a color, color will be
random
TEsting git client.
Added inifile binary for auto updates. Thanks to Horst Schaeffer at http://www.horstmuc.de
Adding in new localized strings.xml generated by Androlate eclipse plug-in and Google Translate
Anroidlate configuration updates
pedantic SASL and TLS settings for talk.google.com and link to their specs
pedantic SASL and TLS settings for non-google XMPP servers
quick workaround to prevent some uncaught exceptions from connection errors
menu update
fixed ant building, it still was looking for XMPPClient
updated prefs to use strings.xml thruout and to separate domain and server
removed unused autoStartOtr variable
added required fields for XMPP and Encryption/Anonymity config to Imps
added convenience methods to Imps.Account to get username/password
removed LoginInfo class in favor of using settings in Imps.ProviderSettings
replace ui.SettingsActivity w/ app.SettingActivity, include IDs in intents

- re-enable app.SettingActivity and its writing to Imps
- delete ui.SettingsActivity because its now extraneous
- make sure all Intents have the needed providerId and accountId
make ant put R.java and Manifest.java in the right place for Eclipse (i.e. gen/)
removed auto-login hack since its not in use anymore
updated default prefs for allow_plain_auth, do_dns_srv and otr_mode
get it to login while pulling the domain and port out of the username
ok, finally removed the domain and port from the username
removed unneeded host and port fetching
replaced pref_account_resource with pref_account_xmpp_resource for clarity
[maven-release-plugin] prepare release acra-4.4.0TEST
[maven-release-plugin] rollback the release of acra-4.4.0TEST
Add API to easily access slices information from the Qt layer

Change-Id: I1e139c20016c5c31f4a2c46e9cc64bac8a1fac0f
Merge topic '13505_improve_slice_view_qt_interconnectivity' into next

adbcd0d Add API to easily access slices information from the Qt layer
better comments in API

Change-Id: I9b3b477534ed95dbab344f9a9007e57b646365c0
Merge topic '13505_improve_slice_view_qt_interconnectivity' into next

a6afc2f better comments in API
refactoring main interface
Merge branch 'remdb' into develop
Merge branch 'develop'
Added preliminary F3 support
Added custom font size setting. Read more: http://blog.dabblet.com/post/21208581503/new-feature-custom-font-size-per-dabblet
fix
Merge branch 'master' of github.com:LibreCat/Imaging
la till inlupp4
Ajout librairie JDom, ok ?
version 0.2

Signed-off-by: Luca Fulchir <luker@codepedia.eu>
Added Android deps build script for linux.
Got rid of the binaries on files.lymiahugs.com for Kahlua, and just put it in contrib.
New test cases, tabs in text, forgotten file, and minor fix in LuaScript.
2 new controls (Sliders)

In response of
http://forums.enyojs.com/discussion/comment/1638#Comment_1638
Normalized references
Added some text to empty chapters and updated bibliography
Added .fls exception to the project file
.gitignore: added *.sublime-workspace
Delivering goal errors to view [FIXES #30260087]
adapt Pycharm
api.purge: Better error messages, comments
test open login page (incomplete)
ranking legend (format code)
changed default board theme
Redid the user duplicate problem
PEX NPE fix.
Removed some things
Remove the readme
Commented wirte in register image
Spinner wheel (implementation not finished).
Spinner wheel (implementation not finished).
Merge remote-tracking branch 'origin/EHEBranch' into EHEBranch
New spinner added.
Removed system out
Improved errorhandling - input/output. Toggle button updated.
Erase-workspace-dialog on workspace import dialog added.
FunctionLabel cleanup

Clean up of code, extracted constants, added comments

Created interface for later use
Merge remote-tracking branch 'origin/EHEBranch' into EHEBranch
Spinning wheel support for parametric functions.
Merge remote-tracking branch 'origin/EHEBranch' into EHEBranch

Conflicts:
	3DPlotter/src/munk/graph/gui/FunctionLabel.java
	3DPlotter/src/munk/graph/gui/ParametricFunctionLabel.java
	3DPlotter/src/munk/graph/gui/V2GUI.java
Spelling mistake..
Simplification of editDialog code.
Now we can undo
Merge remote-tracking branch 'origin/EHEBranch' into EHEBranch
Screen shot export functionality added.
Merge remote-tracking branch 'origin/EHEBranch' into EHEBranch

Conflicts:
	3DPlotter/src/munk/graph/gui/V2GUI.java
Wokring in SSH export...
Implementation of SSH changed.
Refactoring of import/export dialogs.
Clean up
Fixes #269 - Tech Name not displayed on closed WO's on Customers tab.
testvm
ignore *.backup
add jquery-datatables-rails
generate 55 random records
wire in jquery-datatables-rails
[maven-release-plugin] prepare release astyanax-0.8.10-SNAPSHOT
[maven-release-plugin] prepare for next development iteration
software: extracted binary file from patch

This way people without git can apply the patches.
added fetch_and_patch.sh script
rubyracer damn2
Refactoring DB::Insert && DB::Delete
Sample file for directory
Add List.fetch_actions()
New functions added and fixes
Function MAT_COLUMN_SWAP_2X2 set as tested
refactored tests and added whereIs to return an array of square names where given pieces are located.
classifiyed lovepd, added printhook
More platform spec.
Compiles and runs but is not verified.
rtna.tool & faculty
Merge branch 'master' of https://github.com/Piyawanno/Ximple
added image-save functionality
moved css to its own .css file
Makefile refactoring
Faq page looks good
AutoMode: Add support for extra modes (add supybot.plugins.AutoMode.extra).
Revert "squashed PR570". Re-pull from mainline

This reverts commit 9bb53253fab385ce9f65b2c73a7c5bb48b0e2444.
cec: added volume control on a CEC enabled amplifier when one is found
cec: set the HDMI port and the device to which the CEC adapter was connected, to be able to determine the correct physical address. this is needed for people who have connected XBMC to something else than the TV
cec: also mark XBMC as active source when powering up devices
cec: some TVs don't like us querying it while activating sources. moved the queries to a background thread, and only query after the TV reports power state active.
cec: use callback methods instead of constant polling. this requires libCEC 1.4.0 or higher
cec: removed the cec_debug_logging setting. always show cec debug logging when debugging in XBMC is enabled
cec: only send an inactive source messages when not sending a power off command, or AVR devices will power up again
cec: don't call libCEC directly from the GUI thread
peripherals: added an optional order to settings
peripherals: change the 'keymap_enabled' setting for HID devices into 'do_not_use_custom_keymap', and hide the setting when the keymap is not configurable
cec: updated to libCEC 1.5. uses struct libcec_configuration to get and set the config in libCEC.
cec: update settings async, so we don't block the gui thread when the OK button is pressed
peripherals: use std::set for changed settings instead of std::vector
cec: don't send an inactive source message / standby command directly when receiving the OnQuit notification, but just stop the thread. fixes 'double standby' commands being sent. bugzid: 439
cec: added an option to configure whether or not to send an 'inactive source' message. bugzid: 439
cec: don't send an updated configuration to libCEC when stopping the update thread
cec: get libCEC-latest from packages.pulse-eight.net, so it can be updated separately, e.g. to add vendor support
cec: don't send standby or inactive source messages when rebooting
cec: check whether the CEC adapter is enabled in peripheralsettings before trying to open a connection
Schoonmaak

Aanmaken nieuw ReversiGame wanneer op start game gklikt wordt
Expand test for clarity.
Whitespace gardening, linting, move obsolete tests into separate test file.
routing auf user scaffold funktioniert
adresse dazu
Unterbrechung
This time the escape should work.
Added integration tests for datepicker along with bugfix in test_helper
Organized RJS into function, string, number, array, object, and utility sections. Added strContains. Added strContains as String.prototype.contains. Added unit test for strContains and String.prototype.contains. Bumped version up to 2.7.1.
Added beastmaster, Changer and Bountyhunter
fix char...
More Google Books Search URL Fixes
Can get and display tweets now
Update categories management and init method
[z1854] Update base SQLs

Signed-off-by: Salja <salja2012@hotmail.de>
- Added unite#get_unite_winnr().
pruebas de css, para saber donde está quien, indices de tablas backend
renamed to SaveStructures.py
Removed some printlines
Changed javafx dependency in loadui-launcher's pom file to use JAVAFX2_HOME env variable instead of absolute pathPath to jfxrt.jar in javafx dependency in pom file for this project was absolute. Changed it to use JAVAFX2_HOME env variable instead
Changed javafx dependency in loadui-launcher's pom file to use JAVAFX2_HOME env variable instead of absolute path.
Merge branch 'next' of https://github.com/SmartBear/loadui into next
Merge branch 'next' into feature-workspace
Added CreateNewAgentDialog.
Fixed exception thrown when removing the last Node(s) from a Carousel.
Set the correct master version
Set the correct next version
Integrated next
Improved my helper methods in VanillaPlugin more...now controllers that
die will correctly remove themselves from the world (instead of ghost
controllers). Thanks to @spacechase0 for code reference.

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Fixed facing mistake, added header

Signed-off-by: berger killer <bergerkiller@gmail.com>
Added the link to the download page into the documentation.
master check
video tutorials fix
made class inherit options & fixed a getTag => get('tag')
New:
Added editable text to the main volunteer page
Editing shifts now gives you an editable list of people signed up for that shift.
You can now set a custom date for a shift outside of the set event range
Administrators can now view any users volunteer shifts
Cancel buttons are now a different color than sign up buttons

Fixed:
The confirmation message for signing up and cancelling a shift now displays the correct info
Anonymous users can no longer sign up for shifts
增加移库细单新增时单位选择功能
Signed-off-by: wu <981145751@qq.com>
Merge remote-tracking branch 'thok-wyl/master'
vector: ajout insert (avec itérateurs) + empty + modifs pour pouvoir utiliser des types qui n'ont pas de constructeur par défaut
string: ajout operator+
reverse_iterator: correction typo
algobase: ajout find
Symboles pour faire plaisir à g++
Tests vector
[console] Passage de val, val2, escape char, etc dans la structure console_t.
code was updated
Etusivun tuotevalikoiman näyttämistä.
working on player stuff
compass refinement
Use git stuff for version, revision, and and tell people what's happening

Version: last tag,
Revision: commits since last tag + latest commit SHA + modified files or not.
Link to data when debug and no sandbox, and tell people what's happening
Default to sandbox off.
Mobile interation fixes
flights/list: Format date as dd.mm.yy for jQuery datatables
flights: Set competition_id to None if unknown
flights: Fill empty competition_id fields on /flights/igc_headers
Implement CPU#load().
Fix a leaking global.
Fix a typo !===.
Rewrite CPU#mapDevice, #unmapDevice, and #getDevice.
Fix the display not rendering properly. Addresses #47.
PIvotal changes
Rough outline of the concepts
modified getOrigin command for better output
Updating entities to be json friendly. Simplified to a more genetic and flexible structure.
Cambiando fondo de la pagina
ylimääräisen poisto
Modified Card Ace spec for border case and fixed incorrect comparison
Initial work on comparitive list of use cases.
Merge pull request #1 from AlexanderRothkegel/master

Hallo, bitte neue Version pullen.
Merge pull request #3 from AlexanderRothkegel/master

version 0.26
And yet another bug …
Merge branch 'master' of https://www.github.com/Wrzlprmft/Conedy
no second network with nodes allowed :(
Merge branch 'master' of 10.47.9.73:/home/anita/conedy/master
no rewiring only for spetial nodes, as mentioned in the docs
two network bug
Merge branch 'master' of 10.47.9.61:/home/alex/conedy/conedyGit
Merge branch 'master' of 10.47.9.61:/home/alex/conedy/conedyGit
Added utf-Encoding to header …
blubb.
added docstring.h as dependency of python-conedy-root
Further improving and updating the documentation.
Further linking, improving and updating of the documentation.
fixes rewirebug3.co
removing fixed bugscripts from testing/bugs
converting integer to double
adding noiseToStates function
Merge branch 'master' of 10.47.9.61:/home/alex/conedy/conedyGit
Update README
Merge pull request #2 from lingyanwu/Dev

Update README
NEw<<

Signed-off-by: XuruDragon <xurudragon@gmail.com>
Генерация формы прям из полей Модели
Created a new BaseController for Zeega
added google analytics
Merge branch 'master' of github.com:Zeega/Zeega-Core
minimize frame setting gear clickable area
render new frames before saving
mergefix
fix delete project api url
enable the favorite function
Another crash solved.
Merge branch 'Beta_Dev_CR' of github.com:a2omobile/Client into Beta_Dev_CR
- made constants site-specific (duh)
removing old files, moving tile to index
moving foundation index to example.html
Exception Handling for notification
Update README

remove Java SDK
basic setup to exempt info that shouldn't be public
a very simple, and entirely useless, daemon framework
had to fiddle with soaplib a bit 'cause it's changed since last i used
it
server lives!
can't make a blanket without fabric THAT IS THE JOKE
THE JOKE IS THAT THE MODULE IS NAMED FABRIC
eclipse is an awesome tool for super cool people
fix insert after changed type to 64 bit
Add new artifact type: TSK_WEB_SEARCH_QUERY
Merge branch 'master' of https://github.com/Devin148/sleuthkit
partial merge (only relevant changes)
Merge branch 'master' of https://github.com/adam-m/sleuthkit
Add cyan color to make PWD brighter
use same column width for all issue items
Booleans are 1 byte long

Fixes #2
has_data can change from segment to segment

Fixes #3
date files updated
new package: qbittorrent
rename dependency
version bump and clean up
upstream version bump
upstream version bump
upstream version bump
more symlinks
version bump
fix getuid compilation error
new package: kamule
general update
orphan package: ibus-gjs-git
orphan package: mplayer-title-utf8
adding average line type
adding horizontal bar graph
updating rounded bar graph to use the same style line paramter as horizontalbar
adding segment pie graph
adding bubble graph widget
adding overlap parameter to control how much overlap the circles have
removing some console.logs
Create the step model
added mocking of os.path to integration test
adding Peter McLain's fix (for OSX)
Fixed up global references so that anything needed inside a class is required.  this allows browserify to correctly load this module in the experimental zen app.
adding an alias to set current working derectory in tmux.
Put result files into correct directory. Allow empty specs to pass (for the moment).
Add publishable artifacts
Join change of LastModified and previous change, also move cursor back there
More constifications of unmodified char* arguments.

Also add const to return value of internal helper functions.
found bug in petclaw/io
fixed syntax error in visclaw
incorporated visclaw fix
visclaw -> clawpack.visclaw
Merge branch 'refactor_toplevel' into refactor_toplevel_tests
Merge branch 'refactor_toplevel_tests'
Added HMVC, auth as a module
Changed to a Player~
Redo line-wrap on window resize.
Fixed tap output for CI.
try the putty

Signed-off-by: aishuhui <aishuhui@126.com>
vacuum-im 1.3_svn2019-3 i686 by Ben
clamtk 4.43-1 i686 by khvalera
Updated translations
Add changelog for 3.0.1-rc1
ENHANCEMENT: Maori language javascript
BUG: Logo padding in collapsed Menu
BUG 3156e755 broke GridField Add forms because guessed frag was wrong
Dont need to wrap entwine blocks in onload blocks, theres no benefit
FIX 7590: Image thumbnails broken in gridfield

Delay converting the object to a string and escaping its value until the end of getColumnContent. Call formatValue BEFORE castValue, so that formatValue can create raw HTML by casting to HTMLText afterwards.
API DataObject#relField now checks for method on model before property
Add changelog for 3.0.1-rc2
Update docs/en/index.md

Update Templates link under Level 2
Removed duplicated 'return '
BUG 15e2efb55d broke the Page ListView.
Reformatted GridFieldDataColumns->castValue and added missing assignment.
Updated translations
Add 3.0.1-rc3 changelog
BUG BBCodeParser wasnt working due to php4 lack of statics
Add changelog for 3.0.1
Make the list used for autocomplete search results settable.

This is useful if you want to limit the autocomplete results to a subset
of all available objects.
NEW Added composer file.
NEW Add reflection classes for parsing php files.

- PhpParser extracts fully qualified class, interface and trait names from
  a token stream, along with inheritance information.
- TokenStream provides a wrapper around a list of tokens.
- Removed TokenisedRegularExpression.
added hamlbars initializer
used #dashboard as root element
removed hamlbars - it doesn't work
drop_competitions_users poistettu
без джема но со змеями
Обновил документацию
conky: watch connections via netstat
fixed a bug of fetion, patched by cuckoohello@gmail.com
fixed a bug of fetion protocol of not showing buddy's nickname
Fix bug report URL

Signed-off-by: levin li <levin108@gmail.com>
fixed the compile error caused by gtk_combo_box_text_new()

GtkComboBoxText was implemented in GTK since 2.24, while in some
Linux Distro such as Ubuntu10.10 or older versions, on which the
GTK version is 2.22 or old, it would cause a compile error.

I reimplemented the combo box using gtk_combo_box_new_text()
instead of gtk_combo_box_text_new() to solve this problem.

Signed-off-by: levin li <levin108@gmail.com>
fix a bug which cause gtalk account display null in the head name panel

This problem is caused by change of gtalk protocal, previously, 
we send a get buddy information for the current account to fetch
the account's latest information with a message whose "to" field
set to account's username, such as "levin108", it runs well before,
but now it returns error, we need to set the "to" field to the
full jabber id, such as "levin108@gmail.com"

Signed-off-by: levin li <levin108@gmail.com>
modify the homepage of hybrid in the about panel

Create a homepage by github's project pages, the new
homepage is http://levin108.github.com/hybrid/

Signed-off-by: levin li <levin108@gmail.com>
modify the source address to clone in README.md

change it to git://github.com/levin108/hybrid.git, 
as we know, not all users have permission to access
git@github.com:levin108/hybrid.git

Signed-off-by: levin li <levin108@gmail.com>
fix some compile warning

use %lu when involving size_t varibles in printf related functions,
ingored return value of BIO_flush() to avoid compile warning:
"warning: value computed is not used"

Signed-off-by: levin li <levin108@gmail.com>
change log location

change from:
	.config/hybrid/logs/username/
to:
	.config/hybrid/logs/protocol_name/username/

Signed-off-by: levin li <levin108@gmail.com>
change the log format from html to xml

the new format like that:
<root>
	<m type="o">
		<t>15:57:43</t>
		<n>levin</n>
		<c>hello hybrid</c>
	</m>
	<m type="i">
		<t>15:57:44</t>
		<n>kevin</n>
		<c>hello levin</c>
	</m>
</root>

Signed-off-by: levin li <levin108@gmail.com>
Show page for pfitmap releases
Print-ready models
Rails generate scaffold enzyme
Migrated and basic associations
Rails generate model enzymeprofile
Migrated, factories and some association testing
Destroying enzyme should destroy relation
Some views for enzyme
Profile side of the enzyme association
Enzymes show up on profile show page
Enzyme link in navbar
Link to users for admins
Fixed bug with adding enzyme not connected to profiles
Enzyme controller spec as admin
Deleted show view spec for enzymes
Fixed view specs for enzyme
Fixed security bug for creating a new result
Removed scaffold specs
Removed scaffold css
Fixed links css in footer
Configure google analytics from artefact

The ResultCount still comes from the header, but the rest come from the
artefact.
Set the GA format from the header

The format is only available in the artefact for publisher items.
Fix set_slimmer_artefact to handle GdsApi:Response

or anything that responds_to to_hash
Add strong tag to last item in breadcrumb.

This is to be consistent with styleguide
Merge pull request #15 from alphagov/ga_use_artefact

Slimmer updates
Changing "user create" header in prep for Inside Government
Changing "user remove" header in prep for Inside Government
fixing ci: updating test
Fix binary type / text type mixup in _str_encode
Modified texture and shader wrapper classes to track the context for which they were created. Locked context when clearing resources on deallocation, to avoid race conditions with multiprocess rendering.
Moved viewport and aspect-ratio correction logic upstream into BXGLRenderingView, in preparation for animated viewport transitions.
Added smooth viewport-resize animation when changing resolution or turning aspect ratio on/off in fullscreen.
Added complete rendering pipeline for XML shaders.
SpellCheck README
Перенесена онлайн-визитка
only authenticate production
Force encoding for UTF-8 for Ruby 1.9.2.
Removed some unnecessary code.  Added images to the database.  Updated index.php and css to display images on the page.  Created <dl> for the image data.
fixed mem leaks .. this should be using multiple gpus ...
Ajustes interfaz grafica formulario certificados.
Track idleness on the server for returning in userlist (Fixes #66)
updated foreman deploy
add support for NTP, AUDIT, ALERT and CLOCK facility strings
Added oauth and Chrome sync support for getting and setting userId
Merge branch 'master' of https://github.com/anstosa/Capstone
- making projects on front page dynamic
- styling individual articles
- fixing bugs caused by missing javascript files
resolved Found reliance on default encoding in org.molgenis.Molgenis.updateDb(boolean): new java.io.FileReader(String)
hi
Merge branch 'master' of https://github.com/aoudenne/SecProt
just stuff
Wrapped io_work instance in a unique_ptr

More natural semantics for creating/deleting the work instance
generate xqdoc
generate xqdoc
removed write_log
melhoradas as descricoes dos exercicios.
Edited default setup
Fix conflict
Merge branch 'master' of github.com:apuyou/NF17-park

Conflicts:
	statistiques.php
Configuration des parkings
Merge branch 'master' of github.com:apuyou/NF17-park
Rebuilt android again. Added music.
Moved some calls to music around.
Tv frame in place, but hard-coded.
Fixed not drawing where mouse was (had to adjust by 100 for new tv
frame). Better tvTexture.
corrected slide
Merge branch 'master' of https://github.com/arashb/BGCE-Docs
!win fix nick
Follow redirects on link checks
准备对ylclient类库进行大的修改，修改前的备份
Entidad Subcategoria

Creacion de entidad subcategorias
Fix warnings and errors in Sphinx examples.
Exclude setup.rst from Sphinx processing.
Simplify instructions for building the documentation.
Update R example for version 0.9.2 of ggplot2.
Replace Cellmlmodel(exposure_workspace, ...) to Cellmlmodel(workspace=...) in Sphinx example for cellmlmodel.py.
Fix doctest.
Fix doctest.
Merge remote-tracking branch 'upstream/master'
Various architecture changes; commands/handlers split
"korttien" tiedostoon tallennus, hakutoiminnallisuus ja käyttöliittymää
for a few more specs...
implement the requested output
k-means section of the docs
add plots
update documentation
the docs must go on
remove nav bar of to-do-list and add a to-do list item
Merge branch 'development' of https://github.com/asanka-x/e-medic into development
[async] updated
[glib.core] fixed: correctly handle nested waits
[observer.Context] fixed: broken constructor
[process] fixed: imports
[Linker] changed: unwind future in remote asynchronous [method|function] call
Removed duplicated class for client's request.
More elimination of global dojox.mvc.at etc.
Merge pull request #32 from asudoh/multiattrib

More elimination of global dojox.mvc.at etc. Thanks Akira.
Change attach() -> transform() and direct() to setDirection() and update testcases.
Change setDirection() to direction() and update the direction property and the testcases.
Cope with change to getCtor in parser taking array.
Merge pull request #33 from asudoh/nodebind

Cope with change to getCtor in parser taking array.
minimal compose hookup, (un)collapse reader envelope details
Actually source the input file.
Fixed model parameterization

Use model parameters instead of preset parameters
Sync REST API version throughout code base and docs.

Add version history section to docs page
init project
Merge branch 'master' of https://github.com/avnewu/sounddemo
Alignment & minor fix for executing error handler from node xhr

Updating User-Agent string for node XHR requests

Fixing a typo
Merge pull request #45 from avoidwork/edge

node.js xhr tweaks
Leveraging data.teardown() within data.uri setter, moving tag
#61 stats_auto: Automatic stats upload
fixes #65 lmd do not properly cache async plain modules
Merge branch 'issue-65'
Merge branch 'master' of github.com:azproduction/lmd
removed data dumper library
fixed some inconsistencies in coding sytle
added feature delete existing / create output dir
added recursive and file filter functionality
升级jfinal到1.1.6
twitter-bootstrap changes
修改 403、404、500 页面
Changes: Bugfix hook for contact menu
Tweaks & fixes.
Merge branch 'master' of git://github.com/ZF-Commons/ZfcRbac
Use Standard way to get identity
Rebase
Merge pull request #7 from bakura10/identity

Use Standard way to get identity
Add default value for actform
apber: Bemerkungen zu allen Arten implementiert. Textareas zeigen den ganzen Inhalt an. PopMassnBer werden angezeigt (war Fehler). Neue Nodes heissen individueller
Refactoring, improving stability
Removed unnecessary and wrong validation test
check return value of wterl:session_create

Versions of WiredTiger prior to 1.3.3 had trouble handling riak restarts,
returning errors from wterl:session_create that would prevent riak from
restarting if it was not cleanly shut down on the previous run. We
previously avoided checking the return value of wterl:session_create to
avoid this problem. WT 1.3.3 fixes this, so reinstate the check of the
wterl:session_create return value.
Added Qi4j Riak EntityStore

.. in Community Developed Libraries and Projects.
Added Qi4j Redis EntityStore in tools.json

Moved Qi4j Riak EntityStore to the top of the 'Other Tools and Projects' list.
Merge pull request #8 from eskatos/patch-1

Added Qi4j Riak EntityStore
alter gems
Fixed floating point numbers in sprint status box
First shot at launch configurations
interface first take
Making headway with fixing iOS incompatibility issues
moved data parse to object
async background of instance data call
error handling callback and async call completed
added bp chart
Created basic layout framework
move to array each on all_fields
fixed networking interrupt errors.. transmit time reduced to 2-3 seconds. still cannot take multiple pictures without resetting board. LCD should work. beautified the UI a bit
fixed networking interrupt errors.. transmit time reduced to 2-3 seconds. still cannot take multiple pictures without resetting board. LCD should work. beautified the UI a bit
cms cleanup & more column types
Temp fix for getPermsByLoc not pulling group 

overrides of world flags
23:10:53.40
SONAR-3517 Fix issue linked to ERB file trimming done at build time
Unfinished
Finally, parallel processing
Deploy from 2012-10-04 01:59:23 +0200
Early draft for touchcolor
TouchColor!
Fixes to TouchControl/TouchLFO-stuff
TouchColor pretty much works now I guess...
reopen log files after initialization . close #309

make sure we reopen logfiles after initialization so we are sure we can
use it.
Backup documentation covering the database and filesystem

MySQL and Pg specific notes, at the moment.  None for Oracle.  SQLite is
right out.
Note when to use --default-character-set=binary for MySQL backups

Clarifies the subject of the following paragraph since it's now
separated from the command example.
Consolidate example mysqldump commands into a single file

A single file is cleaner — especially when the sessions schema will
rarely change — and makes restore simpler.
Make postgres example also output to a single file
Merge branch '4.0/backup-docs' into 4.0-trunk
v2.1.6 made stash_deploy LWRP only updated if underlying Git resource was updated
inputhook_qt4: Use QEventLoop instead of starting up the QCoreApplication.

Closes #2080.
fixing rakefile for new posts
Adding Drunter and Druber post
Fixed modals, inlined username and password
6
one many
666
Added msu
Update hodgepodge.sql
Add language strings and setup for remote access tab in settings
Disable/enable remote access fields based on enable/disable checkbox setting
Add click event handlers for 'learn more' and 'sign in' remote buttons
strip ticks for MetaColumns and MetaIndexes
added dummy dir watcher
made the 'devices' member of a Database a dict, so they can be looked up by UUID'
add MODULE_VERSION("V1.0");
MODULE_ALIAS("SimpleMyDriver");
save the work of unmarshalling the statistics from the doozer event if instance monitor has removed this particular instance
print out buggy email validation
New email message
Updated requirements.pip to use Django 1.3.1
Mac OS X issues
Added gas.js. Google Analytics on Steroids
Merge pull request #478 from eduardocereto/master

Added GAS 1.10.1
Added dropbox-js 0.6.3.
Merge pull request #479 from pwnall/master

Update dropbox.js to 0.6.3
customized pour moi
removed debug
Added isset-check on errors variable since the count breaks the install when the variable isn't set
Merge pull request #111 from dvwallin/master

Install-breaker fixed
Add Plugin Backend. #112

Simple plugin backend, with only two hooks:

 * retrieve_post
 * retrieve_post_not_in_admin

Usage is slightly different then set in the Issue

```php
<?php
Plugins::add_hook($name, $type, function($data) {
    do_something_to_data();
    return $data;
```

Pretty sure it doesn't require support for closures (weren't they added pretty recently?), you could just put the name of a function instead of the closure. Has NOT been tested much.

Read the code for more information.
Merge branch 'addPluginSupport' into mydev
Add theme specific plugins

Any plugins within the folder `/themes/CURRENT_THEME/plugins/` will now be loaded just the same as plugins within `/plugins/`
Revert "Add theme specific plugins"

This reverts commit 5efde61dc392023568a66628986eaf19ca81bbef.
Add theme specific plugins.

Plugins within `/themes/CURRENT_THEME/plugins/` will be loaded as well as `/plugins/`.
Merge branch 'addPluginSupport' into mydev
Change current working directory (for relative includes) for theme specific plugins.
Merge branch 'addPluginSupport' into mydev
Move all hooks to one place. + more

Many changes in this commit.

 * All hooks in one place
 * Added `before_header` and `after_footer` hooks
 * Added the ability to use classes for your hook callbacks
 * Better example callback
 * List plugins in admin interface
Merge branch 'addPluginSupport' into mydev
Show theme specific plugins in admin panel.
Merge branch 'addPluginSupport' into mydev
Add plugin hook `add_post`
Merge branch 'addPluginSupport' into mydev
Merge branch 'dev' into mydev
Merge branch 'master' into mydev
Merge branch 'master' into mydev
added non-parameterized easing functions
id works... in the wrong frame
now using b4 plugin space... dirty?
removing console.log
new build, svgs passing local inspection tests... need a better example
allow for ip address in inet config files
Add gitignore
Improve README examples
update page create, splitted properties and routes in forms
Added shift select of the checkboxes on the displayShow page.
Added shift select of the checkboxes on the mass update page.
Bug Fixes for the models

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>
Minor Updates

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>
fix rebuildCache
cleanup lambda eval
Added .gitignore files to ignore files generated by Emacs and autotools.
Refactor layouts
Finish sign in
fixed new lambda-syntax errors
Display correct month.
Don't clear disconnected flag when message comes in.
using implicit injection within UsingIndexer, plus Iterable & Nil usage in indexing api
Implemented Black theme for lesson dropdown
Began overwriting some styles from black theme
Removed unnecessary borders, wrong border colors.
tweaked validation messages on all lessons
‘Action’ now using an integer internally.
Minor tweaking.
The state class now uses Action instances instead of arrays of bytes.
Fixed some bugs in the Action implementation.
add the submodule system.network
depend on six to make cross-python compatibility easier.
adaptive verbosity
respect PREFIX in Makefile; add install target
Update 6.1/i18n/zh_hans/source/developer/03_modules_2.rst

bzr fix

http://bazaar.launchpad.net/~openerp-community/openobject-doc/6.1/revision/1837
Update 6.1/i18n/zh_CN/source/features/bank_interfaces.rst
Consolidated platform-specific code

A fgui::PlatformInterface provides functions to get platform-specific
objects.  Components get an fgui::PlatformInterface object through the
static functions of fgui::Platform.  Components are not required to
cache their PlatformInterface, so you should not change which
PlatformInterface is attached to fgui::Platform after you've created any
objects.
Added Completed Android Apps
utt_keyboard set image
add artwork/
add artwork/keyboard-wubi/
primer commit verdeco
Merge https://github.com/cainfoxy/verdeco
Improve commit speed
Improve receive speed
a
fix test error
rewrite hex.hex.test
dxlib
12/04/25
by zhanyi
by zhanyi
by zhanyi
by zhanyi
by zhanyi
Merge remote-tracking branch 'origin/dev-1.2.4' into dev-1.2.4
by zhanyi
Placemaker API added and its usage to get cluster location
Add/Change some comments for the sake of readability.
Start to develop a table constructor.
Still a work in progress. Try to construct the main structure of this
library.
Give this library a better name.
Ignore *all* non-tracked files by default.
Update check_erb_syntax to use check-rails-erb

Rails 3 introduced new ERB syntax, breaking our existing
check_erb_syntax. This switches the check to use an in-repo
bin/check-rails-erb script which uses Rails 3's own ERB parser.

Change-Id: Iaa92f646cfd220730646a9c25c61ce37d497436d
Reviewed-on: https://gerrit.causes.com/5004
Tested-by: Lann Martin <lann@causes.com>
Reviewed-by: R Pickett <emerson@causes.com>
implemented Gamestates (a bit)
switched Makefile to use stlink v2
Merge branch 'master' of github.com:cccc/U23-Library

Conflicts:
	firmware/spacecraft/Makefile
mips maj, pour int32 non géré
Formatting comments
Updating theme metadata after forking
Improve handling of self types
Copy language module from runtime to test dir
Only add top-level and member classes/interfaces/objects to model
improve passing around of type parameters
listo index 15:59
clean up test runner
convert to tdd
code cleanup
add support for superagent based testing
rejigger it all to work with 'versions' rather than 'torrents'
Adding the SMART ontology into the commons
- I thnk timeline/list view, fullscreen, share-url are working fine.
 - Embed url works fine, I have not tried it yet.
sms response message update
malys 아이콘 테마 추가

from: peter yoo <onionmixer@gmail.com>
fix bug in web.xml
move index.xhtml
remove super start and stop call
Fixed widgetBody margin
Fixed banner height to 48px (double $grid-pixel)
added implementation guidelines
Removed incorrect imports
Added SongAdded event
Changed around grantAccess

Method now handles storing of access_token and retrieving access_token
Remove unnecessary check for variable that always has memory allocated.
add npm dependencies to package.json, fill out the .gitignore
quickfix toggle
Code style
Separate out camera module
Home page and stuff.

- FB (Open Graph) meta tags and hashbang url stuff
- Delete pic links
- Header switches based on session status
- Add tracker for Google Analytics etc
- Fix unlike update handler
- Add download dmg
Add login/signup form and stuff
Almost working implementation of eliminate_hinge
Sessions frontend
excerpts fix frontend
added bin folder, nothing in it, for jenkins
Fixed the public key format to PEM.

This format can also be consumed by the ruby gem to be used
for token validation.

Change-Id: Idf05bf2fca1dea5160dba949ee512fa56b4a08da
config comment
Fix for hidden template files

.filename.php files will no longer show up in template dropdown.
Changed strpos to substr, slightly faster.
Merge remote-tracking branch 'upstream/master'
Modificando esquema de preguntas y respuestas
More tests.
Small improvements.
Merge branch 'master' of https://github.com/colin-jack/rules
Fixed warning on mob.c.

git-svn-id: http://rathena.googlecode.com/svn/trunk@15965 dfcd82a3-dffb-8f83-6aec-effe02521c5c
Removed pc_cant_newmount since it has been proved newer clients still support them.

git-svn-id: http://rathena.googlecode.com/svn/trunk@15966 dfcd82a3-dffb-8f83-6aec-effe02521c5c
Minor performance improvement on script function is_function -- replaced strdb_get with strdb_exists since we don't use the data at all.
Modified get_revision to return the revision number rather than it's string, when revision is not known by the server it now returns -1.

git-svn-id: http://rathena.googlecode.com/svn/trunk@15969 dfcd82a3-dffb-8f83-6aec-effe02521c5c
Fixed bugreport:5624 Thorn Trap 'immobilization' effect should now be working properly.

git-svn-id: http://rathena.googlecode.com/svn/trunk@15970 dfcd82a3-dffb-8f83-6aec-effe02521c5c
Fixed Wall of Thorn skill, all of its conditions should now be met.

git-svn-id: http://rathena.googlecode.com/svn/trunk@15971 dfcd82a3-dffb-8f83-6aec-effe02521c5c
Fixed bugreport:4468 Frost Nova freeze chance has been updated to meet its renewal values.

git-svn-id: http://rathena.googlecode.com/svn/trunk@15972 dfcd82a3-dffb-8f83-6aec-effe02521c5c
* Code consistency updates. No functional changes. Credits to Lighta.

git-svn-id: http://rathena.googlecode.com/svn/trunk@15974 dfcd82a3-dffb-8f83-6aec-effe02521c5c
* Replaced rand() calls with rnd().

git-svn-id: http://rathena.googlecode.com/svn/trunk@15975 dfcd82a3-dffb-8f83-6aec-effe02521c5c
fixed progress reporting for local fetch
Use MadMimi API for sending e-mails.
Lock down the important parts of the projects controller.
remove older file
Add config stuff
Adding preprocessing stuff
Added docs, pipedream.tex still outdated
tinvert_thetae root bracket interval changed
answer_entrain.py added
实现2d透视
implementation of arbitrary chained affine transforms (nearest resampling only, so far)
modify CLOS structure.
modify CLOS structure.
modify CONT structure.
refactoring; rename Env to CEnv (Compile-time Environment).
*** empty log message ***
use unless.
remove comment
fix comp' lambda.
fix comp' lambda.
*** empty log message ***
Finished off Simple HTTP 'get_length'
Implemented / testes get_hash
add mocha to package.json
mention npm install in README
Merge pull request #1 from crdx/patch-1

add mocha to prerequisites
Merge pull request #2 from crdx/patch-2

mention npm install in README
fixing firefox bug with search box
archin it up
Fixing a bug where `downcase` was being called on the list of used file paths
Removed command-t and coffetags stuff from rake
changed the loginpage graphic
Added a seq of scales for the leader so far, but commented it out as I haven't gotten it working with bass or the follower.
Removed dupe of canone alla quarta.
Fixed URL
Removed has_key() calls
Modified parse.cpp to use the class IniParser (in construction).
Scaling of notes (too big)
added backup config
Added default values to leasing and trainging bools + nullable comment in shift
Initial.
Initial.
Initial.
Initial.
Initial.
Added Search page.
Added sitemap and alldata fixture.
Adds limechat theme
Plugin jQuery Laserize added
adding python synonyms
tmux slime and python folds removed
Revert "Better naming of variables"

This reverts commit 8f5e2fe6668f75bca32869a90cee76ba1924bc78.
edits for data panel
made remaining jobs use set difference for speed. Added a max number
jobs param to process
OBT will now create subdirectories for it's hdf5 file
added stranded plotting
Update setup.py - Version 0.6
Added SelfCancellingCallable, test not complete
Support validation of REST information provided
Incremental commit, updating quests for new namespace schema
Rewriting quests to make more sense and getting into the current namespace schema
Fix vim status line for older versions
init
forgot to include main class in usage
change end points back to production
remove extra class path param
allow for proxy host and port config
add git ignore file
Merge branch 'master' of https://github.com/dannyduc/ipa-sdk

* 'master' of https://github.com/dannyduc/ipa-sdk:
  add git ignore file
  allow for proxy host and port config
  remove extra class path param
  change end points back to production
  forgot to include main class in usage
  init
Wowhead style main page + lang select (TEMP Solution)
cha e...
Add logging in Arquillian ManagementClient to log operation failure messages
Default implementation of Weld 1.2 API (necessary for forward compatibility with weld-osgi)
Test for AS7-6015
Increase test timeout
[AS7-6019] Clean up detection of version 1.4 of the namespace and the switch for parsing.
Reenable test.dart to be invoked from dartium checkout

This will be used to remove the Dartium usage of minfrog.  From a dartium enlistment, the following will work.

To test with frog:

./dart/tools/test.py --compiler=frog --frog=/usr/local/google/vsm/git/src/dart/frog/frogc.dart --shell=./out/Release/dart --runtime=drt --drt=./out/Release/DumpRenderTree --mode=release client/html

To test with dart2js:

./dart/tools/test.py --compiler=dart2js --frog=/usr/local/google/vsm/git/src/dart/frog/frogc.dart --shell=./out/Release/dart --runtime=drt --drt=./out/Release/DumpRenderTree --mode=release client/html

Review URL: https://chromiumcodereview.appspot.com//10201005

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@6897 260f80e4-7a28-3924-810f-c04153c831b5
release finish now pushes up first so that branch -d works without having to be forced
Version bump to 1.1.1
Merge branch 'release/1.1.1'
Merge commit '1.1.1' into develop
Refer to the project name instead of todo app
Merge pull request #108 from pengwynn/remove-todo-from-todo

Refer to the project name instead of todo app
Refactored tests for the irc_bot module.
some list tests
tests again -> complicated working
removed many print statements, previously used for param debugging
string literal handling
full dictionary suport
new api problems - fixes #62, #63
fixes #63, live reload and html templates, redo
Adding no name provided option for new command
begin pulling commands out of fat index.js
Removed unused vim themes
Simpler vimrc
Fixed crash for empty repositories

Empty repositories will have a `null` in their `pushed_at` date. This
would cause the app to crash when comparing the repositories by that date.

Closes #130
Merge pull request #131 from koraktor/fix-empty-repositories

Fixed crash for empty repositories
Added a object lock to synchronize on createAndAdd
Added GuardedBy annotations to document whats protected by synchronized locks
Refactored all lock/notEmpty calls into awaitAdded(long, TimeUnit) and notifyAdded() so code is more clear
Added javadocs to createAndAdd to document whats happening and what the slow operations can be
Further portability improvements
Added dead
change readme
Merge branch 'master' of https://github.com/ddling/GridWorld
Ading lssh alias to list HostNames in my ~/.ssh/config
Stubbed out history notes for next release.
Moved tests to pystache/tests (intermediate step: tests not working yet).
Normalized newline at end of file in a couple example modules.
Tests now working after making tests directory a sub-package.
Merge branch 'make-tests-subpackage' into 'development'.

The tests directory is now a subpackage.  This is more in line with
the recommended Python project file hierarchy as described here,
for example:

  http://as.ynchrono.us/2007/12/filesystem-structure-of-python-project_21.html

This should also make it easier to use the "use_2to3" with Distribute's test,
so that the directory containing the tests will also be converted to Python 3
when running `python setup.py test`.
Remove action for nonadmins in college index
Оригинальный текст на английском.
Merge branch 'master' of github.com:dem/openehr-spec
Добавлена обработка textile
Исправлены символы кавычек и апострофа
Перевод 1, 2 и частично 3-ей главы
update

icon, box, line, bug…
use color-theme-tangotango
Fixed bug in partial content requests

+ As suggested by @koichik on https://github.com/joyent/node/issues/2997#issuecomment-4671630
SMSIntegration: updated for SMS 1.2.  Require 1.2.0+ as build dep.
Number of input and output signals are limited per gate
Adding ctags/cscope files to global gitignore

Signed-off-by: Mike Detwiler <mike.detwiler@gmail.com>