labofsahil/github-event-dataset-2012 huggingface dataset:
various fixes, alt tree mode so that not to depend on imgenet api #fail
read from json to speed up tag caching
Find scripts only for Denizens who have PlayerDeath trigger enabled.
Add missing changelog entry for ziprequire removal
Remove link to ziprequire.  See #51
Merge pull request #62 from mnaberez/ziprequire_notes

Ziprequire notes
data_dir: Make possible to use a real dir instead of a symlink

Some might want to use the data dir instead of the symlink,
so let's handle this case gracefully.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
update ael .bb to include the 2 req  git repos
Fix omp. Add omp example.
Using assignee for null-check instead of owner for determining assignee-property
ACT-1067 make 2 bpmn deployer methods protected
ACT-1425 deployment and process definition category fixes
ACT-1333 simplifying upgrade scripts
Merge remote-tracking branch 'origin/master' into etl
Added UFM post-deploy fixes
Merge branch 'ufm_prod' into v1.1.1
Check to see if latest gnus is in .emacs.d and use it if so.
Added StaticPages controller
rspec about page
SAT-97 logo updated
WARNING: lots modifies, change basic UttTextArea data structures
Add basic score info
Merge branch 'frontend' of https://github.com/bagmod/kickpassrun into frontend
Deactivate protocol at the close of the form
new file
Merge branch 'master' of https://github.com/baliganikhil/brock
interface for polybyte is done.
install/configuration script for git
bash prompt fix + showing git branch + cleanup
Keep one single copy of the public key around
Let make release generate and sign mlab autoupdate
scripts/publish: remember to publish mlab autoupdate
2012.12.15 18:44
URLs are hard.
added ebin and include folders
Update server.coffee

Remove that ;)
Minimalize the PS1 a bit.
Find the executables rigth after setting the configuration.

reference #16
(m) Fix capitalization in comment
fix issue 28
Merge pull request #35 from clems/issue_28_clems

fix issue 28
Resolving some TODO items
Preventing the state management system from bottoming out and changing the behavior such that pressing ESC at the main menu does not exit the game but instead sends you back to the previous state, if there was such a previous state.
added keywords to package.json
Added MIT License
Added simplistic test as template for future testing
Use request.get() instead of bare request() for easier stubbing in tests
Fixed copyright attribution; updated package.json to reflect MIT license
Merge pull request #6 from bensheldon/license

Added MIT License
Merge pull request #7 from bensheldon/tests

Initial testing setup
Merge branch 'master' of https://github.com/Stebon24/redwrap
removed local files that no longer exist
fixed improper forming of Reddit API request URL.(no extra slash)
1. Removed parseJSON function. Parsing now takes place inside the exe function. 2. Catch statement will pass any errors encountered during parsing to the callback function. 3. The arguments for request callbacks have changed to (error, data, res). Data now returns a parsed javascript object representing the response body.
The documentation now reflects changes made to the structure of request callback functions.
version 0.0.3
Implemented new engine functions

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Make nmake executable
Add commands to start a review
Doc'd fx
Adding variables for colors. Changing to news site
adding readme about the patches
modifying mountd.dynamic.pseudoroot.always to be able to relative
of nfs-utils source
edit my emailedit my email
Spelling
Merge branch 'dev' into health

Conflicts:
	bika/lims/exportimport/load_setup_data.py
Merge branch 'health' into epid
Sample and AR views
ARTemplate forms
front-page spelling
Remove UnixLikeName validator

close #171
In the middle of the QuarryDB supplier
Fixed up the supplier mounting
Quarrydb coming along...
Mongo insertion working
quarrydb progressing...
isome interesting code
Redirección al estar logueado y entrar a login/registro
Enable RTTI by default (overriding npm default)
gimme cat
Tweak non-method-related test subclasses
clean up sales and income report
We can add system rubygems to load path by using JAVA_OPTS, as http://jira.codehaus.org/browse/JRUBY-6890 has been accepted
CMakeLists.txt
Enabled C++11 support.
Removal of CVectorList complete, now using vector<shared_ptr> instead.
Merge branches 'develop' and 'issue-20' into develop
Enable assets in capfile
cleanup and cache first draft
added support for scheduling downtime for specified host.
make options to showModal() optional
generacion de api, etc
Refactor play_game() and evolve_dungeon so that they can be used one frame at a time in the future.
Add new file to makefiles.
Add a port close function to modules.
fix character left on screen after stealth mode.
Add SDL sound file from Angband, for future sound support.
保持to do list cell最小高度。微调html与css。
new test for CharsetsAvailable
Lock screen adjustments for desktop.
Aux status bar for desktop.
Add 32-char limitation for identifiers
modified to requestToken and accessToken to return tokens
fix returns on requestToken and accessToken
Small correction to readme.txt
Use ASCII for ASCII entries of the database
Updated the database format and improved messages
renamed
redo projak
changed view and url to reflect season
refactored code to use newly released bing_images gem
Various cleanup
Diagrams for composition
Growth and equation diagrams
Checkpoint
Closer to final product
Presenter notes
Minor changes
Add function for checking url.
Update notepad++/Solarized.xml
Add Room.Tweet()
Merge pull request #6 from samuelkadolph/add_tweet_to_compfire_room

