labofsahil/github-event-dataset-2012 huggingface dataset:
Add DB and Format
Updated dashboard feature as drush fu did not include all settings
Added file_display settings so media is display as wanted
feature add : grep nodes just on matching any attribute-key OR attribute-value for any node
changed Moment.js lib so that Today formats without the time.
A better team
Merge pull request #2 from tomarrrrr/master

Update to list
FINAL SITE AND ORB CODE, INSTALATION SITE CODE ADDED
Hey, a blog
Customize User-Agent string and then detect that custom string to dynamically load the correct cordova.js file
return a colored image in graphcut
Build for people to test.
layout edits
edit
seperated queries for subordinates and others
added search box in reporting managers page
Minor changes to state machine names.
removing bin .classpath .project
chinese test
ts
修改了一些代码，把文件分了类
11
Added opportunities and milestones. Works but not fully tested.
Styled resume
Make RMI easier to correlate, add a vulnerability check to the scanner module
Fix up the check so it doesn't throw a marshal exception
Fixes an issue with mysql probes not timing out properly.
Fix possible "can't convert Fixnum into String" error
Add McAfee Virtual Technician ActiveX MVTControl vulnerability
Fix an error condition with the afp server info module
Better exception handling is probably needed for the entire thing
Fix a mangled merge that prevent imported vulns from being registered in some cases
Tabs. Sweet sweet tabs
Fix a mangled merge that prevent imported vulns from being registered in some cases
Bump versions to 4.4.0-dev
module for cve-2012-1775 added
Remove reference to missing dispatch_ninja
Merge branch 'cve-2012-1775_vlc_mms_bof' of https://github.com/juanvazquez/metasploit-framework into juanvazquez-cve-2012-1775_vlc_mms_bof
We no longer have to print the client's IP, because it's now a built-in feature.
Forgot... I don't need to print the client's IP manually anymore
Adding a file to the Git Repo (ignore)

This file will be edited a few times then removed. It is here just for
GitHub user training for metasploit developers.
Adding a new file to test/git.txt
Merge remote branch 'mcfakepants/new_test_file'
Adding another test file (ignore)

