labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #4 from fabilocky/master

vuela!
conexion cambios
Merge branch 'master' of github.com:gonzakpo/TPBaseDatos
mas cambios
Merge pull request #5 from fabilocky/master

que te haces el pesado jaja
Merge branch 'master' of github.com:gonzakpo/TPBaseDatos
incluye index menu y 4 consultas
crud a 2 manos
mkinitcpio: protect module install on $MODPATHS

This was always wrong and should have been braced by MODPATHS rather
than ADDED_MODULES. However, since ADDED_MODULES now possibly contains
modules that weren't actually added (builtins), creating an initramfs
without modules causes cp to be passed a null string to be copied.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Fixed a bug where validates_as_unique wouldn't properly convert custom types using the to_mongo hook.
Added plugin for storing extra fields with the in_array proxy.
Haven't yet included any tests for this.

To use pass :fields => [:foo, :bar] in combination with :in => array. 
e.g.

class Person
  include MongoMapper::Document
  key :name, String
  key :birthday, Date
end

class FriendList
  include MongoMapper::Document
  key :stubs, Array
  many :people, :in => :stubs, :fields => [:name]
end

friends = FriendList.create
friends.people << Person.create(:name => 'Steve')
friends.stubs # [{:id => ObjectID(###), :name => 'Steve'}]
Silenced debugging messages. Oops!
Patch to fix a bug with _id vs. id property.
Patched in_array_with_fields so that it attempts to convert to mongo, not a really great fix, but it works for what I need right now.
Swapped key _type for _rbclass.

This is a temporary solution to a backwards compatibility problem. A lot of our older data uses MongoMapper 0.7.0 which did not enforce the _type key being used only for Ruby typecasting. Some of our new code relies on polymorphism and there isn't currently time to migrate all of the new code forward and properly test it.

There is a sibling repo for Plucky that has also been updated.
https://github.com/vuze/plucky
Updated version number to indicate forked gems and make Bundler work properly.
Merge remote branch 'jnunemaker/master' into tmdb
prevent errors in many embedded docs

Prevents error: undefined method 'map' for nil
initiated by interactions between different versions of models
save bang on edocs should not just call save
use our plucky since we depend on changes to it
add valid! for edocs, since save! is stil problematic
Merge branch 'master' into tmdb

Conflicts:
	Gemfile
	Gemfile.lock
	lib/mongo_mapper/plugins/associations/base.rb
	lib/mongo_mapper/plugins/embedded_document.rb
	lib/mongo_mapper/plugins/validations.rb
	lib/mongo_mapper/version.rb
	mongo_mapper.gemspec
	test/unit/associations/test_base.rb
	test/unit/test_embedded_document.rb
re-apply SCI fix to new association hierarchy
remove in-array-with-fields
add tests for validates_associated
avoid deprecation warning from ActiveModel::Errors#generate_message
Merge branch 'master' into tmdb
bump version, so other projects can pick up change
Default to empty hash if there is no config for the environment
Fixed JENKINS-12216: Rake/Ruby build step is not available for other plugins, such as promoted-build and conditional-build-step
Moved project from Subversion to Github
Merged pom.xml
Fixed attempting to assign weaker access privileges
Added intellij to ignored resources
Merge pull request #1 from dieterdemeyer/master

Merge https://github.com/jenkinsci/ruby-plugin/pull/1
Trocando value do campo de busca para buscar no site diveintohtml5.com.br
load config from user's home directory
initial version of function editor #14
Removed snipmate plugin
Merge branch 'master' of github.com:federicobond/dotfiles
07122012
Mascara no CEP
Make development and test default dev environments

It's uncommon to want exceptions to go to Airbrake's servers in development mode and during test runs.
Merge pull request #28 from stephencelis/patch-1

Make development and test default dev environments
�޸��ͻ��˱������⣨����ϵ���Ժ�Ī��������ˣ���
added a RSS feed
update git ignore
Updating the licensing
updating the git ignore to include not committing nupkg files
adding nuget
Culling code done.
remove tmp etc
project tickets added
removed oh-my-zsh
added my own version of oh-my-zsh as a submodule
fixed a user test
require all the fixtures (neccessary to let journal_test.rb pass)
added dependency (mentioned in readme)
Add comments rules, list the bad things.
add Contact page
use let functon of Rspec to refactor spec
Reorganize README with section links.
refs #108507 @2h

Apresentação do curso de PI;
Item11872: Item11884: More blockquote fixes

The last fix inserts a foswikiDeleteMe paragraph,  but TMCE can split
this into multipe paragraphs, and all of them get removed during save.
Only the first foswikiDeleteMe paragraph within a blockquote should be
removed.

Also discovered that you cannot position the cursor above an initial
verbatim / pre block.  The blockquote issue was fixed by expanding the
table tag solution, but this wasn't really right, since tables can be
preceeded by macros that don't apply to pre, verbatim and blockquote
blocks.

git-svn-id: http://svn.foswiki.org/trunk/WysiwygPlugin@14873 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Pushed latest revision 14884
Pushed latest revision 15979
Pushed latest revision 16292
another fix to the exception for the message processor
Merge branch 'issue12'
Add correct instantiation parameters for workspace
Ensure that Atmos driver retains content type information for streaming uploads

Fixes https://issues.apache.org/jira/browse/LIBCLOUD-232
Ensure that path and object names are correctly encoded in the Atmos storage backend.

Fixes https://issues.apache.org/jira/browse/LIBCLOUD-233
- Update to 1.1.3
- fix PORT_OPTIONS s/)/}/


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@303895 aed309b6-a8cd-e111-996c-001c23d10e55
. Fix permissions problems with some of the JARs installed as plugins.
  This is the same fix applied ale@ to java/eclipse.

Reported by:	Olivier Smedts <olivier@gid0.org>
- Update to 2.14