Add Room.Tweet()
0.8.7.2 release
solarized colors for tmux
Added line to create static directory
Fixed some typos and minor edits
changing IMC. Using PORT-Enum instead of string field
Implemented 2 more sweeping strategies.
moved bootstrap less files to separate folder
moved bootstrap less files to separate folder
removed old post
Display separate message when there are no accounts waiting for the merge
Allow easy time manipulation.
Changing position in audio stream.
Change -search button style -search panel title -search form scroll -translation in result panel (chrome)
manual merge commit
Merge branch 'interfaceV5' into sextant
* Number of Disc Intersections puzzle from Codility
use facade in switch action
make a swing and a javafx version of the performance demo - both as standalone and as grails clients
22/11/2012 implementado SNT_UNIDAD DE MEDIDA
fixing confirm widget with proper js, updating users with confirm modals
Added the float container fix to the css.
Merge branch 'feature-MarshallGanzCSS' into theme-MarshallGanz
Merge branch 'feature-MarshallGanzSidebar' into theme-MarshallGanz
Merge branch 'theme-MarshallGanz' into develop
Merge branch 'feature-MarshallGanzSidebar' into develop
minor CSS tweaks
added usm logo to footer
moved scss files to their own folder, removed useless files
added featured image area to publications, can now be used on any article with clearfix, slight typographic changes, moved books to top
file cleanup, slight css tweaks
Merge branch 'feature-MarshallGanzPublications' into feature-MarshallGanzFooter
fixed up footer, fixed up major responsive issues
cleanup files, smoothscrolling
more file cleanup
Merge branch 'feature-MarshallGanzFooter' into feature-MarshallGanzSidebar
[BUGFIX] the event object was being validated before entering the detail action, when it shouldn't've been.
Merge branch 'master' of github.com:castiron/cicevents
initial commit

just saving my work, not 100% completed.
CSS for input using btn css
added userImage.jpb
change logo!
Cleaned up the read me file
added peripherial road
Test ssao
Comment out unnecessary debug output in Settings
Adds dummy nowait argument to queue_delete. Closes celery/kombu#163
weird bugfix
test for init-project
added changelog link and fixed wrong version
The cmr-maven jar is now taken from build/lib while the uber jar is taken from the fixed /lib folder in the CMR project
Rollback fix for #224 and add test for refs b/w defaulted params
custom merge - git hat's versaut...
Added ignore rule for ReSharper
Setup environment in .rvmrc inspired by https://github.com/YouthTree/TEDxPerth/blob/master/.rvmrc
Add support to visit_page and on_page for pageobject strings
Updated RDoc and added support to if_page for string parameter
Merge pull request #132 from peterhartman/visit_page_string

Visit page string
Short circuit access controller check if there is no security manager present
AS7-5786 Remote Naming 1.0.5.Final
Minor changes to maps size
Exclude banned netty dependency
[AS7-5784] Adding @PermitAll support, checking annotation targets and adding a warning on possibly risky deployment setups
AS7-5791 Upgrade to 1.0.12.Final of JBoss EJB client library
switch from java regexp to simpler wildcards in deployment overlay links
fixed remove overlay content in domain
better glob to regex translation
removed public static void main() that got in by mistake
AS7-4796 Convert JCA subsystem to ResourceDefinition
AS7-5778  Convert JAXR subsystem to ResourceDefinition
fix few dependencies & poms
Add test coverage for @DeploymentMarker
[AS7-5789] HttpService as optional capability
Convert config-admin to RD
JBPAPP-9963 regression test (Ignored, till the issue is fixed)
recognize and report a timeout waiting for the cli process to finish
cli: initial steps to custom dmr value-type structure tab-completion
AS7-5176 Pass More Metadata from DMR to JMX

In the DMR model there is a lot information that we could pass to
OpenMBeans but don't. This information includes  default value
(DEFAULT), min value (MIN), max value (MAX) and legal values (ALLOWED).

This change includes:

- pass the following information from DRM to JMX
    - default value
    - min value
    - max value
    - legal values
- add unit tests

https://issues.jboss.org/browse/AS7-5176
Play silence while stream is paused to avoid audio glitches when used with JACK.
Major change in pipeline: added a videorate and a clockoverlay element. Changed the configuration file structure in order to expose the overlay element parameters. Added a top level video source streamer execution script that ensures seamless streaming (automatic recovery in case of critical errors that cannot be handled by the gstreamer pipeline).
add spy reward for infiltrating refinery
Added basic API-Docs due to new JSDuck syntax.
fixed installer path issue
Added overlooked migration
save_meta_for now returns boolean. Fixes #678
Initial commit.
Added mongoid
Mongoid saving
Merge branch 'master' of https://github.com/ciaranarcher/voter
found and fixed an issue with the url preparation that was resulting in malformed urls e.g. http://foo.com//method

apparently it wasn't breaking anything as it has been that way for a long time with no one catching it.
implemented TestStreamingClientFactory that acts as a external test seam for setting up streaming message events
The quick-ass fix also broke not-logged-in front page.
Add highlight and clear
Autodoc commit for master/319b97c5
note about occurs-check as Substitution field
* src/main/clojure/clojure/core/logic.clj: all tests pass, update now runs constraints in both stores
add list of things I always forget
more thoughts added to todo.org. remove example from bench illustrating that update-prefix was running the constraints again.
experimental defc
Output gonit status in alphabetical order.

Change-Id: I3ccec2db14fa77d63e6cb5e1d73fe6dda1f19a54
[s1775] Assign PlayerMovement log to LogFilter_PlayerMoves

Also disable by default.
Also disable SQLText logfilter by default

(based on commit [12224] - d34266a)
added netcat src
Added the calc primes benchmark.
Merge branch 'master' of github.com:cmatthew/Lind-misc
Build program library, update autotools.
Fixup: Close team_page_board div
Fixed styling issue on homepage
all notes have been transcribed, but there are a couple errors in some definitions that need to be fixed
added Rob Golding to AUTHORS
A*:n rakentelua Dijkstran pohjalta
Bellman Fordin korjausta, epähuomiossa bellmania ei suoritettukaan V-1 kertaa, joka aiheutti kaikenlaisia ongelmia.. ilmeni vasta todella suurilla syötteillä.
Adding validations and testing
close #182
CSPACE-5642: Fixing pager selects
Merge branch 'CSPACE-5642'

