labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #60 from emeraldMaster/tagsTransformer

Tags field added with Transformer and tests
working on tag cloud, tmp
Merge remote-tracking branch 'upstream/master' into tagsTransformer
tag clout (not completed)
Joke is up; slightly more serious page.
Merge branch 'gh-pages' of https://github.com/emorikawa/startupschool into gh-pages
updating documentation on each service
Backed out changes
Backed out changes
Updated Scene & Widget Colors to match Simulation
kaynak dosyalarinda isim degisikligi
inital wsgi support
added FIRST to navbar
adding more sponsor content
downgrade to emacs 23
updated for symfony visibility changes
getting that info one by one is slow
Merge pull request #33 from tvlooy/master

Speed up status/migrate
Fix typo
upgraded Console and Yaml components and made them submodules
fixed issue with glob returning false and trying to iterate over that in
Configuration#registerMigrationsFromDirectory()
Merge pull request #40 from shawndellysse/master

small bug with glob and foreach in the Configuration class
Merge pull request #29 from lsmith77/addSQL_type_support

Add type support to addSQL()
Merge pull request #38 from alOneh/master

Fix InvalidArgumentException on --db-configuration option
Merge pull request #39 from arnaud-lb/upgrade-yaml

upgrade Console and Yaml components
Fix Ticket #37, using LIMIT in Migrations Configuration, replaced with modifyLimitSubquery abstraction
don't treat just pressing return as confirmation when executing a migration
Add composer.json
Changed dirs for packaging.

Changed dir for packaging so that the correct symfony component is now
used.
Fixed typoed description.
Merge pull request #44 from craue/patch-1

don't treat just pressing return as confirmation when executing a migration
Merge pull request #49 from meckhardt/master

PHAR standalone broken, when packaging manually
Merge pull request #50 from hype-/master

Fixed typoed description.
Documentation on:

 * Common PHP ini setting that disables ability to create Phar archives
 * Installing git submodule dependencies
Merge pull request #51 from simensen/DocumentIniSettingAndDependencies

Documentation fixes
first code commit
Merge branch 'master' of https://github.com/ericvoid/graham-scan.hs
readme text written
+[COSubtree subtreeWithItemSet:rootUUID:]: detect invalid item sets and raise exception
Update .gitignore

Added other typical OS X files to ignore.
Js minified
Fixed error on context menu when target is null / Fix for GENCLIENT-370
Close search box on Esc or lost focus. Add an X to clear the input.

Issue #46
Renamed vserver to cmode
Merge pull request #1 from neilsoman/master

renamed vserver to cmode
case study 3 bilder hinzugefügt
Task #4399 - fix error in "contactSalutation"  row insertion into tine20_config table.
Merge pull request #79 from antacs/task4399

Task #4399 - fix error in "contactSalutation"  row insertion into tine20_config table
Change status update
remove non-necessary comments
Add ptex build patch
-add toolbar support (no icons yet)
-remove download_theme option in favor of toolbar
simplify weather sms sended to users
Added extra spec for complex arrays
makeheader include css files
Add Style to fhs_rss_message
Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
*Convert creatureScript to BossAI.
*Move heroic spell to SpellDifficulty.
*Add SpellScript Aura Elder Nadox.
*Fix Despawn Summon.
*Fix Timers whith dbm addon.
**And other bugs related in issues TC
Core/Maps: fix being able to be ported to an instance while in a group with a temporary save. was  causing some issues.
Core/Battleground: Correct spawning of the generals in IoC
Core/Battlefield: fix the wintergrasp and ioc teleporters.
Core/Spell: Traps Hunter.
*Fix the range of the activation of the traps, according for video and comments.
*Fix armed traps in combat change in 3.0.2. see u http://us.battle.net/wow/en/game/patch-notes/3-0-2
Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
Fix typo sorry.
Fix encounter in progress on the iron assembly
Core/DF:
*Fix deserter in Dungeon Finder
Compile fix
Merge pull request #7984 from Retriman/DungeonFinderTI

Core/DF: Fix deserter in Dungeon Finder
Merge pull request #7981 from Retriman/SpellTi

Core/Spell: Traps Hunter.
Merge pull request #7970 from Retriman/DungeonsSII

Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
SQL: Rename SQLs from 65c6b89d01b1a5675d2c
Merge pull request #7987 from CeIa/master

Core/Script: Iron assemby encounter
Core/Misc: Tabs to spaces and whitespace cleanup
Core/Traps: Remove hardcoded cooldown value of 1 and use startDelay instead, as per Kaelima suggestion

startDelay is 1 for all hunter traps

Fix non PCH build (boss_elder_madox.cpp)
Remove a double parentheses in LFGGroupScript
Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.
Merge pull request #7913 from Warpten/theRubySanctum

Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.
Fixed compile and renamed one sql files
Fix non-pch build
clean up the code and made more changes to the UI.
fixed link to clojure-blog-search-www
Enhance 'make test' to kill ibus-zhuyin automatically.
Removed README link.
Removed old README documentation.
Added README.md documentation from master branch.
Added man pages and PDF versions of man pages from master branch.
Incremented version number to prepare for merge with master.
Added ChangeLog from master branch.
Added SIZE_ASM_OP and TYPE_ASM_OP.
Added ASM_DECLARE_FUNCTION_NAME and ASM_DECLARE_FUNCTION_SIZE.
Fixes to *_nregs for COMPLEX_FLOAT modes.
Call stab: more modes.
Improved single-precision float support.
Fixed more unhandled cases in mapip2_target_asm_final_postscan_insn().
Changed TARGET macro handling from #undef hack to proper #defines.
Diverses
Benutzerfreundlichkeit verbessert
experimenting with Seqable's type
Index using the psr-0 autoloading format - hopefully.

Based on the code from:
https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
A start to an api controller system.

Playing with namespaces.