Changes:	http://search.cpan.org/dist/WebDAO/Changes
PR:		ports/172297 (based on)
Submitted by:	Aliaksandr Zahatski <zahatski@gmail.com> (maintainer, from another address)
- Fix LICENSE_GROUPS, the ZLIB license is GPL compatilble but does not comply
  with the Copyfree Standard Definition

Approved by:	makc (mentor), maintainer (implicit)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305273 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 0.8.5

Changes:	https://github.com/joyent/node/blob/v0.8.5/ChangeLog
PR:		ports/170407
Submitted by:	Jin-Sih Lin <linpct@gmail.com> (maintainer)
- Update to 1.0.1
- Remove dependency on audio/libmusicbrainz [1]

PR:		170304 [1]
Submitted by:	Jason E. Hale <bsdkaffee@gmail.com>
Add GPHOTO option description.


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304845 aed309b6-a8cd-e111-996c-001c23d10e55
- Use `pre-su-install' target to unbreak non-root installation
- Switch from checking NOPORTDOCS to PORT_OPTIONS:MDOCS
- Cleanup Makefile header, fix COMMENT text, wrap overly long lines
- Synchronize descriptions and add a note about one port being a helper
  library for another


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305023 aed309b6-a8cd-e111-996c-001c23d10e55
Update to 3.0.1.  See http://netatalk.sourceforge.net/3.0/ReleaseNotes3.0.1.html
for a list of changes in this release.


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305024 aed309b6-a8cd-e111-996c-001c23d10e55
Add patch to fix uuid_create() namespace clash with libc, this affects
at least multimedia/vlc port (crash while checking upnp devices)

Submitted by:   nox
remove total
find product by serial no for repairing
remove_sum_from_products
change detail
add tracking and fix cost
add tracking, add fix cost
Merge branch 'product_system'
add reject status
Merge branch 'product_system'
add delete button if repair status is pending
Merge branch 'product_system'
merged master
fixed repairing
1) BackTrack method works better now... the flow is correct but the vars
do not seem to be getting bound.
1) Added some of the boiler plate code required by compiled program
initial draft of disk open using blkid
add some more disk_open code
add command for retrieiving disk label UUID
now use getuuid to get disk's UUID
Released 1.7.4 DEV
Skip lines and strip leading whitespace
Added rails gem and fonts
Added vimrc to list of files and check for whether or not a given file has a symlink
(boolean?)
fix some typo
Merge branch 'NewQSanguosha' of https://github.com/gaodayihao/QSanguosha.git into NewQSanguosha
add presentation slide show
Added ability to take only some of the rolled dice
idk trying to merge in svn?
Added licenses to files that contain javascript
Touched a bunch of files related to the new UI that we outlined in plan.txt
changed the name of ResponseExtenders to something more acceptable and conservative
#RAND_x generating functions don't work inside objects or arrays
Changed form submission in index.html to trigger javascript code instead of posting and refreshing the page.
Added comment to explain form submission function calls.
Scripts/Ulduar: Enable "Algalon the Observer"
remove pygments install cause it is now useless
Update repository name in .travis.yml
set default directory as ~/, i removed Repositories.
Attack squads only attack when at full force

Use AttackSquadSize to set when to attack with squad
and when to make new squads.  Its setup to be variable
and its setup to increase each time another squad is setup.

Now squads move faster since they are not waiting for new
agents once they have already left to attack the enemy
base.
Update app/views/tables/index.html.erb
Made async callbacks execute on UI thread handler by default
Implemented auth support, no docs, persistence, or testing yet
Implemented auth persistence + docs
InformationView + Testing Items
FINISHED REPORTS DUDE.
could comput distance with position
Add link to the datatable plug-in documentation, about I18N
add pupil detection with histograms
Kernel Density Estimators - multivar
toxicities
Fixed API URL call and now includes retweets and option to exclude replies
- Version Flags pointed at v0.0.6
- twit.js illegal token console msg fix
Merge branch 'release/v0.0.6'
added highlight.js to blog index, blog post detail, and add image admin page
Moved the new student form below student list
adding number call support
Image url fail
update some gems
add initial scale to viewport meta tag
fix mobile device settings for ipad
use automatic links
add about us page
add powered by clause
rajout d'un nouveau brouillon sur le DDD en anglais (1ère partie)
correction mineur avant déploiement sur vincentguillaume.fr
sha as item guid
Added 'puppet::master' class.
korjasin taas sen saman testin
Updated git aliases

Signed-off-by: Stuart <stuart@hackingcough.org>
调节首页缩率图大小，添加侧边栏搜索链接

Change-Id: Ia84f91c0d7a8a943329d475e99d4ee4595980c6f
Added new exception to server code
删除对标题的更改
定时刷新
forgot the file...
Adding some additional plugins, fixing folds.
Basic styles (with Twitter Bootstrap)
Fixed isEmpty() issue
Changing the code base to PEP8 standard.
	modified:   ipchecker.py
	modified:   ipmonitoring.py
main IP class been changed to PEP8 std.

Also added more contents to README file.
Removed empty sponsor categories.
Install libpam0g-dev on Travis CI.

This should fix Login Manager build.
(admin) make find number=2.2 added
test commit
addsympho
Merge branch 'master' of http://github.com/heimdaill/codemasters
fixed util lib
took off text shadows
Added a backend stylesheet
Removed ENV vars causing icarus-verilog recipe not to build on Mountain Lion
首次提交，使用视频播放
two issues solved
Cull dead code.
Enabled single objects without an array in request body

It's no longer (since d11524cb4) possible to POST/PUT a single object without
wrapping it in an array - API requires any object in the request body, even
if there is just one, to be within an array.

Since some projects do use single object calls without an array, this commit
re-enables automatic array wrapping of single objects.
added nav status indication fix for when no "index.php" and fixed linked out from featured image + the collection text
clean up the package struct
mixed up node_t / edge_t
Merge branch 'master' of https://github.com/janlugt/Green-Marl
give warnings on compiling gm_graph
32/64 bit stuff
Merge pull request #41 from honkdamonk/master

New builtins
Merge pull request #42 from janlugt/master

32/64 bit stuff
Merge remote branch 'pullstream/master'
thread.stop()を削除
creating numstable external table
Created README and added to do list

added to do list from email
added contributors (fix your name if I spelled it wrong!)
Add access restrictions to BankAccount.
Add routes for banks.
Better colspans in account saldo line.
Fix and enhance german translations.
Note : add vim plugin and ldd example
Fixed GrowButtons flickering
fixed local video library browsing
Analysis done for now
	modified:   Appendices/supplementary-requirements.tex
	modified:   Software_analysis/furps.tex
Merge branch 'master' of github.com:hypesystem/SliceOfPie
fixed recent files; hid home button
moved gesture recognizer to graph view.m
mich:bryophyte and mich:mycology added to profiles
Merge pull request #6 from egbot/master

mich:bryophyte and mich:lichens added
Removed merge leftovers. Updated readme with dependencies
Merge pull request #3 from taeram/remove-merge-leftovers

Removed merge leftovers
Started added some sort of parallelism to the training pipeline.
update node.js version in readme instruction
Merge branch 'master' into dev
wip data binding
Add Korean translation of Scala Tutorial (Java)

Add Korean translation of
"A Scala Tutorial for Java Programmers".
The contents are taken from the pdf version in
the official Scala homepage.
升级Xcode 听说会干掉developer目录 备份一下
Added the ability to tweet a status message about writing status.
Instead of writing session status info using echo, session data is stored in an associative array and dumped to a file at the end. Makes lookups in other external functions easier.
tweaking comment
Lazy Update implemented
FulltextIndex implemented
Some bugs fixed
Fixed a typo on melted-server.js and extended timeout on mocha.js

Signed-off-by: Juan Martin Runge <jmrunge@gmail.com>
Added virtualenv bootstrap script
Merge branch 'develop' of git://github.com/ingenuitas/SimpleSeer into develop
Merge branch 'develop' of git://github.com/ingenuitas/SimpleSeer into develop
Added force install flag option for install script
- Create basic import/export scripts
- Set chart, inspection, measurement, olap, and watcher to publish on meta channel
- Fixed name of Inspection (__repr__) to be consistent with other objects
Add Watcher, missed in prior commit
Merge pull request #300 from xamox/develop

Added virtualenv bootstrap script and force install option flag to install script.
Rename class
Add seer commands
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into feature/importexport
Remove old feature
remove old file
Merge pull request #303 from demaagdk/feature/importexport

Feature/importexport
adding stubs for dashboard
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop
Updated cachebuster to include css, too. Fixes #301
Index.html had javascript error, fixed that. Updated the timepicker
widget with discussed usuability issues. Fixes #302 . Also updated
the datetime filter widget to round the startDate down to the
beginning of the day and endDate to the beginning of the next day.
Fixes #234
Merge pull request #304 from brooksryba/develop

Index.html had javascript error, fixed that. Updated the timepicker
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer
Updated paster template with new index
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop
push init up in to simpleseer
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop
Don't know why this was modified
* Add a 'from scratch' firmware project with latest USB library.
Remove the second branch status
fixed popup positioning
improvements
Changes of BUT's arm navigation packages
Merge pull request #1 from but-spanel/master

Changes of BUT's arm navigation packages
	new file:   srs_asisted_detection/CMakeLists.txt
	new file:   srs_asisted_detection/Makefile
	new file:   srs_asisted_detection/cmake_install.cmake
	new file:   srs_asisted_detection/mainpage.dox
	new file:   srs_asisted_detection/manifest.xml
	new file:   srs_asisted_detection/ros/src/action_fake_user.py
	new file:   srs_asisted_detection/ros/src/bb_fake_user.py
	new file:   srs_asisted_detection/ros/src/ui_answer.py
	new file:   srs_asisted_detection/ros/src/ui_bbmove.py
	new file:   srs_asisted_detection/ros/src/ui_detect_sm.py
	new file:   srs_asisted_detection/ros/src/ui_detection.py
	new file:   srs_asisted_detection/ros/src/ui_detection_fake_user.py
	new file:   srs_asisted_detection/srv/BBMove.srv
	new file:   srs_asisted_detection/srv/UiAnswer.srv
	new file:   srs_asisted_detection/srv/UiDetector.srv
A simple mod to test our workflow
add commons jexl
變更application = h.trialschool.tw
Improve connection creation error handling by rethoring in lwt context
Fix syntax errors
added size entity
modified:   gengit.py
	<done>
	1. added: flags["display-only"]
Docs for {inpath}.
delete upload test files
click a username in open_ui to search for their saves, plus more improvements and fixes to open_ui

Also, tpt.set_selected
made unicode optional (not always saving text)
Rid of all warnings
Edit application stylesheet to @import other ones
Edit layout markup
Add humans.txt
code clean up
ädded Context/TwitterServiceContext.xml
added
Updated resources to include Thrust
Added Sphinx files
Added RTD css
oscon2012 index page
Community is not customers
Moving from apps to services
Open Source user experience
Assholes are killing your project
Django doesn't scale
Large Scale django @ Mozilla
OSI - Still relevant
Instantly better vim
deleted django_apps2services file
데이터 초기화 작업
ignored some files
bashrc-common: disable XON/XOFF flow control, to let vim see Ctrl+S
vimrc: more tweaks
vim: ignore Makefile for command-t
added some phpdoc notes
ISSUE#8: Cannot find CheckBox in group
Merge pull request #9 from apodhrad/ISSUE#8

ISSUE#8: Cannot find CheckBox in group
Flotjs => HighCharts
Generalised the shapes.
Add gauges support, fix formatting.
Modify the message when no container available. (See #8541)
Add listener to turn on the move button (see #8541)
Update templates to sl6.3
update readme with some useful hints
added 32bit version of sl63
refactored confusing var name
Encontrando problema
loaded up project with Pristine-Static
Norma se agrego correctamente
release of jelix 1.2.9
release of jelix 1.3.3
reworked jAcl2 doc
Reworked the doc about coordinator plugins. Added the doc about configuration section for plugins into the main configuration.
merge jelix-1.2
merge jelix-1.3
mise à jour doc jacl2
Added username in every page
Tweak FPS switch position within UITableViewCell.
Fix unicode problems and a few other random errors
replace status bar in form view with toolbar
get session for mock model context from object
Update smarty3/prv_message.tpl

Merge from https://github.com/friendica/friendica/blob/master/view/theme/duepuntozero/smarty3/prv_message.tpl
New script for repairing the damage.
Use the dumper.
Move variable to a wider scope.
Offload the repair part of tptp2miz to the new mrepair script.
These experiments didn't last.
about to start rspec
added faker and fabricator
testing
testing
Animations working on Firefox and new animation for the main picture
Ignoring arduino object files.
Added Code::Blocks temp files to the ignore list.
Initial fix of test and set not being threadsafe. Not tested yet, but
does not affect other code.
mk sec
补一下上一次提交漏掉的东西，主要就算member 和令牌
added http body json content for user creation
git wants me to
Merge branch 'master' into jtilley

Conflicts:
	SDKs/ios/PuzzleSDK/PuzzleSDK.xcodeproj/project.xcworkspace/xcuserdata/jtilley.xcuserdatad/UserInterfaceState.xcuserstate
Commit to include all phonegap-getting-started files
updating code guidelines and example code
Added command input verification.
added icon font
changes on stylesheet
Simple version finished
created folder for simple HTML version
Ratchet version added
Merge branch 'master' of https://github.com/jmarizgit/hackernews5
Change in IMDb api:
* Rating => imdbRating
* Votes  => imdbVotes
correcting error in example in README
Adding mockup account settings.
Rajouté un fichier .md de présentation
Avoid error uninitialized constant Rake::DSL
ruby1.9: use load for spec_helper as it's not in the load path
Hold rakefile and target as absolute pathnames
Ignore rvmrc files
Merge branch 'master' into autoconf
Bugfix
Made a minimal experiment template.
Merge branch 'master' into DummyExp
Merge branch 'master' into DummyExp

Conflicts:
	templates/exp.html
some of the Part II slides
Merge branch 'master' of github.com:NYUCCL/psiTurk
My take on Part 2, will probably have to sync with Todd.
Mostly cleanup, but also an important bugfix where assignmentId was previously getting reassigned.
Merge remote-tracking branch 'origin/DummyExp', keeping exp.html from my copy of the main branch

Conflicts:
	templates/exp.html
Merge branch 'DummyExp' of github.com:NYUCCL/psiTurk

Conflicts:
	templates/exp.html
Merge branch 'master' of github.com:NYUCCL/psiTurk
merged John's slides with mine, started psiturk.html
Merge branch 'master' of github.com:NYUCCL/psiTurk
Fixed config file name in mturk scripts.
Merge branch 'master' of github.com:NYUCCL/psiTurk
Merged back api slides from dummyexp branch
Fixed insidious sandbox HIT submission bug
Removed redundant slide.
Added a function to permute the data
updated commented code
created gh-pages
started refactoring code to match new app for retake
fixing sync conflict
added week 4 files and folders
fixing bug in tuple_compose()
fixing bug in maker<>
fixing bug in placeholder_for_argument<>
create member_to_pointer<> and parenthesis<>
beginning implementation of synchronizer<>
fixed bug in installer script that broke windows installs
corrections in the z coordinates generation
fix IBR always using IQ-Get
add IBR unregister method
improve TLS debug messages
complete the basic code to work with data forms
add Text.XML.Stream.Elements.parseElement
minor fix-ups
add data forms test cases
fix a comment
make datatype fields strict
fix TLS code for hs-tls 1.0
un-ReaderT Xmpp actions
remove Xmpp type synonym
Merge pull request #6 from jorgeu/master

new test case for name transform and enabled midje lazytest
Update contributors
Added Vim plugins syntastic and commentary. Fixed key handling in tmux.
Revised HTML snippets
Support post params
Removed deps on JQuery UI and rearranged a few deps
Site updated at 2012-08-09 14:00:42 UTC
OS-1392 unnecessary conversion of double to uint64_t in iob_bytes2str()
7th: DE225 Fixed
Discover WGCNA with power=6. Also visualize
Modified something quick in index.php
updated dependencies in pom.xml
refactored collapsiblePanel.xhtml to use ui:composition as root
optimized imports
added @SuppressWarnings
converted line breaks
Minor Change and added Readme
debut impl cTree
Added total to models
clean up before removing .gitignore
Overriden the save() method in Competency to ensure that same entity is not a pre-requisite. Added tests for more constraints and created multiple Level(s) for testing relationships
Keep CKWebDAVConnection objects alive for as long as they are running operations.
Merge branch 'davkit' into sandvox2-maintenance
Kulled off a whole lot of out dated code. Am going to build from the libav utility functions from now on.
made changes to yaml
Key as string, not list.
Merge branch 'release/0.0.66' into develop
commenting out bundler
bump da version
Merge branch 'release/0.0.67'
Merge branch 'release/0.2.108' into develop
better vendor form and weekly email
bump da version
Merge branch 'release/0.2.109'
Merge branch 'release/0.0.64' into develop
back to precompile for now
trying latest active_admin
bump da version
Merge branch 'release/0.0.65'
avance de 14 nov
Update confucius/models/submission.py
stripe config continued
custom stats
Update work/info.txt
Add comment clarifying that the downsampling code will not run any longer
no matter what the user selects.
Removing unsupported fields which result in a slew of warnings on windows
Extended ShadowContentResolver#delete()
Renamed test method in ContentResolverTest
Enhanced ShadowContentResolver#insert() and update()
Adds ShadowMarginLayoutParams and updates ShadowFrameLayout#getLayoutParams() to return MarginLayoutParams as default instance.
Fixed maxLength bug in ShadowEditText
Made tests more explicit
ContentValues will now be copied on insert() and update()
Implemented ShadowService#stopForeground()
Cleaned up imports in EditTextTest
Support getExternalFilesDir(String type)
merge from master
fixed merge mistake
fixed some merge mistakes
Merge remote branch 'robo-upstream/master' into robo-staging
Merge pull request #196 from kiefermat/master

removeDialog is missing in ShadowActivity
Merge pull request #192 from Logdog82/ShadowService

Implemented ShadowService#stopForeground()
Merge pull request #187 from ecgreb/margin-layout-params

Adds ShadowMarginLayoutParams and updates ShadowFrameLayout#getLayoutPar...
Merge pull request #191 from roberttaylor426/master

Fixed maxLength bug introduced into ShadowEditText
Merge branch 'master' into ContentResolver

Conflicts:
	src/main/java/com/xtremelabs/robolectric/shadows/ShadowContentResolver.java
Merge pull request #179 from Logdog82/ContentResolver

Extended ShadowContentResolver#insert(), update() and delete()
Lots of changes...

Added syntax hilighting for code sections.
Cleaned up styling of old posts.
Made front page paginated with actual articles.
Added sidebar.
Fix a couple of generics-related warnings and remove unused imports.
first few sections of chapter6, also ex6-1
UDP Todo
UTF8 used in all string encodings.
Udp: Stun packets delegated to StunClient
Adjusting appropriate log-level
Adding static pages controller, with two static pages "Home" and "About"
Removing spec files for views "about" and "home"
Replacing default Rails index page with a static home page.
Adding Badger Model:
mux correct opus frame size
fix background clearing
Basic XML parsing and interpretation. Displays resutls in plain HTML
Merge branch 'master' of https://github.com/krendil/asi-estimator
Черновой вариант страницы выбора даты / телепередачи
Отключение кликабельности для сущностей без записи
Добавлен TODO файл
Упрощена вёрстка страницы телеканалов
Минорные изменения вёрстки
Merge branch 'bergholdt/master'
Rename and removal of useless view
Yay now we can delete
yay we can delete now
default the slider to maximum
Version bump to 0.0.2
Easier client interacion with the tree.
Merge branch 'master' of github.com:ktlacaelel/cache_tree
update v1.7.0a build-2436
Initial particle system
Free unused sparkles
Add colours
Add gravity and rebound
Add more physics parameters
Add config function and sparkles
Add comments and change sparkle for particle
Better bouncing
Merge remote-tracking branch 'origin/master'
Some parameters changed
test from Xcode
test
Added support to read ratio for image dimensions
Adjusted some redirect paths to be relative (to work even if the study is not
at the web root).  Tested second controller.
Merge branch 'master' of github.com:kwickham/a-safe-place
just for the updates
≈Merge branch 'master' of https://github.com/kwickham/a-safe-place

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_study_en-us
Merge branch 'master' of https://github.com/kwickham/a-safe-place
Merge branch 'master' of https://github.com/kwickham/a-safe-place
Merge branch 'master' of https://github.com/kwickham/a-safe-place
Merge branch 'master' of https://github.com/kwickham/a-safe-place
Merge branch 'master' of https://github.com/kwickham/a-safe-place
from the surver
Merge branch 'master' of https://github.com/kwickham/a-safe-place

Conflicts:
	app/Lib/dbschema.sql
#*$&#* another link bug (apparently I need child browser)

Signed-off-by: Kyle Hodgson <kyle.hodgson@gmail.com>
to do receive tree id
to test
fix upload and baidu
Monopoly second
add setup script
Merge branch 'master' of github.com:langtianlang/dotfiles
Fix device scrobbling dialog

- Changed text to bold for the radio buttons
- Made the initial description bold
- Removed the maximize button
- Added a window title because an icon looked bad next to the radio
buttons, too much negative space. It didn't look good above it either.
debug -> pray
Update autoload/vundle.vim

Adds support for loading from Windows.
Changed Copyright: syntax in debian/copyright.
Fixes to README

Signed-off-by: clem <luca.clementi@gmail.com>
Added find-requires and find-provides to the source code

Signed-off-by: clem <luca.clementi@gmail.com>
making sure that memory will only receive 16bits
Again making sure that memory will only receive 16bits
but now with tests
refactored the address mode to cpu
more and more refactoring, most of 'em are about naming
add System.eval(String command) method
implement DScriptConsole inputUserApproval
Merge branch 'master' into dconsole
adding console tests
Merge branch 'master' of github.com:konoha-project/minikonoha
Merge pull request #263 from OkamotoYuki/dconsole

Dconsole
add Ip to DScriptAsk log
Merge pull request #264 from OkamotoYuki/dconsole

Dconsole
print enabled packages when cmake
fix bug fputc(), fchmod()
fixed module MiniVM

fixed SetDefaultFactory

fixed Module TraceVM

fixed option

fixed src/vm/minivm.h

add module/TraceVM

fixed module/TraceVM/CMakeLists.txt
fix string.concat bug
fixed include/minikonoha/minikonoha.h
fixed minikonoha.h
add <sys/stat.h>
Merge pull request #266 from masakiishii/pull_modulevm

make moduleMiniVM and moduleTraceVM
fix build error in llvm package
update Json Module
Merge branch 'master' of https://github.com/konoha-project/minikonoha
adding konoha.json ...
adicionando diretorio workspace
Added static-pages controller
Removed contact page
Added integration tests for About page
Began desgin
Ingnoring H5BP build directories
Added accept attribute to file input
Added Google Analytics
Merge branch 'dev'
use nBurnFPS for FPS reporting, use nBurnSoundLen in audio_cb_batch
FACES-1343
richfaces4-portlet demo does not specify immediate="true" for show/hide comments link
routes now uses settimeout
* Updated work on feeds parsing. Interfaces are still being fleshed out.
* Introduced additional parser methods. Parse testing will begin
shortly.
* Updated feed parsing logic to correct state. Feed and FeedFolder are
not correctly populated (only ID and title are populating at this time,
more fields will be added as features are added in the UI layer).
* Created initial adapter for FeedsListFragment. getView() still
requires an implementation.
reduction using generic folding (tested with sum)
creation of new package leoclient-virtualbox works
Updates to the buzzwords.
Поддержка HTML тегов в топиках опросах и ссылках
Подтверждения при смене емайл адреса в профиле
Лента активности пользователя в его профиле
modified:   meanwhileinrussia.py
v0.1
testmode
test2
Revert "test2"

This reverts commit 7aad259a9c402bc6b1ff5056a8e3fe6245cffcf0.
a
Merge branch 'master' of github.com:lixing/Course-Project
Bug fix for Windows; updated comment; added Windows build dirs to
.gitignore
Merge pull request #3 from mcmillen/py2exe

Bug fix for Windows; updated comment; added Windows build dirs to .gitignore
masked Xtrem vals to .1, inflated brain, no thres, with text
Add support for Vimeo videos
Merge pull request #5 from danielcnorman/master

Add support for Vimeo videos
adding generic pages and code
scalameter stuff
Fixed converting internationalized strings. Removed redundant code
Merge pull request #33 from trungdong/master

Fixed JSON encoding/decoding with internationalized strings
updated toolbox assembly
size of graph
Added arguments and modified tests.
Prevent quick edit for now as we do not support it yet
add option to disable unsupported meta boxes and hide permalink edit section as we don't use this. Also disable autosave, perhaps this can be made an option in the near future
fix up meta boxes disable routine, make this work for all placements
Merge pull request #7 from rvbd/master

Disable quickedit for now
Login - Logout
Merge remote-tracking branch 'origin/master'
[www-client/firefox] Updated Firefox release to version 11.0

New ebuild for www-client/firefox-11.0.
[x11-wm/awesome] add two x11-libs packages as runtime dependencies, but 2736

x11-libs/xcb-util-keysyms and x11-libs/xcb-util-wm are post
dependencies of x11-libs/xcb-util.
Providing that -keysyms and -wm aren't installed:
- installing x11-libs/xcb-util will pull the other two, but
- installing x11-wm/awesome will not.

So there are missing dependencies when x11-libs/xcb-util
is already installed.

(The two missing dependencies should probably be added to SpinBase -
- I'll update the bug report.)
V1 done without tests
basic commenting operational
Merge pull request #6 from madeupname/2-madeupname

Issue #2, CRUD/scaffolding
More minor tweaks I shouldn't be doing
move removeAll to own function (in preparation for also removing function words)
Oct 26 morning
bug fix in forecasts
Minor changes to json progress, start of total slice progress
Working total progress
mgl building as a static link lib and the miracle_grue command line as a standalone project that depends on that lib.  This is to facilitate using the subdirs qmake template to build unit tests
Make mgl use qt core lib
Fix the debug verbosity symbol
Added two unit tests to the build mostly as a proof of concept. When this is done, the unit test project files will be generated by a script
Add a python script to generate unit test projects and remove the already created projects
Add unit test files and other makefiles to .gitignore
Make project file consistent
Add the generated unit_tests.pri to gitignore
Automatically call make_test_pro.py before including unit test files
Copied versioning code
weak typin'
Bugfix: Added a missing break statement
A few more tests for the filtering operands
Fixed behavior when a field can't be converted to integer/float/bool. Fixes #74
bldext: more complete set of vars to depend on
[s2509] Basic cleanup for Laj - Botanica

(based on commit 6854cc3)
fixes #67: move some common defaults into initializer
Merge branch 'develop' into develop-bench
added missing synthesizer
typo fix for constraints method
fix for not overriding annotation layer from delegate
two-finger gestures should zoom out on map center, not touch center
Merge pull request #60 from mapbox/constraints-typo-fix

typo fix for constraints method
Merge pull request #61 from mapbox/cache-expiry

configurable cache expiration handling
Merge pull request #62 from mapbox/annotation_layer_fix

annotation layer fixes
Merge pull request #63 from mapbox/zoom_out_center

two-finger gestures should zoom out on map center, not touch center
Merge branch 'upstream-develop' into develop
adding json data for high scores. some bugs still to work out.
updated
updated
remove data contents
utils/installer.sh: fix for replace existing config.
Merge pull request #224 from kaos/patch-1

utils/installer.sh: fix for replace existing config.
merge from upstream
select data-shortname
Attempting to circumvent the Delayed::DeserializationError so we can instantiate "new" model records which haven not been added to the database.  Needed for a submission system on http://openlobbies.com/
add gitignore
modif gitignore
new maj
Site Width

Min 960px
Compare files of clastfm->nmobj and cstate->curr_mobj before show the button of corrections.
Also, stop clean clastfm->nmobj. Is not necessary.
Add a menu to search entry that configure instant and aproximate search
options.
Added expansion of the <time> element
Added moment.js
Minor change to the <time> element in the index view
Added more styling for the article
Added Modernizr.js to the project
Added placeholder for tag property
FIX - typo in lib/matplotlib/testing/compare.py
Merge pull request #1158 from NelleV/FIX_tests

FIX - typo in lib/matplotlib/testing/compare.py
headers_in headers_out class created.

h = Apache::Headers_in.new()
Apache.rputs(h["Accept-Encoding"] + "<BR>")
h["Accept-Encoding"] = "gzip"
cleanup the category gallery archive
fix noob error
adding parser so we can get everything in one string
login UI finish
push png
Added textures. Running properly.
Added support for Dynamic Navigation
removed a debug statement I forgot earlier
about gemoved
responsive css init

 responsive css init
Clean Update
markup, appearence and js optimization
optimization
initi
zip and radius update
infowindow layout
update
search engine - scroll updates

show var request fixed to 50
rightcol search scroll behavior
custom responsive css update

cleaning update
Version bump to 0.1.8
commit-1345645153
Fix typo in README.Debian doc install
Post go live fixes for DCL
Fixes for showing descriptions when list widget is embedded in an external site
stub in a connection pool for multiple servers
Modify post page to return response from server. Closes #21

With this change, the user's submitted answers can now be saved.
They are cleared on a new connection.

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>
Add cache prefix to avoid issues next season. Closes #31

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>
Unit tests

Change-Id: I552b727045ed1299709be829701e096ebf5b8fd4
Install better errors gem.
Fix some layout issues.
Add edit button to activity#show and move some html layout to partials.
Merge with current master release.'
Actualizando las Facturas con las validaciones
Actualizando Facturas 2
Add deprecation warning
Add support for command windows (q:, q/)

Previously it worked for q: only due to the FileType event.

Fixes #196.
Setup statusline for all windows opened when vim starts

Fixes #187.

Note: netrw is known to spoil things.
Use stricter matches. Also don’t count on 'ignorecase' option when matching buffers

Fixes #182.

Note: don’t know what to do with LustyExplorer and vimpager: unable to
get buffers with such name or filetype.
Added my colorscheme
Add 16-color support to Powerline

Update the Highlight and Parser code to accept color strings instead of
color numbers.  This allows creators of color schemes to specify color
names so that Powerline can work without requiring 256 color support.

Closes #133.
Fix paths containing tildes on Windows

Closes #126.
Add HGRev segment

Closes #115.
Add aurum segment

Closes #127.
Revert "Add 16-color support to Powerline"

This reverts commit 216b20d3a2e51b6f92672a96672c837e20e41e59.

Unfortunately this breaks list colors (cterm and hex values) and this
must be fixed before the 16-color feature is merged into develop.
Add 16-color support to Powerline

Update the Highlight and Parser code to accept color strings instead of
color numbers.  This allows creators of color schemes to specify color
names so that Powerline can work without requiring 256 color support.

Closes #133.
Revert "Add 16-color support to Powerline"

This reverts commit 216b20d3a2e51b6f92672a96672c837e20e41e59.

Unfortunately this breaks list colors (cterm and hex values) and this
must be fixed before the 16-color feature is merged into develop.
Fix typo in aurum plugin

Closes #138.
Fix whitespace issues
Create temporary fix for Tagbar segment

This update adds a wrapper function that checks if Tagbar is loaded
before trying to call `tagbar#currenttag()`. Unfortunately this only
works *after* Tagbar has been opened, so the Tagbar/current tag segment
will be empty until Tagbar has been opened for the first time.

