labofsahil/github-event-dataset-2012 huggingface dataset:
[TASK] Nein Alexander
[TASK] Nein Alexander
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
blue glow on top of selected tab 1px if docked or undocked
NOT COMPILING: Started with file operations for knowing the last comic
even after quit.
Fix up some exceptions.
Поддержка кодировки
wrap api exception
Modified gemfile to include pg
comment out "allow" in munin-node.conf which is deprecated.
install munin-node plugins
Updated Sat Nov 24 12:00:18 EST 2012
test markdown in readme
Problem 134 added.
Added connect and disconnect
Merge branch 'master' of github.com:hubiquitus/hubiquitus4j
Added Distribution Management to pom file.
buildcheck.py script: tries all combinations and checks for build errors
explicitly cast types in {read,write}BufAt to remove compiler warning
use fdatasync after journaled data write, just to be sure

a couple of tests revealed almost no impact on performance although
added data journaling cmdline switch
check if superblock readable
stub for superblock validation method
useDataJournaling implemetation
new assert macros added: fatal(msg)
internal and leaf blocks sanity check (stubs)
added method for tree nodes validating
renamed check{Internal,Leaf}Block to check{Internal,Leaf}Node
do sanity check after every node block read
checkInternalNode should use .key(), not itemHeader

as there is no item headers in internal nodes. There are only keys and
pointers.
Bugfix: Guard methods that return "shared" images against multithreading problems.
fixed tests to include time
Version bump to 1.2.0
Added Chromista as an iconic taxon.
Added taxonomic csv list export.
Cleaned up some dashboard bugs.
Added comments, id please, quality grade to observations grid view.
Trying out obs grid on calendar/show.
some work on the content script
move lists page so it's on the same level as list analysis and upload
add cdn page
Merge branch 'master' of github.com:intermine/intermine.org
migrated .mtn-ignore to .gitignore
Update Resources/config/services.xml

This is part of a changeset to allow configuration of a cache.
typo fix
logo added
Update index page
Update release notes
Update appcast
Initial sources, libraries, buildfile, license file.
1. Added Page List
preserve trailing null
Added YouTube video to README
TTMatrix: added doxygen links to TTBase items
fixed hilghlight, started on generateAvailbility
save keyword list in localstorage
Update .gitignore

need the jars
change doen in linux
add script readme files
Only display logged out message when a logout occurs
[maven-release-plugin] prepare release 1.3.1.CR2
Avoid inconvenient null return value error.
A better commit message.
Update wiki/plugins/notifications/forms.py

After the commits to truncate long notifications, the key for the 
article notification was moved to a settings file.

No error or exception is being generated when forms.py
fails to import ARTICLE_EDIT (?). 
This causes that the plugin is not shown on the configuration for 
articles, thus impeding any notifications.
Upgrade to Parrot 4.4.0
Pages Working
Carousel Controller: Change to class.

Make the live data controller a class so
that it will not be initialized if not in
use, for example when mock dat is running.
Data Access: Sort for Men. Very rough.
CarouselView: correct template name.
Merge remote-tracking branch 'origin/widget' into widget
CarouselView: restore template name.

Points to carousel/slide per the update
to grunt task.
EventData: Implement basic sort for Men.

First pass at soring by vertical for Men.
Architecture: Refactor Carousel creation.

Move resposibility for creating carousel
instances to HauteLook.Carousel namespace.

See carousel.js.
Mock Data: Add new mock data from 07/18.
Architecture: Continue refactor.

Add factory method for carousel view
to decouple clients from instance creation.
Data: Add sorting.

Create algorithm for sorting events by
rules spcific to men and women catalog
instances.

This feature may be missplaced. It may
be better suited to a seperate class
dedicated to creating data sorted for
the carousel - a "Data Controller"?
Data: provide discrete links object to create.

Give each instance of Event a discrete links
object and verticals array.
Events Model: Add comments.
Merge branch 'widget' of https://github.com/ethanselzer/hl-carousel-1

* 'widget' of https://github.com/ethanselzer/hl-carousel-1:
  Events Model: Add comments.
  Data: provide discrete links object to create.
  Data: Add sorting.
  Architecture: Continue refactor.
  Mock Data: Add new mock data from 07/18.
  Architecture: Refactor Carousel creation.
  EventData: Implement basic sort for Men.
  CarouselView: restore template name.
  CarouselView: correct template name.
  Data Access: Sort for Men. Very rough.
  Carousel Controller: Change to class.

Conflicts:
	app/templates/carousel/slide.handlebars
Rebasing Stuifzand interface on Thin interface: some tests fail
Separating out recognizer general pattern methods: t+
Update Grammar.pod
Bumped version to 2.035_001
Implement more of UI.
Simplify extracting headers from response.
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 test-documentation
kjhkjhkjlkjl
caca
messing with database.yml
set up sound model upload and response
Agregados archivos base de PhoneGap
updated to install data_service view for testing

test assumed data_service view was installed, which may not be there, which would cause all tests to fail.

instead… in the test, install the data_service view.
OAuth2完成
Making a local prompt
Add Impress.JS library
Substituted deprecated constructor.
Added notifications table for local database.  Made relevant  changes to
Notification class.
Fix issue 36: rename add_ to add, move current add to extensions

The old add has been moved to Network.MPD.Commands.Extensions.addList.
It might get removed at a later date.

See https://github.com/joachifm/libmpd-haskell/issues/36
Rename playlistAdd_ to playlistAdd, move old version to extensions

