labofsahil/github-event-dataset-2012 huggingface dataset:
Use 64bit Google Chrome package
Properly add yum repo for Chrome
Fix path for Chrome rpms
Fix skype recipe for Fedora
Update Skype recipe
Update Chrome recipe
Include libxslt installation in libxml2 cookbook

Conflicts:

	roles/base.rb
Merge pull request #1 from sickill/givingback

Few small improvements
No signing key for Fedora's Chrome package
No signing key for Fedora's Skype package
creating /usr/local directory if needed (there are systems without it, and it messes everything up)
updated firefox and skype OS X sources
OS X Firefox package URL updated to stay valid longer
Fixed rvm installer.
Merge pull request #2 from lucassus/master

Fixed rvm installer
Merge remote-tracking branch 'llp/master'

* llp/master:
  Fixed rvm installer.
  OS X Firefox package URL updated to stay valid longer
  updated firefox and skype OS X sources
  creating /usr/local directory if needed (there are systems without it, and it messes everything up)
  No signing key for Fedora's Skype package
  No signing key for Fedora's Chrome package
  Include libxslt installation in libxml2 cookbook
  Update Chrome recipe
  Update Skype recipe
  Fix skype recipe for Fedora
  Fix path for Chrome rpms
  Properly add yum repo for Chrome
  Use 64bit Google Chrome package

Conflicts:
	bootstrap.sh
	roles/base.rb
updated config, hopefully travis builds now
ENHANCEMENT: allow folder selection when attaching files from the CMS

http://open.silverstripe.org/ticket/7046
UploadField would default to one folder only, and wouldn't allow asset
tree traversal. HtmlEditorField MediaForm has this capability, so added
it here in a similar fashion via TreeDropdownField.
API CHANGE: add a remote relation class getter to DataObject
BUGFIX: list only files the autoset relation supports in UploadField

Otherwise when user selects an object that does not fit the relation,
the system will throw an Exception.
Merge pull request #363 from mateusz/uploadfield-choosefolder2