[Closes #356]
Removing temp test dir for git user training
When a card is drawn from the deck it is now removed
PKCBUILD for qtbase: Fix url
PKGBUILD for qt5-qtjsbackend-git

Signed-off-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
PKGBUILD for qt5-qtxmlpatterns-git

Signed-off-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
PKGBUILD for qt5-qtdeclarative-git

Signed-off-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
PKGBUILD for qt5-qtsvg-git

Signed-off-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
qt5 now is a metapackage

Signed-off-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
Added bootrstrap to Gemfile
Range request with timer. Ack RANGE ACCEPT.
Clean up a bit Huawei algorithm.
Near final revisions with Aoife. Fixed the epsilon issue by using ragged2e and a newcolumntype command
Merge branch 'master' of https://github.com/aoifecahill/paper-wikichains
[TIMOB-9350] Catch classCastException. Value conversion from strings
Merge pull request #2315 from vishalduggal/timob-9350

[TIMOB-9350] Catch classCastException. Value conversion from strings
timob-10806: fixed setting/changing the "image" property for TiUIButton and updated doc

Conflicts:
	android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIButton.java
Merge pull request #2968 from pingwang2011/timob-10806-2_1_X

timob-10806-2_1_X: Android: Ti.UI.Button.image property is not working for density specific images
Fixin' dem bugs.
Prepping for tag.
Move script files to scripts folder
Removed Bugs..
Temp
Working multithreaded model
Everything is now threaded!!
The servers get added upto 5000!! Which needs to be worked upon...
Multithreading part succeeded.. I guess, eh!!
Merging multithreaded code to master
version moved to 1.5
removed a nasty bug by forcing NO garbage collection
Update lib/express_validator.js
Chars ignored in files
Removed not working travis ci badge
adicionei uma tag de sub titulo no arquivo README
Added Jasmine BDD
Added option for direct file download
Workaround a bug which made pistons disappear.
Site updated at 2012-09-19 11:08:41 UTC
update config (add enable disqus & google analytics)
change blog title
increase content font size for better readability
add first blog entry
更新 ldap o,ou 的顺序。
Undoing last change to production.rb
caif: Fix access to freed pernet memory
Add GC/CC events to the profile
fixed double & float conversion bugs
add xml dom wrappers,change a few sources
refactor exceptions & move JDBC from bingo.utils to bingo.lang
Merge branch 'master' of
https://fenghm@github.com/bingo-open-source/bingo-core.git

Conflicts:
	core-lang/src/main/java/bingo/lang/exceptions/RuntimeExceptionEx.java
add simple plugin features
getting back on track with git...
Added support for TLS connection (STARTTLS).
Added getters for responseCode, responseText and socket.
Modified Gemfile & config/database.yml
fixed epic error inject{} --> inject(0){}
Cult of Logic-Less Templates
fixed the .gitignore thing and removed the docstates (looked useless)
Fix Makefile variable assignment

Missing colon made a recursive variable assignment.
Add ievms installer
Updating TODO list in README
add logo, accented background
ruby-ize file name
adding theming for pages
try loading animation after images load
Merge branch 'animations'
Add gitignore.

Signed-off-by: Daniel Garcia <danny@noisenewyork.com>
Added different names and used normal for the menu callback
#8 Checkpoint module
#8 Integrated checkpoint class into document class
#8 Untested facilities for signature verification
#8 Fixed a syntax glitch and added some comments
Merge branch 'master' into bug8-checkpoint-mechanism
#8 Signature tools have tests now
#8 Intermediate commit for new owner stuff
githubsync: prehistoric ruby compatibility.
githubsync: avoid Errno::EXDEV when /tmp is on another partition.
Add BC.
Check for counterclockwiseness instead.
calculator return 0 for empty string
Wilhelm Friedemann Bach: Bratschenduett completed.
Inventory bundle now has basic functionality for managing your inventory
bugfix: subrequests with error status code did not trigger output header filtering any more. this bad had appeared in the last commit.
bugfix: ngx.req.init_body/ngx.req.append_body/ngx.req.finish_body could not work with ngx.req.socket and resulted in infinite loops when the nginx request header reader has pre-read the beginning part of the request body. thanks Matthieu Tourne for reporting this issue. bugfix: the ngx.req.socket() object could not handle pipelined requests in some special cases. feature: added new dtrace static probe nginx_lua:::http-lua-req-socket-consume-preread.
bugfix: 3rd-party nginx C modules that use the public C API function, ngx_http_lua_add_package_preload, could result in segfault at nginx server startup due to uninitialized Lua VM pointer. thanks Ray Bejjani for reporting it.
我把logo修改了，还有courseMenu。jsp的界面修改了，改成一点击就滑动出来的类型
fix for post 6/20/2012 3
Added link to chilmers wiki @ github
cleaned up randomizer and fixed skylands teleport
vim plugin structure + readme + added ruby class
Handle undefined conversions, so tests pass.
Correct implementation of BinarySearch
Length set/get + tests
Added more fixed numbers in Single/Double FullRange
Added Math.Abs() and tests
Allow non-BCL methods to be redirected into their own class
Site updated at 2012-03-22 13:47:21 UTC
Update CHANGES
Add author to list
- fixed: iReport switched alignment of report (measurement sketches) title to 'Left' , should be 'Center'
Merge branch 'feature/6-enhancement-of-vermessungsrisse' into dev
Fixed peek output error
add another status for feedback
Updated the information shown when an admin is looking at comments.
Bootstrap cucumber for spork use
Merge branch 'spork' into guard
Fixed "Left" layout.
Add male/female as a valid characteristic
Force matched drakes to be alive
New config file WITH OMF.
HTML5 conference
First draft for html styleguide
Added initial content from github styleguide
Added overview content
Add style for inline <code> tag
Fixed broken Liquid asset tag and added http:// to prod urls
Added files to exclude when compiling

 - Added compile script
Added test change for index.md
Copy all files to tmp instead of _site folder
Use gh-pages branch for deploying
Added .nojekyll to rake deploy
bumps version
bumps version
Merge branch 'release/v0.2.1'

Conflicts:
	VERSION
Added a beta download center for staff documents and resources
added cheatsheet
started on cheat sheet
drafted unit testing with JS post
added images for sousvide post
HELP: CAN'T SAVE USER INFO INTO DATABASE,BUT UNIT TEST WORKS WELL
Don't mass assign the cache column to avoid triggering mass assign protection.
Correcting merge conflicts in t-ad
Changed the link hrefs to cuttarug.github.com
Assume that 'homepage' in title isn't a valid page

This is a rather crude attempt to identify where
councils have just put their homepage as a service
URL. We can't necessarily use the URL to work this
out as some councils use URLs like /?page=1 etc.
v0.2.0: to-do
Add samples for the "Reading Files" tutorial.
Mark dndfiles as done.
Rename variables and update comments for clarity.
Combine the forminput, dndfiles and reading samples.
Fix whitespace.
Merge branch 'master' of github.com:dart-lang/dart-html5-samples into jason9t-dnd-files
Merge pull request #11 from dart-lang/jason9t-dnd-files

Add file/dndfiles samples from the "Reading Files" tutorial.
initial commit
CNAME file for hosting
rename files to .html
default.html > index.html
rename default.html
Merge branch 'gh-pages'
Some more notes for Chapter 7
Add Geometry modules
enhance rakefile
Merge branch 'master' of github.com:davetron5000/naildrivin5.com
Adding DNT support to analytics helper.
Adding docblock to generate method.
Document new version.
Adding trackEvent method.
Cast to array in case helper gets no settings.
Adding support for tracking page load time.
Allow script to be configured; don't apply any magic.
Enable debug analytics script when debug is on.
Fixing typo, thanks sams.
Minor formatting.
Remove optional type from script tags.
Format XML output when in debug mode.
Minor formatting.
Thank you!
A note on debouncing
Site updated at 2012-04-09 15:44:01 UTC
apns-conf-cdma: add APN's for USCC and Cellular South

Change-Id: Ie36fddc3c74e7a0fa11a1c67c153bb68382d303d
Merge branch 'jellybean' of https://github.com/CyanogenMod/android_vendor_cm into jellybean
Introduced slideshow button for pages having images
Added jQuery function for carry over.
Merge branch 'carry_over' of github.com:den-plugins/redmine-treeview into carry_over
WIP carry over - bug checks and optimizations
Carry over tree build complete.
Merge branch 'dev' into carry_over

Conflicts:
	app/controllers/treeview_controller.rb
	app/helpers/carry_over_helper.rb
	assets/javascripts/carry_over.js
	assets/stylesheets/treeview.css
Merge branch 'dev' of github.com:den-plugins/redmine-treeview into carry_over
Merge branch 'carry_over' into dev
Added vars for password_spin
push start of inode write
Added further instructions on compiling the agent to the README
Update formtastic-scss.gemspec
gmail feature added
fixed google-player, added mp3-loading via ajax
Added MagField images, materials, and prefabs for testing
5.26commit
5.26_commit
Problem 5

Problem 5 added
SVProgressHUD added
need a link to view friends
Added initial setups for using ajax
Resolved cinflicts
changes database.yml to work with postgres
expansions support
Added google Admob
refactor a button
Merge branch 'AndrewKo'
new jar; removed useless import
Add (very simple, and possible errorprone) auto updating to the development version
[node] lower the barrier to 0.6.0
mmm agregando cambios by brick
Merge branch 'master' of https://github.com/efrainastudillo/sw2calpespol
new cool Contact Manager
added function to store the ContactStore
added validation
renamed Validator to ContactValidator
renamed Validator to ContactValidator
adjust size
New added.
added base-config for freifunk-jena
fixing pause and forward for haskell
Missing var statements.
Site updated at 2012-10-19 07:30:09 UTC
Some stylesheet changes.
Javascript-s!
Merge branch 'master' of github.com:emilevictor/HCI-WhatsInThere
upload the pdf; some cleanup
compatiblity with spree 0.7 was added
ConfigHelper contracts fixes.
XML debug, grid id fixes
Primeira inclusão de arquivos no fadamiao.github.com
Rewritten.

Cleaned up SDF builder, fixed taxonomy handling, fixed post_type
handling. TODO - admin page. TODO - search class
fixed Makefile to build html to the root
Site updated at 2012-08-03 12:53:06 UTC
fixed
fied bug in tests
add more errors in the examples
Ignore rubinius dir
Remove instacast add podkicker
Fixed flag/mark confusion in helpMarked (...)
update command line generation to put sources before specs
dependencies for building the server
metadata cleanning before re-submit and change the add concept button
Solve the mix of thesaurus and metadata graph
partition update
use guava for managing user creation
add test to utils package
todo for integration
#59 comments for implementation
clean comments
put the datasending in the right place
#59 clean metadata json construction. Remove information about file parsing and then create a new property for this
#59 add a global naming service for generate graph name
Rename the csv skosifier with a more clean name
#59 get a fully compliant metadata source,model and json generation. Let's go to implement the rdf processing
#59 get correct dataType in RDF. Solve graph name error
merge metadata to master
first draft, but don't work due to cross-origin policy
first import
Really first implementation of the authentication endpoint based on Clerezza
update the readme
#29 #27 first implementation draft of authentication. Client side is ok, server side need more code (link to LDAP and ntua auth)
first draft, but don't work due to cross-origin policy
first import
Really first implementation of the authentication endpoint based on Clerezza
update the readme
#29 #27 first implementation draft of authentication. Client side is ok, server side need more code (link to LDAP and ntua auth)
rebase on master
#66 solve on send-mapping
#66 change crlf to cr
#56 solve on css-wiki-edit
#56 change CRLF to LF
#16 add button
#16 change clrf to lf
first draft, but don't work due to cross-origin policy
first import
Really first implementation of the authentication endpoint based on Clerezza
other ui tests
Redmine 2.0 fixes
put 'model' in the environment.py for convenience
release v 1.0.0
Only return attributes for a representation that match attributes in the model

In the instance we have a garbage value for a relationship, the previous implementation would also returned that as a valid attribute
(which subsequently crashes the incremental store when it tries to update the backingObject)
Validate relationship representations

Need to exclude garbage relationship representations (e.g. a string) else it'll be passed to the HTTPClient delegate (AFRESTClient crashes).
This could probably be made even safer, e.g. ensure an array contains only dictionaries, but this is a start.
add support for auto serial number, centos, automatic zones based on
chef nodes
Merge pull request #1 from jcam/master

adds centos, auto serial, auto zones
Bugfix: updating an album's entry's artist wouldn't update the markup
Item4912:

   * fixed web param to SOLRSCRIPTURL
   * fixed reading multi-select url params initializing the edit template
   



git-svn-id: http://svn.foswiki.org/trunk/ClassificationPlugin@15474 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Altered Akane's stats, making her slightly slower and more powerful.
Some characters have a redefined check_conventionality() method to indicate whether they are Uber.
comment toegevoegd2
comment2
comment3
comment4
test
66d
Fiddling around with moosql
PricedOrder and DraftOrder view models stored in blob storage.
Implemented IBlobStorage interface using real Azure blobs.
add settings for blob storage. use blob storage for the priced order.
add deletes to blob storage
tweak dtos to allow updates. remove dtos from db context
Updated reference in AcceptanceTest to 1.7.0.1 of ServiceBus NuGet package
Updated references to newer ConfigurationManager and Json.net NuGet packages
store seat descriptions in a blob
remove dbcontext vestiges in the read model generators and dao
fine tune the cloud blob storage and its settings
Site updated at 2012-07-03 02:56:54 UTC
メソッドをもろもろ追加 #81
マニュアル作成 #81
翻訳完了 #81
トランザクションを追加するときにフックを実行 close #81
Changes cleaned hash to RestrictedHash
0.1.5
Start ex 1 + 1/2 ex 4
Ex.4 completed!
Ex 1 completed
Ex 2 completed
ex.6 up to b
EX 6 completed!
ex 6 bug fixed
up to uploading zahra exs
ex 3 and ex 5
Uploading 1 - ex 1 / 3 (few lines)
Add webscripts and mech.py
Tomaz was here and force squshed few commits
example for pytables support
Add ivy repository for play 2.1-SNAPSHOT.
Update HTML index files.
atualizando pagar para pago com javascript
Octopress init
Site updated at 2012-06-17 17:43:06 UTC
Update docs/marionette.compositeview.md

Fix selector for tbody.
3/7 update
Site updated at 2012-03-14 21:53:06 UTC
Site updated at 2012-08-24 18:39:22 UTC
Update SPECS/cnijfilter-mp620.spec
Sync jenkins-Heat-65 build logs
Added labels and message boxes with basic styling.
Properly ignored the target folder this time.
upgrade to bundler 1.2.0.rc
new relation support
intiial supoprt for exeternal handlers in a connection and support for creation/removal of connections
new preferences file
new json serializer key value
new get context attribute
occurrence set/remove/create
・全体の見栄えを修正した。
・メンバー管理をポップアップで出すようにした。
change serializer-bundle to 0.9.*
Site updated at 2012-11-19 13:01:20 UTC
Site updated at 2012-11-18 13:01:18 UTC
Add category and mainpanel
added comments [otd:25]
Added examples xsd.
requests + changes
Merge branch 'master' of https://github.com/ikame/betabeers-hackathon-v2

Conflicts:
	app/hackathon/urls.py
	app/hackathon/views.py
2.06 Changes
Night backup on test_master_thread.py
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Backup for the multi-threaded testing script
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Changed language_test_pipe to hadjective_test_pipe - currently able to read the states and spawn new processes to do fun fun machine learning stuff
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Added detailed states to bolt_pr2_motion_obj.py
Merge branch 'master' of github.com:imcmahon01/Penn-haptics-bolt
Android 4.0.4 props
Small refactor (added strong typed VO for flicker mode)
modifications to jruby runner
Fixed so CSS/JS paths are generated locally
Versión 0.9 Beta
Compatibility with FFmpeg 0.11 API changes

Patch based on chromaprint commit 1402a244da, uses preprocessor macros
to detect API version.
replaced ruby skill with ios skill
Updated Permalink
Cleanup: removed ROOMEDIT macro references, since that does not seem to be defined anywhere
Re-Common: split acfonts.cpp
Re-Common: split acgui.h and acgui.cpp
Re-Common: Common.Lib compiles without any references to acruntim.h
Advances to version 1.1

+ Adds support for simulating events within child-iframes.
+ Fixed version of jquery.simulate.js to support iframe simulations.

* Ensures that the coordinates of events are integers.
* Improves tests to handle browsers that do not return elements which are out of the viewport when using document.elementFromPoint()
routes can be captured
Update readme. #3
Update readme with Ubuntu/Debian support.
Add Testset generator for Debian.
More informative transmit message.
Add some messaging on startup.
nemesis.rb 修正
fixed a few bugs to allow multiple datatables on one page
added a check for debug mode
Profile fix

Signed-off-by: Jesse Dobbelaere <jesse@dobbelaere-ae.be>
Merge branch 'master' of https://github.com/jessedobbelaere/MatchTracker

Conflicts:
	www/src/MatchTracker/Bundle/AppBundle/Controller/DashboardController.php
	www/src/MatchTracker/Bundle/AppBundle/Resources/views/Dashboard/index.html.twig

Signed-off-by: Jesse Dobbelaere <jesse@dobbelaere-ae.be>
finished up to file i/o
Added read, write and delete adapter options.

Ensured that they do not clobber actual options that are necessary for
the adapter to work.
Recode all file into UTF8
Change groupId to remove the dash
got remote sudo working for setup scripts
Merge branch 'development' of git://github.com/jacobwagner/Private-Cloud-QA-CE into development
force-based section of Algorithms is mostly done
t sure what i did to fix the commented code from showing up.
TODO list and R output of lm()
Google Maps V3 Extension Update
modificando agregar usario
Create URLs based upon authorizenet payment module.
Changed width of alert boxes
removed dev group from gemfile
got rid of approvals in the templates, updated annoying float issue in templates
Added Images Folder
Merge branch 'master' of github.com:joshleckbee/BetterSalesforce
Created CRX and ZIP for 3.1.0
fixed for text input StageText positioning.
Updated about me section for this semester
Add html version of order confirmation mail
* css accueil
Search in tickets
Removed unnecessary linkings
* añadido icono
* añadido icono
* eliminado iconos del config.xml
* repuesto iconos del config.xml
* Fixes
Update doc/ag.1
Added cucumber tests for James and Jennifer
add jsxbin inside app_doScript().tmCommand
adding getExerciseAttemptsForStudent
adding queries, fixing error-handling
Creacion Operacion Bancaria
01 Intro
updated docstrings, tests, test config for docstrings...
convolve_fft doesn't pass because of a warning
fixed convolve_nd tests and added warning ignores
upsampling in 2 dimensions is working!!!
(no tests implemented!!!)
Initial start on BlockLogging
Update section and priority
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Enabled with Travis build status badge
[asio_5] Fix packet size on one more place
draft of player_look_at
Merge branch 'master' of ssh://github.com/krzyzacy/EECS494FinalProject
check function update
edited for headings
add a subscribe link.
Actualizacion de usuario completa

Los roles tambien se actualizan adecuadamente
making compatibility example independent
fixing springsource build
Tous les boutons et FastSearch fonctionnels
Fixed missing main() in test case.

I had accidentally commited an old version of the test case in a rush.
cambios en la pagina de detalles
gone bad
fixed compareMusicTaste
Merge remote-tracking branch 'origin/master'
added id of 'menuHowDoI' for the 'How Do I...' menu block
TCE uping
Everything compiles - but has logic errors
clear big images.
updated notificaitno assignment
Fix bug for csv export.

Water levels could be None, the csv export crashed when getting
a location from a None water level.
Preparing release 0.3
Back to development: 0.4
Fixed h2/h3, added demo comment
Merge branch 'master' of github.com:lizardsystem/lizard-blockbox
Analyze mit Hilfetext ergänzt, Histest korrigiert
Tagged CFS 1.6.3
build 1.1.1 docs
enable new languages (ca, id, pfl, sl), fix a few syntax errors and recompile
skeleton to order products is ready
Merge remote-tracking branch 'origin/master'
Add "../third_party/libudev" to include dirs to fix the build for linux env without libudev.

TBR=Andrew

BUG=

Review URL: https://webrtc-codereview.appspot.com/761009

git-svn-id: http://libjingle.googlecode.com/svn/trunk@178 dd674b97-3498-5ee5-1854-bdd07cd0ff33
Add gyp for sound, xmpp, xmllite, p2p and session.
Build unittests.

BUG=

Review URL: https://webrtc-codereview.appspot.com/766006

git-svn-id: http://libjingle.googlecode.com/svn/trunk@179 dd674b97-3498-5ee5-1854-bdd07cd0ff33
Remove DummyThreadObject.

Remove DummyThreadObject as we don't really need it and it causes warnings in component chromium build on mac.

BUG=http://crbug.com/146389

Review URL: https://webrtc-codereview.appspot.com/765010

git-svn-id: http://libjingle.googlecode.com/svn/trunk@180 dd674b97-3498-5ee5-1854-bdd07cd0ff33
Merge branch 'svn-base'
Add Gemfile
Add Procfile
Add config.ru and environment.rb
add 轉換pdf頁面到png
change menu string
add some build commands based on our 4tw test buildout
Added child theme text to style.css file - now child theme of twenty eleven

Signed-off-by: Magnus P White <mpw@ecs.soton.ac.uk>
new post on using graphviz with the C preprocessor
Framework loader
Compat with Opera, FTW! Have not tested in IE yet. Works in ff, safari, chrome and opera now :)
Bunch of new features!
add URL to README
fix some lintian errors
update mate-display-mamger.spec
Merge branch 'master' of github.com:mate-desktop/fedora-packages
Update configuration to recognize Windows and make color work
Correct household to reference the person when setting family_name
Update specs to enhance testing of event updates limited to households.
Correct code to limit event updates to households
Merge branch 'master' of github.com:mattscilipoti/oseh-occasions