The plan:
- Semi auto generate the api documentation to markdown.
- Learn to use namespaces better.
- Learn the psr-0 format for autoloading.
- Mix in other framework libraries to drop in functionality.
- Self calling api.
- Keep it public and on git.
Merge branch 'start'
at-spi2-core-2.5.5-1-x86_64
* Version bump
at-spi2-atk-2.5.90-1-x86_64
* Version bump
LoadingPanel example - cosmetics
I added tests, and I'm done with this for today
removed changes that aren't ready
cleared some things in IOData.class
added CCFLAGS for static lib
testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	timesheet.txt
bla bla
update the "fork me on github" ribbon
Push RSS down some more
Exported TV-CLOSURE.
Directory structure desiderata
BuildConfig fix
categories update
Products listing and products listing by category done
Template changes
Удобности в BaseController
Нужно для работы темплейтов
HttpException чтобы бросать пользователя в 403/404 и т.п.
Фишки с именованием
Moskva: CrudController
Example of work
Update README.md

Just change the page title.
Adds better mc shortcuts
Replaces pomodoro for tomatinho mode
History kept in Github, so the file is gone
License declared in the script, so the file is gone
Fixed an option error in help (was d while declaring r)
Dry run mode declared even if not debugging
it's k.
it's k gais.
updated ruby command
Update functional comparison table for result ranking
Update restrictions list for 1.4.0
Add a note for /etc/default/gcs (the configuration file for the gcs daemon)
Add notes for the way to configure server's behaviours, to the tutorial
Update functional comparison table for result ranking
Update restrictions list for 1.4.0
Update descriptions about configuration of service (daemon)
Merge commit 'ffe3b71c12c910ea018456a12c692ff19fd7309a'

Conflicts:
	docs/install/index.md
Remove needless else
mvn params cannot be chained (sic)
updating color for locations
upgrading to the redis 3 gem
Merge branch 'redis_3_upgrade'
renomeando bkpclient para bkpagent
nao fazer backup de apps que comecem com 'django'
Names SMS exporter properly and changes the string accordingly. Removes name redundance.
Adds application name to copyright hint. Adds option to export list of installed non-system applications.
Removes application list exporter.

Adds check for import task if it runs already.

Adds exclusion to type 4 call log entries (voicemails).

Minor code cleanup.
Updates license files.
Created math package, created Vector2D and Vector3D as well as Point2D
and Point3D. Adapted opengl package to work with the new interface. Made
humble beginning on an affine subtraction method in Point3D
Merge remote-tracking branch 'origin/master'
bug fix: players weren't being drawn in some cases upon init. the server now handles setting up the init position.
if two players occupy one square, it turns a different color
stair and shelving action only occurs on spacebar. fixes #14
Importing Entity dir
Importing Repository dir
Created gh-pages branch via GitHub
Update index.html
initialize
update files
update files
新增了各个主功能模块的页面代码

先嵌入到整个流程里面，然后给颓废子改成模板渲染
不小心删错东西了恢复下
恢复
Merge branch 'master' into gh-pages
物品管理界面迁移

FYI
1
？
Merge branch 'gh-pages' of https://github.com/heroes/world-of-heroes2 into gh-pages

Conflicts:
	heroes2_json/attribute.manage.html
t
开始整理技能列表

试验下能不能提交什么的
？？

？？
……

……
11

11
11

11
11

11
added relationship post trigger
リファクタリング
Hdf.getIntValueを追加
Hdf.copy()を追加
Hdf.copy()のテストにルートへのコピーテストを追加
Hdf.getNode()を追加
getNodeの注意書きを修正
new naming values
Update munin-node to version 2.0.4. Add default attributes. Change PERLBREW_HOME to /usr/local/perlbrew/etc
sapgw
Add leiningen sceleton
Configured com.github.github:site-maven-plugin to publish the site.
update the version to v 0.5.4
update the version to v 0.5.4
Merge pull request #41 from sunchenliang/master

update the version to v 0.5.4
fixes HubotSDK and hAPI
Merge pull request #15 from ebrulato/master