Old version has been moved to Network.MPD.Commands.Extensions.playlistAddList.
Merge branch 'dev/move-add' into next
Wrap stBitrate and stTime in Maybe
Merge branch 'add-volume-type' into next
Merge branch 'use-maybe' into next
Merge branch 'missing-meta' into next
DEBUG: extra func in hexdump.
Fix parsing of dd_progid SH records. Fixes #1189. Fixes #1216.
Update the EPG code to include text at broadcast level, removing title/desc hashing for URI and add a broadcast level linkage mechanism (series link, which shoudl be more like a standard STB). Fixes #1108.
Replace existing series recording with simpler version for now. Fixes #1208, Fixes #1201 and Fixes #1176.
Clean up the UI for series link and related broadcasts. For now all related info is removed and "Record Series" is change to "Autorec" if no series link is available.
Added support for processing default authority (CRID) and modded table code to have a full PID x11 callback. Hooked into existing usage in EIT code.
Ensure that EIT scanning will not block after first pass, will only update as required and will continue to operate if someone stays tuned to the mux.
Include XMLTV channel name in EPG source selection. Fixes #1164.
Merge remote-tracking branch 'upstream/master'
when adding a widget to a container, assert that it isn't already contained
adding customize rake task
ValueRank done
Extensive refactoring in service layer
Removing users collecion on client side as no longer needed
New module notebook
Adding the croquis app
improving the croquis app
Total refactoring (delete old code)
logging out repsonse params in production
fixed some weird heroku issue
more tests
draw rects behind words for highlighting in the svg dom
<leader>space also clear quickfix and location lists, formatting option tweaks
#4: Changed the colour of suggestion annotations to purple
basic transition puts working
fixed up the interface of the database so as to be 'agnostic' to wether its mysql or cassandra
Merge branch 'master' of github.com:jotta/cassandra-testing
make it work on monodev
Small commit to trigger a Travis CI build.
Updated the documentation for this class.
added get_standing_order_items test
added get_unapplied_service_credits test
Update terms/cms_plugin_processors.py
rb_libtorrent: use PYTHON_ABI-versioned boost
Closes #162 bis
Flesh out node and netty benchmarks
Hopefully fixed gitignore.
Merge branch 'master' of github.com:jupiterjs/javascriptmvc

Conflicts:
	site/docs.html
Initial termios support
termios: Add speed mappings
Support TIOCM* ioctls
Add tcgetsid

Forgot this termios function before...
Add pts functions

I don't actually need these, but they let you write termios tests
that don't actually need a serial port.
Add tests for termios/pts functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge pull request #3 from bdowning/master

termios/pts support
Changed 'engine-class-' example to 'app-class-'. The 'engine' convention is probably a bit too idiosyncratic for a proper README.
It is now allowed to create an article that doesn't belong to any idea (such as a blog post).
More #navigation to .navigation in 219-green.css
reworking config; adding environment support
Fix elfinder class
Bug fixed in wrapper.
added fully-functional FreeImage library and ran working test ouput color gradient;
... And the linebreak
Added architecture for second assignment
Broken ores are broadcasted to server
-Changed the dFindWhiteCorner procedure to the more generic
dFindCornerPiece
	-when calling the procedure, $a0, $a1, and $a2 must contain the
	three face colors of the corner piece (in no particular order)
	-in $v0, the procedure returns either the address of the
	upper or down face array
	-in $v1, the procedure returns the index of the corner piece
	in the array
Signed-off-by: Travis Dillan <tad30@case.edu>
use escape not encodeURI - single quotes need to be escaped
Update URl.
add interactiove function lecture
new unified metadata for readme and pypi page
Bluetooth: SSP: Just Works Model in no MITM

In case both side have no MITM requirements, we need
to use Just Works Association Model. We should not
display PassKey in this case and just YES/NO option
should be displayed

Change-Id: I447aa84a0d021e8834138062a26a9380d3b9b2d9
Signed-off-by: AnubhavGupta <anubhavg@codeaurora.org>
using default en for locales
I hate logging so much
"change ssl"
fix last_contact_date method bug
Added buy and sell buttons for marketplace
Merge branch 'master' of https://github.com/lamson6592/canefaitrien
trying to get matrix inversion working
added free text answer mode
scaffold out more, start writing tests
moved old files to old folder
Merge branch 'master' of https://github.com/lectrotext/quicktionary

new stuff from vince
Refacto cache-related
Initial Responsys commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	responsys/pom.xml
addthis block moved in hero block
castling...
added iOS6 Sharing
JUst a test change

Added a ESCAPE character somewhere in Form1.cs
only self
Support a global measure_time for queues
Add support for global measure_time to aggregator
Merge pull request #47 from librato/feature/default_measure_time

Feature/default measure time
rolled back sass-rails to stable build
altered package hierachy, altered docs hierarchy, added logging and deployment of logging, improved config preprocessing.
altered package hierachy, altered docs hierarchy, added logging and deployment of logging, improved config preprocessing. - part 2
altered package hierachy, altered docs hierarchy, added logging and deployment of logging, improved config preprocessing. - part 3
LPS-29577 Forgot .gitignore
LPS-26188 Apply api change
LPS-26186 Provide download token updating Apps in Marketplace
Add @ne helper as the complement to the @eq helper
Changing eq to ne.
Add tests for @ne
Add tests for other types for ne

While adding tests, I discovered some problems with the filter and coerce functions. Fixes included here.
Merge pull request #14 from linkedin/ne

Add @ne helper as the complement to the @eq helper
File
change comment
change comment
popup table styling
updated CHANGES
first session handler and interface
added return_to param+redirect, modified /changes to include revert option and commit option
Add spec for until(). Add until() to namespace.
Fix ansible hosts
Put eth2 in promiscuous mode
Configure for 2 nics
Set NIC to promiscuous mode
Automatically run an instance when everything comes up
Updated README.md
Can handle massive POST submit data
Only run paginate code when necessary.
vdr-skinelchi-0.2.7: added Copperhead's vdr-1.7.33 patch
- Node and Agent defined.
- First factory implemented.
Merge branch 'master' of github.com:luizabrahao/msc-project
finished the valid soduko function, but can only pass the small test
cases.

