labofsahil/github-event-dataset-2012 huggingface dataset:
Add twitter info plugin. Still needs some work -- when it should delete
itself (for instance if you disable the plugin and re-enable) it doesn't
seem to, leading to twitter complaining about duplicate statuses. Also
get a message about creating children for parent in different thread.

Along the way, made lastfm plugin correctly switch to the right thread
for the info plugin, fix a couple bugs (such as loving and unloving
using the same type), and so on.

Need to fix up xmpp info plugin to use the correct thread as well.

Also, right now tweets indiscriminately when you love, should turn that
off before merging to master.
This should hopefully get rid of the messages about parent being in the wrong thread
Get rid of double-additions of info plugins. Still not sure why it doesn't seem to delete itself.
More work towards cleaning up and making safer the info plugins. Twitter should be pretty good, but need to make lastfm and xmpp use the same paradigm
Remove album from love action
Make lastfm/xmpp info plugins more robust
Convert sip plugin to a weak pointer so we can check its validity before running invokeMethod on it
Move Jreen bits in xmpp info plugin to the SIP side, allowing the plugin to run in the correct thread.
Maybe fix cover temp file writing
Merge remote-tracking branch 'origin/master' into twitterinfo
Make now-playing FDO notifications reuse, and fix a logic bug in audioengine that would cause missed notifictions
New social share icon in now playing controls
Use returned notification ID instead of static version. Thanks to David Rosca <nowrep@gmail.com> for the fix
Fixed position of context menu in ArtistView and TrackView
- using viewport()->mapToGlobal() as QTreeView is subclass of
  QAbstractScrollArea
Merge pull request #85 from nowrep/master

Fixed position of context menu in ArtistView and TrackView
Somehow, who knows how, passing a QImage to the FDO notification spec
crashes some X servers, but saving the QImage to a file as a PNG,
loading it back from the file as a PNG, and passing that QImage is
totally cool. Wut.
Merge branch 'twitterinfo'
Add New Releases icon for sidebar
Update charts info plugin to use the new API

This changes from the /source/billboard/chart/top100 style of uri
resource naming to /charts/billboard/top100. The server side changes
have been live for several weeks.
Implement New Releases info plugin

Heavily based off existing charts info plugin, refactoring and consolidating
can be done later.
* This is explicitly WIP: Added Latest Additions & Recently Played nodes.
Added multiagent base code
Function to eat all the food avoiding ghosts
Now better and faster?
DevicePolicy: Fix lockNow() failing to turn off screen
A fix introduced in 93c518e
causes lockNow() to sometimes (most of the time) fail to turn
off the screen. The screen will turn off, but then immediately turn
on showing the lock screen.

This is caused by getWindowManager().lockNow() call which calls the
method to lock the screen, which the PowerManager service also
call in parallel, leading to a race condition.

The fix is to only call getWindowManager().lockNow() if the screen
is not on.

Change-Id: I235c0f34d5cc15268d569e18e025a87330deced7
[pawitp]
merge "move weather images to framework-res"

- decreases size of systemui
- allows for access throughout the system without
      duplication

Change-Id: I06e90d39d365587ee15bf1b566ec81b39f79d3b0
update maguro build apn's
subtree merge ant build
Fix template error
Bump version number
Merge branch 'release/0.1.1' into develop
improve roles constraint
remove instance.mediaType override, make mediaType method public and overridable
Merge pull request #7 from tstmedia/open-mediatype

open controller mediaType to be overriden
updated README whilst a work in progress
removed duplicate devise stuff from user
Add 2 more resumes
ensime-maven-plugin-0.0.1
sbt presentation redux
added bool ofWindow::isKeyPressed()
add products app
add products app
Remove products app
Add products app
Add apps module
Merge branch 'develop' of https://github.com/undertheladder/startuper into develop
Remove old products app
Update requirements with south
Add product model
Add local settings and apps to settings file
Add migrations for product app
Merge branch 'develop'
Added embedded datadefs
Merge branch 'master' of git://github.com/uwcms/FinalStateAnalysis
rename visibleBounds -> visibleBoundRect, since former apparently was flagged wrongly as private API.
Add PSUICollectionViewDelegateFlowLayout declaration (by valdyr, Issue #115)
fix minor errors
Merge pull request #116 from ShonFrazier/master

minor README edits
Flow layout contentSize computation improvements.

- fixes premature cell removal when alwaysBounce* is enabled #117
fix unused variable warning

ifdef the whole loop in NS_BLOCK_ASSERTIONS
to prevent an unused variable warning.
Merge pull request #118 from diederich/develop

fix unused variable warning
Merged
Bug fixed. Novo exemplo add
gem rename to blacksmit-js
Resize Basics
Handling of tmp fitness_file by the DumbEvaluator
removed a config method
Machine Translation!
Forgot to upload jquery.couch.js to cloud ant, now there are no issues
New Structure with Rides and such
Site updated at 2012-10-15 15:40:57 UTC
Site updated at 2012-11-29 17:33:49 UTC
Site updated at 2012-12-01 01:41:49 UTC
Replace Listener to Manager
Changes
Committed some losting file
vm as an artifact and sources
Simplify method finished.

Sort, combine like terms finished.
mario moves and jumps
Latest hg pull: 13 Aug 12
Refactor home, show user, and following/followers views to use shared partial for user info.
Refactor to use respond_with in RelationshipsController
Fix help formatting
Ignore tags
- add failure form.
-Add a close form
- No verified procedure.
- change to H2DS in persistence.
- second edit the forms related to verify form.
- closed model added.
- version 1.0.2 stable
piccola modifica in minutes.php
Check actual configured paths, fix typo in comment.
images: Build 201211040349 of webos 1.0 for machine tuna on borabora
packages: Build 201211040349 of webos 1.0 for machine tuna on borabora
fix and test automatic loaders
updates

added bootstrap functionality to menu builder
new updates :)
Start refactor of the coverage build script
Refactor of the perf build script & linting files
linting files
Adds a statistic varialbe for range request.
Adds a statistic variable for bad format range.
wescamp_client: automatic update of addon 'Brave_Wings'
Path Prefix Fix and Future Support for Domains in Install Profile or Drush via Params as per #27
Merge pull request #127 from sylus/master