* CSPACE-5642:
  CSPACE-5642: Fixing pager selects
adding data icon font face
add style to dropdown-menu
improve positioning
update test index file
improve styles
replace no border-top by negative margin
print selected item
add color to orange item
testing
NavigationConstant.java
Change-Id: I87269985afb7ced7973ae01f81fece6feede3824
Misc changes.
1.Created new test
2.Junit settings
3.Other misc.
add support for passenger module via passenger gem
add info about passenger module support
fix code format
add support for naxsi module, when installing from source
fixes nginx source install on first run
standard naming
create conf target dir before compilation
fix recipe name check
doc typo fix
Merge branch 'master' into COOK-1515
just move commons to top of source recipe
Merge pull request #21 from artiom/origin/COOK-1511

add support for naxsi module, when installing from source COOK-1511
Merge pull request #22 from artiom/COOK-1417

fixes nginx source install on first run
Merge pull request #9 from pdeschen/master

COOK-1269 add support for passenger module compilation
Add support for http_echo_module in nginx.
Merge branch 'COOK-1527'
Remove default site when required: COOK-1526
Merge branch 'COOK-1526'
Only download nginx source when needed: COOK-1525
COOK-1525, add comment for checksum w/ version
mac80211: don't transmit 11aa BAR to SA

Thanks to Javier Lopez for figuring this out.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
mac80211: clarify some 11aa code

Also indicate no more retransmission should take place
this window by setting exp_rcv_ba to 0.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
mac80211: rename 11aa variables for clarity
mac80211: fix receiver scoreboard shifting
Accept Python long for int type.
Almost finish, js left
Updated gnome-terminal-colors-solarized
Half finished Chapter 8
Merge pull request #216 from creisman/master

Moved add members into house settings.
Fixed IE8 javascript bug (hopefully)
Merge branch 'master' of https://github.com/Full-House-UW/fullhouse
PCB Readme
Edit Album stuff
Firefox compatibility fixes to lawnchair's IndexedDB adapter.
Manually unregister event handlers in Lawnchair's IndexedDB adapter.

This prevents a leak in Chrome.  Granted, this is actually a bug in chrome:
the request objects should get garbage collected which should also free up
the event listeners.  But this doesn't appear to be happening.
Update lawnchair to match Chrome 21.