Implement the isSymmetricTree in recursive function
10pp::test-block-dedup: don't quit the pager even for short outputs
10pp: ignore whitespace when checking equality in the unit tests
10pp: unit test with some more files
10pp::block-dedup: fix extraneus copying; now passes all tests
added new files for relative frequency maps
Merge branch 'master' of github.com:maarten990/Taalmodellen
CameraInfoProvider
Added some more conditions for timestamps
Shell-script upgrades.
translate, search, open_URL, mod_mnger added to xbindkeys
fix module name select in mod_maker.tcl save2module tab
add label about default passwords in GRAFFITI mode
rpmdb & ext3/4 fix
change 01-background detault pass label to use grep /etc/shadow
prerelease 20120518
Merge remote-tracking branch 'remotes/origin/neobht-dev'
Merge remote-tracking branch 'remotes/origin/betcher'
prerelease 20120518-2
Got rid of BookStub
corrected a few errors in 'unveiling play2.1 json api part1'
Akshay : Fixing the back to data senders link on add a datasender page
Performance Build DB from git commit 06766ab04f50762f962d9eaa47e674d6f7c7d46f using node bob
Performance Build DB from git commit 10ead621372f4dfc0feff42896b2241e31a4e812 using node bob
Performance Build DB from git commit 0bb2fed087066a4ae0fff0e070f4f302737865f1 using node bob
Additions to ui and alg sections in DGSR manual.
get the osx package name right and consistent with tarball
criado pasta de docs
connect ssl_options
[courses/enrollments]fix adding a class group to a course
Explicit user per host in SSH config
Start of Service
B1 comple
Adição do phase listener para impedir o jogo sem se logar na aplicação e validação de email
fix presence channel
Updates to patch

