labofsahil/github-event-dataset-2012 huggingface dataset:
dd
Merge branches 'master' and 'master' of https://github.com/SaturdayPeople2012/GIFViewer
90퍼 끝 ㅎ
폭탄이랑게
Merge branch 'master' of https://github.com/SaturdayPeople2012/GIFViewer

Conflicts:
	GIFViewer/GIFViewer/Classes/ELCAlbumPickerController.m
	GIFViewer/GIFViewer/GIFDetailViewController.m
	GIFViewer/GIFViewer/GIF_Library.m
	GIFViewer/GIFViewer/GridViewController.m
	GIFViewer/GIFViewer/ListViewController.h
	GIFViewer/GIFViewer/ListViewController.m
	GIFViewer/GIFViewer/MainViewController.m
Added a tabpanel to attempt to recreate scrolling issue with text areas.
annotate --exclude tests,fixtures
Add a date_range_navigation_start parameter.
Add .gitignore + fix pom errors
Update deployment options in pom.xml

This change removed the current settings for deploying artifacts to S3
and replaced the repository with the SpringSource Artifactory
repository. More details at the SpringSource Repository FAQ:

https://github.com/SpringSource/spring-framework/wiki/SpringSource-repository-FAQ
Merge branch 'master' of git://github.com/StudentGrowthPercentiles/SGP
Merge pull request #207 from dbetebenner/e85ad22004cad32f234b63a68c6b1c9c47714567

Remerging in Adam's changes
Better reconciliation of conflicting arguments in studentGrowthPercentiles
Merge pull request #121 from dbetebenner/master

Better reconciliation of conflicting arguments to studentGrowthPercentiles
Change "INCLUSION" to "ENROLLMENT_STATUS" to match summarizeSGP output
Merge branch 'master' of git://github.com/StudentGrowthPercentiles/SGP
Merge branch 'master' of git://github.com/StudentGrowthPercentiles/SGP
Changes to bPlot labels and individual level messages
Why style 11 not work?
Fix style 10 and 11 file paths to create unique district files.

Previously function was over-writing plots from one district with
another.
Edits to style 11 to get working
Add *_NAME to names merge for plot labels.  Change some path names
Change style 50s bubble tip names.  Path name changes.
Change y unit in bPlot message for student bPlots
bPlot message changes
Fix parallel.config set up when NULL (for sequential run).
Load iterators package and registerDoSEQ() when sequential
Make messages consistent
Add NA to "NA" to stop subsequent checks on ==
Changes to bubble tips in the student level plots.
Add ability to do just 1 content area panel to student growth plots (for CELA)
Change error for 1 content area
Set up report width
Merge pull request #78 from adamvi/master

Edits to visualizations
Link to the correct js in the example.
swapped string with ByteString, fixed related bugs. No longer crashes upon parsing .torrent
builddevice: fix repomenu if typo
Removed the hardcoded URL from drinkadapter, should now be dynamic.
Revert "Test"

This reverts commit ae4ce55a6aadd29eafb7fe57f0068e53100c1ab5.
Password save enabled
Susie|Ruoran Refactor: getTopBrowserList
Bumping snockets dependency to 1.3.5
Version bump to 2.2.0
Repair, Selfactions updated.

Fixed all vehicle damaged parts showing in repair menus.
Yellow, Below 50% damage.
Orange, Aboue 50% damage.
Red, Aboue 90% damage.
Removed Files

giattributes Removed.
gitignore Removed.
Tent Build Issues

Tents can now be deploted on any ground.
Revert "Tent Build Issues"

This reverts commit 6283ea0627bd44a123f1a25bf5f8da417bc5dbef.
Updated Tent Pitch Checks

Tents will no longer be allowed to be placed in buildings or on
concrete.
Tents will now allways be allowed in forest areas.
Tents now only need one ui click.
Looking to start adding quick actions

Looking into Quick actions
Debug added to isinbuilding

surface checks added for later use.
Changelog updated
Readme updated
Update cartodb-js/create_a_map.md
Merge pull request #3 from jgrebski/patch-3

Update cartodb-js/create_a_map.md
Fixes fonts
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into dev
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into dev
Merge pull request #729 from WindowsAzure/dev

Add IaaS utility DLLs
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into dev
Merge branch 'release-dec-2012' of https://github.com/WindowsAzure/azure-sdk-tools into dev
Add SB online help, Issue #724
Merge pull request #730 from markcowl/release-dec-2012

Fix for Issue #724 (SB Online Help)
Update Test-AzureName help
Update setup to include ServiceBus help
Apply code review
Merge pull request #731 from ogail/help

Update Test-AzureName help
Merge pull request #733 from ogail/setup

Update setup to include ServiceBus help
Update IaaS help file to include VHD docs
Merge pull request #734 from ogail/vhd-help

Update IaaS help file to include VHD docs
Fix for Test-AzureName unit tests
Merge pull request #737 from ogail/ut

Fix for Test-AzureName unit tests
Updated to 0.6.9
Updated to 0.6.9
Updated version # and product name
Update ChangeLog.txt
refactor movies to use new advanced filtering
add 100ms sleep because JSON-RPC returns values before they are updated in database
refactor tvshow with advanced filtering
remove redundant code
make limit changeable and already refresh the list on playback
Frodo refactor most played albums
cleanup
don't hardcode the limits and let skinners choose
fix not updating watchlist after finish playing or stopping it
remove debug code
update mimimum XBMC version
fix tabs to spaces
Version bump
Merge branch 'frodo_refactor'
README.md was refined.
Fix line endings
Add missing license block
Add .gitattributes
initial commit
added the awesome
fixed badly named test classes, put pocket.js into libs(js) + assets(cs)
Automatically (un)watch when (de)selecting events.

When any event is checked for a repo, it is followed. When no events
are checked, it is unfollowed. Hopefully, this won't result in too much
"adam followed x" spam in peoples feeds.
Refactored everything.

Hopefully into more idiomatic CoffeeScript.
Filter the news feed.