UploadField doesn't allow you to choose the folder to attach files from
MINOR More robust path concat in HtmlEditorField.js (means it doesn't break with translatable module enabled)
Added new /peeks endpoint
Maven site stuff.
Fix initialize.inc.php
Merge branch '1.1.dev.japanese' of github.com:sjstoelting/evolution into 1.1.dev.japanese
Improve PersistentConnection sample.
Add json2 library.
scaling kinda works
naapurit on kivoja
fix build on 1.8.7
slav9n
forked±
Added missing removeObjectAtArrangedObjectIndex, added missing return
Add xft font
tweaking graph_reduce algo
Committing code cleanup and small fixes before embarking on major change.
Remove option to enable/disable synchronisation of settings (now it's always on).

The ability to enable/disable synchronisation causes too many corner
cases.  Generally, it makes it difficult to decide which set of option
values to use.  Very specifically, the previous implmentation generates
a very bad use case: an initial installation of vimium reverts any
previously updated settings to their default value ... which is clearly
wrong.
Merge branch 'sync' of https://github.com/smblott-github/vimium into full
Note issue around maximum size of key/value pairs in chrome.storage.
add post-by-term-and-date method
Added gallery-node-transform2d.
small changes to README; also changed to import from more recent bson.binary instead of pymongo.binary
Add test to ensure event bus is re-entrant

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
ticketsystem-0.5.6:
- code fixes
- add move ticket to user in view.pl (not working)
ticketsystem-0.5.6:
- code fixes
- add move ticket to user in view.pl (not working)
Fix the generic process crash report
BK-121 Change Password
WOBS-1181: Newscoop TagesWoche API - Comments Service

Done.
CS-4075: Attach image is broken by png file with empty background

Fixed.
Merge branch 'next' of dev.sourcefabric.org:newscoop into next
WOBS-1729: Omniticker servic

Add search. Fix missing fields. Add comments counts.
WOBS-1729: Omniticker service

Fix CommentService::getArticlesCommentCount ids handling.
WOBS-1146: Newscoop TagesWoche API - Topics service

Adding article id of the article holding the list of recommended topics
WOBS-1766: User search in Frontend is not working as it should

Fix like operands.
Merge branch 'wobs-devel' of code.sourcefabric.org:newscoop into wobs-devel
WOBS-1731: Newscoop TagesWoche API - Feedback Service

Testing
Merge branch 'wobs-devel' of dev.sourcefabric.org:newscoop into wobs-devel
WOBS-1747: articles from topic rotblaulive don't show up

Reindex articles to track changes of related data.
Merge branch 'wobs-devel' of code.sourcefabric.org:newscoop into wobs-devel
WOBS-1747: articles from topic rotblaulive don't show up

Add missing return.
WOBS-1745: Withdrawn events should be marked as "outdated", not "canceled"
* adjusted
WOBS-1729: Omniticker service

Add recommended comment count. Add client/version to uris. Fix limit.
WOBS-1729: Omniticker service

Remove client param from comment_url.
WOBS-1729: Omniticker service

Set limit for search.
WOBS-1717: Agenda part for the mobile API
* lists updated according to spec changes
Merge branch 'wobs-devel' of dev.sourcefabric.org:campsite into wobs-devel
WOBS-1717: Agenda part for the mobile API
*adjusted
WOBS-1776: Newscoop TagesWoche API - Online issues service

Initial issues list/toc methods.
Merge branch 'wobs-devel' of code.sourcefabric.org:newscoop into wobs-devel
Adding "datagrid" style to select menu of table plugin in the tinymce editor
WOBS-1075: Implement cron update script

Index section short name.
WOBS-1326: wording issue in omnibox

Fixed.
WOBS-1455: Community widget "Jetzt mitmachen" button should initiate registration in omnibox

Adding script to community template to trigger omnibox when clicking on requested button
Fix version. Clean up config.mk a lot.
Rewrote the standard library, but it still bombs the stack. This resolver stuff is insanely subtle.
Working around a bug in StringReader
Removed 'group' class from #content; Changed to version #2;
Add list of artifacts.
Adds tests that will verify that orderBy syntax should be 'key ASC' or 'key DESC', not 'ASC key' or 'DESC key'.  The following commit will rectify this failure.

- SC.Query's and MySQL's ordering syntax are both 'key DIR' and so SC.ArrayController's syntax should be the same.
Changes SC.ArrayController orderBy syntax to 'key ASC' or 'key DESC', not 'ASC key' or 'DESC key'.

- SC.Query's and MySQL's ordering syntax are both 'key DIR' and so SC.ArrayController's syntax should be the same.
Adds unit test to prove that SC.ArrayController's Array orderBy doesn't work for more than a single Array item.  The following commit will fix this.
Fixes SC.ArrayController's Array orderBy to work for more than a single Array item.

- It was replacing the object with the value, so subsequent iterations would fail to find the key on the object (now a value).
Add the SH_CSS_SHADERS_SPEC flag.

Review URL: https://codereview.appspot.com/6270050/


git-svn-id: http://angleproject.googlecode.com/svn/trunk@1145 736b8ea6-26fd-11df-bfd4-992fa37f6226
Add placeholder entry points for GL_OES_get_program_binary.
Review URL: https://codereview.appspot.com/6279054

git-svn-id: http://angleproject.googlecode.com/svn/trunk@1146 736b8ea6-26fd-11df-bfd4-992fa37f6226
Don't crash on calling static member overloaded operator, PR14120

Patch from Brian Brooks!



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167604 91177308-0d34-0410-b5e6-96231b3b80d8
objective-c: provide fixit hint for @autoreleasepool
and similar other keywords. // rdar://10723084


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@159956 91177308-0d34-0410-b5e6-96231b3b80d8
Revert "objective-C: warn if selector has nothing but bare"

We plan on discussing this more.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@163719 91177308-0d34-0410-b5e6-96231b3b80d8
Revert "objective-C: warn under a flag if missing argument"

We plan on discussing this more, but we shouldn't have it in the compiler
in an incomplete state.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@163720 91177308-0d34-0410-b5e6-96231b3b80d8
minor improvement to couple of tests.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155204 91177308-0d34-0410-b5e6-96231b3b80d8
Add a little hack to emulate a clang crash, so the diagnostics generator can be
tested.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155205 91177308-0d34-0410-b5e6-96231b3b80d8
When generating the clang crash diagnostic script, strip out the -o flag.
Add a FIXME comment.
rdar://11283560


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155207 91177308-0d34-0410-b5e6-96231b3b80d8
Make the FilenameRange of the InclusionDirective callback more accurate,
preserve the macro location of the range end if the filename came from a macro.

Patch by Kim Gräsman!

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167239 91177308-0d34-0410-b5e6-96231b3b80d8
Remove an unused header

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160492 91177308-0d34-0410-b5e6-96231b3b80d8
Simplify UninitializedValues.cpp by removing logic to handle the previous (imprecise) representation
of '&&' and '||' in the CFG.  This is no longer needed, and greatly simplifies the code.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160494 91177308-0d34-0410-b5e6-96231b3b80d8
fix'ed module configuration hint
US1451 : TA2193 Provision of VM for Jenkins (CI). Changed the epel package url.
Clean up a likely concurrency issue
Fix reversed inclusion primes

Thanks to hoxide
http://stacks.math.columbia.edu/tag/031O#comment-71
Remove usage of deprecated Qt5 methods.
Added basic game start screen into flow
simplify delegate
Adding in Web QA.
add chmod_public for Apache permisisons
Added vmail EnvVars & Switch Script
Showing a cooler gravatar instead of the default gravatar when the user doesn't have a gravatar profile
Revert "initialize the definition with a null reader by default"

This reverts commit e47cb624817d825ca2b626a93bf90fb684b6df58.

Conflicts:

	spec/acceptance/import_without_source_spec.rb
after blocks are deprecated
camera multithreaded, updated in vdrift thread, queues for carPoses (old:newPosInfo), removed carPosMutex
fix cam in m.thr=0
Merge branch 'master' of github.com:stuntrally/stuntrally
moved linRange to headers
grasses for moss scenery, merged some info .txt's for data
fix replay load crash
now using .include() and more prototypical internals
expose start and end line data from esprima
failing calls test
basic expression statements for the calls test
adjust for off by 1 differences
pushNode changes, now passes the calls test!
wups forgot to check in the package.json
document fry.include
Adapter and quality trimming command line added README.md
Updated fields dictionary
Adding entities and agencies to search.
support docky click animation effect
Merge branch 'feature/fixaccess' of git.dt:qomo-linux
add destroy link for the show page of isos.
Merge branch 'feature/fixaccess' of git.dt:qomo-linux
shell 配色方案
tmp
add error-check
fix order
BUG13835 cd
del tail log
Merge branch 'feature/error-check' of git.dt:qomo-linux
Merge branch 'hotfix/kde-cd' of git.dt:qomo-linux
Initial Commit
Initial commit
Merge github.com:svcrobotics/HelloWord
Fixing tab spacing...
rjava commit
test-dont-use-too-old-dep.py: fix tarfile timestamps

It turns out that TarFile.addfile() doesn't provide a reasonable default
timestamp, resulting in files dated to 1970 (they're probably wearing
bell-bottoms and listening to disco too). Then, when the bdist_egg command
tries to create a *zip*file with those files, it explodes because zipfiles
cannot handle timestamps before 1980 (it prefers boomboxes and jackets with
straps on the shoulders, thank you very much).

This puts a modern time.time() on the members of the tarfile, allowing future
cryptocoderarchaeologists the opportunity to make fun of fashion trends from
the user's chosen era, rather than an artificially older one.

refs #1342
Changes dependency to spree_core 1.2.0
Fixes zooming on thumbnail images
Fixed bug with incorrect cleaned filesystem paths
Fixed wrong method name
Added unit tests for Helper#getStringSetFromObjectList()
Updated README (0.3.1 version)
Translate most common javac options in Leiningen 1 format into the one used by Leiningen 2

We intentionally don't try to support every single Lein 1 option because there is no way
to do everything Ant javac task can do with JDK's javac API. And it's also not necessary
because many of those features are very opinionated at best.
Strip trailing ws
Merge pull request #544 from technomancy/legacy-javac-options-support

Legacy javac options support
initial docs commit
more docs
Merge remote-tracking branch 'tporigin/master'
doc updates
updates
move stuff around before oush to github
corrected some semantic mistakes… changed script position within dom, added no breaking rule for links edited margin bottom for text to be responsive to.
tried stuff with header and mediaqueries… both turned to shit
button
Update images/lebutton.svg
Added footer button shizzle
Update images/lebutton.svg
hansmartin tried some stuff...
merged in changes of xinteractionx, added behance application
Respun all versions of the presentation material to reflect latest changes to the .rst file.
fixed the documentaiton which wrongly used a method with a "!"
fixing the require
output file is being created. Is missing the satisfactions function
Adding context instance to archive page.
added NUKED source tree flag, will salvage what I can
Release 2.34.3.
add a simple action menu
Add more items to the context menu
don't redraw game when not necessary
indent
move the menu a bit more to the right so it doesn't overlap
trying to change pdf reader
added debug view [#if statement thingy]
Merge branch 'master' of github.com:thedamoes/Gravitation
Trying to add image to readme file...
Add the concept of override rules to tell which files can be safely overwriten or not.
Import the query context buisness.
Adjust default checkbox status for Transfer Sent Contacts
improve text on post-survey facebook screen
Merge branch 'fb-survey-mode' into dev
Post4 complete
Added ido to .emacs: everything should be 22<=, and coffee-mode
Creating and updating rides both work
Proper version #
Included the actual Neo4j version in build config examples. Made the SBT example for embedded+server work again, with a better workaround. Some formatting.
Merge pull request #743 from nawroth/setup

Improved build config examples.
Fix a Javadoc TODO and some typos.
Merge pull request #748 from jotomo/docs-fixes

Fix a Javadoc TODO and some typos.
Reuse kernel instance identifiers.

Made the KernelData instances reuse instance identifiers when automatically generating instance identifiers.
Also made it possible to configure the instance identifier (failing to start if the desired identifier is already in use).
first commit
Merge branch 'master' of https://github.com/thomasjungblut/CudaNN
Removed redundant CSS comments.
Better layout hints for free columns.
Arbitrary instances ready. Two props created. Both fail.
Added readme and license

Preliminary readme includes features and installation instructions.
License is MIT.
Adding better JS
Building for unit tests.

https://github.com/timrwood/moment/issues/211
https://github.com/timrwood/moment/issues/217
https://github.com/timrwood/moment/issues/215
[velo] more UI improvements
tweaked GUI
added headers to output timeseries files
auto use default values for image maps
auto use default values for image maps - fix
some minor improvments and fixes
some minor improvments and fixes
fixes
end of chapeter 5
Correcting some mistakes
Merge branch 'master' into gh-pages
Changed markers to only show up if they are within the users circumference. Added TODO list at top of viewmodel.js
JBTM-1230 it looks like type names need the / taking off from ObjStoreBrowser
Ignore the qa testoutput zip
JBTM-1274 updated to allow the pass through of parameters to build.sh for XTS and txbridge
adding initial version for jfx2 properties
adding chart informations
adding menu rendering
adding core runtime support for Jemmy testing
fix osx frame font
Remove lineprofile temporarily (saved in a branch)
Remove unused import
STY: Refactor BaseWidget from Slider and ComboBox
BUG: Fix behavior when initial overlay limits are bad.

Intensity limits are calculated by the initial input image. If this image has, for example, all black pixels, then subsequent overlays will remain all black because of the initialized limits. Set limits based on data type to fix this issue.
Add line profile plugin back in.

I saved a copy of the line profile plugin in a branch and then deleted the plugin from the main qtmpl-viewer branch. Unfortunately, I forgot that rebasing off the main branch would erase the plugin. This commit just adds the plugin back.
Factored out all address-bar-management logic into a separate module.

The new file is called current-page-manager.js.
Default text size is now explicitly "normal" if not otherwise set.

This is sort of a "partial cherry-pick" of commit
3e41b0840d5cf0b991a03d2d6b44907ec28030d0 in that it doesn't move the CSS
outside of text.js; it just fixes #86, which is a much less volatile
change right now.
Clicking '+ Backpack' now pushes to the backpack via the issuer API.

I've structured the code to be as fault-tolerant of OpenBadges failing
as possible, as well as not blocking on loading of the issuer JS API. So
right now the "+ Backpack" button simply won't be displayed if
window.OpenBadges is falsy, which decouples loading of the issuer API
from the loading of core application logic. It also makes it possible
for an embedder to opt-out of backpack integration if needed (though we
don't expect this to ever be the case).
rename html-badges qunit module to thimble/html-badges.
massive style updating
added the 1.3 download to the docs
Update README.md
Merge pull request #86 from kenjis/patch-1

README.md の更新
merge 1.3/develop ダウンロードページ
Update installation/download.html
Merge pull request #87 from kenjis/patch-2

Update installation/download.html
More descriptive ParameterError for invalid ids.
Working target tracking!
add a little line break between loops
don't add result by default
no longer automatically send result in instrumentation
Removed the :edit-config and :load-config options.
New feature : Added set_question_properties remotecontrol function
New feature : Added get_question_list remotecontrol function
New feature : Added get_token_list remotecontrol function
New feature : Added delete_token remotecontrol function
polling bug fixed for linux
Adding erase function to Vector and some code done to make algorithm works
Set Starter HP to 30.

Also added a constant to easily adjust this if wanted.
Update views and simplify rspec tests.
Finish layout and routes
fix crash when load list place, use WebView in place detail
Trying to upload the missing files
This doesn't work, jsyk.
first commit
Merge branch 'master' of github.com:ueda-keisuke/TopCoder
Set the Gemfile for JRuby.
create and install jruby on deploy if not present.
Set the Gemfile for JRuby.
Removed accidental artifact from bad deploy
Set the Gemfile for JRuby.
Okay, we've got the jruby bundle
Removed jruby from gemfile
Set the Gemfile for JRuby.
Restored Gemfile.
Proper disposal of IncQueryEngine when patterns are reloaded or models
are dropped #177
stylesheet has been updated
Fixed issue with old variables being used, instead of the Global vars
Fix notice of uninitialized variable
Merge this file into Tiwari
deleting files
deleted file
Update %files
Merge pull request #14 from urbanairship/fix-spec

Update %files
Closes #382 - undefined variable footer_block

Signed-off-by: Linda Kamau <kamaulynder@gmail.com>
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web
working api call for getting details in each type
works on both JBoss and Tomcat
Archivo database yml con clave del servidor
Add 'traffic jam' option to road events
now only make the processor available on the queue once the conversation has finished
[check] PHP bug #55156 might prevent annotations from working properly
add test showing progress bar on petition page before signing, add test for sign button brightness
Пофиксенно #15
Ajout du CU7 : Consulter un lecteur
+ Modifications nécessaires dans le controleur et menuBiblio
Merge branch 'master' of https://github.com/vinc38/Gestion_biblio.git
repo_name changed as requested by Tommy[D]
structure action
maps home
Changed ClearDrives subroutine to loop structure
We can set the size of  textarea (cols, rows)
Fixed compilation errors

Now it compiles! Yay!
ChangeLog catch-up
- updated StyxExeptionMessage class
modifications on My Product Reviews table list
modifications on Product Review templates
markup of reviews and ratings tables and content
modifications for shipping labels and buttons on checkout
added count of category items near category title
markup changes for Share Your Wishlist form
styling and markup changes for compare products popup page
Keyboard command send
change cookie key name
Adding QLStephen install script
Update Models for Delicious and IKeepu.
Add model for tuita.com.
Fix model for tuita.com.
appliy source formating
multi error text add
multi valdiate bug fix
syntax on add nerdtree
fix a compilation problem on the farm
Basic caching and time aligning added
Updated strings to be sentence case and added extra lower case versions for use on the main screen
Did not do ru translation though
Shorter menu item strings and ifRoom|withText instead of always
Minor
DE Update
further lang updates from GL
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
configured drag & drop toggling button for blocks plugin
disable sortables and dragables
updated impress.js demo to 0.21.x
updated demo-app for AE jQuery UI; added a system check if required *.php / *.log files are read/writeable
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
updated changelog
Add 'block-activate' and 'block-deactivate' events for blocks.
Added the option for specifing dropzones for blocks
added missing comment
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
Coding style updates
added info about getContents contenthandler settings
added info about Aloha.settings.contentHandler.handler.generic.transformFormattings settings
removed demo/test.html -- was never planned to be a demo...
Adds documentation for block-activate and block-deactivate
Merge branch 'dev' of github.com:alohaeditor/Aloha-Editor into dev
Merge remote-tracking branch 'laktek/blocks-dragdrop' into dev-blocks-dragdrop

Conflicts:
	src/plugins/common/ui/lib/settings.js
Push with little changes for Tyler
Add conn.open_session method support for the isolation configuration
string.
WT_RET in __wt_block_alloc could leave the allocation spin lock held.
WT_RET in the middle of __wt_block_open could fail to clean up.
WT_RET in the middle of __wt_block_read_off() could leak a scratch buffer.
WT_ILLEGAL_VALUE in __inmem_row_int could leak scratch buffers.
WT_RET in __slvg_col_build_internal could leak created in-memory pages.
WT_RET in __verify_dsk_row could leak scratch buffers.
WT_RET calls in row/column search loops could leak a page's hazard reference.
Calls to WT_RET in __rec_row_int and __rec_row_leaf could leak scratch
buffers.
s_style was complaining because there was a WT_RET that didn't free the
buffer, but it wasn't a bug, the test before was to see if no buffer
memory had been allocated.  For simplicity and to avoid wasting memory
should the configuration string be kept around, rewrite the code to use
a scratch buffer plus a final string allocation.
WT_RET call in __wt_conn_btree_open could leak a btree handle.
Typo, fix WT_ITEM declaration.
s_style was complaining because there was a WT_RET that didn't free the
buffer, but it wasn't a bug, the test before was to see if no buffer
memory had been allocated.  For simplicity and to avoid wasting memory
should the configuration string be kept around, rewrite the code to use
a scratch buffer plus a final string allocation.
Free the temporary buffer on success.
Call to __WT_RET_MSG could leak the scratch buffer.
s_style was complaining of WT_RET(__rec_discard_page) in __wt_rec_evict
not jumping to the error lable, which it probably should have -- but,
neither __rec_discard_page or __rec_discard_tree can currently return
errors, change them to return void, not int.
WT_ILLEGAL_VALUE call in __btree_tree_open_empty could leak page memory.
WT_ERR call in __wt_block_write_off wasn't necessary, it came before the
temporary buffer was allocated.
s_style had a bug, it was removing the longest C comment it could
construct from the function, which removed most of the code as well.
Fix that (and fix all the bugs that suddenly showed up).

Add WT_VERBOSE_RET and WT_RET_MSG to the list of "returns" we check
for.
Fix a comment.
If we're copying out data, assert there is data to copy.
Use Keith's new list of valgrind suppressions applied to any Python binary.
Fix a leak of the in-memory transaction log structure.
closes #333
Fix uninitialized variables as reported by GCC 4.6.
Allow "lsm:" types to "wt list".
Implement session->rename for LSM trees.
Versão final inicial
adding documentation files
merging from 1.2.1
add css class to menu item
add css class for page menu items
make checkbox visible
adding migrations for new fields
Merge remote-tracking branch 'origin/lyrical-page-1-3-x' into development

Conflicts:
	setup.py
ignore mac files
remove old index template
put Eric in authors file
Remove old menu templates

Update and remove old templatetags

Add base.html  based on  html5boilerplate
add jquery

update stylesheet

add modernizr
Site tracking updated to work with multiple sites
fixes to page position blocks
changed menu and menu items
Each menu item now has a mitem{{ number }} associated with it.
Fixed the SiteMenuItem change form's inittinymce error
Adding site_util to development
Fixed an issue that prevented access to add and change menu item link and page pages on a production setup
Added an import for redirect
fixed an issue with returning to the menu item list if trying to continue or add another.
Stripping the content clean of html tags

Remove all html tags, the output is much more readable now.
update the sample script in README
rotujeme
kompilacia na obrazovku
b:JSLintActive invoke after JSLintClear because it's be set in
JSLintClear
Merge pull request #857 from GeertDD/fix_metabox_toggle

Fix metabox toggle
chosen frontend - separated to avoid accidental deletion
refactor variation add to cart. Closes #1134.
No nav_menus
woocommerce_ajax_loader_url
sending to multiple e-mails for test
Merge branch 'master' of github.com:wsdookadr/mailprequel
Testando o merge
Merge branch 'master' of https://github.com/wseidel/treinando-git
update mananger

fix #29
a simple patch for verifycode

TODO:
 show verifycode when someone visit.
Update libs/jsfunctionParser.py
Merge pull request #1 from binux/master

merge
settings
include fix
just in case: we don't want to create links to ourselves
organize app to suit 'django standards'
deprecated bit
signal
Merge branch 'master' of git://github.com/jgsogo/url-shortener

Conflicts:
	settings.py.example
	shortener/models.py
	shortener/templates/404.html
	shortener/templates/base.html
	shortener/templates/shortener/index.html
	shortener/templates/shortener/submit_success.html
	shortener/urls.py
	shortener/views.py
	templates/base.html
	urlweb/templates/base.html

MAY NOT WORKING NOW
try to get equations to render first time
Merge branch 'gh-pages' of github.com:wysiwhat/Aloha-Editor into gh-pages
Update Readme for facebook integration
ctrl+enter functions propertly if keypress in main window and clears search too.
Manu window title menu option to disable keypresses in window
Added knowledge bar for right hud showing research completed (and eta hover).
Calculate research ETA from actual rate so allowing for libraries.
Add more dependancies to debian control file.
Minor tidy up for new code knowledge bar code.
 * Fixed spelling error for OpenGL errors.
 * Fixed tiler index error.
 * Added different formats for terrain texture when using OpenGL 2.1 or OpenGL 3+
Merge remote-tracking branch 'upstream/master'
Add Atom feed to notify the updates of the pages
libXaw: update to 1.0.11.
libX11: update to 1.5.0.
xbps-src-utils: new day, reset revision.
cinnamon: fix short_desc.
added ws backup files
各种有用的扩展
[batchimport] Added some style for the batch import wizard.
XRENDERING-202: XWiki 1.0 Syntax Parser sets the wrong SYNTAX Metadata
* Revert commit for now since Thomas says it's breaking things
client.py: add middlebox information data structure and simple algorithm implementation.
initial configuration

Configuration of the Azure Project to go live in the Cloud
Use iso8601 instead of crappy rcf8222date wannabe
Merge pull request #261 from harlowja/master

Change dates used.
Updated ys/struct2uml

Author:yangyingchao, 2012-11-21
design shops index 2
added text before captcha
http-conduit 1.6 (snoyberg/http-conduit#44)
first commit
Merge branch 'master' of github.com:yibojiang/Pixel-Space
Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad
Open transaction before applying transformation
importSVG: ignore the viewBox if not absolute untis are

given for width and height and sort edges before trying to make a wire
既存のhtml
Pass in coordinate instead of address to SnapFresh API for i18n support
Tweaked bar button item title for smoother transitions.
Remove unneeded DbcMethods

The log_in and log_out methods were initially used as noise methods, but
I later modified the script to generate an entire set of n noise methods
(n ranging from 0 to 10). So when n was 0 (meaning no noise methods),
there were actually 2 noise methods.
Add noise methods before, not after, useful ones

This will change the search space so that DFS will find a solution
quickly (but the solution will get longer as the number of noise methods
increases), while BFS will suffer before finding the optimal solution as
the number of states it has to check increases with the increase in the
number of noise methods.
construct single page.
アセンブリ情報を更新/バージョンの指定方法を変更
repo arrangement
Changed SDImageCache.m disk cache to delete oldest files once cache disk usage goes above a certain size.
Merge remote-tracking branch 'benhoyt/patch-1'

Conflicts:
	SDWebImage/SDImageCache.m
Optimization(Stopped creating new chart each time)

Improved performace significantly
Added very basic Personal page and transition to it
Remove final > in TERM=linux PS1
libxtables: add xtables_ip[6]mask_to_cidr

This patch adds generic functions to return the mask in CIDR
notation whenever is possible.

This patch also simplifies xtables_ip[6]mask_to_numeric, that
now use these new two functions.

This patch also bumps libxtables_vcurrent and libxtables_vage
since we added a couple new interfaces (thanks to Jan Engelhardt
for his little reminder on this).

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
extensions: add HMARK target

The target allows you to set mark packets based Jenkins' hash calculation:

h(t, rnd) = x

mark = (x % mod) + offset

where:

* t is a tuple that is used for the hashing:

 t = [ src, dst, proto, sport, dport ]

Note that you can customize the tuple, thus, removing some component
that you don't want to use for the calculation. You can also use spi
instead of sport and dport, btw.

* rnd is the random seed that is explicitly passed via --hmark-rnd
* mod is the modulus, to determine the range of possible marks
* offset determines where the mark starts from

This target only works for the "raw" and "mangle" tables.

This can be used to distribute flows between a cluster of
systems and uplinks.

Initially based on work from Hans Schillingstrom. Pablo took it
over and introduced several improvements.

Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
libxt_recent: remove unused variable

The info variable is assigned but never read in recent_check().

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
libxt_hashlimit: add support for byte-based operation

allows --hashlimit-(upto|above) Xb/s [ --hashlimit-burst Yb ]
to make hashlimit match when X bytes/second are exceeded;
optionally, Y bytes will not be matched (i.e. bursted).

[ Pablo fixed minor compilation warning in this patch with gcc-4.6 and x86_64 ]

libxt_hashlimit.c: In function ‘parse_bytes’:
libxt_hashlimit.c:216:6: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’ [-Wformat]

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
libxt_HMARK: fix output of iptables -L

Fix accidental swap of [s|d]port-mask and [s|d]port-port.

Use xtables_ipmask_to_cidr instead of xtables_ipmask_to_numeric.

Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
libxt_HMARK: fix ct case example

... -j HMARK --hmark-tuple ct,src,dst --hmark-offset 10000 ...

Note `ct' requires also the tuples.

Reported-by: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
adding a warning on scheduler component
colors() can now look up the symbolic name for color codes.

git-svn-id: https://pennmush.googlecode.com/svn/trunk@1576 ba372814-4f39-11de-9ad6-1127a62b9fcd
IE7 FTW
- add an engine creation routine for tests, which emits SkipTest if the
given engine isn't configured/supported on the target platform
- add a fixture file for the README docstring tests which uses the new
engine platform
- modify test_oracle, test_pg to use new configuration system
Adding notes on running database procedures.
Updated templates.

New base template layout - moving the menu from the top to the left.

Updating base template to work with boostrap. Leaving old javascripts,
as they used to be, but adding pipeline code to enable once we bring js
libraries up to date.

Adding neccessary graphics and tidying up .css files, removing a number
of unused or no longer required html/css files.

This commit contains css updates related to templates that will be
included in subsequent commits.
Updated graph, about and documentation templates.
Fixed error in clear_queue option.
Fixed error
Fixed crontab.
MTRACKER-51: Sticky footer.
MTRACKER-56: New search template.
MTRACKER-56: Updated hit details view.
Left menu as on the mockup.
Adding db_arrivals to cron schedule.
A bit of pep8.
Improved toprequesters reports.

Introducing new toprequesters logic and multiple reports support.

Two toprequesters reports are now be available:
* average of hits_available,
* hits_posted,
per requester over most recent entries specified by --days.

Management command will now accept a --report-type integer paramente,
defaulting to hits_available report.

See toprequesters.reports.ToprequestersReport for available report
types. This class should be refactored to act as a wrapper for all
cached reports' data.

Cron entries and view integration will follow soon.
Commenting classification out in hit_group_details.
Merge branch 'gb-new-templates'

Conflicts:
	templates/main/hit_group_details.html
Adding npm to requirements (to install less).
Merge branch 'classification'

Conflicts:
	app/mtracker/settings/defaults.py
	app/mturk/main/views.py
	templates/main/hit_group_details.html
Added forgotten requirement.
Fixes in classification and hit details sites.
Toprequesters report tabs.
Refactor: adding mturk.toprequesters.

First of all, moving toprequesters from mturk.main.management.. to a
separate app.

Adding a dedicated logfile for toprequesters.
Changed from file-uploader to request; still not working…
1. daily acceptability added

Signed-off-by: shubham kaushal <1shubham@gmail.com>
WHISTLE-1186: don't normalize the querystring keys implicitly; caller should normalize before converting to query string
WHISTLE-1186: handle the nesting of Play/Say/Pause in Gather better
WHISTLE-1186: fix bug for handling relative paths with a leading '/'
WHISTLE-1186: remove unneeded log line
WHISTLE-1186: remove some extraneous logging
WHISTLE-42: remove debug lines
YouTube HomePage Two Columns: Suited to the new design
Update notes for submitted changes

* Fix SecurityException when adding a captured photo
adjust the method in com.weitongji.net
merge
update 1styles
step 2
MAM V3 DEV. Services module done. Started work on App class
Desktop mode crabs the jquery timer js file.
Started moving code related to desktop stuff into desktop.js. Also started intergrating jPlayer.
Hooked jplayer up to the play button.
Removes test code.
Adds support for G++.
A session-based flash store that persists to the next request.
[revert] revert .settings feature

This was supposed to be in one commit, but things got confused.

[doc] document the new monitor API
[feature] add settings properties
[doc] document new monitor API
[feature] add settings properties

Conflicts:
	README.md
	lib/core/monitor.js
Fixed include/exclude bug.
Accordion makes new Sections
Alle Platzhalter Icons für die Map hinzugefügt
updating docs and killing typos
Fix popover positioning
Send correct headers for motif downloads
Add nr chapter citation
Fixed tag_name for atom

in order to get work commands mongo:command({create: 'collectionName'})
and mongo:command({renameCollection, 'db.col', to, 'db.newCol'})
it is necessary to tag atom_to_binary(atom, utf-8) as string value
(not as symbol)
Fix privado
Deleted mwlib folder
Added mwlib without subtreemerge
Merge branch 'master' of https://github.com/Arcavias/arcavias-core
added silence check and FindTowers to updateGameboard
Use sparse copy - suggested by Steve Hardy
Typo
Merge pull request #190 from aeolusproject/feature/fedora_sparse_copy

Feature/fedora sparse copy
Added user authorization and blocked access to User index page
Precompiling assets for deployment
very lazy to write changes...
updater:aokp vendor
alternaitve targetting and ajax reload methods
Update src/org/Barteks2x/b173gen/generator/beta173/WorldGenBigTree.java
Revert "Merge branch 'hu-master'"

This reverts commit b8e959a0af913ce1ffeecfbe6fb1057a95ca74e0, reversing
changes made to 6db341e64ad41db3c86c89e3da8756a831897474.
Removed coco 2d library
Improved the look of the aerial perspective:

http://en.wikipedia.org/wiki/Aerial_perspective
Added in Sounds
TileNeutral
doublecmd-svn :: 4969-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-main :: 20120920-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-stat :: 20120920-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
opera-adblock-elements :: 20120920-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
virtualbox-modules-bede :: 4.1.20-1

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
- Added integer branch folding optimization (incomplete)
- Fixed bug with clearing out operands
Changed DB connection string

Live database doesn't exist anyway so no security issues here.
ultimo commit de hoy. Solucionado los bugs que paso qc
Home y Followers en home.html (PageView.js, user por parametro)
Grid gutter adjustments
Grid fix
Responsive goodies
Responsive Updates
Integração com o RubyMine
Remove some debug codes
Fix a bit of styling
httpencoding of gadget in securitytoken as it may be a URL
removed extra odt
remove two unused java files from tree plugin
Change the mref back to xref for ontologyRerference otherwise the length of joined table name is too long
refactor dataShaperExcelImporter.java due the changes in ontologyReference from mref back to xref
Remove the searching function in tree plugin. Prepare to redo the searching function in jQuery instead of reload the pape
as soon as the user click the search button.
Would not remove the pipe character when the string is processed because it is the symbol that separates the category values. That indicates there are multiple values in one cell
Removed the testing json code from harmonizationPlugin.ftl file
The detail information of the tree branches (messurements) is stored in JSON object instead of self-defined hashmap in javascript. This is more formal and eay to manipulate in the future
Add valueSet to the HL7Parser, to be continued......
formalize the name of the entity, only letters, digits, space and underscore are allowed to be the composition of the name
added 2 new classes to hold the value for categorical data (answers to the questions), succussfully import all the data with categories for StageLRA
added Missing category in the detailed information for measurement, the categories attached to the measurement and with code string
change ontologyReference from xref to mref in InvestigationElement, deleted ontologyReference in Category entity as it extended from InvestigationElement
added barebones index.html
Merge branch 'master' of https://github.com/Cheeseum/microprojects
add more framework code
new mysqli stuff
new mysqli stuff
Update srcDir
Check if value is set to get rid of warning
warn when child plugin doesn't have a start function
use deploy instead of built.jar symlinked folder in scripts
script warns when bukkit is running with a fail msg
Merge remote-tracking branch 'upstream/master'
don't start REPL if it's already running addresses #18
but still this isn't good enough considering that on `reload` clojure
reinit happens (or at least RT class gets re-loaded ie. its static
initializer block gets re-executed which loads clojure/core) not sure
how this affects the running REPL - maybe we need to stop it when
cljminecraft gets disabled ? but only if it's deemed inconsistent
considering the above
ignore eclipse repl history
stop REPL onDisable (of cljminecraft not children) #18
this is not a bad idea maybe because config.yml now has different repl
options (port/host) and it can be restarted (stopped then started) when
`reload` happens on server for example.
noting a possible inconsistency
consolidate into one .gitignore
Merge pull request #19 from basicsensei/master

renamed built.jar folder to deploy - in scripts AND warn when child has no start method
got length of Tat's tree stump set to correct size
disable playback video recording if opencv is not available
leaner .less art counter
Fixed CSS Formatting
Moved init procedure to void init().
Merge pull request #14 from CraigPorter/master

Added map2bam.pl script.
assembly stats programs
Merge pull request #15 from andrewjpage/stats_apps_by_mh12_for_assembly

assembly stats programs
mh12 utils
Merge pull request #16 from andrewjpage/stats_apps_by_mh12_for_assembly

mh12 utils
Added ena_submissions_update.pl to pathdev_bin
Merge branch 'maa_branch_20111012'
Added ena_submissions_update.pl to pathdev_bin
Merge branch 'maa_branch_20111012a'
Added project page script to pathdev bin
Merge branch 'maa_branch_20111018'
snpfind
Merge pull request #17 from andrewjpage/master

snpfind
shuffle reads
Merge pull request #18 from andrewjpage/master

shuffle reads
remove temp directories at end of script
Merge pull request #19 from andrewjpage/master

remove temp directories when everything is finished
assemble lanes and retry failed lanes
Merge pull request #20 from andrewjpage/assemble_lanes

assemble lanes and retry failed lanes
rna seq find
Correção em quests de episódios
General Cleanup
Good to go without google+ button

Also doesnt have analytics.  Do I really need them at this point?
4
Updated buildbot link on README
Implemented memory viewer in the IDE
Merge branch 'master' of github.com:DCPUTeam/DCPUToolchain
Fixed random segfault (thanks Valgrind!)
Fixing literally the weirdest Windows bug in existance.

It appears that the fseek/ftell functions on Windows have a "hole"
around 14880 upon which if you query for the location either by
ftell() or seeking with SEEK_CUR, you will be given ~14856.  When
reading character-by-character in the bfile library, it'd loop forever
since it would never pass this point.
Merge branch 'master' of github.com:DCPUTeam/DCPUToolchain
Merge branch 'master' into policies
Use new icons.
Edited 'keeping passwords safe' for brevity and clarity
Edited 'Minimizing damage' for brevity and clarity
Edited 'physical protection' section for clarity and brevity'
Edited sentence based password section for clarity and brevity
Edited password manager section for clairty and brevity
Re-ordered sections in order of importance and to make things flow
Removed redundant section on firefox passwords (with reference to non existent chapter)
Edited caveat section to remove redundant info and make it clearer
Rename old files to new files, scss now live
Added a few more tests to Force.
dropped django-twilio.
added psycopg2 to requirements
Echo finally working
get now dumps a list of crops.
added filters
Added image support
Now supporting null User PriceReports
SMS upload working
Fixed the format of some code.
Pushing so that I can end up changing to Play 2.0
Enable Zram and Implemented Google snappy compression / decompression  CREDIED by vadonka
Add: Weather Control to worldParam
Fixed tile rendering issue
выравнивание меню #nav и #main
adds icons and hipster ipsum
Google analytics for GH pages site
minor 2nd :D
FCFS was trivial as shit, man
Makefile: Added queue.c into the sources list
code style changes
add cache plist example
Update Configuration Files/Essex-1/nova.conf
Improved unit tests to allow the use of before(:each)
Element sampling HUD thingy (No very good with MVC)
<Tag 6> Barbara: Änderung des Fehlers auf getUuid()
Merge remote-tracking branch 'origin/ceBarbara'
dialog: version bumped to 20120706
Solve for two aces, both get reduced, == 21
Autodetect availability of accept4() using a compiler test.

Previously we autodetected using macros, which turns out to be unreliable.
This fixes compilation problems on e.g. CentOS 5.8.
Temporary frame limiter removal.
No need to use hard reset

proc run_cpu0 was missing an adbg_select_module [DC_CPU0] that's
why it didn't restart the CPU and we needed ti use the hardware
reset. This patch fix this.

Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
Time to Push3
fix duplicate html_part issue when mail already has html_part
Site updated at 2012-12-15 12:43:46 UTC
pass the chart data vars as indiviual data attributes on the placeholder div.
Made slendy fit into the gang of trees

I tried my best. Not really.
Using full paths
Updated comments and shortened filenames.
Changes added by AJ for Eni detergent-deposit binding strength predictor.
Updated path to the excel file containing group definitions.
Merge remote branch 'official/master'
Remove whitespace and bang a create
fix the build  [#29788299]
change the color of link if no sandbox   [#39077955]
[#37122893] eager load associations for insights
[#37122893] present insight list as an activity stream
[#37122893] remove some of the keys in presenters if presenting for activity stream
Unignored library and sln files

- updated .gitignore to include libraries
JKJkjnsjf
now kind of works
calculateBenefits y getUrl
Committing from your house
switch to latex appendix instead of chapter style
removed warnings in rmiWithCacheClient
removed warnings in rmiOnlyClient
removed warnings in rmiOnlyServer
Merge branch 'master' of github.com:Hofmaier/ObjectCaching
Fix monitor formatting.
Remove unneeded AntiCheat exemption
Check for the 'prongs' in the transmutation circle
Storage circles
v2.8.0
Using dip [device-independent pixels] instead of pixels. That way, pixel size is well....device-independent.
Added quit menu, so that we can stop these threads properly -_-
Added section rendering to the print-friendly view
Updated models with current schema
inserted few GUI changes

tried to make a animation on background while playing music - not done
(inserted one of the background images)
inserted a volume slider
inserted error message if pygame couldnt read file
(have to insert an exception if song not selected and play key pressed)
changed positions of buttons and resized the window
Boost Bar Label added also made time label white

it looked cooler
GrabOne - Fix history back
ZL Field Text placeholder option is now translatable + install script tiny improvement.
Clean tmp_h_test_* files.
work on setting stuff
paramdefinition newfromarray