Conflicts:
	Gemfile.lock
Merge branch 'master' of github.com:mattscilipoti/oseh-occasions
Create default user 'Doug Heifetz' again
Testing modman deployment
workarounds for stock camera driver

Change-Id: If592aa8692a4ff88d7286e33b85da379e6fc6696
Example repo URL - see Github issue 516
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #666 from nathanl/example_repo_url

Example repo URL - see Github issue 516
Updated gems and rubies to 1.9.3
Merge branch 'master' of github.com:imathis/octopress
Fix for issue #622

The filters bundled with Octopress are not applied to files ending in 
`.md`, because the match in octopress_filters.rb does not match `.md`.
Merge pull request #706 from Confusion/patch-1

Fix for issue #622
bumped rbenv version fixing #743
Merge branch 'master' of github.com:imathis/octopress
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #675 from zlu/master

Update Github API to V3
Twitter API call and links are now protocol relative
Merge branch 'master' of github.com:imathis/octopress
Using https instead of protocol relative urls, for Pinboard and Twitter feeds
Disabled Rsync delete by default. Closes #787
Merge octopress upstream changes into source; upgrade gems.

Conflicts:
	.rvmrc
	Rakefile
Article about planning one's infrastructure.
Put the subtitle back.
Added scriptmergercache
Site updated at 2012-04-25 14:56:24 UTC
removing extra start block
- Added main.c
checkinForm4 databindings
model die 2.
Update grails-app/views/index.gsp