Refs #152.
Refs majutsushi/tagbar#77.
Revert "Create temporary fix for Tagbar segment"

This reverts commit 5948dd5bc28cf4dda75d8532fe4e35b1722353c0.
Create temporary fix for Tagbar segment

This update adds a wrapper function that checks if Tagbar is loaded
before trying to call `tagbar#currenttag()`. Unfortunately this only
works *after* Tagbar has been opened, so the Tagbar/current tag segment
will be empty until Tagbar has been opened for the first time.

Refs #152.
Refs majutsushi/tagbar#77.
Revert "Create temporary fix for Tagbar segment"

This reverts commit 5948dd5bc28cf4dda75d8532fe4e35b1722353c0.
Create temporary fix for Tagbar segment

This update adds a wrapper function that checks if Tagbar is loaded
before trying to call `tagbar#currenttag()`. Unfortunately this only
works *after* Tagbar has been opened, so the Tagbar/current tag segment
will be empty until Tagbar has been opened for the first time.

Refs #152.
Refs majutsushi/tagbar#77.
made my powerline colorscheme work with the codeschool colorscheme a little better
Zip file for release
Ignore generated files
usecases & reflektion hinzugefügt
Add patient to Active Directory setup
removed client1 file from master
Dodano mechanizm semaforów.
Funkcje serwerowe umieszczone w przestrzeni nazw.
Reorganizacja plików nagłówkowych.
vwReg warnings removed
First version.
Make languagea Turing complete.
add sudo function to autoload
prezto takes care of dumb terminal nicely
switch back to virtualenv with pythonz
Update examples/buffer.html

