labofsahil/github-event-dataset-2012 huggingface dataset:
refactors public photo display and deactivates sort by vor if votes are deactivated
adicionando artefatos do projeto
removendo target
Update to version 0.1.6
Update to version 0.1.7

Merge branch 'devel'

Conflicts:
	Changelog.md
	DOC
	RELEASE.md
Few fixes, refactored read() (uses blank()'s code), updated docstrings
Added tmux config file
Base javascript config file
Syntax coloring for twig
refactoring extraction and viz code
Removing ds_store

e Please enter the commit message for your changes. Lines starting
$> bundle install
Deleting sqlite3 reference in main scope
$> bundle install
Renamed README.md to be compliant with the Yocto Project
Esto ojala y sirva
pu
First implementation of image storage.
Use async iterates as default
Add some actor goodies. Async Logging, FSM, Agent
Update to Selenium 2.21.0 and enable selection of document mode in IE + Webdriver.
Added all the functionality except for timer
Made configuration more modular and created some Doctrine specific bindings, see tinyissue#2
MOSYNC-2147: Removed problem with infinite reloads upon exception breakpoint.
MOSYNC-2147: Changed some debug messages.
MOSYNC-2147: Added support for evaluate in HTML5 files
MOSYNC-2147: 'Evaluate' console message
MOSYNC-2147: Changed name of launch for on-device debug
MOSYNC-2147: Added console message on timeout
MOSYNC-2147: Temporary fix, this must NOT be in the release
Add jcrop

-- Beginnings of image crop UI
-- Customize store_dir for carrierwave
-- Add extra_large version for cropping
-- Move update button below both tabs on user edit form
-- Add jcrop js, css, images
-- Remove automatic posting of form on file selection
Added in randon seed provider that uses DateTime.Now.Ticks
It's wrong to use rails dummy test database?
added a generated by footer
Remove unecessary comment.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/options-refactor'
Update node version requirement, and pass back the path search for windows testing.
Finished all table operation testing
global config for git
global gitignore
added Rake tasks for updating config files
decimal ajax
Added additional usage information and examples to the README
Updated requirements with dependencies and a caution on building in the README
First pass on LogNormal distribution
Added test suite
Fixed CDF and moments
Fixed pdf test cases
Never heard from Dr Ferguson.  Managed to replace Kolmogorov CDF with a power-series approximation.
Accepting some slight loss of precision on LogNormal isf and ppf functions.
Merge branch 'LogNormal' into develop
Updated phar archive.
Updated README
Added to changelog
Updated Doxygen main page
Fixed line breaks on Doxygen main page
Merge branch 'develop' into OLS
trying out junk
Fixed kernel, still hardcoded path though
Добавил зависимости в README
bit 'o cleanup
fixed song_progress readable form
fix bug  of root
In BarApp the jlabelOrderPrice is now updated with total price of Basket.
Merge branch 'master' of github.com:mennowolvers/FitWare.git
Introduced GeekGraph as a more lightweight data structure (which will eventually replace GeekMap) and the initial classes for a GUI based on Kivy
force rack version
Adapt the Voronoi Mesh library for Processing to Java
Update .gitignore
Attempt to interface Graphstream with Mesh with a simple test
lots of images
Merge branch 'master' of github.com:metaltoad/memeplacer
Improvement on crossover in TSPGeneticAlgorithm.
complete the connection management initial drfat
Fix up some typos in meta text.
finished most of the conclusion
format with optional template
fixed the work's forest behaviour

A node gives its value to children instead of taking its own value
this way, a leaf is now able to set several values to its output
depending of which parent calls it.
LPS-30280 Tests for the new reword template. Use this classes as the base for all the tests related to rewording SQL queries on different databases
Added abstract model object and added Users module
Add Sublime keyboard shortcuts
Changed get[Vital]() to getCurrent[Vital](), to match variable naming
convention.

Added experience stuff.
Added basics for derived attributes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/struct/mob.dm
Auth myself to allow manual builds
rename to README and change image links to be more github friendly
changed the targets from lines to rectangles
Merge branch 'master' of https://github.com/mimason/FinalProject
Remove labels in main cycle.
Remove all labels from Cli.
Add exceptions for add and delete.
Last commit 11.12.12 from office.
Added a rudimentary example of getting the current scope's declared variables.

It doesn't work for multiple variable declarations yet, nor does "scope" itself work, but I'll be adding that soon.
Maybe this is just to remind you that the project is still alive ;)

Test case passed:

var s = '';
var b = '';