Oh yeah.
Filter events loaded by the More button.
Add 'filtered (n) items' counter.
demo commit remote
Añadimos el fichero readme.txt
Installation de C.I.
002: scala solution + Readme
Fix the tag in scheme(1) and remove hello world.

Also remove "----" lines from jekyll chinese blog.
Add section about example and programming env.
Make navigation bar horizontal
Linkify the header title
More Spaces
fix tiny spell error
Update why-gentoo.md
Fixing treeview skin issues and adding build files for skin
splash.html 是跟我的路由器有关的。
Lots of new but subtle changes. Biggest thing was adding a higher part pulled from Kontact to the ending.
fix both iterator on Node
New 2 dialogs.
Added RSH's changes
Merge branch 'master' of github.com:aperson/Reddit_Minecraft_CSS
Added RSH's changes
[TIDOC-345] Updated MusicPlayer docs.
[TIDOC-345] Updated to address review comments.

I would add a description for "seekBackward", but I just can't think of a way to describe what it does.
Merge pull request #2374 from arthurevans/tidoc-345

[TIDOC-345] Updated MusicPlayer docs.
[TIMOB-11472] Made the debug-host setting hidden since it's only ever used by Titanium Studio.
Merge pull request #3220 from cb1kenobi/timob-11472_3_0_X

[TIMOB-11472] Made the debug-host setting hidden since it's only ever us...
[TIMOB-6903]- Look for bounds instead of frame
Merge pull request #2572 from srahim/timob-6903-2_1_X

[TIMOB-6903]- iOS: Media - openPhotoGallery opens popover in wrong position.
timob-11523: Added support for deleting row by taking TableViewRowProxy as argument and fixed row's parent
timob-11523: Update the doc
timob-11523: fixed the event bubbling for table view row
timob-11523: updated doc
timob-11523: updated section even when the new section proxy is the same as the old one because the properties may be different.
timob-11523: set parent if the new section proxy is different from the old one
Merge pull request #3386 from pingwang2011/timob-11523

Timob 11523: Android: TableView - delete row cannot delete a row without giving it a number, but iOS can
timob-2452: fixes based on comments
Merge pull request #1746 from hieupham007/timob-2452

timob-2452: convert KrollDict to HashMap for animation properties.
[TIMOB-8504] PLSqliteDatabase leak in Analytics module
Merge pull request #2131 from mstepanov/timob_8504_20X

[TIMOB-8504][TIMOB-1800](2_0_X) PLSqliteDatabase leak in Analytics module
Added JIRA issue collector to __init__
Added a build number to index page
Fix manage.py for django 1.4 support.
Add clickjacking middleware for 1.4
Fix bug in manage.py for django 1.4 support
Rename wsgi to match django core template in 1.4
Fix wsgi to more closely match 1.4 template
Update requirements for 1.4
Fix url import for 1.4
Enable timezone support by default
Merge pull request #4 from auzigog/django1.4

Django 1.4 Project Template Update
remove reference to deprecated setting ADMIN_MEDIA_PREFIX
add PIL support by default
master - dfsdfsdfsfsd
master - dfsdfsdfsfsdwerwe
master - dfsdfsdfsfsdwerwe
Fixed an issue with Disqus.
updates and build 0.0.0-2
moving to other box
Returning the order link back to the dev environment.
Use jarjar to repackage scala-library.jar
Added rough filter/search bar
fixed a typo
fixed and minified
Required SQL to get this whole thing started
Promote importance of kwargs in API call.

Ensure those values overwrite the payload dict rather than the other way
around.
Revision 1:

Removed references to the html host file in the browser URL.
Revision 1:

Removed references to the host html file in the browser URL
RSS is undead
Merge pull request #3 from pengwynn/master

RSS is undead
Weirdly worded
Auth on top texts
fixed sql exceptions
Last bit of clean up for the night
Merge pull request #5 from 5523183/master

Placeholder in UIExpandingTextView
Adding LinkedIn profile link
Revert cname fix
DOCUMENTATION: heavy update to documentation. Made use of syntax highlighting. Added some recipes, and fleshed out others, and provided good links.
fixed title typos
added code to look at the big twitter ngram corpus
Update Give Now button ids
removing tags...
metodologia: primeira versao
A little bit of setup before coding.
add: delete id before saving dump
More documentation changes.  Fixed some issues found during unit testing (test files to come soon).  Added additional functions for accessing OTL meta source data.  Added a function to getmultiparm indices for a parameter.  Any function that deals with modifying a GU_Detail will now test to ensure the geometry is writable, throwing a hou.GeometryPermissionError if not.
Removed unused headers.  Change return object in decorator back to orignal value.
Merge branch 'master' into new-layout
Open graph stuff
CSS Moved to separate file
Bootstrap loaded locally
Open Graph Authorship
Digg Digg Sharebar
Profile local
updated to filter env vars
1. change to the newest logo
2. change to hover color in United theme
Add unit testing & Fix query
- remove duplicate query for root node
- add condition for primitive number in constraining function
  (ast-primitive-as-string)
