labofsahil/github-event-dataset-2012 huggingface dataset:
Require pygments 0.2.8
Correct mime type test
Minus jruby
rbx too
Add 1.9.3 though
Ensure our custom mime types override mime-types lib
Merge pull request #147 from baoshan/linguist

PowerShell, not Powershell
Fix tests
Merge pull request #142 from jaxzin/detect-tea

Added detection of the Tea language.
Fix sorting
Merge pull request #138 from jesusaurus/817b36ca61b80fe61c243f5eaf964e5cb78885c6

Add Modulefile to Puppet
Merge pull request #140 from jstrachan/detect-kotlin-language

Added detection for the Kotlin language
kt extension is real now
Merge pull request #141 from semperos/lsp-extension

Add .lsp as an extension for Common Lisp
Merge pull request #135 from ecere/master

Added eC and Ecere project (JSON, .epj) to languages.yml
Merge pull request #144 from shortstuffsushi/patch-1

Update to vendor.yml to include the ExtJS Javscript Framework
Set lexer for VHDL language.

Conflicts:

	test/test_blob.rb
New lexers in 1.5
Merge pull request #146 from trq/add-php-syntax-for-phakefiles

Adding PHP syntax highlighting for Phake
Ignore any root dir named samples
kick off quorums
codes
New Ignore Config
New Ignore Config
增加了第三章课件和前三章的代码
route: two step algorithm (compute pixels, then draw number of frames required)
route: implement frame interpolation and extrapolation
Added aggro to server.js
added tmux.conf
add fasd
hgds
more table browse stuff
Changed `BeEF::API.registered?()` to use the `:is_matched_params` method

Fixes issue #500
Add Ch2_3_Summary.md
16:52:54.78
Big update to the styles to finish it off
If I'm going to change the styles it needs to be done properly
Yes I might have ruined the search box slightly
Lots of work done on the documentation, final commit
Deploy from 2012-12-11 13:30:48 +0100
Latest round of TTS changes
Merge branch '0.5.0-bookshare' of https://github.com/benetech/readium into 0.5.0-bookshare
Create and purge queue in one statement
Extract TODOs into their own file
Allow unit tests to override default Renderer template_dir etc
Added additional watched folders & files

Added triggering on add/remove/rename of a file in any of the following
folders (case-insensitive): "Assets", "CSS", "Images", "JS" or "Styles".
Added triggering on save of "T4MVC.tt.settings.t4".
allows gunicorn to bind to multiple address

Allows gunicorn to listen on different interface. It can be either ipv6,
unix or ipv4 sockets.

Ex:

    gunicorn -w3 -b 127.0.0.1:8001 -b 127.0.0.1:8000 -b [::1]:8000 test:app

fix #444
fixed distribution settings
disabled some
rotation fixes
Merge remote-tracking branch 'upstream/master'
fixed rotation
adding slider
minor issues
alpha crap
just removed version from nav, annoyed me
replaced tap label with default image
fixed splash image filename
adjusted image size
fixed weirdo bug appearing only in ios4
added autoresize on pagebar show/hide
added opaque currentThumb
removed statusbar
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Sources/ReaderMainPagebar.m
	Sources/ReaderViewController.m
	Sources/ThumbsViewController.m
merged this stuff to upstream now
updated to last leaves version
added resize capability
added image resize to build
added libreader static target
Permit <bdo> tags and the lang and dir attributes when displaying HTML

The <bdo> element and lang/dir attributes are used in mixed language
contexts and they are often essential for correct display.  CKEditor
will also generate the attributes if properly configured, so RT
shouldn't scrub them out.

Refer to http://www.w3.org/TR/html4/struct/dirlang.html#h-8.1 for the
source of the acceptable values.