Fixed buffer sample page
don't relabel a comment
tweak reader
Working on web pages
Update the unittest import to grab unittest2 for 2.6
Реализована работа с БД:
Создан файл конфигурации и подключения к СУБД MySQL.
Добавлена в БД таблица пользователей (user).
Реализована авторизация с использованием БД.
Добавлена таблица товаров (product), которые отображаются на главной странице.
Реализовано удаление товаров, которое доступно только администраторам сайта.
Tweaks to display names of advanced search fields.
work towards TEI viewer
Merge remote-tracking branch 'origin/master'
tei reader back to book home
Update ic2020_surf/src/ic2020_surf.cpp
ignore *.pyc files, finished book/performance
完成：如何提交Bug
Fixed grasps again.
Added predicate object-grasp for per-object grasps.

E.g. for plates, top-grasps don't really make sense.
Updated package exports
Merge branch 'master' into sushi-hackathon
Added locking of the bullet-world at some places.

  * Visualization locks the bullet world before it is drawing it.

  * Serialization locks the world now

This hopefully prevents strange deaths of the lisp process now.
Call glut:init whenever cl_bullet_vis is loaded.

To use glut functions such as glutSolidCube we need to initialize glut
before. Make sure that it is always initialized by calling the init
function at load time.
SinaWeibo was not using CustomForm
Merge branch 'refs/heads/sinaweibo'
fix custom form
autotoolized. More to do
added BSD 2 clause license
qjson.framework para MacOSX
Compile most recent PDF
Katta|000|Now you can refresh the faketime and campaign visualization
Sharvani | #4 | Modifying table name to include schema.
Ashish, Rahul | #00 | removed snapshot dependency
Batch downloading is partially implemented, but does not handle errors well.
Cleaned directory a bit, removing old files.
I have the sample viewer to a reasonable state, though it could still use some work.
Finished the skirts for quad tiles.  This hides the vertical edges between paged tiles.
chronometer in questionaire
added new function to only generate the word document as a file like object, also added an example of usage
update CHANGELOG
bump to v0.5.0
Merge branch 'release/v0.5.0' into develop
bogus_bounce: added logging and rejection handling
update user_home
Revert "Groups / Object groups: added a deletable listing so that multiple entries can be removed at once from groups and object groups."