feature: made ngx_http_lua_api.h visible to other nginx modules by adding src/api to the CORE_INCS variable value in the config file. thanks Brian Akins for suggesting this in github issue #105.
Merge branch 'master' of github.com:chaoslawful/lua-nginx-module
fixed the test "unexpected globals sharing by using _G (header_filter_by_lua*)" by chaoslawful which did not really test what it was supposed to test.
eliminated hard-coded nameserver IP address in the test cases in coroutine.t.
removed too restrict timeout settings in the test suite.
把地图嵌入到了index，改了一些div格式，并把地图坐标弄到了上海市中心。。。。。
Merge branch 'master' of github.com:cheatingfish/shs-eating-fish
for harry
changing whenever recipe to run on app-master
Added requirejs
Added basic strcture to test
name processor.
changed primary connection between TDRouter and the outside world to use streams
NOTE: right now in many cases they are still byte array streams
but in the future there is now a way to actually stream data out
direct get requests for attachments now stream data without
loading the entire attachment into memory
now uploads are supported as streams like downloads
upload attachment now uses the streaming feature
able to upload and download a 15MB movie wihout memory errors now
refactored the tests to reuse more code and clean up connections better
new properties files support to change replication configuration
streamlined logging calls, to avoid String.format()
reduced usage of separate handler threads
Keep default for non-class based views
Initial commit of Alloy API Less parser.
Fixup API call to use json request body and content type.
Mark Less import test as untestable b/c of API file passing limitation.
Fixed bug with actionScheduleOrder not working in UI.  It was commented out to be removed in a cleanup process
testing
check in homework review
merged README.txt file
A couple of renameing tweaks.
Travis CI config.
Example.
Merge branch 'master' of https://github.com/colin-jack/require-namespace
Make sure apache gets the right path
Merge gametes at end of meiosis animation
Swap chromosomes and drake in offspring container

... so that the chromosomes end up in the same place as the final
meiosis chromosomes end up.
Added link to personal site and Beef site
This is an improved db.php and index page. Also added some js
now able to show rooms, based on building selected
Adding the example-tenants
screen shot of configuring jshint in editplus
SECOAUTH-221 - Support for registering multiple redirect_uri
Update to include multiple values in the redirect uri column.
https://jira.springsource.org/browse/SECOAUTH-221
Added Phake entity manager for verifying transactional operations
9，10
monday test 2
Initial import of David's mean.
Change project name and version.
Added a dubious calc for variance.
Typo in the commentary for redstats/core.clj
An initial version of parallel variance.

It will calculate the variance by processing the list twice; the first time to calculate the mean; the second time to calculate the mean square difference.
hacktastic filter on bad reg numbers applied to search results.
iOS done for now
Site updated at 2012-03-17 19:01:29 UTC
various small enhancements