Resolves [rt3 #19691].
Update scrubber tests to expect lang attributes
Merge branch '4.0/html-language-attributes' into 4.0-trunk
增加数据库备份文件
Merge branch 'master' of https://github.com/bestsuke/promote
in some cases (jet-lep).M() < 0, and in rare cases still has Pt above threshold: kill those jets
Merge branch 'no-neg-mass-jets' into alk-kinfit
New average unit price graph (trend)
Creation, Generation and deletion of projects is working with Hibernate!
Change category 'PBX' to 'Switch'

git-svn-id: http://fusionpbx.googlecode.com/svn/trunk@2375 e2954ef0-caed-11de-bd98-e341d93cc3cc
Better handling of `__file__` when running scripts.

* Set `__file__` when running `ipython filename.ipy`
* Avoid leaking `__file__` back into the main namespace when using `%run`.
Add test for `__file__` behavior in `%run`.
Add test for `__file__` behahvior in `ipython <file>`
doxygen: added some doxygen comments.
twi: fixed the disable bit mask.
usart: optimized the BermudaUsartTransfer function.
usart: added a listen function.
stdio: added a specific file for the usart stream.
streams: fixed header include.
Merge branch 'io'
stdio: added serialio.c to the Makefile system.
doxy: added doxygen comments to serialio.c and serialio.h.
doxygen: modified the doxygen file for version 0.0.5.
Merge branch `readme` into `master`.
Merge branch `readme` into `master`.
Release 0.0.5.
Merge branch `version-0.0` into `travis-ci`.
下载课程的xml文件。
Automated commit at 2012.11.12. 9:09:47
minor: wrong URL on README.md
syncDeletions now also deletes fields
Using the latest bjonnh:develop tw2.jqplugins.select2 to get initial values
Working copy of API examples

Both a simple and more complex example of the API functionality is in
place.
Added config-file

Added a template for the config-file
can handle below both. add for S7 ext sdcard.
	private final static String StartDir = "/mnt/sdcard/stream/";
	private final static String StartDir2 = "/mnt/ext_sdcard/stream/";
position all buttons at one line.
increase audio buffer.
and avpkt.size = 0; if decode failed.
read duration_in_second  from jni.
'getOptions->' to 'getOptions()->'
Modified parse_gff3 to allow absence of structuring comments and to
improve compatibility with parse_gff2.
Modifications required the update of three scripts.
Labelled Dial.......labelled
add write functionality to gzip & dictzip
add readme;clean complie warings;change sdkpath in make.sh
Move composite to startup-programs
Added a Message Object
Updating Travis icon for the dev branch
Added links for travis for dev and master.  This merge resolves issue #54
Added blank as default to due date, so it's optional.
today
Merge branch 'master' of github.com:bobuk/addmeto.cc

* 'master' of github.com:bobuk/addmeto.cc:
  Update master
修整了一下，去掉了已经 submodule 的功能
Merge branch 'master' of github.com:bolasblack/ownjs
拆分了 own.coffee ，为 tooklit 添加 seajs 支持
Small improvement in install.
make: also remove builtin_client

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
sensord: server-side stubs

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
storage: dummy vals for get block

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
adding vim gui config
Call mingw32-make explicitly.
Merge pull request #12 from bostak/benoit

Benoit
Merge pull request #13 from bostak/benoit

correctif nommage class db
Tweeting stuff, ignores, etc.
Oct 9 4:38 am -- locking implemented on newFlight method
Some work for sub-plugins
updated test_trajectory with correct paths
fixed bug in load map
Add AzDrawTargetGetSize
Add more bindings for DrawTarget methods
Add pjax gem
Switch to rack-pjax
Add rack-pjax and a lot of duplication
Change active link
Linked browsers.
Fixes an issue where the old IE warning is visible in Chrome.
Added a way to change order date.
Make canonical redirects 301s, not 302s. See #1741
using textures
Update 6.1/i18n/zh_hans/source/book/5/5_14_Stock/5_14_Stock_Location_Ex.rst
small fix from merge
best practices, bugfixes, etc..
rails best practices
still 29 warnings...
added timeago.js, break app.js in more files..
Fix crash when Google Latitude doesn't work.
Alvin 11:13 a.m. 05/06/2012
Fixed a bug in Sentry::force_login() that was storing the user id as a string, which caused a Sentry\SentryException to be thrown from Sentry::user().
Added Sentry_User::to_array() to allow converting the user data to a native PHP array.
Merge pull request #47 from theideapeople/develop

Sentry::force_login() bug fix, and Sentry_User::to_array() feature
Improveded places.walk class
Almost finished the steiner approximation :)
The check for the path to the script is now more robust. It will properly escape paths with spaces, etc.
scorm funcionando
libceph: protect ceph_con_open() with mutex

Take the con mutex while we are initiating a ceph open.  This is necessary
because the may have previously been in use and then closed, which could
result in a racing workqueue running con_work().

Signed-off-by: Sage Weil <sage@inktank.com>
libceph: close socket directly from ceph_con_close()

When we are directed to close a connect, close the socket directly while
holding the con mutex.  This is simpler and less fragile than the old
method of setting the flag and queueing con work.  In particular, we will
frequently re-open the same connection and need to close+open the socket
in con_work(), which doesn't work well.  We thus prevent a situation where
we encounter the SOCK_CLOSED flag and OPENING state (which isn't currently
handled).

We also carry the mutex for the entire duration of ceph_con_open(),
including the period where we are twiddling state bits.  This avoids the
possibility of another thread seeing an undefined state, moving the
con->state manipulation under the protectino of the mutex (in this case;
there are still other places where it is not protected).

This also appears to fix not-completely-explained crashes with socket
failure injection on the server side.

Signed-off-by: Sage Weil <sage@inktank.com>
libceph: report socket read/write error message

We need to set error_msg to something useful before calling ceph_fault();
do so here for try_{read,write}().  This is more informative than

libceph: osd0 192.168.106.220:6801 (null)

Signed-off-by: Sage Weil <sage@inktank.com>
grr

Signed-off-by: cfstras <claus@strasburger.de>
mode change
update gitignore
WIP: properly dbx'd type variables (src/poly.ml)
Disable the click outside to close the popover code. Buggy.
Correction in apache invocation
* Getting to know bootstrap
  * Edit page has better looking buttons and tags
  * Unfortunately - now the add tag functionality is broken
New and Edit timeline now works!

Made partial _new_edit
Also, refactored code to populate tags and events - which is used in create(), edit() and update()
Use widget instead of box for FLTK runner
remove redundant socket.io.js symbolic link (socket.io.js file is served directly by socket.js)
Added project URL to source headers.
MWB Project +
modif 1 template home
Adds haskell exports for traversing processes.

It is now possible to obtain meaningful information about a process,
such as the operator used and the constituent processes.
Insertado el "if colorcolumn" para soportar versiones viejas de VIM.
Agrego los cambios respectos al dll

Cambios de dll en Capa Logica y la IU
Remove acme
Merge pull request #4 from cihann/master

26 Mayis bulusmasi
Merge pull request #5 from cihann/master

fixed meeting date
Fixed a markup error in the presentations section.
Merge pull request #6 from berkerpeksag/master

Fixed a markup error in the presentations section.
removed logging
Merge branch 'temp'
Performance enhancements and bug fixes
performance enhancments
Performance optimizations
TCP Keepalive in curl is only in very recent versions and not required with regular messages on stratum anyway.
0 is a valid return value for read so only break out if read returns -1.
Update changelog to v2.4.1
Add dpkg-source commits
Merge pull request #201 from nushor/master