Numeric constants for transaction mode are deprecated, and transaction
creation inside a versionchange transaction is disallowed.
Make lawnchair indexed-db adapter safe in contexts w/o indexed-db (android 3).
Firefox compatibility fix for indexed-db adapter (sigh).
Turn off IndexedDB on Firefox.  Too problematic...
Use local copy of webfont loader script.
Use local copy of Delius font.
Removed from tfs source control.
c20 limit
Fixed drag-and-drop going to wrong window (issue #217)
Prevented GUI resizing that may make PrimerSeek look odd
changed readme cause I can
fix mysql agent
fix for products not showing in customers controller
a NB about format spec
pure-ftpd 1.0.17a

* Version 1.0.17a:
    FD_SET(-1, ...) is invalid, but it could happen
on aborted transfers,
causing Pure-FTPd to exit without removing ftpwho
entries nor atomic files.
    safe_fd_set() has been introduced to solve
this, it just works like
safe_fd_isset() and ignores descriptor -1 and
it has been placed on the same
places.

* Version 1.0.17:
    Some fixes
were made to the traditionnal Chinese translation by Flaw Zero
<flawzero
at eyou.com>.
    Autoconf was upgraded to 2.58.

TLS_CERTIFICATE_PATH has been renamed TLS_CERTIFICATE_FILE.

--with-certfile has been added to ./configure to set up a value
for
TLS_CERTIFICATE_FILE. The default value has been reverted
to
/etc/ssl/private/pure-ftpd.pem.
    Solaris NIS accounts can now be
converted using pure-pwconvert.
    Don't drop capabilities too early,
or even chroot will be prohibited.
Thanks to Arkadiusz Patyk, Li-Ren and
Philipp Kern for their report.
    Negative return codes are not used
any more - reported by Andrew Victor
<andrew@sanpeople.com>
    System
users whose password is '********' are now imported by
pure-pwconvert
(for newer MacOS X).
    New file : README.MacOS-X.
    Use SO_REUSEPORT
in place of SO_REUSEADDR to bind the ftp-data port on
FreeBSD. Suggested
by Henri Virtanen <hvirtanen@daous.com>.
    Big change in the way
upload are handled. We now maintain a per-process
unique file name in an
"atomic_prefix" global. This is the name of a temporary
file that is
actually used for upload, through the get_atomic_file() function
that
adds the basename if needed. Once the upload is completed or aborted,
the
temporary file is renamed. Or hard links are created when autorename
is asked
for (autorename happens after the upload now, not before). It
changes a lot of
stuff in dostor(), but it makes the whole thing easier
and atomic uploads are
really nice for the end user. --no-truncate (and
the global no_truncate) can
keep the old file when a new version of a
file is being uploaded.
    Redundant calls to get_usec_time() were
removed.
    Julien Andrieux's parser has been added to contribs.

Errors when SSL certificates are missing are more explicit.
    The SITE
TIME command was implemented. Suggested by Mark.
    A new sample of a
PAM configuration file has been written. The previous
one is still
available as pure-ftpd.old.
Added errors messages
Merge branch 'master' of github.com:cykod/Webiva-video
Update hubot version to 2.1.x.
buggsssss
Jars added
Merge branch 'master' into diony/databaseklassen
added socket to dump current queue contents
remove deadlock issue: reading threads where blocking and holding a lock needed by writing thread
print queue contents
use stacktracer to debug deadlock issue
better print of queue in logging
make output less verbose
ENH make runjinja.py script to allow code generation w/o waf
Fixed responses to have proper 'application/json' mimetype, and remove unnecessary simplejson import
Merge branch 'master' of https://github.com/dalanmiller/ledger
Refactor out some error handling
auth start
Add account works

Now add account works. Had to remove password and other craps when
adding the account explicitly.

Update plugin too.
quasi start
E thicknes...
E thicknes...
Make the new tomato visible
Merge branch 'master' of https://github.com/danieldanciu/fling
Atualizado para release 241009 do subversion.
Fix public api tests in agent_channel
fixed bug that only showed up in testclient but was actually in middleware (why didnt client break? no idea, but it doesnt matter
Arreglando el nombre de clases a mayusculas y agregando la clase Libro
limpieza del main y agregue clase libro
Strange, but cool.
normalized declaration
add type annotations, fix bug in innerHTML

Review URL: https://chromiumcodereview.appspot.com//10913120
DAL createDocument fix
Switched up custom text to be in title field, not description.
Added functionality for multi-city support.
Multi-city support flag tweak.
fixed violation
fix callstack problem
Some minor changes at the beginning
Common last version
Updated links and stuff.
Fix ZSH prompt

Did not work with hub
Remove Node version from prompt
added .gitignore and .gitattributes
get svn revision number from git svn
removed mediainfo and zenlib

This is a video player, dammit.
removed ugly custom background from volume control
removed support of some old and dead subtitle formats from vsfilter

Why?
PowerDivX is ancient;
XombieSub is ancient;
USF never got any traction;
changed default settings

* go to fullscreen without any key modifier, just 'enter'
* do not hijack system volume controls
* remember file/dvd position
* autoload some audio and sub languages
* autofit player to screen
* play next file in folder
* changed osd font to something more vista+ like
* snap to screen edges
* lock the window resizing to the video's aspect ratio
* use video title when available
* always on top when playing
* prevent minimize when playing on non-default monitor
* user a higher priority for the player
* enable fast seek
* use desktop resolution to render subtitles
* disabled internal audio switcher
* other things I can't remember
gave round corners to the OSD
replaced filetype icons with davidm147's

from http://davidm147.deviantart.com/
removed .style file creation when saving some subtitle types
change how vsfilter draws subs relative to video or screen

SRT will now by default be drawn relative to screen
ASS will now by default be drawn relative to video
few patches from threaded-vsfilter
const correctness
simplified max texture resolution selection for subtitles
readded mpcinfo project files with a few fixes
first attempt at making seekbar a little more modern
use more modern, antialiased fonts

This will probably fuck up everyone who is still stuck with XP.
Not that I care, it's their fault for using 10 year old software.
changed toolbar skin
paint chapter positions on the seekbar

this only works with mkv/ogm chapters for now
set parseProperty() private and fix words bug of this method name
add fiters capabilities to relations
kdapp 0.8のスナップショット更新
v0.2.2 Final Sync with local git repo
dist zilla from apt-get
TU-141 - TestDataGenerator.generateReformulationModelConceptNetwork
- did KBAdapter.reformulationModel and also simulationModel
Nannananna. There's no limit!
Tilausviiteviivakoodin kosmeettinen siirto.
Myyntitilausrivien splittaus.
T-funktioitu.
Uusi laskupohja jossa ei näytetä aleja eikä verollisia rivihintoja.
Lasketaan viron tapauksessa verollinen loppusumma eri tavalla ku suomen keississä.

Suomessa homma menee niin, että laskun loppusumma on sama ku verolliset rivihinnat yhteensä.

Virossa homma menee niin, että laskun loppusumma on verottomat rivihinnat yhteensä kahteen desimaaliin pyöristettynä ja siihen lasketaan sit alvit päälle. Virossa ku ei näytetä verollisia rivihintoja ollenkaan laskulla niin tällä tavalla laskettuna laskun alv-erittelyyn ei tuu pyöristyseroja.
Pari fixiä.
Kuvaavammat selitykset
Merge pull request #490 from devlab-oy/juppe/laskupohjaviro

* Viron laskupohja *
Merge branch 'master' into sami/logistiikka
Tsekit-funkkaria käpälöity.
Use re.UNICODE for category/package name regexes.

This only affects r'\w' with Python 2.x, since Python 3 already
defaults to re.UNICODE behavior when compiling unicode str objects
(unless re.ASCII is specified). If a repository wants to ban unicode
categore/package names then we can add a layout.conf setting for that,
as discussed in bug #435934.
RepoConfig: add find_invalid_path_char method

This binds filename validation to the RepoConfig, so that eventually
we'll be able to control it via a layout.conf setting as discussed in
bug #435934.
Add _get_feature_flags(eapi_attrs) function.

This will be useful for adding flags that behave specially in
experimental EAPIs, such as the targetroot/sysroot flag which is
planned for EAPI 5-hdepend.
scan all lib subdirs

Rather than hardcoding lib/lib32/lib64, scan all dirs starting with "lib".

URL: https://bugs.gentoo.org/435834
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
env_update: scan all dirs starting with "lib"

Also see bug #435834 and commit
7fb9758506341ffc05585fbd18f2be58ef0e16c2.
Reorder and cleanup of ebuild(5)
Adjust code of first paragraph of ebuild(5) to 80 char width
Fix referencens to Dependencies section of ebuild(5)
Better documentation of PDEPEND in ebuild(5)
Improve wording of *DEPEND variable description in ebuild(5) a bit
Reorder description of --root-deps in emerge(1)

80 char width and max 1 sentence per line.
env_update: use eroot variable more
_create_use_string: pass in feature_flags arg

This allows them to be looked up outside of the USE_EXPAND loop.
use `readlink -f` if it works

Rather than always re-implementing `readlink -f` in shell, probe the host
tool first to see if it works.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
drop support for QA_DT_HASH/QA_STRICT_DT_HASH

These variables have been deprecated in favor of the new variables
QA_STRICT_FLAGS_IGNORED/QA_FLAGS_IGNORED, and the tree has been
converted over to the new ones, so drop the old vars.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Updated readme to mention the exposed Q object, the literate programming docs, the testing mechanism, and the minified version for browsers.
Automatic doc and minification for version 0.2.0
fixed code broken by CLI upgrade
more changes due to CLI upgrade
Merge branch 'master' into dev
one less pbutton
check_interest bug
Merge branch 'master' of https://github.com/dhminch/bittorrent
[ticket/10308] disable retain/ delete posts option when deleting a user

When deleting a user, it asks whether the posts by user should be retained
or deleted. The selection should be disable if the user has no posts.

PHPBB3-10308
[ticket/10308] Displays message to user if there are no posts.

While deletng the user, if the user has no posts in addition to the
options being disabled an added message is displayed.

PHPBB3-10308
[ticket/10308] fixes language entity.

Language key has been changed and has been made more specific to
avoid conflicts

PHPBB3-10308
[ticket/10308] fix language and user's total posts

language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
[ticket/10308] renames language key to USER_NO_POSTS_DELETE

language key renamed to make its usability more clearer.

PHPBB3-10308
[ticket/10308] fixes user deletion if no posts

introduces a hidden input field with retain posts as the mode in case
user has no posts.

PHPBB3-10308
[ticket/10308] fixes sql query, limit it to 1

instead of fetching all posts by user we limit the query to 1 to check if
a user has posts or not

PHPBB3-10308
[ticket/10308] makes variable boolean

makes user_row['user_has_posts'] boolean instead of 1 or 0.

PHPBB3-10308
[ticket/10308] fixes language variable name

Language variable has be renamed for better understanding

PHPBB3-10308
Added static default error handling to activities.
Added register capability. Updated misc. things for 0.6
Закомментирован код обработки алиаса в CUrlManager.
Bugfix in date filtering in video search.
Fix system paths in script
turn on gevent + 30 sec keep-alive
Merge branch 'master' into keepalive

Conflicts:
	services/templates/supervisor_django.conf
Merge pull request #44 from dimagi/keepalive

Keepalive
fixed tests, better device management
something
Merge branch 'master' of github.com:diskhub/LeedsHack3
z-index fix
Merge pull request #2 from RayFranco/master

Fixes the z-index problem
Account Credits
[DDC-1637] Implement PersistentCollection matching
[DDC-1766] More cleanups
vlg - post review fixes.
first commit silhouette para git y heroku
first commit of silhouette for git and heroku
first commit of silhouette for git and heroku
ajustes para guardar nuevas ubicaciones
Correcciones
	Los campos booleanos, que en mysql son tinyInt(1), en el schema son booleanos(1)
	Los campos telefono_1 y telefono_2 de la tabla Ubicacion ahora son telefono_ppal y telefono_sec
	Reconstruidos modelos, filtros y formularios
Nueva caracteristica
	La clase de control de googlemaps ahora tiene el metodo callGeocoder
		Permite llamar el objeto geocoder utilizando un string
Nueva correccion
	Corregidos los llamados al campo telefono
Nueva caracateristica
	Creada accion para guardar nuevas sucursales
Nueva Modificacion
	Nuevo metodo del la clase controladora de googlemaps: destruirActividad
	agregadas validaciones y mensajes a la creacion de nuevas ubicaciones
	incluido metodo de destruir la actividad del mapa cuando se crea una ubicacion
- Eliminados css que no se utilizaban, agregado otro que si
Nueva caracteristica
	Creados los metodos para editar y eliminar ubicaciones
Nueva caracteristica
	Creado metodo para limpiar y reiniciar el mapa completamente
	Integrados metodos reinciar el mapa en la vista de sucursales
	
Nueva modificacion
	refactorizado las acciones de sucursales
	separadas las acciones ajax en el partial actions
	en assets_sucursal estan las configuraciones e inicializaciones del mapa y de los popups
	creado el arreglo markerFormArray
Nueva modificacion
	Separado el modulo ubicaciones del cpanel
	creadas rutas para cada accion realizada en el modulo de ubicaciones
Nueva modificacion
	refactorizado el metodo getSucursalesPorOrganizacion para retornar un json o un doctrine_array dependiendo de lo que se necesite
Nueva modificacion
	borrado codigo comentado
Nueva caracteristica
	Creado el esqueleto del modulo de anuncios
		Creada la lista
		Creado el formulario de nuevo.
			El contenido de la pestaña tipo anuncio depende de la seleccion del combo tipo_evento, cargando via ajax los formularios que se soliciten
	Instalado el plugin jwysiwyg de jquery
	Integrado el plugin jwysiwyg en el formulario de anuncios
	Ajustadas configuraciones del formulario de anuncios
	Creada ruta para el ajax de carga de formulario
Merge branch 'abeja_reina' of https://github.com/drakezilla/guammas into abeja_reina
Nueva caracteristica
	Creadas nuevas acciones del modulo de anuncios
		Creado accion de guardar los anuncios dependiendo de su tipo
			Creado metodo universal de guardado de tipos de evento
		Creada accion de eliminar anuncios
		Creado metodo personalizado de inicio de actividad en el mapa
			El marcado del punto geografico carga los valores de los campos de coordenadas en el formulario de anuncio_evento
Nueva modificacion
	Corregido bug al eliminar los infowindow al editar una ubicacion en el modulo de ubicaciones
		Quitada llamado a rutina innecesaria de eliminar infowindow
Nueva caracteristica
	Guardadas las ubicaciones del modulo de anuncios
Nueva caracteristica
	Implementado estilos en el panel de empresas
Nueva caracteristica
	Mostrados los 3 ultimos anuncios de una empresa
		creada consulta para traer los ultimos 3 anuncios
足りないもの追加
Merge branch 'master' of github.com:drakontia/dotfiles
can return object literals etc
.gitignore 書いた
vcs でリビジョンまで出さないようにした
missing files
missing file
added rvm for reby version management
libs hinzugefügt. vielleicht schaffen wir ja IE 10 support
Minor change to allow NLP error message to work.
Merge branch 'production' of github.com:dsnopek/lingwo-old into production
Merge branch 'master' into production
lingwo_korpus: Letter select gets it's list from the radio buttons, not the Annotator.pos_list, so the order is correct.
lingwo_korpus: Fixed the first letter select for Polish.
fixed #1022: add the comment for CCString::stringWithContentsOfFile.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1022_string_with_file
Update cocos2dx/include/CCString.h
Improve Lua engine

rename executeFunctionByRefId() to executeFunctionByHandler()

add executeFunctionWithCCObject()
add pushIntegerToLuaStack()
add pushFloatToLuaStack()
add pushBooleanToLuaStack()
add pushCCObjectToLuaStack()
fixed #1028: correct directory name
Merge pull request #758 from minggo/iss1028_makefile

fixed #1028: correct directory name
remove exception catch from CCLuaEngine::executeFunctionByHandler()
fixed #737: remove view id
Merge pull request #759 from minggo/iss737_remove_viewid

fixed #737: remove view id
Merge pull request #755 from dumganhar/iss1022_string_with_file

fixed #1022: Added a static method named CCString::stringWithContentsOfFile. 
Merge pull request #756 from dualface/fix-lua-engine-bugs

fixed #1030: Improve Lua engine
Added support files for Accelerometer Simulation for iPhone Simulator and
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
Merge pull request #760 from Wartortle/iOSSim_Accelerometer

fixed #1033: Added support files for Accelerometer Simulation for iPhone Simulator an...
fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG
fixed #737: remove view id
Merge pull request #767 from minggo/iss737_remove_viewid

fixed #737: remove view id
Merge pull request #766 from assoulter/master

Fix m_nEntryID typo
Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h}
Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp
Merge pull request #761 from peoronoob/linux

fixed #1051:Fixed and improved building on Linux
services: GitHub: repo contents API support
Merge pull request #35 from DmitrySandalov/github_repocontents

github: repo contents API support
github: code review for adding support for repo contents

Fix some param names and usage, extend the tests, return the actual
download URL from the (renamed) archivelink() method.

Also whitespace and PEP8 fixes.
Now using pluralize on home page
Working admin page with table

just need to add finishing touches
added menu categories entity, fixtures
added ability to clear stickies
changed to escape double quotation on inserting sticky entry
add devise
add signin
working authentication
implement efficient value pattern
update libraries
rewrote the bash config
Add netbeans jsbeautify by Drew Hamlett
Merge branch 'master' of github.com:einars/js-beautify into gh-pages
Spring framework version upgrade 3.0.6 -> 3.1.2
Last changes to program - ending around page 130
Serious fixes.
RandomBoat works fine
Add more C# files to ignore
Improve tests for bitstring macros
Trololo cfg
Initial bashrc
Test code for other neural net composition
Add _unchanged_ user/group value
Update deps
Cleanup bit files
Add some roots shild theme stuff
More changes to cornbread and cornbread dressing recipes
added newest printable files
editing gemspec
Completed Chapter 10 Exercise
added stacked bar chart for rx and tx data
Case-insensitive tab completion for readline
More robust message parsing code.
Add 5 seconds for attachment point change from one broadcast domain to another.  When the attachment points flap quickly, the controller should avoid learing the attachment point but should continue processing the packet.
added an example of a custom matcher and how to use an implicit to use not, be/have
added a build.gradle file to test the JUnitRunner
using the specification arguments to override the command-lines one and allow to use "sequential" from inside the specification
added an example of junit runner with a sequential spec
specified the jdk to use in the travis file
added a new pp method where it is possible to pass a show method
added a new inline method to add only the middle fragments of a specification without the start/end
added the possibility to specify the equality function to use with the haveTheSameElements matcher
better indentation for the TraversableSpec
made the aka methods lazy in their parameter to avoid evaluating objects which are only used in case of a failure
fixes issue 88. When a malformed regular expression is passed to the 'ex' argument on the command line, it is replaced with a quoted one (using the Pattern.quote method)
refactoring of the "matches" method for examples so that it is safe
started fixing the locations for mutable specifications
fixed the location examples for "should" and examples (in acceptance and unit specifications)
added a location example for an introductory text, a paragraph and an end fragment
fixed auto examples when extending SpecificationWithJUnit
added tweaks so that e.g. auto-examples spanning several lines in mutable specifications can be recognised
fixes #91
fixed the json matchers so that they accept Any as value types
fixed the streaming display of results when executing with the console
fixed the issue where the html statistics were not displayed in case of a failure.

This occurs with the sbt runner and was a result of not using the result of the specification after stats are stored and SpecStart/SpecEnd are updated with results.
This also explains why the index link icons were not displayed properly.
reduced the contention on the execution of fragments
added more time to the storage phase for the TestInterfaceRunnerSpec examples
added another of adapting a matcher

By writing the function first:
  def haveExtension(extension: =>String) = ((_:File).getPath) ^^ endWith(extension)
Added Ponysay 2.2
updating a lot of documentation
AjaxRequestHandler can delete entities
Fixed url-params reading
AjaxRequestHandler provides creationstructure
Startup params will be read via get or post.
-PdfCreator
Merge branch 'master' of https://github.com/eumel1990/JiMs.Bar.git
-PDFCreator exportieren von Bons funktioniert wieder, Layout muss noch
geprüft und angepasst werden.
::uuid() is now a valid Id type
uuid type IDs now CRUD correctly
removed uuid library: without a random seed v4 UUIDs were coming up identical; switching to avtobiff's erlang-uuid lib
changed uuid libraries, updated rebar.config accordingly
removed extraneous debugging line
refactored keytype into boss_record_lib
added PK blurb to readme
Merge pull request #38 from kevinmontuori/explicit-keytype-2

Explicit keytype 2
fixed few minor typos in check and remove of nested virtualization
ttrololo
moved src/test and src/demo to ./
Manually merge PR #18 "Content returned from a server function that requests not to be cached"

Original proposal by @johanberonius
Manually merge PR #23 'Fixed issue with setting CustomHost[.css]'

But in different way by instroducing new argument and shave of a string function insted of introducing a new one.
Original patch and report by @gbentley
Add Croatian translation
Merge pull request #4 from emodric/cro_HR

Add Croatian translation - 4.7 (Etna) / 2012.4 translation campaign
Renamed DynamicConfigResolver to ConfigResolver
Bump to Symfon 2.1.1
ChainConfigResolver : priority should defaults to 0 and sorted routers should be reinitialized each time we add another resolver to the chain
Added tests to ChainConfigResolver
REST: Implement loading drafts of a user
added update persistence legacy handler
make space, not tabs
Easier reload
Split phlog() out of a class definition file

Summary: We can't put functions and classes in the same file any longer.

Test Plan:
This warning vanished from the new linter:

  >>> Lint for /INSECURE/devtools/libphutil/src/error/PhutilErrorHandler.php:

     Error  (PHL3) One Class Per File
      File 'error/PhutilErrorHandler.php' mixes function (phlog,
      phutil_error_listener_example) and class/interface (PhutilErrorHandler)
      definitions in the same file. A file which declares a class or an
      interface MUST declare nothing else.

               342  * @return void
               343  * @group error
               344  */
               345 function phutil_error_listener_example($event, $value, array $metadata) {
               346   throw new Exception("This is just an example function!");
               347 }

Also ran 'arc' and loaded Phabricator.

Reviewers: vrana, btrahan

Reviewed By: vrana

CC: aran

Maniphest Tasks: T1103

Differential Revision: https://secure.phabricator.com/D2596
Mark floats in printable value

Summary:
The output is confusing for `assertEqual(0, 0.0)`:

> Expected: 0
> Actual: 0

Test Plan: New test.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3475
cope with punctuation within words
builds in-memory database, but alists become too slow fast
update NEWS
assorted buildsys cleanup
add license and vim modeline
changed non-archive period
Implemented task list.
Set default target distance to 25 meters.
First draft.
.\PlayerTestFixture.cs
增加 function 预先判断
cosmetic changes to absorption/reduction handlers
Merge branch 'development' into group2
Separated offer functions in AbstractCountry for CDM
Corrected the title page email addresses
Typo in README.md
Merge pull request #15 from piouPiouM/patch-1

Typo in README.md
add bin/tl-init
renamed methods
[story] Portfolio should belong to user
My talks shows only current user's talks
[story] User should be founder of group on foundation
Readme-Basics
Prepare parser for future encodings
Remove extra require
Simplify test case
Make common.createConnection configurable
向系统中添加缓存功能
Chapter 2.2:  Improve some german translations
Chapter 2.3:  Improve some german translations
Chapter 2.4:  Improve some german translations
Chapter 2.5:  Improve some german translations
Merge branches 'master' and 'master' of git://github.com/feugy/mythic-forge
Merge branch 'master' of git://github.com/feugy/mythic-forge
Merge branch 'master' of git://github.com/feugy/mythic-forge
Merge branch 'master' of git://github.com/feugy/mythic-forge
Merge branch 'master' of git://github.com/feugy/mythic-forge
Merge branch 'master' of git://github.com/feugy/mythic-forge
Hyperion: enable Http cache for static RIA
~second commit (on master, b1 not merged w/ 1 commit)
Fixed top menu css problems
Add count methods for literals.
refactoring
remove version information from external JS libraries' files
chrome: add details
use handlebars for desktop html (others will follow)
add login fail strings
check if login was successful
More collision map code, preparation for pixel-perfect collision detection
Added stubs for pixel-perfect collision
Included LibNbt.Test/CompoundTests.cs, missed from last commit
Use g_object_unref
zsh, profile
config ignore
Add option to trim whitespace before validation
4/10/2012 updates
forgot to add model line for that last migration
Small CSS tweaks + jquery.proximity
Add URLManagerDemo proj
Change config for /blog/ sub-directory
fix incorrect gender for user join notification
Added the PBS/torque submission script and the PAN sources to the list
of ignored files
Now delete the file when it has been successfully restored at the
processing center
继续添加博文
refactor
Delete Holidays
Reverted previous commit
Updated README, added Java 5 to Java 6 TODO
Sort webkit dep in paraview 3.14
added google sat and osm as background layer
added administrative limits as overlay
translated a few strings
Base64InputStream optimization
Base64InputStream speed optimization
Merge branch 'master' into booksdb
updated TODO
Merge branch 'master' into multidirs
updated TODO
Merge branch 'master' into multidirs
Red/Green/Blue color names
Merge branch 'master' into multidirs
fixed seek bar start view
Merge branch 'master' into multidirs
fbreader-action:bla-bla-bla URLs processing fixed
Merge branch 'master' into multidirs
XHTMLReader reused
more TODO items
Merge branch 'master' into multidirs
file aliases (for reference shortening), not used yet
Merge branch 'master' into multidirs
unused classes
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into booksdb
Merge branch 'booksdb' into booksdb-ics
Merge branch 'ice-cream-sandwich' into booksdb-ics
Merge branch 'booksdb-ics' into library-service-ics
readLanguageAndEncoding => detectLanguageAndEncoding
separate methods Book.getEncoding & Book.getEncodingNoDetection
synchronization with native branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into booksdb

Conflicts:
	src/org/geometerplus/fbreader/library/Book.java
default hyphenation language
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into booksdb
Merge branch 'booksdb' into booksdb-ics
Merge branch 'ice-cream-sandwich' into booksdb-ics
Merge branch 'booksdb-ics' into library-service-ics
Cleanup, added alias support, can now delete users and aliases
SiteStats: use field names in select instead of *

Change-Id: Id8eefdf5fb320a920b7d1c725e0d250f9b6125c1
use consistent "controller" abbreviation
Added getters for constants where needed.
Packaging 1.5.0-1
packaging 1.5.0-2
packaging 1.5.0-3
Packaging 1.5.0-rax1-1
complete Response and part of Session content.
No underline for download link
memolist用の設定を用意
update addons in release.xml
add qt4 example
Avances en páginas de prestador e inscripción
Merge branch 'master' of https://github.com/gomezhyuuga/SiRASS
Always show notification when test mode.
1. Add dist/ dir for putting  apk/jar
2. Add content for README.md
3. Dont always increase unread
Tiny change docs.
* Fixed handling of OleVariant type (was messed up with Variant), now comparisons with colevarianttype work correctly, resolves #22504 (r21970 was correct but not enough).

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21976 3ad0048d-3df7-0310-abae-a5850022a9f2
* Fix for TField.OldValue state, patch by Lacak2, Mantis #19542


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20704 3ad0048d-3df7-0310-abae-a5850022a9f2
* don't push/pop current_module.localsymtable when adding explicitly created
    pointer/arraydefs, because these operations can have side-effects in case
    of helpers (will add/remove helpers, so popping after the insertion
    removed all helpers in the static symtable of the current unit)

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21282 3ad0048d-3df7-0310-abae-a5850022a9f2
add showproduct.php file
added supporting resources.
Probando en test.java bu.hashCode
Merge branch 'master' of https://github.com/gres147679/Algos_3.git
Merge branch 'master' of https://github.com/gres147679/Algos_3.git
Finalizadas las pruebas de Git
OOZIE-1032 Create JMSService used for any JMS compliant product (Mohammad)

git-svn-id: https://svn.apache.org/repos/asf/oozie/branches/hcat-intre@1402670 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1033 Generic utility class to register/unregister a JMS message handler(Mohammad)

git-svn-id: https://svn.apache.org/repos/asf/oozie/branches/hcat-intre@1402672 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1033 Generic utility class to register/unregister a JMS message handler(Mohammad)

git-svn-id: https://svn.apache.org/repos/asf/oozie/branches/hcat-intre@1402673 13f79535-47bb-0310-9956-ffa450edef68
GROOVY-5721: Fix return type inference when a class is a subclass of a generified class
GROOVY-5590: Caused by: org.codehaus.groovy.runtime.InvokerInvocationException: java.io.IOException: Cannot run program "find": java.io.IOException: error=24, Too many open files
GROOVY-5456: Error when type checking a division
   The type checker didn''t check that the left-hand side of a division (binary expression) was of number type
GROOVY-5444: Missing metadata information leading to failure in static compilation
GROOVY-5482: Type inference error with lists.
   - This is a partial fix, it probably fixes most cases, but there are chances that one day, a UnionTypeClassNode gets in the way, though I didn't manage to find a real use case
Slightly changed the unit test so that it compiles when used in static compilation mode
Updated button to Search from Done as requested in OpenCloudConf presentation
Merge pull request #3 from kborchers/master

Updated button to Search from Done as requested in OpenCloudConf presentation :-)
[Update] Jingwei, This is an example of improving
further tests
total folly, mixing allow and deny subordinates does not work.
the chain has to be the same throughout
New Protocol PT502 not yet tested. It has an unkown error.
took out lines in homepage and added in a line for projects page
fixed all tree related crush problems; updated labels and minor typos
Allow empty bindings for loop form.

