labofsahil/github-event-dataset-2012 huggingface dataset:
[#1066] Adding subindustry to organization metadata
Merge branch 'master' of github.com:sunlightlabs/datacommons
[#1066] Updated org metadata view with subindsutry and current cycle
Fixed broken logging import.
Merge remote branch 'origin/master'
Update committee itemized table to only include incoming money
[#1053] Fixed: lobbyist name was using raw field instead of standardized
[#1057] Adding subindustry_entity_id to org metadata and fixing its indexes
[#1064] Improving matchbox_politicianmetadata indexes
[#1064] Line up indexes in model more with reality
[#1057] Add subindustry_entity to OrganizationMetadata model
[#1064] Add FKs to entity to entity alias and attribute tables
[#1068] Make contracts data preview order by obligatedamount
Aggregate over all committees. Other minor handler changes.
New command to create entities based on IndExp spenders.
Merge remote branch 'origin/master'
Wrote initial tests. Not passing.
2012 data required for tests.
removed unnecessary filters from loadcontributions
changed recipient_type to 'P' and 'C'
added protected resource role
initial client test
token request functional
fixing dependencies
moving test app to a more specific name to allow better testing
integration tests + general bugfixes

bugfixes
hacking on new Push varaints
small experimentation
update atombios set pixel mode
Fix memoize
Merge branch 'master' of git://github.com/syslabcom/recensio.theme
wrong memoize again
use _send() to leave headers intact
playing around with udp
Changing inputs to buttons so they can be styled with the :after pseudo class.
Merge pull request #155 from andysellick/patch-17

Changing inputs to buttons so they can be styled with the :after pseudo ...
change /info/site.html to twitter.com/ngn
Fix potential memory leak in scanner interface
Adjust FreeImage text in plugin downloader
Release scanner interface on program unload
Improve layer's ability to directly write BMP files

Should be less prone to errors now
Improve cascading on image load

Certain filetypes load better/worse with FreeImage, GDI+, and even
native VB.  The new load routine intelligently cascades from one
available system to the next based on performance and reliability.
File Load/Save dialogs adjusted to match new GDI+ capabilities

Without FreeImage, it is now possible to still load and save PNG, TIFF,
JPEG, and GIF files.
Fully implement GDI+ saving

for PNG, TIFF, GIF, and JPEG when FreeImage cannot be located
Saving is now completely tied into layers
added: use chardet to detect lyrics encoding
insert fanciness into index

Added slope column template to index, some CSS tweaks, changed buttons
etc
Cleaned up and grouped (still pending);
포스트 등록/조회 및 친구 홈 조회 가능버젼.. #1
Fix version detection
Add git-prompt.sh to package
Castle of Ordeals map done
changes to bashit files
Handle ball's max speed
Updated field parts
Increased density/mass of blobs by 100 ; Movements are now "mass aware"
Increased speed of blobs by 2
Blob is now a heptagon (with circle physics)
Corrected a bug which was preventing a blob to jump when colliding with several objects (not only the ground)
Increased size of ball by 1.25
Adjusted blob movement (linear)
I am "desoled". We speak english here
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from svnfqt/master

Enhancements
queue: introduce a default reconnect delay of 5ms.
Data Permanence
Persistent data
n/a
n/a
gferioo
Maybe the backticks were messing with it?
remove .well class from nav-list demo
Fix stupid error, and hence fix this branch up
don't acquire values when indexing
Preparing release 1.2-FHNW2
Back to development: 1.3
EVEN MAJORER REFACTORING. Tab bar controller now is the root view controller containing two navigation controllers for each tab
Refactored the order of business. ListViewController can now ASK for movies instead of them being given to it
De "coole toevoeg animatie" moet ook werken bij de automatisch gesorteerde "watched" lijst !!!!!!!
Localization
Localization of API
Localization of API
fix lighthouse
dellet wrong files
Removed duplicate list of install requirements.
Bumped release for fixing the versioning stuff.
Merge branch 'release/0.0.4' into develop
Store identifiers using SmallString instead of Text

Each SmallString has much lower overhead than a Text.  Additionally,
SmallString stores its contents in UTF8 instead of UTF16, which will
save a lot of space for LLVM where all identifiers are currently
ASCII.

It is still future-proof (and still more compact for unicode text than
Text).
Merge pull request #8 from travp624/master

sync test to master
Merge branch 'test' of github.com:travp624/frameworks_base
Merge pull request #9 from travp624/test

Test
production readme
fix error lookup key order in i18n calls
Random changes

not sure what these changes are exactly
fix syntax error in layer.rb
Merge branch 'master' of github.com:unepwcmc/carbon-benefits
getting the save edition to work
getUserFloat -> userFloat in ntuple
add corrected Pt to electron ntuples
Merge remote-tracking branch 'uwcms/master' into HEAD
try a different way of doing pass-thru
remove the primary vertex filter and add some rudimentary handling of a selected PV not existing
Merge pull request #81 from lgray/master

Non-cranky vertex cleaning + better pass thru.
Update README.md
Update README.md
Merge branch 'master' of https://github.com/uzikilon/backbone-poller
comments
Update README.md
removed license
Added test for aborting XHR when calling stop()
tests cleanup
Merge branch 'master' into gh-pages
Fixed compatibility issues with busybox 1.20
initial commit, Dyna's csv exploder added
remove slash folder
update commit

Signed-off-by: gabrielfanel <gabrielfanel@gmail.com>
Version 1.2 + updated readme

Changed the URL above the image to be displayed in a read-only textbox
Moved the image checkboxes to the top and added open & download buttons
below each
Initially disabled the "Download" button and "All" checkbox
add one more test file
Revise test code to pretty-print preferences
add empty store page
Removed ejs, added jade
Do not sell more items than we actually have
Version 0.6: easier to use with n/N navigate
Version 0.7: fix bug on nomatch
First commit
Merge branch 'master' of github.com:vincentpasquier/gpu-1213
First.1 push by Roma
Remove locals() trick
use thin via procfile
update gems
missing ref
Merge branch 'master' of https://github.com/vzmind/demo-http-caching
Ribbon Tool tips and Help Manager fixes
Conflitos
Conflitos
Doc path-relinking
mpc: Implemented RAM bank decoding.
Adicionando prototipo LEIAME
drop local- from find fns
renames to reflect latest datomic-simple
au revoir namespace redundancy
db -> ds, let schemas breath
actually use the defined uri
replace non-dry find-all implementations with datomic-simple's find-all
- add deadline as ticket filed.
- unit can save date successfully.
- unit deadline is ok.
- add deadline and current date time in the form.
- To add the function of search ticket
Merge branch 'master' of https://github.com/wchen057/richfaces_mysql.git
-In sql statement, the table name must be capital.
Fixed typo

Changed text: "Umbraco 5" to "Umbraco 4"
Added some verification code
STOPALL exits the process
Merge branch 'master' of github.com:webinos/Webinos-Platform
Merge branch 'master' of github.com:webinos/Webinos-Platform
Merge branch 'master' of github.com:webinos/Webinos-Platform
Added find-dependencies on android build
Added inherits node_module in android that is required from the zap-and-shake API...
Added mkdirp node_module for android because it is required from the file API
Temp fix to kill aNode to free the ports (for installing new versions and testing it instantly instead of waiting on non-rooted phones)
Merge pull request #232 from paddybyers/android-andreas-merge

JIRA Issue: WP-452: Fix build dependencies on Android
updated to allow username/password for distribute
Adding BrowserID gateway to Register for Distribute

Also made the form a little prettier.

Adds the registrants email address to the Network Node Connection document as X_contact.

Signed-off-by: Jim Klo <jim.klo@sri.com>
Adding BrowserID gateway to Register for Distribute

Also made the form a little prettier.

Adds the registrants email address to the Network Node Connection document as X_contact.

Signed-off-by: Jim Klo <jim.klo@sri.com>
Merge branch 'release-0.25.6' of github.com:jimklo/LearningRegistry into autosign
Fix distribution credentials

problem with /register creating the wrong url for authz creds, and the creation of the credz for the distribution destination had a syntax error.

TODO: distribution test needed for this.
Signed-off-by: Jim Klo <jim.klo@sri.com>
Fix distribution credentials

problem with /register creating the wrong url for authz creds, and the creation of the credz for the distribution destination had a syntax error.

TODO: distribution test needed for this.
Signed-off-by: Jim Klo <jim.klo@sri.com>
Merge branch 'release-0.25.6' of github.com:jimklo/LearningRegistry into autosign
Merge branch 'master' into batch-incomming-docs
updated to only test the handshake for dist, handlers are now tested in test_model.py, still need tests to test filtering
Better clue implementation
Move to hut78
Fix for Admin Menu + Ctools AutoModal
Merge pull request #331 from sylus/master

Fix for Admin Menu + Ctools AutoModal
Fixes for Travis Build + Removal of Make file via patch
Merge pull request #302 from sylus/master

Fixes for Travis Build + Removal of Make file via patch
Updating explanation of configuring the root

So that how to do it and what to configure is clearer.
kiosk finished
DurableQuartzActor
Update ContributionReporting to master with settings for 2012 fundraiser

Change-Id: I56a3b164b994f1be80bb9802660cdc8dd5eecea9
Re-enabling amex forms

Change-Id: Idf8fe643df683f2d1e006b7ccc0698466b250ae9
Add type hint

Change-Id: If529cfbf568a10e8cea184fa229959701268ebcb
Merge "Add type hint"
track-dotfile.sh added dotfile bbb
track-dotfile.sh added dotfile ccc
remove test files
init
remove test file
update gitignore
track-dotfile.sh added dotfile dmenu-bind.sh
track-dotfile.sh added dotfile menu.xml
track-dotfile.sh added dotfile rc.xml
track-dotfile.sh added dotfile autostart
track-dotfile.sh added dotfile terminalrc
track-dotfile.sh added dotfile config
ws
track-dotfile.sh added dotfile tint2rc
track-dotfile.sh added dotfile .zshrc
track-dotfile.sh added dotfile .vimrc
track-dotfile.sh added dotfile .Xresources
track-dotfile.sh added dotfile .conkyrc
track-dotfile.sh added dotfile .emacs
track-dotfile.sh added dotfile .emacs.d
Removed @williejackson attribution in the footer.
Finish chapters 4, 8

Remove unanswered questions
Revert "LunaCE 4.9.6"

This reverts commit cf6e411e22468012c39637c4524812084e4e7830.
system clipboard -> vim default register

for linux, osx and windows.
follow-up for #153
Update default.xml

added motorola spyder
Site updated at 2012-11-20 16:04:08 UTC
Text Fixed
Version 0.3.1
Minor fix
clojure introduction
nitly cleanup
[maven-release-plugin] prepare release hw1-yucongy-0.0.6
Updated to use set and analyze in correct places.
Update: add third argument when calling socket.socket()
test my IDE first
맵뷰 부분 다시

marco랑 겹쳐서 충돌한거 해결
change for HypnoTime
Rename the folder 'assets/modx-boilerplate' to 'assets/templates'.

Change the corresponding paths in the chunks and in the build script.
add warn_only for query
add cname
modify cname
Support multiple dataset in "line construction"

- Add checks for active datadef in dataPoint action handlers.
Site updated at 2012-12-05 04:28:18 UTC
Site updated at 2012-11-06 03:32:17 UTC
restored to old version
Update greedy algorithm (it was wrong)
updated for 1.0.0 stable release
Forgot to move HTTPI/Savon configs below require
Checks for existence of VC before displaying it
creates 'Game'
Changed string format specifiers for NSUInteger values from %u to %lu

Resolves two compiler warnings in AFHTTPRequestOperation.m and one in AFHTTPClient.m
Merge pull request #436 from gcox/string-specifier-fix

Changed string format specifiers for NSUInteger values from %u to %lu
Kapitel Implementierung
Merge branch 'master' of github.com:ARCADE-UAV/Projektseminar
Geänderte Versionen zusammenfügen
mongo repair feature

Change-Id: I3877f8e38e692f25d56ac65181d91787d2d83fe0
Merge "mongo repair feature"
Comitting phantom CRLF changes
Merge remote-tracking branch 'origin/master'
TwitterBootstrap Integration
Temporar fix for attacker, inget fel nu
MEh why are you doing this to me?
valid flag not required in User model
commented some print statements
Fix: BCut Morpholgical Ball Size -> 1
Merge pull request #144 from reginakim/BCutApplyWarning

Fix: BCut Morpholgical Ball Size -> 1
Adding Foolamancer to the moderators.txt as per http://baystation12.net/forums/viewtopic.php?f=34&t=5637#p110395
Merge pull request #1874 from Asanadas/master

Config: Adding Foolamancer to moderators.txt since he got approved.
Fixed removing the first beaker from chem grenades, fixed premade grenades not working
Merge pull request #687 from Miniature/master

fixed both parts of #645
Changed: Function admin_add_log_entry now accepts only array as it's second argument.
Changed: Add some logging to session class to see if we can work out why sessions keep expiring prematurely.
don't forget to update the gemfile
Updating econ stuff
don't include sessions directory in git
ReassignObjectNumbers: fixes to neighbor-finding
Update VariantAnnotation to version 1.5.4
Schimbat locatia pentru ISO
git-svn-id: http://dwlab.googlecode.com/svn/trunk@345 1f63a6fe-6007-92bf-7612-2633ac8b7beb
Updating .jar to 1.1.0
adaptacion a openlayers

Fork del argenmap.jquery, cambio inicial al estado de openlayers.jquery
y primer commit. Las demos no estan muy pulidas y justo en este momento
esta caido el wms del ign, asi que va teorico porque no puedo probar.
tratando de sacar el png con url
Fixed cross link class issue
Fixed a few magor bugs with clicking & scroll
Merge remote-tracking branch 'upstream/master'
Deleted old Create_Item.php and replaced it with newly programmed Item.php
Merge https://github.com/CarrotIsland/CarrotIsland
Clarifications to help.

Clarifications to help
fixed ranking order bug
Got me some sounds!
Merge branch 'master' into Sound_Effects
Added Sound Effects (Except Death Sound)
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
almost finished EMP
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'master' into EMP

Conflicts:
	armored assault/Source/Enemy.cpp
Finished EMP
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
Merge branch 'rob_testing'

Conflicts:
	armored assault/Source/Player.cpp
An opening wave of enemies spawn.

Signed-off-by: Robert <robert.lewis.stewart@gmail.com>
added arcade controls.
Merge branch 'rob_testing'
game over fades in,
fixed a bug where you couldn't escape out of menu screens because of joystick input.
Merge branch 'master' of https://github.com/ChaosHill/Armored_Assault
GameOverState.cpp fade in, and added a press enter to continue.

Signed-off-by: Robert <robert.lewis.stewart@gmail.com>
InfinitySword2.0
update servlet and commands
420 - Fix expiration of petition
824 Display contribution attachments in sub contribution modal
Revised project banner per updated design
466 Upgrade Haml to 3.1.4
Merged UX62-Opportunities-DEV into development
removed gemspec
removed jeweler
fix typos in comments
use updated shader generator
fix typo
opinion extractor web app ok
Cambio en frases
fixed asterisk display for modified repos in git prior to 1.7.2
changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
fixed introduced to parse_git_dirty
Merge pull request #925 from cruser42/bugfix/gitversionfix

Bugfix/gitversionfix
Merge pull request #868 from wgriffioen/bundler_add_rails

added rails to bundled_commands
Fixed bug introduced when fixing issue 896
Merge pull request #958 from cruser42/master

URGENT: Fix for bug introduced in pull request 925
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
First Commit with code.
Output JUnit Reports
roll back function
slide bar finished
Fix an error in user creation in README.rst
Added default root document node (optionally)
Added gist example.
First implementation that will build a multi dimensional DOM efficiently
Merge branch 'master' of github.com:Discovery-Software/Presto
вывод оценки по весу слова
make run & test scripts
prototype tcp server. use asyncore library of python3
usb4bsd: Fix some compilation warnings.
usb4bsd: Fix the compilation of the remaining drivers into the kernel.
usb4bsd: Add uether dependency for compiling udav into the kernel.
top - Use RES by default instead of PRES

* The kernel support for PRES was removed during the SMP fine-grained
  locking work on the VM system last year so top was reporting 0K for
  everything.  Change top to go back to RES.
Added first iteration of presention. Please review and provide any images you wouldl like included.
Merge branch 'master' of https://github.com/EWUDesignPatterns/Project
call attr before toFixed
Topic changes, too!
Handle channel invites we've received.
Handle nick changes
Finish handling of incoming messages
some CSS for the twitter content
add our names

Signed-off-by: EngTurtle <ollie.liang@gmail.com>
Doppelte Einträge im Abschnitt "Copy Bündle Resources" führten zu Compiler-Warnings und wurden deshalb entfernt
falsche Exception Initialisierung führt nicht mehr zu compiler warnings
Reservereifen werden montiert und nicht gewechselt -_-
fix-483
little refactoring
Merge branch 'wolfor-dev-shop'
vendor-aliases
added some switches to allow for using as a compuled phar file
Make TTAN block pressure when framestepping
Tweaks to glow colors. EXOT now mimicks Heat View's color scale, and its irradiated color scheme uses tmp2 instead of temp so it appears to cycle.
fix php syntax error: unexpected character \ in input
fix php syntax error: undefined constant.. should be quoted string
fix php warning: undefined variable
fixed incorrect syntax for defining constants
fixed bug where customer txt file wasn't being created.. 'customer_data_dir' in a constant but it was incorrectly being referenced as a variable
lets create the customer txt files in a temp directory within our dir structure, instead of /var/tmp which some webhosts might not give access to
fix broken links
productId parameter for isSubscribed() function was declared but never used, so remove it.. (bad vars were being passed on top of it)
bugfix, 'mode=test' wasn't being appended to URL
turn off curl's SSL certificate verification, otherwise connection fails
added support for the new 'discount-duration' subscription update xml field
included detailed instructions to set up the example1 demo app
Merge pull request #1 from mmikeww/master

Bug fixes, discount-duration, and detailed instructions.
made Miss Creeper greenish
added card backgrounds specific to all realms, fixes #23
fixed typo(s)
Creation of a bean containing permissions on establishment view
Creation of services for retrieving permissions on establishments views
creation of tests for permissions on establishments views
adding scripts finally
Merge branch 'master' of github.com:GenteiJanken/aperiodpiece
gh-64 Expect new ClientTools packaging

Fixes gh-64

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
gh_54 Link to new ECL Watch pages.

Links to source view and source files.
Updated help index and TOC

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Merge pull request #65 from GordonSmith/Issue_54

gh_54 Link to new ECL Watch pages.

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #66 from GordonSmith/Issue_64

gh-64 Expect new ClientTools packaging

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
g:TableMode updated
list:member() fix
Multilingual g:label() fixes
deploy script
updated copy for contact us
Fixes #36
placeholders from profiles
Removed timeout on parallax fixed #58
Merge branch 'dev' of github.com:GuntLondon/guntlondon.com into dev
copy added
html tag fix
console.log removed
Merge branch 'dev' of github.com:GuntLondon/guntlondon.com into dev
Added home copy

Fixes #64
Fixed Gunt info rollover layout
Replaced borrowed text content with lorem ipsum so we can see where we need to write more copy

refs #65 - our approach copy
refs #66 - the gunts copy
refs #67 - case studies copy
mobile goatsee
Added meta description
Footer styling for IE
Merge branch 'dev' of github.com:GuntLondon/guntlondon.com into dev
Content added for missing sections
Fixed some copy
Fixing vertical alignment between titles and text
activate on selecte.focus
App icon setting
Added release items to the pom, fixes #1
UnixTimeからスレッドの作成された時間を計算する処理を追加した
paml: Correct sha1. Fixes #41
Overriding Devise gem's controller and views to start styling the login page
Adding all the devise views
Finished all points.

Also added a super basic (Edit it yourself!) script to help people get
it working locally with chrome.
Toggle map types
&
zoomToCurrent tweaks
Adding pathologic module
call apps post install function for sitenow_people
[Client] Added skill event

A event is not published in case a skill update is received from the server.
[Client] Added the introduce command
Fix code-signing

As per http://docs.oracle.com/javase/tutorial/deployment/doingMoreWithRIA/settingArgsProperties.html
custom properties in jnlp files are generally considered insecure. Only
properties prefixed with either "jnlp." or "jawaws." are considered secure
and will not break code-signing. The only correctly signed jnlp so far was
the loader's release jnlp since it does not contain any property. Also it
should be safe to remove jnlp-signing now.
[Client] Added first basic version of the skill window
[Client] Improved skill handler layout
Merge branch 'master' of github.com:Illarion-eV/Illarion-Java
setup initial links for demo app
The source code of part 1
commit base of project (not tested ...)
Modified a few things in preparation.

* Made everything compile correctly.
* Refactores `Actions` into `Action` for clarity.
Merge branch 'develop' of github.com:JugadorNumero12/SimuMatch into develop
Added method `get` to `Action`
Added new class `Target` and modified `Effect` to use it
Flipping last name and first name headers
Revert back to Cyanogen Kernel source until Faux's gets updated
re-enable OMAPLFB for new PVR

Change-Id: Idf4bdc5a9fff1aa75404c162ae0a9d8ee9eb7db1
move omapreadl and other register functions into plat/io.h for public access
Got rid of duplicate file
Start of my Type System...
updaing gitGet, webperm base and git
居然把验证表单注释掉了
题目页面评论代码
update composer install for travis
Add calm-containers
Fix typo + other minor details
change wording of IfWinExist.htm Example 4
Added splash potion checks
updated controlPanel and meowth
Added To Do file

Functionality description.
Google Places acabado con autocompletado
update plugin, bump rails version for security fix
OAuth mobile
info message changed
new perl build master script to handle the command line options for build_wms.sh
Implemented a context menu for tracks in bookshelf fragment, also added functionality (accessible from this menu) to delete a track, to move a track up one step and to move a track down one step.
Rename database version file
Cache buildings information locally
updating songs.html
Fixed class MultimediaDirectory which doesn't really need a local filesystem resource accessor
Added comment to IResourceAccessor
Reworked MediaItemSource to BinaryTextureImageSource to be more general and not hard coded for media items
Cleaned up SubTypes from projects
Fix build using gcc under OS X 10.8

 * Change the default SDK from OS X 10.6 to 10.7.
   The 10.6 SDK is no longer bundled with the current version of XCode

 * Add explicit casts for permissions value

MD-18896
Reviewed-by: Carles Pina
Fix failure to install files in non-pre-existing nested directories during an update

If an update includes a new file 'dir1/dir2/file' where neither 'dir1' nor 'dir2'
already exist, the update fails as it attempts to create 'dir2' without first creating 'dir1'.

Use mkpath() instead of mkdir() to create the dest dir for a file.

MD-18896
Reviewed-by: Carles Pina
Bump updater version to 0.13

MD-18896
Reviewed-by: Carles Pina
Do a more thorough check that install dir matches the package source dir after installing the update

Compare the package source dir and the post-update install dir recursively and check:

 * There are no unexpected files in the install dir

 * All files in the packaging dir were installed with the correct permissions and content

MD-18896
Reviewed-by: Carles Pina
Update the v2_file_list.xml file to match the file_list.xml file

The UpdateScript test requires these files to list the same files
to install in the same order.
Reviewed-by: Carles Pina
Fix an issue where a build of the updater on OS X 10.7 failed to run under OS X 10.5

Copy the work-around for missing template symbols in the C++ runtime library
from Mendeley Desktop.

See the StackOverflow discussion referenced in the comment for more details.
Reviewed-by: Carles Pina
Fix old/new helper binaries in unit tests failing to run on OS X 10.5 if built on OS X 10.7.

Apply the Leopard STL template symbol fix to the helper binaries.
Reviewed-by: Carles Pina
Adding ModelDriver subcommand to ms

- Partially working now.
Trying to track source of problem in MongoDB script
Changing "use config" parameter because this breaks the mongodb script
Still trying to fix MongoDB test
literally don't remember what i changed ... must have just been spacing
 or something ...
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
new exported apk for phone ...
Merge pull request #312 from Tim727/master

new apk for phone testing
Merge remote-tracking branch 'upstream/master'
fixed issue where notifications would pop up for no notifications (in the background alert)
File description update
BUG: fix Slicer extension install paths
using our pypi server for deps
added index updating
morphology changes
Merge branch 'master' of github.com:NeuralEnsemble/libNeuroML
adding kinetics support
Motivación
Добавлена библиотека для работы с файлами формата Excel.
Добавлен класс для экспорта отчетов в формате Excel.
Removed figlit from list of standard packages
v0.9
Changed everything
Do not spam the beheer mailbox from environments other than prod
Need more metadata fields for the SP overview page.
String.format is ugly if you already use a StringBuilder
https://jira.surfconext.nl/jira/browse/BACKLOG-517
thread roboter funktioniert.
normaler roboter nun auch mit suchzeit.
Partial commit
Merge pull request #1 from PIP-JOBAGREGATOR/backend

Partial commit
Fix buffer overflow issue, and update to optimised RELEASE config.
made sexy shaded box to add contrast to sign_up
removed comments
Merge pull request #50 from PennAppsTeam/contrast

Made sexy shaded box to add contrast to masthead
GCS Config: Also increase the sampling rate for gyro scope for the developer config
GCS Config: Make the developer file default to 127.0.0.1:9000 for network configuration
Minor tweak for coding standard compliance.
Bugfix when stoping sound
Core:Script. Westfall fixed npc_horatio. Added neel function. Patch by Jasper.

Signed-off-by: SkyFire <admin@projectskyfire.org>
changed attend to get attend approved
created all views and functions for attendances; moved new event link and added indexes to header nav
PIM: Improved inputs matching.
Changed what we return on getEvents,
EHR 8 letters added
Eliminados logs.
Compara línea a línea ignorando espacios.
Initial working version of TurtleSim for the web.

Code needs to be more straightforward though.
Minor code clean up and velocity fixes.
更新translate
update css绑定
Cleaned up the function.
Create FS utils project.
Created FSTestUtils Project
Basic code structure, config parsing
game connect
INCR to v3.70
Added ProtoBuf ordering

Added ProtoBuf ordering to the Auth & AuthResponse DTO's
Added using for DataMember filter
Added [DataContract] to the DTO's
Merge pull request #213 from ChuckSavage/master

Added ProtoBuf ordering to Auth DTO's
check in new dlls
Change underlying data structure of StatusCode to be an int to support new HttpStatusCodes not in .NET's Enum.

Added Remote IP Which looks overrideable Http headers first falling back to UserHostAddress
INCR to v3.96
tab indent bug fix
added linux compatibility
Added explicity stratosource. before all admin packages

Conflicts:
	stratosource/admin/management/SalesforceAgent.py
	stratosource/admin/management/commands/deploy.py
Rebuilt
cherrypicked changes from dev to support label exporting
updated spec and build to be RHEL compatible
Tweaked requests usage to be compatible with version 0.11
Updated to repackage
Tweaked json parsing
Built latest combined package
update conflict_manifest.xml for working branches

nlcp team updated the R8 A4 RC0 release content.
fixed #39
fixed #40
no message
LatinIME: Add whitelists and shortcuts to the english dict

Change-Id: Ica49ffaedb3dee5e0a2163c039c311ebf1155100
Merge remote-tracking branch 'cm/mr1-staging' into mr1-staging
Changer hero unit size en fonction du responsive
389457: Interim (for rebase against common model).

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=389457
Added ability to pull version from phpbb_config table and needed to change/add some heading titles. Edit 2 of 3.
started fleshing out how the game will work (ie its html markup layout).
added the main stylesheet.
added gitignore to block wierd binary files from gobby.
just fiddling with the layout a bit.
gemfile apparently changed...
added main js file.
cleaned out the gemfile, and added a js library note...
added fabric repo to the project.
been doing a lot on the project.  Have more classes, have an audio file pair... it's looking sharp.
in the middle of fleshing stuff out.  I have the title screen fading in really nicely now.
have the thing's skeleton thought out pretty good right now.  With fabric it will be a synch to come up with a death animation, I'll make my own method and send it up to them.
really cruising along with the logic and classes of the battle screen.  I just started a convention where 'public' methods shall start with a capital letter, and 'private' will be lower case, just to make it look nicer.
about to do a scary refactor to make titleScreen more object oriented and use constructor.
finished refactoring... took a little longer due to needing to move keyboard.js to the bottom of the declarations on the html.
if I keep refactoring... the classes will actually be MORE difficult to understand...  yet easier to use...  Should I undo my last commits for that reason?
refactor complete on title screen.  Time to refactor battleScreen.
I just created a bug in the battle_screen canvas where there's a gap between the border and the image painted...
i've been coding so long with out a commit.  It's cause I'm cleaning up so many loose ends.
added a bird mob, about to fiddle with the position so its based off of the bottom left corner.
The enemies are showing up pretty good on the canvas.  Now it's time to work on the heroes.
Squish the nyan cat animation into a single animation. Reorder animations to be grouped by color.
Added comments to Homography.py
includes arrays
Added directmongosuite in the components folder.
still Need to document modifications
[Form] fixed construct params, added support for validation
[DIC] added FormBuilder to DIC
Update Javascript and KML
Added an event to be called if a property is set.
Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
mc/classic: Fix camera rotation not updating on teleport

Spotted by fragmer.

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
charge: Fix mac build

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
gfx: Be a bit paraniod about cleaning up targets

Fixes crash on MacOSX.

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
gfx: Improve FBO code a tiny bit

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
Moved mode setting to config
Substantially improved pipeline.js

Fixed initial loading bug and "don't create functions in a loop message"
Added "this line was added by eden server" to ResponseWrapper
colored running log green
Removed falsy comment
Deleted out of date docs
Removed console.log
Started new application bgCanvas
Added support for relative paths in eden.json
add extract indices
Challenge ratings; spawns; correct alignments.
More debugging info in script2
Add more features to the serverside
Wrote it again in PHP
Changed styling for courses
Core: language_manager related bugfix
Control Panel: method _buildMenu renamed into _build_menu in menu_control.php for prevent runtime notices in log-file.
Control Panel: AImage memory leak bugfix. Destructor added.
Added the lost file.
Merge branch 'master' of github.com:agcooke/ExperimentControl into develop
Trying to get it to work outside of the current directory.
Creating PIP package.
Merge branch 'release/0.3.1'
alpha add 全文搜索
Merge [#69767] shp2psql solved test error
Correction nom pièce jointe
Attempt to use stubs
corretto commento!
Add .gitconfig and .ssh/config
Update to use sort parameter
Added PSD version of hero BG.
Changed help e-mail address to help@diskusagereports.com
adding fork-me flag, and a dribbble shot html
Local RavenDB server editable
Injecting dependency in employee

//TODO update binding in order to use Newtonsoft (to get current calculator from javascript)

//TODO: call this on add or remove items to vacations
Changes EmployeeController (related to script)

* Post action is updating an existing model in place of store
* On create a new employee ScriptVacationsCalculator is set
* Return HttpNotFound in Post and Delete actions when id is not found
Make ScriptVacationsCalculator lazy
Set ScriptVacationsCalculator for all employees
Set sortedBy parameter requiered in DoInResults migration helper
Force to set Vacations employee field to update vacations
Simulador casi terminado
print out Harry Potter title info, added node-netflix directly to project dir: https://github.com/petreboy14/node-netflix so I can modify it
.jar toimii
MAJ SVN -> git de julien :)
[ADD/MOD] Flottes: WIP

Signed-off-by: Benjamin Crosnier <bcrosnier@intechinfo.fr>
Re-added '--owner' option to VMCreate event for LB
pre_ + srpm + rpm + deb + deb-src + etics targets updated.
manager for imports
manager for annotation
support for the types BigDecimal, BigInteger, Date, LocalDate, LocalTime, LocalDateTime and relationship many-to-one
changes in the templates to support news types and relationship many-to-one
adding dependency joda-time-hibernate
merge manager for annotation
refactoring manager for import
merge suport for annotation
merge support for the types BigDecimal, BigInteger, Date, LocalDate, LocalTime, LocalDateTime and relationship many-to-one
merge changes in the templates to support news types and relationship many-to-one
merge adding dependency joda-time-hibernate
merged pull request about types
removed joda-time attributes and dependencies. was maintained date and references types. 100% specs :)
changed project name created in objectify model generator. this ensures tests passing. Esquisito.
Merge pull request #83 from armoucar/references

new types on model scaffold.
added support for firefox
cleanup
Merge pull request #1 from DanielRuf/master

added support for firefox
Added a URL for temporary access to our old preservation planning page.
bug fix ProductModel
Contacts stored in Contacts application
mUITO MAIS MANEIRO
Functional/TestCase: support for phpunit 3.6+
Merge pull request #1 from Svel/phpunit-3.6

Functional/TestCase: support for phpunit 3.6+
Remove unused vars/comments
Add default category functionality
Add default radio option to new category

Still not hooked up
trigger experiment
debugging step 1
Use the cucumber-rails2 gem from RubyGems
Merge pull request #591 from Vanuan/cucumber_rails_gem

Use the cucumber-rails2 gem from RubyGems
updated per issue #44

added filter to allow deletion of image instead of just meta
child core script as constant
doing the enable correctly
Fixed manifest to include static files
Add better color for a comma in ruby.
Added localAddress for request object
Commit the unsved file in Eclipse.  tabs to spaces
Set the localAddress more consistently
Fix for #81 Upgrade to Netty 3.4.0.Final
Fix for #79 Why is the WebSocket-Version hardcoded?
Fix for #82 [websocket] Wrong origin header ("Sec-WebSocket-Origin")
Merge branch 'master' of https://github.com/taer/async-http-client into taer-master
Merge branch 'taer-master'
Cosmetic, re-arrange the last patch
Shield AHC from Netty 3.4.0.Final new behavior. I will rollback to 3.3.1 for the 1.7.3 release to make sure no regression gets in, but just in case someone is using 3.4.0.Final, at least shield from that chnages
Rollback fix for #81
Use a String to avoid missing class
Fix build
Integrate Grizzly 2.2.5 to resolve #82.
[maven-release-plugin] prepare release async-http-client-1.7.3
[maven-release-plugin] prepare for next development iteration
Incremental fix for #84 [websocket] Allow removing listener
Incremental fix for #84. Add equals/hashcode for listener adapter.
CMake sure listeners are cleaned after events are pushed
Fix for #85 AsyncHttpClient should allow asynchronous close operation
Changed sidebar to use the striped background for the entire table view in order to match the design. Tweaked the current cell background to just have the border and a 50% mask when selected in order to darken the cell. And added an easter egg to the table view header :) Maybe we should put the "code is poetry" logo there?

git-svn-id: http://ios.svn.wordpress.org/trunk@2902 7d847f7c-ffe1-4a24-85be-b788d016d96a
Added a boolean to keep track if the welcome screen is being run for the initial setup so that the navigation bar won't show up if you sign in and then back out to the first welcome screen. Fixes #1272

git-svn-id: http://ios.svn.wordpress.org/trunk@3297 7d847f7c-ffe1-4a24-85be-b788d016d96a
Fixes #1279. Done button uses primary style.

git-svn-id: http://ios.svn.wordpress.org/trunk@3298 7d847f7c-ffe1-4a24-85be-b788d016d96a
This is a quick and dirty patch for #1257. Need to investigate more on this.

git-svn-id: http://ios.svn.wordpress.org/trunk@3299 7d847f7c-ffe1-4a24-85be-b788d016d96a
Adds logging for GetSyncRegionUpdates
adjust README
force all Job option keys to symbols
Outsourced common panel to floors and engine panel. Use Rectangle calculation for bounds.
more fixes to web_plugins.rb that were already made in other recipe
small UI changes to ticket list
fixed template again
Updating node_modules

Not sure about the source of all these changes, they all happened when I
installed express 3.x.
Updating web.js with simple place data

Respond to simple requests for nearby places. Synchronously calls to
Google to ge
remove attribute for access_log_format
added rvmrc to easily manage environment setup for lessons
Fix bug with fullPath construction in updateRequest
Button system finished
Activation and deactivation of buttons added
FC-2662: fix bad merge

--HG--
extra : convert_revision : svn%3A8f7d33b6-1012-0410-9a5a-bb7ecce9c363/FC/trunk%4012233
FC-2649

--HG--
extra : convert_revision : svn%3A8f7d33b6-1012-0410-9a5a-bb7ecce9c363/FC/trunk%4012235
FC-999
- Changed bubble error message to text block display under admin title.

--HG--
extra : convert_revision : svn%3A8f7d33b6-1012-0410-9a5a-bb7ecce9c363/FC/trunk%4012237
Added convenient proxy method to get media uri from according Provider
execjs / rubyracer
jquery.specialevent.hammer.js delegate support

The current implementation does not support using delegated bindings in jQuery, example:
$('ul#root').on('tap','li a button',function(ev){}); // won't fire
This update adds a different method of triggering evens. This method is inherently slower than the current implementation, so a manager has also been added to automatically use the faster, original method over the new, slower, delegate-compatible method.
clean strings before sending thgem out
Merge branch 'master' of github.com:brandonprry/nexpose-sharp

Conflicts:
	NexposeReportingExample/Main.cs
Basically built most of the application. Still need to implement hymn viewer, but we're coming along.
Added todo.lisp which parses .org mode todolists and will eventually make alarms for scheduled tasks
Updated server page instructions to point at the root dir.
MetaBuild 1A399 - system_comparators1 update SWC dependencies
Ran jcaret through jslint
The init function seems to work w/ no arguments.
Got the init method working along with returning selected text.
Cleaned up some of the demo code
activate lang translator

Zavedení translatoru (knihovny Nette) do BasePresenteru a jeho defaultní
nastavení v `config.neon` + úprava hlavičky a defaultního nastavení
`layout.latte`... všechny změny jsou zatím konstrukční a proto nejsou v
žádné vývojové větvy.
ReadMe update

Tak tady ten commit moc nechápu, nevidím žádnou změnu, ale můj Git
klient se tváří, že to commitnout musím. Že by kolize mezi Git klientem
na Windows 7 a NetBeans (resp. jeho Git servisem)?
增加了一些数据库操作，将离线地图信息更新到数据中
added the ability to import a title for a company contact
Properly report zero weight for categories not included in the calculation rule
Merge branch 'master' of https://github.com/burke-software/django-sis
bayeux-emitter is no longer in use
Created a proof of concept of the multiselect list
changed css to compass
cleaning up README... again
Added kotlin
Corrected spelling error in t/telephone comment
Added MATLAB
Added Mathematica
Don't encourage bad C++ style.
changed name
Merge remote-tracking branch 'nitish/master'
cleanup after merge with nitish
Merge remote-tracking branch 'daknok/patch-1'
Merge remote-tracking branch 'rwzehner/master'
Merge remote-tracking branch 'simi/kotlin'
Make use of Java Conventions
Real name is better name
Added Typoscript
Merge remote-tracking branch 'faisalman/master'
c# over csharp
Fix broken link. Closes #580
bump to 2.9.0.rc1
don't forget rake
bump to 2.9.0.rc2
Merge branch 'master' into issue-126
Adding append_after, prepend_after, changes to after hooks storage and run method
Added MapQuest support. Revamped code to allow quick swap between Google and MapQuest if need be.
Holacarol testing
Merge branch 'master' of git://github.com/carolgarcia/places_mobile
tweak to make sure the cells line up as expected;
Merge pull request #1811 from cb1kenobi/master

Mobile Web Ti.Map icons in wrong folder
some trending logic
readme up
merge readme
fix conflict
Changed all userIDs in create.sql to strings instead of ints
change chrome extensions link text to the actual url
First Implementation.
Prototype accounts backend QML interfaces

Consists of:
1) new QML models (accounts, account providers)
2) lightweight adapters to libaccounts-qt (account, serviceaccount,
   accountmanager, service, provider, authdata) for QML.
3) lightweight adapters ot libsignon-qt (identity,
   serviceaccountidentity, identitymanager, authsession and
   sessiondata) for QML.

Note that account-model.cpp / account-model.h, and
account-provider-model.cpp / account-provider-model.h
were taken from qmlaccounts-ui project (nemo), and
modified slightly to be more useful in QML.
Removed last reference to ICon

ICon was phased out to put constants in more semantically relevant
classes.  Thsi is a personal preference.
CJ - Forgot to commit this line.
performed topic modeling on everything
Support for seconds and weeks, some cleanup, added licens and readme.
Added Usage comment to the ecl-pages.lisp. test-grid-data:read-db is exported from the package.
Merge branch 'dev'
fix diseño en ABM comentarios
groovy + mysql
banner: link al inicio
Call "monitor" method of the callback object at first, even if it is a function
Initialize platform specific prefs in clSystem.js
Remove initialization logic for platform specific prefs from SystemMonitorManager
Remove SystemMonitorManager and unify its features to SystemMonitorItem classes
Disable code for debugging
Don't show permission popup for local files (workaround for #9)
Migrate preferences automatically
submodule bump for release 10

Ferran Rodenas (3):
      Fixed cli terminal size calculation when not invoked via tty
      Add openstack bat template
      Merge "Add openstack bat template"

Glenn Oppegard (4):
      bat deployment parallelism test
      Merge "bat deployment parallelism test"
      bat vms test & cleanup drain test
      Merge "bat vms test & cleanup drain test"

Martin Englund (19):
      use compatible gem versions
      bat refactor
      Merge "bat refactor"
      deployer should use err() to raise exceptions
      deployer version 1.0.1
      Merge "use compatible gem versions"
      Merge "deployer should use err() to raise exceptions"
      Merge "deployer version 1.0.1"
      update aws template
      Merge "update aws template"
      dns updates for director
      add powerdns to deployer services
      Merge "dns updates for director"
      Merge "add powerdns to deployer services"
      select subset of octets before reversing them
      micro bosh stemcell 0.6.7
      full_target_name replaced by target in cli 1.0
      Merge "micro bosh stemcell 0.6.7"
      Merge "select subset of octets before reversing them"

Matthew M. Boedicker (4):
      Tell the user about the --force option.
      Add console-data to MCF packages.
      Merge "Tell the user about the --force option."
      Merge "Add console-data to MCF packages."

mihaibuzgau (2):
      increased rubygems version from 1.3.7 to 1.7.2 (same version as the director)
      Merge "increased rubygems version from 1.3.7 to 1.7.2 (same version as the director)"

skaar (4):
      stemcell: aws/openstack-0.6.7
      encryption: constant time hmac comparison
      Merge "stemcell: aws/openstack-0.6.7"
      Merge "encryption: constant time hmac comparison"

stefan.schneider (2):
      fix default config in deployer for the new vsphere_cpi
      Merge "fix default config in deployer for the new vsphere_cpi"

Change-Id: I3b92ec92d01f4ae8ee1cf92846ae3a40ee57f094
bosh release 10

Changes:

director: reverse DNS support

Change-Id: I86d2b034a19961d5cad03a62672bba3af87ea799
Removing version from SERVICE_DRIVER_HASH and searching for base name of db

- Adding java_web_spec test method for new db versions

Change-Id: I3235782afe8756da48323a50f7299546f58b96cf
Merge "Removing version from SERVICE_DRIVER_HASH and searching for base name of db"
Merge commit 'af8b463c0474b79553536bcf71e24eb0790d2b5e' into dup

Change-Id: Iec2622b91438d95e1b32f3a397c9072086f169f2
Refines project like
4th commit
Merge branch 'master' of github.com:cmpe297webcrawler/project
Merge branch 'master' of https://github.com/codati/INSSETAirlines_GR2.git
Merge branch 'master' of https://github.com/codati/INSSETAirlines_GR2.git
fix signature generation and verification, fix JDBCDAO, upgrade sqlite driver, add junit, separate ant clean_* targets for test and app
去掉check style
1.4.5 b3
Fix really weird extremely retarded thing (thanks Falkreon!)
slight update to percentage bar, will add more to damage numbers soon

Signed-off-by: Collins <cobinwa89@gmail.com>
some dialogue for game, will add more soon. Need to appropriately add it to the game

Signed-off-by: Collins <cobinwa89@gmail.com>
change the redir to use request/url to avoid view name hardcoding
Turn on other stuff
Redirect Back Work Route Fix
add GameManager
change things up a bit
New color for tabs
zzzdf
Merge branch 'master' of https://github.com/cozos/GoodbyeKitty_Master

Conflicts:
	GoodbyeKitty.html
Add copy-from-phrase-to-phrase-as-tagged-dashrep-code action
Add copy-from-phrase-to-phrase-and-replace-html-reserved-characters action
Fix new action "numeric-minus"
Allow coder to specify replacement used when action cannot be translated
Pretty bandwidth :D
[INDENT]
[BUG] Remove id from NakedData
Fix Event validate extend logic ;)

May be misprints.
Merge pull request #2 from pahaz/patch-1

misprints
update to wordpress 3.4.1
Secondo update Working
Some updates to schools.jsp
removed maven-jar-plugin version