labofsahil/github-event-dataset-2012 huggingface dataset:
[#16] Fixed the login button sizing problem, also some z-index issues with tooltips
Fix bug #23 - create event page pointing to the incorrect URL
Fix bug #25 - thimble and popcorn project links both pointed at the same place
Merge pull request #27 from rossbruniges/github-23

Fix bug #23 - create event page pointing to the incorrect URL
Merge pull request #28 from rossbruniges/github-25

Fix bug #25 - thimble and popcorn project links both pointed at the same...
Merge pull request #21 from k88hudson/t16

[#16] Requesting a pull to k88hudson:master from k88hudson:t16
Merge pull request #581 from toolness/development

Track authorship/ownership of published pages.
Super ghetto feedback mechanism.

This is a super hacked-up logging system for QA that monitors
credited behaviors, earned badges, user agent strings, ajax
success/error information, and window.onerror information, while
doing its best to strip out PII. When the user clicks 'feedback', they
are asked for comments and a JSON blob containing their log and comments
are posted via hackpub (an S3 proxy) to bugs.hksr.us.
Merge pull request #592 from toolness/ghetto-feedback

Super ghetto feedback mechanism.
Updating webmaker-nav
Merge pull request #603 from stenington/update-webmaker-nav

Updating webmaker-nav
Point to k88hudson/webmaker-nav, latest commit on master
Merge pull request #604 from stenington/update-webmaker-nav

Point to k88hudson/webmaker-nav, latest commit on master
load PPX if the browser doesn't support CORS. update clopenbadger.
S.JS submodule
symbolize keys after going through sidekiq
Reduce unneccesary method chaining
Merge pull request #67 from GeekOnCoffee/api_event_build_cleanup

Reduce unneccesary method chaining
infer worker queue names for now
changes to irc client so we can access the scope of the class which is using the IrcClient run method
some irc fixes after the ping thread was added
we don't need to to_sym this
the commit can be shortened by default
fix the specs
Raise RecordNotFound in find_by.

This makes both paths to query the database even.
Also simplifies error handling by callers.
add the config url to the worker configure payload
add the git clone url to the test worker payload
Create ssl key when creating the repository.
Merge branch 'master' of https://github.com/travis-ci/travis-core
Merge branch 'sslkey-on-create'
Hopefully fixes an AR deserialization issue

Errors in the hub happen sporadically where the Build.config attribute is not deserialized from YAML correctly. This is a fallback for now, it doesn't fix the root cause, just puts a bandaid over it.
pushing a broken spec for @mattmatt to help with :)
moved the config_url to the build node in the worker configure payload
rename git_url to source_url in the test worker payload
some tiny spec changes
Merge pull request #20 from travis-ci/payload_changes

Payload changes
Fix broken spec.

Log an error when serialization issue occured.
Merge pull request #19 from travis-ci/deserializer_issue

Hopefully fixes an AR deserialization issue we see during notification processing
Create a key lazily again, but catch validation problems.

This way we won't throw an exception to the outside, and still return a key.
[#37604937] Fixed the treeselect control to work for unloaded nodes.
Major UI update, and AbilityCount moved to AbilityMetrics and expanded
Fixed: all round-trip tests
Note: Two tests still fail due to the different orderings of attributes
Fixed typo in circle of healing
完成缓存数据添加函数

约定：
1. element可以是string类型，此时在globalCache中添加以element为索引的元素
2. 如果只有element一个参数，则返回对应该元素的所有缓存数据
3. 如果有element和key参数，返回元素名称为key的数据
4. 如果有三个参数，则是添加操作
fixed gmail error 555 for TX_Mail
Move to LVM
Reorder
以下を追加。

blacklist
+# facebook
+.fbcdn.net
+.facebook.net

+twittercounter.com

+# amazon
+rcm-jp.amazon.co.jp

+# apple
+iadsdk.apple.com
+
+#
+cdn.topsy.com

+.adjapon.com
+.hlywd.co.jp
+tophatenar.com

+.testflightapp.com
+koneta1923.com
+.adclr.jp
+.mbga.jp
+appdriver.jp
+app-adforce.jp
+.applipromotion.com
+.usus.co.jp
+.tapjoyads.com
+.chartboost.com
+.playhaven.com

+# feedburner
+feedburner.com/~fc/.*
blacklist

+growbutton.com
+.browsize.org

+#^http://p.twitter.com/t.gif\?url=.*
 twitter-any.s3.amazonaws.com

 # hatena
@@ -48,6 +49,9 @@ ideaxidea.com/.*.js.*
 100shiki.com/.*.js.*
 100shiki.com/images/.*

+# smhn
+smhn.info/.*.js.*
+
 # alc
 alc.co.jp/.*/ad_alcom.js?.*
 http://eow.alc.co.jp/content/js/eow_.*
blacklist_regex
+^http://p.twitter.com/t.gif\?url=.*
以下を追加

blacklist_regex

+# amazon
+amazon.co.jp/exec/obidos/ASIN/.*/.*/.*
+amazon.co.jp/widgets/.*
ニコニコ動画、ameba、urchinに対応。

blacklist

-.dlvr.it
+#.dlvr.it
+.ad-cloud.jp
+.shinobi.jp
+# niconico
+ads.nicovideo.jp
+ad.nicovideo.jp
+urc.nicovideo.jp
+.commons.nicovideo.jp
+.uad.nicovideo.jp
+ichiba.nicovideo.jp

+# ameba
+act.ameba.jp

blacklist_regex
+__utm.js

+# seesaa
+.seesaa.net/.*.js.*
+.seesaa.jp/.*.js.*

+# ameba
+ameba.jp/.*.js.*
+ameblo.jp/accesslog/.*
+#ameba.jp/blogskin_images/.*

+# niconico
+nimg.jp/.*.js.*
+nicovideo/.*.js.*

whitelist_regex

+# niconico
+nimg.jp/js/lib/.*
+nimg.jp/js/watch/watch.js\?.*
+nimg.jp/js/watch/EmbededWatchData.js\?.*
以下を追加。

blacklist
+.amoad.com
+.taroid.com
blacklist
+.sma-clsys.info
+h-a-i.co.jp
以下を追加。

blacklist
+.eimg.jp
Merge branch 'master' of https://github.com/typex20/adblockfilter
Updated aggregate vacancies from Master
Pre moving save to within WantedVars for MC perposes
Ready for cutoffs MC
Ready to merge with master
Ready to merge
Cutoff is now using a binomial cdf
Ready to merge with binocdf cutoff
Merge branch 'AddVarianceForCutoff'
Updated test framework projects #359 - take 2
fix for the preference storing #239
Candidate solution for #264: traversal of unresolvable proxy EObjects
suspended until they are actually resolved
OPEN - task #309: suppress type validation errors 
https://github.com/ujhelyiz/EMF-IncQuery/issues/issue/309
Signed-off-by: Ulises Rodriguez <ing.ulisesrodriguez@gmail.com>
Updated .gitignore to include libs directory. Where we keep the android v4 support files
Update on starspan and raster
added html_safe to the return value of state_options_for_select
update vim-color-solarized to act as submodule
Add instructions/workflow for doing a release
binded the form
Merge https://github.com/ustbenchan/App-titude
rsvpstuff
fixed issues for 1.0
Fixed the red black tree issue
update data
Merge branch 'gh-pages' of github.com:uu59/vim-plugin-stats into gh-pages
the algo is finished and tested
New post about webservices exception.
Added allocate size color
Update application/controllers/index_controller.php
25921615 Modify import script
26234817 Beautify UI
Next issue
Create first ster of neural network
making candidate list have less padding
Also added the same info to content/rubies/docs.haml so that both Installation and Docs pages have this info. Users should be made aware of this at *both* times.
Remove one of the flickering during page switch. EDIT object still flicker
finish STAR implementation. One thing remains: filtering still done on Java side. Would be better to do it directly on the SGBD. Next step: implement the same in the filesystem
Update R/plotsHelper.R

degree of freedom correction to .plotFtest
escape brackets.
Update _posts/2012-08-02-pagerduty.md

Quick shortening
Testing Socket.io 18
lab5 styled and complete
adding numpy to reqs
Fixed creating an additional activity when clicking on a notification
Another set of changes to make checkpoints outside of the eviction
server thread work.  The last set of changes had (at least) two
problems:

First, the test to avoid selecting a dirty page for eviction was
insufficient.  It appeared in __evict_walk_file, which is before
eviction has exclusive access, the test should still appear there to
avoid selecting pages there is no hope of evicting, but should also
appear in __rec_review after the page is locked down to ensure no pages
modified after selection, but before final review, are written.

Second, the test to avoid selecting a dirty page for eviction wasted
performance because we couldn't select a page ever considered for
modification (regardless of whether or not it was actually modified),
because racing with the checkpoint thread reviewing an internal page
that referenced the evicted page could drop core when the evicted page's
modification structure disappeared.

This set of changes adds a test in __rec_review to resolve the first
problem.

The second problem is trickier, and messes with page states (oh joy!).
The key is to inform page reconciliation if it's being called by the
eviction server thread or a checkpoint thread.  In the case of being
called by the eviction server thread, any child page of an internal page
that's in the WT_REF_LOCKED state is in a stable, in-memory state,
because the calling thread set the WT_REF_LOCKED state.  In the case of
being called by the checkpoint thread, any child page of an internal
page that's in the WT_REF_LOCKED state is in a temporary state because
it's been locked by eviction.  It will either be evicted (and the page
state reset to WT_REF_DISK), or skipped (and the page state reset to
WT_REF_MEM).  Regardless, the reconciliation within the checkpoint
thread has to wait on that state change.

This is all built on top of a set of flags passed into reconciliation,
which additionally offers better control over skipping updates on a
page.  We now explicitly flag if reconciliation should (1) quit early
if unable to entirely clean a page, set by the eviction code, (2) panic
if it's unable to entirely clean a page, set by sync during file close
and by salvage, or (3) not worry about it, set by the checkpoint passes.

Reference #419.
adding ecstatic as a dependency
updating application port
adding redis store for files
Update Variation Image Title/Alt

We should update the image title/alt when the product image changes for different variations.
Merge pull request #1347 from scottbasgaard/master

Update Variation Image Title/Alt
div prefix. Closes #1034.
Boundary Condition Tests for Binomial Coefficient
Fixing the upgrade routine
Reconfiguring
Reconfiguring
Merge branch 'dev' into cnx-master
Merge branch 'math-rewrite' into cnx-master
Merge branch 'math-rewrite' into cnx-master
Merge branch 'math-rewrite' into cnx-master
Uploading images broke when an image was dropped into the editor

Looks like an Aloha bug (ignored the dropped image data)
Added package.json file so it can be installed via npm
Fixed package name
Merged in some changes that were on the demo branch
Merge branch 'image-plugin-consolidation' into cnx-master
Merge branch 'image-plugin-consolidation' into cnx-master
Toolbar no longer blocks popovers
Math plugin now saves the ASCIIMath or TeX into a MathML Annotation element
No need to insert "New Link" to the text of new links because we require the user enter text
Image upload should work for one image at a time

I use a 'uploading' class to match the AJAX response with the <img> tag
to update.
DnD and "Insert Image" Button should work with server uploads
Merge branch 'cnx-master' into dev
change auth file to ini and debug
whoops!
Merge pull request #1 from mikedillion/extra_period_in_testing

Don't duplicate dot on two lines.
network-manager-applet: fix nm-devel dependency version.
common/shlibs: update sonames for gettext-0.18.2.
giflib: update to 5.0.1 (SONAME bump).
imlib2: rebuild against giflib-5.x.
tracker: rebuild against giflib-5.0.
libtasn1: update to 3.2 (SONAME bump).
repair the header's add buttons ...
commit a logo.png photo
complate One vinsin again——20121211
changed the title to be system independent
my first commit
Merge branch 'master' of https://github.com/xxdesmus/PersonalSite
my second  commit
Fix log exception func name
Update the epel rpm and raise on empty download uri
Check exit codes of yum installs/wget download
Check exit codes of yum installs/wget download
Keep tmp dir around if u want to look at it later
Merge pull request #208 from harlowja/master

Epel + warmup.sh changes and error out if uri in config isn't found.
Seems like nova uses stevedore
Merge pull request #362 from harlowja/master

stevedore dependency
add auto-insert configuration for emacs
add web.py 0.33
try pg production
initial commit
Merge branch 'master' of https://github.com/yanlisa/P2PVideoShare
Update js/jquery.gritter.js

Adding onclick to entire item.
The module jsch-agent-proxy-jsch should include only classes from RemoteIndetityRepository.java
SnapRetailer now subclasses MKPlacemark class
Añadido Jersey Para servicios Rest
modified js public asset pipeline
different tag box handling, added sponsor logos
added PIP_DOWNLOAD_CACHE
Removed vitality.vim due to unresolved issues.
Tmux conf tweaks.
Dropboxへのログインを3回試行して、NGなら終了する
more trees, group soap
Create index.html

created main home page
flexible image dimensions
improving translations
changing layout
adding public caption
Added to QT Creator
Asorted modifications. Added zip library to application. Added method to create enargas txt
small victory, yearly expansion of conflict spells
movedc
Added test case. Fixed device classification of some text only browsers and webcrawlers.
WHISTLE-1257: if the timeout provided is less than two seconds override with 20 seconds, and do not alert on for fs route error
WHISTLE-1263: dont bind to presence_update if we are not tracking subscriptions
WHISTLE-1273: remove the list_to_binary in the validator
WHISTLE-1121: move log line back to debug from info
WHISTLE-1275: give the view time to update
WHISTLE-1263: dont bind to presence_update if we are not tracking subscriptions but since the other ecallmgr might we need to do it on its own q
WHISTLE-1121: move log line back to debug from info
Merge branch 'WHISTLE-1121' of github.com:2600hz/2600hz-platform into WHISTLE-1121
WHISTLE-1121: add CHANNEL_PARK to FS call events to publish
Merge branch 'WHISTLE-1121'
WHISTLE-1121: removed duplicated work from the play command and updated specs
WHISTLE-1121: updated specs and removed duplicated code from play
WHISTLE-1121: converted pid lookups to cache macros for whapps_config
WHISTLE-1121: dialyzer updates
WHISTLE-1121: move grpoc reg for call_events into the clause after we've successful returned from freeswitch:handlecall
WHISTLE-1121: remove return from terminate/2
WHISTLE-1121: formatting fixes, move amqp connection into a gen_server:cast, and patch start_timer/1 to send the callback's timeout message if timeout = 0
WHISTLE-1272: add the continuous media handler, but for now just mirror the single handler (as FreeSWITCH is caching the file locally anyway, and can join the caller into the media stream already).
Merge branch 'WHISTLE-1121' into WHISTLE-1272
WHISTLE-42: fixed call forwarding issue where options we being deleted
WHISTLE-1272: delayed_cast introduced to replay a casted message into gen_listener; use a random factor in the time to wait to resend an add_binding message
update readme file.
remove unneeded files.
updated
updated
updated
for heroku
updated
wuhc: 新增Pair转换
Added check for missing sessionId
Merge remote-tracking branch 'fabrizio/master'
manifest: track own Gallery2

Change-Id: I9fd92e3418a2549b0feb6c7eb3db9b5614cd54e7
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
fix AOKP remote

Change-Id: I02ffa59c58c2fabaae737b07ebea4fccd569a6f9
Signed-off-by: Roman Birg <romanbirg@gmail.com>
added useful verbosity, added call hook to pre_start_diy-0.1
Archivo para crear documentacion a minton.c
added toImage() for iOS

Conflicts:
	android/titanium/src/java/org/appcelerator/titanium/TiBlob.java
Merge remote-tracking branch 'origin/tiblob_image_additions'
WomenHealth
glx.adb
working simple address line
Adding fatjar to elephant bird
Update AUTHORS.rst

adding zsmahi's twitter account
Update AUTHORS.rst
Merge branch 'master' of github.com:Alfanous-team/alfanous
Enabling history search , opening URLs in new tab instead of same one , using new icons added by Muslih AlAqqad, Adding Assem Chelli and Muslih as contributors in Alfanous Toolbar
Removing temporary files *~
Merge pull request #81 from zsmahi/master

Upgrading to Alfanous Toolbar 0.7 , Issue #55
obsulete TODO comments removed from Makefile
add to Makefile the target of compiling UI files
- move alfanousDesktop images from resources to src/alfanous-desktop
don't import UI files in packages of alfanousDesktop
import Qt forms from compiled files rather then load them on real-time
Merge pull request #120 from assem-ch/master

Use compiled UI files rather then loading them in real-time
( with these changes , the issue #84 will be obsulete )
Makefile fuer Images
ST-015 : Refactoring
ST-016 : Refactoring
Merge branch 'master' of github.com:AndreyChizh/ScreenTest
Weiter an der Db Abfrgae gefeilt
code optimisation is done
test yourself
Merge remote-tracking branch 'origin/master'
removing hard-coded spawn position
RsyncUpload now accepts extra arguments.
Version 0.0.3.
Additional error checking.
Reconfiguration for python module packaging.
Change for setuptools based installation.
added new shortcut to start a goober service
Limited color distribution
Initial setup
updater: vendor sammy
Some tweaks. There are now lots of bouncing balls.
Added ninja-ide-9999.
Removed because 1.0 was closed source, wrong was uploaded
Ch2: Initial preparations for Chapter 2
Prototype for feature 2 for ridejoy complete. The result.json will be produced once everything finishes. The php page will display a search url that can be used to compare. Please do not copy and paste address, but type or click. Since the hidden field will only work when type or click on autocomplete.
Implement OOP style class coding
Holding side mouse buttons pull out secondary/melee, releasing go back to primary.
Added ids to each Employee and added comments to Manager and TeamLead
Merge branch 'master' of https://pgr9876@github.com/ChadSki/se441_project1.git
javascript to display links of a trail upon click

wrote js function to call json and look through json to display tags of
the clicked trail.
added values to db
Merge pull request #11 from ChrisAnn/master

Update ReadMe for new Api Client instantiation
Manual merging is go

Fixed all the things, mostly.
removed references to utilities2.php
Added option to not send notification emails when messages are sent
Completed establishing all baseline files
initial doc repo
Added gitignore on the netbeans project files
colophon titles styled
feature figure titles decreased one size
all direct captions/titles no column/page break before
table caption color revised
answer key title bkgrnd color overwrite colophon
removed testing code should not have been committed and eof brace
increased img/fig/subfig margins
removed no page/col break before all title elements (bad logic)
removed no break before captions from biology.less - added no break inside figure into base
removed bad code *caption *title no breaks - put on base - removed title (bad logic)
removed preface code pasted throughout file
Merge pull request #22 from Connexions/remaining-bugs

+ colophon titles styled (answer key, attributions, about cnx)
+ feature figure titles decreased one size 
+ table caption color revised	  
+ increased img/fig/subfig margins
+ no col breaks within figure element
Acho q makabu me esqueceu

Forever alone level: above 9000
Pequena correção no envio anterior
Atualização da documentação e do arquivo help.txt
Implemented custom preprocessor modules.

Fixed some tools not setting arg0 in osutil.
Added symbol file option to debugger for initial load.
Added string symbol type to debugger symbol format.
Updated German translation
Merge pull request #1 from cjuergen/master

Updated German translation of Messages.properties
Fixes issue with player not dying.
Fixed mismatched index when updating file
Bump version to 0.1.3
Fixed headers crossing
Added smooth scroll
Update config.guess and config.sub

Adds support for a bunch of targets, including:
aarch64 (armv8)
arm-linux-androideabi

Files copied from Ubuntu 12.04 (version 2012 february 10th)
Fix disabling of mbtree when using 2pass encoding and zones
Eradicate all mention of Extended Profile
x264 never supported it and never will because nobody uses it.
Add Level 5.2 support
Faster chroma weight cost calculation

New assembly function with SSE2, SSSE3 and XOP implementations for calculating absolute sum of differences.
First draft of constant MB API
Some use-cases of x264 involve encoding video with large constant areas of the frame.
Sometimes, the caller knows which areas these are, and can tell x264.
This API lets the caller do this and adds internal tracking of modifications to macroblocks to avoid problems.
This is really only suitable without B-frames.
An example use-case would be using x264 for VNC.
Wrong Flag for AtLogin
Added coverage report. Added .bat to run OpenCover. Bit messy (has my paths).
Changed HashMap to referenceMap to reduce memory load and possibly fix
I07's Issues
Squashed commit of some BCMDHD patches from caf msm-3.0 by gregkh
4rd

- book and movies page done
- characters page started
-JK rowling page done
Deprecated: Assigning the return value of new by reference is deprecated in C:\Projects\CosmoProGit\www\index.php on line 770
fix:
Notice: Undefined index: photo in C:\Projects\CosmoProGit\www\func_lib\news_f.php on line 10
Call Stack
# Time Memory Function Location
1 0.3177 754384 {main}( ) ..\index.php:0
2 1.3511 1466272 get_news( ??? ) ..\index.php:67
fix:
( ! ) Notice: Undefined index: flag in C:\Projects\CosmoProGit\www\index.php on line 667
Call Stack
# Time Memory Function Location
1 0.0126 756256 {main}( ) ..\index.php:0
birthday fix form
Частное лицо не может в корзине вбивать карту
fix form
fix &
fix message warning
form data filling
sdflkasdlkfasdf
rewrite sentinel support as RedisSentinelClient. still in progress.
fix keys test for redis 2.6, as identified in https://github.com/mranney/node_redis/issues/290, make order-neutral
disable ENABLE_OFFLINE_QUEUE_FALSE test in node_redis, see https://github.com/mranney/node_redis/issues/290#issuecomment-10976421, not sure how to fix the test. all tests ok now.
continue RedisSentinelClient, with initial tests
added RedisSentinelClient.createClient(), like RedisClient's. more tests.
first try at RedisSentinelClient commands, passed thru to master client. RedisClient needs to export its commands to share. not yet tested.
get and set successfully pass thru
sentinel HMGET/HMSET test was failing, but now seems good. (might come back.)
readme explaining fork's purpose
cleanup test_sentinel
remove tanguy's earlier sentinel implementation
redis index now exports RedisSentinelClient, createClient() delegates via sentinel:true option
readme explains new sentinel approach. added getMaster() method.
sentinel example
Got initial pass of networking going with VisCubes

Also brought in net code because it will likely require some tuning to
fit this application
Changed readme file for templates
Add ignorePrevFound option
Fix a few small (a lot of big) memory leaks associated with the stamps browser
Get rid of alloca() usage.
Catch exceptions in Pool::collectAnalytics().
create, update and show bike works using bike_form object in combination with exposures
Easier way to write type tests
ajout du module DocumentPublisher
README: no need to escape < inside code sections
SourceJobId used to track outstanding tasks instead of a counter. ALlows us to associate each task with a match id, and thereby track failures/access denied (which are now recorded in the database).
Make rooms/slots save redirect to schedule.
Unify OSX/X11 and WIN Events

Fixed issue when using SYSTEM_BOOST:
find_package(Boost COMPONENTS x y z) needs to be called once and not like:
find_package(Boost COMPONENTS x)
find_package(Boost COMPONENTS y)
find_package(Boost COMPONENTS z)

Added the ability to override the WM_ERASEBKGRND message on windows.

Fixed mouse coordinates for MOUSE_WHEEL event.

Ensure OSX, X11 and Win events are similar.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
[#36801635] remove old nginx log directory before creating symlink
Disable gppipe specs.  Don't try to drop gpadmin when building gpdb fixtures
Finalizado primera versión paso forward
Modificado construyeBspline para generar los puntos de control

No tenemos en cuenta los datos de prueba
Merge branch 'master' of https://github.com/GrupoModelado/Bsplines

Conflicts:
	Bsplines/bspline.cpp
testeteteteeeee
2.0.6 Mission files

Fixes long loading, unnecessary w8s
Data::Hash
make the annotation control behave like the rest.  Restyled and created active style
keine ahnung was ich geaendert hab
修复透明度问题
Added information for Pogo (Name + Description)
Copying base state of doctrine/mongodb-odm (PR 310)
Applying head state of doctrine/mongodb-odm (PR 310)
ZL Field Elements improved with better filtering
Fazendo a classe GZMigration trabalhar com as mudanças no motor de
migração; Mudanças na classe SQLDataProvider, SQLDataProviderImpl,
GZMigration e MigrationEngine(Motor); Adição das imagens usadas no
aplicativo.
Added comments for `page.onOpenedOrLoadFinished`
refactor reporter and print function
Add new MoP 5.1 zones
Erase tiles instead of using transparent tile, update tileset.
Merge.
scene work
Merge branch 'master' of github.com:JohnYangSam/raytracer3
Fixed dialogs and added download cancel.
documented javascript and css pertaining to carousel
VenomShooter Fix Only Part 1
VenomShooter Fix Only Part 2
Bug chars in unicode
Set symbol in unicode
Merge pull request #963 from KBaluh/Charset

Unicode chars
fixing connect to gracefully return to title with error message if
connect fails
changing to use showError method
Merge pull request #965 from Maescool/connectfix

fixing connect to gracefully return to title with error message
added option to enable/disable mods to the audio/video menu
Merge pull request #966 from Flet/modoption

added option to enable/disable mods to the audio/video menu
Updating PlayerSpawn tiles (flag tiles) to only allow player to pass.
This should protect the player from being spawn killed by baddies.
Merge pull request #968 from Flet/spawnkill

Updating PlayerSpawn tiles (flag tiles) to only allow player to pass.
Merge pull request #958 from AngelDE98/develop

Fixed #893 VenomShooter Ammo
Pickup item bugfix
Updating branch from upstream 'develop'
Item raildroid swap bugfix
Merge pull request #971 from KyleBrodie/bugfixes

Item pickup bugfix
Portuguese translation update.
Merge pull request #973 from Shishioh/patch-2

Portuguese translation update.
Updated texts_it.txt
Switched to PEAR coding standards and updated the files accordingly. Fixed ListIdentifiers container tag in OAI-PMH provider.
beginning stuff
organizing branches
(Almost) adjusted to use zorro techniques
manually updating binaries, as I seem to be unable to do so with TeamCity at the moment
include the manifest
Minor optimizations using local variables
Update YTDB to 6.28 (Update)
Discount and some tests
Discount fix
UPS parser for address validation
Add canace-dev group remove project page in README
corrected notes for development
Near finished VarExpr, have to finish Arrays
Do not forget to correct the size of the string inside a Record to make the decalage func working.
Merge branch 'master' of https://github.com/Logarithme/Compilateur

Conflicts:
	Project/src/parser.cpp
fix comma in gemfile
Added unit test for URI class
Changing jumbotron to work with file uploads
And another Bug fixed
Update DB version to drop unique index on project number
Docs: Add a space after period (selects/methods.html)
Simple visualisation of the wind arrow.
ElectionEngine:
	Fixed a dodgy tab

shtuff.tex:
	Patterns added
Merge branch 'master' of https://github.com/MaximusV/pyturn-battle
setup_requires = [
        'numpy>=1.6.2',
        'scipy>=-0.10.1'
        ]
add source for flask-mail
merge origin master
Implemented Stair-descending code, based off of an improved version of
Jackof7's code which takes into account moving across slopes quickly
(previously that portion was broken)
Moved the view setting script from PlayerControl to the end of Character
End Step.
Removed Debug Code
Added helper constants
Added .orig to the .gitignore, as vimdiff tends to generate them
needlessly
Update Source/gg2/Scripts/GameServer/sendLobbyRegistration.gml

Fixed game-crashing typo
Merge pull request #79 from nagn/utility

Misc improvements
Fixed sniper zoom and slightly improved performance of the stair code
Merge branch 'stairs'
changed version number on main menu screen
fixed the typo (assuming it is a typo)

changed wewapon to weapon
because i accidently edleted my gg2 folder
Merge pull request #82 from IcyArctic/master

version number on the title screen and typo in readme
Removed the old Revolver sprite
Fixed Spectator numpad 9 does not destroy checkpoint (#1078992)

Simplified the spectator checkpoint code
Updated .gitignore
Merge pull request #84 from TazeTSchnitzel/master

Updated .gitignore
AutoBalance: don't reset counter on death pre 10s; only balance dead players
AutoBalance: notice now vaguer; counter time dependant on respawn time
Merge remote-tracking branch 'ajf/autobalance'
Merge remote-tracking branch 'origin/wareyabalance'

Conflicts:
	Source/gg2/Constants.xml
	Source/gg2/Objects/InGameElements/Balancer.events/Draw.xml
	Source/gg2/Objects/InGameElements/Character.events/Draw.xml
	Source/gg2/Scripts/GameServer/sendLobbyRegistration.gml
	Source/gg2/Scripts/ServerBalanceTeams.gml
	Source/gg2/Sprites/Weapons/Revolver2S.images/image 0.png
	Source/gg2/Sprites/Weapons/Revolver2S.images/image 1.png
	Source/gg2/Sprites/Weapons/Revolver2S.images/image 2.png
	Source/gg2/Sprites/Weapons/Revolver2S.images/image 3.png
Actualizando Tad_Heap
small bugfixes
small but wide cleanup: unused vars and imports, bad indents
standardize and generalize def files loading and parsing for main dicts

Functions g.load_xxx_defs() had a very similar pattern for base_types,
locations, events, items and techs. While similar, they had a few
inconsistencies with each other.

Create new generic functions that accomodate all needs of these
functions: load_generic_defs() and load_generic_defs_file(). Besides
uniformity, it also offesrs a few improvements:
- language is optional, default is current language
- missing language files are silently ignored with no errors. Only the
  default language file is mandatory
- always load default language before language, to "clean" any entries
  from previous language that may be not present in current language
- entries in data files with non-matching id in object dict are ignored
- attributes in data files' entries that do not exist in the object
  class are graciously ignored
- attributes of type list (as flavors in base_types and cities in
  locations) that are missing from data files' entries are assigned to a
  a list with a blank element [''], to prevent them from being empty and
  chocking on random.choice() in location.generate_base_name(). This was
  already done for location.cities, but not base_type.flavors

load_strings_defs() behavior does not fit load_generic_defs(), but it
can benefit from the first 3 improvements above, so it directly uses
load_generic_defs_file(). It also requires both default and current
language files as mandatory
All hail the newborn heir to the i18n throne!

Still a young infant, tough... a lot more to come in next commits.
Renamed local vars.
Updated tests for renamed vars.
README.md altered to include information about defining translation strings for namespaced models, as requested at issue #555.
fix default profile for docs
Update Issue 156

Fix + non regression test
Backport to master

trying to fix the script according to http://stackoverflow.com/questions/818255/in-the-bash-shell-what-is-21
(cherry picked from commit 0f4d1b584fb0d6cc0b478e245e7fb58c836201f6)
Backoport to master

trying to fix the script according to get rid of the following message Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html that screws the parsing of the output and doesn't kill the server
(cherry picked from commit 642c2279a3474fd19157640a15b42ea7fe24711b)
Backport to master

trying to discover why the node doesn't get killed
(cherry picked from commit bb3c9034f676ff3416c1ddb12537647e4eabc697)

Conflicts:

	sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh
Backport to master
revert change
(cherry picked from commit 09913890b9e1b9f6c0c77b0557a5c71afcd4303d)

Conflicts:

	sip-servlets-test-suite/sipp-scenarios/clustering/auto-clustering-failover-test.sh
Backport to master

trying to fix the script according to http://stackoverflow.com/questions/818255/in-the-bash-shell-what-is-21
(cherry picked from commit 975d09cf0cab40512c8746443c00ecd7b53cb633)
Backport to master

fixing wrong value for test checking
(cherry picked from commit 87f285d05604bd42c802bc78e6c8fff5980ffc8c)
Backport to master

try fixing UAC test
(cherry picked from commit bb77d8f79b3bc7ed7d1548d9bb01dce6ba357df6)
Backport to master

adding config of profiles in script
(cherry picked from commit 3c4bbf1c8da100581de06c818b0c45c24aaabae1)
Backport to master

adding log messages
(cherry picked from commit aaf49d7b80a13d09a2cf90e678fd10618fc78e00)
Backporting to master

fixing script for preparing UAC tests in HA testsuite
(cherry picked from commit e0062109498d1e1abe26456664c48501eb0bbd6d)
Added new portfolio images, lots of description updates, resume git,odesk,linkedin links
Removed "Unicode" from SendSS name

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1483 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Fix UAC for readme.txt opening

git-svn-id: http://miranda.googlecode.com/svn/trunk@14375 83df23c2-51fd-11de-bb24-2d5e9b4af41d
first commit
Merge github.com:Monara/bulkinnovations
after delete files
find_text error
Initial breakout of deb packaging

also Remove deprecated default executables from gem
Refactor.
Nib adjustments.
Changed background color of the main view to to darkGrayColor.
添加timeline相关资源信息
实现主页时间轴
$path was not initialized.
Avoiding a PHP notice.
Ajout sur le README
Slimmed down the file size.
Second commit

Missed something?
- Commit de pacotilla para hacer merge con la versión más actualizada del repositorio
Merge branch 'master' into rama1
- FOO
Simplify multi-arch building:

- Link the relevant fstab while building.

- Let's default /dev/sda.
cadastrar adv
Added chefignore reference and functionality to the cook methods. Syntax checking and rsync now both exclude anything in the chefignore, based on Chefs methods for using the chefignore. (Chef::Cookbook::Chefignore class was used.)
Cook tests: test_check_syntax_ignores_files_in_chefignore and test_chefignore_is_valid_object
Moved rsync exclude in cook command to sep method. Test for test_rsync_exclude_sources_chefignore.
Added test_check_syntax_raises_error test for cook commands
use the 'debugger' gem on 1.9 ruby instead of the broken ruby-debug19
- added lsb_release fallback when /etc/issue is not present
- added support for Linaro's Ubuntu flavour/development, see http://www.linaro.org/
Merge pull request #38 from rmoriz/debugger

use the 'debugger' gem on 1.9 ruby instead of the broken ruby-debug19
Merge pull request #39 from rmoriz/lsb

Use "lsb_release" as a fallback for /etc/issue
Remove unnecessary virtualbox dependency
Silence UI output during test
Merge branch 'amoslanka-master'
Added an Opscode Omnibus bootstrap installation method.
Set the Omnibus installation method as default for all supported Linux operating systems.
Fixed SSH option help.
Added support for Opscode's vendored Ruby to check_chef_version.
Merge pull request #40 from hectcastro/omnibus

Install Chef on supported Linux operating systems with Omnibus
Changelog updates
Added docs regarding use of knife bootstrap if prepare method is not sufficient.
Switch ubuntu to debian_gem installer until #45 gets sorted out
Whitespace
discrete method
Major refactor in SDCard generation

The generation of SDCard has been completely refactored to work out of
box; now to use it you have to set, e.g:

SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
SDCARD_SIZE = "128"
IMAGE_TYPES += "ext3 sdcard"

Now the sdcard has following layout:

 0  - 1M                  - reserved to bootloader and other data
 1M - BOOT_SPACE          - kernel
 BOOT_SPACE - SDCARD_SIZE - rootfs

All current supported machines on BSP will work out of box and
generate a 2GB SDCard with an ext3 rootfs on it.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
u-boot-mxsboot: add

Adds a native and nativesdk tasks that allow for automation of image
generation for 'mxs' SOC family.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
u-boot: add imx28evk as compatible machine

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
u-boot: add imx6qsabrelite as compatible machine

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
linux-libc-headers-imx: add 2.6.38

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
linux-libc-headers-imx: add imx6qsabrelite as compatible machine

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
image_types_fsl.bbclass: generates mxs' u-boot bootstream binaries

The mxs SoC family requires use of a bootstream in bootloader but at
this moment only SDCard format is supported. The image for use is
'u-boot.mxsboot-sdcard' and this is also the file extension of the
generated file beside of regular u-boot binary.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
linux-imx: add imx28evk configuration

The kernel configuration has been imported from Freescale's official
GIT repository, for 2.6.35.3 recipe, but with CONFIG_ROOT_NFS disabled
as we use the NFS server in user-mode.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
imx28evk: add machine definition

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
core object handling
Merge branch 'master' of github.com:OXIDprojects/admin_2_0
redefined abstract model class
added
replace LOOP with ITER
new downloaded folder, which is in UNPACK mode.
[release] version v0.1.1
#4 readme updated
Update javascript/discussion-package/author-controls.handlebars
Added javadoc TODOs
committing first files
Merge https://github.com/Pommes06/LoopWedstrijd
Relacionado con #13
Cadenas de texto nuevas
Source formatting
Fusión de vistas: Se realiza la inserción, edición y lectura de facturas desde la misma vista. Desarrollo del javaScript y el controlador necesario
Limpieza de código
Fusión: Inserción, edición y lectura de facturas desde esta vista.
Rutina
tbFactura.cs: Inclusión de propiedades necesarias para el control de relaciones con otros subsistemas desde la vista.
Reorganizado la carpeta de JS de Facturas. Almacenadas facturasNueva.js, facturasEditar.js y facturasDetalles.js en la carpeta Old. Por si hiciera falta más adelante.
Implementada funcionalidad de eliminar facturas
Rutina.

[EventosController.cs] Fix tras cambio en BD.
Added unicat example
add data to repo
Merge branch 'master' of github.com:RHoKPrague2012/MapGuys
Edited Create Account and Login options.

Fixed some things
Zdjecia rejestracji
modified the way display comment
Added license file
Fixed copyright
Fixed copyright
Removed hidden/personal files
Ignoring files
Fixed ignore
Removed private files that should be hidden
Removed private files that should be hidden
Added Ext js index template and form page in showcase
fixed ugly indent
Added window to forms page
Cleaned up the old theme and added my theme as a submodule.
update to 22.0.1229.92
Only show recipe procedure if has a value
JOANNE OBATA: 'update header.php'
Added examples to helpfiles
Fixed html chi extraction
Don't really this extra code
General update, bug fixes
HSEARCH-882 Define an Infinispan IndexManager using custom RPC commands for backend operations
Reorganized movement code
Add html5 mobile compatibility tables
Merge pull request #9 from gorekee/patch-2

Add html5 mobile compatibility tables
Did Lab 0. Looked over Exception Handling. Noticed it is usually on he Setters.
Release version 0.14.0-2

  * Webengine >= 0.13.0-2 provides a trigger that restarts apache2, drop
    the now redundant postinst/postrm scripts.
  * Clean up Uploaders.
Set up Guard and get our first test passing!
Different Gemfile/gemspec approach
Add version constraints to deps
Add local .vimrc to ignore tmp directory
Start to set up logging
Throw in some logging code
Fix hash syntax for 1.8 compat
*use window.close() again
get var from other scope
added AS30746
Suggestion
Merge branch 'master' of https://github.com/SnowblindFatal/DodgeIt
* Fixed GlobalMac script
* Refined PCFactory categories
typo
typo
Merge pull request #129 from ftassi/fix-readme-typo

Fix readme typo
Added providerKey check into AuthenticationProvicer (fixes #134)
fixed old tests
added new tests
Serialize/deserialize providerKey
Merge pull request #137 from Koc/add-provider-key-to-authentication-provider

Add provider key to authentication provider
Merge branch '2.0'

Conflicts:
	Tests/Security/Authentication/Provider/FacebookProviderTest.php
Fixed var typo in README
Merge pull request #143 from MattKetmo/typo

[Typo] Fixed var name in README
Set the file parameter optional
Merge pull request #144 from MattKetmo/file-config

[Config] Set the file parameter optional
Updates to Spinup
-update to RC1
-improve logging
-RC1 index upgrade
Merge branch 'master' of https://github.com/SpringSource/wavemaker
Adds scripted config files
No longer requires 1 role if turning OFF JOSSO
Reformatted code
WM-4353: If CF URL is taken now sets URL not app name to invalid.  WM-4114: GenerateUrl button now sets http not https; confirm dialog shows correct url
Tweaks progress bar messages during save
Fixes color for readonly editors in studio
WM-4148: Does a database import after completing a cloud foundry db export
Reformat Code
Code Reformat
Fixes bug when providing wm.grid.cells.ComboBox with a comma separated options list
Changed from using isHeader to using transmitType which lets each parameter be a queryString, header or path parameter
Reformat Code
Merge branch 'master' of https://github.com/SpringSource/wavemaker
WM-4717 Imported types not included in service defs, types
The fix for the build error on macosx caused this.  Fixed.
updated hourly overview
02_06_2012 1:23
02_06_2012 3:44
fix loop bug
updated story
merge changes
tests/amd64/stat/print_stat_layout.c (main): Fixed to output code for
st_rdev member.
corrected application
score last year instead of "all time"
update to jquery 1.8/Should not bind anything to the window object
add TODO
Remove unnecessary default options
Use dataName property to set a custom data to hold the hint instance
( avoiding conflicts ). Change internal data from window to
document in $().autoHint();
1.0.11
Make it compatible with jquery 1.8
just a couple of lines
made a person site
homework stuff
Fixed bug #61964 (finfo_open with directory cause invalid free)
Implemented FR #61602 Allow access to name of constant used as default value

This is an improved commit for FR #61602, this fixed the previous
commit 054f3e3's C99 compiler compatibility issue
Unified zval -> UDate conversions

Now IntlDateFormatter::format() also accepts IntlCalendar objects.
Code is shared in MessageFormatter and IntlDateFormatter.
Refactored internal_get_timestamp()

Added bounds checking for 32-bit ints.

Do not fetch array elements that ::parse() generates but that
::format() does not actually care about.y
- Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
- Fixed bug #62565 (Crashes due non-initialized internal properties_table)
- Fix conflict
- BFN
- Fixed memory leak when extending DOMXPath
- Fixed conflict
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed memory leak when extending DOMXPath
  - BFN
- Fixed bug #62525 (sigabrt while converting floating point to string)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #62525 (sigabrt while converting floating point to string)
Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed bug #62525 (sigabrt while converting floating point to string)
fix for bug#18556 - use simple tolower() function for internal things
add test
fix comment
add NEWS/UPGRADING
Merge branch 'pull-request/91' into PHP-5.4

* pull-request/91:
  Fixed bug #61964 (finfo_open with directory cause invalid free)
added overlay for mako
Adding automation category on NSObject with implementations of UIAccessibility method analogs
Cleanup and SPACE TO WIN

Removed meuk comments
Fixed search. Also added default sort for results.
Added some default sorting to the main entries.
TaskTree implements "TreeNode", tested on TestForm
Merge remote-tracking branch 'origin/Dmitry'
Ansatz für Test
Test script for gamepad.js
here we go links
Fixed emphasizing of winner. Now alway emphasized the one with the
highest score.
* Add an interface SyncColumns for all sync-related columns.

* Tag ORIGIN as deprecated. Use new fields from SyncColumns.
* Tag SYNC_STATUS as deprecated. Use new fields from SyncColumns.
* Add creation date and last modified to all that were missing.
* Change type for creation date and last modified date to integer.
* UriPathIndex and UriMatcherIndex are now protected.
* Rename actor, object, verb, target for all activity classes. Now they are correct.
* Update javadoc.
* Index classes need to be public
* Add reserved sync columns
* Global ID as foreign key in tables is deprecated. Use _ID_* instead.
Updated old Readme
Pushed css & flash

Pushing smaller amount of files
Updated to new mozilla-central repo
Rename date not zero
winpcap win7에서 설치여부확인불가 패치

Signed-off-by: WeDoCrm <eclues.help@eclues.net>
first commit!
Whole file going up! Basic loop works, search for author workds
Merge remote-tracking branch 'origin/master'
move modules to packages
Add the main file
Merge branch 'master' of github.com:ZBaker1398/URLDatabase
MrMap no longer wants to work as a CActor apparently. :(

Signed-off-by: gm112 <gm112@zfgc.com>
Merge pull request #14 from ZFGCCP/gm112

MrMap no longer wants to work as a CActor apparently. :(
Logboek bijgewerkt

in LibreOffice als HTML opgeslagen. Werkt wel met git?
Logboek aangepast en Mappen ordening veranderd
Ajout des prototypes des fonctions en haut du fichier
Add quotes to cd command in scm_breeze.sh to fix bash eval error
fixed more/less logic for skills
fixed save and retrieve for comps and assets along with update logic
on page load disable all used options form comp and asset
Querying python include directory
on utilie les notifications de commandes et o y met les messages particuliers
on utilise les notifications de commandes
Configuration, les données du client et paiements
appem a notificatio comme dans action/editer_commande.php
adaptation csv
modification messages
rien
migration
le messages
test sur les champs de la db
midification de type de champs de la table recette
midification de type de champs de la table recette
trifles page
Ghetto way to have multiple routes do the same action since regex doesn't behave how I expect in production.
move to my gh pages theme
Update application/modules/default/controllers/IndexController.php
changed field registration functions to use template instead of id.  this deprecates 'transform'
Create JessieJamesMeowth.c
Remove the kids hack now the BSE distribution bug is fixed.
Added dependencies to .travis.yml
Merge branch 'master' of github.com:adw0rd/django-goto-url
Minor bugfix to Report.java
new example, updated cv
Merge branch 'develop' of github.com:aeolu/aeolu.github.com into develop
Merge branch 'develop' of github.com:aeolu/aeolu.github.com into develop
Changed the fonts after viewing the app in the ios simulator. Didn't like it. Also added an About this app section on the bottom of the index page. Changed some style points.
fixing filing issues
DOC: Add quickstart for viewer to User Guide
ENH: Set viewer min-intensity to zero when possible.

Some image dtypes allow negative values, but these are typically not used. If an dtype allows negative values, but no negative values are present in the image, set the minimum value to 0 so that the image doesn't look washed out.
STY: Clean up formatting and remove repeated imports
Fix bug in grey erosion and dilation
Let travis build bot run tests
Merge pull request #313 from ahojnnes/travis-tests

TST: Let travis build bot run tests.
Merge pull request #301 from tonysyu/viewer-user-guide

DOC: Add Viewer Quickstart to User Guide.
Fix bug in binary dilation and test case
Add test case for non-square images
Merge pull request #310 from ahojnnes/morph

BUG: Fix bug in grey erosion and dilation.
TST: Invoke Travis nosetests differently.
initial commit
test
fixed conflict
Adaptations pour pouvoir étendre facilement les dto vers d'autres flux
(sedna en particulier)
Alteração arquivos readme
ajaxify older pagination
removing ashwin test