Path Prefix Fix and Future Support for Domains in Install Profile or Drush via Params as per #27
Branch test
Merge back to master test
Merge branch 'master' of https://github.com/wfsolutions/Architecture.git

Conflicts:
	HelloWorld/src/HelloWorld.java
switched off production ssl
Add support for devices (mobile, table, desktop)
Add Mobile_Detect class
Remove redundant code, re-order mobile detect
Create model directly
Create model directly
Re-order config
Merge branch 'master' of github.com:widgetfactory/jce-editor into 2.3
Merge branch 'master' of github.com:widgetfactory/jce-editor into 2.3
Add border-spacing to prevent admin template style creep
Add script using addCustomTag
Load mobile class with include_once
Use width() and height() instead of outerWidth() and outerHeight() ??
Use width() and height() instead of outerWidth() and outerHeight() ??
Add .wf-tooltip styles
Add all?
Revert to using outerWidth etc.
Update JQuery and JQuery UI
Set default device value
Delete old JQuery libraries
Add tips body styling
Localisation updates from http://translatewiki.net.

Change-Id: I934fc8141bcd2d6f7683f55862286f0d9341c69a
Suppress warnings around unlink call

Attempt to shut a lot of noise in production logs

e.g.
1 Warning:  unlink(/mnt/thumbs2/wikipedia/commons/thumb/f/f2/Members_only_jacket.jpg/800px-Members_only_jacket.jpg) [<a href='function.unlink'>function.unlink</a>]: No such file or directory in /usr/lo
cal/apache/common-local/php-1.21wmf6/includes/filebackend/FSFileBackend.php on line 422

Change-Id: I9e1407c4b11301f468f8e291105955ade9a731d0
Fix doc/hooks.txt for EditPage::showStandardInputs:options

The documentation added for this hook in Ic5d35c8e missed one of the
parameters.

Change-Id: I935dac942679d999658fa9fe367db81df33edbfd
Merge "Fix doc/hooks.txt for EditPage::showStandardInputs:options"
Update ArticleFeedbackv5 to master

Change-Id: I688662ecce8be8c383e1d881af21aa6ef8d05f9a
remove .gitignore, add README.md
Initial commit of bacula server plugin based on transmission
Changes in IDEA workspace
Small refactoring: moved all the classes under the same package; renamed classes and Module name
add 分页

add 分页及最新发表文章功能
Support both value and time downsamplers limiting in API.
books_v3 for spring project
Improved Script Stability

onStart Method.
tag bundle
添加账号检测、地理位置上传及查询接口
added search, before test
word-problems: shuffle the arrays incrementally

Before, it was impossible to add new word problem categories or even to
add to lists within a particular category without wrecking all the seeds
for every exercise that uses word-problems. This changeset will
unfortunately break all the seeds once but should fix it for the eternal
future thereafter.
Oops, var
Not enough Bens
Merge pull request #22528 from Khan/incremental-shuffle

word-problems: shuffle the arrays incrementally
Added: Converse, inverse, and contrapositive

closes #18792
CI样例学习

增加一个Model与Controller，学习如何使用Model与Controller
数据库插入操作

可直接插入数据到数据库中
增加多表关联视图

在数据库中做多表关联视图，然后用CI的Model来获取该视图的数据
测试多表插入的操作

用CI的方法可以非常简单地进行多表插入操作
加了些横屏卷轴键盘/镜头类
added support for inline javascript
methods
fix spell
Merge branch 'master' of github.com:yoshi49535/RockOnSymfony into 0.1-RC
Site updated at 2012-04-08 10:51:50 UTC
realign, neighbours, megplanar, RMS
Added small welcome message
Replace the validaton error template

This chage also reorganizes the views folder to match Minion's.
factor out *nbhash*
want to translate upgrading ruby on rails
Fixed ShowDialogGUI
再次更新配置！
corrected gui condition
edit size.
change layout strategy !
change layout to floor base design ! one floor for one section !
sections background is cause of this commit.
added '&' between parameters in query string
Merge pull request #242 from minorblend/master

added '&' between parameters in a query string
add ru translation
add translate
Merge pull request #179 from slimus/master

I added the russian translation
Revert "intento fallido"

This reverts commit ad9071bb245b1b0068620fbf87047f7681713de2.
funcionan cuadruplos

