labofsahil/github-event-dataset-2012 huggingface dataset:
added castcollectiondown as static method, pdfgenerator now takes invoiceitemdata
RoomData nullpointer sollte weg sein
Merge branch 'master' of https://github.com/markusmo/HotelSoftware
centralize date conversion
Marshall Changes
the slope is opposite? proč?
Add zencoding mode
button disabled
Merge branch 'master' of git://github.com/mastergreg/db-aviation
?
Merge branch 'master' of https://github.com/mathematiker/Topologie
Merge branch 'master' of https://github.com/mathematiker/Topologie
Merge branch 'master' of https://github.com/mathematiker/Topologie
Rescue from NoMethodError
.osx: Disable automatic termination of inactive apps
.osx: Speed up Mission Control animations

Note that I don’t completely disable the animation, as that results in a very unpleasant effect.
Updates from class 7
added go back option on view houses
make names consistent (sequence -> base where applicable); work on finding ALL orfs
Merge pull request #1 from matthew-parlette/master

Merging Matt's fork back into the master
removed default values from injectVersion

Signed-off-by: Matthew Hare <matthewhare@me.com>
removed old vendor, url updates
Impact Document
Add a comment
Merge branch 'NHS111' of git://github.com/benbunCoder/cdaapi_core into NHS111CDA
tried to fix endless scrolling for users page
still fixing the top bar
Modelado de un niño
Merge branch 'master' of https://github.com/mayela/trabajo-blender
limit number of chars shown in the home page thumnail widgets
Updated message display for YAML 4.0.1
Removed yaml-focusfix from default template
Switch the split direction for better results
Add README and more examples.
slight changes on log level and exception
Latest commit - PhoneGap version for iPhone looks pretty good
2 cookbooks patch levels updated by Chef Jenkins

apache2
iptables
Updating the last auto-commit marker for Chef Jenkins
find exs that derive from Throwable and Error
Adding footer text breathing room.
If it is me browsing, mixpanel can be null...
Tidyed up the README
Minor fixes
* unindented the heredoc
* renamed the dates.txt file to dates.txt.sample
also count md lines

otherwise the layout gets messed up with multiple pages
Update system/application/views/admin/data_view.php

abdul ghofar :

- menambahkan file pada views/admin dengan nama data_view.php, file ini untuk menampilkan log dari tabel ebook
fix multipart parse
Change-Id: I9ed968a485bc6729cd3e3e32aef208d712cc5407
change link to display archive
asmicon: skeleton
Make the demo page more generic
Update jQuery
Make package details more generic
Improve grunt paths
Add more specs
Rename plugin file name and make some improvements
Remove old specs
Now submodules should be fixed.
initial check-in.  plays and stops files with a simple bobo web interface
Fix path in zshrc
Clean up hackathon schedule a bit
Added "cleanup" command
Build copies napi_test_hdf5 -> napi_test_xml -> napi_test_hdf4. Use TARGET_FILE in add_test. Set CMAKE_*_OUTPUT_DIRS to bin, libso, and liba in the compound NeXus project
fixed #16 - database can now be overwritten by using an environment variable
Running all tests should be in order now.
Merge branch 'master' of https://github.com/mnbujold/c415-compiler
replace ... with xml entity
remove layout weight property from url EditText control
favour Integer.valueOf() instead of new Integer()
Merge branch 'master' of https://github.com/mojoBrendan/feedscribe
Updated test: taking PersonRole entity into account
Merge pull request #160 from joerivandervelde/master

Updated test
Use Pinboard API token
Bump to 0.1.0
user case + prototype
cart modified for MZK (column for author, title and year added)
delete cerr output
option to score splan length with guassian pdf
option to score splan length with guassian pdf
option to score splan length with guassian pdf
always try to set JointLM when LM is defined on multiple factors
[maven-release-plugin] prepare release platform-1.1
added spacing between button and pagination
whitespace
sample copywriting change
Undo sample copywriting change.
'Open Badges infrastructure' changed to 'Open Badge Infrastructure'. 'User' changed to 'badge earner' were appropriate. 
'User' changed to 'Earner'
'User' updated to 'Earner'
Changed 'user' to 'earner' at the very top intro paragraph. Otherwise user is appropriate elsewhere. 
'user' updated to 'earner' where appropriate
consumer -> earner, learner -> earner where appropriate
authentication channel -> verification channel
spelling: they badge -> the badge
authenticated/validated -> verified
are currently in developer preview beta version -> now in public beta
User -> Earner
Update templates/issuer.html
Onboarding docs included along with technical docs
Earner onboarding docs added
Displayer onboarding docs added. Technical docs now pointing to github displayer API rather than issuer API
Merge pull request #1 from mozilla/copywriting

Copywriting
Merge pull request #13 from toolness/master

copy changes
configured Emacs with Clojure Mode, Paredit (currently disabled) and Inferior Lisp
Switch to standard PHP curl to prevent recursive logs
Warn when use_list is not specified.

Conflicts:
	test/test_sequnpack.py
Fix warnings in tests.
extracted strings for de,es,fr,it
we moved it one step up in ae03e72
typo
Add Logo, set paper size
Revert "plugins: add by-uuid to smart_"

This reverts commit 492fb560598a80c8956e7df99c904d6e2e481ac6.
The commit message was wrong, and I forgot to correctly attribute the patch, sorry.
plugins: add by-id to smart_

The smart plugin uses non persistent names (/dev/sdX) to
access device block. Moreover, as the plugin use the
filename to retrieve the device name (removing the smart_
initial string and prepending /dev/), only device block
name directly in /dev can be used. Persistent device name
in /dev/disk/by-id/ (or /dev/disk/by-UUID/ or ...) cannot
be used.

This commit adds by-id in the search path, so it remains
compatible with the old syntax.