for each(var x in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) {
    for each(var y in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
        s += x * y + '\t';
    s += '\n';
}

console.log(s);

Have fun.
ftp link replaced with http
full version history also for Opera
ftp link replaced with http for FF
Duplicate dataurl.net entries merged
Merge pull request #22 from pepelsbey/master

A few fixes
pt_BR: translation updates by frankviana
sl.po: translation update by Taykun345

Signed-off-by: pieterg <pieterg@users.sourceforge.net>
Merge branch 'master' of git://openpli.git.sourceforge.net/gitroot/openpli/enigma2
Major UI updates in segmentaion.py and ui*.py
add a/v sync slider to avformat producer
Add Qt-based implementation of mvcp_socket.
Refactor can_read into try_read
Add new require-based builder
Harshit & Duck | Removed unused git submodules, i.e. actionbar and pulltorefresh.
added patching process doc
Added alpha(), added comments, fixed function names for list and import to conform to Python naming conventions.
bug fix: ordering bugs with multiple before/after
VERSION 0.1.4
initial commit
Merge branch 'master' of github.com:mortenhn1981/TestGit
Modificado: oi.txt
added docRouter to weatherFeed.js file
added docRouter to weatherFeed. js file
Merge pull request #25 from mousaz/amal-remote1

added docRouter to weatherFeed.js file
No bug. Rename releng repo
`Shortname` -> `ShortName`
Ignore pycs and install all requirements.
Merge pull request #57 from jsocol/master

Fix two small issues
don't compact objects before merging into req.p
Made a very important replacement
fix minor bug where association was sometimes added twice
Manifest-o-matic for 2012/07/16 18:41:10 CDT.
Time function working. Now postgress
Player can no longer loop around open level designs, and keypress code cleaned up and refactored.
Comments, and asterisks around global variable.
Huge refactor of namespaces, and a bunch of marginalia documentation.
test commit desktop
skills
added sysdep: _msgpack_be_float and _msgpack_be_double
IDSgrep 0.2
Add plumbing for SSL/TLS support

This change abstracts out the networking functions so that the
user can provide an SSL/TLS implementation.

Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Cleanup autoconf/automake build

Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Implement SSL/TLS over CyaSSL, GnuTLS, OpenSSL & PolarSSL backends

This branch follows on the "ssl-plumbing" and "autotools" changes.

Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Actually have until tomorrow for teams...
fix qualifier
Merge branch 'master' of github.com:mulesoft/mule-devkit
Adding Rest integration test WIP
generate LoggingAgent only once
only generate metadata adapter for connectors and modules
fix issue in logging-agent integration test
tum haraketler gireniyle cikaniyla tamam, tas haraketleri ekrandan alinacak sekle getirildi
Added the Java HelloWorld project
Modified the hello world message and added additional output
Merge branch 'master' of https://github.com/mwall1992/HelloWorld

Conflicts:
	bin/HelloWorld.class
	src/HelloWorld.java
Switch to redis-url
Semaphore build status
Site updated at 2012-11-04 13:10:58 UTC
Changed up HelpText model to introduce slug and order fields
Emotes: 13113 Time: 09/23/12 02:35:35
Emotes: 13121 Time: 09/26/12 22:35:18
texshop: fix open command
State_monadに関する修正

テストコードのインデントの修正
1.0.3 CSS minification added
added tabular, new haml and sass bundles
Fix missing yield in _server_version().
http_status should be http_code.
Merge pull request #10 from jerith/transport-fixes

Transport fixes
Merge pull request #12 from pfote/master

support for bucket.head() metadata request
Fixing link header bug. #13
Stray line
Sorry, that's just fucking broken
Clean up tests
Fixes Solr search API
Merge branch 'master' into pbc
+ delete()
+ better pooling support, idle connections will be dropped after some time
Push version number
Merge remote-tracking branch 'pfote/pbc' into pbc
+ minor bugfixes, better debug
Merge remote-tracking branch 'pfote/pbc' into pbc
Merge github.com:calston/riakasaurus into pbc
+ bucket.head() method (dont retrieve content, only metadata)
+ added PB timeout handling
Merge remote-tracking branch 'pfote/pbc' into pbc
Removed CocoaAsyncSocket submodule.
Moved iPhone app from phone_apps to root directory.
Re-added CocoaAsyncSocket submodule.
Made error code finding a tad more robust
Fixed subscription JS view conditionals cf. #66
panel-volume: fix bug in setVolume on device, stupid me
Reset mechanism fixed
Make sure CSRF token is set at the share form
Update recipe format.
Updated deBlog.
Removed unnecessary parentheseses
Added .cache to ignored files
Merge branch 'master' of github.com:nfrankel/More-Vaadin
Size up vote count, size down answer count according to screenshot.
Moved folders to /web/
Moved folders to /web/
fixed wrong definition of is_irreducible
something not working here ...
Added Pages Controller
Finish pages
Modify zh-Hant xib
modifica admin per brand
img class thumb, first-child
pulizia campo Place in editing annuncio
form insert ad - clean Place
next e prev in ad_detail
Merge branch 'master' of github.com:ninjabit/Fotomercato into iscape/ecom
added googleverify as distinct route
Figures out how to asynchronously call audio,
but still need to figure out how to incorporate end events
etc
make file-read operations consistent with creational operations
testing with input images
addStock
pag e consult quase pronta
some optimization in hud simplex coloring code
implemented ping module, improved console
We aren't providing food
Add <title>
Better integration into the activity lifecycle.
Javadoc tweak.
Disabled log debug output.
changed method name for conformity across APIs
revised latin america hover
build release.v5
optimization: Use tail-recursion in stepStmt
NXP-9400: skip subdirectory update if entry doesn't exist
NXP-10253 Make LDAP Server Cert verification optional
Merge pull request #5 from ron1/feature-NXP-10254-ldap-verify-server-cert

NXP-10253 Make LDAP Server Cert verification optional
Changing getMimeType to return application/zip if the bag's format scheme is zip
Correcting check for existing sequence
Added styling for figures and subfigures

No buttons for creating them yet but they can be pasted in from other
webpages
Cleaned up styles. Brought back "collaborate" button on demo
PubSub correctly works with functions, atoms, and workers
pubsub order of args corrected
add1.cpp typo fix 2
fixed all the other bugs
added integ
Merge branch 'master' of https://github.com/omarhernandez/public
Redundant output
added default-currency patch to the parser
qt4: Drop 4.7.4

We have 4.8.1 now and 4.7.4 is obsolete.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update notes for submitted changes

* Service API Documentation for luna-prefs
Refactor name validation in order to allow renaming clients
Simplified name checking code
Fixed test failure for clients
Merge pull request #8 from opscode/dt/OC-2550/client-rename

Dt/oc 2550/client rename
ensure jenkins-node ownership is set on /opt/chef-server
add jenkins helper scripts for killing and testing chef-server instances
grr...HULK HATES trailing whitespace.
ensure server-test script has locale set properly
arreglado test
adds a cname
install chmod
Make readme look decent on github.
Updated code to work with Xcode 4.5 and Openframeworks 0073
Initial commit
second commit
first commit
lots practice
folder maintenance
first tests for coverage paths
remoteerror tests for remote AAL
tests for errors in remote adapters written
Merge remote-tracking branch 'remotes/ask/remoteerrors'
fix a counter issue, and remote-ise user_info.pig
first change after push to master
only readme
readme at origin
Update 1.[Doubly Linked List] Addition and Subtraction.cpp
First implementation of a menu.
Not yet functional
Commit before un-staticification of TMap
Bloomberg scraper
Add small tag to typography default styles
Replace all the stuff.
fenetre scores
Merge branch 'Development' of https://github.com/pcaillou/InnovNation.git into Development
countdown goin up
add no support for ie in README
add some clarification
fix typo
fix bug in counting max radius
height for container
add one file named newfile
Please use this template when adding new examples.
defconfig: ics: p4wifi: set DHD_ENABLE_P2P
Made django
Corrected type error in is_error?();
Backed out bug introduced to rx() by last check-in
Friends/Usage SWT admin window now working
eee commit
eee commit
Merge branch 'master' of github.com:piotrjastrzebski/BSc
Merge branch 'master' of github.com:piotrjastrzebski/BSc
Merge branch 'master' of github.com:piotrjastrzebski/BSc
Merge branch 'master' of github.com:piotrjastrzebski/BSc
After crash
After crash2
After crash2
From Laptop to PC
fix pinger
updated gemfile for Heroku with pg
customer can now see total price of basket
remove useless test
Merge pull request #2137 from nashby/indifferent

remove useless test
Adding symbols only on validate
Checking required fields on lockable
Fixing lockable to use the correct method
Merge pull request #1716 from plataformatec/validate_symbol

Validate is now a boolean function and unautheticated_symbol returns the symbol
update CONTRIBUTING.md
Merge pull request #1963 from shime/master

update CONTRIBUTING.md
remove dispatcher actors
cleaning a bit execution context import, and added it to java
fixing scalax.io duplicate dependency issue related to Console

giter8 is pulling in and also depending on an older version of scalax.io (0.4.0) API. Having both 0.4.1 and 0.4.0 versions on the console's classpath was causing runtime exceptions when creating a new project with `play new`.

My first idea, excluding scalax.io from giter8, did not work unfortunately (since giter8 is relaying on the older scalax.io API).

So for now I just downgraded the scalax API in the Console to the previous version (0.4). We should be able to upgrade back to 0.4.1 once giter8 moves on to the new version.
Upgraded to ebean 3.1.2
Merge branch 'master' into breakup
Fix the default timeout for the WS
Update queue so that we can emit messages using puppet apply.
Posts show fix.
Posts show fix (priority added).
Replace post priority with important flag.
Csv import update (supports replace).
Post supports dates in "m/d/Y H:M" format.
small fixes
small fixes
Merge https://github.com/polatolu/version-ios

Conflicts:
	README.md
正規表現の間違い修正。
Added validation to renaming devices.
Added validation to swap devices (check active/inactive targets).

Added logoutSuccessHandler class to clear cache on logout event.
Fixed issue with deativating a device no removing UserCoupon entries in
coupon_user_map.

Validating coupons will now check "isApplied" along with the existence
of an entry in coupon_user_map.

Views for adding payments now use TreeMap in Config for listing
states rather than hardcoding the states.

Added new view for redeeming coupons when no devices are active.
Admin and SuperUser level users can change password and emails without
prompts.
Notification ni
show系のページでも使用できるようにしました
notification クラスが overflow: hidden に設定されるようになったため画像が表示されなくなってしまったので overflow: visibility になる CSS を書きました
ヘルプの概要について多言語化に対応しました
Added Autofac WCF integration, added WCF service, added data provider manager
Added web framework test project and added an event test case
Show the categories in a line
update lcd.rb and name lcdclass_update
Merge branch 'master' of https://github.com/pracstrat/Internship
- Апдейт
- Ночью словил краш..

Signed-off-by: privatecore <rial9111@rambler.ru>
Improved zone parser.
Moving commons-codec to ERJars
update to commons-lang-2.6
Add total for CARC Amount
Add message if there are no locations, remove lat/long
Adding a pagination example and an explanation of require an exact URI match to the streams plugin loop docs.
Merge branch '2.1' of github.com:pyrocms/pyrocms-docs into 2.1
Merge pull request #43 from pyykkis/dont-match-to-element-name

Don't match to element names
In-place directive manipulation support
Merge pull request #51 from miohtama/in-place-manipulation

In-place directive manipulation support
Merge branch 'master' of github.com:leonidas/transparency
pg2
yml
add CEHttpRequest, CEHttpOperation, CEHttpResponse
init
init
Ausfürhliche Beschreibungen
Recordind to wav with the double tap.
Last commit was not complete.
surveys user require
Site updated at 2012-04-03 00:30:21 UTC
update layout and posts
Merge branch 'source' of github.com:rach/rach.github.com
Added incProgress() and updated java doc. I removed all the
exception throwing - incorrect method calls (eg. setCurrentVal()
on an intermediate instance) will just return. I also added a
build directory (javadoc and jar).
Merge branch 'master' of ssh://github.com/radmoore/ProgressBar
Updating all submodules to the latest
Forgot to remove Command-T from bundles. Removing.
bla
remove command-t for CtrlP
add webapi-vim as requirement for gists-vim
initial GitFighter commit
Update posts/2012-05-04-pinkify-jquery-plugin-released.markdown
three
first
bootsrapping UI
font https
zxcv
wahaha
Merge branch 'master' of github.com:raphael0914/wishPlus
ha
Fix bug in keydata_alloc()
Rename key cache field.
Move general macros in dnsmasq.h
Explicitize the context of verification algorithm.
Refactor to use new VerifyAlg context, and start implementing logic for querying DNSKEYs.
Macros to simplify tentative parsing.
extract_name_no_compression: strip trailing dot.
Start parsing DNSKEY records and insert them into cache.
Add function to extract algorithm number from context.
Fix argument in dnssec_parsekey() call.
Before using a key for validation, also verify that algorithm matches.
Postpone RRSIG processing after all DNSKEY/DS have been parsed.
Skip non-signing keys
Change some logging messages.
Insert all DNSKEY/DS records into cache in one transaction.
Call valg verify functions (unimplemented for now)
Rework the loop a little (no functionality changes)
extracted original octave 3.4.3
array_merge session config
return false when deserialize failed
Update permissions for this file
Check for null before deferencing.
Move jython initialization to env var instead of a table property.
Added a script to load/transform datafiles.
Changes
Changes
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Changes to date
Changes to date
Changes to date
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Merge branch 'master' of github.com:readywater/Tributary
Green to RED when < 50% funded
added reference to new tests
rearranged calculation of gisans, and moved subtraction of avg sld out to a separate Fourier transform of the bounding box with sld=-avg_sld
desabilitando utf8 rest para teste
Add a new mach_inject demo project
Merge pull request #3 from erwanb/mach_inject_example

Add a new mach_inject demo project
New autocomplete version of search form; initial working version
wsuser search form simplified and with just one #ahah
Forum Block update. Done and done. For #57
Override message theme function to alter html
Add message styles for status, warning and error
remove randomizing
support handling table events
adding new script that uses netcat to transfer files between nodes
changed version to release development: 4.2.2-SNAPSHOT
kitchensink: Pulled in latest quickstart changes
changing version to 4.2.2.Final
changing version back to 4.2.2-SNAPSHOT
fixed showMessage on iPhone

Conflicts:

	kitchensink/src/main/resources/archetype-resources/src/main/webapp/resources/js/showMessage.js
Changed the enterprise RichFaces version to the community version
changing version to 4.2.2.Final
Merge branch 'release/4.2.2.Final' into release-develop/4.2.2
changing version to 4.2.2 development 4.2.2-SNAPSHOT
changing version to development 4.3.0-SNAPSHOT
Merge branch release-develop/4.2.2 into develop
RF-12199: rich:tooltip does not work inside h:graphicImage
RF-11370: Metamer: rich:toolTip: targetted example causes NPE for some IDs
RF-11294: added console log mode for a4j:log
RF-12196
RF-11970: Ajax event create exception on form submission when defined on dataTable inside that form
RF-12084: Richfaces 4.2 <a4j:ajax> when inside <ui:fragment> dont work and causes 'identifier resolved to null'
RF-11821: Passing state to walk method in encodeMetaComponent to make rowClasses work.
Docs update
Bumping up the RightJS version number
Added disqus.
Built project.
Merge branch 'master' into gh-pages
I think we basically have this video thing down.
Moving to hd, making manifest only include large 3.0+ devices
adding 2.3.0 exports
Site updated at 2012-09-08 03:02:14 UTC
[M,W] style implemented; days and times can be seen together or on their own
beginning to write the rewrite rules for AST
adding in backbone love - changing up the API.
updated the severe settings
added in new copy
updated names of enums
updated enum nmae
drawing the background colours no the graph
moved the advice data out of this
added in copy
tests running fine for mysql
changed includes
changed includes
changed includes
Fold in rb-trace(hook) C extensions. Update to p327.
Add basic code for managing and viewing housing applications
Merge branch 'master' of github.com:rollaccf/ccf-website
Add a basic housing application completion page
Added criminal activity field to the housing application
Center and enlarge submit housing application button
Fix firefox rendering of housing application
Fix layout on manage housing applications
Add notes to housing application viewing
Format to content out the housing application output
Format the housing applications list a bit better
Fix background gradient
Remove useless to_dict calls
Remove slide url prefix
add fatal_error handler to the BaseHandler
初始化项目

1.初始化项目；
2.建模；
3.SQL Helper；
One step back for preparing and understanding how to prepare feature
Roman Numerals - looking better after introduce digit to determinate the substring value for diff key length
Rebase from 'release/rviz' @ version '1.9.12'
Generated debian files for precise
update
delete readme
cal_weight.pl(normalize at each node), influence.cpp(add function to calculate each node independent expected potential).
Merge branch 'master' of github.com:rt77789/dblp_circuit
alfa 2.a - 22 Aug 2012
test: don't clear all text domains

It breaks other tests...
Add missing LGPL header
Add missing require for rmsginit
PoParser: convert msgstr from "" to nil when parsing
MoFile: convert msgstr from "" to nil when only binary .mo file is loaded
more idiomatic
don't cache mutable objects
default frame should not assume iphone
cgcolor helper for a more idiomatic sugarcube
Merge branch 'master' of github.com:rubymotion/sugarcube

Conflicts:
	lib/sugarcube/uiimage.rb
assign sugarcube_view no matter what is being adjusted
Symbol += UITableViewCellSeparatorStyle
0.12 was short lived!
Actors in Rubinius
UITableViewStyleGrouped for DocumentManagerTVC replaced by UITableViewStylePlain.
Added searchBar.
Updated layout along with a bunch of other things
Changing color scheme in variables
Formatting changes.
Increment to version 1.3 + build against 1.3.1-R2
Update resources/gem.rb
Statics working
Tweaked error reporting; fixed indentation bug.

The call stack wouldn't show the current line in the "main" unless there
was also a function on the call stack. Also, indentation was ignored on
the first line since I only parse indentation when there are newlines,
so I fixed it by adding a newline to the beginning of the file and
offsetting the line numbering by -1 to compensate.
new stylesheet added and templates changed
Start plumbing ocplib-endian through
Update test suite to run in native code
Do not display paquet content (just parse the packets)
Add SSL in prodo
merged pull request https://github.com/debasishg/scala-redis/pull/16 by @mwdavis
added idea plugin
added twitter resolver
publish command should return number of clients which have received the msg, ignoring it was causing protocol error for every command after that
Merge branch 'master' of git://github.com/debasishg/scala-redis
basis of ontology 'sudo micro new physics; micro physics 10;'
height width pic
Ugahupu Ninakiv
* Заготовка для работы с масштабируемыми силуэтами.
refactor ipaddress define to allow inet and inet6 interfaces
Update translations
Fix a typo
[Single] Estilos CSS para listas y video
[Page] Template de paginas agregado
binary tree is difficult to understand
readdir and rmdir are added
Strikethrough color schemes that don't link to real files yet
Get more specific with post:target
Current state

Need to go to university. Finish it there.

Signed-off-by: Matthias Kluth <matthias@kluth.me>
Parsen des searchStrings vereinfacht
Fehlermeldung "Kein Javascript" hinzugefügt
Merge branch 'master' of https://github.com/sebastiankluth/MCCRM

Conflicts:
	public/js/app.js
Using Theirs
preparing to accept seed objects in treeview
22dec2012 : tag 1 nach dem weltuntergang nachschlag
Allow merging of data of different days
Improvements to TimeRange.
Prevent circular import.
Improve timerange.
Remove redundant comment.
Merge pull request #188 from segfaulthunter/timerange

Improvements to TimeRange.
Bugfix.
Updated tox and setup.py to use pandas 0.8.0 in order to avoid issues relating to timezone support in 0.8.1
Merge pull request #193 from khughitt/master

Fix build failures
Merge branch 'master' of github.com:sunpy/sunpy into specmap

Conflicts:
	setup.py
animal table
Merge branch 'master' of github.com:sevenfold-IS2011/zoo
modifica utente finita
update the deploy
Temporary files created by vim will be ignored.
default empty language resource to default messages
Model basic user and posts
add created_at to projects
wip
complete
tweaks
setup re-direct from resume
all CSS editors with UI and logic
debug CSS editors
links and link editor
link editor, prevent leaving page accidentally, fixed css properties with "-"
fixed insert menu layout after drop, added browse after drop media, silexlink instead of linktopage in templates
default length unit is px
fixed multiple urls editor
refactored call to file browser and text editor, fixed relative and absolute url convertions for firefox only
fixed toolbox styles, updated to new brix version
tests and bug reports, fixed background position, fixed page selection lost after save
z-index should not be %, save a copy bug, visual effects, cursor, not pluged with the library, add a loading page by default, change the name of the initial page should change the meta
change the name of a page should change the links
removed useless test
fixed application init when disableEmbed
fixed absolute => out of container, no more clickable
Merge pull request #31 from lexoyo/master

work in progress
date add projection
tried to fix UITextLayer on 10.8, failed
updated INSTALL
Changed table schema for table sahi_jobs
Modified README to include important credentials
Added some comments describing what this file is
handle db close
fix 'k => iao'
Added new methods from data conversion
Added widgets/breadcrumbs/breadcrumbs.js and widgets/imagecombo/imagecombo.js
fixed.drop_down.overlap.issues
Hibernate demo done
ignore.
Merge branch 'refs/heads/master' into dev

Conflicts:
	engineclub/apps/engine/analytics/templates/analytics/analytics_detail.html
added simple bar chart to analytics detail.
2012-03-29_10-31_1332988308
2012-03-29_10-41_1332988860
used wrong parameter format in get route
Partial implementation of visitors list removing items
Minimize use of jersey support classes for provider muck
linux: consolidate os_ip4_tunnel and os_ip6_tunnel

the code was almost the same, so merge the functions

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
linux: name is required to be non-null in olsr_os_cleanup_iptunnel

Mainly to get rid of TUNNEL_ENDPOINT_IF and TUNNEL_ENDPOINT_IF6
usage here.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
linux: rework usage of defines w.r.t. IPv6 tunnel

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
node api start
node.js api basically ready right
minor doc changes, need to add more
changed package.json a tad
fixed json bug
getting rid of annoying ~files
Merge branch 'master' of https://github.com/sonofabell/leftronic
Added some styling to order summary
CC-4056: Add Show -> Prevent shows from overlapping

-done
CC-4069: Edit Show -> cannot edit show

-fixed
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
cc-4292: Removed unnecessary code related to md5.
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
CC-84: Smart Playlists

- subforms now open and close on the click event
- fixed add and remove criteria to work with new subforms
CC-84: Smart Playlists

- removed criteria subform and reverted back to original criteria options design
CC-84: Smart Playlists

- remove subform and combined back into one form
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu

- fixed
Resolver::resolve() uses Str::classify() to determine class names

Signed-off-by: Joe Wallace <joew@atiba.com>
Model::table() uses class_basename() helper - which properly discards namespaces on *nix systems

Signed-off-by: Joe Wallace <joew@atiba.com>
Fixing bug where custom validation messages in bundle language files were not getting picked up.
Merge pull request #518 from joecwallace/eloquent-model-table-basename-fix

Eloquent Model::table() bug fix
Merge pull request #522 from kloy/master

Custom validation messages in language file fix.
Merge pull request #517 from joecwallace/migrate-resolver-classify-fix

Resolver::resolve() bug fix
return after loading mapped class in autoloader.
Merge pull request #512 from Mikaweb/patch-1

Misspelt word corrected!
incremented version.
Merge branch 'master' of github.com:laravel/laravel
Merge branch 'laravel'
don't try to parse empty install_requires
add empty fork
size lower
Implement diffusion and xor. Remove practically-pointless verbose flag.
adding tests for admin work
Removed netbeans.
[#108] Improve drag/drop reorder of items in manager by supressing refresh
Implementation of an Issue #147
fixed test case and added new one, commented out metasploit integration case as it cannot be handled easily
Update helpers/pcms_accounts.rb
more blah bla
new knxproj

name + temp2min
php aggiornato con nuovi comandi e get not post
Let spare test pass. Let rspec use colors
Fixup tags.

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
Streamlined Exception handling for server communications
More logs color tweaks
Change search and replace to leader-s
Ignore AlignMaps
agrega mante para stores y products
w3c validated
adding css styling to page
V1.515 Fix bug in mask apply/add buttons. Add linux files.
Merge branch 'master' of https://github.com/stmudie/scatterBrain
Converted tabs to spaces, and changed bracing in a couple of places.
Update calendar schema.
cleanup seed.
Add settgins and setting UI for google API app info.
Google auth implements.
Show flash message.
Add twitter bootstrap.
Merge branch 'master' of github.com:sugi/vocalendar-core
Merge branch 'edge'

* edge:
  Add twitter bootstrap.
  Show flash message.
  Google auth implements.
  Add settgins and setting UI for google API app info.
Externalising port configuration.
update pre/code styles
Clean up the footer a bit
Move all javascripts to the bottom
suppression d'un printf
commit rapide, version tres instable
(/!\ segfault a la suppression d'un port)
- IO Impl now creates CyGroup objects when loading sessions or importing XGMML; also prepares all groups for serialization when saving CYS files or exporting to XGMML (still buggy, though).
- Fixes #1379 (XGMML Export: Hidden attributes not exported).

git-svn-id: http://chianti.ucsd.edu/svn@30231 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Fixes #1093: Removed strongly typed lists from API

git-svn-id: http://chianti.ucsd.edu/svn@30305 0ecc0d97-ab19-0410-9704-bfe1a75892f5
[maven-release-plugin] prepare release api-parent-3.0.0-beta2

git-svn-id: http://chianti.ucsd.edu/svn@29869 0ecc0d97-ab19-0410-9704-bfe1a75892f5
[maven-release-plugin]  copy for tag api-parent-3.0.0-beta2

git-svn-id: http://chianti.ucsd.edu/svn@29870 0ecc0d97-ab19-0410-9704-bfe1a75892f5
[maven-release-plugin] prepare for next development iteration

git-svn-id: http://chianti.ucsd.edu/svn@29871 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Remove extra String in the format description

git-svn-id: http://chianti.ucsd.edu/svn@29842 0ecc0d97-ab19-0410-9704-bfe1a75892f5
#1466

git-svn-id: http://chianti.ucsd.edu/svn@30398 0ecc0d97-ab19-0410-9704-bfe1a75892f5
#1466

git-svn-id: http://chianti.ucsd.edu/svn@30399 0ecc0d97-ab19-0410-9704-bfe1a75892f5
#1466

git-svn-id: http://chianti.ucsd.edu/svn@30400 0ecc0d97-ab19-0410-9704-bfe1a75892f5
added initial files and directories
changed it to press space bar to start a new game instead of clicking
Fixed minor code examples issues
Merge pull request #2045 from WouterJ/minor_fixes

Fixed minor code examples issues
[book] Fixed every inconsistention find in quick proofread
[Book] Tweaked API class link
Updated images for the new profiler/web debug toolbar
Deleted welcome.jpg and replaced it with a PNG version
[quick_tour] Added note about the new toolbar and updated image link
removed references to the PEAR channel as it should be considered deprecated (Composer is now the de-facto much better standard to manage dependencies)
[Cookbook] Adding a note about optimizing the class map autoloader thanks to @Stof's suggestion
Correcting potential typo

Found in optional step #3: twig vs. php template is inconsistent in body-part
body -> _content in PHP-Mode
Merge branch '2.0' into 2.1
[deploy] Adding note about needing to dump asset independently of clearing cache in 2.1 - thanks to @Stof
Merge pull request #1852 from fabpot/pear-removal

removed references to the PEAR channel
Correct input checkbox render as

Checkboxes render as `<input type="checkbox">` not `<input type="text">`

This typo exists in all versions of the docs 2.0, 2.1, master.

Thanks!
Merge pull request #1875 from johnkary/patch-1

Correct input checkbox render type
Links to components on packagist
Fix: the names of the packages
Merge pull request #1798 from WouterJ/syntax_checks

[book] Fixed every inconsistention find in quick proofread
[#1798] Minor tweaks after a bunch of consistency and format fixes
Merge pull request #1800 from WouterJ/updating_profiler_imgs

Updating profiler images
Merge pull request #1877 from gajdaw/packagist_links

Links to components on packagist
New Features!

It's time to get excited!
Updated Readme with output.
Added current user support

When adding/editing/deleting/restoring projects user actions will be
saved as: createdBy/created/changedBy/changed.
Added milestones support.

Milestons can now be added, closed, opened, deleted, restored.
added up-down-up sanity checking and -r option
Problem validating credit cards.
Got partway through the validate credit card assignment.
Added SubzoneOwnerChange field and pushed to 20, also did more translation of help files
Published at Sun Mar 18 20:15:32 JST 2012
adding arduino sketch that simulates the master TWI controller for the
tiny
viitteiden listaus EasyB
コンフリさせる
Merge branch 'sakaihara-0001' into develop

Conflicts:
	abc.txt
+ ‘nuovo file’
< ‘nuovo file’
> ‘ciao-ciao mare’
- ‘ciao-ciao mare’
- ‘gattoduro.txt’
Moved files to make repository more friendly
removed mongo support
org-html5presentation.el
s5 xoxo presentation framework files
s5
s5
s5
s5
pie chart.el
contrib-functions
rm create-shells.el
load slime
don't load elget!!!
keybindings
s5 presentation in org projects
org remember templates
settings
org-redmine recipe
spawn-shells command
Implement water scheduling
tightened delays
use latest bukkit version available.
Finished the answer sheet
Updated CC, fixed ES (Hopefully) and added KMS.
- Created BasicBlocks class (replaces List<BasicBlock>)
- Added Mosa.Test.Compiler.Framework (for unit testing)
- Worked on Loop Detection (incomplete)
fix BUILDARGS - this should always be a method modifier, not an override
prompt for the password, if --password= is used
Merge pull request #5 from karenetheridge/topic/authentication_prompts

prompt for password
Matched code and documentation
Make scripts work when run from outside code directory
Ignore markdown generated files
Store size of input and output dataset
Added a histogram plot
Widget styling fix
Fix glotpress error
Logo til credits og fiksa på buttonmappinga
Merge remote-tracking branch 'origin/master'
Gotta have a TODO file :)
added tmux-powerline and configs. updated submodules
[UI] Correct toggle check.

Checkbox should be checked if a service is active.
[API, Code, Doc] Rename some methods and improve docs.
Add desktop control menu to the indicator.
Adding mailchimp_activity_entity_access().
Core/Battlefield: Cleanup
make it work with mozilla too without flash
Require Active Model for the validator
[#5] Add Code Review trail
Adding testfiles
Adds Rakefile to apply all xslt files on the testfiles.
Added example for Adafruit joystick
plays complete from pygame
Version 1.0

1. Support Tencent Weibo and Renren
2. Bug fixes
add rake test task backend 
change travis setup
Mockup Page 4, BandBase Signup
fixed type for cellular network type. fixes issue #352
added recent method
Added message for when the reset button is pressed

void mousePressed() {
  if(mouseButton == RIGHT)
    reset();
   if(mousePressed && mouseButton == RIGHT)
     msg("Resetting the sensor");
}
idea for prune
proxy setting need http:// prefix otherwise git will err
update to chef 10.14.4 release, update test-kitchen and use latest foodcritic
GH-1: update getting started guide for setting up the chef server via knife-server plugin
removed connection string in EF contexts constructor, caused problems with publish
added team members
eh
Update accelerate-io to avoid repa problem
parameterise {,un}index{1,2} to integral types

this is to make the functions easier to use with segment descriptors, which also range over integral types.
add 'null': test whether an array is empty
fix segmented scan family

The key missing feature here was support for zero-length segments. As soon as one of these was encountered, the rest of the data would be thrown out of whack. To counter this, the flag arrays that mark the start (or end) of each segment can now contain not just zero or one, but non-unity values that mark the start (end) of several empty segments. The remainder is fairly standard, although still required a rewrite.

fixes AccelerateHS/accelerate#44
Updated location type spelling
Working on bids stuff
Ajax prototype, some changes to index.html
Merge branch 'master' of github.com:tnaumann/PosterBoard
jax prototype, index.html update
Adding head info
Updating the action for adding a poster.
Adding HTML5 upload-with-preview raw from http://www.script-tutorials.com/pure-html5-file-upload/
Improved Context.
Removed MockRequestBuilder's dependency on HttpHeaders.put()
Removed RequestResponseMappingBuilder's dependency on HttpHeaders.put()
Removed addHeader call from MappingFileWriterListener
Removed addHeader() completely from ResponseDefinition
Removed put() completely from HttpHeaders
HttpHeaders now properly immutable
added additional server
Finally have private messaging functional.
Update gamescraper.py
Added skeleton for Alerts
Get more information about the alerts on a device
List Device groups
Refactor into an event based model, and use a Portable Class Library as the build target. Remove dynamic references and use JSON.NET Linq to JSON
update source code for cross-platform distribution ;)
add 15 and 45 to test fizzbuzz
commit file source code
Fix adding builds to a build list on pusher event
Fix build link when updating builds through pusher
Don't add repository on worker events if it already exists

It's best to do that, because worker payload is usually outdated. If
there is no info on repo yet, it's worth to add it, but if it already
exists, we will most likely end up with inconsistent situation.
payload.job.id is not always present in worker:updated event
Handle case where key on data needs Ember.set

I'm not really sure what cauese a field to be defined as such setter,
but it sometimes happens.
Check also associations for incomplete records
BUILDPACKS!
Change buildpacks
Move rakep and dependencies out of development
AssetFile -> Assetfile
Ignore only top level assets directory
Keep assets dependencies in assets group in Gemfile
Don't ignore assets directory when building slug
Set encodings to UTF-8 when compiling assets
Remove console.log entry
Use isComplete on build page to not show incomplete record
Merge branch 'deployment-plus-plus'

Conflicts:
	assets/scripts/lib/travis/expandable_record_array.coffee
	public/scripts/app.js
	public/scripts/min/app.js
	public/styles/app.css
	public/version
Remove compiled scripts and styles from repo
Remove public/version from git
better handling of disconnects
Updated MCB Recommended plugin
Implemented basic menu.
Added base files
cleanup of which & path
cleanup stray env
Adding a more robust version of the pyline script found on activestate
Update iap/launch/iap_kinect_2d.launch
update logs for: 2012-06-19
Fehlererkennung verbessert
Upload for the results of experiment 3
Restores custom forms code that was accidentally deleted in a past commit
Fixes copy-paste error in previous commit
Update custom forms code in teacher quiz module to match Spring 2012 improvements
Switch to non-wizard custom form rendering template on teacher quiz
Comment out console.log() lines in csrf_check.js

This may have been causing Javascript errors (and hence halting execution)
in some browsers, ironically leading to CSRF problems.
Remove duplicate ID attributes on fields in loginbox_content.html

This may have been confusing some browsers and causing Javascript errors,
especially on the standard login page (which has username and password
fields, so the IDs were no longer unique).
Avoid returning 'none' in {% getBooleanTag %}

When the use_rapid_approval Tag doesn't exist, this would cause "if (none)"
to be written into Javascript, leading to an error.
Replaced ADMIN_MEDIA_PREFIX for Django 1.4
Fixes to clearing AJAX schedule
Makes AJAX schedule clear callable from shell
Fix StudentLunchSelection module to use abstract inheritance
Merge pull request #407 from gkanwar/ajax_ui_fix_10_12

Fixes missing arrow assets
Merge branch 'stable-jul12' into main
Admin Panel: added filtering and sort-by-title to the class subject page
Tweaked admin-panel StudentRegistration search to include usernames and class (section) titles
Useful Script: help admins export large amounts of encrypted data from Formstack
Clarified documentation in formstack_download.py
Admin Panel: filter by program
Added financial aid auto-approval script
Merge remote-tracking branch 'lu/main' into main
Merge -r 1396971:1396972 from trunk to branch-2. Fixes: YARN-146. Add unit tests for computing fair share in the fair scheduler. Contributed by Sandy Ryza.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396977 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1397182 from trunk to branch-2 to fix MAPREDUCE-4616. Improve javadoc for MultipleOutputs. Contributed by Tony Burton.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397183 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3912. Merging change 1397211 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397219 13f79535-47bb-0310-9956-ffa450edef68
Merge pull request #34 from acandael/patch-8

corrected some typo's, made a sentence better readable
fixed bugs in exampleCanvas
Merge pull request #45 from torutoru/master

Bug fix in exampleCanvas
Try to avoid empty restaurants in listing
Added config option for damage amount
Make it clearer when tweets displayed have have been retweeted
updated alphahull including error handling
realign analysis tools button/help
move reset password link into login form
added large 'create project' and 'view projects' button to the front page
KDE4 screensavers and liquidwar6
/ ‘kickstarts/fusion-17/fusion-livecd-desktop.ks’
Fix disable subtitles at VLC tab
Fixed and updated Hebrew translation (thanks, zvi-yamin!)
Updated CHANGELOG
Updated Hebrew translations (thanks, zvi-yamin!).
This counters the ltr inside pulldown menus.
See: http://www.ps3mediaserver.org/forum/viewtopic.php?f=4&t=14128&start=10#p68634
#408 scrollspy fix
Fixed hashing algorithm bug.
Merge branch 'master' into develop
Fix multi-delete permissions for discussions and comments
Merge branch 'hotfix/multidelete'
Merge branch 'master' of github.com:vanillaforums/Garden
Merge branch 'master' of github.com:vanillaforums/Garden into develop
Add some exception handling into the timezones.
Added the Category() function to get the current category at a certain level.
Add event: AfterGetCssFiles
Fix tabs
Always check for sync'd roles on trusted connections.
Specify the application on the guest module.
Merge branch 'master' of github.com:vanillaforums/Garden
Fix bug in IsUrl().
Use IsUrl to check for urls instead of regex.
Confirmation email bug didn't resepect external URL formats.
Merge branch 'master' of github.com:vanillaforums/Garden
Whitelist comment counts against private communities.
Merge branch 'master' of github.com:vanillaforums/Garden
Fix typo in comment count regex.
Make gravatar images load https versions properly.
Fix embedding for https.
Change Facebook avatars to use a schemeless url.
Merge branch 'master' into release/2.1b1

Conflicts:
	applications/dashboard/models/class.assetmodel.php
	library/core/class.format.php
Fix bad merge.
"Fix" request flow links/includes

- Request flow graphs are now included in the tar-ball
- The links that were originally used by S5 are removed.
- The front page of the slides are "fixed"
Update NEWS
S3 WEB: Better usage of the partial views for title, table header, table row, clickable image
S3 WEB: Add DI for HomeController
S3 WEB: Remove ProfileFilter since the base class uses this attribute already.
S3 WEB: Start using thte new IFilterProvider that injects dependencies.
Adding 2 more solutions.
only broadcast if site is down after retrying a few down
Added method to handle the picture stuff
第22回分追加
update deris's tech talk.
Merge pull request #5 from deris/deris

update deris's tech talk.
Added JavaDoc.

Signed-off-by: vince-d <vincent.diener@gmail.com>
Fixed bug where ecplipse wouldn't compile.

Signed-off-by: vince-d <vincent.diener@gmail.com>
Fixing crash when info file was specified but didn't exist.

Signed-off-by: vince-d <vincent.diener@gmail.com>
removed a dead div from the views
removed mouse-wheel zoom
merge conflict resolution
Merge pull request #190 from vincent-gros/master

updating epub_content packages
oops i messed up a merge conflict this commit fixes it
images and svg in spine both hooked up and working tag issue #176 and issue #177
Merge branch 'master' of github.com:readium/readium
added the delete button back in to the details modal
Merge remote-tracking branch 'upstream/master'