This reverts commit 21149737b5db8c659404daefa9dc78568b15a2d4.
sortableListing: integrated mass deletion from sortableDeletableListing

WARNING: Changed type of sortableListing::active_index from int to array!
pagetitel from sections
RoomFeaturesRepository Tmmlandi. Glob.Lan Eklendi
Added support for unit testing
GTNPORTAL-2594 - Dependency Cleanup - Part I
GTNPORTAL-2593: Add javax.api as dependency to javax.jcr.api module on as7
GTNPORTAL-2571 Fix junit testcase properly for testing multi-threading
GTNPORTAL-2579 Wrong response JS from JavascriptManager#addOnLoadJavascript
GTNPORTAL-2584 Port missing updates of Reference Guide from EXOGTN to GateIn
GTNPORTAL-2590 Can't get children of UserNode after use UserPortal#resolvePath
GTNPORTAL-2595 - Rework deployment on AS7
Fix failing AS7 extension test
skin cacheable URLs
Support orientation for composite skin
Removing legacy CSS serving completely and rework on junit tests to use controller properly
GTNPORTAL-2597 Skin controller integration
GTNPORTAL-2594 - Dependency Cleanup (Part II)
- removing asm, 5 "commons" libs, guava, jdom, joda-time, hibernate and slf4j from as7 packaging
GTNWSRP-308: Fix an issue where multiple chromattic sessions were sharing the same jcr session when using WSRP.
[Build fix] somehow I missed gatein-dep update to 1.2.0.Alpha05  in parent pom
GTNPORTAL-2594 - Dependency Cleanup - remove unused hsqldb from AS7 packaging
answer removed notice
removed memory subproject
adding chee as a dependecy... removed duplicated code
Only show text tab to relevant users.
no scrolling on report created page either
Add corrag wave 9 and remove scout planes
Стили для кнопки немного поправил + откатил свою небольшую оптимизацию...