checando hacia atras si el valor de variables existe en la tabla de
variables locales (faltan globales)(backcheck local no global)
Nuget Updates
Updated Version Number
Animationplayer is theoretically done (untested)
MINOR fix in bone and keyframe
LPS-25804
LPS-25804
LPS-25804
LPS-25804
LPS-25804 Test formatting
Test Fixes - portal/login
Test Fixes - stagingcommunity/assetpublisher
Test Fixes - stagingcommunity/documentlibrary
Test Fixes - stagingcommunity/sites
Test Fixes - stagingcommunity/webcontentdisplay
Test Fixes - portlet/breadcrumb
Test Fixes - portlet/managepages
Test Fixes - portlet/sitemap
Test Fixes - portlet/directory
Test Fixes - portlet/documentlibrary
Test Fixes - portlet/messageboards
Test Fixes - portlet/pollsdisplay
Test Fixes - portlet/shopping
Test Fixes - portal/permissions/announcements
Test Fixes - portal/permissions/blogs
Use osfamily rather than operatingsystem.
Merge pull request #125 from traylenator/osfamily

Use osfamily rather than operatingsystem.
nokkrar breyting
WMD1 on beams for mangonel family howitzers
typo in helepolis config (average shot position starboard by half a degree)
Tweaked Tesla plasma spray velocity for better visual effect
fixed Makayev tag on omni ballista (should be NAMI)
Mms: add new QuickReply buttons Delete & Mark Read

Patch Set 1:
 + new menu option in QuickReply to delete the thread
 + the char counter in quick reply is now shows
   number of charaters left in message
 - fixed call to @Depreciated method
Patch Set 2:
 * now requires http://gerrit.sudoservers.com/4603
 + added two new options 'Mark Read' & 'Delete Thread'
 + buttons shown is now configurable
 + fixed notification not being marked as read on delete
Patch Set 3:
 + fixed showing buttons not showing as user specified
 / wip deleting only the latest notification may be
     a pain... I removed the delete entire thread
     but delete only last message is not working correctly
     yet
Patch Set 4:
 / clean up
Patch Set 5:
 + fixed Notification cache collision problem
 + lots of refactoring
 + changed 'Mark Read' icon but we may want to
   supply our own later.
Patch Set 6:
 + refactored out redundant code block

Change-Id: I55cae38e65f565af4e9edc86176e231ab043ff71

Conflicts:

	src/com/android/mms/transaction/MessagingNotification.java
	src/com/android/mms/ui/QuickReply.java
comments added in chapter 1 by nicole
that must be a bit more correct, i think
added new assembled timer-igniter assembly and added that to default chem-grenades
Adjustable timer for default grenades
Merge pull request #1861 from AterIgnis/detonators

Detonators
halved species-unfitting damage, made cramp damage actually stick to max 10 + lowered accum rate

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
increased cramp interval, removed damage chance

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Conflicts:
	code/modules/clothing/suits/suit_cramp.dm
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
removed silly comments

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
readd ssd sleep

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
reduced alien infestation random event chance, down to less than 1% every five minutes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
made invisimin change the mob sprite

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme

Conflicts:
	baystation12.dme

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
fixed alien whitelist (wasn't being loaded at round start), removed myself from admins

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
made helmets etc properly hide hair

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
dme fixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #1858 from caelaislinn/bs12_with_tgport

Miscellaneous things
Added MadMaliceMcCrea to moderators.
Runtime fix
Merge pull request #1568 from SkyMarshal/BugFixes

Runtime fix
- Ported ISaidNo's artifact code. Will look into adding xenoarchaelogy [anomaly] base near RnD at some point.
- Modified dme.
- Modified changelog.

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
minor updates

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
missing icon file

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
revert unintentional changes

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge pull request #1309 from caelaislinn/master

ported ISaidNo / oldcode artifacts (no research yet)
"Hidden" HE pipes added. HE piping in the kitchen cold room allows a freezer unit just outside the cold room to lower the room's temperature. A human inside the cold room with the temperature set to minimum will typically expire within a few minutes.
Revert ""Hidden" HE pipes added. HE piping in the kitchen cold room allows a freezer unit just outside the cold room to lower the room's temperature. A human inside the cold room with the temperature set to minimum will typically expire within a few minutes."

This reverts commit e924aa8fc3b645b4cf15cc1f5d7bac9875d3902d.
wrapsortjunction fixed - will now divert packages correctly.

Mail chute changed a bit, as ejected packages were smashing the window door.

"Small parcel" renamed to "Parcel".
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Make setblock able to handle block index 0

It will simply do nothing. Fixes issue #2049
Fixes issue #2032

The proc to get zlevel map files used lowertext on the filename. That is bad, for obvious reasons(breaks uppercase paths on linux).
Merge pull request #2073 from CIB/bugfix

Make setblock able to handle block index 0
Fixed design name of telecomm circuit design

Was mislabeled, fixed!
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge pull request #2076 from GauHelldragon/master

Telecomm Server circuit label fix
Merge branch 'master' of https://github.com/Baystation12/Baystation12
reverting map
Remade the map edits with mapmerge driver.
Merge pull request #2069 from RavingManiac/master

Mailing bugfixes and tweaks
A small fix to the throwing string when a mob is struck with a baton.
Merge pull request #2082 from Zuhayr/master

Fix for stun baton throwing message.
Merge branch 'master' of github.com:Baystation12/Baystation12 into feature
Added a mechanic that makes it possible to miss in melee.

Only happens when the target is neither laying nor restrained. In this case, there are various chances to miss the targetted organ, and either hit nothing, or a different organ.
Bullets can now also miss, even after entering the same tile.

This means that aiming for the head with a gun only makes sense from a short distance or when the target is restrained. Otherwise, you're likely to miss unless aiming for the chest.
Fixed two issues with bullet hit chance.

- Bullet hit chance was too low at close distance
- Missing wouldn't actually prevent the damage
N3399
Added hook to allow images to be moved
Make SerialParam a singleton class
Add new BiocParallelParam class that uses foreach & %dopar%
minor changes to contributed patch

- return() is a function
- less nesting of function calls
- use explicit generic rather than callGeneric, for clarity
Fixed spelling/grammar mistakes

Eg. "Video Verlauf" -> "Videoverlauf"
Fixed translation
Fixed translation
Fixed translation
Added missing string from chinese XML
Updated SConstruct to allow custom Thrust installations.
changed view_layout_application folder
More API Testing

Much better formatting, still work in progress. Cant find the edition
number return.
Create GLOBALS.h
Removed killjavabridge project
More regex

Excluding and escaping characters
adding a blank passport_m.png file to serve as the summary background
601 - Admin Moderating Contribution May Add Link to Contribution.
453 - User default Avatar is not showing when displayed on a widget
chenck
added delegatehandler
mkvendor.sh: fixes for Android 4.2.

Change-Id: Id7ff9ef03700d595734811ccf868371ffb024384
roomservice.py: Verbose error when a branch is missing.
Also add ROOMSERVICE_BRANCHES environment variable to use fallback branches.

Change-Id: I3c2b1d79fc185c1f1e1d658e5ca4f78e688780e2
VM tweaks (testing)
removed webgl demo, merged play/pause buttons, removed dom.* dependencies
Fix to http://jira.diamond.ac.uk/browse/DAWNSCI-81
Fix to http://jira.diamond.ac.uk/browse/SCI-80
Added trim to ProcessTransformer's output variable.
Fix to first workflow cheat sheet.
Fix to maths and if cheat sheets.
Fix to cheat sheet text
Fix to http://jira.diamond.ac.uk/browse/DAWNSCI-102
Fix to http://jira.diamond.ac.uk/browse/DAWNSCI-85
Fix to http://jira.diamond.ac.uk/browse/DAWNSCI-125
Fix to http://jira.diamond.ac.uk/browse/DAWNSCI-94
Attempted fix to recent NullPointerException seen with some workflows.
ADMIN: add .gitnore
Fix for DAWNSCI-101
Added fix for DataExportTransformer which was always renaming to have 1
in the file name for Thomas' workflow.
Clean up script creation by Python actor
Changed the level of log messages for 'ChannelHandler' from info to debug
Changed level of log message in case of exception from info to debug
Added log info message when setting the scalar value
Added info log message
Forced counter to be integer, added info log message
gdl title bug fixed
o align cover art box and description box in vertical center
Begin update 3 of libcvautomation version 1.4
Freelancer association
updated gateway url
mountlist_exists(): use a TAILQ_FOREACH macro again

Removing a few lines of code in the process.
Import OpenSSL-1.0.1c.

  o Fix TLS/DTLS record length checking bug CVE-2012-2333
Merge branch 'vendor/OPENSSL'
Update files for OpenSSL-1.0.1c import.
Updated Makefile to work from root directory
Updated .gitignore
populate site geometry fields with points from existing lat/lon field values on migrate
Updating reports to use caching and report value integrity
Added real github link
Added BUILDID querystring to two more scripts
Datasources are now event based. They trigger an event when they have new messages. The Twitter datasource now uses the since_id to take advantage of this.
Twitter button!
Final Version

Tested
Updated Readme, deleted JSON stuff
Prevent stacking from ELEC+NEUT, ELEC+water, and CO2 from BUBW

Also conserve number of particles when CO2 from BUBW is absorbed by
water, and when splitting water into H2+O2 using ELEC.
use kill_part when creating a new particle over an index, fixes STKM not respawning after CONV and probably other stuff too
omniauth and user features added
another meta tag change
Fixed gitignore for all private plugins.
Updated default theme's poster data structure.
Updated default theme CSS and version.
merging master
Fixed magma spawn and impaler targeting issue.
Addition of getPercentageActiveAccounts() and toString()
Bug correction : Services methods never returns null
Implementation of services methods
Addition of the total entry
Display of the global statistics
Unified ClientTools Packaging for OSX, Linux and Windows.
Changed default install location for ClientTools (???/HPCCSystems/3.8.0/clienttools)
Added third party dlls to windows + OSX install.
Removed invalid dependencies from DFU Plus
Removed OSSDIR from child projects and appended it to
CMAKE_INSTALL_PREFIX as needed.
Required folders now calculated relative to eclcc.
Include examples.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
converting to phonegap 1.6
Big cleanup and compile agains 1.5

Added emerald block revive and a much better autorevive function
Control events
Removed the original installation guide.  (Now in the readme)
Added better user feed link; because authorname != username, also disabled ssl on default and added userId method
Implemented HTTPSConnection check to use external curl only if necessary. Some cleanup and debug messages for login procedure.
Added official bukkit repo and updated bukkit dependency to latest snapshot
a few more updates-not done yet, though
Don't auto patch on import. Allow the user to specify the local builder (in case they want to use a gevent local or somesuch)
Timers done but not tested
changed custom layouts to panel layouts, updated info file
simplify cp command
[Build] Tried fix of the process of creating the compressed resource file
Merge pull request #25 from mkaring/master

Fixes in build system
[Mapeditor] New opened maps are now automatically selected.
[Mapeditor] Fixed open multiple maps at once.
[Mapeditor] Fixed build error
Merge pull request #35 from Tiim/master

Fixed build
browse page mod'd for tablets, experimental changes to demo still not committed
res
Merge branch 'Andy' of https://darklazar@github.com/JWengert/jw-asteroids-454.git into Tyler3
screen appropriate
Added ZjifApiController.
Space leading to something not being a header
Moved lifestyle tests closer to implementations.
Added minimum size for Serial Port dock.
Set graphs to only poll last hour
Comparator added to dataManager
Merge branch 'develop' of https://github.com/JugadorNumero12/SimuMatch into develop
qsd8k hack magic (by @rapmv78), native part
(refs #3118,BP from #2585) fixed not to login rejected member using automatic login cookie (from patch)
FindReplace.waitForeditor, not window.waitforEditor
Basic regex support
Update auf V 0.1
improved wiring
Checkout out v1.0.0 of upstream puppet-hiera
Fix command git remote in THIRDPARTY docs
We no longer need the type copy stuff since the new way of including upstream
Updated the readme a bit
README is markdown format after all
Improve the Modulefile a bit here and there
Version bump to 1.0.0 matching upstream
Merge branch 'release/1.0.0'
Merge pull request #4 from UnifiedPost/master

This merge will update (upstream) hiera to v1.0.0
Seat picker draft
Merge branch 'master' of github.com:LanRavageur/wp-lan-plugin
WIP: query languages
minor updates.
Fixing LineItem Data to accept more than 9 entries.
Merge branch 'master' of https://arch85@github.com/LitleCo/litle-sdk-for-php.git
getting rid of lively.lang.Namespace
Tweak BENCH1
WRFL prints more info into the log
Yep.
Merge branch 'master' of https://github.com/Longhorns747/Team-Awesome.git
Merge branch 'master' into UniverseMaker
Universe set up
Added Keychain package, tests, documentation and command-line management
utility.
Update version to 12.3.
New function: JDatabaseQuery:format() - a sprintf-like function for building queries or query fragments
Correct a class name JLoggerCallback => JLogLoggerCallback

I believe the class name is wrong.
Fix unit tests due to class renaming

JLoggerCallback => JLogLoggerCallback
Fix unit tests class names

JLoggerCallback => JLogLoggerCallback
JLoggerCallbackInspector => JLogLoggerCallbackInspector
JLoggerCallbackTestHelper => JLogLoggerCallbackTestHelper
jLoggerCallbackTestHelperFunction => jLogLoggerCallbackTestHelperFunction
Merge pull request #1627 from elkuku/patch-5

Correct a class name JLoggerCallback => JLogLoggerCallback
Added composite primary key support to JTable.
Merge pull request #1606 from ianmacl/jtable

Added composite primary key support to JTable.
fix bug on stream transport http layer when headers are sub array of wrapper data
Made time based test more forgiving.
Merge pull request #1631 from ianmacl/oauth_test_fix

Made time based test more forgiving.
Add hooks object for JGithub
Merge pull request #1630 from mbabker/githubHooks

Add hooks object for JGithub
Adding JMail::IsHTML and have it return  for chaining. Includes tests.
renaming to JMail::isHtml
Fixed an issue in JApplicationWeb where the web app can generate a media URI with two lashes.
Merge pull request #1634 from robschley/master

Fixed an issue in JApplicationWeb where the web app can generate a media URI with two lashes.
Fix code style
Merge pull request #1635 from elkuku/sniff-fixes

Fix code style
added auth for creating and editing games/patches
Pre test push
Fixed ajax query not working on 'show' view
Renamed Project, fixed a few things

Full Changelog for v1.1 is on the Bukkit Page.
Better plan, use app.load_resource().
Fix spawn-fcgi starting on first install. Rename sysconfig script.
Make response generator case insensitive. #2637
Add method to get pregnancy screening instrument. #2637
Add screen participant button to root view controller. #2637
Pre-populate capi in screener.
Set defaults on initiate contact screen.
Update contact date attribute in test data.
modify requirements.py to use tarfiles in vendor/cache
cleanup some old imports
Improved the integrity of Symbols by using functonal coding style rather than built-in methods.
Updated to use more Pythonic api with add_cell() etc. in place of addCell()
Updated examples to reflect this
Changed again, want to see git history
correción en cuotas semanales de 48 a 52 semanas
Added html document
1.3.0 - Added support for checkboxes

Checkboxes are now supported!

Signed-off-by: OMGCarlos <me@omgcarlos.com>
BACKLOG-614: additional null-check
Maven (m2e) updated classpath
Updated standard theme CSS to match OpenID pages
Trying to use RoSe framework to handle binding and reconfiguration
logic error fix
Able to check HTTP response code for each request
Add it the model, view and controller of Albums
Install SimpleForm
Merge branch 'master' into 1-CreateAlbums
Change it de form to the simple_form syntax
Typecasting and decleration fixes.  Resolves various Warning messages.
add the git rm command
Minor variable renames / corrections.

Corrected SQ01 check table deletion.

Started Stage 3 DV rewrite.
Filtering is a workin and a workin fine
Replaced bukkit 1.2.4 with 1.2.5
Core/Spells: Added holy power resource handling.
Core/Scripts: Moved broken dummy spell effect define to a spellscript.
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Added missing SQL file on last commit (again? >.<)
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
DB: Correction to a couple ScriptNames :s

Signed-off-by: Bootz <bootz@projectskyfire.org>
2012年9月2日23:36:35  提交
added field player settings
Added handling of game victory conditions and new game over state
Added French translations for GreaseMonkey and PIM plugins
updated store.query to match rdflib fixes
moved license info around, set release version
setup.py pypi tweaking
back to dev version
Call antenna functions and speakerEnabled in the fallback service
Remove some debug messages and set debug false
added sprites
merged with latest
support amazon instances for creating Connection
- reworked DevConsole.java (can now add parser to enhance flexibility)
- added InputParser.java (and interface for a parser attachable to the DevConsole)
- added URLInputParser.java and PropertyInputParser.java (parsing url and display as clickable link and parsing properties from settings)
- added progressbar theme
- made scrollbars faster by moving from area node to grid node (center is not bigger = fewer draws)
- Settings.java must now be able to return a Properties object holding all properties
changed an error in the .project file
durability dashboard
需要重构事件模块了
ENH: Fixed camera orientation issue (with registration)
Fixed issue with FunqValidatorFactory not working in ordinary MVC3 scenarios.
The issue was traced to using straight Resolve in the ContainerResolveCache.
When Resolve fails, it throws an exception, which in turn crashes MVC3 validation through the FunqValidatorFactory.
Instead of just wrapping the ContainerResolveCache.CreateInstance with a try catch to suppress the error, rather modified ContainerResolveCache to accomodate running in TryResolve mode as well as the existing Resolve mode.  Then used the TryResolve mode in FunqValidatorFactory.

Also renamed FunqValidatorBase.cs to now match the class it contains - i.e. FunqValidatorFactory
Merge pull request #126 from pauldbau/master

Fixed issue with FunqValidatorFactory (ServiceStack.FluentValidation) not working in ordinary MVC3 scenarios
Renamed IService for new service functionality to NService (New/Non-Generic) base
add place holder directory for future MonoDroid builds
Added events, ready for faye
removing some reliance on SQL
merging implementation-specific methods into one generic method that can be altered by forks without affecting Aurora-Sim.php
adapted to new Qt5 plugin architecture
Styling the popover
New handy SQL for assisting in making migrations that involve new Pages, Blocks, and/or Block Attributes
minor fix to avoid problems on systems that don't have access to the EventLog
Fix foreign keys on GroupTypeRole many-to-many table (it was backwards)
Packethandler:
* improve SQMPacketHandler method names
* move dataHandler to private section
+ add deviceUsageChanged event which will occurs if a device is add or removed to the PacketHandler

Server/Client:
* adapt server and client to packet handler changes
Added assoc array to fundamental 1 answers

Signed-off-by: Sprocket <duncan@sprocket.co.nz>
Add jeremyb and ben as users.
#1 Add more filenames
ChallAnge 27
adofijpsåädafgjo
Added support for KILL
fix SmartGit

- remove .DS_Store
1002: coding view Detail Cinemas

- CinemaDetailController, CinemaDetailView: show detail of specified cinema, include list movies that were showed in this cinema

- MoviesController: change variable to const (using #define)

- HJManagedImageV: edit code. change the way image show on view. Instead of 1 showing mode <UIViewContentModeScaleAspectFit>, we can set it by code via variable "imageContentMode"
1002: coding view Detail Cinemas (part 3)
fix error that was made by SmartGit
Merge branch '1002' into develop
fix_2002
-Disable scrollview of textview in tablecell
Merge branch 'fix_2002' into develop
31004: re-check coding style in Cinema's views and AppDelegate
Merge branch '31004' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	SGN_Movie_v2/iPhone/Controllers/Detail Cinema/CinemaDetailController.m
31001: coding view Session Times (part2)

- add pragma mark in code
- SGNCinemaMovieCell: view to show combo Cinema & Movie
- ShowtimesController & ShowtimesView: manage showing times for combo movie and cinema
Merge branch '31001' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	SGN_Movie_v2.xcodeproj/project.pbxproj
	SGN_Movie_v2.xcodeproj/project.xcworkspace/xcuserdata/vnicon.xcuserdatad/UserInterfaceState.xcuserstate
4038:Fix DetailMovie Screen
- Add reloadView to viewWillAppear
Merge remote-tracking branch 'origin/develop' into develop
add dupfile
4049: fix error when return empty update time from server
Merge branch '4049' into develop
fix build error on webviewclassic.java
wallpaper background for toggles and text color-xoomdev
Double if-statement, wat
Adding files for right side of Detective Notes.
created gear items db
got tables working barely
created all list pages
working gear lists
working product pages minus proper formatting
working gear lists
lists in to partials
gear show and index working
friendly_id isntalled
basics of url routing
added reviews basics
updating reviews
sorting out routes....path
got reviews working
Updating sample to Hippo 7.7.6
Adding user create with authorized_keys
Updating TODO
Adding serverdensity manifests
Implemented natural occurence.
Comment out the realisation of puppet.conf, it's not used in this module
Fixed bugs and now Exception write to the log.
Added some missing .class files to the Note plugin which apparently was
needed for it to run.
missing entry_points in setup.py
Remove dead code
Merge remote-tracking branch 'telefi/master'
La til getLong()
La til en toString()
Don't take sprint stamina when walking with sprint pressed
Remove some old code from previous commit
Add r_mode -2
Sets resolution to current screen resolution
Patch from ioquake3
Fix Wallwalk dismount correction
Previous code only truly worked for some very specific planes. Also, the pitch correction was very unnatural so it was removed
Switch the unnamed player numbering default to always number from 1.
fix: a layout bug due to logo vtc
fix browser-crashing bug. author: jon Medhurst

Change-Id: I186393a5f44933595b6afec31207b07a2d393156
Fixed a bug with the timing in the thread being /1000 instead of *1000.
Added more table names to floodmaps app
clean up
Cleanup and reuse VizGrimoire as expected in a normal report
Final version for M0
First sample version for M1 reports
Added M1 src to vizGrimoire
Merge branch 'master' of https://github.com/VizGrimoire/VizGrimoireJS
Missing only tests for bubbles, demographics, selector, radars and gridster
Demographics bars appears now! But we need to order the data and group it.
Changed MsgColor to use constants as opposed to unnecessary method
calls, update for SpoutAPI changes.
Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Initial version ported from Bitbucket
nxtOSEK TailAngleControl UPDATE
Fixed javascript error "jq_model[index] is undefined". Var algn will be set to 'middle' if jq_model[index] is undefined.
hw3-finished-without-reditection-detection
initial commit
small message for failed login
fix some quoting / file.join
added tournament actions

publish/unpublish tournaments, renamed match update action
added status fields to games and matches

as well as vbos for all three types
find() back in, replacing calculateNextPosition

pathing, seeds, and skipping byes all reimplemented
drupal coding standards
Merge remote-tracking branch 'upstream/master'
champion match fix

tournament test all a pass
Merge pull request #4 from sidke/master

changed controllers to use find() method instead of calculateNextPosition
Removed interactive operations for moving, deleting and coping.
Added a content based router.  Fixed the unit tests for the splitter.  Updated the license.
SPEC, BioTables for common data
KMER
SIGN

Move permutation code into Permutor.
Move closest BS into ExtendedSearch module
real example model files are added
release v1.121150
Change code with assert_tag.
Speak more better English.

Bah.
Formatting, changed a default setting.
Update full struktur
added second inset vid
requirements moved to a subdirectory
fabfile removed
layout changed
Makefile and AUTHORS
make test
Fixed the admin web access
merged develop with dashboard
Merge remote-tracking branch 'origin/origin/develop' into origin/view/dashboard
Removed Extraneous Notice
Added method to return the current adapters data
Refactored
Refactored
updated GUI controls, and integrated ofxCv's Tracker on the feature detection points
before downloading in new mac
GETからlocalstorage 修正2
Fix rendering of empty regexp
improve UI.
Adding quotes db
Merge branch 'master' of github.com:etiago/spicy-stonehenge
Merge pull request #31 from etiago/master

Adding a db schema
Merge pull request #18 from SERG-Delft/master

DB schema
Fix the link tabs up a bit so they don't push everything down.
Adding log reading and other caps.
add B::H::Normalizer
exports header()
header()という関数の名前は曖昧すぎる
add B::H::Iterator
implemented Iterator
add B::H::Entity
renamed Proxy to Adapter
removed $Header
add denormalization.t
more tests for adapter
removed obsolete tests
update POD
add each() meathod
Checking in changes prior to tagging of version 0.05006.

Changelog diff is:

diff --git a/Changes b/Changes
index 754e9ff..7ec43e9 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 Revision history for Perl extension Blosxom::Header.

+0.05006 Jul 7, 2012
   - add each() method
   - requires HTTP::Date and CGI::Util
   - expires() always converts its value to machine time
singleton structure removed
test fixed
Removed icons and error directory, that is part of apache.
Fix gzip response for multipart post.
personal site commit
очищен CMakeLists.txt
created printStory function
minors updates on pull request
[MOD] Déduction des ressources de $user pour une utilisation ultérieure

Signed-off-by: Benjamin Crosnier <bcrosnier@intechinfo.fr>
[SQL] INSERT: Ajout techs avec coûts par défaut

Signed-off-by: Benjamin Crosnier <bcrosnier@intechinfo.fr>
added package files, moved js files, renamed for proper format
improved compactWall
Cambio de usuario a administrador
forwarded proto can be wss if behind node-http-proxy [#15232453]
(bugfix) Remove import of mcMMO-hook (use direct package reference
instead).
Changed astropy-users -> astropy (and updated links)
Definition location change of $variables.
Need to install keystone packages in nova-common

Also structured cookbook like our other nova cookbooks
Merge pull request #4 from retr0h/working

Need to install keystone packages in nova-common
Added gold sponsor Smart.
updated readme for multiple helper
Fix some small code bugs
First stab at implementation
delete denseforest
Fixes #430
Merge branch 'master' into unified-journal
Detect invalid platform passed
Update src/gdp_correlations/GDPScanner.java
personality
went through some vim colors
dircolors evaluates to 256dark
Updated with iguide code

Signed-off-by: Aidan Carroll <aidan.carroll@gmail.com>
print out cost time
player can die now
Make the dot/colon colors more visible.
Updates static resources entries
Dissolving entity with sprinkles
Fixed a bunch of warnings
Fixed crash
Merge branch 'master' of https://github.com/benjymous/MWM-for-Android
Move Requirements above Installation

This reads better if you understand the requirements before installation
Feature slice M5 initial commit

	--Implemented gui using intelliJ gui generator
	--validated all fields
	--wrote handlers for gui events
	--wrote framework for passing flow of control to other guis
	--assorted small changes (Yeah, I know, bad commit message)
- Removed stock icons (for now).
- Moved basic resources.
- Added queensday theme. :-)
Add action icons, click event
Fixup previous GPIO patch

we only want to exclude the HOME pin
changed login notification
Updated for v5.17.7
work on guards
Octopress init
Site updated at 2012-12-09 23:58:52 UTC
Better reader button.
add commas between hash elements
Cleaned up some messy views and removed a few extraneous stuff from tables (i.e. id of column)
Simple css changes to tables to make them a fair bit easier to read
Add key for branan
updated scripts from meowwow
Adding `build-xsp`
adding assets
adicionando CNAME para dominio personalizado no github
README adicionado!
Fix Encoding of updateText so ampersands are sent correctly and don't break the update.
landscape stretch fix in my reports
preprod url
Corrected bug in IsDefaultOn resulting in stats progs not appearing available for a new user
Corrected output on UserKeepUp and BwUserKeepUp so that it outputs correctly if the user hasn't had stats/bw processed yet.
Corrected regex flaw in UserAllowedRegex to match word boundary for user name.
Increased contrast for the minimap.
fixed wrong topic name
LPS-27136 Forgot class loaders
LPS-4775 Add inherit param to UserFinder
LPS-4775 Minor source formatting to make it match logic in GroupFinderImpl
LPS-4775 Unnecessary throws
LPS-27136
LPS-26321 Add required JAR for parsing SQL
SOS-891
Test Fixes - portlet/activities
Test Fixes - portlet/activities
Test Fixes - sevencogs
Test Fixes - sevencogs
LPS-27105 Rows in collapsed panels are being removed by visible check, clearHiddenRows instead
LPS-27105 - Source formatting
LPS-27139
LPS-27142
LPS-27136
LPS-26321 We already ensure that PluginContextListener is the FIRST listener that is initialized by the servlet container, because it's the first listener. But the servlet container construts all the listeners ahead of time. So this means someone can do an attack when the listener is contructed. This commit moves the list of listeners to a context init param, that is then constructed and initialized by the portal AFTER security is enabled.

Also, the servlet is constructed by the wrong class loader. It's the web app's parent class loader, meaning, it's not registered with PACL, meaning, it's not protected. So we have to wrap the servlet. It also needs to be part of the portal lifecycle so that we call destroy on it BEFORE the portal is shut down. Just in case someone tries to attack during construction, init, or destroy phases.
LPS-27136 Should be remove
[TIMOB-10989] pass additional hosts argument from debugger config
[TIDOC-794] Explain current autocorrect behavior.
[TIDOC-794] Update per comments
[TIMOB-11041] Fixed bug with mobile web's old compiler not working properly when detecting modules without a platform or version.
[TIDOC-794] Same issue for TextArea.
Merge pull request #3022 from bhatfield/tidoc-794

[TIDOC-794] Explain current autocorrect behavior.
[TIMOB-11058][TIMOB-11059]Proper support of Modal VC on IOS6
[TIMOB-11058][TIMOB-11059]Explicitly check for TiViewController
Merge pull request #3036 from vishalduggal/timob-11058

[TIMOB-11058] Contacts picker fails to update orientation on device rotate
Merge pull request #3018 from mstepanov/timob-10989

[TIMOB-10989] pass additional hosts argument from debugger config
[TIMOB-10928] Allow modification of fullscreen after player is up
Merge pull request #3038 from vishalduggal/timob-10928

[TIMOB-10928] Allow modification of fullscreen after player is up
Merge pull request #3035 from cb1kenobi/timob-11041

[TIMOB-11041] Fixed bug with mobile web's old compiler not working prope...
TIMOB-11076: Declare iOS 6.0 method prototypes for earlier SDKs to know.
[TIMOB-11065] Sound proxy hanging on play from remote event
TIMOB-11076 Moved legacy support to protocol
Merge pull request #3048 from vishalduggal/timob-11065

[TIMOB-11065] Sound proxy hanging on play from remote event
Merge pull request #3044 from BlainHamon/timob-11076

TIMOB-11076: Declare iOS 6.0 method prototypes for earlier SDKs to know.
[TIMOB-11150] Load image with correct scale factor
Merge pull request #3055 from vishalduggal/timob-11150

[TIMOB-11150] Load image with correct scale factor
get and cat work for entities with no associated file
add show method
updates to README.md
clean up dead code in utils.py
test download file
added version checking
remember to close the control
Issue #418: Create parameter proposal (don't add proposal to actual
method or class)
Last polish and images to my slides.
選択中フレームの全フレームデータコピペ作成中
全フレームデータコピペ 実装中
選択フレームの全レイヤフレームデータ コピペ、削除 追加
Home banner Images class added
Total Route Length reduced to 3 number after comma.
Force the hover colour so that even rows highlight. Fixes #1063
Played around at home
s/it/is
Slide edge cases.
Suppressed errors unmapping keys in vimrc.
closes #9 - right order of functions calls: first install quicklisp, then retrieve list of projects from it.
Update notes for submitted changes

* Cleanup of assorted things
Bumped cloudfuji dependency, bumped version
Fixed last login and last activity
Add routing based on a person's nick

Now the show page of a person has a URL like
"redesocialinf.com/nickname". The user must fill a desired nick when
signing up.
Adds thumbnail view mode for projects and people
Adds option for deleting an uploaded image/file
Use rbenv in user's home directory before using system-wide install.
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
Merge branch 'refs/heads/development'
rspec for neighborhood and testing cartesian address
Another shot at formatting

Sorry guys no local copy and going for the speed-fix.
Fixed typo
Merge pull request #91 from iJanki/typos

Fixed typo
HTML::encoding() is not available yet in Laravel main repository, at it for temporarily for speed improvement.

Signed-off-by: crynobone <crynobone@gmail.com>
Add test for extending memory driver, closes #34

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'master' into develop
Add support to use closure to define memory

Signed-off-by: crynobone <crynobone@gmail.com>