labofsahil/github-event-dataset-2012 huggingface dataset:
Fixes and simplications of build files.

Previously, Ganglia_statedir referred to /var/lib - not very specific to ganglia.
Also $GWEB_DWOO was defined, but not propagated to the conf template.

Now defined and propagated where appropriate:
 gmeta_rootdir (parent location of rrd folder)
 gdestdir (php files)
 gweb_statedir (parent of gweb 'conf' folder and 'dwoo' templates)

I've attempted to match up the RPM spec also, but I suspect that the
'custom_web_prefixdir' needs defining and passing from the Makefile.
Unfortunately I'm unfamiliar with RPM builds.
Merge pull request #146 from timstaley/fix-build

Fixes and simplications of build files.
Added bootstrap site template
+ ‘README.md’
/ ‘i18n.txt’
Backend changes
Merge branch 'master' of github.com:gcavalcante/markBox
add implementation for items award/exp
Merge remote-tracking branch 'origin/master'
update ResultController xib for iPad
Merge remote-tracking branch 'origin/master'
Fix Nav orientation
Make brand intelligent
Auto generate id
Auto init children
Make NavItem to initialize smartly
Refactor
renamed utils handy
moved node app into app folder
added private folder
refactored project directory structure
added internal field interface and two implementations, one using internal fields and one using setter/getter methods
added a bit of javadocs to the internal field stuff
big refactor over the ReflectionUtils, now all the cache methods are in the ClassCache class and with a pre cache of all the internal fields and fields in the constructor of that class
removed unused test from injector impl stuff
Merge remote-tracking branch 'origin/master'
Add reqmon initial deployment script and related changes to frontend rules and the workqueue configuration.
Changing configcache and reqmgr url depending on deployment variant of crabserver.
Better photo of Creep 2
Added params sld and sld_body to User Manual WMS Reference
Added the migration code.
final image and text for todo
final images and texts for todo
Merge branch 'master' of github.com:ggregoire/tripfully
createInputFormattedFileLDA
Add an opportunity to add task to contact from contacts page.
add composer install introduction
modif globale du design
send access_token even if requireAuthentication is NO
added luakit confs
Silence annoying cucumber warning
Minor fixes: imporovements in FlowNetworkEdgeType
Minor fixes: religion switched to allowing break one
Minor fixes: unused explicit deleted
Minor fixes: IntsByVectorComparator optimized
Minor fixes: inner typedef added
ccnx: Add skbuff handling
removed test code from gui script
Updates event type snippet for JavaScript.
modified:   hello-git.sh
added another echo statement
password change redirection reversed
change email form appereance changed
spelling mistakes corrected
change pass and change email pages appereances changed
change email url name added
Heroku Toolbelt.
Added PostgrSQL connector dependency.
Fixed bug in ant build file.
Add modules

Change-Id: I122cd4acb9cb2ba97178d1c42b9685edbd1362b0
Fix typos
Merge pull request #128 from paulsmith/master

Fix misspellings of "Homebrew"
Merge pull request #127 from guibog/master

On modules and packages
rubric added
Merge pull request #371 from abhinavc/master

rubric added
don't need this "hint" symlink

there's a readme instead.
only include conf files
split the default server config

Make it possible to pick and mix server rules.
loading icon and cominginto and out of a chat room
Separated color
working camera and pathfinding
must commit or die
完成一批战功
完成所有 1v1 的战功
还剩下最后39个战功未完成，总252个
Fix SWZS
Fix: crash
Merge branch 'master' of github.com:hboon/oauthconsumer
Updated documentation - testing markdown
Updated documentation - testing markdown
improve collision logic again
implement basic picking logic
Dokoncen abstrakt.
Upraven makefile, odstranen suffix tex
config pager
version 1.7 installer
Add hover effects for navigation links and buttons

Signed-off-by: Henrik Saari <henrik.saari@jollamobile.com>
加入客户端与服务器端通讯，加入服务器端接收，并返回数据
update usecases
1.4.16+HH-28041 release * HH-28041
1.4.16+HH-28041 released * HH-28041
jobhandler: reset command, data processor thread
To Aug 03
Added .postgresrc
Initial support for non-generic For/Use (with typeof)
setarch command to override kernel arch number
Update default environment to load script.bin and easier to set kernel name etc
implement move calc opcode
refactor
fixed invalid characted in database dump
added the photo tab
New "GCode" tab which invokes CodeMirror text editor with current 2d render code highlighted and scrolled to. Some work on color differentiation.
Second bottom slider now lets you select any part of layer
Added Village Dialog
updated for the crossdomain and add the config for dialog,traclog
fix url
Merge branch 'master' of github.com:alicnwd/fdevlib-doc
update
uploader demo improve
clipboard demo improve
Merge pull request #7 from sjpsega/master

demo improve
update
Merge branch 'master' of github.com:alicnwd/fdevlib-doc
update
update
update
update
Changed color for staged
Parse X509v3 Issuer Alternative Name extension
XML changes
Updating to Angry Mob
Changed main object to mob
感谢 wersling 提供支持多文件处理的功能，稍微修改了下文案
T2092: ORM: mappedSuperClass inheritance, support for union subclasses (ommit the joinColumn attribute), dialect property can now be mapped to a custom java class
T2092: Reverted Component.java, moved getProperties() entry to ComponentPro.java. Moved to order of property inclusion to scan top to bottom. Added type checking for the ComponentPro when using getProperties() in HBMCreator.java
T2092: Changed terminology for "overrideProperties" should swap syntax
removed unnecessary main method
when a query has 0 columns it fails
removed developer specific exception
build by deploy process
changed version to 4.0.1.002
Merge pull request #58 from pionic/RAILO-2092