- removed depage-base (no need anymore)
- added semicolons for save minimization
- added vim marker
updated depage-player
Added a simple factory
Rewrote and tested SimpleFactory (#22)
Update project files and ignore.
Adding french localization
Refactored code and old log statements
Added more comments
Modified the updateCurrent functions to ensure that they only use
current data (before they still ad old data from a couple hours ago)
Created a mock up app for getting daily and weekly weather. Keep in mind
the emulator will only be able work with the zip code version of the
update with location functions. However, those functions do work since I
tested on my phone. I had each button load a different zip. 
Merge pull request #2 from dharmdeo/HEAD

Head
Fixed new checkstyle issues in swift.php from build #1341.
Fixed new checkstyle issues in ftp.php from build #1341.
Added label with posting string
Added support for gauge measures
Change go-hello (hello world)
renomeado tasks
Add TestScene

Added a cube with highpoly textured normal and gimp'd diffuse.  Scene
has an object called TestArea1, which houses a collect of these cubes
along with a simple plane
Darkening body text. Fixing #11.
Updating button icons, new icon for mailing list too. Shifted mailing list button to the top of the list
Site updated at 2012-05-23 22:52:33 UTC
Added excludeFromSync property to MO

This can be used to make sure an object that should not be synced, such
as one in a InMemory store, does not get synced.
Fix a runtime warning from unorderable methods.
Generate one-of() types for enums when possible.
Move macro output to the c-ffi backend to avoid runtime warning.
New blog post: "The Khan Academy Internship Experience"
Initial Commit
initial commit
Merge branch 'master' of github.com:eamonford/cernvm-copilot-ios
Added countshapes module and download image feature
Proyecto con JPA para manejar servicios de Cloud SQL
add HelloWord.java  and HelloGreece
make a change
Se cambia Demandantes/Demandados por Clientes/Contrapartes
Corrigiendo comportamiento erroneo de la lista de particiones
Eliminando salidas innecesarias
Organized the streams.
Reduce pairs, added a test.
Add mysql2
Add mysql2
Add mysql2
Add mysql2 for real
Arrumados testes com a tradução e o novo layout
Contract update.
Node plugin - scripts are made executable.
Implemented Bowling Kata - ugly solution.

git-svn-id: https://MSC-L3ALZ8R.allegisgroup.com/svn/JavaScriptPlayground@6 23f47ed3-7335-1448-b4a3-db36cdf8522e
Refactored. 

git-svn-id: https://MSC-L3ALZ8R.allegisgroup.com/svn/JavaScriptPlayground@7 23f47ed3-7335-1448-b4a3-db36cdf8522e
Initial commit
Merge branch 'master' of github.com:fcuenca/JavaScriptPlayground
Coleta de JBOSS 100%
Minor bugfixes in graphs
fiddling with error handling
Merge pull request #31 from financeCoding/master

Update pub
Make white space consistent for all generated operator* methods

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Fix generator for new directory layout

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Add dart:sczlarlist to console library

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Revert "Do not align the text verticaly as it breaks if no logo is present"

This reverts commit 15b5bf351ec5262a9672ddbaac753b0515837286.
Update wording on partner page
Rename database to have .db suffix
resolving Issue #1 and updating hasPlayed color to be more prominent
Completely rewritten Setting.PushButton class. Other classes will follow.
get MacOSX boottime
Migrated to simplePlugin
Added youtube base class
Expanding events on click. Event topic icons. CoffeeScript for data generation.
1.0.0

- added a readme file
- added an #iOSDevCamp easter egg for presentation =)
- renamed and relocated homescreen & splash screen images to the root
directory
- modify image source instead of swapping classes when message changes
- added global debug option
Site updated at 2012-06-15 08:12:33 UTC
Adding key and aptitude update, setting mac address
fred commit
Merge remote-tracking branch 'origin/fred' into matthewmcc
Update res/values-hu/strings.xml

proper update to v1.3.9
Merge pull request #24 from appelsson/patch-3

Update res/values-hu/strings.xml
Add on_over event to map tile

This will be used to replace the select case statement that checks what
map item the player is over. Each case will be moved into its own sub
that will be called from this event.
Move each item check into its own event sub
Testing to see if setting the world changes something.
Few css fixes... done for today
une autre ligne
构建3D流水线但不完善，
局部到世界变换，世界到相机变换，剔除，
有基于渲染列表和物体2中模式

Signed-off-by: hebidu <hebiduhebi@126.com>
testing travis-ci build

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
adding bin with .apk

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
splash images are not transparent anymore

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
update svdrp4j
add genre and stream information to the program
add genre and stream information to the program
use the description for short description, too, if no short description is available
don't stop channel parsing on errors
added target to run with local vdr for easier testing
updated to new svdrp4j snapshot
i18n
Disabled validation of DVB channels. Increased version to 0.5.5
i18n
Fixed assignment of channel categories
Fixed NPE, when connection cannot be established in checkForAvailableChannels(ChannelGroup, ProgressMonitor)
merged from master
Site updated at 2012-04-07 20:28:12 UTC
Updated runtime shutdown to issue forced shutdown after specified time
has elapsed.
Fixed global leak on agent.
Updated common.js exports var name.
Replaced jasmine-node with mocha, should & sinon. Added sandboxed-module as well.
Renamed runner_spec to cli_spec.
Moved some stuff from cli_spec into common_spec.
Tabs to spaces on agent.js.
Comment
Make sure reports are only requested once.
Small fixes.
Added a few things on cli spec.
Dispatcher: callback if it exists.
ControlPanel driver: Cancel report if sending data fails.
Fixed reports.cancel(report_name).
Added utils/keygen.js, cleaned up a bit setup.js.
Export config_path in config.
Updated shebang on python sound detector script
Converted tabs to spaces in scripts.
Fixed XML parsing of Control Panel outputs.
Updated cli_spec
Syntax updates in Control Panel driver.
Task for mass emailing BR users about vote
Added new plugin. Working on interactions between the user and the plugins. Hopefully, this will be the last big change in this stage before a new release :D
remove not relation
new support for conditional attr setting
Added travisi-ci file
Site updated at 2012-10-23 10:52:48 UTC
implemented proper bounding box handling
added grandfather and uncle
added brother
working on delete cases
more robust training and test functions
Merge branch 'master' of github.com:/imcmahon01/Penn-haptics-bolt
Fixed some major bugs.
Another major fix. How'd I miss that!?
Revert "Vadonka: Add Core and CPU voltage reliability requirements for some skus"

This reverts commit 045088de1df0a6d8369587eace48521bf0b6f2f0.
Cleaning up and updating the readme
for new g_format_size(), require glib >=2.30
remove all i18n files for jquery.ui.datepicker
Site updated at 2012-06-13 13:22:06 UTC
Fixing passs.json template.
Change Audio Streaming to Audio Recording
Update lluvia de ideas.txt
up to 1.1-snapshot
Basic algoritm done
modify app delegate
rss and picture on index

add rss link to the page. add two pictures of graphics on index page.
Fix whitespace and long lines
ReSharper 7 support, based on SDK and improved test coverage
Merged with origin
added asl log cleaning for speedier term and a quick way to update textmate
added code from kris'

'
added names to sub-components.
Add missing package lzma
No need to delay themeGalleryInit anymore
Prerelease 1.10.0pre.7
Extracted MinimaxNode class for common functionality between Min and Max nodes
MBPJ-23: Ensure Redline widget is passed the map name of the actual *MapGuide* map, and not just the first map in there.
Android

Partial success with the config.xml. App now has permission. Still no
location alert.
updates to initial file tree
Merge branch 'master' of github.com:justinhammack/WineFolly-Pack
added again a2.1
BuildFileDownload works with single quoted attribs

BuildFileDownload works with single quotes HTML attributes
add revision to the file name of the failed log
AOSP GB Work for P350
Added JustTraceExamples.Optimized

Readers would benefit from having a project with the optimizations from
the blog series applied.
Added fines
Namespace cosmetic
[62] Fix spell animation angle + GNU GPL
Send data about GOs to player
building view
Data Set added for Day 2
implemented more of the sound graph

not working yet
Adds spec for waiver#age
Requerimiento completo: Edición de datos personales
Revert "BaseAction Implement  SampleServlet interface"

This reverts commit b91c3024b0201e70621352905ae96b740d0cb120.
add puppet push client
Site updated at 2012-10-22 02:55:30 UTC
Site updated at 2012-10-23 01:56:00 UTC
Product en Category toegevoegd + kleine aanpassingen
Release 2.0.19-stable
Remove some printf logging and rely on re.escape to do the right thing.
update main css backgroup color.
Description (readme.MD) generated for Github from running launchpad. (readMeGeneratorFromLaunchpad.py)
LocalKeyName added to constructor (languageServices uses this request wrapper to eliminate the duplicated code)
Version incremented
README.md, osgidependencies.dot and osgidependencies.svg files generated
README.md, osgidependencies.dot and osgidependencies.svg files generated
Session manager uses Java 1.6 concurrent classes.
Sling DynamicClassloader facade replaced to own, more flexible solution
…..
Merge branch 'master' of github.com:lizardsystem/lizard-blockbox

Conflicts:
	lizard_blockbox/static/lizard_blockbox/blockbox.coffee
	lizard_blockbox/static/lizard_blockbox/blockbox.js
Site updated at 2012-06-23 13:11:51 UTC
Site updated at 2012-06-23 13:24:49 UTC
Site updated at 2012-07-08 14:54:47 UTC
Limited change to only work on Digital watches
Merge branch 'WidgetRowAlignBottom'
pattern + doc
Added new languages to settings
Compiled messages and added locale/qqq/LC_MESSAGES/django.mo to .gitignore
Rebundled as an Alfred extension.
Compatibility fix for Growl 1.3

Also adds support for Safari. Thanks tzarskyz!

Signed-off-by: Roberto Acevedo <rxacevedo@gmail.com>
Growl and Chrome fixes

Growl notifications working again. Also fixed an issue where URLs were
not being grabbed from Chrome properly.
Fixed issue with Instalfred not working with browsing running concurrently

Instalfred now plays nicely with multiple browsers running at once. It
now considers what the frontmost application is, not just what
applications are running (this caused an issue where it would always
grab the URL from Safari first if it was running).

Also added an error message when Instalfred is called on a non-browser
window.
Had some issues getting rxacevedo's script to work.  So, I made a few mods and a couple of structural changes.  
Added the web page title to the growl notifications
Added title to growl notification and updated alfred extension
unknown
giai quyet conflict seed.rb va schema.rb
seed, schema
Chinh sua model: recipe va user, customer_home_controller: create_recipe, index_recipe; customer_post_controller: index_customer_post, index_recipe
Giai quyet conflict cua commit truoc
Sua lai inactive trong view/customer_post/index_recipe.haml
Chinh loi hien thi ben customer_post view file index_recipe va show_recipe do thay doi model
Chinh mot so logic trong view thanh title
Chinh link_to mot so file
Merge branch 'Vinh_work'

Conflicts:
	app/models/tutor_post.rb
Merge branch 'Vinh_work'

Conflicts:
	app/models/tutor_post.rb
config devise
config mailer
Customer_post_controller: accept_recipe && deny_recipe
Merge branch 'master' into Vinh_work
Nay thi phan quyen ;))
add role when create user
Merge branch 'Vinh_work'
...
Loi edit, update customer_post_controller
Replaced asScalaIterable with iterableAsScalaIterable (the former was deprecated).
Pass function to display results.
Source compatibility 1.6 -> 1.7.
More long used configurations.
typo in the README for the travis image
Add a button to select SQLite database file on new connection tab.
much-needed gitignore file
social icons -- still need to add attribution