которая не понравилась @nop )
manifest_version: 2 に対応、それに伴う微修正
削除し忘れ
Renamed cc-logo to logo.
Change conditional method to switch
Change SessionAuthentication to Authentication
Add task: GCD/LCM.
somehow lost index.php file
modified ignore file

primarily to test my git client...
book
test
Add 6 new color scheme for Phoenix Dark color variation
Load CoffeeScript depending on the runtime.
Release 1.4.4
Update compiler dist for 1.4.4
Add contact form as a dependency and turn on contact form permissions.
Change Main nav link for Feedback to Help and switch path to contact page.
Tweak width of nav area to adjust for new width of text.
Remove duplicate content top region in page template.
Change contact page title to Help. Redirect to the map after submitting. Clean up out-of-date code comments.
Comment out redirect code because it won't handle set messages properly and give you a message next time you edit something.
Redirect the help form back to the help page.
Build docs again. Rebuilds everytime again :(
Made changes to avoid losing information when choosing to export the md5anim file only.
Updating versions / dependencies
Merge branch 'master' of github.com:KrisBuytaert/puppet-graphite
Do not define httpd service in graphite module
Use puppetlabs_spec_helper gem and setup fixtures
Merge branch 'develop' of github.com:nhuff/puppet-graphite into develop
Add parameters to the main class to allow overridding the location of the storage schema and local_settings file
Allow timezone to be passed in as a class parameter
Merge branch 'feature/params' of github.com:nhuff/puppet-graphite into feature/params
Fix typo in init.pp comment
Content 1.9.5

	* Just minor maintenance updates to keep current.
Different colored shells for servers."
update comment and TODO
put continue in a separate line
Fix most cases of Event Create. Managed Poster Upload. Event Create UI partial redesign. Images serve folder fix.
Revert "Сектора Арены"

This reverts commit 65ac0408f43282b41d0fa27e4dfcfbeb0496dd69.
look at the correct db
v0.4, add Google Analytics
fix TD2192...
[derp, wrong game]
fix Mantis #2192, EMP brings play-dead fighters back to life

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@8971 387891d4-d844-0410-90c0-e4c51a9137d3
fix Mantis #1972: hotkey brackets are drawn around stealth ships

git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@8972 387891d4-d844-0410-90c0-e4c51a9137d3
Merge branch 'trunk' into cmake
Add comfirm scan information dialog
Once XZing scan has finished add dialog is replaced by new dialog with autofilled fields from the first result of a scan_upc query
Client caption & IP implemented
Client info full implemented, closed #4
Protocol MOD_GRAPH added
Updated from the upstream
Added sub-script starting message.
Complete problem 011 in Python.
moved css for details block in metadata viewer into application.css
fallback display options for non javascript mode
overiding js dependant css with fallback.css in a noscript block
css moved into application.css
fixed weird spacing
add method for create thumbnails for videos shots
clean up builder methods some more