HubotSDK and hAPI fix
fixed problem with firmware-folder in /lib/
Code cleanup in ExportSongDialog.cpp
updated german translation
Updated french translation (Patch by Frédéric Courchesne)
Make sure that all Aperture and iPhoto parser messengers hold their individual parsers list
adding new fields to the model
enabled sticky posts, location of templates can be overriden in settings
Schema change! Existing installation will need to be migrated with python manage.py migrate
Ceremony & Reception sites
Redesigned modules of client. Added methods to work with sources statistics.
建立code snippet库
Add BODY selector
Install-Information added
Prevented a number of unnecessary picasa api requests.
+series
Replacing fullname with full_name everywhere appropriate
Version bump to 4.3.1
Regenerate gemspec for version 4.3.1
Ironfan.cluster returns the new cluster!
Remove all defunct tests and start fresh.
Failing spec for https://github.com/infochimps-labs/ironfan/issues/158
Ooops. THIS is the failing spec for https://github.com/infochimps-labs/ironfan/issues/158
Version bump to 4.1.1
Updating changelong (fixes #137)
Regenerate gemspec for version 4.1.1
Basic cluster spec stuff
Cleaning up substep announcements
Parallelizing provider load calls
Version bump to 4.2.0
Regenerate gemspec for version 4.2.0
Merge branch 'master' of github.com:infochimps-labs/ironfan
Updated changelog (after the release - d'oh)
More correct merging of cluster and facet objects, with specs (fixes #158)
Terminated machines are not bogus
The dead are not bogus (Bill & Ted I), they're ghosts (Bill & Ted II)

* terminated machines are skipped, as they were in old ironfan.
* ...except in the case of knife cluster show, which accepts them as there-but-bogus if verbosity > 1.
Ignore deleting, deleted, or errored volumes in discovery
Circumvent memory bloat by resolving just once
Rename spec so that it actually runs :-/
Version bump to 4.2.1
- Added a new, additional parameter '--bootloader' to the '--install' mode
- little regular script maintenance
Improve how to get title for a web page

Get max sentence from <title>,
Then try to extract title from body content.
Updated the Retina image for the iPhone 5 (removed "AGREED Software") and added the Hollywood Legends Icon.
Miscellaneous cleanup in the project.  I've removed some compiler warnings.
Merge branch 'master' into arc-cutover

Conflicts:
	.DS_Store
	HollywoodLegends.xcodeproj/project.pbxproj
	Soap.m
Stopped tracking Eclipse config files.
Misplaced news entry
- We don't allow time travelling here :)
small fix for schema creation and added a task
Extended SQL lookup of nodes.
Initial authentication conf for pfappserver
Allow html tags in alert messages.
ns and ps variable names changed as next and prev
find_order で due と due_year を初期化する．
Common functional moved to  iron_core_php
Check that a deadline exists or is approved before approval and refactoring
Commented out validations that may fail during grading of applications
initial commit
LICENSE
fixed: erased an unused variable
fixes  for Symphony 2.3 compatibility:
- fixed missing xmlns namspace in extension.meta.xml
- fixed some issues in field.multilingual.php due to api changes
fixed a problem with allocation in multi_modelstruct, still working on pca_multi
comply with the RFC and submit useless and unused information when redeeming the access code.
Improvements to CSS URL converter.
add pause in piServer loop
Merge branch 'release/v3.2' into develop
Merge branch 'hotfix/3.2.1' into develop
1. Fixed: Removed propertywrapper and using corresponding MComponent for object map.
2. Fixed: a NPE when a omap file does not have any components recorded yet.
3. Fixed: Stack trace in ContextMenuWindow.
4. Fixed: Classpath in JavaRuntimeProfile for adding context menu classpath elements
5. Fixed: NPE in MTableHeaderItem creation.
6. Update: GridBagContraints returned as a Map from layoutdata
Fixes:
1. Updated ChangeLog and Version Number.
2. Added indexOfType to MComponent OMapProperties
3. GetPrecedingLabel of MComponent.
4. Added accessors to MComponent
5. MComponent#getButton* return null if the component is not a AbstractButton.
6. Added code to stripLastColon()
7. Updated default omap configuration
8. Updated TestObjectMapConfiguration
9. Updated priority values for default configuration
10. Fixed a warning in JavaRuntimeProfile
11. Fixed priority values for default-omap-configuration.yaml
12. Fixed: getAccessibleName() of MTabbedPane returns null.
Merge branch 'release/v3.2.2'
Correct stylesheet name
Montando índice
fix small icons when airplane mode & wifi are on

Change-Id: I1e12e5824f8fd33cf7a66c73dd303a267b55e740
http://rootzwiki.com/topic/24238-maguro-b34-shrunken-wifi-airplane-icons-when-both-active/

Signed-off-by: Roman Birg <romanbirg@gmail.com>
Add application shortcuts to toggle torch & Navbar
these application targets can be used to toggle the
torch or navbar from places like launcher homescreen,
Custom NavBar and Lockscreen.
These are created as SystemUI Shortcuts.

Signed-off-by: Mike Wilson <mwilson@acesappraisal.com>
Change-Id: Ib7ccfeebd2fc7c9c1d1759e46a32b0d877ce930c
Merge "fix small icons when airplane mode & wifi are on" into ics
LGEQualcommRIL: Clean up processUnsolicited

At David Ferguson <ferguson.david@gmail.com>'s suggestion, remove
the full overload of processUnsolicited and have it just work with
the requests unknown by the RIL superclass. Pass everything else
upwards, unmodified.

Change-Id: Ie019fbaa3d5010bf7adc5528f3d523a77efb146f
Merge "LGEQualcommRIL: Clean up processUnsolicited" into ics
Merge "Add application shortcuts to toggle torch & Navbar these application targets can be used to toggle the torch or navbar from places like launcher homescreen, Custom NavBar and Lockscreen. These are created as SystemUI Shortcuts." into ics
Fix Decrease lights in custom backligh settings.
All credit to CM team.
Signed-off-by: Mike Wilson <mwilson@acesappraisal.com>

Change-Id: Iafdae300764462700bad22e10084a1799baaed80
Merge remote-tracking branch 'upstream/ics' into ics
added currency name formatting option
Added new database with users
- adding postgres test client and server scripts
Added gathering assignment in the event "new" use case, updated the form partial for gathering and fixed the errors helper method
Update Changes file
Bumped version #
Created unit tests for the algorithm transform_while.
Created a new header file for extracting out path components.
Created unit tests for the path extraction methods.
Changed the FileDownloaded class to use the path extraction methods.
Removed some unnecessary headers from the http_response files.
Merge branch 'master' of github.com:jehugaleahsa/spider-cpp
Make seach for user email optional

Global Mailer advanced configuration option 'tryToResolve' introduced. It
allows to anable/disable email address resolution globally. Turned on by
default.
Merge pull request #1 from olivergondza/master

Make seach for user email optional
Fix defparam in generate broke in 3.840, bug543.
tests; check package to package refs
New tests
Fix imports under multiple instantiated cells, bug542.
Test for bug349
Fix duplicate begin error broke in 3.840, bug548.
Support '{} assignment pattern on structures, part of bug355.
Include: Allow external progs to test command args
Create V3ParseSym. No functional change.
Fix triangle symbol resolution error broke in 3.840, bug550.
This requires the parse symbol table persist across all parse runs. This is
probably more correct than before, but may result in some fallout if people
relied on data types not being persistant across separately parsed cells.
Merge branch 'master' into clk-race
IMPORTANT: Major internal changes for supporting complex data types.
Adds dtype() to every node, keep global table of dtypes and remove duplicates.
Final merge from dtype branch.
Internals: Move widthPow2. No functional change.
Internals: Avoid broken recusion
Internals: Fix dtype() dead code drop on assign varrefs
Fix input and real loosing real data type, bug501.
Better message for display-like format warnings, bug500.
Merge branch 'master' into v2k1-short-circuit
More Q method comments.
Update copyright date and some gem files.
create event update
fixing merge conflicts
interface graph marche
WordWrap,line numbers,code folding preferences
oops no need to do the looper

would be cool but really, no need.
Now retains settings while switching places
moved security from the -security file to the database. please use the password you set in the SADataLoad file to login
grep default with colors
New decrypt by blocks
marvel page update
updated git ignore file
added LJS submodules
added MacOS target
unit testing setup with ghunit, ocmock, ochamcrest, ljs utilities, ljs categories, and ljs + lumberjack logging
localized app name in info plist.  added stand-in icons for target and test target
started implementation
incremented version
timer is setup
timer is configured
added hpple submodule
bumped version
adding asi http request
tryin asi request
can now connect to server and get usage information
parsing remaining, allowance, and reset date
added a usage object to store/perform calculations on the html of the usage page
corrected a semantic problem used vs. remaining GB
Fixed query so that list view displays correct number of likes.
Referring tables use task ID instead of task name (safer).  Deleted
idle Requirement classes.
Set up notification list view so that OnItemClick leads to task (Does
not work properly yet)
New examples.

Added TouchSpots example, fixed ThreeButtons & AnimationCurves.
- updated svn_commit to make commit and del be silent if --quiet was specified
- updated svn_commit to add new directories regardless of name
Merge pull request #2 from h34th3r/master

ADD: svn_commit will be quiet if --quiet is used
ADD: svn_commit with add new directories regardless of name
Trees and so on
added second files.
add devices template to migrations generator
removed rails 2.3 style plugins
add wifi creds
oops
changed things
Add first part of code on repository
small indentation typo in algorithm description
LaTeX claims:
Error: Don't know how to compile nil
Added support for Secure and HttpOnly cookie
cambio en las mayusculas de la descripcion
Change Rails version on Gemfile
Updated highlighting, experimenting with ESC
Linked CoreData and MapKit libraries
We can turn on and off points
remove copy-and-paste errr
Reorganize directory structure to be more friendly to new users.
Add first working version of SequenceFile access
Added package list needed to build RPMs in general
Added introduction to events chapter
Introduction to Events content updates

- Revised tone in some areas
- Added an example using `addEventListener` and explained how jQuery
abstracts away browser inconsistencies
- Reordered some sections for better flow
- Went a bit more in-depth on `stopPropagation`
Merge pull request #102 from stevenhauser/master

Added "Introduction to Events" chapter
Avoid transparent websites
Fix , first jquery
changed image path from ../img
images path from img to images - icon margin
added mouse support to vi file
Remove misaligned amazement 

json schema has been extensively adopted lets reflect that by not being all wow theres one for C.
fixes logout link again.  trying to track what spree expects as they figure out ssl issue
rough activity feed complete plus lots of little tweaks
antes de rename
first rename
Merge branch 'master' of github.com:juanantonioruz/aceitoso
travis fails
Add database.hanbo.yml to source depot. This file is preconfigured to use localmysql server on hanbo's dev machine. Used only for development.
add login by jerry
add login by jerry
pass address family down rather than autodetect
August talk - tweaks
Login page flows to start of main application. Second time login will take you to main application. Added tools to the toolbar.
(#1227) Updated english locale
H8/3069Fで動作させていることをREADMEに追記
Sorting  and tooltip

tooltip restored
sorting implement w/ offset bug
Fixed issue with path to working directory, and minor fixes to documents logging.
Merge branch 'master' of https://github.com/kasraman1000/SliceOfPie
readme modified again
added file1.txt
added file2.txt
added file3.txt
branch, edit, merge
lipsum text
make aggressive tighter tests with full load control, tidy code
small fix for displaying the images on single.php

small fix for displaying the images on single.php
added alt and title on the images on single.php
ARM: Add ARM CPU Topology
cpupower: update the cpu_power according to cpu load
sched: Ensure cpu_power periodic update
sched: use cpu capacity to decide if a ILB is needed
Overriding default behavior : moving the Spring context configuration
file from WEB-INF to /src/main/resources (so that Unit Tests that are
run from within the IDE could load the Spring context configuration
file)
add process to seek maximum round length
Finished autosave when navigating back to FolderTableViewController.
adding initial empty Xcode project
track member changes
show mount changes and more info on guild member avatar tooltip
fix hotkey bug
not add span to h1 on front page
Updated code in h1
updated theme urls in readme
fix heading and link to remark in readme
dev version
better intro
removing unnecessary return statements
Add overclocking up to 2.1Ghz
first inmport
Merge remote-tracking branch 'origin/master'
Changes:
-Now using filter before redirecting to book.jsp
In progress:
-Going to replace the session usage with request usage
+ README.md: More usage. [Work in progress!]
class shop-dashboard-header changed
added some usage info to README.md
Replace with upstream version 3.3.5
Attempt to merge previous PleXBMC-changes into newest version of skin.
TextBox now renders in line with camera
Fixed register function
Added a column in games for board state
Implemented make_move in the API
Implemented list games in API
Implemented user views for the API
Moved move making logic into the Game class
Made the homepage all pretty with bootstrap
[FEATURE] Updated template
[BUGFIX]
[FEATURE] If a subcategory is selected to edit the clear-parent-icon is displayed per default
[FEATURE] Added back-to-list link to the category edit form
[FEATURE] Added delete link and function to each category
[CLEANUP] Removed unused function
[TASK] Added code commentary
[BUGFIX] Updated category delete function to make possible to delete a top level category
[FEATURE] Added confirmation box before deleting a category
Add markdown and pygments deps.
Foto de perfil, con ruta dinamica definida por el API cliente mediante
querystring
more objects
Lamps: need to add lights
test STI to HLA
Finally fix atomicLoad for classes.

We really need the infrastructure to collect and run our own automated tests…
Merge branch 'ldc' into ldc-llvm-3.1
。。。
Merge remote branch 'origin/lsm' into ccs

Conflicts:
	MAT/src/com/rushfusion/mat/MATActivity.java
	MAT/src/com/rushfusion/mat/video/db/TestDB.java
add teleplay
imageUrl convert to bitmap
Merge remote branch 'origin/lsm' into ccs
..
....
Merge remote branch 'origin/lsm' into ccs

Conflicts:
	MAT/src/com/rushfusion/mat/MATActivity.java
	MAT/src/com/rushfusion/mat/utils/DataParser.java
	MAT/src/com/rushfusion/mat/video/db/DBOperate.java
	MAT/src/com/rushfusion/mat/video/db/MatDBManager.java
...
test videoplayer page
parse json get category,type,area,year
Merge remote branch 'origin/lsm' into liyang

Conflicts:
	MAT/src/com/rushfusion/mat/MATActivity.java
	MAT/src/com/rushfusion/mat/utils/DataParser.java
	MAT/src/com/rushfusion/mat/video/db/DBOperate.java
	MAT/src/com/rushfusion/mat/video/db/MatDBManager.java
Merge remote-tracking branch 'origin/liyang' into lsm
。。
Merge remote-tracking branch 'origin/ccs' into lsm

Conflicts:
	MAT/src/com/rushfusion/mat/MATActivity.java
	MAT/src/com/rushfusion/mat/utils/DataParser.java
..
order by year
...
Merge remote-tracking branch 'origin/ccs' into lsm

Conflicts:
	MAT/AndroidManifest.xml
..
Mise en place de la traduction pour la partie Graph
Update chinese install.zh-cn.md
Started coding the movegenerator, looking good! (hopefully)
Base Views
views
Merge branch 'master' of github.com:levigross/Project-Voodo
views added
views updated
Entorno de testing
update drm to 2.4.40, which new relies on it
Add majority of SNES9x Next speedhacks
record every round
整理了485总线测量系统的内部函数，缺数据标识解析部分，急！
[Sanitizer] use unsigned int as a parameter for placement new on 32 bits

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@158147 91177308-0d34-0410-b5e6-96231b3b80d8
Jenkins build v163
Conversion to standard escapechar and commentflag

Also new LIB_FILE with stdin stdout,
various functions added
* added demo dump for postgresql
* updated changelog
Fix a name conflict between "all" task and "all" built-in function
fix outof range bug...
added basic inquiries and contact page
Adicionando a classe testador.
Troquei o for pelo foreach.
Melhorei os comentários.
Merge remote-tracking branch 'choose_remote_name/master'
bmdplay: support non zero-starting streams
Fix typo, ouch
cleared cache and re-ran it
Webrtc changes from gclient sync
Changes to support newest webrtc trunk in Android.mk
Agregar actores independientemente de cada evento
Merge commit '02994ed3d418ac17b8aed57ac4808cdc1563d035'
[^] fixed db config
[^] unicorn
Merge remote-tracking branch 'origin/master' into stable
Added cli help and refactoring
Added win message
Ajout de la demo dans gh-pages
Simplifies SqlServer2008 ValueBinder and ValueExtractor
implementations.
Akshay/Ashish/Argha(DADA) : changing the fab script
Fix "Adjust CSS style of subject filter and Data Sender filter" #1538
Performance Build DB from git commit cf16a47cd698935fd4e653fa67c3d70a6127bdf0 using node bob
test
meilleurs respect MVC
Corrected a couple of small issues
qt implementation of plotRaw from xcms - not tested; waiting on update to qscatter
Intermediate Commit. (FIX ME).
Move entire method into a main
Added entry point for 'imdb'
Added standard python gitignore from github.
Merge pull request #4 from axiak/master

Add a proper entry point so one can just pip install
added details, uploaded to pypi
initial commit
fixed it
lowercased names
lowercased names
Update readme.md
initial commit
Merge branch 'master' of https://github.com/zacoppotamus/TerminaIMdB
fixed movie search duplication. (Thanks @markrechler)
Legibility improvements with str.format, removed superfluous parentheses
Merge pull request #8 from louist87/master

Legibility improvements with str.format, removed superfluous parentheses
merge changes into upstream
fix some spacing
fix utf-8 errors
added method onResume to sasabus for updateding palinalist after an update or when downloding the files the first time
atualizando prime
Fix image-demo by adding necessary paths
update node info format, remove extra type string.
update settings page.
remove templates.
Update src/com/atlassian/jira/rpc/soap/jirasoapservice_v2/JiraSoapService.java

Implemented getResolutions
Update src/com/roni/dash/LoginActivity.java

Removed load from jira logic, and moved to ServiceLocator
Properly switch players
Put moving functionality in the board, not the model
- add ProtoBuf support (needed for 0MQ messaging)
- add 0MQ support (necessary dependencies)
- FixServer is now publishing the OrderEntry as they come (for now no one listens)
Site updated at 2012-04-17 01:10:28 UTC
methadone --rspec -l mit funding_primer
Removed extraneous license
Succinct gem source
Tidied gemspec
added ico
added new quin kennedy works
adding support for Teency for testing and Travis-ci for automated testing
fixing my travis.yml file a bit
phing change in .travis.yml
More changes for travis-ci
should fix the test failures with travis-ci
turning off tests while I attempt to get them working again
fixes for travis-ci
Adding bootstrap files
Navbar for admin page
adjusting the order of things
Working on the post pages
changes to createPost.php
Fixing up the pages pages.  Also fixing a typing bug in a bunch of other pages
Changes to the categories page
Just a few changes.  Pretty exhausting day so I didn't get much done
a few changes
a few additions to bootstrap admin
Merge branch 'bootstrap_admin' of https://github.com/matthewshafer/feedstock into bootstrap_admin
probably one of the dumber tests I have written
protect_unit: adapt code to new get_attacks() syntax
Patrols: add some comments and rename 'ally' variable

As it finds all adjacent units on the next WP, not just allies.
Patrols: check that potential attack target is on enemy side

This is in case cfg.attack is not given.
sync with lloirs
Fix merge-related wibbles
adding correct gitignore
starting to create a file generator to help with testing
New update 11/07/12
Implemented signup, list of users and documents

Included models and fixed database connection
Expose modulesToString on parser
-- lint
Better error handling
-- lint
params-controlled layout
Adding the basic sass framework and susy grid
fix orphans_maps
Fix drag, drop. Need to fix event handling.
Removing any namespace declarations
Fixed arithmetic error in demographics.js
moved app2 to mc.py for easy access, reverted world to a more up to date version. Modified world calls to reflect this.
fixing issues with calc
First reverse filtering: simple * and ** only.
added and fixed stuff in rest api and drivers
asql
New function to delete words, but stopping at the first "/".
Bindings to go backward/forward words.
Add IRC-Hispano network
mortage+
Pushing documentation for mcms
Working on passing virtual light data to shaders
Added 1.5 source compilation
more inputs
Finishing the slides
Cleaned up directory to reflect app v example

Moved site into a subdirectory - Example
Minor refactorings to error handling code
Iteration 2

Implemented polling, server now sends json responses(client handles the
rendering), added last_checked attribute to a online user, user offline
if not polled for more than 1 minute, deleted unwanted images
Removed unnecessary empty comments in header and fixed indentation
Added #-related entries to .gitignore
Corrected indentation and line lengths
platform awareness
Removed .hushlogin from linux installations.
Add license and link to Bootstrap to README
Email accounts are now retrieved with AsyncTask
Bug 746703 - Set targetSdkVersion to 14 in AndroidManifest.xml to disable legacy menu button [r=blassey, a=android-only]
Bug 750130 - Telemetry doorhanger appears then disappears when onLocationChange is fired during startup. r=bnicholson a=android-only
Bug 743153 - Use ContentUris.parseId instead of RepoUtils.getAndroidIdFromUri. r=rnewman, a=android-only
Bug 713524 - Batch bookmark inserts. r=rnewman, a=android-only
Bug 749857 - Don't upload history records without URI or visits. r=liuche, a=android-only
Bug 810726: Backout 34d30fa24371 for infinite loop problems. [r=dbaron][a=akeybl]
Bug 769001 - Site identity popup should have a max width on tablets. r=sriram
Bug 764405 - Adjust site identity popup arrow margin to work with new toolbar icon layout. r=sriram
Bug 768073 - Fix doorhanger arrow alignment on tablets. r=sriram
bug 770264 - http connection diagnostics r=honzab
Bug 802071 - [l10n] Sometimes, l10n.js does not get loaded properly. r=kaze, a=blocking-basecamp
Bug 809325 - Change version number to reflect not production-ready state. r=vingtetun, a=blocking-basecamp
Bug 814555 - After hanging up the phone, still ring tone from bluetooth. r=echou, a=blocking-basecamp
Bug 809974 - Set the last update installed time for B2G. r=fabrice, a=blocking-basecamp
Bug 804571 - Implement download cancel (pause) for B2G. r=fabrice, a=blocking-basecamp
Bug 816899 - Add keys of firmware revision and software info. r=cjones, a=blocking-basecamp
Bug 817141 - Call EndTrack()/Finish() from StopPreview() (as well) to prevent deadlock. r=kchen, a=blocking-basecamp
bug 771705: Pull out compilation variants into a CompileOptions structure. r=luke
Bug 754469 - Part 1 - Add blessings Python package 1.3 for terminal interactions
Bug 754469 - Part 2 - Add blessings to virtualenv
Bug 748211 - getVertexAttrib should reject the VERTEX_ATTRIB_ARRAY_POINTER pname - r=jgilbert
Bug 795480 - Make b2g app ensure that it's the process group controller. r=cjones
Bug 774585 - Temporarily disable test_principal_extendedorigin_appid_appstatus.html for failures on OS X 10.7 (and possibly others); rs=mounir on a CLOSED TREE
Bug 795691 - b2g fixes for the web console actors; r=past,vingtetun,ttaubert
Bug 798764 - Global console: add support for a global ConsoleProgressListener; r=past
Bug 661762 - Scratchpad source link may focus the wrong Scratchpad window; r=msucan
Bug 795648. Add a commment describing why we need to call RequestDecode. r=mwoodrow

--HG--
extra : rebase_source : bd0b47c361eee7c0ed6f00f92eda8aabc5ef08e9
Bug 790650 - It may be a good idea to have the debugger start with collapsed panels, r=past
Bug 671894 - Part 1: Add-ons Manager doesn't recover correctly in some cases when the database is locked. r=Unfocused
Bug 671894 - Part 2: Add-ons Manager doesn't recover correctly in some cases when the database is locked. r=Mossop
merge m-c to fx-team
Bug 775375 - B2G 3G: Handle B2G restarts (let's be honest, crashes) gracefully. r=philikon
Bug 823124:  Add diagnostic (and otherwise good-to-have) assertion that non-root rule nodes must have a non-null rule (and vice-versa).
Bug 823124; speculative fix - null style rule from an animation; r=dbaron
roomservice delivers you lunch combos from the CyanogenMod github.
fix roomservice formatting
Squashed commit of breakfast/brunch commands

Add a CM-specific breakfast menu

We usually don't wan't all the devices in the lunch menu, so
we can now choose to pick up breakfast or brunch and get a
smaller selection of devices (i.e., those we support)

Make brunch more nutritious

* "breakfast device-name" will set up the environment, just like lunch.
* "brunch device-name" will actually do the whole setup and build :)

brunch: add a lazier mode

Since all of CM's targets have a predictable PRODUCT_NAME and BUILD_VARIANT
(i.e., "cyanogen_$(PRODUCT_DEVICE)-eng"), brunch can now be invoked passing
just the PRODUCT_DEVICE ("brunch passion" for the N1 setup+build, for
example).
The "classic" long form of $(PRODUCT_NAME)-$(BUILD_VARIANT) can still be used
if desired ("brunch cyanogen_passion-eng" still works).

breakfast in bed

breakfast in bed (aliased to "bib") is the baconless friend of lazy
brunch.
You can now use "breakfast passion", or "bib passion", to setup the
corresponding CM build without actually building it

Fix breakfast for the undecided

The menu presentation (i.e., giving no arguments to breakfast
or brunch) was broken, so if you didn't know the name of your
target you weren't given a list to choose from, just an error.

Change-Id: I85b8217daa2d511c16a1e82c700e1b0fadbb36ac
CyanogenNom: Now moar helpful!
support product names with _ in them
Fixed references to Settings.Template.xml
Settings.xml reading azure storage information.
Basic Azure tables event store
Removed BinarySerializer, and made ISerializer specific to strings (ITextSerializer now).
Updated event store scripts to use nvarchar for events payload (instead of binary)
Created basic AzureEventSourcedRepository without error handling if the events are not published after they have been saved.
Started implementing component that picks up pending events (WIP)
Renamed IMessageSender.Send() to IMessageSender.SendAsync()
Try to make test more resilient to timing errors
Added synchronous method for sending messages, that use the async APIs under the hoods, in conjunction with Topaz for retrying.
Item is removed from the pending queue when finished sending.
EventStore as an IPendingEventsQueue.
Using Transient Fault Handling (Topaz) in EventStore
EventSourcing/AzureEventSourcedRepository uses the IEventStoreBusPublisher instead of the Bus directly for robustness.
EventStore PartitionKey composed of Entity Type plus Entity ID.
Added some more metadata to both the EventStore event and the ServiceBus published event (for easier filtering).
Removed unused configuration setting.
Added SourceId as metadata (for both the event store, and the published events).
Merge pull request #242 from jdom/azure-tables-event-store

Implement Event Sourcing infrastructure that uses Azure
Reviewed with jdom
test change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/org/lds/community/CallingWorkFlow/api/JSONUtilTest.java
updated Data Model and Service methods.
Created bash cookbook with bash_profile resource, and leveraged it in drupalcs recipe.
SSH'ing into vagrant now automatically jumps to project docroot.
SSH'ing into VM opens a shell in the project docroot.
Created new bash_profile LWRP to achieve this.
-make min terrain height 0. simplifies several things
-add gravel and all around texture grabbing/drawing based on affinity
for geographic region
Fixes for faults figured out by diffing.
Merge branch 'master' of github.com:naturwerk/naturvielfalt
in progress: datatable loader more obvious
Observation edit ACL permissions via Ajax
Fixes #379: Datatable loading indicator; outsource cutsom flexigrid CSS to datatable.css
Merge branch 'issue379' into chakrit
Merge branch 'master' into chakrit

Conflicts:
	webroot_drupal/sites/all/modules/datatable/css/flexigrid.css
Fixes #381: Datatable blocker/loader in gallery
Bugfix datatable filterDiv CSS moved to datatable.css
Fixes a minor grammatical mistake in Readme.
Fix settings selected row #33
Press and hold to edit tasks #11
Update Readme.markdown
Tap preference. Fixes #21
Merge pull request #40 from joffreylacour/patch-1

Update Readme.markdown
Merge nicolasgomollon settings cell. Fixes #33
Conflicts:
	Classes/CDIListViewController.m
	Classes/CDISettingsTableViewCell.m
	Classes/CDITableViewCell.h
	Classes/CDITableViewCell.m
Merge branch 'master' of github.com:nothingmagical/cheddar-ios
Update rake file and improve settings pickers
fix for landscape list edit buttons #28
Lots of progress on font preference. #16
Merge Benuuu. Fixes #28
Merge remote-tracking branch 'upstream/master'
do not display classpath if application starts
change log level for console output
Update src/app/code/community/N98/LayoutHelper/Block/Customer/Account/Navigation.php
don't force values to string in case they are jinja Markup or otherwise magical
Release guide for Xitrum 1.10
Iteration D3 - Adding a Button
upper and lower case d in rdf:description
Adding intro response view to campaign dashboard.
more clustershit
Merge branch 'master' of https://github.com/nickbarnwell/07.21.2012
fixed get group query
一段
Add nova_volume_disks to data_bags, fix nil-object issue
fixed details colors
error checking for integer conversions
signed division fix
Changed the methods to non-mutable
Value getOrder() method
width checking for orders
machine class, getters and setters for memory/registers
step() and a first simple test
longer test of orders
fixed shift right behavior
update README
Merge branch 'master' of github.com:nishio/EDSAC-on-browser
default value null makes more sense. add test cases for false.
remove default value for debug's first argument
Merge pull request #899 from dereuromark/2.3-more-tests

default value null makes more sense. add test cases for false.
Making getMockForModel actually useful
Fixed errors in manual
wrote tests to push coverage to 100%
added deleted field to receipts table
added div image_deleted_info to show information if image is
markded as deleted
added markImageAsDeleted function and update RCT_SetImageAsDeleted query
added markImageDeleted function and delete hotkey
change deleted column varchar to char 
changed deleted column to boolean
change type of deleted field to boolean
show string "deleted" before request to database
Merge pull request #89 from masterRules/master

Fixed Issue #76. 
Merge https://github.com/Open-org/PhotoAccounting

Conflicts:
	data/PhotoAccountingDatalayer.php
Center the arrows link in the middle of the image
Merge pull request #96 from abbaco/master

Fix arrows and center arrows in the middle on the image
Updated credentials
added hot_keys table
add hotkey field to webservis response
add setHotKeys function to persist hotkey in database
added support for set_hot_key request
added hotKeyFormatter to display cell as inoput field
added functions to support hotkeys: HK_GetAll, HK_Create, HK_Update
fix
Merge pull request #97 from masterRules/master

Issue #74 finished
Created AbstractThing and some things headers
updated some whishes
restructured tree, as we wont need to get AOSP to compile the project
forgot to add
New droidvncgrab lib
This library allows one to compile droidVNCserver without having AOSP.
Screen grabbing is performed by this library, which is compiled against
AOSP.
removed vnc folder, reduntant
moved suinput
indented
added libpng from ics AOSP
added openssl from AOSP sources
updated LICENSE
added misc things
added flinger grabber method
added gralloc grabber method«
added new nativeMethods folder
ups
start tracking latest apk
added latest androidvncserver version
added libvncserver 099
revamped some files
stage for 1.1a1
use 'master' as default branch
Remove check plain, converst & to &amp;, #669
Begin tests for oembed functions.
Move os_activity block to into the context and remove it from the template file.
Added biblio special case to sv list #224

Biblio gets its nid list from a query instead of entity field query.

Pager still needs to be rewritten.  I think it'll have to be done manually to accommodate biblio, which expects a range of items since it doesn't automatically page like EFQ.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Commodore theme (arts humani theme) css big fixes
Sidebar nice menu cleanup
Commodore theme fixes
OpenScholar theme css bug fixes
Fixed iqss events this week migration.  #1053 [status: needs qa]

Set box to use full html.  That plus the javascript change on events.iq fixed it.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Remove list style from .collapsed. #1058
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Rename scholar_department theme to department
Remove the os_activity block from the projects frontpage.  #1063
fix node order direction on SCHOLAR-3-0 #1061
Patched olark to allow us to prevent olark to be displayed to certain roles as it was in d6.  #1060
Airstream theme: add body bg img to responsive css so it disappears when browder shrinks
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Remove os info from default info file (used for distro)
Ballard theme: fixed Site info fonts
IQSS theme: css bug fixes (still working on it)
Fixed galleries not listed in slideshow.  #1066 [status:needs qa]

This wasn't a migrate problem after all but a slideshow box one.  The slideshow box was populating its list of slideshows with a view.  Because I was being cheap when I wrote that section, it was recycling the view used later on to display images.  It got a list of all the images in slideshows and put their nodes into a list.

Problem was that there was a pager so it was only getting the first ten items.  That's first ten files.  Which equated to two slideshows.  Replaced the view with an EFQ.  Now it gets all slideshows in a vsite.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Temporary fix for sorting biblio nodes and directories in 3.0 branch, #1048
#578: Use node_access to check permissions on add links.
ballard theme fix
Fixed migration's content override option #519

I was using a select to let users choose how to override vsite content types.  By default, migrate would map vsites -> personal, project -> project.  But, because the select had a default value, whenever the form was saved (which has to happen at least once to set up migrate) an override was always imposed.

To fix this I added another option to keep the current type.  This is set by default.  Now you only override vsite types when you really want to.
Began migrating oembed boxes.  #424

My previous assessment was inaccurate.  I did not remember that MigrateDestinationFile (even with the media options from migrate_extra) wouldn't do embed:// as a destination.  Media simply doesn't allow it.  Spent longer than I'd like to admit trying to bludgeon it.

Instead I'm using the MigrateFileFid option.  This lets you specify a fid instead of a file if "for whatever reason the fid already exists" (paraphrasing migrate documentation).  This lets me create the file during prepareRow and tell migrate to use it.

This is tedious since I have to do all the CRUD by hand instead of letting migrate handle it, but it's working.

TODO:
Clean up code.  There's some experimental stuff that needs removal.
Clean up created files.  Migrate won't know about them, so when we rollback or update they should be deleted to avoid dupes.
Actually create the box.  This is just files so far.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
checking wrong constant on spaces_access, should check if private flag is set, #309
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
BZ 888410: The reader sequence can block if there is too much stderr
Merge pull request #1099 from rmillner/BZ888410-stg

[TO_STAGE] BZ 888410: The reader sequence can block if there is too much stderr
-PATCH-493, PATCH-603, PATCH-614
Fix scrolling with page down/up.
Merge pull request #129 from operasoftware/scroll-page

Fix scrolling with page down/up.
added slider bg
fixing bug: if tcp-send results in a dns error, we call release-dns-base (which was only being called if an error didnt occur). aiight
Merge branch 'master' into future
adding prtty print for future
fixed a bug in jquery.media.tracks
fix jquery.media.sync.js
Only adds CSS and JavaScripts to queue when needed.

Fixes #80.
CSS updates.

Fixes #78 by using more specific selectors.
Fixes #79 by moving admin-specific styles to the admin CSS file.
Merge branch 'master' of git://github.com/scholarslab/SolrSearch
State that email addresses will be kept confidential

Email address fields now have an additional "confidential" note for a placeholder. Also added Italian and Chinese translation to the target (looks like they were missing before).
Cambios sobre imagenes de index
updated a song and update jar
Fixing bug caused by synching 200+ participants at once
Adding missing token attribute 'participant_source'
Merge remote branch 'origin/release-1.0.1' into develop
Implementing Onyx operations
tb2 test
*fix* scanline issue
add timer and progress bar to dialog
remove debug html
wcas tprogra
Simplified NextToken by extracting MatchToken and ConsumeToken methods.