http://www.danieleckermann.com/linkdeck
added social icons to site
add link to OmniAuth
added setPagingEnabled() for ViewPager.
It is working!

Still need to:
- add some methods
- make everything cleaner
- remove extra code
Annulation ignorer archives (jar / war / ear)
Ajout des libs
adding sched_yield
Be polite to potential consumers of this class despite being in the internal API.
Unused import.
Fixed #47 by filtering on isLandingPage = 0
Merge pull request #48 from massiveart-webservices/bugfix/47

Fixed #47 by filtering on isLandingPage = 0
HotFix: error calling findOneBy doctrine function
add shipping cost to cart result
Working on sub-header/ update to layouts
update to patterns
Just checking stuff in while waiting for a download...
"Settings" dialog no longer crashes on-save if charged-miners' data folder is missing (thanks Moose).
Fixed parsing of mc.lastMcUrl field in settings.ini. Resume tab is now fully functional.
Allow editing/display of collection file_package_summary from file_groups
belonging to the collection, as often one will want to edit that when
adding/editing a file_group.
Site updated at 2012-04-25 14:47:59 UTC
Add syntax-check target, fix phpunit

syntax-check runs the PHP linter to verify E_STRICT/E_ALL compliance.
phpunit was using global php, fix makes it use environment php.
Documentation updates
South support