Closes #132.
Merge branch 'master' of github.com:halgari/clojure-py
Remove some extension points and expose the underlying locks to subclasses.
Use the underlying lock in PersistenceCache
Added an index version of the PersistentCacheStorage2.
Marked both PersistentCacheStorage2 and Indexed version as @Beta
Ser correct author tag.
Added tests to ensure correct behaviour of status categories.
Changed to Range to ensure correctness.
Added possibility to change the method of the request.
Change headers of response. Should be considered internal API.
Use new Response methods.
Moved invalidation of cache to be correct according to spec as denoted in todo.
Upgrade NING
- Refactored parser
Updated imports and avoid linkify in rich text fields.
Stylesheet fix for admin header line.
removed else part in process_slides, since DB sets default value
Build the qt5-qtlocation-git package.
fetcher: Always delete the tmp host key file after getting its fingerprint
controller: disable/enable main folder watcher during the right times
setup: Add help label explaining why email is requested
readme: bump git version requirement
improve tray, rename some functions
Changed cox so that it's scheduled method explicitly does an observe, decide, act cycle. To match this the brain now gets a new observation object each cycle. Plus moved the shared final goal into observations and executes a land action when it is matched without delving into type specific choice.
Add sample of ext link module to download.
This is a commit in the branch1
Merge branch 'branch1'

Conflicts:
	README