Closes: #1102, D#628533
trying to fix production css
no more need for fixing toolbars
add test for file attachment
Revert "changing mut_topology() method for chance not to change anything"

This reverts commit 6af5fe6a77199df5581a02806f7ce8c5e3e7e1fc.
revert to previous evolution scheme where parameter mutations are in between topology mutations
uncomplete function of askinformation
Merge branch 'master' of https://github.com/myfavouritekk/iGEM2012
Fixed threadsafety issues with pipeline
The event 'Measurement Anomaly' has been created.
The API has been adapted to use the new event: 'Measurement Anomaly'.
The Newsletter form has been changed to post user subscriptions to a new URL. The cron function of the notification module has been improved.
The on-site consumption page main function has been improved for not logging too many PHP warnings.
Changed repository name. Updated Examples.
added a par-map-reduce function
HHH-7746 - Investigate alternative batch loading algorithms
HHH-7749 - Allow setting system properties for tests on gradle command line
HHH-7758 - Write fetching Developer Guide chapter on fetching
HHH-7748 - EnumType crashes because of unsupported JDBC API in Oracle
HHH-7645 - Enum property defined within orm.xml using enum-type string does not work
HHH-7763 No need to clear caches when these are going to be stopped

* Make sure failures in stop won't affect other crucial stop operations
that could leave nodes unstopped.
HHH-7553 Upgrade to Infinispan 5.2.0.Beta3
Fixed a bug in the directed barabasi generator
Changed the code to load the MWS_* values from an ini file instead of
having them hard-coded into the PHP.  (Mainly so I don't accidently
forget and push a file with an admin password in it to a public repo...)

Also commented out a few debug lines that were writing a *lot* of info
to the apache error log.
Checking in the .gitignore file
Moved the LDAP parameters over to the ini file.  Also removed a stray
echo command that was left over from debugging.
delete old header image
removing meta keywords; updating meta desc.
updated from many ATNF revisions (their 1.19)
an old ATNF update, their 1.1
ATNF updates (WCS and others)
doc change
borrow/wcslib/Makefile.am: build Fortran component of new wcslib error stuff
src/subs/co.for: report wcslib error messages in coReinit
2 weeks of science fluxes added from new fluxcal script: now have more accurate errors and spectral indices when available! AB
dsolinking option
make DSO linking default
keep a local copy and re-use it
src/prog/analysis/hanning.for: port ATNF ptrdiff-related changes
make it work for osx again
larger maxsels so most common subarrays in CARMA will work ant(....)(....)
opcor changes (via ATNF)
doc
formatting updated for fluxcal on science fluxes, AB
Merge branch 'CVSHEAD' of https://github.com/nhakobian/carma-miriad into nsh-ubuntu
[NGRINDER-209]  Fix unit test error
[NGRINDER-141] Implement log tranfer 
- Completed now log is saved in perftest/id/logs
Update index.html

Typo errors
[NOBTS] Several fixes.
1. adjust i18n
2. Introduce NullConsole.. to reduce if statements.
3. remove testTrial concept.
4. adjust agentController logger to show less log.
[NGRINDER-315] Make user agent is assigned first.
[NGRINDER-21]
Renaming package com.nhncorp.ngrinder ==> org.ngrinder
Renaming package BO ==> service / DAO ==> repository
Move several core packages into ngrinder-core project.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ngrinder-controller/src/main/java/org/ngrinder/perftest/model/PerfTest.java
	ngrinder-controller/src/main/java/org/ngrinder/user/repository/UserRepository.java
	ngrinder-controller/src/main/java/org/ngrinder/user/util/UserUtil.java
	ngrinder-controller/src/test/java/org/ngrinder/script/service/LibraryServiceTest.java
	ngrinder-controller/src/test/java/org/ngrinder/script/service/ScriptServiceTest.java
	ngrinder-controller/src/test/java/org/ngrinder/user/model/UserTest.java