Thansks to github.com/sidmitra
https://github.com/brosner/django-timezones/pull/13/files
Adapted django's VERSION  & __version__ scheme
No more need for MANIFEST.in, default covers all
TimeZoneField in root of import path
[Finishes #36517983] Allows uploading of translations from a hash to phrase api.
some progress in modularizing templates, views and data
leistung zusatzleistung artikel
aufenthalt date to sql
socios equipos sin titular
ajout membre IplImage* ds contrôleur

je l'avais mis dans la vue (je ne l'ai d'ailleurs pas supprimée), mais
il est plus judicieux qu'il soit dans le contrôleur
corrected tags on markdown
增加 视频转码
Merge branch 'master' of github.com:mindpin-shcmusic/shcmrs_sync
The Geant4 structure: src and lib.
Actually fix installer bug
Site updated at 2012-08-27 18:45:53 UTC
Modified to meet new plugin format
Add vim-endwise for end completion
Add vim-rails plugin
Add vim-fugitive for git in vim
Add tComment for comment toggles
Remove vim-commentary
Add and configure powerline, installed earlier
Fix mounting disks by UUIDs
Updated dropbox-experimental to version 1.5.10
init data update
...
Octopress init
Site updated at 2012-11-29 00:37:27 UTC
Fixed instructions

Vagrant file actually looks for a box called 'lucid32' not 'base'
Fix nits reported during & after the talk.
changed gitignore (workspace) and added some  settings from Database-Analyzer (copyright, inspection..)
updated  copyright
Issue #140 - Added Typed Methods As Extension Methods
Added generic versions for Get<T> and Api<T>. Also added tests.
Prabir, Nathan - I have not used Git much (still a heavy TFS user moving to git). Please let me know if this meets your requirements or not. I would be glad to make changes and be a small part of this big project
set default host for faye.
Removed PhpConsole.php
Add version.py to manifest.in (Fix #14)
oops, fix links again
Removed recycler
Add a "local" meta layer with a "my-image" example

If you build your own image, this demonstrates how to do that by creating
a "scratch" area for your recipes. To help getting started, there's a
my-image recipe that demonstrates how to create an image packed with
your favorite features.
Makefile: fix typo
opkg: intercept modprobe

modprobe is called from the postinst hook, for autoload modules.
As a result, modprobe would run before depmod (which is intercepted).
Unfortunately, there is no easy way to determine the running order
of the interceptors.
So simply intercepting modprobe would still cause it to run before
depmod, after the installation has completed.
Therefore, prepend a 'depmod -a' command to the modprobe interceptor file.
This will cause depmod to be run twice (once by the modprobe interceptor,
and again by its own interceptor), but this avoids having to
rewrite interceptor handling, to force a certain calling order.

This will fix the 'FATAL' error messages during installation
of autoload modules, and ensures the modules will be loaded right
away, no more reboot required.
Linux: Build XFS filesystem as module for all boxes.

Some built it internally, some as module, some not at all. This
makes them all build the XFS filesystem as a kernel module.
Add xfsprogs 3.1.8 recipe (3.1.7 is no longer available)
Add xfsprogs to feed
autoload xfs module
linux-dreambox: "fixes stability problems since previous update"
dreambox: bump MACHINE_KERNEL_PR

recent kernel changes break external modules
openpli-bootlogo: handle when /boot is already mounted

Some people might have a /boot entry in their fstab,
so /boot will be mounted already, causing bootlogo updates
to fail.
mdev-mount.sh: Tell enigma about non-mountable devices

If a disk doesn't contain a filesystem, it's still a good thing to
tell the UI about it. If you attach an unpartitioned or otherwise
unrecognized disk, you still want to be able to format it. (*)

This may fix some reports about "missing" USB drives, since they
wouldn't show up in Enigma2 if they weren't yet there at startup.

(*) Note: E2 could just listen on a netlink socket for this.
linux-dreambox: 3.2.31 update
dreambox: bump MACHINE_KERNEL_PR to 12

Before we used MACHINE_KERNEL_PR, the kernel had a PR of 11.
So we need MACHINE_KERNEL_PR to be higher than that.
dm7020hd: build XFS into the kernel again, and disable XFS_RT

just to find out whether this avoids the booting problem,
introduced after 20121010 (coinciding with the XFS defconfig
changes in 702913ef03fea56b244b56484a6ed6df7cd766ed)
libpng: update to 1.5.13

Signed-off-by: MiLo <milo-software@users.sourceforge.net>
linux-etxx00: 3.6.0 update

Signed-off-by: MiLo <milo-software@users.sourceforge.net>
enigma2-plugin-picons-ziggo.casema: 20121021 update by gjstroom
Merge remote-tracking branch 'pli/master'
[tmtwin] update linux 20120802:

1. . AV Recover Function improved
openvix: build 88
branch-a
Merge pull request #1 from ojimac/branch-a

branch-a
Merge pull request #2 from ojimac/branch-b

branch-b
conflict-test
Merge pull request #3 from ojimac/branch-a

conflict-test
conflict resolved
Making good progress on hough stitching
Updated descripion about user filter feature
Update principles.html
Added missing practice address code
Re-insert missing CCs
Add a custom sharing provider for addthis
Remove deprecated `organisation_owner?`
Move OAuth detection and token parsing to `oauth_credentials`
Return parsed dn from User.uid_to_dn(uid)
added field class and created unit tests to match, added a form class declaration with no attributes or methods
Storing flora tools from GIS server.
Testing app for UI templates
Demo of ace editor
include parent styles
Version 1.04 paypal bug fix +
ignoring grid
new problem
Double-tap enabled for manually selecting location during active GPS
location search.
Rename 'resource_factory' to 'resource_creator' and add a attr_writer for modification after the Dispatcher is created.
Adding Dependencies
Adding Artist/User Entity
fix clean result if nothing to clean because the match didn'T found anything
extend alias from 10 to 30 characters
Moved timer init call to widget's onAttach event to avoid the timer from being halted when multiple windows are open
Fixed case where incorrect readcount would show up
unua problemo el la projecteuler.net
embarrasing. spelling README right
resolved paging issue
Added default titles for photos which don't have one
Merge pull request #6 from IanDBird/master

Resolved issue with pagination and photos with no titles
Fixed changelog order - entry had fall into wrong version due to automatic merge and release while work-in-progress
SolidColorDetectorDataFetch:Working - Updated StatusNotifer and ThreadStopper to use condition object for inter thread communication.

Next step: Write Junit for StayusNotifier
Replaced deprecated load_instance with find
Fixbug lors de l'envoi des notes
Catch HTTP server errors (especially EADDRINUSE) of File API hack (for Zap and Shake demo).

Jira issue: WP-60

This is just a quick fix: Only one HTTP server per machine is allowed. Further PZPs on the same machine will no longer crash, but won't provide access to their filesystems.
Merge pull request #46 from felixjendrusch/WP-60-file-hack-eaddrinuse

File API crashes PZP when port is already in use
pzh-host and pzh-name separated

check config parameters

Jira issue: WP-47
Merge pull request #48 from habibvirji/WP-47-pzh-host-name

pzh-host and pzh-name separated
added tests for Gallery Api

Jira issue: WP-77
Update boothSales.php
first draft of completed registerSale. added include "loggedIn.php"; to controllers.
(#15699) Add methods for resolving and more adequately stubbing the forge host

This patch includes the new 'forge' method which looks up the host using the
following mechanisms:

* return the host with the 'forge' role assigned to it
* return the value of 'forge_host' in the CONFIG hash
* default to returning 'forge-acceptance.puppetlabs.lan'

This allows us multiple mechanisms to override the forge host, with a fall back
to the static 'forge-acceptance.puppetlabs.lan' host.

It also provides wrapper methodology for stubbing a host in general
`stub_hosts_on` and provides a forge specific wrapper `stub_forge_on`
so we can make our acceptance code more DRY.

To facilitate proper 'unstubbing' this patch also introduces the capability to
declare a teardown code block, that will always be called at the end of a test
case. This is a generic method, and can now be used by anyone for purposes
beyond the initial goal of this patch.
Merge pull request #260 from kbarber/ticket/master/15699-forge_role

(#15699) Add methods for resolving and more adequately stubbing the forge host
add VS project. Fix bug in RGB2LUV
Modify the test case
create readme.md

frist create
Reorganized cmake module directory (removed the modules directory)
- Changed default example to blink form the Arduino SDK
- Updated the documentation to reflect changes made during refactoring (no need for find_package anymore)
Start sage.
Chance to Sage.
Some amount of identifying queues by name rather than pid, but not for fine stats.
Junk bug23625
Aggregate recommendations working, without user portraits.
KaraokeLayout working, debugged.
Homescreen india (wip).
Created intro
Merge branch 'master' of github.com:rahulsom/rahulsom.github.com
Update composer.json

correction of syntax
Remove jquery.cluetip since we're not using it
charts
I fixed the crazy bug and NOW ALL THE THINGS WORK
do not trim subject/title - we have more space now; used wrong hash to search for information
bump version
fixed #1509 handle Firefox's 4KB nodeValue limit
Fixed #1534: add chipmunk
Fixed #1534: add chipmunk
Merge pull request #619 from linshun/iss1534_chipmunk

Iss1534 chipmunk
Merge pull request #618 from dingpinglv/iss1509_UpdateMenuTest

fixed #1509 handle Firefox's 4KB nodeValue limit
Add basic participant queue struct
sphinx-api: Generate skeleton docs
Switched to using an error function.
Add encoding pf var for JSON

Optional parameter file variable.

The default JSON encoder for the Python JSON module is UTF-8.
This does not correctly encode some single bit characters
like ó and é. If you force the encoder to be ISO-8859-1 then
the JSON parsing works (into Unicode), provided the database
field values are inserted correctly in single bit Unicode.
Refreshed gradle plugin manual

* Added a manual for 'idea-utils' plugin
* Moved scala facet plugin manual to project sub-folder
* Created a top-level README pointing to the two above
add good=bad and future work
Rebase from 'release/nodelet_topic_tools' @ version '1.7.7'
Generated debian files for oneiric
Row height calculation tweek
Site updated at 2012-05-02 16:08:48 UTC
Axe the image for now
Fix donate link
Documentacio am JSDoc
Update dingding's photo and desc.
Traduccion cap 8 desde linea 375 a 691
Site updated at 2012-07-26 21:57:18 UTC
jhg

fjhg
added id to update function
add support for initial population download from GA source
caslimaSirasi.txt silindi
reactivated cname
Venky's commit
Shortened isSameDomain location === undefined logic.
Added tile.stamen.js so I can change it.
Use the provider option on the Stamen layers, if it's given.
Added Stamen base layers. Fixes #41.
Update gems, including New Relic security update
update Rails
Use different maximum events for Tabor overall
Use custom minimums for some Tabor categories
Fix logic error in Tabor calculations
Update gems
Ignore .sass-cache
Replace deprecated :confirm
Merge master
Merge main branches
Initial import of spring example. Basic skeleton spring app going to being with!
Trying to avoid out of memory exceptions.
Proper sectioned packages.
Fixed build issues (hopefully)
Renamed omxil-doc to omxil-broadcom-doc.
added handling proj-ship collisions
Adding all koans
First commit for koans already covered
fix multiplier for loans objects
fix "multiplier" to work with loan objects
Register commands in a far more intelligent way

Decorators for the win.
Fix NullPointerException in JsonHttpResponseHandler

If result is null after new JSONTokener(result) which means response is
not a json type, assign result to responseBody to avoid makeing
NullPointerException and also makes handleSuccessJsonMessage able to
create a JSONException with right jsonResponse's class name.
Moved mock requestor to seperate file
add a script to allow easy gerrit pushes
Site updated at 2012-04-02 03:02:52 UTC
textView в результатах сделаны нередактируемыми
delete all the file to rebuilt the blog
Put ICO CLM preferences checking responses for ECA
Merge branch 'development' into FraserICO_CLM_ECA
Add folder and class structure for 'automatically create CIS' test
case(s)
Merge branch 'FraserICO_CLM_ECA' into development
Merge branch 'development' of https://FRBlackmun@github.com/societies/SOCIETIES-Platform.git into development
bundlde build related updates
Update DataIdentifier Schema
Fix PrivacyDataManager implementation to adapt to DataIdentifier
Added CIS manager to the plan
Minor mods to clean up pubsubID
Merge branch 'development' of https://aleckey@github.com/societies/SOCIETIES-Platform.git into development
Pulled Android renderer out of the project and put it in SpookEngine-Android

Removed Android.jar (commented out all texture code related to Android; need to fix this!)

Pulled Maths library out of the project and put it in SpookEngine-Maths

Renamed project to SpookEngine-Core
Added clover page, and valigned the sidebar to the top.
depend on released pluginkit 1.2
depend on nexus 2.3.0 and latest parent
license headers
change nunit reference to any verson
Addint a setter for isDownloadable
Fixing a typo in the bundle identifier
Bumping to 1.0.1
Merge branch 'release/1.0.1'
OPT Minor cleanup
Use 1-1-stable branch.
* Use digital pins D2-D13 for controlling lights.
* Add CC A-SA license to be clear the code is available for other people to play with.
Wrapped modal link in transparent background
Intermediate version of SimpleFileDropWatcher
notifcation oauth
forms | Refactored review form.

Since the reviewform is used in two places, created a base class and inherited the admin-editing form and the public-new form.

Cleaned up new_review view to remove crufty code and make better use of form.save(commit=False).

Reworked admin interface a bit.
Corregida la RegExp utilizada en un ejemplo
dev.sh:  a script for running the service with dev_config.yml
Bleh, typo. 'yourls', not 'yourl'. Duh.

git-svn-id: http://yourls.googlecode.com/svn/trunk@812 12232710-3e20-11de-b438-597f59cd7555
Removed config-network.sh
Update config/rake.rb
rfkill PM is needed
updated msm_mdp.h
sparkcharts all description
Merge branch 'master' of github.com:syntagmatic/labor-statistics
try a working commit of hybridauth sudmodule
technoirc is working
Site updated at 2012-12-28 10:42:31 UTC
Mercurial completion
fixed bug in webtest for ui
optimizing backend
[#26397767] Remove require 'gdbm' from rake task, not sure if it will work.
temporarily prevent a user to delete a non-empty blog
Updated debug for profiler
Deleted release packages
Fixed all 9 'bugs'
adding a video
events load limit to 50
config development
Added supersized library
Fixed opening issue and open file with default browser
Merge branch 'feature/issue3_opening_same_pdf' into develop
testing ddb01 html5 video link
A few fixes for the carousel.
Warriors and stuff. Fix DJN bug.
Re-enable phpcs for travis builds, now that that pesky bug is fixed in
phpcs.
added update rules for pecl.

added `cd ~` instructions in the right places, just in case.

Bumped the install versions of nginx and php.

Mentioned `make test` for building php.
Removed all the `sudo` instances.  Evidently ops people think its cute
that I don't run as root all the time.
brought csv_import_db that is referenced from the 08-15 blog post
Inverted Triangle
remove user proxy
Catalan copys translated
Add prefix to checked elements.

Readme file updated.
documentation...#
[TIMOB-9471] iOS: add time measurements for JS compilation
another optimization try
[TIMOB-9620] Remove deprecated sound property
[TIMOB-9631] Fixed a bug in navigation group animation.
[TIMOB-9631] Bug fix.
[TIMOB-9623] Treat iphone, ipad, ios identifiers as iphone for project creation.
Merge pull request #2426 from vishalduggal/timob-9620

[TIMOB-9620] Remove deprecated sound property
pass files via stdin
Merge pull request #2428 from sptramer/timob-9623

[TIMOB-9623] Treat iphone, ipad, ios identifiers as iphone for project creation
timob-9626: fire close event for TabGroup
[TIMOB-9639]Wait for stopReachability to finish in destroy
Merge pull request #2398 from mstepanov/timob_9471

[TIMOB-9471] iOS: add time measurements for JS compilation
Merge pull request #2429 from vishalduggal/timob-9639

[TIMOB-9639]Wait for stopReachability to finish in destroy
Merge pull request #2427 from bryan-m-hughes/timob-9631

[TIMOB-9631] Fixed a bug in navigation group animation.
Merge pull request #2430 from hieupham007/timob-9626

timob-9626: fire close event in appropriately for TabGroup
Created a view to show the image and Share link.
Added ability to post picture to Facebook.
Added feedback to the user when his picture is successfully shared on Facebook.
Overlay the We (L) Iran logo on the submitted image.
SamsungQualcommUiccRil: hack to prevent SIM unlock popup

Change-Id: Ibe922fa4f9d9de20f0ffc2d7efd8ad12d2ff8319
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Change SIM Pin lock entry to center of window with transparent background
for devices with large screens (Tablets)

Change-Id: Ieff8b7c0062c09d97da6333d344d4fbb4ef20a68
Lockscreen VolCtrls : Don't raise volume on skipTrack

Set mIsLongPress to true when longpress was successful to avoid
volume from being changed on release

Change-Id: I874f7d66248e30535dddfec53ddd299718e3fa3d
German: new string

- weather last sync
- 'Application killed' toast

Change-Id: I2038237aa3a5aea1009d3258668eb92e0e7a28bb
Merge "SamsungQualcommUiccRil: hack to prevent SIM unlock popup" into jellybean
add notification/ringtones contributed by Ink Monster

Change-Id: I2ff76fce1f5b1e476ef6f71755347f2d9a836fe9
AutoRotateButton : Minor cleanup

Use setRotationLock to avoid code duplication and staying consistent with framework.

Change-Id: I3268c049b723684fbd173911d098aa7b089c1d06
Merge "Change SIM Pin lock entry to center of window with transparent background for devices with large screens (Tablets)" into jellybean
LockscreenPattern : Toggle dots/error pattern visibility (1/2)

Give user ability to hide error pattern / dots.

Part 2 : http://review.cyanogenmod.com/#/c/21543/

Patchset 2 : Minor formatting

Change-Id: Idda9539b213eb78391b725fcd89ff5d93c8090ce
Merge "Lockscreen VolCtrls : Don't raise volume on skipTrack" into jellybean
Merge "German: new string" into jellybean
Fixed Hungarian keyboard layout derp

Change-Id: I128ed9813fe0008f0f50ff1d23e22a2c5e7b72b7
Merge "AutoRotateButton : Minor cleanup" into jellybean
Merge "add notification/ringtones contributed by Ink Monster" into jellybean
Merge "Fixed Hungarian keyboard layout derp" into jellybean
Merge remote-tracking branch 'github/jellybean' into jellybean
Bara ett språk i READMEn
Merge pull request #9 from whitetigerisme/master

Add sprite files
Merge pull request #10 from whitetigerisme/master

Update octobot pull sprites
Merge pull request #12 from whitetigerisme/master

Update sprites
Merge branch 'master' of github.com:Choctopus/game-off-2012
Upload sprite sheet data
Do group name mangling in the manifest

Otherwise groups get added continuously to the sudoers file and they will never
get removed even with ensure => absent.
Support ubuntu in addition to debian
sudoers::os subclasses sudoers not sudo
Make "ALL" default commands

This seems to be a reasonably general use-case for sudo.
pacakges is not required to use Package resource
Install sudo before realizing the package
Always convert commands to an Array

The include and join in pre_gen fails in some cases if we don't force the
conversion.
Change nopasswd field name

Change the nopasswd field to be a different name from the nopasswd option to
avoid notices about the sudoers file changing (like the following) every time a
manifest is applied.

	notice: [snip]: nopasswd changed 'ALL=(ALL)' to 'false'
Update README file
Ensure sudo package is present
Qualify fact variables, deprecated puppet 2.8
Leave the defaults lines alone
Whitespace
Don't break sudoers file
Merge pull request #1 from mcrute/master

Please pull my changes
add a reference in 'metaclasses in python'.
Site updated at 2012-06-13 06:12:00 UTC
add send mail after pull added
workout saving. plus a bunch of bug fixes.
Added the workout list
Remove building groovy docs
new file:   _draft/2012-09-05-why-smartphone-sensing-important.markdown
	modified:   _wiki_source/bookshelf.wiki
	modified:   wiki/bookshelf.html
Modified to asynchronous the outputs
add design-patten-template
change lisence
change lisence
our rang page compete with footer
evita: use proprietary wcnss firmware

Change-Id: Ideb2aa7ae29d6df2d8a9968395032af48f48dbf0