Debian packaging configs update
Async everything.
[bash] Using emacs as my default editor in MacOS (launchd rocks)
[emacs] Re-enabling menu-bar for MacOS (it does not suck that much here)
[emacs] Adding a keybinding to the magit-status function
Remove dependency on zipfile and use adm-zip instead.
Update version number
Prototico basico inicial
Add tokens resource to admin client by default

Change-Id: I60e0cafba7770387241a315596ebedf2a64e01b1
Update notes for submitted changes

* Merge branch 'ng'
Update notes for submitted changes

* use cfoundry for authentication; adds UAA support
Update notes for submitted changes

* move app helpers from CLI to App
remove keys from git
scion
add tracked files
Database code is added for authentication
Adding vim-surround

Signed-off-by: Cristián Maureira <cmaureir@hpc.cl>
updated gemfile
gemfile update
test
Finish demo app
Reorganize files, again.
marquee is fully functional
remove button on staticSessions page and make title a link
Merge branch 'master' of https://github.com/codecentric/thot
update: Make Logger as Class variable.
update: Redmoi shows current user's article only.
Merge branch 'dev'
* Added "listening", an OSX shell script to show listening services
add FML to markups
游戏界面初步创建，可以点击按钮，并响应。
some uncommmit files
Added class structure.
ignore my thoughts template folder
though1 => thought1_buttons_and_labels
though2 => thought2_table_view
thought3 => thought3_image_view
thought4 => thought4_this_and_that
thought5 => thought5_toolbar
thought6 => thought6_nav_controller
disable failing spec for now
add select all toggle
DRY up admin a bit
this button is for more than just flagging
reorder admin columns and stub in show
disable show for now
allow multiple tables per page
separate default and deleted comments into tabs
More microformats
moved Kalimba::Persistence::Redlander into a separate gem
force absolute movement working well.
modified:   Makefile: upgrade version to v0.2.0 .
modified:   VERSION: version v0.2.0 (force).
modified:   stepper.h: changes in force move: step movement with jitter and position reading place; and set STATIC jitter instead of vector one (to put back).
modified:   stepper.help.output: automatic update.
Bumped up Gemfile.lock rspec version for devel dependency.
linking Xrender
physics changes for sol
Fix Add institucion_principal in module Search from Expertos_e_investigadores
fixing sizing on downloaded image
Update header file
Merge branch 'master' of https://github.com/csava/dbcCompare
compatibility fix for old beta luajit release
compatibility fix for old beta luajit release
Merge branch 'master' of git://github.com/cstraehl/ljarray
in preparation for png compatibility, support for 16 bit integers
dammy soft cascade
added structures for cascade represintation
minot in train application
scale pyramid calculations
ICF feature
fill softcascade
soft cascade: xml parsing
soft cascade: scales decompaction
warning fixes for cuda samples
added detection test for softcascade
Integral images computing
formating fix
eliminate synchronous AJAX call to fetch ML bricks

git-svn-id: https://devx.heimat.de/svn/module_dev1/dev/jscript/lib/cb_ui@5935 6fe43c2e-958e-4c7b-8ed4-929f07986c78
make sure that changeLanguage callback is also called if function returns without translating anything

git-svn-id: https://devx.heimat.de/svn/module_dev1/dev/jscript/lib/cb_ui@5936 6fe43c2e-958e-4c7b-8ed4-929f07986c78
Update 2012-05-05/exercise5.js
Wed Dec  5 11:00:12 JST 2012
Featured Posts - commented out to test

Signed-off-by: hugosaner <hugo@sanerdesign.com>
breadcrumb error fix
Import Maven Project
Updated imgs
l
essent-update
Redirección después del login. Solución al Issue #8 https://github.com/dacmail/fixmedia/issues/8
afegit cosa a ignore
refactoring with use of the smart prefixed() function
Fixed bug in the RINA Band application (the test would not finish for the sender "client" or "server" options)
Include list of Queues with "Skills" list
Merge two functions to improve code structure
Add support for hex or RGB colours

Allows query string hex code, or separate RGB values. With fallback to
the default colour (black).
Add full support for hex & rgb values.

Clean up .htaccess to be more precise also.
Merge pull request #3 from michaelw90/master

Add Hex & RGB Support
eigen problem solved
debug code deleted
magrit-cat-build implemented (not tested yet).
MFC r240144:

After r240104, make sure the hpt27xx driver also compiles with clang,
when it is statically linked into the kernel.
MFC r240531:

Pull in r163967 from upstream llvm trunk:

  X86: Emitting x87 fsin/fcos for sinf/cosf is not safe without unsafe
  fp math.

This should make clang emit calls to libm for sinf/cosf by default.
MFC r240773:

After r205013, amd64 and i386 CPU family and model IDs were printed out
in hexadecimal, but without any 0x prefix, which can be very misleading.
Add missing mtx_destroy

This is a direct commit to stable/9 as the locking is somewhat different
in HEAD due to the VALE bridge work (r238812).
MFC part of r239149:

Comment out the knlist_destroy for now as there is currently no
knlist_init.
Add a (temporarily located) definition.
Add AR5413 radar parameters and strong signal diversity capability.

This is a re-implementation based on the reference carrier code
for the AR5413.

Tested:
 * Pulse detection for AR5212 and AR5413, to ensure the
   correct behaviour for both chips

PR:		kern/170904
Obtained from:	Qualcomm Atheros
Add a new capability bit - whether the hardware supports AR9285 style
combined diversity.
Set the HAL combined antenna diversity capability if the AR9285
EEPROM settings allow it.
fix shebang python call
adding in cat flux scripts, might be newer elsswhere
Merge branch 'master' of github.com:dannyjacobs/capo