show themeing
last bits before announcement
Style cleanup: mixed tabs/spaces were used for indentation in osl_closures.h

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52446 954f8c5b-7b00-dc11-b283-0030488c597c
OSX: disable kernels in cycles gpu again, would only work in 10.8 afaik

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49646 954f8c5b-7b00-dc11-b283-0030488c597c
fix [#33051] view selected (focus) bug

this was really a feature request!, previously the first cage vertex was used no matter what, but no the code checks to use the closest vertex to the original.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51896 954f8c5b-7b00-dc11-b283-0030488c597c
defines to make it easier to manage ik stretch constants (these may need to be tweaked to fix [#32174])


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49313 954f8c5b-7b00-dc11-b283-0030488c597c
UI: add hide/show menus item in header right click menu (same as +/- button).

Patch #32872 by Harley Acheson.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51621 954f8c5b-7b00-dc11-b283-0030488c597c
fix [#31530] Project paint with Clipping border gives opaque background

draw clipping box alpha 0 so reprojection and rendering show the background as alpha 0.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46870 954f8c5b-7b00-dc11-b283-0030488c597c
Bugfix #33159

Histogram in Blender was nearly useless - it just didnt work, showed
confusing blank results.

Two reasons for it:
- It was including Alpha in the weighted total value
  (RGB images have alpha 255 for all pixels)
- It was counting the a total weight value max(R, G, B, A), instead of
  using max(R) and max(G) etc.

Now it all draws much nicer - similar to Da Gimp! :)




git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52178 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #33222: When rendering DPX it's flipped in the Image Editor

Avoid using IMB_flipy from image save callback. It will use a bit more
memory but wold be thread-safe.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52437 954f8c5b-7b00-dc11-b283-0030488c597c
correct scrollbars not working properly with DPI in the console/info view.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52992 954f8c5b-7b00-dc11-b283-0030488c597c
Remove redundant status queue & add check for build request message routing.
Added an alias for network related stuff.
Site updated at 2012-06-06 20:40:23 UTC
Preparing for 0.0.3 release
fix for line config
freeze version fosuser
number_headings_inplace.rb no longer strips off \n
Update adblock#.uc.js filter converting tool and ReadMe.txt.
Make all class-level js_configure blocks evaluate
initial
Merge branch 'master' of github.com:nphillips34/seedchange
refactored code, cleaned up visits method
Removed job, consolidated into the driver.
updated forma.csv
Merge branch 'master' of https://github.com/ntkachov/CS320-Project
reduce README.md \n add projects/android/sdk-explain/index.md
Fixing wrong title size for Freebase.
Adding source method to the GDACS Resource object.
Substituting the [gdacs] variable with http://www.gdacs.org.
Removing puts in gdacs rspec.
Version push to v0.5.0: Add gdacs 'source' method and expanding [gdacs] in url.
Merge branch 'develop'
Fixed alan's name
Cancel parsing if the command doesn't support multilines.
imported article
imported article
Implemented case-insensitivity

New "Ignore Case" option added.
Allow HTML in fields.
Pass values from 2nd region selection to image filter
Impl colortable selection action and toggling of region selection components
Use Xcode4.4-DP5
POST /api/entries complete
Merge branch 'develop' of https://github.com/opendream/OpendreamBug into develop
Enhanced tests (and some bug fixes) for Map Query
Initial implementation of Map Root resource
Time support in Query and Map Root.

Also generate and use numeric layer ids for better compatibility with
the GeoServices REST specification - among other things this lets us
validate the layer list in the map root resource.
Added ping history container (ON-586)
Added availability suspicious/failure state markers (ON-586)
Rolled back previous refactoring per code review notes for af4d9fc5d0 in github
Added a default value for the size of pingcheck history to the configuration file (ON-586)
Code cleanup, removed irritating log statements
Reduced default history size for ping checks to 5 (ON-586).
make french archive style consistent with english
Update notes for submitted changes

* Execute Horizon bin script with correct group.
kill throws an error while finding pid
in quantum dhcp agent section

Change-Id: I602df7875710336125cdbb8407ff293a8e7d448e
Merge "kill throws an error while finding pid in quantum dhcp agent section"
Update notes for submitted changes

* Fix order in graphite storage-aggregration.
show sauna fields on organization
show sauna_hall fields on organization
authorization added, tests not yet working
uri-list selector host/service
uri-list by hostname
removed uri-list filter
Merge branch 'development' into feature/dataset

Conflicts:
	lib/4store.rb
dataset-large tests pass
Changed title headers of each chart to match the charts on right, as per Nick and Jeetendra's request
Merge branch 'master' of https://github.com/osamaomar/EZ-Dashboard
Index page of GitHub
removed marketing expressions, more infos on how to create your app and on controllers
release pwman3
Agora temos Ajax! A busca esta sendo feita usando Ajax (ajax.js) e usando PHP (search.php) para pegar a lista no BD.
Cheers!
Wire throttle-based SPI transmission and radio data transmission.
add setup and teardown tasks
use setup tasks to fix issues with async tests setup
add update method and tests for pages
add destroy method and tests for pages controller
Some minor improvements
Merge pull request #1 from tpeden/master

Some minor improvements...
RESTEASY-747 (b23)
merge from upstream
Merge branch 'Branch_2_3' of https://github.com/resteasy/Resteasy into Branch_2_3

Conflicts:
	resteasy-jsapi/src/main/java/org/jboss/resteasy/jsapi/ServiceRegistry.java
Merge pull request #184 from patriot1burke/Branch_2_3

multipart fixes and build fixes
RESTEASY-775,776
add missing files
RESTEASY-736: Servlet3AsyncHttpRequest sets timeout only if it's > -1.
Merge pull request #186 from ronsigal/Branch_2_3

Branch_2_3
Merge pull request #185 from liweinan/RESTEASY-775,776

RESTEASY-775,776 (Branch_2_3)
remove jsapi-test optimize doseta tests
faviclock example
Updated version on readme.md
mach-tegra: tegra_sleep_stats: fix runqueue stats info

Replace tegra_sleep_stats.c with the qualcom original (which it was
derived from anyway) and fix the tick-sched hooks which were not
present at all.

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:

	arch/arm/mach-tegra/tegra_rq_stats.c
	kernel/time/tick-sched.c

Conflicts:

	arch/arm/mach-tegra/tegra_rq_stats.c
	kernel/time/tick-sched.c
mach-tegra: compile tegra_rq_stats.o

squashed 2 commits

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
rename: modern -> advanced classical.

modified:   FrontBackmatter/preface.tex
modified:   classicthesis-config.tex
modified:   modernOpticsLecture11.tex
modified:   ../phy485/modernOpticsLecture10.tex
modified:   ../phy485/modernOpticsLecture9.tex
renamed:    .gitignore -> .gitignore.in
new file:   GNUmakefile
modified:   notes/blogit/GNUmakefile
modified:   notes/gabook/GNUmakefile
modified:   notes/gabook/cronology.tex
modified:   notes/nonga/GNUmakefile
modified:   notes/otherbook/GNUmakefile
modified:   notes/papers/GNUmakefile
modified:   notes/phy354/GNUmakefile
modified:   notes/phy356/GNUmakefile
modified:   notes/phy450/GNUmakefile
modified:   notes/phy454/GNUmakefile
modified:   notes/phy456/GNUmakefile
modified:   notes/phy485/GNUmakefile
Added ability to add filter if none exist
implemented first pass of task "post permalink to percolate"
implemented first pass of task "post permalink to percolate"
added tests and factories
Fix infowindow, we broke the code a while ago
Updating image links in CSS
Added autoclose.vim
Added fugitive
option to print messages added
Extended the search results to all fields of kitEvent
Release 0.31

added additional placeholder for ISO date format
added template /10 with sample for event micro data
extended code cleanup at all classes and files
moved all templates from /htt to /templates, separate by frontend,
enable
custom templates for the backend and for the search results
changed license from GNU GPL to MIT license (MIT)
updated all header informations
removed class.droplets.php - no longer needed
renamed frontend.css to kit_event.css to force improved loading by the
dropletsExtension
removed class.editor.php - no longer needed
removed backend_body.js - no longer needed
changed all language strings to I18n mode
new col for internal naming
NSHostname challenge
Same for external links.
加入坐标轴的拾取
Working on printTexCalendar()
working on printASCIICalendar()
plone.app.form 2.1
Merge branch '4.2' of github.com:plone/buildout.coredev into 4.2
Provided solutions to the first two questions; second solution is tail-recursive!
added delay argument
Toggling of the update step.
Fixed a bug updating the volume.

The volume was updated in areas where no measurement is available.
Add summarizing description for multi-entry methods.

Fixes #129
Add clarifications to :disabled and :enabled selectors
Added support for escaping variable interpolation
Removing unused executable local variable
Fix permission errors in setting up sentry
switch off the default browser form autocomplete , for editing relations.
Add proem favicon to api docs
add Kollision(Fehlerhaft) mit Animation
gfx-directory added, bomberman.java renamed to Spielfeld.java
Spiel kann nun über das Menü gestartet und komplett beendet werden.
Doch nicht. Aber jetzt!
Merge branch 'master' of https://github.com/propra12-orga/gruppe21
kleinere aenderungen
Bug 56 fixed
Merge branch 'master' of https://github.com/propra12-orga/gruppe23
Bug 56 fixed, Formatierung korrigiert
Merge der letzten Commits

Conflicts:
	src/MapEditor.java
Modifier der Methoden auf protected gesetzt.
level test11*.bml entfernt
Entities are completely serializable now. The image issues are not solved yet though. The serialization process of images must be separated into two parts: The rendered image (dynamically) - The asset image (static). Have to think about it tomorrow...
Double Buffering(Animation) hinzugefügt + Keyimput für die Pfeiltasten zum steuern einer roten Kugel
The Trie is now implemented in function words making the search take
~1/3 the time on average.
nettoyage du html
Added configurations for booting multiple VMs on the same codebase.
vagrant up
vagrant up sqlite
vagrant up pgsql
bug fix matrix upload, new front page
Merge remote-tracking branch 'upstream/master'
video fix
Merge remote-tracking branch 'upstream/master'
new front page
add "create user data for facebook"
fix foodcritic violation
New word file
Form Submission based on the formId. UI for Interview Types .
enable upcase-region command in emacs
Ingore AnnotationProcessor hack
+ ‘phpbb3 download mod jquery carousel fix for no conflict after using jquery base.md’
prettyprint
cfx
prettyprint-notes
Added logic to report controller, am now able to download pdf report
Primeiro commit
Merge branch 'master' of github.com:raul010/Gerador-de-CPF
Added and output stream to the Board class.
updates for all lab parts
Use tvdb_id when scrobbling episodes. This fixes #2 and #5
Background Music from MainMenu.java

Signed-off-by: Valentina Brunnström <valbebi@hotmail.com>
Stack Menu

Signed-off-by: Valentina Brunnström <valbebi@hotmail.com>
moved StickMenu.form
removed DummyDatabase.java
Merge branch 'master' of github.com:refforis/se-os11-plump

Conflicts:
	Plump/src/canvas/comp/StickMenu.form
	Plump/src/canvas/comp/StickMenu.java
	Plump/src/frame/MainMenu.java
Tog bort MainMenu.form

Signed-off-by: Valentina Brunnström <valbebi@hotmail.com>
debug/go: support D_STATIC, D_FCONST on amd64 and 386.
pprof: add basic remote profiling support and heap profiling.
Slightly better test method
Merge branch 'master' of git://github.com/aviflombaum/playlister-rb
update
LuceneTypologySearcher prints time for searching now
Fixed visual bug in single layer preview
slots_users
Finsh demo_app
RF-12207: aligned output-demo with simplification requirements
added first specs
alias at=aptitude broke /usr/bin/at scheduler.
Just an idea: change it to ap
Merge pull request #1249 from korjavin/aptitude

alias at=aptitude broke /usr/bin/at scheduler.
Added lightbox plugin and images for Edinburgh page
Added test code for bundles
simple grunt build for processing coffeescript, less & handlebars
added comms manager so each host can send it's own commands
forgot "self" reference in a lot of places
added check for playing event when viewing host
added ability to remove host
provide check for if host is running
pull now playing information in GUI
fixed sentto method calls

fixed issues with parsing params
started beginnings of "pull" functionality
version bump
Start Bandung 2012 slides
Missing ogv from previous talk
Change wallproxy appid.
add auto-jump to InGameActivity after "StartGame"
Bueno muchachos pudiamor agregar algunos punto
faltanates pero tambien poreparando la documentancion adjunta
begin on uploadManager, complete SQL functions

all all sql functions to query helper
add upload status to laps table
add ID to races table
Begin work on uploadManager
Reverting to CyanogenMod system core
Updated README

Added detail about end of project to introductory exposition.
Update ResumeCompanion's brief!
	modified:   2012/source/sponsors/3-ResumeCompanion.txt
fix errori battitura
Site updated at 2012-07-14 18:31:05 UTC
Massive refacter snmpd->snmp.

Renamed the module from snmpd to snmp.  Changed module layout so that
the SNMP client is installed vi Class["snmp"] and the server is
installed via Class["snmp::server"].
до рефакторинга get_target_date
edit and update modified
temp
Удаление событий
[#20] ZF config is now completely gone
Finished the koans about "expects" which covered checking for equality
Compatibility fixes
Compatibility fixes
bring back the ace editor
STAT-223: moved branches to sitestats/

git-svn-id: https://source.sakaiproject.org/svn/sitestats/branches/sitestats_0-x@72270 66ffb92e-73f9-0310-93c1-f5514f145a0a
windows start
Merge branch 'master' of github.com:samjohnsson/otwarchive
speeeeeeeed (caching on)
changed the name of bot_test form field to email confirmation
Merge branch 'master' into sdev115
moves getSpaceMap function into global
renaming responsive template to desktop
now detects device and browser information and the form is styled

refs SDEV-115

still need to reopen spot detail page when reporting a problem from
a computer after the redirect. also need to gracefully catch the
error when a user enters an email with a bad domain.
Merge branch 'craig'
Merge branch 'sdev115'
+ ‘Testing/’
add history to ChatInputView

currently only arrow up/down can be used to trigger it

Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge pull request #69 from MarcLandis/input_history

add history to ChatInputView
change system folder name to core
Copyright extended
Adding "formidable" to package.json
hooking back up upcoming events and adding a bit of styles, removed old assets that are no longer used
adding meta tag for mobile and doing a little formationg for mobile
grab events via json instead of xml
Merge branch 'enhancements'
Merge branch 'dev'

Conflicts:
	A.txt
3a
Merge branch 'dev'

Conflicts:
	A.txt
ciao
Merge branch '1.1' into dev
Merge branch '1.2' into dev
Ax
Bx
Dz
1.0 a5
2a
3a
ciao
+
1a
Ax
Bx
Dz
cc
Merge branch 'dev' of github.com:sdtmcmorry/github-test into dev

Conflicts:
	A.txt
	README
Sent messages, moze biti poslije iskoristeno, zasad zakomentarisano.
Allow add media in case when no category selected. In this the paretn of
add media is MediaLibrary object.
Create named workers example, allow File lock provider to pull in the path from the daemon's working directory
Bug fixes
add function to index
testing commit without push
2nd commit without push
Site updated at 2012-06-30 18:24:53 UTC
Update openjdk-b145/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java
added possibility to trust certificate
Add a README.md file for github and improve RELEASE-NOTES.txt
Switched to boost pointers to manage TMatrixD lifetimes
Ignoring Composer and PHPUnit stuff from git.
removed admin template override used for FileBrowser.
added url quoting for django 1.4.
fixing categories collab
Fixed a query input history bug.
Twitter gem のバージョンを3仕様に
Removed obsolete files resulted after the repository split.
NR-486: Create New Blog -> Seems there is no way to delete posts from Timeline

fixed.
_e.val().on
Refactored all variables to eliminate errors.  Working now!
Added more vehicles.  Works now!
Changed mismatched variable and corrected variable spelling error.
Added header column to file.  Still getting syntax errors...
yellow task
update last checkin -- forgot to remove the bogus test (realted to the TODO).
Add fired alerts test, and empirical getter. Add annotation for unit tests to make it easier to find during failure. Make sure asserts have proper "expected" and "actual" values in the right order. When values are countable, make sure to check for equals vs. true/false of an expected value.
Test login with token and login information getters.
Reinitialized git repo
Merge branch 'master' of https://github.com/spudstud/Torque-Switch
Added main page and stylesheets
Use `py_ctrl.use_web();` to enable webSql.
finished writeup?
Merge branch 'master' of github.com:stefanbehr/ling570_hw3
cleaning up the mess
add code that fixes the status bar 
add more variants
add note about ML
add note about 3rd party files
bug fixed for url without query.
Update master
Add eventRead and accountRead basic methods
Event endpoint changed, add a debug setup
Add phpunit tests with expected output
Changed private to protected for testing
Added example for replacing used php core method "get_class()" by "getClassName()".
Merge branch 'master' of https://github.com/stevleibelt/PHP_Script
getting ready for 2.0
mod:using python build-in function
added wins losses table to stats.php, changed css a little
Added a basic training status page and tweaked to rotation PDF output.
Adds findAll method
Preliminary controller
QVariantをv2にｓちあ
Illumination also requires its block to be solid
isRegionProtected now checks target block too
FastSwimming doesn't work on two more objects
WaterManipulation can now simply displace water permanently
Frozen waves turn to air when melted
Merge remote-tracking branch 'origin/master'
ADM-misc-34a14.7: When Impersonating in banned user admin automatically deimpersonates and return to his account
added assembler for 8-bit version and renamed files
Correct readme file
Clean up markdown
Clean last commit ffbda2c14
Added validation for the use_sonata_admin configuration value
Changed use_sonata_admin 'auto' to check for SonataDoctrinePHPCRAdminBundle instead of SonataAdminBundle
Added require-dev for sonata-project/doctrine-phpcr-admin-bundle to composer.json
Forgot to delete the old config line in the last commit
Changed use_sonata_admin configuration from scalar node + validation to enum node
Merge pull request #9 from saithis/config-improvement

Config improvement and composer.json update
6-6-12
fix default flush interval
add api to flush manually
fix to use Data::MessagePack::Stream to deserialize continuous several msgpack objects (Data::MessagePack->unpack() raises errors)
fix to use time as localtime
benchmark
search new by url fragment
added search by fragment url
changed url for facebook  and twitter
Merge branch 'fragment_url' into develop
add virtual mechenism
#31: début de la mise en place de la colorbox
user stories alone page, next step: events
bluets21 1
enable vbo module
change stored procedure getanmdescriptors to use taxonomy ID as parameter. Change anm_observations_controller accordingly.
udpated
merged
setup iframe for iphone sim test
Clean code and comments
Fix ::rDelete() to return true number of removed keys
Add explanation of package.
plot: add a post-time/day bubble plot
plot: update colours of posts_per_day and posts_per_week
Added AuroraLib.h/cpp with basic class definition and singleton
Adding api for file management
works with can-Test and runCan0.sh on ch0
Math.hypotenuse: Return nil if either a or b is negative
""b5666d2 Resize image
""
adding coursesize report
re-adding admin.css/less
glossary paging
Merge branch 'gu23' of https://github.com/ds125v/moodle-bootstrap into gu23
optimised gifs and deleted unused files
solved mystery with admin.css not changing
new stuff from bootstrap
some tables, new icons, new less files
Fix estimate command bug with incorrect case number
itegracao com allan e limitacoes de perfil
Close vim files, don't hide them. Gitignore .sw*
Add gitconfig.
some fixes for T=0 during initialization
Conversion to LESS.
Now includes API for adding item to order.
Update ColorTests.m

Updated to include UIColor-to-hex conversion
Update module : part 001
Update module : part 001
Update the timestamp and progress bar
Fixed several things broken by recent gmod beta updates.
Update lib/remote_jenkins_job.rb

flush standard out all the time
updated index file. Moved CSS to seperate file
sys-kernel/mkinitramfs-ll-0.10.4 version bump
removed x11-base/nouveau-drm
added www-client/midori-4.2-r200
sys-kernel/git-sources-3.0.24-r1 version bump
www-client/midori: update
Remove unused class and compiler configs to reduce JAR size
added tag m2m example
Py2.5 support.
Version bump.
Merge branch 'release/2.0.3' into develop
travis-ci.
Don't alias ruby-2.0.0-preview1 as 2.0.0, RVM 1.17 will do it for us

And the previous alias did not work for some reason, RVM reported it as
"ambiguous".
Testing is up to 98%
Cannot login twice, let Alfredo manage it
Moved include headers back into source directory.
removed junk and added it to gitignore
help from Aleksey, getting rid of /tmp/cache files on GitHub
updated form import
contact request handler now default to sending mail
settings has outline of email server
updated form import
contact request handler now default to sending mail
settings has outline of email server
Updated the view to prevent file names clashing when mounted as an engine
use newer version of mr.developer to fix git hangs
add line enconding config
client
ubuntu
Require interrupt handlers to be registered.

This allows it to be save stated sanely.
rearrange error handling -- all panics should be reported
Pipe data from bzr fast-export to git fast-import directly
subcommand branches
template for subcommand update
Added correct path for unicorn pids
mirror back
first post - code needs some cleaning
align on head meta for WindowsPhone <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" />
Add mvn/mr wrappers
Fixing too eager copy-paste.
Bug 797277 - Part 1/3: add `messageClass` attribute in nsIDOMSmsMessage
Bug 797277 - Part 2/3: dom implementation
Bug 797277 - Part 3/3: RIL implementation
Preview bonsai body with redcarpet
fix small layout bugs
clean bonsai model
adding vs com
sync options
settings
typo at classify method
word_count map reduce functions added
minor optimization stuff
tapatalk stuff
Merge branch 'master' of github.com:vranki/siilihai-mobile

Conflicts:
	qml/siilihai-mobile/SubscribeWizardPage.qml
Attempt to modify github gist css.
Solve a syntax error
fixing js bug in add product admin panel
usf.utils id_generator support save-file once-alloc-size and debug
更新buildtools支持XCode新目录结构
Merge branch 'master' into refs/top-bases/t/3rdTools/gtest
Merge commit 'refs/top-bases/t/3rdTools/gtest' into t/3rdTools/gtest
Merge branch 'master' into refs/top-bases/t/3rdTools/gmock
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/3rdTools/gmock
Merge commit 'refs/top-bases/t/3rdTools/gmock' into t/3rdTools/gmock
ændret pubtopic i wiimote_to_twist lavet en launch fil som burde køre den
Merge branch 'master' of github.com:warhorse2012/FroboMind
Removed a restart_syscall as a blacklisted system call
Updated the readme file with the new function names
intensity call inlined
Suppress a warning that spams the log if you don't have metrics enabled
添加Activity ,为以后对其修改做准备.
bugfix in select-das
JavaScript style.
API demo page
refs #83
在响应的 JSON 字符串中添加 message 消息
refs #83
引入 html_entity_decode 方法转换 &uuml; 字符
refs #83
最终为 html_entity_decode 添加了 UTF-8 编码参数, 解决问题.
gave homepage a style
Updated UAParser

Updated UAParser from 1.4.1 to 1.4.3
change config
do some layout
Site updated at 2012-12-13 08:10:16 UTC
add longest palindrom Manacher's algoritm
add spiral matrix
Update bashrc
Add Git config in
markdown syntax bei der readme verbessert
强化未读条目数量
add first blender file
Added some ruby versions for Travis.
1. 重構一下fileObj, 把判斷、轉向移出來
2. 404判斷加強
if date field is blank calendar should populate it with the current date by default
Site updated at 2012-11-06 13:11:17 UTC
Add q31

Concrete Math has a solution using generating functions. Chapter 7. Need
to figure it out.

For example, this one is too slow for n=2000.
add q33

Actually it doesn't have to be so brute force, but anyway since there is
not much calculation.

If the numerator is ab, and the denominator is cd, it can be proved that
it must be b==c or a==d; the other two options are not legal (a==c or
b==d).
Add altenate solution to q31 (using table to record sub problems)
WIP: Bug fixes in downloading of dependencies
WIP: ISIS 3.4 bugfixes.
WIP: More bug fixes in conversion to ISIS 3.4
with bug no fixed
Adds a new member "prefix" to ObjectivePlurk. Also cleans-up code.
Added expanding shell variables in postinstall
ERP-2141: Refactor du DynamicPresentationModel pour ajouter une factory
et permettre de dériver dans Framework pour les besoins spécifiques au
tables Swing.
ERP-2141: Re-déplacer l'abonnement au value changed dans
registerValueModel.
ERP-2141: Permettre de passer le UndoRedoManager au
DefaultPresentationModel pour permettre le undo/redo pour les
CustomValueModel.
ERP-2141: Refactor pour extérioriser la création des ValueModel et les
listeners pour le Map bean change et Map key/value change pour que
binding et framework puisse avoir 2 behaviors distinct pour injecter les
CustomValueModel.
ERP-2141: Mini refactor pour améliorer la performance
ERP-2141: Ajout de tests
ERP-2141: Ajout de test sur la factory
ERP-2141: Changer le type de retour de l'interface
ERP-2141: Split des assert pour les tests
Merge pull request #18 from cnadeau/branch_v2.4_ERP2141

ERP-2141: CustomValueModels
Simplified bus page, began query formulation
Fixed bus error-checking

When checking whether e, E, or . exists, it can differentiate between 0
(found at first character in string) and false (not found).
Added support for "-" checking
Removed $stops initializer (which created an empty entry)
Fixed syntax error

Added ; to end of line 80 in submit_bus.php
Removed old files, began work on form submission

Form submission now uses PHP + AJAX
Started json-parsing and outputting
Additional progress on submission
Update endpoints/photo/PUT_photos_update.md
Compress smiles
system works for addition/delete/update and rollbacks in a sharded cluster. need to do stress testing.
First commit
Fix for the first bugs
* Router well defined
* Fixed misspelled names in many places
* Fixed include path
* Added Twig and its support
* Added .htaccess
Ignoring access tokens
Ignoring access tokens
Remove stale test cases.
ANUMS-2: Added different tile types with movement costs
Made sure List wasn't empty before calling it's zero-eth element in lastEntryAt method of Java driver
Limpeza de ficheiros do Eclipse
test_filtering_apps_by_category
test_that_checks_that_summary_must_be_limited_to_250_chars_on_basic_info_for_a_free_app
addressed more comments from previous pull request
added is_element_not_present to page.py which emulates an implicit wait
Merge branch 'master' of git://github.com/mozilla/marketplace-tests
code review update
Added test to verify search suggestions under the search field
https://litmus.mozilla.org/show_test.cgi?id=66531
Merge pull request #35 from bebef1987/test_search_filters

test_filtering_apps_by_category
Addressing pull request comments
- changed names of is_the_current_page methods in page object
- renamed is_element_not_present to wait_for_element_not_present
Merge branch 'master' of git://github.com/mozilla/marketplace-tests
Merge branch 'master' into search-suggestion
Check that the span is visible for is_app_icon_displayed
Merge branch 'master' into search-suggestion

Conflicts:
	tests/desktop/test_search.py
Updated MockApplication to make the contents of each text field unique for each instance of MockApplication
Merge pull request #41 from bobsilverberg/mock_application

Updated MockApplication to make the contents of each text field unique for each instance of MockApplication
Added a wait to click_my_apps to ensure the page is loaded before returning the page object
Merge branch 'master' of git://github.com/mozilla/marketplace-tests
Attempt to fix test failures due to apps missing prices
Added a private _is_element_present_in_app to be used by the App object
Added a has_price method to the App object
Merge pull request #39 from teodosia/search-suggestion

LGTM and tests pass

Added test to verify search suggestions under the search field
Merge pull request #37 from bobsilverberg/master

extra bonus previously failing tests now passing!

added a test for summary > 250 characters
Merge remote-tracking branch 'mozilla/master' into free_app_edit_listing
update
update view
update
Update
Merge branch 'master' of github.com:AllInOne/BeautifulDaRen
Avatar do face \o
Removing datastores we are not currently testing
Merge pull request #36 from nlake44/limit-dbs

Removing datastores we are not currently testing
Updated Snake Reset

Resets BoundingBox, body, and positions to START_LENGTH
Comment cleanup
Convert fopen() to fopen_s() to remove a warning message
Remove extra include
Push _d pointers into private internal classes
footer styling and image container styling on homepage...and maybe something else.
fixed merge conflict
Added specific examples per DOC-246.
Redesigning upgrade section to use same content but with different files. This is needed for correct paths in breadcrumbs.
Changing ditamap to reflect new upgrade design.
Merge branch 'master' of git.eucalyptus-systems.com:documentation
Changed content to conrefs.
Updated per tech review - DOC-202.
Merge branch 'master' of git.eucalyptus-systems.com:documentation
Incremented patch version.

Actually, the only reason for this is to troubleshoot some issues with the
Continuous Integration (CI) setup. Currently, the CI build can't push to
NuGet, and I'm troubleshooting why. However, to troubleshoot, one must
push a new version of the packages each time, since NuGet packages can't
be deleted once they have been published.
Added stuff for rules package.
Squirrel behavior worked on, still slightly buggy
Merged work on flying squirrel with everything else
Fixed: Memory leak in TbrFrame.frLoadFromBrzFile (Arno Garrels)
Fixed: Memory leak in THtmlViewer.HTMLMouseDown (Arno Garrels)
Changed: Some var params to out params as in Version 11.2.
Fixed: Missing initializations of some out parameters.
A phrase changed
VM_READAHEAD = 512
[mm] various memory bugfixes and tweaks
Small sio tweak
lowmemorykiller: Don't try to kill the same pid over and over
started 64
It works! :)
Comments
Beschleunigung der Dopplungssuche
1. Расширим и углубим встроенный детектор утечек памяти.
   Для debug-билдов при выходе статистика выводится на экран.

2. Утечки памяти в классе Language и функции GetVHDName().

3. Добавлен аналогичный счетчик для аллокаций/освобождений, выполняемых плагином. Пока что только для SCTL_CREATE/SCTL_FREE. 


git-svn-id: http://farmanager.com/svn/trunk@9185 72235d2c-c60c-0410-a47a-a0032694dc5d
Revert "Initial commit"

This reverts commit 3f03c3daeca2ca3161d0a0463135d307825a571b.
static pages controller
static pages tests
finish static pages
removed unnecessary button on week view
#9 Encore une MAJ :p
fixed field names & class names
Merge branch 'master' of github.com:ClTraining/Task-Manager into help_command
Merge branch 'master' into help_command
updated file bindings
aggiornato cap12 di NdP e controllato con controllo lessicale
added the function to filter out all incompatible solutions
added simple parsing strategy, at the end of the main function the determined
program options are printed out in the json format
Added descriptions  for some class methos
803 Build version advanced to 2493-49

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@127270 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@127271 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1193-196

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@112536 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 2491-28

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125425 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@125426 eb64e737-3616-4df0-8941-5ee2ae88103d
CLOUDIFY-816
The validation is now being done for both the file location in the remote server location and for the local file location.

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@119704 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@122253 eb64e737-3616-4df0-8941-5ee2ae88103d
Making plugin actually usable
Merge pull request #3 from pfemiani/master

Lets get v1 out the door!
Some UI Changes
Couple more changes
Added generic liquid container filling to Buildcraft Tank.
- limits.d/sunray.conf: some more per process/per user in @users restrictions
Add the query string value back to the State's getValue function
Fixed an issue with the redirect after logout
Removed the layout query string value from the current URL string
прототип живой системы
Merge branch 'master' of https://github.com/Crazy-Unicorn/Arcomagic.git
updated path to static graph
Moved the Font Awesome font to another directory
Added a padding to the top of the core layout
Added a composer.json file
Added user input and Physics/GUI interaction
Merge branch 'master' of github.com:DBRTeam/Dirt_Bike_Racer
added in ability to not mange the location header
Erroring out quickly - hooray :)
View README.md for details of commit
View README.md for details of commit
IDE: Another common topologies generation improvement

Now fat trees are supported.

Signed-off-by: Alevtina Glonina <alevtina@lvk.cs.msu.su>
GlavniMeniZDodatki1
Dick
Merge pull request #1 from Satum/master

Yo Pul
Added forcing fullscreen and no action bar as a theme.
Tilføjet URL til playlist
Add README.md and LICENCE.
Add package.json for NPM.
finish issue #8 kill actionsheet ,did not finish anchor feature now
update TODO.  I have WIP code to support to/from syntax in queries
Worked on actor movement.
Added Library folder to ignore.
updating to latest stack options
attachments / media / thumbnail
Support for offline compress in jinja2 templatetag

It was written only for django templates
Correc url
[-] StbMainApp: Add Elecard XSPF extension tags

Move standard-violating Elecard tags to <meta rel=""> extensions.
Parser will accept both old and new playlist formats.
changed log for better error checking
fixed the twitter schema to reflect the accurate naming conventions
fixed the twitter schema to use sceenName as alias instead of matching a url and now generate a url based off of the screenName and simplified fb Alias to fbUser.alias
Further altered the schema to conform with twitter standards
Finally fixed the twitter login stuff, albiet without any sessions/update support
Upravil sem - Muffin
Implemented page entity.
add lost methods in PhoneInterfaceManager

Change-Id: I261748c8ebec0c0bc623b762dc08572c51cbb2c1
Add Control Panel
Add MiuiEqualizer
Remove MIUI File Explorer, and add MiFileExplorer
Modify ControlPanel, and add dependencies
Add 3way reboot
Update Busybox to 1.20.2
Add MiuiEqualizer correctly
Add TerminalEmu's lib
Add cron-based cleaning
Locked Init.d support - try2
Re-arrange HomeScreen icons with the new apps
Cleaning
Release update
Some changes for sketch3.
Test commit for FourBros\MonoGame
adding change-versions.sh
Merge pull request #464 from clebertsuconic/Branch_2_2_AS7

version changes
HORNETQ-1025
Merge pull request #466 from jbertram/Branch_2_2_AS7

HORNETQ-1025
JBPAPP-9914 removing extra logs
Merge pull request #472 from clebertsuconic/Branch_2_2_AS7

JBPAPP-9914 removing extra logs
fixing classpath on netty
Merge pull request #477 from clebertsuconic/Branch_2_2_AS7

fixing classpath on netty
Fixing ServerSessionImpl::toString
Merge pull request #479 from clebertsuconic/Branch_2_2_AS7

Fixing ServerSessionImpl::toString
fixing snafu on remoteSession
Merge pull request #483 from clebertsuconic/Branch_2_2_AS7

fixing snafu on remoteSession
v
Merge branch 'master' of github.com:FreakyTiger/FreakyTiger
New DWS test, Baloo config and updated .gitignore
Merge branch 'DWStest'
Preparando ficheros de configuración
City and User models and extractors
Create user.
Salt for user's password.
Remove not necessary uses.
Mail service.
User service.
Confirmation email will send if user create.
Update user action.
Unique validator.
Filter for dub resource and custom method.
Remove not necessary use.
Object not found exception.
Fix $subResource
Rename MailService from Service to MailService
changeForgotPassword
Baseline stuff I had already developed, will put a little more structure in soon
moar gooder layoutses
Gravação e leitura de arquivos.
Merge branch 'master' of https://github.com/GustavoKatel/projetoLP1

Conflicts:
	src/projeto/models/Curriculo.java
	src/projeto/models/Titulo.java
gocce completate
Apps display now generated from database
Refactoring:

Session "nextPlayerCounter" durch variable und setter und getter ersetzt
Refactoring: session-param in the script is now standard in the sendAjaxRequest Method

fixed json bug when attacking a textfield

changed title in the index.php
Added a change password page to the MHS app.
Update the dependency version of messaging-client-core in logappendar
Remove unnecessary proprties section
Stop timer in scribeTopicPublisher is connection fails
Add example for multi topic publisher
some range bug fixes
added bit aware buffers
moved to completely using the new bit-enabled buffers
Add Stream page & give urls for topbar links "Stream" and "Kompomaatti".
Added image for Readme related to issue #34
-Added ItemIsReference, ItemReferenceLoopHandling, ItemTypeNameHandling, ItemConverterType to JsonPropertyAttribute
-Various Metro fixes