Fix the mistakes from my boozed-up original patch
SDL compiled version
locations stylesheet.
fixing groovy repl (we weren't packaging up the associated xml and properties file from the source tree)
Added photo model to backbone
Added a very simple view for photos
Added ability to see the set from the photo route
Changed the structure of the showPhotoList route to be more pleasing
Added some style
Fixed merge conflicts
Release of v0.11.3 for Wesnoth 1.11
ai_helper.attack_combo_stats(): added adjustable rating parameters table

Function call now contains a table through which some of the ratings
can be adjusted.
slight improvement to ITL_StructureWrapper destructor
minor improvement to structure instance constructor
add basic version of ITL_StructureWrapper._Clone()
ITL_TypeLibWrapper: release unused pointer
ImportTypeLib correction - wrong parameter was used
fix ImportTypeLib loading of registered libs + improve error handling
minor improvement to exception message
improve cleanup in ITL_TypeLibWrapper
[#4] begin working on alias implementation (not yet working)
Removing unecessary stuffs (comments)
Fix potential crash bug
Enable SoundHandler

OpenAL build script isn't very good yet. No OSX and Windows support.
"lib" => "extern"
Move periodic task declaration
Update clean up submodule accelerate-io
a few more snippets for php
updating readme about issue with returning `File` objects
Create UI project for Process List page
GraphicsManager, GameComponent added

Moved D3DManager into GraphicsManager so that D3D things can all easily
be replaced with an OpenGLManager that extends the same functions.
GameComponent will be extended by any object that wants to be updated
each frame.
use default cluster name
re add file
Merge branch 'demo' of github.com:meedan/meedan-bootstrap into demo

Conflicts:
	_meedan-bootstrap.scss
ajustando imagens
adicionando senha
alterando endereço
"All" computations are now done incrementally.
Added slug field to Post (gedmo sluggable)
Updated functional tests
Updated routes,controller and views to show post slug in frontend
Updated docs
Added ignore case to the metadata regex for title, artist, album, track and date as these are capitalised in .FLAC files
Added timer, display, dynamic game creation almost finished
Added a Pages controller
Added a StaticPages controller
Added a StaticPages controller
Finish static pages
Cleaning some code styles.
Updated form views and styles
Add flask mail missing extension
Fix markdown URL
personal add page
compress-folder now compress-folders
Twitter shut off its unauthorized access to the public timeline; switching example over to the App.net global stream.
NSCParameterAssert -> NSParameterAssert
Minor reorganization & cleanup
Using consistent urlRequest parameter name in AFHTTPClient
Minor updates to AFURLConnectionOperation documentation
Updating changelog to 1.0
Updating README
Updating podspec to 1.0
avoid warning (error with -Werror) on implicit 64 to 32 conversion
Merge pull request #578 from Madefire/64_to_32_conversion

Avoid warning on implicit 64 to 32 conversion in AFHTTPClient.m
[Issue #579] Fixing last file component in multipart form part creation
Merge branch 'master' of github.com:AFNetworking/AFNetworking
Merge remote-tracking branch 'mattt/master'
cambios menores y comienzo de la segunda etapa
Multiple task types fully supported, includign demo mode.
Floating toolbar (pause not yet functional)
Updated the recoverFiles.py program so it doesn't identify as pdf blocks those blocks that have double brackets in seemingly random blocks of data. classification.txt also reflects this change.
Added DISCONNECT functionality to ZMQ protocol manager
Bugfixes for README.md v2
Updated the kiip binding and sample. It should now be fully working and complete!
Mont's revision of the physical parameters chapter.
Fixed Mont's comments in parameterstudy.
Finished the second pack of Mont's comments.
Oops, wrong branch...
Revert "Get nickname by OpenID AX. bugid:108034"

This reverts commit 9aadefd4f168b7a93c8f3c56c9b178e805e85c4c.
Use "JSON" instead of "Data::Dumper". bugid: 108846
No duplicate global assets. bugid:108730
Watch socket activity in the WebUI.
use meinheld as backend for chaussette
Add a page with information about all the sockets in the webui.
Merge branch 'master' of github.com:mozilla-services/circus into socket-webui

Conflicts:
	examples/example5.ini
fix the stats collector tests
added --log-level and --log-output to circushttpd
Bug 810260 - xul:deck hidden pages shouldn't be offscreen, r=tbsaunde
Backed out 11 changesets (bug 783368) because of build bustage on a CLOSED TREE

Backed out changeset 2bc4310263c4 (bug 783368)
Backed out changeset a35c83a8d99d (bug 783368)
Backed out changeset afb9b2a661ba (bug 783368)
Backed out changeset 3926f510f9be (bug 783368)
Backed out changeset 9d1fe200ff87 (bug 783368)
Backed out changeset b6e4f88f5730 (bug 783368)
Backed out changeset bc53f7dba7c6 (bug 783368)
Backed out changeset 1948fa2fccc1 (bug 783368)
Backed out changeset 9af163388fd1 (bug 783368)
Backed out changeset 7a2256e1aa7c (bug 783368)
Backed out changeset 4da1958a9885 (bug 783368)
Bug 799304 - Document how to enable a CA root certificate for EV (extended validation, r=rrelyea, DONTBUILD
Bug 766883 - Don't abort during shutdown when SignalTracerThread is called twice before FireAndWaitForTracerEvent notices; r=ted
bug 758673 - nsprotocolproxyservice::asyncResolve applies filters twice r=biesi

--HG--
extra : rebase_source : ffae3554c9f73886692d8947850949520c6171d7
Bug 776255 - Rename pref_private_data_cookies to pref_private_data_cookies2. r=mbrubeck f=flod
Bug 800364: Install gaia deps into mock environment. r=rail

--HG--
extra : rebase_source : e852a1cf067cecd87dbdcfb582be9e6b002f440e
Bug 808866 - do not create location providers in child process. r=jdm/amarchesini a=blocking-basecamp
Bug 808993, ASSERTION: must have binding parent when in native anonymous subtree with a parent node, r=bz
Bug 809003 - Don't dispatch load and error events on generated content images, r=bz
Bug 805965 - Geolocation fix jerks around. r=jdm/bz. a=blocking-basecamp
Backed out changeset 9035907b68ec
Bug 805965 - Geolocation fix jerks around. r=jdm/bz. a=blocking-basecamp
Backed out changeset 30b340a71112. r=me
Merge m-c to inbound.
Bug 799344 - Remove nsBuiltinDecoder::GetDecodeState(), so that nsBuiltinDecoder doesn't need to know about nsDecoderStateMachine::State. r=roc
Bug 799344 - Un-templatify nsBuiltinDecoderReader::DecodeToFirstData() so that we don't need to know nsBuiltinDecoderStateMachine's interface in nsBuiltinDecoderReader.h. This means that nsBuiltinDecoderReader.h doesn't need to include nsBuiltinDecoderStateMachine.h when we move the state machine declaration from nsBuiltinDecoder.h to nsBuiltinDecoderStateMachine.h (in a later patch). nsBuiltinDecoderStateMachine.h needs to include nsBuiltinDecoderReader.h, so if nsBuiltinDecoderReader.h needed to include nsBuiltinDecoderStateMachine.h we'd have an include cycle, which is bad. r=roc
Bug 799344 - Flatten nsBultinDecoderStateMachine and nsDecoderStateMachine into a single class. r=roc
Bug 799344 - Remove virtual from media state machine methods, since they're not inherited. r=roc
Bug 799344 - Remove extraneous media includes from nsLayoutStatics.cpp. r=roc
Bug 642257. If there are no plugins in the display list skip a potentially expensive compute visibility pass with accurate visible regions to determine plugin geometry because it is not needed. r=roc, a=bajaj

If there is a plugin in a background tab and a complex scene in a foreground tab the accurate visible regions can cause us to bog down, for no good reason.
Bug 801831 - Don't mark EnterJIT thunk if it's NULL. r=dvander, a=bajaj
Bug 800498 - Check for null context in MainWindowHook. r=jmathies, a=lsblakk
Bug 805301 - Rename iframe.mozallowfullscreen to allowfullscreen. r=jlebar, a=bajaj
Bug 792873 - Ensure that we are using the same IonCompartment throughout the lifetime of an AFC. r=jandem, a=lsblakk
Bug 817122 - Add initial B2G xpcshell manifest, r=jgriffin, DONTBUILD a=NPOTB,test-only
Bug 748384 - Back out 330e9c52f9ac, 9ba1078559fe, 2ed39c12d792, f53f05ecacd5 for build bustage. r=bustage
Bug 782289 - Forward headphone status changed notification from gonk to chrome. r=philikon

The wrong patch was applied previously. This changeset rolls back the previous change and
applies the correct one.
Bug 795580 - Stub shouldn't be copied when it isn't built. r=bbondy
Merge the last PGO-green inbound changeset to m-c.
Merge m-c to inbound.
Bug 685903 - Remove firebug automation from testing/firebug. r=jhammel
Bug 718293 - Anchor string in nsHTMLDocumentSH::CallToGetPropMapper. r=jorendorff
Bug 787289 - Don't copy useless info from about:support. r=dtownsend
Bug 793558 - Time API: changes does not persist after a restart. r=mwu
Bug 794463 - Fix nullptr failure in Azure canvas. r=roc
Bug 794878 - Keyboard API should pass initial values for input[type="date|time"] and others. r=vingtetun
Bug 794881 - Phone state to dialing or connected will clear ForceForUse to None. r=philikon

During phone state of dialing or connected and speakerEnabled not set, the
AudioManager.ForceForUse(NONE) can't be called or will overrite existing
value Ex: BT_SCO during communication mode.
Bug 795395 - Don't unload the library immediately on failure on nsGSettingsService::Init(). r=karlt
We return a failure anyway, so the component manager calls our destructor where we do the unload
Bug 783016 - Make space for Int32 string type. r=luke
Bug 730085 - Object.prototype.hasOwnProperty calls ToString on first argument before calling ToObject on this. r=evilpie
Bug 820200 - Pass application directory to XRE_InitEmbedding2 in content process. r=bsmedberg
Bug 820200 - Enable browser-element oop tests on Windows. r=justin.lebar
Bug 792302 - Add a more useful pseudo stack entry for flushing to FlushPendingNotifications; r=roc,BenWa
Bug 791164: Inherit priveleges for apps that have hwdecode permission. r=jlebar
Bug 816576 - Link libsoundtouch statically instead of dynamically. CLOBBER NEEDED r=glandium
Bug 455165 - Add support for chained ogg audio file and proper metadata dispatching. r=cpearce
Bug 455165 - Put some very verbose media logging behind a MOZ_QUIET=1 check. r=
Bug 455165 - Tests for ogg chain support. r=cpearce
Bug 815579: Increment usecount faster on MI to interpreter calls, r=dvander
xml file for FB changed for Jenkins
Fixed I/O-buttons for loading again.
Merged the Error- and LoadingFragments in the AbstractLoadingFrame.
Reason? The fragments couldn't communicate to the 'parent frame' so
merged them so this communication is never blocked.

Second all getSherlockActivity is replaced by getView() so different
Fragments don't interfere with eachother.
Added io and file io.
fixes for the package
ws tests
Status was not surviving the serialization process
Added back list refreshing when returning to main page
Added update attribute test
this is base version
kleine fout gefixt
Updated to include Pull request workflow
Merge branch 'ui-fixes-incl-drafts'
Updated to include Pull request workflow
Update README.md

+ Test update
Merge pull request #1 from DanteNguyen1008/master

new request
style applied for cells and rows
Merge remote-tracking branch 'origin/master' into gionkoch
Update area and user messages.
Update area and user messages.
Merge branch 'retoschneider' of github.com:naturwerk/naturvielfalt into retoschneider
area mocks updated
Revert "area mocks updated"

This reverts commit c7d839ed7f28909fcd70b287fef1f95750f8fba7.
updated mocks
Remove menu as it is not required.
Remove menu as it is not required.
Merge branch 'retoschneider' of github.com:naturwerk/naturvielfalt into retoschneider
update
Merge branch 'master' of github.com:naturwerk/naturvielfalt
mocked up
Add languageselect.
Add startpage logged-in.
Merge branch 'master' of github.com:naturwerk/naturvielfalt
Merge branch 'ramongamma'
update mocks
update mocks
allowed to edit competitions
Started the outline for start screen and controller
zip scrip
update .gitignore with vim support
start work on zend form
more work with zend form, and services for catalogmanager
add files
add more forms
new services
more refactoring / setup to accomodate zend form
switch to single namespace
remove CatalogManager from src
Finish collision handler business
Effect base class updated
anroid improvements
Merge branch 'master' of https://github.com/nebirhos/JProbe-keynote
changed sudo call to root user
now with guard
fixed close buttons and ESC for lightboxes
historic URLs
updated the filter manager and moved person class into it's own file
Merge branch 'mysql-dev' of github.com:neutrinog/CyberSecurity into dev

Conflicts:
	socialgraph/network.pde
fixed some bugs and abstracted away some of the filtering class variables
Sex Jun 15 15:39:11 WEST 2012 etc
Move number handling to ringer and assigned phone number to normalize and parse incoming numbers.
Use GPIO from git, current gem is broken
Moving the admin UI out
Disabling hiredis
add test-grep task
use an environment variable for mocha grep
add OAE_COVERING environment variable
rename grep to mocha_grep and add to test task
Merge pull request #259 from stuartf/grunt

add test-grep task
Merge branch 'master' into ui
Merge branch 'ui' into uiBatch
Follow up on oae-coverage
Resolving file extension no longer required
No alpha save for 1-bit png's
Commit's Info:

- Se eliminan los bordes de las imagenes link en los modalbox
Fix failing INT test
Commiting code cleanup
Fixing charge specs
Displaying initial status after game startup was implemented.
fix illegal character in get_image.js.php; trigger jQuery ready events
Modified Documentation.html
oop: remove unused properties
oop: coding style for import properties
oop: some coding style for plugins
add theme parameter
oop: fix ExportLatex
Merge branch 'master' into plugins-and-OOP
Merge remote branch 'upstream/master'
Defined missing heading in CommonFunctions.class.php file
Test class for zip_extension.lib.php
Fixed failing test cases of Display Results
Test for _getShowAllButtonForTableNavigation function
Test for _setHighlightedColumnGlobalField function
Merge remote branch 'upstream/master'
Merge branch 'master' into plugins-and-OOP
Merge remote-tracking branch 'yasitha/master'
Translated using Weblate.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'chanaka/master'
Now checks for the correct number of arguments to init
tests for correct number of arguments to init
Update deliverables/Requirement_analysis.doc

analisis kebutuhan
do not include path in hiredis.h include
added Makefile for Linux
[api] Now able to work with other user's dbs
Fix silent failures.

Fixes #3133
fix contain for find method
Revert "sort the mimeTypes map alphabetically"

This reverts commit 90ae2df38ea85fea1a52aaeb83c917085dda5a7f.

The mime type is used by CakeResponse::mapType to determine which mime
type maps to which alias. As this is done in the order of the mimetype
map the mimetype map is order sensitive.
path fixes to work with windows and make tests pass
fixing typo
more paths
Changing references from core.php to new config files.
Fixed TestShell options, removed space which caused the option to not be recognized.
DbConfigTask now writes to datasources.php and removed remaining references to DATABASE_CONFIG.
Merge pull request #926 from dereuromark/3.0-app-path-fixes

path fixes to work with windows and make tests pass
Fix coding standard in AsseticExtension
Add documentation links to AsseticExtension docblock
Add AsseticExtensionTest (incomplete)
Add assetic github repo to vendor script
Add method AsseticExtension::getAssetsUrls() based on AssetHelper
AsseticExtension functional for debug + !use_controller

* Add method getAssetUrl() to AssetsExtension
* Add method getPath() and getUrl() to Routing Extension
Merge remote-tracking branch 'origin/assetic-extension' into assetic-extension

Conflicts:
	Resources/config/smarty.xml
Merge branch 'master' into assetic-extension
Add AsseticExtension documentation
[AsseticExtension] Remove the usage of a TemplateNameParserInterface instance and the list of bundles because the check of active bundles was "suspended"
Add definitions for SmartyFormulaLoader in smarty.xml
Merge branch 'master' of github.com:noisebleed/SmartyBundle
Change supported template suffix from 'tpl' to 'smarty'
Move all AsseticExtension configuration to assetic.xml and add Dynamic\StaticAsseticExtension

* assetic.xml configuration is only loaded if the AsseticBundle is available
* AsseticExtension becomes abstract and must be extended by either Dynamic* or Static* AsseticExtension
Add kernel.bundles parameter to SmartyExtensionTest because AsseticExtension requires it
Pass SmartyEngine to SmartyFormulaLoader constructor
Add script fix_template_extension.php to replace the previous used template extension with 'smarty'
Keep support for both 'tpl' and 'smarty' until we reach 0.2.0
RouteNotFoundException's are caught in DynamicAsseticExtension and the exception message logged
Add a filter to SmartyEngine::getPlugins() so we can retrieve Plugins from a given Extension
Add "/clear" command
Add "/seed" command
make List::MoreUtils a dep
mockup of how this should work, seems tests are failing so its not quite working
well that fixed all the old tests, now for some new ones
well that fixed all the old tests, now for some new ones
it seems like a good idea to carry vars all the way thru while sketching
this is better, all tests pass. Not thrilled about sting ~~ [nums] but hay its localized well enough
now with more tests to make sure that stuff works as intended
documentation changes
version bump
Include these modules so that everything works.
face recognition without dataset
Updating for 1.4.3 release
add locale string
modify preferences
Merge branch 'master' of github.com:nurinamu/AhnSpaceModule
vdsm: pki: install spice duplicate certificates

Change-Id: I1fbe29b53cded96aff786a8ec81db992e028b6a9
Signed-off-by: Alon Bar-Lev <alonbl@redhat.com>
Improve grab\n
Merge pull request #17 from okyeron/master

First pull request
Update master
remove some useless files
update readme
Merge pull request #18 from okyeron/master

Updated Stealth Output Device 
update supported hardware
Updated to fixe 404 Adavision link and add info on Stealth Panel + link
Merge remote-tracking branch 'origin/patch-1'
Check for user in associate_by_email pipeline method. Closes #392
tour exercise 45
Exercise: Loops and Functions
Implement sqrt by using Newton's method
tour exercise 46
Exercise: Maps
Implement word count function
tour exercise 48
Exercise: Fibonacci closure
Implement Fibonacci function by using closure
tour exercise 49
Advanced Exercise: Complex cube roots
Implement complex cube roots by using Newton's method
ignore *.swp for vim
glib: chain up finalize to the parent class

This was missing in some of the classes.

https://bugs.freedesktop.org/show_bug.cgi?id=55521
0.20.5
FormFieldChoice ctor: Fixed wrong index variable

It caused a crash if multiple items are initially selected.
Killed FormField::isModified() in favor of a new AnnotWidget callback

Instead of having to ask FormField from AnnotWidget::draw if the
widget's appearance needs to be rebuilt, now AnnotWidget gets notified
of changes via the new AnnotWidget::updateAppearanceStream() callback.
Generate and write the appearance stream in AnnotWidget::updateWidgetApperance()

Note: At the moment the old appearance is deleted and a *new* xref entry is
created every time AnnotWidget::updateWidgetApperance() is called.
AnnotWidget: Avoid repeatedly deleting and creating xref entries for appearance streams

Previously updating the appearance stream always involved deleting the old
stream's xref entry and creating a new one.
Since xref entry deletion causes the generation number to be incremented, this
behavior caused the generation number to quickly rise during user input.

This patch stops it by reusing the same entry as the old appearance stream in
case of repeated modifications.
Killed FormField::isModified() in favor of a new AnnotWidget callback

Instead of having to ask FormField from AnnotWidget::draw if the
widget's appearance needs to be rebuilt, now AnnotWidget gets notified
of changes via the new AnnotWidget::updateAppearanceStream() callback.
Generate and write the appearance stream in AnnotWidget::updateWidgetApperance()

Note: At the moment the old appearance is deleted and a *new* xref entry is
created every time AnnotWidget::updateWidgetApperance() is called.
AnnotWidget: Avoid repeatedly deleting and creating xref entries for appearance streams

Previously updating the appearance stream always involved deleting the old
stream's xref entry and creating a new one.
Since xref entry deletion causes the generation number to be incremented, this
behavior caused the generation number to quickly rise during user input.

This patch stops it by reusing the same entry as the old appearance stream in
case of repeated modifications.
Create the 24x24 rectangle for text annotation icons from the top-left corner instead of bottom-left
Free entries in the xref form a linked list: terminate it properly when writing the XRef

The last entry must point back to object 0. Previously it was left
unitialized and resulted in "-000000001 00000 f" being written in the
XRef table.
Merge remote-tracking branch 'origin/poppler-0.20'

Conflicts:
	CMakeLists.txt
	NEWS
	configure.ac
	cpp/Doxyfile
	poppler/Annot.cc
	poppler/Form.h
	qt4/src/Doxyfile
Merge branch 'master' of git://git.freedesktop.org/git/poppler/poppler into agg_support
Added a downloadable zip file to the repo
persona nombre, apellido, templates
cambios en el custom
Merge branch 'master' of https://github.com/onrushRus/pelota_paleta
фикс генерация номенклатура
add require_valid_user to couchdb local.ini
fix checker image
reduce number of passenger processes
more search #ASBUILT-4
remove duplicate tagged node theme function that uses item_list #434

Before yesterday, theme_os_taxonomy_tagged_nodes() printed term info &
tagged nodes using just a single call to item_list, achieving indented
child depth with programmatic style tags in (custom)
theme_taxonomy_term_node_render().

For gkplus, I needed to access term information (custom display
settings for headings and indentation) at each child term, so recursion
made more sense than a single item_list.

To reduce duplication, this commit removes the original
theme('item_list') and theme_taxonomy_term_node_render(). Now
theme_os_taxonomy_tagged_nodes() only has one recursive mode.
Migrate search blocks correctly to new blocks provided by new search modules, #533
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Rebased havard_courses to be like in branch 480-2 and merge with 3.x.
Merge pull request #950 from openscholar/480-3

Havard courses API import on 3.x
add info to hook_os_widget
add readme.md for github wiki
simplify os_blog.test setup with admin user method
create os_presentations feature
#1029: Create os_subsites module.
Disable mini_menu when cp_toolbar is active.
Remove Shortcut dependency because why?
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into master7
#9417. поправить нормализацию названия подразделения
update gems
rm unneeded importer
update gems
+ useful scripts
Review fixes
* no "loading" template
* no "flash" template but a fallback one with a Show Resource link
* reuse the NetworkEntry' .error_in_current_response
* s/service/_resource_inspector in cls.ResourceTreeView and cls.ResourceDetailView
* switch this.flat_list to a private variable in window.templates.resource_tree
DFL-3562 Use the parent_view_id to store the last-selected-viewfor overlays
Merge pull request #64 from operasoftware/overlay

DFL-3562 Use the parent_view_id to store the last-selected-view for overl...
[PAXWEB-434] - org.ops4j.pax.web.pax-web-extender-war - 2.1.0 | Could
not parse web.xml

----
merged a fix from master-branch
Merge branch 'pax-web-2.1.x' of git@github.com:ops4j/org.ops4j.pax.web.git into pax-web-2.1.x
Renamed Consts.cpp to consts.cpp, and removed Consts.h; Removed all Uni-related files from Consts.cpp to Uni.cpp; Moved getLines() from consts.cpp to util.cpp
Updated git ignore.
Work-in-progress to merge department and uni classes to a signle uni class; Some rearrangements in Course.h and Student.h
Update last version and release history in documentation
Updated the document.

Signed-off-by: OZAWA Tsuyoshi <ozawa.tsuyoshi@gmail.com>
all working but need to clean up and add fallback for shit browsers
Fixes footer

deleted extran treehouse referral
Nuevas imagenes de index
modified:   .htaccess

aggiunto opzione per evitare l'indicizzazione delle cartelle

new file:   application/.htaccess
new file:   docs/.htaccess
new file:   library/.htaccess
new file:   include/.htaccess

protezione cartelle importanti

	modified:   application/controllers/MakeController.php
bugfix ordine immagini errato, cancellazione vecchi file temp
	modified:   docs/localhost.sql
nome db modificato
	new file:   include/function.php
funzione per la cancellazione ricorsiva

	deleted:    gif.php
rimosso file innutile
rimosso gif.php perchè innutile
Fix add module
Refactoring to clean up code
checksum: 4d861ace718e35d16925a986b74e459f

Signed-off-by: Pascal Vahlberg <pascalvahlberg@yahoo.de>
Added LTL experiment
A fab func to make the loaddb command a little shorter
updated to handle some API changes
added transmission method
SVG version

Couldn't find any for Safari and IE...
Merge pull request #3 from sindresorhus/svg

SVG version
correcao dos paestrantes
Contragent's balance revision added.
added ServiceStack.Text json media type formatter
added missing test files and fixed .gitignore
Merge pull request #23 from pedroreys/servicestack.text

added ServiceStack.Text json media type formatter
Server Status Timeout is now 240s
Re-indent cup of code line
Fix layer overflow
Disable jstree hotkeys plugin
Merge branch 'patch/jsonrpc' into release/1.0
flash notice tests

Wrote product controller and integration tests for flash[:notice]
Added flash[:notice] display code to application.haml
Merge branch 'master' of https://github.com/petekinnecom/Petstorish
added to .htaccess file lines to not require .php file extension for pages to clean up the url
Adds info about the latest merge,
Version bump 1.1.0-rc.1
Update of the contributers.
Version bump 1.1.0
Merge branch 'release/1.1.0'
Merge tag '1.1.0' into develop

Release of 1.1.0
Preparation for new development cycle after release 1.1.0
populating states select only with states belonging to selected country and hide states select if country doesn't have states
deploying cron jobs
file changed to .php not .html
use multi nio server
fix bugs
fix bug
AMD router from brianarn's pull request on boilerplate
Modifications for deprecated attributes in iOS 6
wczytyawanie danych dziala
Fix TOPIC_LINK, and add POST_LINK
w/o debug doesn't work :C
pg sql added
fix typo rightCmarea -> rightCamera
Remove alpha test
Removed passport. Its not gonna work for this since it saves authorization to session. Added validator.
typo
Added comment
Remark
Adding a few faulty input tests
Merge branch 'master' of git://github.com/mamarjan/bioruby-hpc-gff3
Remove unused import from ``app.py``.
make sure tests pass on python 2.6 too
font03
Final change to CSS
static pages
final static
final static1
Fix freetext bug and test a freetext state.
email is sliced
Updated composer.json to comply with new packagist standards.
Scaffolding for module configuration, controllers, views, and routes.
Merge branch 'refs/heads/release'

Conflicts:
	src/ShiftMedia/Item.php
HPCC-8182 Fixed indentation issue.

Fixed tab that should have been spaces.

Signed-off-by: Philip Marc Schwartz <philip.schwartz@lexisnexis.com>
创建execute包，将启动类main和各种window类分开
learning alot about the unstable eigenfunctions of the linearized chemotaxis equations
added django to project
added django to project
removed temporary script used to find figures in rst (not necessary anymore)
Manually merged.
backup script
Merge branch 'master' of github.com:rafaelmohedano/SESCMove

* 'master' of github.com:rafaelmohedano/SESCMove:
  schema Imagem, quadrado e thumb
Versao 0.21 - Todos os cenarios preparados.
Modificado para localhost
learner highest value set to -1
Merge branch 'master' of github.com:rafiquemt/DistSysDesign
updated Linda's bio
user credentials imported from json file
The power of JSON implemented for static datas and user credentials
get_confirmation updated for group sms
bot browsers header datas
service datas here
All your account credentials here
New Features updated
By default do ganeti-only deployment

GWM deployments are always optional and its causing major issues for
deployments.
Update submodule
Add sshd_config provider based on Augeas
Add key parameter to supercede name
Update README to describe new types, improve sshd_config type docs
Fix instances method for `puppet resource sshd_config`
Fix Ruby 1.8 compatibility
Fix specs when using mocha 0.12.0

Remove our requires and rely on puppetlabs_spec_helper to load mocha with the
appropriate MOCHA_OPTIONS.
Fix ensure property in self.instances to be present
Add tests for sshd_config provider
Improve sshd_config Match testing
Refactor common augopen into utility class
target is a param, not a property
Release 0.1.0
Add Match groups to self.instances
Conditions are passed as strings (so far)
Add support for arrays for ((Allow|Deny)(Groups|Users))|AcceptEnv
entries
Add MACs to array types of entries
Improve sshd_config documentation
Do not return position part in label names,
Always return an array for values,
Make sure to only use our own entries in array parameters,
Update rspec tests accordingly.
Fixed dumping bug.
formatting change/test
better formatting for code samples
added a few gems. basic rspec model tests done for ticket and user.  started ticket controller rspec test.
Adding the release date to the JIRA released version.
Add screen shot and move things around.
More deets on authentication support.
Add about software and contribs.
More tweaks.
Merge pull request #22 from reddmetrics/feature/readme

Feature/readme
Added property BsonDate.timeStamp.
Added parsing of content type multipart/form-data.
Fix a regression with updating extra comment data.

The newly introduced _import_extra_data wasn't handling deletion of data
very well, and this broke unit tests.
Fix the cache stats page.

The cache stats page hasn't really worked correctly in a while. This may
be due to the Django changes to cache backends. Either way, we're now
working properly with cache backends, and format our content in a way
that's consistent with the admin UI.
Removed unused variable and added removal of duplicate lines. Should add some optimisation for removing multiple occurances of references to the same type.
ssml: use the document reader API to parse SSML documents
fixing stupid Adnan hardcoding of 150 in the url
Added link to drawing attachment
clean up modal look and css.  Also move the damn button out of the form
move navigation to external file
Improve free markdown editor section
worst typos ever.
Added web servers block in README #1
Merge branch 'master' into orm
Formatting/Cleanup.
Changed name of plugin file. Added entry points in setup file
Forgot to remove the adding of data from this migration.
Version bump in package.json. Pushing to npm.
local saving done
Recuperando tags depois de  erro no form criação conteudo
Merge branch '2.0b' of github.com:robolivre/robolivre.org into 2.0b
Removed static controller/views
Updated ecm_cms locales
funcao consulta recados pronta
Create .travis.yml file, first version

Signed-off-by: Rogerio Prado de Jesus <rogeriopradoj@gmail.com>
try to get font support on travis
[+^] Basic support of Render Builder has been added
Incremental progress on Config::Simple integration. run_as_user still not solved.
Progress on module construction.

Got determine_location working, reading from Config::Simple object,
with INI-style config file.
Incorporate changes from working with TCK
Text of blog post published on the technophobia external blog, that provides a synopsis of the conference experience and my presentation
Merge branch 'master' of https://github.com/rorygibson/osepa-slides
Ioan's suggestions minus fixing the crazy number of parameters
launch file rosparam limits max number of FK points, default 5000
Added all the documentation for vbo
Fix operator incompat. in some queries on contacts table using MS SQL Server (#1488505)
Add imap_connect() method for backward compat.
Remove last instance of storage_connect() with possible performance
improvement when a message part body is in cache
Deprecate storage_connect() method
Fix support for large uuencode attachments.

Currently, Roundcube tries to match with a regexp a whole uuencode
attachment. This is not always possible because PHP enforces a limit
on the maximum match size.
Merge pull request #4 from rasky/fix_uuencode

Fix support for large uuencode attachments.
clustering.py timeout changed to 720s for prod-celery-clustering-1
nada
Merge branch 'master' of ssh://git@github.com/rsantander06/OrgrupPlay.git
User-albums, ajax-pagination & more features added
Making guessing of names more durable. Still needs proper Snow AST
and not just transformation scripts. Fixing tests.
Basic class definition works.
Fixed wikipedia-image parsing code - HTML code of wikipedia changes permanently and they have no API... :(
Fixed some problems with gui.
fix: bugs and index.html
Skip install for the frameworks neeeded for the iOS app
create and login php code functional. index.html is a test file
Removing Treehouse Verification
refactor dynamo lock and allow lock-specific options