Conflicts:
	dcj/scripts/hpm_cat_flux.py
	dcj/scripts/img_cat_flux.py
actually saving the stupid merged changes for dcj/scripts/hpm_cat_flux.py
added time interval to about_uv.py
fixed a very strange weighting issue in aipy_healpix_to_skyviewer.  Aladin healpix now looks like plot_map. But better
fix_aipy_fits.py fixes the dreaded RA dash error in some image viewers caused by images made with aipy. aipy fix to be committed soon.
adding imstats.py for computing a few stats on individual images. intended to flag bad channel snapshot images
using plot_beamformed_sources and made a few changes.
Merge branch 'master' of github.com:dannyjacobs/capo
theme medo added
Adding Debug Mode + Quest Typo Fix
DEPS AutoUpdate: webkit to 451 (2012-04-26 22:34:31 +0400) antonm@chromium.org
Port XMLHttpRequest.response.
http://src.chromium.org/viewvc/multivm/trunk/webkit?view=rev&revision=451

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@7036 260f80e4-7a28-3924-810f-c04153c831b5
Minor menu fixes. Now uses a proper projection.
Added menu pages
Initial cut of the update command
Added summary of actions
Remove extra characters from end of echo statements
Merge pull request #2 from datasift/feature/update-command

Feature/update command
Added project home page (index.html)
new relative import tests
fix completions on 'from . import variable'
ignore completion in import aliases
Add checkout script.
Widens tmux status-right
Added includeRepeatTweets flag, giving the developer control over whether repeating queries return the full count of results, or only new results since the last return.
Proposed workman-m (mobile) for phones
Añadido PPrueba
Remoção das imagens não utilizadas
Add `HTTP` and `HTTPS` macros to bootdoc.ddoc