T2092: ORM: mappedSuperClass inheritance, support for union subclasses (...
solved ticket https://issues.jboss.org/browse/RAILO-2092
~ huge refactoring
Fixed main image display
Limited main page to 3 items only
Merge remote-tracking branch 'origin/master'
- port to Flash Builder 4.7 + Bug solved in Foxhole ScreenNavigator
-foxhole
- project properties
-testing
Frobidden → Forbidden
Or, just everywhere.
Added user/generate/Secretkey API and updated relevant codes

Change-Id: I9802e3c2dd465fa5e836cc41b4b183e445ac4da8
When diffing, file ignore paths
Fixing bugs in schema builder.
Return ID from create method on relationships.
add WeiXin to footer
add 10, 30 to alipay
Merge pull request #21 from huuguanghui/master

小修改
graphs work as long as there is value
Arreglado error en cumples
changed the EAM folder name

from EAM to EAM-8.4
List view + dashboard + start HIW
[How It Works] Almost done (videos missing)
[Dashboard] Some modifications
Adding videos
A few speed tweaks
周末
1、添加拼音本地检索
2、重构代码

Signed-off-by: hao zheng <cctvu@163.com>
fix source path
Merge branch 'release-intermine-1.1' of github.com:intermine/intermine into release-intermine-1.1
improved filename parser
playlist table, get all and one
mock playlists shown on minisub
fixed test_iposonic
coverArt for songs
fixed logging
fixed file extension management
pep8
authentication support
playlist support with memory store
a bit of refactoring
getFrameByNumber
bucket s3 fix
chained refactor
sending labels indicator
Merge branch 'mb-js-client' of github.com:ipeirotis/Troia-Web into mb-js-client
Reformatted code and fixed ping function.
little fix local ping, add all desktops and devices to local ping
Merge branch 'dev' into 246_local_ping
Local pings: scan all range ip of 192.168.137.xxx
write log for all hardwares is activity in local network
Search log pings for ip by date
preview version
Merge branch '246_local_ping' into dev
adição de um README (de novo)
Google Maps For Rails instead of Geocoder
Fixed UVs for VPLANE meshes
Merge branch 'master' of github.com:ivansafrin/Polycode
L5-P2: Completed & tested
pyp added
migrando a nuevo fichero GPX
added help plugin
make joining and parting a bit more talkative
setting mode to -t
adding a part message
adding shortcuts plugin, as well as sqlite db to the bot
Colour prompt should now work with one monitor.
added back calendar stuff
Clase Task mapeada
Merge pull request #4 from jawillis/master

Minification of .js files
Fixing some http issues - jawillis forgot to make minifying happen in debug as well.
Fixing secondary car number bug.
Version to 1.25.
Added something fairly unimportant. Want to merge.
Minor change to README.rst, to fix the requirements list.
Increase size of L2 cache to 64k
Clean up assertions
Consolidate a number of other enable lines into vectors.
Added a section that describes how to install additional providers using the features commands.
requires nil
quick debug of drop_down.php
Added costa rica csv file import script.
Add support for cancelling bookings
Reverted test runner commented out by mistake, sorry folks
try 132
try 133
try 134
try 135
try 136
try 137
try 138
try 139
Fix merge conflicts
try 140
try 141
try 142
Merge pull request #63 from jdragojevic/jd-jenks

last best attempt at config for running tests on jenkins.  About 1/2 there. Still missing stuff.
dev settings have the keys, testing with it imported.
Merge branch 'dev' of github.com:pculture/unisubs into dev
Stub test for SecurityInterceptorTest so that it stops failing on
Jenkins
Merge pull request #6 from jebyrnes/master

Fixed intercept problem
Merge pull request #7 from jebyrnes/master

Add functional predict.rrma
switch T to TRUE in predict.rrma to avoid build errors
Add formula test functions
Update Rd files, add coefplot.Rd
remove extra comment at end of file
Update...
Merge remote-tracking branch 'upstream/master'
Better handle empty meta messages - thanks jeff@pyebrook.com
Changed some things that wanted std::vectors to be templated
Fix incorrect information about Guard, added text about Spork.
Door#garbage -> private Door#_garbage
Particle#clear_merged! add a parameter r=nil

if r is set, it's used as receiver for#release_p call,
which allows to return the merged particle to the Spin instead of ruby GC
specs: cover Particle#clear_merged! r=nil param
improve hello_world example
Added mach syscalls
remove body height from isAtBottom function since is not used.
Fixed parsing-style features to not aggregate.
Changed phrase penalty to simple int feature.
if vm_cookie is not set the appilcation don't start
Merge pull request #116 from mihawk/master

appilcation don't start if vm_cookie not set
Merge remote-tracking branch 'upstream/master'
Removing load of JS file (we might not need it after all).
Removing obsolete files. Added directory listing protections to Customer, Directory, Search, Timekeeping, and Tools modules.
Removing unused JavaScript files.
Removing obsolete CSS files. Workstream/common_files/less/Workstream.css is the correct style sheet, though this will probably get moved to common_files eventually.
adding javascript runtime
Knockout, boundary condition autofill

If string that starts with "t" or "f" lower or uppercase are typed in
cell, fills in "true" or "false". Any other value reverts back to
previous value.
fix framing again Rest1 and Rest2
use seajs 1.3.1
index
add kml definition docu
completed metadata script
mapped score ID => url
cleaned up
Print out more data
Install atlas before numpy
fix adding a marker on a new sighting
Rev(001)V2
Small change to Facemovifier to correct error
will graphics work in markdown?
Mejorado el codigo
Update readme and all examples.
Added rails model and active model generators.
Ensure persisted_id is used when reloading object from adapter.
test commit

Only changed some space in thanks file nothing more nothing less :P
Fix mode arguments for FullYear and Month.  Fixes #105
Fixed MouseTrack when an axis is "time"

This used to throw an error when it tried to call ".toFixed()" on a Date
object.
Merge branch 'master' of https://github.com/HumbleSoftware/Flotr2 into gradle
Merge pull request #109 from neoGeneva/master

Fixed MouseTrack when an axis is "time".  Fixes #104.
Built.

Fixes for date month/year mode and fix for mouse hit with dates in the
time series.
Ignore node_modules and dev.
Integration with js-fiddle.  Add fiddle button.
Merge remote-tracking branch 'upstream/master' into gradle

Conflicts:
	.gitignore
update to gradle 1.0
set version number to 1.0-SNAPSHOT
oops, was in the wrong directory
Add helpful footer link
icon, splash image updated
Fixed README left over typo's
Added better ogg codec
Removed bad ogg codec, fixed audio engine
q2 start
ints to bytes
change file names and structure
Change to LWT threads
manifest is now automatically updating
no paragraph indents for ECE, 1em paragraph spacing
Added rules to .gitignore
Initial source code commit for GitHub
Organized imports and added serialization IDs
JavaDoc
Added the ability to do RI query

$repository->ri is now an object that can do ri queries.
added span and footer
Added call to get#ProductPrice, display prices
Modify code to use Strategy Design Pattern
Play around with a simple site
Set page title and analytics code
Add favicon
Add more to the site
Add .gitignore
No need for the mega big picture
Parallax'in
Actual information. WOW
Merge conflicts
VRRP - VCPEModel
VRRP flow in GUI and OpenNaaS
Compatbility functions for Emacs 24.x.

Emacs 24.3 introduced a new python.el with a number of functions
pyde.el uses. This creates (more or less appropriate) compatibility
aliases so pyde.el also works in Emacs 24 before 24.3.

Fixes #8
pyde-check: New function.

This overwrites the key binding of the default check command, and
always runs `python-check-command` on the current buffer without
prompt.

Fixes #2
Put spec back, should now be passing.
delete no meaning file
Removed an unnecessary div to the native scroll view and fixed CSS to make sure the layout option is properly inherited by its children
where to pick up next time...
Added development page.
Update download.jqueryui.com to 1.10.0pre.2, to test multi-version support on stage, after fixing dependencies
alteracao do parametro de ASTWriter de CompilationUnitHelper para
CompilationUnit
editors/vim: Fix from ftigeot (untested)
Success: net-mgmt/xymon-server v4.3.10_3
Success: databases/freetds-devel v0.91_3,1
Success: misc/metalink-tools v0.3.6_2
Success: databases/p5-AnyEvent-Redis v0.24
Success: deskutils/msynctool-devel v0.36_1
Failure: japanese/mutt-devel v1.5.21.j1_3
Success: textproc/p5-CSS-Compressor v0.02
Success: net-mgmt/torrus v2.05
Success: devel/p5-Devel-Refcount v0.09
Success: security/afterglow v1.6.2
Success: devel/p5-Getopt-Euclid v0.3.9
lang/tcl86: Fix properly
x11-toolkits/tk86: Blind fix
Fix to profiler

* No more dirty reads; we just update values at the commit (fixes #26)
* (view, method) now a unique tuple pair to avoid (fixes #24)
improve sorting performance. allow a way to sort on priority order for incident.
add priority to to-do and opportunity sort order.
Finishes Basic Graph implementation (hopefully)
Update Conformance section to include JSON-LD Implementations

This addresses #184.
Update RDF conversion algorithm in API with significant simplification after performing expansion on the input.
Merge remote-tracking branch 'origin/master'
stats test changes;\nminor improvements on stats panels
avoid to on 'never used' metadata on usage stats
 “1 weeks ago” instead of “1 week
improving on the metadata usage page
merge
fix many stuffs int the usage stats. checked the visualization on IE, Safari, Firefox, Chrome (Windows and Mac)
improving on the usability of stats panels
fix the usage of GeoIP functions: introduced the checking of the private IPs address and the checking of the requests from the crawlers to avoid the statistics distortion; manage the mfsp: query (ship them on the stats visualization)
improvements on stylesheet view_stats.css
minor cosmetics; pylint fixed and cleanup
restore a minimal stats test
restore a minimal stats test
restore a minimal stats test
Changes in statistics model to take into account the resource status: add 'ignored' fields in LRStats model; updated stats tests; fix bugs in mystat page; add help comment in usage stats page; improve styling and clean up code
add 'show more' button in the visits statistics panel
update docs/META-SHARE_User_Manual.doc with stats info
update docs/META-SHARE_User_Manual.doc with stats info
update docs/META-SHARE_User_Manual.doc with stats info
update docs/META-SHARE_User_Manual.doc with stats info
Merge pull request #542 from cgirardi/master

Improvements on statistics updating
fontfaced
#JC-1040 prepared statements off, for tests
#JC-1118 #JC-1119. Sender link at pm page.
updated excel ?
Better styling of dumplog link column
Add dumplog download column to server games view
News about correct AceHack/NetHack4 trophies
News about dumplog links being added
fixed redirect on SendMailMitgliederFilterAction
Adding third party repos
Bam!
removed, "warnings" lines.
add provider
remove .settings from git repo, cleanup
give credit to all contributors
Added type check to setters.
Merge branch 'master' of https://github.com/jyggen/YoutubeThumb
Manifest altered slightly
JJJLLL
Migrating to new design in progress (MySQLClient).
Migrating to new design in progress (MySQLClient).
Network i/o
Fix: Correct Actor name
remove duplicate line with reference to PHP 5.2
Fixed bad safe mark on video source
Merge pull request #69 from kalupa/viewables

Fixed bad safe mark on video source
Version bump v0.5.0.1
Target for android 4.0
only red FUUUU
Playing around with gradients.
Merge branch 'master' of https://github.com/karma4u101/cms_site.git

Conflicts:
	site/src/style-app.cms.xml
Updated Dashboard server info
Signed-off-by: KatzSmile <katzsmile@lead-games.com>
限界・・・
Added a frametype to UKIDSS - required for uwish2 data
Added filters to UKIDSS - again, required for uwish2 data
Empty the 'docs/astrodata' directory.
Change references to the 'astrodata' package, remaned to 'astroquery'.
Add a __init__.py file for the 'besancon' subpackage.
Add missing subpackages to docs' main toctree.
Merge pull request #15 from fgrollier/astrodata-fix

Astrodata and other fixes
Added try/except clauses for NRAO image archive; it unfortunately
requires either coords (an unmaintained package) or astropy's coords,
which doesn't exist yet
added a new UKIDSS example and fixed the get_images code to accept
'none' in the directory keyword.  Added a progressbar retrieve function
Ignore Eclipse related files.

.project
.pydevproject
Initial commit of vizier package.
Initial commit of vizier package documentation.
Fixed typo in Veron & Cetty.

Removed accent on Veron, does not look nice on github otherwise.
Changed VizieR server default to "vizier.u-strasbg.fr".
Improved documentation for astroquery.vizier.vizquery
added Kyle Willet's "nedpy" routines
Merge pull request #17 from jwoillez/vizier

Add capability to query VizieR with a vizier package.
Copy bootstrap-astropy theme from astropy
remove default.css import from astropy.css - now not needed
update conf.py to use bootstrap-astropy theme, mirror astropy's version
Implemented matrix sequencer UI.
fixed bug in projection.py that prevented from selecting a station
bug fix when no tracks are available
order reviews from recent to oldest
changed extra grade item fields in database to type varchar
random battleground (arathi) + guild system
wrote rough yui filter
Templates.
Add wording.
Octopress init
Site updated at 2012-04-28 03:04:48 UTC
Html Tweeks
Contents of html from commit da47c61b
semester number style
deleted fat kenny and adrian
Added support for specifying a tile index during decoding; support for J2k codestreams
invite form tweaks and footer bug fix
21L011 lecture 11
Fixed forwarding paths in UserController. Register no longer redirects upon error
Remove unicorn (for the Windows) and add sqlite3
Gemfile.lock
Devise 2 changes
adding examples to work with
Bugfix: regression for nodeunit
logiraj a ne samo MsgBox pa quit
pos, fiskalni račun storno generisanje bugfix f7, f8
[docs] I-D multipart wip
tweaking. figured out outstanding batches is always an exact fit. bad design.
Removed some copypasta cruft in the mobile template.
Initial stab at mobile UI.
Update boxes_plugins/more_boxes_imce.inc
fix to xmedicus_id
add my fork of pyflakes
Allow more steam community links
added inputs...
fixed a playlist
Remove rake alias; it causes issues when chained with foreman run
Update oh-my-zsh
added tweet preview
Added caption styles to student page
added rails to bundled_commands
fixed asterisk display for modified repos in git prior to 1.7.2
changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
fixed introduced to parse_git_dirty
Merge pull request #925 from cruser42/bugfix/gitversionfix

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

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

URGENT: Fix for bug introduced in pull request 925
Python plugin: added pygrep command, simplified pyclean
added aliases for sublime text
changed the alias to use to cli provided by sublime text
Don't drop everything after a trailing slash, as this breaks standard svn branches:
^/branches/featurename
^/releases/Release-vx.y
^/trunk
Suppress "zsh: no matches found" error when $ZSH_CUSTOM has no files

The addition of `(.N)` enables the `NULL_GLOB` option which suppresses
the error output in question.

Reference: http://www.zsh.org/mla/users/2004/msg00621.html
Load themes from `$ZSH_CUSTOM` instead of `$ZSH/custom`

This seems like a simple oversight, everything else uses `$ZSH_CUSTOM`
rather than `$ZSH/custom`.
Merge pull request #1111 from jimeh/fix-ZSH_CUSTOM-variable

Fix $ZSH_CUSTOM variable
Merge pull request #1105 from Drarok/fix-svn

Fix the svn plugin only outputting the 1st path segment
Merge pull request #1079 from dylnhdsn/feature/sublime_text_plugin

added aliases for sublime text
Merge pull request #1026 from dir01/patch-1

Python plugin: added pygrep command, simplified pyclean
Merge branch 'master' of github.com:kulikovav/oh-my-zsh

* 'master' of github.com:kulikovav/oh-my-zsh:
  my
  my
  my
  disable g alias
templates
Upgraded dependencies to latest.
Delaying s/2/4/ indentation for too long. Definitely more clear.
Add Autoloader, Application, Request and Response
Add Library to gitinore
LuaJit with Clang and Static library
doing my thang
add confwindow with all settings and list files inside the folder view when there are no more folders
ajout de news et modification du slider
ajout de news et modification du slider
ajout photo elve
unicode upgrade - handling bad characters in ffprobe output
start shadow mapping
shadow mapping ing
shadow antialias poor
fuck
lua improvements
don't create certs we're not using
remove more unused code from generate_keypair, update rdoc
fix whitespace
Override runlist support
Merge branch 'CHEF-2988'
[CHEF-2705] - fix regression where fqdn as default was lost
Load scm provider in deploy provider before any interaction with scm could happen.
Merge branch 'CHEF-3010'
[CHEF-2068] Use Net::HTTPRedirection class to detect all possible redirections (Found, Moved Temporarily, Moved Permanently, See other, Multiple Choices, Use Proxy).
[CHEF-2068] Add generic redirection support on #run_request method. Add specs with generic HTTPRedirection requests on #run_request and #api_request methods.
[CHEF-3025] Add --json-attributes option to knife bootstrap, which will be merged into the first_boot variable in the bootstrap context along with the run list.
[CHEF-3025] Fixed failing spec due to JSON parse order error
[CHEF-3025] Attempting to fix spec comparison. Again.
stub out Tempfile in solaris cron spec
[CHEF-1408] Use rubygems api to compare gem versions.
[CHEF-1408] Specs for rubygems version comparison support.
[CHEF-1408] Minor spec clean-up.
basic linaro support => use ubuntu settings
Merge branch 'CHEF-3032'
Minor update of README's: (c) 2012, spaces, rspec 2.8
Upgrading to rails-3.2.3
fix #3: ddfd
Bump version
Add class method config
Bump gemspec
remove import ANSI in consumer and producer
allow direct install from extracted zip file

handles lack of config.php and data folders
debugging web proxy
Added boiler code.
Added a browser compiler to Cakefile, and a browser namespace adder.
fix, reconnect after break
add haskell mode
comment hiline feature
Make haskell-mode works for me
add autopair mode
Add Term::ReadLine support and PKGBUILD file

* Add readline support for (slightly) better input handling
* New PKGBUILD file for Arch Linux (AUR)
* When vote changes, output goes on new line
* .gitignore: remove unneeded ignores, add useful ones
* Rename the script file
Update test/database/DeleteDataBlockTest.java
Import API parameters the same as in merge API

For consitency updated import API to take result files and attachments
in result_files[] and attachments[] instead of the old report.[1..n] and
attachment.[1..n]. The old ones do still work so there should be no
compatibility issues. Need to update documentation once the code is
merged to master.
Do not monitor port if protocol is UDP
Updating logo files for top and bottom silk
scale the lower end of the range to 0

shift data points so that the minimum value is 0.
also fix integer round off error by using float().
Generate time line graphs in processData-ascii

Port timeline graph generation from processData-graph.
remove test api key, secret, token; and the api key was blocked
header
fixed merge
some stuff
Teste E-mail
Prepare for GitHub
Them README
Walkaround for Unikey to work on Windows
Tim cach bo cai thu muc backup va undo

Co the co thong tin nhay cam o trong...
LF ending in .gitignore
Tiep tuc
CRLF
That su xoa may cai roi
Them vao Supertab Continued. (DOT)
Merge branch 'master' of github.com:linktohack/dotfiles

Lan truoc quen khong push
Conflicts:
	.Xdefaults
	.emacs
	.emacs.d/ac-comphist.dat
	.emacs.d/ac-dict/tcl-mode
	.emacs.d/auto-complete-extension.el
	.emacs.d/autocomplete.el
	.emacs.d/color-theme-6.6.0/COPYING
	.vim/bin/ack.cmd
	.vim/bin/jsl.default.conf
	.vimrc
Chuyen qua laptop lan nua...
Chuyen qua laptop lan nua...
Update vim addons
Merge branch 'master' of github.com:linktohack/dotfiles

Conflicts:
	.gitignore
Merge branch 'master' of github.com:linktohack/dotfiles

Conflicts:
	.gitignore
Prepare for GitHub
Finished Ch6 (correct version) user models
Some map api docs.
Adding a simple documentation.
var -> value
suite du CSS Nuit de l'info, correction titre de page dans le main layout, ajout du nuage d'univers sur la page d'index, correction de la liste de l'indexController
Adding SKU#
Shaping up the project

- Included index.html in all public folders in case web server is
configured to show folder contents
- Cleaned up config.php file
- Fixed a bug that failed to select current directory
- Filled out ReadMe file
Generate static_pages integration test.
Added an explanation about the patterns
add more stuff for file handling
ate exercicio 10.4
Ateh exercicio 12.3
ate exercicio 13.3
redirect_uri is a keyword arg, not positional

The example wasn't working before, this fixes it.
bugfix
check previous exception for php5.3
update twitter api config
epub: kinovar' color for headings; \myemph and acute accents configuration
Added a section to the README describing how to use drift-db with drift.
Fix `undefined method 'in?' for string` bug (close #1)
completed code generation
WT-57- parsed text
file defuns; empty ffip setup
handle darwin/linux
test: first stab at testing usr-workarea
[0050] Tutorial flag opcodes, SMSG_UPDATE_ACCOUNT_DATA

Signed-off-by: Yaki Khadafi <ElSolDolLo@gmail.com>
[0068] Typo

Signed-off-by: Salja <salja2012@hotmail.de>
[sd2_mr0493] Correct combat movement and drop solved comments (Sapphiron)
Fix regression related to sld expression (#3929)
Fix bad handling of startindex with some drivers (#4011)
Merge branch 'branch-6-2' of github.com:mapserver/mapserver into branch-6-2
Added history note
fix segfault in proj error message reporting

fix a stupid segfault caused by some more verbose
error reporting introduced in #4041
Necessary file correction.
MDL-34665 merge with me
TODO REMOVE request log
TODO REMOVE temp small lifetime
MDL-34290 repository/lib.php phpdocs
dropbox temp
MDL-36048 Allow course formats to add course headers and footers

- Added functions in class format_base
- Added global functions in course/lib.php
- Added calling of course header/footer functions to the base theme
- output renderer checks if theme calls the coures content header/footer functions, if not calls them explicitly and displays a development warning
MDL-35770 Converted scorm format to new course formats API
MDL-35770 Converted social format to new course formats API
MDL-35770 Created class format_topics as copy of format_legacy
MDL-35770 Created class format_weeks as copy of format_legacy
MDL-35770 Converted topics format to new course formats API
MDL-35770 Converted weeks format to new course formats API
caching of section format options
Make smart rule creator dialog draggable
Remove "public"
Remove useless import
Add marks
added dojox.layout.ExpandoPane
make really obvious that we shouldn't use this repo, but leaving notice and not just deleting to be nice to future computer archaeologists
Improving the `Basic Example`.
Bumping version to 1.2.3.
Adding a java require to the jenkins cartridge spec
Adding a link to the Jira issue for the Jenkins spec
Adding >= 1.6 to the java require to avoid pulling in gcj
Merge pull request #454 from brenton/spec_fixes1

Merged by openshift-bot
Fix for Bug 864681
Merge pull request #633 from jwhonce/dev/bz864681

Merged by openshift-bot
rename max_scale/min_scale to scales_to/scales_from
Merge pull request #638 from rajatchopra/master

Merged by openshift-bot
updated ews cart
Merge pull request #643 from bdecoste/master

Merged by openshift-bot
Adding support for amqp instead of zeromq
Make dynamic random playlist play better with user added songs

Don't truncate the playlist until it's near the end
Allow the playlist add to work on arrays

Having the playlist handle lists correctly when adding items
means that things like server-side saving don't get queued
for each object.
Basic styling of special playlists in tree
Fix possible race condition on ajax fetching

Make sure that the ajax callback to add songs to the dynamic playlist
won't do anything destructive if it fires after the playlist is
disabled
Fix this => self in playlist add
Grey out played entries on the playlist
Add preload library and initial build system

Create autotools build system.

Add a small LD_PRELOAD library (inspired by path.c from kmod) to wrap the libc
functions that libudev needs for prefixing the paths with $UMOCKDEV_DIR.
Cover sysfs for now (which mostly needs open(), readlink(), and stat()), but
this approach is extensible for intercepting sysctls, device node access, and
similar things in the future as well.

Add a small shell wrapper "umockdev-testbed" which runs the argument under
the appropriate LD_PRELOAD. This is more robust for third party test suites and
also allows us to change the test bed implementation in the future.
Altered User.Java to use Unix Time in toString()
Fixed MongoDB Drivers
Versioning upgrade: 2.0.0 tag.
Corrections on *.markdown end sprint 7
spaces for tabs in tex (was driving me nuts)
ui shaders
updated grapevine

only shows top 10 now
simply get value of first/last element
creating tests for bookmarks;
Added hello World Label
Added the property helloWorldLabel
Refactoring: extending WebDriver capability
Always use the first (highest) version for displaying history

refs gh-89
Complete addition of all base files.
変数のスコープが無駄に広かったので直した
- AbstractServer getServerSetup has to return the really used connection port
Bump version to mbaechler-11
Merge pull request #4 from thomas-hilaire/master

Automatic port problem
Usunęłem wszysko
Fixed missing codec using global audio.
stab at adding abstract/bio
Remove last platform specific code form thread.cpp

A somewhat tricky function pointer cast allows us
to move the platform specifics to lock.h, the cast
is tricky because return type is not the same of the
casted function in Linux (for Windows return type is
a DWORD that is a long) but this should not be a
problem as long as the size is the same;

From: http://stackoverflow.com/questions/188839/function-pointer-cast-to-different-signature

"OpenSSL was only casting functions pointers to
other function types taking and returning the same
number of values of the same exact sizes, and this
(assuming you're not dealing with floating-point)
happens to be safe across all the platforms and
calling conventions I know of. However, anything
else is potentially unsafe."

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
Rename current_time() to now()

Follow C++11 naming conventions.

No functional change.
Added dlls from AForge
Zero is not less than zero. Fixes BUKKIT-3259
Added TileEntitySkull for diff visibility
Implement Skull BlockState. Adds BUKKIT-3259
Implement API to get and set FireworkMeta on Firework entities
Updated version to 1.4.6-R0.1 in pom.xml for Beta.
Updated version to 1.4.6-R0.2-SNAPSHOT for development towards next release.
Add BlockJukeBox for diff visibility
One record per JukeBox.
Allow fireworks to be created. Adds BUKKIT-3262
Add DispenseBehaviorFireworks and EntityFireworks for diff visibility
Fire BlockDispenseEvent for fireworks. Adds BUKKIT-3246
Update firework power when modifying meta. Fixes BUKKIT-3272
Remove runner leak on async tasks. Fixes BUKKIT-3288

In some situations, an async task could be cancelled with no tasks
pending. This means the finally {} block from run() never gets executed
properly on the last async task to have run, as it expected to be
executed again.

This fix takes the only spot that the task period is set to cancelled
and will check to see if the task should be purged from the runners
list.
Report valid health when getting Entity health. Fixes BUKKIT-3210
Implement entity max health methods. Adds BUKKIT-266
Properly update fireworks. Fixes BUKKIT-3289
Fix fireworks being short lived. Fixes BUKKIT-3291
Fix Skull BlockState setting illegal values on owner.
Perform permission removals after the quit event. Fixes BUKKIT-3303

The player would have no permissions (other than their OP status)
when checked in the Quit event. This is because we removed permissions
before the event occurred. By calling it afterwards, we can persist
the data until the server finally removes the player.
Fix fireballs being motionless (again). Fixes BUKKIT-3299

The key "direction" incorrectly mapped to variables that were already
set in the entity. In order to prevent loading incorrect data we
renamed "direction" to "power."
Add TicketView.
Add 'View Activity' button.
Add subheader with venue and date information.
Merge pull request #14 from meqif/29641203-show-ticket

[#29641203] Ticket View
Changed the position of the label to a higher position.

This makes the icon look shorter, but keeps a margin all around the
button.
Merge pull request #25 from meqif/30988797-homescreen-icons-restyle

[#30988797] Homescreen icon height
This seems to work better than e726639a93579a27dec424bfa05c3e341561320b
I forgot all about vimpager
baseline.target needs to be set before before baseline.setbase() is called:
 * Remove code that set baseline.target in init().
 * Call baseline.tellmetarget() before baseline.setbase().
Remove quotes from the examples at the top of baseline.js. The second parameter needs to be an int. Strings will not work.
Fixed div. Added home page route.
after NIPS
after NIPS
crossvalidate
crossvalidate
delete_db version is now based on Neo4j version.
Support for using a different neo4j port in Travis

... since the default environment includes its own Neo4j already (of a
version we might not want).
added job creation, removed parsetest from makefile
update mayaCommands
add TODO file
Images have been moved from javascript code to HTML.
implement PAUSE on space or "p" in SDL game play
make PAUSED text over the whole board and set wm title in SDL
add and use new tiled background image
Ended Image loading module
New image calibration module
.
Switch testing Lightroom directory over to NSURL.
Change to github flavored markdown
attempt ~15
Make sure it init's prior to script run.
add k_pT to standalone
index
Merge branch 'master' of https://github.com/misteryyy/project-f
change tags_xref.lid to id
Update styles/css_32grid.txt
Maybe final mechanics push
Removed old code
updating home page content
Enable ReturnToSourceQueue tool to handle V2.6 messages.
Added a option to suppress the use of DTC but still keep the retries
provided by NServiceBus
added logic to edit project file while installing NserviceBus.Host package
Added saga type to the timeout messages to allow us to do a smarter lookup
by saga id when a timeout fires. This avoids unessesary calls to the saga
storage
Fixed misconfiguration of diagnostics store
Merge branch 'develop' of https://github.com/NServiceBus/NServiceBus into develop
Fixed a bug where the Ninject builder would blow up for public properties
with a private set. Closes #204
Disabled module loading for ninject nested kernels since that causes ninject
to blow up if castle is present
Child components are now resolved correctly using the unity container
Fixed a bug in the unity builder that prevented singletons to be resolved
Created a more robust implementation for setting property values for the
unity builder
Fixed a bug in the unity builder where properties with only a set method
would not be property injected
We're now logging a warning if no handlers could be found for a given
message. If we're in debug a exception will also be thrown to alert the
user
Disabled the nuget configuration transform until we can make sure to not
break people that have specified a other name for their error q
Enable Bus.CreateInstance<Interface> to map properly custom attributes.
Closes #187
Merge branch 'develop' of github.com:NServiceBus/NServiceBus into develop
Fix Deferred message sending in Unobtrusive sample
Fixed the problem with transform of app.config in Host packages using install.ps1
Modified the host packages to only update the app.config if needed
Included xml declaration in the app.config
Print offset arrays
Added first, last, take, drop
Memory bug
Corrected ARR_PTR_AT->arr_Ptr_at, bugs in eval, del for arrays
meta value syntax fix
dom ready now passes window instead of calling in the context of window.
indents in DList
activity feed built, comments started
replace persona with login
Merge remote-tracking branch 'bebe/mark_BrowserID' into pull383
adding login mark to xfailed reviews tests since refactor isn't merged yet
Merge branches 'pull383' and 'master'
Bug 791426. Fix bustage. r=bustage
Changed Fav Icon to current Logo
working on search cards
Media can now be merged via option in Settings.py
*Added webassets library.
*Added cssmin and jsmin libraries for compression.
*Added Flask-Assets
*Created `build_assets.py` script to merge media.
Edit Page Clean Up.  Took out things for the presentation that we didn't have time to update.
Tested TXT-file-parser, made all additional 2.1x BSL commands, added testfile

*The parser seems to work
*The 2.1x Connection class makes sure that the memoryOffset is correct when\
handling devices with more than 64kB memory.
*I added the file I used for testing the dll.
it contains some examples on how to use commands.


ToDo:
*fix Lane's 5xx USB buffer flush issue

Known Issues:
The directories for the DeviceList and TXT files have to be absolute.
Somehow it doesn't work for relative directories.

Signed-off-by: Matthias Pritschet <github@pritschet.eu>
'implement Favorites menu , create desktop shortcut , and bookmarks'
Ajout de diagrammes de classes. Reste à ajouter : diagramme usecase.
Fixed error in select test code
Added mouse input handlers
Apparently, even adding unit clauses can disturb the watchlists

So add them delayed, too. But the delay should not be so much, so check
it more often.
Forgot to initialise the time count to 0
Update to new version of metrics tracking
Version 2 almost done. Data is in array but not getting read properly
first human commit
Merge branch 'master' of https://github.com/mugmickey/crossgate
singletonの扱いの修正
Merge branch 'develop' into setting
ログイントークンの実装
Merge branch 'setting' into develop
Themed the UI a bit
Removed seen crap
little cleanup
Made it possible to pick ICB host
Made settings blue
add regressions test for joinMeasure()


git-svn-id: https://mscore.svn.sourceforge.net/svnroot/mscore/trunk@5581 e27ab94a-cc1d-0410-850c-f737b25541af
fix #19076: Crash when copying and pasting range with lines
Merge pull request #137 from lasconic/19076-crashline

fix #19076: Crash when copying and pasting range with lines
start on tests for irc.py
GTNWSRP-304: updated patch to better support username token usage with other actions such as encryption and/or signing
examples updated to client version 0.0.3
Merge branch 'hotfix/no-html-conversion-for-hidden'
Only offer download links on publicly visible requests
Check that a request is publicly visible before generating a download link.
Use helper method for download path, and use Rails.root instead of file location.
Put download zips in a predictable location - sharded folders based on request ID, rather than distributing them across the download directories by the generated SHA. Preserve the uniqueness of the subdirectory.
Remove any download zip files when a request's cached files are expired.
Merge branch 'hotfix/authenticate-and-expire-download-zips' into develop
Merge branch 'release/0.6.4'
Add Alaveteli application version.
Move the installation of themes to a Rake task so that we can use the ALAVETELI_VERSION constant to check for tags in themes that indicate compatibility with this version of the Alaveteli codebase.
Update location of theme repositories - now in the mySociety account.
Pass through verbose param, switch to false.
Update with mysociety repo.
Update references to point to the mySociety repo.
Handle absence of deprecated THEME_URL option.
Raise an error on a non-zero return code from the git pull command.
Add fixture for an external request without a username.
Fix basic admin interface in case where external request without username is being displayed.
Fix for the case where an external request has no user_name
Update spec for previous commit.
Give external request request event unique timestamp to fix spec failure caused by two requests with identical last event timestamps.
Merge branch 'feature/repo-move' into develop
Allow serving of html versions of cached attachments by Apache, as well as the originals.
Latest translation files from Transifex. Just doing a pull for this release as there's only one new msgid, and not one that anyone will be needing in a hurry - it relates to external requests without a user_name.
Update CHANGES.md for release 0.6.5
Bump ALAVETELI_VERSION.
Add note about new methods on PublicBodyCategories.
changes to allow regex filters
Make the SSH test more portable.
Finished layout and routes, just trying to be a big boss
reset the db migrate
make multigroupby compatible with cascading 2.0
typo in changelog
Added Rout gen
Fixing reverse transliteration
Bug 769195 - Fix an overzealous GuardShape in TestCommonPropFunc(). r=jandem
Bug 786073 - Don't animate lock icon when switching or restoring tabs (r=mfinkle)
Bug 786103 - Advance the aSrc and aDst pointers when copying video planes. r=roc
Bug 744700 - B2G 3G: Notify connection errors in the WebMobileConnection API, r=bent
Bug 744700 - B2G 3G: Notify connection errors in the WebMobileConnection API, r=philikon
Bug 786979 - Use a new constant for returning ICoreWindow from GetNativeData. r=bbondy
Bug 564815 - Implement window.devicePixelRatio [r=jst, sr=sicking]

--HG--
extra : rebase_source : 392c6636fabe2a3ec519abd03ef1b1cf44ba464e
Bug 788404, return unconditionally from attempts to insert from drop to prevent mutliple copies of text from appearing in contenteditable areas, r=ehsan
Bug 723107 - Re-add mozdevice to testing/mozbase, remove duplicate files in build/mobile;r=jmaher
Bug 787769 - Clipboard option for CF_DIB is now explicitly specified. r=jimm
Merge m-c to inbound.
Bug 688382 - Add some logic for text-transform checking to avoid merging the first-letter text-frame with the rest. r=roc
Bug 787650 - Add element id attributes to pageInfo.xul. r=adw
Bug 788924 - Implement "pictures", "music", and "videos" special folders. r=dougt
Bug 788924 - Use "picture", "music", and "videos" special folders for DeviceStorage API. r=dougt
Bug 789307 - Unlock() the graphics buffer if we're not going to consume it. r=kchen
Backout 1566e8499cb8 and fcc61274ec43 (bug 744700) due to mochitest orange.
Bug 788971 - Pymake chokes when native commands raise exceptions without a "code" attribute. r=ted
Bug 788914 - Removing failing assertion in EnableUniversalXPConnect. r=me

This seems to be failing intermittently during linux64 jsreftests (possibly due to OOM?). UniversalXPConnect is a test-only construct, so we don't really care too much about a failure here as long as it doesn't go orange in other ways.
Bug 789107 - Fix attributes of ParallelArray length/shape (r=dvander)
bug 776783 - add Makefile.in and wrapper script r=ted
Bug 773039 - Don't populate menu accessibility event with descendant strings. r=blassey, a=akeybl
Bug 773085 - Make door hangers keyboard navigable. r=margaret, a=akeybl
Bug 771727 - Block focus in tabs panel when it is hidden. r=sriram, a=akeybl
Bug 762727: BrowserToolbar needs to re-created on rotation. [r=mfinkle a=akeybl]
Bug 762727: Tabs Panel refresh on rotation. [r=mfinkle a=akeybl]

--HG--
rename : mobile/android/base/resources/layout-xlarge/tabs_panel.xml => mobile/android/base/resources/layout-xlarge/tabs_panel_toolbar.xml
Bug 780442 - About:Memory page buttons are overlapping, oversized, r=margaret, njn
Bug 760447 - Update .ua entry in PSL. r=gerv.
Bug 772069 - Update .uy entry in PSL. r=gerv.
Bug 803493 - Fix Makefile.in entry for /dom/media mochitests. r=jesup
Backout 5eec0a5b76ff, 64e143317082 & f356d9b2524c (bug 808288) for reftest failures
Bug 808313 - changing location.protocol can break nsFtpState::Init r=jduell
Test case for bug 815359 - r=joe
Bug 814549 - Fix OOP app segfault when exiting the app. r=cjones
bug 779520 - get rid of Accessible::Init() r=surkov
Bug 815928 part 1: Fix typo s/elelment/element/ in comments & tests. DONTBUILD, rs=Waldo
Bug 815928 part 2: Fix typo s/elment/elment/ in comments & tests. DONTBUILD, rs=Waldo
Bug 815928 part 3: Fix typo s/elemnt/element/ in comments & tests. DONTBUILD, rs=Waldo
Bug 815928 part 4: Fix typo s/elemnet/element/ in comments & tests. DONTBUILD, rs=Waldo
Bug 711901 - When possible, measure, don't compute, the size of imgFrame::mImageSurface.  r=joedrew.

--HG--
extra : rebase_source : 72dc61c2618166262ec6d83778d7bd2a3a7b5d61
Bug 814272 - Cache the bounds of nsDisplayBackgroundImage items. r=roc
Bug 796847 - Make AdjustInvalidAreaForSVGEffects correctly adjust for the coordinate space of the input rect. r=dholbert
Bug 796847 - Fix typo in reftest file. rs=npotb DONTBUILD
Assert that GC things are only marked on the main thread, bug 815906. r=billm
Bug 815646 - enable logging for accessible/states/test_link.html
Bug 796847 followup: Fix typo in test filename in reftest.list, fixing reftest orange.
Back out 0c242b9fcb54 for Moth crashes
Bug 809259: Properly handle allocation failures. r=kanru
Bug 804680 - Part 1: Support MORE_TIME in RIL. r=allstars.chh
Bug 804680 - Part 2: xpcshell tests for MORE_TIME. r=allstars.chh
Fix up indentation of the generated code for event handler return values.  No bug.
Bug 812785: ICE issues r=jesup
Bug 754669 - fix stack corruption in WebGL texImage2D parameter validation - r=jrmuizel - landing on a CLOSED TREE because this stack corruption started causing mochitest-1 crashes
Back out 58ca5bf07352 (bug 738480) for xpcshell and browser-chrome orange on a CLOSED TREE
Bug 612391 - Convert CSP violation reporting from XHR to nsIUploadChannel. r=jonas
Bug 744063 - Pass Y' texture size rather than picture size to Nv3DV.  r=bas

--HG--
extra : rebase_source : 3a8744b67a9cd8b3f149d0c20fa5e0619b34fe9a
Bug 757485, remove nsIXBLService and use nsXBLService directly, r=bz
Bug 752872 - Upgrade SQLite to version 3.7.12.1 (SQLite changes). r=mak
Bug 752872 - Upgrade SQLite to version 3.7.12.1 (Mozilla changes). r=mak
Bug 731423 - Don't do incremental GC when hitting alloc trigger (r=gwagner)
Bug 757483 - Don't throw away JIT code during later incremental slices (r=bhackett)
Backout 8cf563a575fd (bug 734015) due to random Moth orange.
Bug 757667 - Clean up Proxy tracing (r=terrence)
Merge m-c to inbound
Bug 757755 - Make sure that the reftest suite never attempts to download and stage an update; r=dbaron