Fixed logo link (hopefully).
use website urls to match url service instead of link.theplatform urls
Added ZeroMQ logo.
Make spawn_and_link return the greenlet.
Added an Actor class.
Allow timer to be noop.
Site updated at 2012-08-25 01:23:45 UTC
Accepting PHP 5.3.* or higher!
Disabled subdivisioning for testing.
Write better instructions for the full import.
snapshot_IDs/ -> ID_listers/
Removed unused files and fixed source checksums
Site updated at 2012-11-09 13:59:35 UTC
stric standards error (fix issue #3)
Blog Redesign

Styling:
- layout complete
- blog & blog post complete
Blog redesign

- resume
Blog Redesign

- projects
Blog Redesign

- updated twitter feed to my account
- removed accomplishments for now
make ready for gae
Site updated at 2012-11-21 12:52:59 UTC
Start building pivotal library
added ads, improved seo for pagination, restyled nav branding, changed analytics setup to better adhere to standards
minor change to nav brand hover effect
added larger glyphicons
added missing glyphicons and fixed some others
updated script to invoke pages rebuild
Travail sur l'inspecteur : valeurs éditables
fixed a weird whitespace issue after uploading
fixde some in index.js
Added reference to the Clojure version
Site updated at 2012-12-02 23:32:50 UTC
[maven-release-plugin] prepare release objectos-comuns-etc-2.0.0
Set 3 constructors
[ebox] update wpa-supplicant-0.5.10
[openmips,openaaf,odinsupport] switch back INHERIT += "rm_work"  not working
Added new distro
Added new distro
.gitignore added to res folder to add to git
traffic gen for mediawiki
[Add] cocoa pods file
made exists function in backend protected
fixed stylesheets
added spaces to improve readability and indented comments
space before opening brace
removed unnecessary files
added ui files
removed backend
added backend
Add extra link as suggested by the OAIC
Split the links up more
Add New Matilda as a supporting organisation
[OPENENGSB-2179] Added dummy changelog in preparation for a release

Signed-off-by: Andreas Pieber <anpieber@gmail.com>
Added check for policy_manager vad
Fixed labels
Updated version
not used anymore
add dynamic salt
Add a note about CORS on storage buckets
Added support for constructor injection
implemented CSHARP_462 to support local collection Contains operations translating into In queries.
fixed issue where we write the default value even if it wasn't specified.
Merge branch 'csharp_467' of git://github.com/craiggwilson/mongo-csharp-driver into csharp467
ported csharp linq tests to vb and made some changes to accomodate vb idiosyncracies in expression tree generation.
Merged pull request adding support for LINQ from VB.NET.
Merge commit 'fa544b80f17de277d4e1fb3edd8666e052403fb6' into ctor
renamed SetConstructor to SetCreator and added a test.
Finished merging pull request 88 with minor formatting changes.
Merge remote-tracking branch 'upstream/master'
Improve '_id' comparisons so they are more general case:

1. Array.IndexOf is now avoided for any input < 4 bytes
2. Comparison of "_id" is now done using a single branch
added support for elemMatch queries when array elements are documents.
Merged pull request for CSHARP-413 with minor changes.
refactored SelectQuery into BsonSerializationInfoHelper and PredicateTranslator
Added typed query builders and reimagined untyped query builder.
added the rest of the typed builders.
Fixed warnings and fixed unit test that was being skipped.
Added license to some files. Standardized using statements. Removed a few checks for null returned from GetSerializationInfo (which now throws an exception). Removed some dead files. Made all files in the Linq\Utils folder share the same namespace.
Change to GetItemSerializationInfo to properly throw exception if serializationInfo parameter does not implement IBsonItemSerializationInfoProvider.
Changed IEnumerable<TMember> to IEnumerable<TValue> in typed builders. Renamed some variables to more closely align with their type names. Replaced a few <V> with <TMember>.
Got rid of andand :(
Fix a devastating block bug… in one character. *cries*
added index to articoli e clienti
Styled singleton sample
Added VERY basic support for viewing an Issue.
Fix nihao and add sentence with lve
Switch to using substitute so mutliple pinyin easily converted
Site updated at 2012-09-14 17:03:51 UTC
Create a variation for signup title in signup view
finished transitivity of refinment relation proof
Update lang/buildcraft/fr_FR.properties

Minor changes after playing MC.
rewrite some data types by the ML-style (non-GADT) inductive definition.
Revert "arch-chroot: default to /bin/sh when no command given"

This doesn't actually work since we don't shift off the chroot
directory.

This reverts commit 67c4b0fd24e73159bc09c6718375f5e0e4ff4e6b.
arch-chroot: Default to /bin/bash as shell

By default chroot uses SHELL as default shell on the target if not specified otherwise.
As our install iso uses zsh this might fail if zsh is not installed on the target.

[dave: changed shell to /bin/sh]
prepare v5
genfstab: handle btrfs subvolumes correctly
genfstab: use a more innocuous name than 'source'
arch-chroot: shift off first arg as chrootdir
prepare v6 release
Make art 1280x720 px
Redo default icon
Re-add functional mail test and fix test isolation problems.
Altered post file name and added update hook information
Added WorkerThread as an inner class of Worker.
Modify the settings : change to default renderer
LeadIdReader returns dummy value.

RecordParser is splitting the data returned from LeadIdReader.

Skeleton added for LeadResponseRetrievor.
Merge branch 'leadverify' of github.com:prateeka/JavaDevelopmentRepo into leadverify

Conflicts:
	LeadResponseVerification/src/com/cobalt/leadrespverify/controller/Controller.java
	LeadResponseVerification/src/com/cobalt/leadrespverify/parser/RecordParser.java
	LeadResponseVerification/src/com/cobalt/leadrespverify/reader/LeadIdReader.java
Updated _posts/2012-12-10-prueba.md
fixed navi back arrow groups
commiting that lovely text file
Ajout du fichier de sauvegarde de DBSchema
Reformated posts and sidebar.
deleted cboothrep
Update Modulefile, CHANGELOG for 2.6.0
Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.6.0

Conflicts:
	CHANGELOG
	Modulefile
Merge branch '3.x' into 4.x

* 3.x:
  Update Modulefile, CHANGELOG for 2.6.0
Merge branch '4.x'

* 4.x:
  Update Modulefile, CHANGELOG for 2.6.0
Update Modulefile, CHANGELOG for 3.2.0
Merge branch '3.x' into 4.x

* 3.x:
  Update Modulefile, CHANGELOG for 3.2.0
Merge branch '4.x'

* 4.x:
  Update Modulefile, CHANGELOG for 3.2.0
Not powered by hyde for now
Incorporated more changes from jgopper/arduino-cmake
changes again to layout
Merged version.
DB change. Added field for User sound file. Changed user layout for aggrRec.
Started testing grid display for large number of users.
Testing FlowLayout.
User images read from the SD card;
Added SD card check routine;
Disabled rotation. Closes #3
Sounds played from SDcard. User icon functionality changed.
Site updated at 2012-11-03 08:41:26 UTC
add option to not include the caller node in the results of
get_settings_by_role
fix return logic
Merge pull request #61 from mancdaz/master

Merged automatically by jenkins after successful build test
fix missed out on to_f for leave
changed kiosk_serial to serial
remove equipment & add serial foreign key
custom primary key
linked checklist to machine
Revert--Bad map drawing"added half of a map...kind of"

This reverts commit 1b0544d2af6511daf591f37166899eabb631acd7.
Ajout de la classe css positionnee sur le menu (non deroulant) qui etait present en 8.0 mais a disparu en 8.1
Merge pull request #11 from xsalto-cedric/8.1

Gabarits du Corail: Ajout de la classe css positionnee sur le menu (non deroulant)
traitement des erreurs: en cas de connexion a la base de données, redirection
sur la page fatalerror-01.html, d'abord locale sous www, puis sous tzr/templates
si la premiere n'existe pas
Merge pull request #12 from renaudzigmann/8.1

traitement des erreurs: en cas de connexion a la base de données, redire...
Merge pull request #13 from renaudzigmann/8.1

traitement des erreurs: en cas de connexion a la base de données, redire...
Fonctions de traitement des comptes fidelite + diverses modifs dont format mail
Merge branch 'experimental' of ../seolan8 into 8.1
finalisation evo et adaptations pour comptes fidelite
Merge pull request #14 from renaudzigmann/8.1

utilisation de imagemagick: correction des parametres de colorspace pour...
Merge branch 'experimental' of ../seolan8 into 8.1
Merge branch '8.1' of git@github.com:XSALTO/console-seolan into 8.1
gestion des cartes fidelite dans la modif de commandes
correction appel abusif init fidelite lors de la validation
Merge branch 'experimental' of ../seolan8 into 8.1
corrections liees au compte fidelites et aux foramts de cartes dans le
traitement des commandes
XFileDef : post_edit , recupération du filename depuis les header du fichier lors d'un ficher externe en http
Merge pull request #15 from julien-guillaume/8.1

XFileDef : post_edit , recupération du filename depuis les header du fic...
correction oidcollection xlinkdef, correction widget.js
modifications pour gestion des assurances groupes-individuelles
gestion et transmission des articles dans la remontee teamaxess
Merge branch 'experimental' of ../seolan8 into 8.1
API fixes

Added:
cc.size, cc.rect

Renamed:
spriteFrameByName -> getSpriteFrame
boundingBoxToWorld ->  getBoundingBoxtoWorld
More JS API fixes:

replaces SizeMake() with size()
replaces RectMake() with rect()

The constant colors are not functions, but constants:
 cc.WHITE() -> cc.WHITE
 cc.BLACK() -> cc.BLACK.
 etc.
API performance additions

cc.rect = {}, cc.size = {}, cc.p = {}

they return "inline" objegts, without using new.
eg:
cc.p = function(x,y) = { return {x:x, y:y} };
Merge pull request #488 from ricardoquesada/api_fixes

API fixes
added integrated dom editor for prototyping and debugging
added support for menuItemToggle, fixed some bugs
Merge remote-tracking branch 'Official/master' into newdom
Merge pull request #489 from Wu-Hao/iss1295DOMConverter

added integrated dom editor for prototyping and debugging
strings de login, tratamento de exceção e erros.
Wrap for today. Everything is working now! Just need to do some refactoring...
Updated test files with correct declarations.
Send plugin file on download request.
Source code release of CVPR2012 paper.
Improve storage choice for glite.
Cache db4o locking.
adding test case for deprecated methods
del end line delimiter copy from C lang
add basic-tutorial-7.py
update README.md
Fixed minor bugs for DummyGatewayHosted
Change 'controller' to 'processor' in PaymentFactory
Allow credit card number to be a string, not only array
Add test environment for Dummy yaml
Update credit card unit test
Update Dummy unit tests
zepto test
Merge branch 'master' of github.com:ryanrdetzel/Template-Monster
disables pygments and lsi
Site updated at 2012-07-03 17:37:52 UTC
sv_set_mvr was broken in old perls; prepare for release
make fuse esb 7 friendly
updated customer reviews page
extra uid for shugarcrm provider
Force directory creation for readline history
Updated Autoloader class

Better logic for determining project and framework paths
Replaced c,console with c,shell

c,shell works the same way, but loads the shell using rlwrap, a readline tool, if possible
Cleaned up ConsoleInteractive class

Removed references to readline, deprecated because most php builds don't come with readline. Improved formatting
Additional changes to readline wrapper

Not sure how useful this is, but I had pending changes. This code is deprecated, but I haven't decided to remove it yet.
Initial implementation of c,ql - coterminous query languange
Renamed class directory to lib

More familiar with other frameworks
Regex: Allow expectation of a minimum number of results
Refactored recipe system

Allow more complicated recipies; added pre and post script hooks
Implemented Database class

Added Mysql support; Added DatabaseResult class
Fixed join order with SQL building
Reworked Schema class to be useful
Modified fields for the pkey schema format
Added model support for extending into a namespace
Recipes get framework path by default
Fixed Resolve::files
Added connection configuration example
Added helper initializers
Updating to remove preconditions from ecf.
Added Kaue's comment about chapel-product-par.
cilk-thresh-expertpar pause
Merge branch 'scoop_expert' of github.com:scottgw/concurrent-languages into scoop_expert

Conflicts:
	cilk/thresh/expertpar/main.cpp
added blocks to changeform
Meu 1 commit Aline Morais
Fixing multiple server deployment!

* Uses more shell scripting than the previous version
* Fixes parallel deployment to multiple servers
* Fixes Unicorn "master (old)" processes hanging around with a `sleep 2;`
issue #19051: had to reinvent the databaseServerWidget as a RelationWidget
issue #19051: don't need to cache databaseserver list
Site updated at 2012-10-02 23:49:25 UTC
switching back to python.el

Moved python specific stuff into a python-mode hook to avoid long startup times (but slows down loading of the first python file)
got rid of separate Pymacs directory
Merge branch 'testing' of github.com:shaunplee/shaunplee-.emacs.d into testing

Conflicts:
	init-python.el
	vendor/Pymacs
oops.  Now getting rid of Pymacs directory.
Add the Rakefile.

Thanks to judofyr from #ruby-lang for some insights.
Check for valid interface orientation.
add another Directory test
Initial Commit
Index and some preliminary fixtures
I knew I forgot something.
And one other forgotten thing.
Add some styling.
Add two end points
Add helpers module
added logout functionality to gamefinish and menu activities

logout function called from userfunctions on the gamefinish and the
menu activities
removed login option from menu page

login options removed from the menu page
empty the textfields when there is a login error

empty the textfields from the login activity when there is a login error
updated updatestatus call to twitter

made update status call to twitter by hard coding the access tokens
moved twitter integration to the game finish activity

move twitter integration as users must login through the scene fiend
login, to get the player id etc. thus the twitter integration is more
suited to an end of game activity to post a tweet about their score and
they must login to accomplish this - this functionality will also only
be possible if there is internet connection
updated score db functionality

score db functionality but the scores are being sent as null for some
reason
last update
Began fixing python 3 syntax errors as per issue #5
Fix known bug
Added better documentation for bug fix
Cleared out repo
merge
Changed name of the project
Updated current status of the master branch
List of short-term improvement plan
fachklassen Flasche auswerfen
adding the psd
Merge branch 'master' of https://github.com/smedevelopers/deals-template
Changed DeviceStatus testbed page
Copied linux implementation as base implementation for mac
minor changes to utility project
bug fix - DIANNE
incremented version to 0.4
Merge branch 'Testing_Release_0.4' into development
registering the service on restored CISs
Add SocietiesInterfaceType.PROVIDED annotation to external ITrustBroker
interface
Add ITrustEvidenceCollector interface to Societies external API
Improve TrustEvidenceType javadoc
Add ITrustEvidenceCollector interface to SOCIETIES external API
Service sharing: a service can now have any number of files to be served from REST server, not just the client jar
the REST server returns correct filename. Any suffix is supported, not just jar.
old addService() version deprecated
javadoc
javadoc
New overloaded addService() method to automatically upload the files to REST server (not implemented yet)
Update Android Trust Evidence Collector client based on updated
API schema
cis updated regarding negotiator
Remove deprecated CtxModelObjectNumberGenerator
Change CSS Context Monitor log level to DEBUG
Update context attribute origin to MANUALLY_SET in Css Context Monitor
Update context-broker-example to include ICtxBroker.retrieveCssNode
Fix ICO components that broke due to API changes
now using Requestor
missed three files in previous commit
Merge branch 'privacy_eliza' into development
clean up
ico
integration tests from cis test suite
community & user CSE
added simply CSE
Added listIterator() method to CommandList.

This method returns a ListIterator<Command> object. In a future
commit, it will replace the inner for-loop in State.begin().
Rewrote Encoder.displayHelp() to be more extensible.

This method now uses the getHelp() method from the objects
in CommandList to build a string that includes info on
every command.

Also added Javadoc for Encoder.main() to be consistent.
Dynamic programming implemented.
works
Merge branch 'master' of github.com:spikebike/Backups-Done-Right
Edits

Included jquery in the example, removed npm install.
Fixing issue where the prefix tables with spree migration was clashing with the same-named one in spree_comments
Adding tests and bugfixes for read-string[!].
update greenc32 importers based on schema changes
Dont cache in debug mode. Fixes bug on admin calendar.
adds persistence of language selection, and _po files with placeholder translations for fr and zh locales
adds 'create' functionality to refactored photoshop PickletExport
changes style of class creation. using closure to better manage scope with PickletExportController and PickletExportView
honing in enemies
MMC_CAP_ERASE removed for security reasons
Generate asset view logic in views
Starter for ten copy
Bootstrapped style
Site updated at 2012-09-20 14:23:41 UTC
A new screen shot.
Build base website with bootstrap.
Rotate is implemented
Added asyncrounous screen sending to client
added doc pics
added doc pics
make it optional the use of the KEYWORD and ANSWER in error templates
separate ore from food in view
Merge remote branch 'cxreg/master'
don't display empty items in stash
launchpad.pl - allow you to specify a particular planet to send from instead of all planets
Merge remote-tracking branch 'origin/master'
Merge remote branch 'origin/master'
glyphinator script
glyphinator: bias against digging the same thing multiple times
glyphinator: round times better
glyphinator: clean up exception handling
glyphinator: add usage, verbosity
glyphinator: support --planet
glyphinator: allow user to specify --min-ore and --min-arch
glyphinator: support --preferred-ore
glyphinator: support --create-db to create empty star db
glyphinator: support --dry-run
glyphinator: print total glyph count in summary
glyphinator: don't repeat the same destination repeatedly on dry-run
glyphinator: refactor pick_destination to be faster, and take args count, min_dist, max_dist
glyphinator: allow user to specify min-dist and max-dist
added static variables for glu & glut to class
updated methods to reflected static class glu & glut
cleaned up reshape method
changed order of methods
removed the submodule
Added a new line
KERN-2732 Remove the deleted flag in case we're replacing some previously deleted data.
Config now read from a config file.
Added Notes & Ideas file
removed virtualenvwrapper line that caused error
lib: create abstraction object called Detector which is responsible for blackscreen detection
lib: attach external callback and check for black screens
main: use lib.Detector
Delete App_Data folder on Release build.
Add references for heuristics
change vimeo video to vereador's video
some edits and nomenclature consistency issues
Added templates.
Added templates.
Solving Conflicts.
Use jboss jat
Site updated at 2012-10-06 00:29:57 UTC
fix shadow & alignment on illustration
pimping the title page
rename to slides.
slides
added build/release scripts for client and gamelib separately; added Servers.txt guiding description to servers; tasks upd; update Gamelib to V2 officially with build scripts used.
renamed Tests directory to tests, to suggest that its not a namespace
mapping, just a directory.

Moved the unit tests into a namespace-compatible directory structure.

Converted the composer autoloader config back to PSR0, now that the
classes are structured properly.
App initializes without modification now
icap module updates
	- updates to icap::Header and icap::RequestHeader classes
Only use one cartodb layer with variable cartoCSS
uncommented correct line
Merge branch 'master' of github.com:unicefuganda/rapidsms-mtrack
Redirect after a blog submission/save to the correct page.
staging social base for debugging (should have I?)
addAttachmentPhotoToDresses is removed
Added searchpreview term to workflow terminology for grabbing thumbnail url
Added support for partials in index.js
Remove this. not needed in dev.
Next version
White space fixes + jslint + Prevent click/touch if animated
Add really long fade just for testing
Removing the fadetime to test the default settings
Adding parseFloat back
Remove the extra classes + switch to using only the plugin css for debugging
Adds initial version of the css for the plugin
Fixing most of the bugs
Let's fix this file later...
Minified
Current size 762 bytes
Bump up the size
Switch tabs to spaces
Separates "pagination" and "auto" options so you can choose both at the same time if wanted.
Minified version.
Adds cursor: pointer, to fix it in Chrome
Remove junk
Add known bugs initial version
Starting to clean up the example code
Version 0.2.3: Bug fixes.
Restart is not working
Updating README

Making sure our config --local user.name works within Tower
added a not before $groupname - silly mistake
rework - not using resources in methods
DEV : theming du contenu info admin , ajout de fichiers de base

Signed-off-by: webmasterpf-DG <webmaster@provence-formation.com>