`WEB` macro is unsafe because `$(WEB http://..., ...)` is a common mistake.
It was removed from dlang.org by [pull 28](https://github.com/D-Programming-Language/d-programming-language.org/pull/28).

`HTTP` macro is better. `HTTPS` added for consistency.
Merge pull request #23 from denis-sh/patch-1

Add `HTTP` and `HTTPS` macros to bootdoc.ddoc
Fix `.symbol` padding

Non-zero `.symbol` padding leads to incorrect selection on mouse hover.

For example see http://jakobovrum.github.com/bootdoc-phobos/std.array.html#insertInPlace
Merge pull request #24 from denis-sh/patch-2

Fix `.symbol` padding
Rename CSS class `symbol-anchor` to `symbol-link`

* also rename corresponding variables in bootdoc.js
Rename CSS class `symbol` to `symbol-target`
Remove white space at end of lines in bootdoc.js
Fix JavaScript code breakage caused by symbol link & target division

It was caused by this commit from pull #24: ec6d9c14de051b5bf5a1cee9955f506522595006
HTML/CSS fixes for Opera

* it will force Opera to not hide links under titlebar
1.0.1   Fixed some minor bugs when loading the file and tweaked the graph plot.
Added `protos lint`. Closes #84

The command can be used within a project's directory to lint any of
the project's files, using the integrated Protos linter (jshint).

If a `jshint.json` configuration file is present, it will use it,
otherwise will use the default protos jshint configuration.
Add support for /etc/monit.conf style configuration files

Adding Naresh <vnareshkumar@gmail.com> changes to monit.spec to use as
a base to fix spec file.
Changing "release" to match comments from Naresh <vnareshkumar@gmail.com>
js : filter out text nodes. Ref #259

v1.5.22
Merge branch 'master' into gh-pages
Saving circuit works
track anonomous user segments via analytics (let's see how successful the beta channel features are)
forgot to add _setCustomVar param to _gaq.  doh. [ci skip]
small css tweak with info shade box shadow grossness [ci skip]
only segment by beta / non-beta [ci skip]
Fix url "/logo_caps.png"
Merge pull request #3206 from movilla/reshare-flash

Fix url "/logo_caps.png" mails [ci skip]
Merge branch 'master' into despora
My Dash pages; Event Calendar
Adjust input sizes
Merge pull request #32 from dictoon/starpad

Code cleanups
fixed export without transformation blur
removed unnecessary argument
changed the name of the single assembly when transformation motion blur is disabled, plus some cleanups and cosmetic changes.
added new bindings
remove unused imports
update rapisms-logistics
Refer to LinearDRPCTopologyBuilder by it's global namespace name
make mozpool logging a bit more consistent with that from web.py
Corrected spelling mistakes and added notice about tax.
edits git aliases
Javadocs, etc.
Editing class documentation for ParamComposite to reflect changes.
Refactor map/reduce options test in QueryTest
Revise support for geoNear commands and $near query criteria

Fixes #47. Previously, the near() builder method was used to support the geoNear command instead of $near query criteria. This was unintuitive, given how other geo methods like withinBox() operated.

Instead, we add a new geoNear() builder method, which operates similarly to mapReduce() and switches the query into GEO_LOCATION mode. We also add methods to specify the distanceMultipler and maxDistance options.

The near() builder method is repurposed to define $near query criteria for a field or expression.
Fix event argument order when dispatching collectionPreNear
Merge pull request #63 from doctrine/geo-near

Revise support for geoNear commands and $near query criteria
Version 0.0.2 - new gem
Update Menue (JS & HTML)
Inserted Split List
Added Link to Options and Backbutton
Header fixed
Fixed bug on Menuepage
Return value check for calloc in function lookup_bytestring

This code adds a check for the return value from calloc in function
lookup_bytestring.
rename CodeBase to codebase
Added md5 and sha1 computation
added flash messages to create & destroy
VM Print
Update gk in gitconfig; use tilde in tmux
big idea.
Create a new class for menu option types?
placeholder - before i do something stupid.
remove the synopsis functionality
Starting the process of documentation.
Nearly ready for version 1 release
Still working on docs.
I think I will end up taking out the auto module.
Sure it's convenient, but it takes away from some of Sphinx's functionality,
and readability.
Added link to dougflip.com
began work doing platforming things
Quick note on counter_rates and timer_data
[bug fix] Check existing assets really exist
v0.9.1
Switched some remaining instances of enviorment to environment
video: fixes window, improved sprites
video optimization, only one buffer
Fixed some memory access rules, MBC1 implemented
added stack, changed makefile
run code in URL fragment, a la CurlyLogo
added baseline Vimrc file
foto

tirei foto
utf-8, please...
I've remade the Hungarian translation of Toggle 2G, because there were many hard to understand parts in the original (HU) language file.
Restored controller methods so admin home page buttons work
Use string instead of symbol for group_id
removed dependence from dswm.asd.in
Added optional type annotations in preparation for array/struct support
#10 First go at structure support.

Functional loading and storing attributes. Structures need to be passed into functions
through pointers. Indexing a structure pointer returns a reference rather than a copy, which
is consistent with Python behaviour.
#10 Enable augmented attribute assignment; docs, cleanup
Basic ND index support.

Currently considering only row-major layout.

Issue #11
kill throws an error while finding pid
in quantum dhcp agent section

Change-Id: I602df7875710336125cdbb8407ff293a8e7d448e
Configure and launch Heat REST API.

This is a REST API in the same style as other OpenStack APIs.

This also creates a new endpoint for the REST API which uses the
serivce type 'orchestration'. The old endpoint now has the service
type 'cloudformation'.

This matches the pattern where the native openstack API gets a
generic service type while the emulated EC2 API gets a specific
type (eg, object-store, s3).

There will be breakage for the time period where only one of this
change and https://review.openstack.org/#/c/14263/ are approved,
since keystone will have the incorrect service type for that period.

Change-Id: I6a0d51a63da8017d375b4c065c4c9079dfca8fe3
Merge "kill throws an error while finding pid in quantum dhcp agent section"
Merge "Configure and launch Heat REST API."
Aliases for local dev
Original project pushed to GitHub.
Optimizando Interfaz (layouts y agregando botones segmentados)
Simplified channel management
Formatting
new stat file
v1.3.8.13 nochange
Displayed name of level
less jagging, level fulfills portal consistency condition
Walls allowed at portals
Walls allowed on portals
Merge branch 'master' of https://github.com/geoo89/gulasch
blasdlfjöasdf
Added animatikns
Merge branch 'master' of https://github.com/sekti/gulasch

Conflicts:
	levels/level1.txt
	main.lua
Fixed bug that would hide past posts
Changed the data type of the publication date to a simple date
Merge branch 'feature_agregar_categoria_desde_bloque' of https://github.com/heronog/kublog into feature_agregar_categoria_desde_bloque
Merge branch 'master' of https://github.com/e3matheus/kublog into feature_agregar_categoria_desde_bloque
Merge branch 'feature_ver_posts_publicados' of https://github.com/heronog/kublog into feature_ver_posts_publicados

Conflicts:
	app/views/kublog/posts/index.html.erb
Merge branch 'feature_programar_post_en_blog' of https://github.com/heronog/kublog into feature_programar_post_en_blog

Conflicts:
	app/models/kublog/post.rb
The notifications are scheduled for a programmed post
The notifications are scheduled and stored the reference in the notifications
When an unpublished post is updated, it refreshes the job
Fixed bug that would hide past posts
Changed the data type of the publication date to a simple date
The notifications are scheduled for a programmed post
The notifications are scheduled and stored the reference in the notifications
When an unpublished post is updated, it refreshes the job
Updated the publication date reference to published_at
Added rspec configurations
Save sent at of notification and reschedule notifications. Also you
notifications are scheduled now.
Merge branch 'feature_programar_post_en_blog' of https://github.com/e3matheus/kublog into feature_programar_post_en_blog

Conflicts:
	app/models/kublog/notification.rb
	app/models/kublog/post.rb
	lib/kublog/network/facebook.rb
	lib/kublog/network/twitter.rb
	spec/models/kublog/notification_spec.rb
	spec/models/kublog/post_spec.rb
When a notification is saved, when you edit the notification the content should appear
Upgraded to ruby 1.9.3
Added comments
declare variable shutter
added case for M250

The shutter pin is set in pins.h as 32
added SHUTTER_PIN to pins.h
Fix method names and arguments.
Customize image captions in jQuery lightbox

Now uses the Title in file metadata for images in the lightbox. Falls
back to default item title.
Gitignore
Merged LdapAuthSourceController into AuthSourceController.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9232 e93f8b46-1217-0410-a6f0-8f06a7374b81
Resourcified auth_sources.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9233 e93f8b46-1217-0410-a6f0-8f06a7374b81
Remove error template
bug fixed that _up method fired without _down method called
changing all paths again
fix viplist issues
style adjustment and fixes
* style adjustments, now window and button style
* fix bug when logging on a tile with too many creatures
* remove deprecated onLogin and onLogout events
Make 'Type' the type of types instead of Sets
...after mailing list discussion
added replicate
added repeat and replicate
added hyperoperation sequence
Merge pull request #31 from MekeorMelire/master

Added new functions in standard-library
ignore empty sequences
added coding
also exit if the variable db is empty
Modify documentation for readability.
Add a selection strategy that gives you all lines. It's like heaven.
fix error

Signed-off-by: Max F. Albrecht <1@178.is>
Got server running with new project structure

script/server to start server.
Now uses supervisor to restart server on file changes.
Add bootstrap and jquery to layout.
Implemented a front page

Displays installed providers.
Has a simple signup.
Removed unused views.
Work on createPasslet. Added validation.

Also tweaked text on front page.
Implemented a basic bookmarklet.

Compiles bookmarklet from template and compresses with uglify-js.
Includes a bookmarkletId which authenticates user.
Uses baseUrl from config.
Sends domain as a parameter.
Moved all env usage to its own module with defaults and validation.
smp like api
gemspec
like update
Added paste and pastedeploy to setup.py. Thanks Matthew Hanson
update GeoNodeDataAccessManager for master changes

The admin role user name should be looked up dynamically now.
update GeoNodeDataAccessManager for master changes

The admin role user name should be looked up dynamically now.
Merge branch 'dataaccessmanager-activerole' of github.com:opengeo/geonode into dev
Apply drwelby's pull request #299 to dev
Fix errant change to view name
Add initial migrations for the geonode.layers app
add ROLE_ADMINISTRATOR to authorities too

When superuser, also add ROLE_ADMINISTRATOR to resolve integration test
failures.
Added .gitignore for geonode egg.info
Merge branch 'dev' of github.com:GeoNode/geonode into dev
Simplified README.rst
.gitignore reorg
Merge branch 'dev' into design

* dev:
  .gitignore reorg
  Simplified README.rst
  Added .gitignore for geonode egg.info
  add ROLE_ADMINISTRATOR to authorities too
  Add initial migrations for the geonode.layers app
  Fix errant change to view name
  Apply drwelby's pull request #299 to dev
  update GeoNodeDataAccessManager for master changes
  update GeoNodeDataAccessManager for master changes
  Added paste and pastedeploy to setup.py. Thanks Matthew Hanson

Conflicts:
	geonode/layers/views.py
Creación de la primera Clase
Creación de la primera Clase
Creación de la primera Clase
simplifies node_modules
separate files for sync / async tests
Ignore noise
Updated read me
Xcode color theme
Expand backup functionality

* honour backup-directory-alist
* add user option ebib-create-backups
Add comment on new backup behaviour to manual
Rename rase-hook to rase-functions.
[core] Make configuration wizard as arguments of main script
Merge branch 'master' of github.com:embolalia/willie
Cleaning up files. Adding message preview. Readme.
updating dotfiles
Merge branch 'master' of github.com:enjalot/dotfiles
imagenes

cambios en las carpetas
Compatibility with Go 1 (Use go tool instead of 6g and gofmt)
changing more markup in readme
add classpath export to main zshrc
Added: Ambient Auth Website
Added: MD5 Library
Added: Rusty
added sendMessage() implementation
ferme sa gueule quand il se co
changed the syntax objectives around a bit.
Events cassette and inclusion
Added incomplete estop function to state server
refactored chcache & added web/media support
setup.py
Update pip
added back proxy model for video
Merge commit 'c6e73b2' into pip
Update pip
Update pip
polymorphic back in settings
REQUIREMENTS.txt added
uncommented video plugin code
Merge commit 'bd36a3e' into pip
requirements updated for django CMS 2.3
correct version of Django Filer
debian installation
anonymous github access
example project ready for 1.4
Merge branch 'pip' of https://github.com/spacedman/Arkestra into HEAD
anonymous git
added Barry Rowlingson to CONTRIBUTORS
installed apps in the right order in example project
correct installation docs
Fix an issue when executing a query with kPFCachePolicyCacheThenNetwork cache policy

When using kPFCachePolicyCacheThenNetwork with a parse query, the callback will actually be called twice - first with the cached results, then with the network results. We avoid duplicating results and refresh cached objects list with network results as soon as they're available.
Simple JSON formatter for the cmdline.
PLF-2955 update missing dependencies
properly set ruby
Moved viewport to pagelayout
Pruning of cherries from Newick string
Newick simplifier improvements
POD update
Use pwd instead of home directory. Also add missing files to be removed in make clean
don't debug yui on the server
fix navigation
add muttrc config file
Ticket 2790 [IR190] FHC secureendpoints: new command mostly in place. May need tweaks when hooking up to millicore
Protect SIGPIPE usage for PLAT_POSIX only
All grammar regdefs to be shared between files.

This allows the grammars's regular definitions to be split
up into smaller units, which makes it possible to provide
easy to understand documentation.
Upgrade flx_pkgconfig to read pkgconfig databases.
Fix web reference not shown when no basic explanation bug
world history part 4
Removed walts devise
vim: load easymotion after csapprox to avoid breaking csapprox on
start
git: various aliases
vim: don't mess with <esc> remapping. <C-L> cleans hlsearch. Fix
broken arrows in normal mode
德鲁伊cd
Ftp deploy
Readding demo from master
[core] Begin multi-table db abstraction. (Not yet fully stable)
[core][db] Make db auto-initialize and detect available tables and columns
Add SQLite support
Port rss to use the new jenni DB
[core][db] Add proper SQL to add_table()
[core] Set up alias of willie.settings to appropriate db attribute

This will allow the table name change to be done more smoothly
[core][db] Add SQLite configuration, update documentation
[web]fixing web.post

web.post doesn't treat 'query' as the actual data sent (as curl -d would), turning {"key1":"value1","key2":"value2"} into key1=value1&key2=value2 which is obviously a 400, bad request. (in the case of git.py)
Any modules that are broken because of this should use web.urlencode() before calling web.post().
[git]fixed .issue, now a functional module.

Hence closing issue #12 for now.
[dftba] Disable dft.ba functions until API is made available again.

Issue #109
[rss]Refactor to use only one cursor and connection, making code neater.

Also, fix minor syntax error in db.
[rss] Fix issue of time being prepended to site name
Merge branch 'new_db' of github.com:embolalia/willie
Remove Hindi etymology module, per issue #100
[modules] Update signatures and credits for some modules.

Issue #70, Issue #76
Merge branch 'master' of https://github.com/embolalia/willie into asynWillie
idk what happened to it, but here's config.py back, without revision history unfortunately
dropped the config.php file. Only images.php was using it. Also added comments to functions and updated the README file
Made block objects not get boxed unnecessarily
Forging
[test] Add test to verify the presence of present() method on the view object after loading a complex view
Adding the raw error to the `logException` call.
Finished Score-Screen for 6 players.
Switch to JSON keys and Base64URL payloads for encrypt/decrypt
Implement keygeneration and PRNG seeding using SJCL
* Correctly proccess paths with brackets.
* Fix warn_unused_result compiler warnings with FORTIFY_SOURCE defined.
Merge branch 'cvs'
Add PL transaction into the Scons configuration file
* Forcibly tweak the model number for Xbox360 clients, or they might ignore us.
* Fix up error handling when given a bad order in SortCriteria.
Merge branch 'cvs'
Reverted ffmpeg include path - testing commit
jcode
jcode
Implement "line" method for GDT tables
glNewList GAUBE
noch mehr Texturen
comit views
Space and x keys send right command.
Clean notification. Small fullscreen fix.
Fixed model.model -> model.Model
added postfix for centos 6; no mysql support, WITH pgsql support
remove google plus feed application
rename executor to worker
let test pass
a little refactor
Merge pull request #12 from furatafram/code-cleanup

Improvement to run_bench.py script
Merge pull request #13 from furatafram/code-cleanup

Code cleanup in ptlsim/x86/decode-fast.cpp
Fix small issues in directory and MOESI

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Fix in memory-update operation in Moesi

Allows memory-update in MOESI code to go to lower level cache/memory.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Merge branch 'features' into code-cleanup
Support Write-back private caches with Split-bus

Now users can create multicore machine configurations with private
write-back caches and split-bus as interconnect.  Specify option
'snoop_disbale' to 'true' in machine configuration.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Cycle count fix in atomcore

Now idle mode cycles are not counted as 'kernel' cycles in atom core.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Support to run multiple run configurations

New feature in run_bench script that allows multiple run configurations either
via command line or via configuration file.  To specify more than one
configuration in cfg file create a new run section as below:

[run multiple_runs]
runs = run_cfg_1, run_cfg_2, run_cfg_3

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Support for pop gs instruction and fix in push fs/gs

Fix small bug with push fs/gs instruction.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Fix in cache line prefetch

Line is now inserted into cache when prefetch request is completed.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Changed location of cache hit/miss stats

Old place where stats were updated might be incorrect because if a request is
annulled after cache is accessed and before stats is updated then our total
stats count can be little off.

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Removed unused code from ooo-exec.cpp

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Added 'likely/unlikely' to cpuController and memoryHierarchy

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Fix memory update handling issue in MESI

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Added description to memory operation types

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
New feautre: Override checkpoint list in run_bench via cmdline

Added a new option in run_bench.py command line to run only selected
checkpoints from the run-configurations.  To use this feature, use --chk-names
command line option and pass comma separated list of checkpoint names.

Example: $ ./util/run_bench.py --chk-names chk_0,chk_1 run-chks

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Merge branch 'features' into code-cleanup

Conflicts:
	ptlsim/x86/decode-fast.cpp

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Added a .gitignore file

Finally got a chance ot add this to repo!!

Signed-off-by: Avadh Patel <avadh4all@gmail.com>
Merge branch 'master' into features
Merge branch 'features' into code-cleanup
add drupal as submodule
revert back to unmodified version - mods in gift membership
Use og_group and og_ungroup for civirm_og_sync reverse sync.
add drupal as submodule
fixes in d7
drupal updates
add drupal as submodule
fixes in d7
Merge branch '7.x.1.x' of github.com:fuzionnz/civicrm into 7.x.1.x
4.1.3 version of drupal
ignore settings_location file
activity count added to dash
test for new activity class
activity_count implemented
discussion activity half finished
subgroups specs migrations and model
functionally complete
re-align icons
fix merge errors
fix second merge  errors
Subgroups controller and layout tweaks
can't inherit from a subgroup
list of subgroups + breadcrumbs on group page
oops forgot an if statement in the breadcrumbs
Fix failing specs. Remove unnecessary migrations.
i'm cheating. i'm very sorry. i want to go to yoga.
Quick and dictatorial homepage overhaul
Add google analytics probe
Merge pull request #64 from vaevictis/homepage_overhaul

Quick and dictatorial homepage overhaul
Homepage tweaks.
Merge branch 'master' into feature/activity-notifications

* master:
  Homepage tweaks.
  Add google analytics probe
  Quick and dictatorial homepage overhaul
Minor changes

- Refactored 'makeFriendConn'
- Missing import on Graph.hs
- Comment formatting
- Code formatting
Merge pull request #339 from galthaus/e22f2cbc7a0e1a60e93138e702dc9254073ce834

Remove NFS workaround in control.sh [2/5]
Merge pull request #340 from galthaus/724973970b5fcfef7da78c7fa7e281a0ddea4f2b

Remove NFS workaround in control.sh [3/5]
Merge branch 'master' into cloudera-os-build
Atualização enviada no dia 03/12 - Roberto
Those were temporary files. Removed from workspace.
add show post
pretty up makes, take it or leave it
slightly better exception handler.

Not using nasm but rather gcc
Remove Cruft
Use QPainterPath for drawing edges : cleaner, faster, sexier !
Update line-height for h1 elements.
Update sample HTML.
Update background-color.
Update padding for ballot-item-results.
Update CSS to accommodate for HTML without "Elections" or "Referendums" article level.
test case for mixins passing keyword arguments correctly
Added Builders

Added builders/build.xml
Added builders/main.xml
Added builders/packing.xml
Added builders/properties.xml
Added builders/runner.xml
Added new log file dialog.
Fixing form updates
otro test
Merge branch 'master' into experiment
Lots more work on Extensions logic.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Cleanup criteria language
整理核心 Gadget 清單
small bug corrected for flashcard
create Bird model
added relationship
runned rakes
added symphony and workspace/uploads dir
Merge pull request #290 from kanduvisla/patch-1

added symphony and workspace/uploads dir
VisualStudio.gitignore: Ignore the ‘x64’ directories
Merge pull request #214 from dtrebbien/patch-1

VisualStudio.gitignore: Ignore the ‘x64’ directories
new actions and 'helpers'
Removed cassandra from unwanted packages
Updated Install-Tools-Custom.cmd
Use paged memory
Defaulting opcode to 0x00
Only translate binary files if they are older than their source file.
use struct init screen
include the fetcher
token check before first select
quick fixes
Evertything should be fixed - now I'm off to break it again.
Forgot to actually add the method to the poirot object that is being returned.
Post-merge clean-up.
Revert "Revert "Initial commit""

This reverts commit 206850b0c63621e08bed78795c9943cb8d4848fb.
docs
documentation
documentation
ignore
remove link to references from non-admin
Fixed typo in Cardinia config file
Configuration of councillors tab at Mitchell
Label used in the drop down: first non-null value
Added tab color for waste & recycling tab
updated css and js in both prod and staging for new publications pages
Fixed some style/weight mismatches in @font-face rules.
Corrected two bugs. Still not running with NAs.
fix rvm version for tavis.yml
lets use macvim in the console too
тест сервера
more style tweaks (assisted by phpformatter.com)
Add note that public/private keys should be in the PEM format
Fix typo and it should be OpenSSH format
Add xsl.security_prefs manipulation to XsltFilter.

Adds check to enable necessary permissions for creating new files and
directories using XSLTProcessor if appropriate for php runtime.

For more details, see:
 - http://www.phing.info/trac/ticket/938
 - http://www.phing.info/trac/ticket/800
 - https://bugs.php.net/bug.php?id=54446
Merge pull request #154 from bd808/bugfix-938-xslt-filter

Add xsl.security_prefs manipulation to XsltFilter.
Merge branch 'master' of git://github.com/phingofficial/phing
upgrade compass to 0.12.2
Added functions __canonicalize_directory/__git_root/__path_directory/__path_filename/__path_with_trailing_slash/__path_without_trailing_slashes + changed functions __current_directory/__current_git_root + refactored functions __is_git_directory/__is_git_root_directory
Fixed #58: CTAS were triggering mapred jobs.
Merge pull request #59 from harveyfeng/hive09

Add null check for HiveFileSinkOperator.fsp. Fixed #57.
Merge pull request #60 from harveyfeng/hive09

Initialize SemanticAnalyzer.viewsExpanded in SharkSemanticAnalyzer
Destroy driver after use in SharkCliDriver.
Avoid type inference for CommandProcessor.
Merge branch 'hive0.9' of github.com:amplab/shark into hive0.9
Rearranged some imports and removed whitespace.
Ignore trailing whitespace in test diff.
Fixed a problem with JAVA_OPTS appending itself to itself in local
cluster mode.
Added checks for HADOOP_HOME and HIVE_DEV_HOME in bin/test script.
Fixed the problem that test scripts cannot be started correctly because
JAVA_OPTS in run were no longer set properly from the previous commit.
Register Shark's conf variables with SessionState
Configuration at startup. That way, default values
show up in 'set;' calls.
Fix for avatar on first login.
debuging error in runtimeexec object
debuging error in runtimeexec object
Added week 8 material
message
updates labs
Many bugfixed.

1. Truncate would leave us with totally empty (=invalid) database
2. Locking release wasn't updated when locking was last changed, which led to exceptions
3. Some docs added
adding support for differenet baremetal types
and some logging in scheduler
Merge branch 'silver' of https://github.com/hesamrahimi/nova into silver
Updated version to 0.0.1.1
Fixed bugs on linux
can now choose to not have the metadata read
updated UI
(sort of) implemented the cpu operations
added some tests for user access
change name of method called on main class
changed rvm rc and updated schema.
Merge branch 'master' of git://github.com/diaspora/diaspora into HFASE
continue to implement new arch:

    - reset is now in place
    - server is a compilation option
Add email example.  Fix line-ending issues for input files.  One day, this might be an option to make processing more strict.
rexx: Added some examples
third commit
forth commit done on Friday june 1
fifth commit 
sixth time
adding private variables
minor changes, level 1 added

This is just a working version of level 1.
Also, I'm hoping I can get an idea of how many people visit my
repository by embedding this image from digits.com in my readme
tweaked evolution mechanics: now featuring recombination!
Add renumber-windows to tmux.conf
Add tmux conf installer script
Use tmux installation script to install tmux.conf
加入HTTP GZIP支持
Added ProTips
added placeholders for obsoleted 'user_css' files
users don't need to care about removing those when updating.
Introducing DataGroup and ItemRenderer
Code quality fixes
Removing accidentally included cljs
por favor checa el script 17!!!
new patient button and fixes
barrra en mesages
allow underline.
removed calltime page.
commit clisp/ch[67].lisp which has examples of common lisp ch 6 & 7
travis-ci: add py3.3
color picker hooked to rest of the system