labofsahil/github-event-dataset-2012 huggingface dataset:
Correct merge issue.

Something weird happened when merging beta with master.
Ajuste na mensagem para depois da data do casamento
Displaying Date of Stories. Closes #37
added Travis CI support
fixed Submodule for Travis CI
tuning the Travis CI stuff
fixed DB config for Travis CI
changed some DB config (for Travis CI)
Stupid DB config error. Duh!
moar DB config for CI
Removed env setting and db creation.

This is now done in the rake task.
addd Status Images to Readme.

[ci skip]
updated readme; put icons in title
Upgrade to Rails 3.2.7!

* fixed spec helper (duplicate Schnitzelbanks)
* fixed some deprecated `:confirm` opts
instruct travis to only build pushes to `master` and `stable` branch.

[ci skip]
FGCP: Fixed the driver to use :default in entrypoint configuration
add support for @Named beans with tests
different behavior, better arg handling
revert
better parsing still
Got Edit button text chaged
Merge remote-tracking branch 'origin/mikesmithjr' into gh-pages

Conflicts:
	week3/goldapp/index.html
Errors from previous commit have been resolved
Order add_to_shop checking the quantity if it's valid
Merge branch 'master' of github.com:mimarcel/UBByte
queue is actually working as it should
Fix tests affected by empty non-terminal records. Remove debugging leftover in AFXR in.
date filtering fixed for ppr_scheduled
'bundle:list' now prints bundle contents

old 'bundle:list' renamed to 'catalog:list'

(cc @jarodl)
Sorting 'bundle:list' output
poprawa działania obecnych plików

dodawanie i edycja wpisów, index oraz login
A także szczątkowe zadania wysyłania zdjęć
dodawanie zdjęć + zmianySQL

Odpalić zmianySQL.php w celu dodania potrzebnej tabeli w bazie.
Merge pull request #3 from markizzoo/master

qqq
Zníženie kontrastu príspevkov v diskusii.
Pridané zobrazenie podpisu.
Upravené bordery a pozadia príspevkov.
first simulation for RUDP
Merge branch 'timo' of github.com:miun/mediasense into flo
Loads of additions
optimizing SiblingSubscriptionsComplete DAO

Should optimize the query (it can be an expensive query) by starting
not will all available files but only the files actually in the
input fileset to this cleanup subscription. Really suprised this
actually worked before.
Bugfix for harvesting tasktype

Add it to the defaults in wmagent-resource-control
Also fix a reference in the Harvest algo unittest

Fixes #4069
Merge pull request #4072 from hufnagel/siblingcomplete

optimizing SiblingSubscriptionsComplete DAO
Merge pull request #4071 from dballesteros7/add-harvesting-threshold

Bugfix for harvesting tasktype
Bugfix LHE request web interface

Remove the duplicate time per event field
Merge pull request #4075 from dballesteros7/bugfix-reqmgr-lhe

Bugfix LHE request web interface
Improve WorkQueue handling of conflicts on cancel.

For some reason update calls fail sometimes when canceling work. Replace
update with a full save.

Fix #3856
Improve workqueue cancellation error handling
Modify build script for wmcore/wmagent rpm merge
Change signature of Object.getProperty to match Object.setProperty
-Added explicit formats for date parsing.
Merge pull request #549 from mmcguinn/mm535

-Added explicit formats for date parsing.
revised HTML
Update lib/crc.js
fix celeryconfig path for runserver
fix feedback-upon-submission of iframed forms
Dont hit database on n-n relations if foreign key is empty. [ close #1766 ]
update the uranium version to the 85 from 46. which didn't support many of the features we advertised.
Merge pull request #69 from letrest/master

update the uranium version on the download page
extended RF switch IC pads for easier soldering
redirect from old Areas page to contribute page (Bug 781914)
Merge pull request #391 from sgarrity/bug-781914-contribute-area

redirect from old Areas page to contribute page (Bug 781914)
[bug 747071] Added Tamil and Nepali locales.
One locale per line for easier reviewing of changes.
update name in package manifest; add code contributors to list of contributors
Merge pull request #75 from mykmelez/rename

update name in package manifest; add code contributors to list of contri...
Get most of the old regressions to pass, we were missing the Capabilities class.
Added trampolines for global trait methods.
Revert "use 32x32 favicon for AMO"

This reverts commit f5f9ac0240b3f6b907236db119df79a763b72d4a.
bump receipts (bug 793247)
Only summarize webapps, not addons. (bug 813254)
added lightbox dismiss when clicking outside it (bug 750328)
low-tech post hijack detection
Revert "Revert "upgrade highcharts for jq1.7 compatibility""

This reverts commit b0682c150bdb3578dec8ea4f9dd502f704ceaa97.
app-ify admin menu
added snap feature & changed draggable js
updated user routes. added id to routes. user is now accessible with url
Provide an example of using totp-cgi from RADIUS

FreeRADIUS compliant perl handler, configuration file and a basic usage
document.
Merge pull request #10 from tykeal/master

Provide an example of using totp-cgi from RADIUS
rename to mpgat
Fixed image references
Added simple makefile
set git core.pager as less with special params for ANSI coloring
(Authz) Added the ability to determine 'isMemberOf' from the AuthzAPI. This should be more performant than doing 'getMemberOf' and iterating groups to find one.
Make linking 64-bit addons with VCExpress 2010 + Windows 7.1 SDK work out of the box
loggers expect exc_info to be falsey or a tuple, pass in the tuple from ExceptionInfo
Updating the size of the images in the carousel, and making the images rotate automatically.
Added useful hint in setup.busybox module
change notify bg color
add scriptSender.cgi
add editor png
fix dcase flow layout
fix editor height
fix footer
improved datetime patterns for JPA
#201 fixed JPAProvider behaviour
#68 improved support for primitive types
fix generics issue
fix validation test
#116 added datediff and dateadd support
Merge branch 'master' of github.com:mysema/querydsl
Static serving, maybe.
new dev skin and a bug fix on TradeFriendDetailScreen.cpp

Signed-off-by: jsinclair <james@mytcg.net>
Test master -> core commit.

Signed-off-by: andrecronje <andre@mytcg.net>
Merge branch 'core' of github.com:mytcg/GameCards
Profile updates to reflect no more maprofile.h

Signed-off-by: andrecronje <andre@mytcg.net>
Merge branch 'core' of github.com:mytcg/GameCards
Removed maprofile.h information from gamecardscore to be compatible with new version of mosync (3.0.1)

Signed-off-by: andrecronje <andre@mytcg.net>
Updated gitignore for andre@mytcg.net's folder repository, added files for windows phone 7.

Signed-off-by: andrecronje <andre@mytcg.net>
Removed maprofile checks.
Added credits and premium as well as credit reductions.
Changed selected font color to black and unselected to grey.

Signed-off-by: andrecronje <andre@mytcg.net>
ui change on DetailScreen.cpp

Signed-off-by: jsinclair <james@mytcg.net>
Merge branch 'core' of github.com:mytcg/GameCards into core
Added popupbox to GameCards/Dev.
Changed flow changes from screens.
Added popupbox to Auction creation and Insufficient funds.
Added clickable links in cards if selectable is 1 on index.
Changed indexes for multiple categories.
Added GameCards project that points to live.

Signed-off-by: andrecronje <andre@mytcg.net>
fix to loading categories in index/index.php

Signed-off-by: jsinclair <james@mytcg.net>
Merge branch 'core' of github.com:mytcg/GameCards into core
bug fix to test_index.php, for the categories.

Signed-off-by: jsinclair <james@mytcg.net>
Added URL printouts for documentation purposes.
Fixed memory error when backing out of album screen.
Busy adding fixes for premium credits display.

Signed-off-by: andrecronje <andre@mytcg.net>
Merge branch 'core' of github.com:mytcg/GameCards
fix for loading of card images after buying a booster.

Signed-off-by: jsinclair <james@mytcg.net>
Added selection of purchase via premium/credits or combo.
Added premium price to products.

Signed-off-by: andrecronje <andre@mytcg.net>
bb support changes
Merge branch 'core' of github.com:mytcg/GameCards

Conflicts:
	GameCards/screens/AlbumViewScreen.cpp

Signed-off-by: andrecronje <andre@mytcg.net>
2012-03-14-13.26.47: src/lib/std/src/posix-1003.1b/posix-io.api: For clarity, changed read_vector arg from  (File_Descriptor, Int)  to  { file_descriptor: File_Descriptor, max_bytes_to_read: Int }.
2012-03-31-17.41.37: src/lib/std/src/list.api: Commenting.
BooleanField coerce string values
import number of pages and height
Added Java
readme update
Adding databases and comporg
Lots more school added

Just miscellaneous school work being added, including some
comments/readmes
add random assign
Merge branch 'master' of https://github.com/natsutan/Taurus

Conflicts:
	src/Taurus.scm
	src/schedule.scm
	src/setting.scm
Handle ITs and Clirr.
Added ammo to weapons, fixed some rednering issues based on screen size, probably added some other stuff that I forgot. If text wasn't in it before it is now.
try to make nicer code for the paper
cleaning up after NR
compilable model of the search strategy
ignore emacs backup files
more refactoring from NR
fixed 2 minor problems preventing compilation, but still doesn't build
fix bug NR introduced into search
Merge branch 'nr' of github.com:ndaniels/Smurf2 into nr
compiles but blows the stack
refactored mkfile
bye bye stacky
Merge branch 'nr' of github.com:ndaniels/Smurf2 into nr
Eq instance for Scored is no longer bogus
WOOOOOHOOOOOOOOOOOOOOOOOOO
massage edge so it can be imported into paper
tagged more code to be pulled into the paper
went to 'vee' for viterbi, and used map (sadly DL.map due to namespace conflict)
no dl.map
put comment on Seed type
swapped vee' and vee''
Scissors o/
Merge remote-tracking branch 'origin/home' into work
^ Better way of doing the project dropdown
^ Updating line endings
^ Getting efforts to display and save the relevant project properly
^ Putting in all the fields that are required… (still needs work)
^ More work on editing of efforts
Merge remote branch 'origin/work' into home
Proof of concept - integrated architect layout with timeowl
Estimator retries
Exported Results class
Fixed and reenabled ruby_side_struct optimization.
We should not retry submitting shares indefinitely or we may end up with a huge backlog during network outages, so discard stale shares if we failed to submit them and they've become stale in the interim.
Do not recruit extra connection threads if there have been connection errors to the pool in question.
There is no need for the submit and getwork curls to be tied to the pool struct.
Implement a scaleable networking framework designed to cope with any sized network requirements, yet minimise the number of connections being reoped.
Do this by create a ring buffer linked list of curl handles to be used by getwork, recruiting extra handles when none is immediately available.
Use the ringbuffer of curls from the same pool for submit as well as getwork threads.
Since the curl handles were already connected to the same pool and are immediately available, share submission will not be delayed by getworks.
Reap curls that are unused for over a minute.
This allows connections to be closed, thereby allowing the number of curl handles to always be the minimum necessary to not delay networking.
Increase pool watch interval to 30 seconds.
api.c bug - remove extra ']'s in notify command
api.c V1.9 add 'restart' + redesign 'quit' so thread exits cleanly
Icarus - minimise code delays and name timer variables
API bool's and 1TBS fixes
Bugfix: thread_shutdown shouldn't try to free the device, since it's needed afterward
Disable failing devices such that the user can attempt to re-enable them
Bugfix: Return failure, rather than quit, if BFwrite fails
Generalise add_pool() functions since they're repeated in add_pool_details.
Limit the number of curls we recruit on communication failures and with delaynet enabled to 5 by maintaining a per-pool curl count, and using a pthread conditional that wakes up when one is returned to the ring buffer.
Implement an older header fix for a label existing before the pthread_cleanup macro.
Bugfix: Use a 64-bit type for hashes_done (miner_thread) since it can overflow 32-bit on some FPGAs
Merge pull request #191 from luke-jr/bugfix_64bit_hashcount

Bugfix: Use a 64-bit type for hashes_done (miner_thread) since it can overflow 32-bit on some FPGAs
Detect pools that have issues represented by endless rejected shares and disable them, with a parameter to optionally disable this feature.
main: move PKGCONFIG_VERSION_EQUIV to pkg.h
Fixing asciidoc syntax in cypher cookbook example. ENding sentences wit a full stop in config descriptions.
Merge pull request #641 from nawroth/cookbookfix

Asciidoc syntax and language fixes.
Removed superflous semi-colon.
Prevent Antrun plugin from failing at build time.

The Antrun plugin seems to need more of Ant than it thinks it does.
By adding a dependency on the Ant launcher.jar, this intermittent
error goes away.
Move bigger-tests back to community.

The tests that were extracted from this project are back.  What's
different is that they are now Integration Tests running under the
Maven Failsafe plugin, and are wired into the 'verify' phase.

Integration Test filenames do not start with the word Test, but
they do finish with the word IT.  That's how Maven tells them apart.
Timing issue for a test which relied on Thread.sleep
Merge pull request #575 from simpsonjulian/master

Move Bigger-tests back to Community
Fixing Reduce's calculateType
Merge pull request #906 from wfreeman/reducetype

Fixing reduce's calculated type
Moved display to display.py, to reuse in some of the other areas
Added boilerplate code for thread files
Added new file for translate thread
Added new file for write thread
Created separate threads for each. Joined to main
Fixed pointer warnings
updated gitignore
.o files
Fixed bugreport:6428 Fixed behavior issues with script commands replacestr and countstr. Special Thanks to QQfoolsorellina for the extra information

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16764 54d463be-8e91-2dee-dedb-b68131a5f0ec
fixed future issue: now have to declare allow_inheritance. fixed issue with unique bcstrip
Made it possible to create, update and delete users.
create listings model
[WIN32] fixed vs project files for using taglib
[WIN32] add TAGLIB_STATIC to precompiler settings
[WIN32]: further fixes to VC project to compile
[WIN32] download taglib 1.8beta from our mirrors
[filesystems] Implement Truncate/ftruncate/_chsize for all writable filesystems (HDFile, NFSFile, SMBFile)
[WIN32] fixed: use the same implementation for retrieving the file descriptor like in CHDFile::Stat
[tags] Update project files to add new VFS implementation for TagLib
[tags] Add helpers for ReplayGain so that we can simplify the TagLoaders
[tags] Add new TagLoaderTagLib.
[tags] Make TagLoaderFactory use TagLoaderTagLib for most audio formats
[mp3codec] Integrate CVBRSeekHelper & related functions from MP3 into the MP3Codec
This is the only place they are used and they seem more appropriate here than anywhere else.
[cddb] Update CDDB to use TagLib directly for genre conversion so we can demise ParseMP3Genre
[tags] Remove a direct dependency on CFlacTag and make it use the TagLoader.
[tags] Strip ID3Tag back to the bare minimum required for writing ID3 tags, as we don't have a TagLibTagWriter yet
[tags] Make OggCodec use TagLoaderTagLib instead of calling OggTag directly
[tags+ogg] Move Ogg Streams counting into OggFileDirectory so we can demise OggTag.
This could probably be gleaned from the TagLib code later and written into CMusicInfoTag to clean this up.
[tags] Remove parenting from CTag to CID3Tag
[tags] Remove old AAC, Ape, Flac, MP3, MP4, MPC, Ogg, WMA, and WavPack TagLoader header file dependencies
[tags] Remove old AAC, Ape, Flac, MP3, MP4, MPC, Ogg, WMA, and WavPack TagLoaders from Xcode project and remove files on disk
[tags+replaygain] Make ReplayGain normal tags in CMusicInfoTag - we have to read all the tags to get the data anyway.
Finish User Signup Page
added export_fig/ folder, changed some other files
added send pushover function, updated shortcuts
Merge branch 'master' of github.com:nirum/functions
Add missing pyserial package dependency

The pyserial package was not listed as a dependency in the spec
file.  This adds it.
AddTaskActivity without bound checking
AddTaskActivity with bound checking, without dialog errors
First repo change
updated init script etc
Added personal aliases.
Added custom git config.
Added custom homebrew commands.
removed erroneous space from command line.
Merge "Alternate meta header removal method."
Merge "Update swift.common.client with bin/swift changes."
FIX: add NO_ASK to update loop script
Indes Galantes 1735 : prologue, scene 1
Changed background model init
DIL-211 assign an image to multiple collections
Проба на конфлікти
кабінет
forManko(3)
Merge remote-tracking branch 'origin/master'
multylang++
Points game jsp
Add Debugger submodule to the README
Add UIImageView-NDVAnimatedGIFSupport
Animated GIF support (and more!)
TMBOUpload now provides a more appropriate mechanism for getting images, and the view controller uses it!
Update submodule
NXP-10155: remove useless check on selection list
NXP-10184: add compat behaviour to remove icon on singleUserSuggestion + fix contribs to display users/groups listings
standard pword
minor change in .tmux.conf
update #147
Added deployment code & ability to generate CSS.

- Also commented out google analytics code
Added linux support to loc zsh alias
admin_add/edit for 'Menu' part now uses Html->beginBox()
Overall packages upgrade.
Changed the initial path when showing the file open dialog.
Add the showing tools list view action.
add erb filetype
Merge branch 'master' of github.com:ojimac/dotfiles
add jslint
config.php в игнор лист
lombok.jar added. Also CalculationBean and calculation page added for calculation process
Added dependencies

As of Ubuntu 12.04 boost should also be installed
README_EN.txt was renamed to README.md
Renamed GameProcessor.processEvent --> processPlay. Pass along the player ID.
Started work on data structures with which to perform more detailed analysis on play-by-play files.
Added comment about alternative to pattern matching on an Option.
Add Jenkins to README
Merge pull request #92 from LTe/jenkins

Add Jenkins to README
[skin] fix gs in lcd setup
[About] fix BSOD.
[ipkg] cleanup
[UsageConfig] remove epg.dat in /etc/enigma2 when not in use.
[upgrade] upgrade all packages on all devices that have opkg status files.
openvix: build 340
[upgrade] fix typo.
openvix: build 341
[upgrade] fix file path.
openvix: build 342
Merge branch 'master' of git://github.com/OpenViX/enigma2

Conflicts:
	ChangeLog
	lib/python/Components/UsageConfig.py
	lib/python/Screens/About.py
add new ini rc types
Merge branch 'master' of github.com:openaaf/enigma2
Windows: afslogon expand short domain names

Depending on how the user specifies the domain name during login,
NPLogonNotify may be given a short or a full domain or kerberos
realm name.  If the name is the short name, attempt to expand it
automatically if there is no 'realm' configured for the short
domain name.

This patchset relies upon data in the local registry instead of
using an API such as NameTranslate in order to avoid network
queries to the domain controller that might not be reachable.

Change-Id: Ib2cd08bca5223fa847a462520074bb758191539d
Reviewed-on: http://gerrit.openafs.org/7650
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: SetDispositionInfo !MmFlush SectionObjectResource

In AFSSetDispositionInfo() if MmFlushImageSection() fails,
be sure to release the SectionObjectResource.

Change-Id: Ic0a31627369d0fa055f78e5949314398f58569e0
Reviewed-on: http://gerrit.openafs.org/8714
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Some minor cleaning up.
Fixed some issues of splitters settings not being properly loaded/saved (due to them not being shown).
Slight update to the documentation.
Minor updates to the documentation.
Remove too verbose outut logging
exclude map viewer config fields from map form
make local layer detection more robust - this should enable links in map layer listings
Merge branch 'mapstory' of github.com:opengeo/geonode into mapstory
make map loading work again, still needs @mpriour to look at this to see if I interpreted things right
Navigation: Test uneven rows
[OC-4074] Clarified itest for update user
Bump windows-omnibus revision to 2

This build is to fix CHEF-3216
online: adicionado script que gerava a versão pré-API
Novo util/missing-requires.sh
Extended pom.xml
Renamed JUnitEE to junitee
Renamed JUnitEE-anttask to junitee-anttask
Fixes a crash when structures: is blank.
added edit/delete/clear/all actions to manage reported  listings
added clear_all to items.php admin controller
added delete dialog, added bulkactions clear_all stats
Model item added case clear_all to clear_stat function
fixes showing on listing admin
fixes showing on comments listing
fixes showing on item listing
fixes showing on manage media
fixes showing results leyend in all listings
Merge branch 'develop' of github.com:osclass/OSClass into develop
issue #383 , also small fix on plugins area being a json_decode result not an array
Merge branch 'modaccess' into develop
Merge branch 'develop' into testing
git fix showing text
deleting a line I ddon't know why I put there on first place
fix on themes update
sanitize ndash and mdash
issue #384 about filter on manage users area
Merge branch 'develop' of github.com:osclass/OSClass into develop
minor style fix in show filters button in manage listings
Use index,follow in robots even if the item is expired
Use index,follow in robots only in the first page
noindex,nofollow in the public profile page
radu
Small lint changes, no functional change.

fix va_arg and duplicate macro name.
Update local C library module comments for ASCII table.

Improve the commenting of the table.
iASL: Additional debug output for table compiler.

When debug is enabled, output full subtable information including
an indented subtable tree. Useful for developing support for new
tables.
Fix text correction assistant layout.

Remove horizontal columns and shorten titles so that everything fits in
a bit better considering the new sidebar in Gtk.Assistant.
adding better role access control but broken some test
fixed name of the csync owncloud module.
Merge branch 'master' of github.com:owncloud/mirall
Use right placeholder, fix #47
Added splitBySchema for protobuf and changed file output names

Files changed to include underscores instead of periods.
splitBySchema now complete.
Changed Thrift marshaller namespace qualifiers
Change liquibase script
Add Client ID to the Loans view, as well as to the client list and client overview
Edit Users, and ajax folder for processing requests, also updated the navigation bars to be more informative
Bump to dev version
Add test_suite to setup.py
Update description of gntplib
Conform to PEP 8:  Files using ASCII should not have a coding cookie.
Move to package
Cleanup README.rst
Entered on-line publication of O. Trim. 1, 287.

 - Created from SoSOL template
 - Entered on-line publication of O. Trim. 1, 287.

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2012;0539' (DDB_EpiDoc_XML/sosol/sosol.2012/sosol.2012.0539.xml) to 'papyri.info/ddbdp/o.trim;1;287' (DDB_EpiDoc_XML/o.trim/o.trim.1/o.trim.1.287.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/o.trim;1;287'
Update revisionDesc

 - Vote - AcceptText - .side.concave -> .concave.side; .side.convex -> .convex.side. Convex lin4 <:.4ο̣ς|alt|Σερ̣ῆ̣νο̣ς(?):> (James Cowey)
 - Vote - Accept-Straight-to-Finalization - accept (Tonia Sarri)
 - Finalized - ready (Tonia Sarri)
Merge branch 'master' of github.com:papyri/idp.data
.gitinore fix
Tweaks and ignore files.
Added CCache::contains() to check if a value exists in cache. Query caching will now cache empty results
#852 Content: Configuration with cache false keeps caching content
Fifth set of facet moves (a second set of analysis facets)
See http://tech.groups.yahoo.com/group/pcgen_developers/message/2218


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18581 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Possible bad character in "Strand of Prayer Beads" item description
Issue#: DATA-821


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18816 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Brings Template into the new facet model with one consolidated model facet (a new TemplateFacet)
This partially fixes CODE-1708 in that the conditional template (LEVEL:2:FEAT:<blah>) should now be equal to the non conditional form. 
  The bug is not fully fixed, however, in that either may not be firing properly.
Note that two of the unit test cases were updated as part of this change. These are not material changes.
  Subsequent to this change, Templates are univerally exported in key-alphabetical order to keep them consistent over time in unit tests
    (was getting into a scenario where the results would change every time due to hashing changes of object identity)

Issue#: CODE-1708


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18591 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Update release notes for recent changes

git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18084 b6a209e6-650d-0410-972b-dadffa731f64
Decrease margins around plots.
Fixup: scale label plotting
Tweak DFT plot to be suitable over a wide range of freqs
Start time plot x-axis at the first data point
Condense units on seconds axis
Change the plot to use a more readable font
Use the correct symbol for the mma plot without errors
Lots of changes, will break tests..
Removing validation.
extend functionality

* change external_ip url and add URLError handling
* add flexible logging (default is for all output to be logged to file but error messages are sent to screen - great for cron mail)
http servername check fix and controller name
- removed second "use strict"; as one is enough
- added jQuery adapter
Merge remote-tracking branch 'origin/master'
- added $define to View
- added hooks for webpack
- update nof5 to version 0.2.1
- Current state of refactoring
- nof5.hooks deleted
- browserify hooks renamed to new convention
Merge remote-tracking branch 'origin/master'
- removed nof5.browserify.hooks as they we don't use browserify anymore
- renamed nof5.webpack.js to nof5.webpack.hooks.js as this is the new convention
JavaScript privacy options, update, part2
new: Constructor from Stream DataBlobResponse
more precise error positions
commit the css background-image path
Merge branch 'master' of github.com:pesome/shuihuar
Little fixes and add class to render code
Firsts steps with i18n
Removed unused files and code
fixes in some lines of css
OH GODDAMMIT I AM SO BAD AT REMEMBERING
readd jewler
Version bump to 1.0.0
generate gemspec
ppp
Merge branch 'master' of https://github.com/phentila/webkittest
Session Idle Time Changes
[artf530857]: constants for .sln, .csproj, and appxpackage
Merge branch 'durban' of https://github.com/phresco/phresco into durban
[artf525880] Windows metro project feature updation added
fixed r8169.c support in 3.7.0
usage: add file backed buffer

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Updated formatting for version label in settings tab
Fixed bug: with the updated get restaurants web operation, not passing in a radius would invalidate the web call
Limit event listing in user hp to 5
User event listing
User event listing completed (hopefully)
Change logo for christmas, minor error for unscheduled events.
Method :serving need env as param
avoid namespace conflict when including Dav4rack::File
method serving need env as a params
Changed x264 encoding options so they at least work
Changed x264 encoding options so they at least work
Changed x264 encoding options so they at least work
Merge pull request #29 from h4rdc0m/ISSUE-Video-Preview-Backend

Issue video preview backend ISSUE: PIMCORE-1585
initial presentation detail page and a couple of other tweaks
Changes for v0.03.
- updated to 2.2.12
保存下可能用到的图标蓝色版本
add Leo to the list of contributors
upload 100 spot images
Modified the version of pom.xml
fix xkcd regex and css selector
finishing up before a break
Finished feature 3
Update Mon Dec 10 09:00:28 CET 2012
use odst for search
Try to stomp out -180 (#2066)


git-svn-id: http://svn.osgeo.org/postgis/trunk@10732 b70326c6-7e19-0410-871a-916f4a2858ee
Remove TODO note: the storage is now double aligned


git-svn-id: http://svn.osgeo.org/postgis/trunk@10560 b70326c6-7e19-0410-871a-916f4a2858ee
Use double alignment property to remove memcpy from wkb generation


git-svn-id: http://svn.osgeo.org/postgis/trunk@10561 b70326c6-7e19-0410-871a-916f4a2858ee
Allow WKB generation to do direct memcpy of coordinates in specific cases.


git-svn-id: http://svn.osgeo.org/postgis/trunk@10562 b70326c6-7e19-0410-871a-916f4a2858ee
Remove old signature for serialized_form function


git-svn-id: http://svn.osgeo.org/postgis/trunk@10563 b70326c6-7e19-0410-871a-916f4a2858ee
PostgreSQL 9.3 changed where heap_form_tuple() is declared. Fixed in
raster and postgis. Ticket #2013.

git-svn-id: http://svn.osgeo.org/postgis/trunk@10885 b70326c6-7e19-0410-871a-916f4a2858ee
use negative values for consumptoin rates.
almost code commented, because it not works with generics
Two and Three-pointCrossover public and generic, added to project and test, .
check for equality of gen sets in parents added
TwoPointPMX added and tested
Fix typo in demo templates
[Framework] Adding a dev/production switch for the 404 page. Now you can have useful debugging page for dev mode.
[UserModule] Fixing typos
Removing an old file
Merge branch 'master' of github.com:ppi/skeletonapp
Adding in an action view for demonstrating things with the MustacheEngine
Adding in an action view for demonstrating things with the MustacheEngine
Fix /smarty and /twig routes
provpy added to the project and tested
finish stopTable, create stopTable by lines
first day of testing axioms in prolog. (axioms geared toward modeling SQL query semantics)
.gitignore
what i thought would be a convenient use of the forward slash is now being replaced by lists, so i have lists-of-lists instead of lists-of-tuples (where tuple was my own little slash-based workaround which i don't think will hold up well over time)
experimentation with length less than 4. just for documenting what i did. will roll back.
removing my length experimentation for now
more sample queries that worked as expected
okay. so my slash-based tuple emulation is out (i ditched it earlier today), and now my 'flattened list' tuple emulation is out, too! But i have a working version now: structured arguments
Update README with new configuration format
Adds MessageType constants for the various message types.

Also changes all other code to use them.
always output score summary
added CLAM authentication support
bundle vendor js into one file and tick version up
Close issue #17.
Change on app of function ControStreamFile by GetData to obtain proper behavior.
Fixed documentation of Command ControlStreamFile.
LOG change to proper level.
Removing unnecessary files & improvements in POM.
Code cleanup.
improve IsBst2 to use out instead of ref
Update wrappers/Tile.java

Remembered RSBot supports jdk7 so updated to use diamond operator
Update system/cms/modules/pages/plugin.php

No idea why body was being set as an object - it should be an array as it was causing undefined errors on 2.1
Merge pull request #1787 from rmwebs/patch-3

Update system/cms/modules/pages/plugin.php
fixed typo

fixed typo
Fixed typo Sitemap language

Fixed typo in italian language
Added PyroStream italian language

italian language for pyrostream
Update Italian Language for Email Template

update translation
Updated italian language

Updated italian language for Users
Merge pull request #1299 from ChristianGiupponi/2.1/develop

Some update
Fix for deleting via streams CP.
Pages module is erroring out when trying to save a page b/c this is called statically.
Fixing compatibility with MY_Model in files plugin.
Adding extra file_id variable in addition to id for files.

id is a pretty common variable and this can help reduce conflicts.
Merge branch 'feature/files-module-optimizations' of https://github.com/petsagouris/pyrocms into 2.1/develop
Added a setting to Files for restricting the size of uploads. Uploader also checks if a file is an allowed type before starting upload
Use lists so that our watches execute in the order they are added.
comment only one execute

Signed-off-by: mszot <mszot@CENTRUM-NASA>
modify
modify
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/action/Admin/Collect.class.php
	lib/core/Core/net.class.php
[BUG #6099] Feature detection for borderImage syntax
Conflicts:

	framework/source/class/qx/bom/Style.js
Add border-style: solid (no longer implied in FF)
[BUG #6126] Use default code path for Opera
[BUG #6788] fixed expression list parsing in condition part of for(;;) control expression

- also streamlined parsing of init part
[BUG #6677] Added interactions for text field and combo box widgets
[BUG #6677] Added interactions for VirtualComboBox and DateField
add an entry of readme.rst to bumpqxversion.py
Fix bug 8900 - Zip with infinite range fails.

`std.range.Zip` contains a `Tuple`, whose `toString()` function calls `formatElement` which eventually calls this function, leading to a static call to `walkLength` on infinite ranges. Since pul request 880, `walkLength` doesn't work with infinite ranges, so it fails to compile.

This change ensures that `walkLength` is called with only valid range types.

Bug: http://d.puremagic.com/issues/show_bug.cgi?id=8900
improvements/fixes for count countUntil

Changes:

1. Count:
1.1 Better conditional statement
1.2 Count will now turn down any infinite haystacks (or else you'd count to infinity...)
1.3 Infinite needle will instantaneously return a count of 0.
1.4 Fixes a condition that was checking pred(haystack, needle), as opposed to pred(haystack.front, needle.front) (guess no one ever tried a fuzzy count?)
1.5 Fixes reference range support...*

2. countUntil:
2.1 Better conditional statement
2.2 countUntil supports InputRange for element and predicate search.
2.3 Fixes unicode bug (return the amount of popFronts, not index)
2.4 Fixes http://d.puremagic.com/issues/show_bug.cgi?id=8804
2.5 Fixes http://d.puremagic.com/issues/show_bug.cgi?id=8821

Note: count is still subject to the bugs in splitAfter
* Incorrect reference range support
* Incorrect split for forward range
Both are corrected in another pull.
As such, no unittests are added (yet).
more improvements in cout/countUntil
fixing countUntil vs indexOf issue
Quick splitter countUntil fix

This is more of a band-aid..., splitter needs some deep fixing anyways...
indexOf: More details

Not 100% about the text...
Changes to count[Until] as suggested by review
Added igammaTemmeLarge to std.internal.math.gammafunction.
fix issue 4489 std.array.insert is slow
structs with postblit, CTFE, fix -property
another -property error
generalize countLength
re-style and fix indention
address review remarks
Merge pull request #858 from blackwhale/optimize-insert

Optimize insertInPlace
Merge pull request #918 from jerro/upstream-master

Fixed a bug in gammaIncompleteCompl
Merge pull request #901 from Poita/bug8900

Fix bug 8900 - Zip with infinite char range fails.
Merge pull request #951 from monarchdodra/count3

improvements/fixes for count countUntil
Merge pull request #852 from quickfur/issue7992

FIx issue 7992
Change i3status hostname color depending on time
Merge branch 'master' of http://github.com/qwazerty/config
initial setup
product groups config
some look adjust
add login.aspx style and mobile support
do not replace "。" with "." and use qoute reply instead quote
use quote reply instead quote
changed category full payment logic and undefined category if amount payable is zero
Added generics, method to find components by type and name, and copyright header. Minor code cleanup.
Changed log output to warning when trying to send too large packet, fixed typo
Reimplemented the send queue to avoid problem when DMA is used
using correct command context print streams
added method to retrieve mapentry of current stack
Global CPU monitor should be called before the memory write is performed.
Added generics
* Bug fix: update pins when polarity is reconfigured
* Added support for FIFO polarity
* Added support for 8 MSB register writes
* Renamed some variables for clarity
added support for reading dwarf file - discriminator ext operator LNS
Merge branch 'master' of ssh://mspsim.git.sourceforge.net/gitroot/mspsim/mspsim
added exception when executing MSP430X instructions on non X arch
Added exp5438 as platform name
Removed multiple notification of register monitors in some operations
Updated to use cpu.getPC() instead of cpu.readRegister() to avoid notifying register monitors
Reduced debug output when using DMA
turn off radio and stop transmitting at reset
Added figure 6.
Wrote down some thoughts in World.hs
Use library function to remove floor instead of manually removing each point.
Merge branch 'master' of github.com:rbart/guide-dog
Made Authorize Facebook link work.
Added COMMENTS
Sanitize output (prevents XSS)
structuring things: documents go in the documents folder
代sum君提交更改
DEFCONFIG: Crespo, enable CONFIG_MMC_BLOCK_DEFERRED_RESUME
CryptoFS 0.6.1-rc4
Fix build if FUSE needs extra libraries linked
fixed hovers on dashboard

Signed-off-by: Predrag Kanazir <predrag@arraystudio.com>
Backported r9858 from trunk.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/1.4-stable@9860 e93f8b46-1217-0410-a6f0-8f06a7374b81
added more debuging info
update rubygems version in ree and ruby cookbooks
Some more structure.
Add pagination for dept and search at datatable function.
Add Screenshots folder to gitignore
Added new MoP totems to nPlates and removed some whitespaces
Cuckoo tables do splitting, etc.
Remove the old "datalayer".
Adapt the "searches" component to use the new disk/datalayer interface.
Make progress on the new disk layer.

This commit:
 - Supports get/put/del end-to-end
 - Doesn't contain anything but headers for search
 - May have one or two bugs
Get/Put/Del work well.

It's fast and passes all stress testers.
upgrade to express 3; start rss template
Added character generation and contrast/backlight control!
ignored position_id directory

which contains POSITION_ID map pictures
Functional cookbook -- however missing configuration and init/startup.
Add RhodeCode erb template and supporting attributes.
bug 775631 - Revert "relocated logging to its own namespace"

This reverts commit 750fc92d239ea1ff5ce3a4409b9f59da5740cb69.
bug 775631 - Revert "refactored DRY in various tests"

This reverts commit dfeff509e657840c22a6631bcfafc4d5cb1d7cbe.
bug 775631 - Revert "bug761650 - dailymatviews as crontabber apps, r=rhelmer"

This reverts commit 3d3ab45329143addab58cf7c796cbf1d71bd59f4.
info on reloading schema
be more explicit about how much crash volume is enough
bug 822432 - hbase API has changed a bit since this was last used
Merge pull request #1019 from rhelmer/bug822432-hbase-api-change-stage

bug 822432 - hbase API has changed a bit since this was last used
bug 822432 - missing paren
Merge pull request #1020 from rhelmer/bug822432-hbase-api-change-stage

bug 822432 - missing paren
780972 Fix name of sql script
780972 Add PERFORM instead of SELECT
bug 780972 adding rapid beta version
Added ORDERs database and config.
Output full path to compiler used.

This should make it easier to troubleshoot when people report they have latest clang but get a “too old” failure, e.g. issue #45.
Update .gitmodules to use Git over HTTP
Update build instructions for clang.

It appears that latest Xcode for Lion does ship with a clang recent enough to build TextMate.

Also added instructions on how to build clang via homebrew.
Also check brew for clang and boost dir.

We now prefer Apple’s clang over MacPorts/homebrew. This is because clang on Lion (with latest Xcode) should be recent enough to build TextMate.
Move git clone + submodule update to README.

A few people were reporting build issues because they downloaded the source and thus lacked the submodules.
Update README.md
Merge pull request #55 from youngrok/master

brew uses proctools rather than pgrep
Also check for boost in $CPATH

This way it can be installed anywhere as long as the C compiler can find it.
ninja now back in trunk of brew 

https://github.com/mxcl/homebrew/commit/ff13af6fb37b378c9edb3a91fe3d6016c36661b5
Merge pull request #57 from shadowbq/patch-1

ninja now back in trunk of brew 
Include ‘mate’ in application ressources.

Previously we installed this from the Bundle Support bundle’s support path.

While the Bundle Support bundle is a requirement to work with TextMate, including mate in the resources section should ensure we always get the latest build and address issue 53.
Upload to GitHub instead of S3.

Technically GitHub is backed by S3 (shielded by a CDN), but now all releases also go to the Downloads section of GitHub.
Add support for ^ $ and > in scope selectors
Fix bug with > in scope selector. There was an implicit > after path
Fix ^, previously it failed immediatly if last rule in scope selector, wasn't tested against last scope part. Fixed by giving ^ additional chances
Accept HTTP/1.1 response in network tests

GlimmerBlocker (http://GlimmerBlocker.org) and other proxies may intercept the web data and replace the HTTP/1.0 response with a HTTP/1.1 response.

Modified test to accept either.
Rework path::is_local to support disk images.

This enables SCM badges for disk images. The check is done using the new (10.7) kCFURLVolumeIsLocalKey.
git: show modifications in upstream folders
Opening txmt URLs with escaped spaces no longer fail

Example: previously it was not possible to open a URL like

	txmt://open?url=file:///Library/Keyboard%20Layouts/
Use current document when no URL given in txmt URL

Brings TM2 in line with the promises in

	http://manual.macromates.com/en/using_textmate_from_terminal.html

Could probably be written nicer, I just don't get C++!
Final
Test
Merge remote-tracking branch 'choose_remote_name/master'
Add logstash module.

Since the logstash config file seemed very similar to a nixexpr, I decided
to map directly from nixexprs to logstash configs. I didn't realize until
too far in that this solution was probably way over-engineered, but it
works.
logstash: use {name=; value='} attrsets for repeated name-value pairs instead of parallel lists
logstash: Start process in /tmp

See https://logstash.jira.com/browse/LOGSTASH-107
Add option to keep hardware clock in local time.
Rename time.clockLocal -> time.hardwareClockInLocalTime.
Don't add the i3 window manager to the system if it isn't enabled in configuration.nix.
Add lib module for modules to provide helper functions
logstash: Export config.lib.logstash.mk{Float,Hash,NameValuePairs}.

This allows hiding the implementation details for how to represent logstash
config types that don't directly map to nix expressions, particularly floats,
hashes, and name-value pair sets with repeated names. Instead of setting
__type and value directly, the user now uses these convenience functions to
generate their logstash config.
logstash: Fix sloppy description fields
/etc/login.defs: set the mode of new home directories to 700
sshd.nix: Create ~/.ssh/authorized_keys with the right ownership
openssh.authorizedKeys.keyFiles: allow multiple keys

Ugly hack to get around the error "a string that refers to a store
path cannot be appended to a path".  The underlying problem is that
you cannot do

  "${./file1} ${./file2}"

but you can do

  " ${./file1} ${./file2}"

Obviously we should allow the first case as well.
Add module for b43 firmware
multitouch: Add option to invert scroll
multitouch: Add an option to ignore palm touches
multitouch: Invert left-right scrolling when invertScroll is enabled
D'oh
Global replace /var/run/current-system -> /run/current-system
Global replace /var/run/booted-system -> /run/booted-system
Global replace /var/run/opengl-driver -> /run/opengl-driver
- getFile() - finished
Update link to support forums
fix default argument value causing syntax error
Document the FUNCTIONS section and its =func command
credit for doc fix
Note my work for today.
Some board code for the Scheme bot.
first one
Ok dan
Got the first screen transition working
experimental settings

playing with some settings learned from Vimcasts
set awk tabs to two spaces
First
ignore vim swaps
When the locator made lowercase, it puts the pins correctly in Google Earth.
The Folder tags separate the grid and contacts, as it would sometimes freeze for me refreshing with the group expanded. Also makes it easy to hide the pins and keep the grid.
Merge pull request #1 from wdjc100/patch-1

Locator and folders - tnx M0ZXA
Remove useless conditional.
Merge pull request #5575 from phiggins/remove_conditional_from_statistics_task

Remove useless conditional.
Allow a defining custom member field on resources

By default, resources routes are created with :resource/:id. A model
defining to_param can make prettier urls by using something more
readable than an integer ID, but since the route picks it up as :id you
wind up with awkward User.find_by_username(params[:id]) calls.

By overriding the key to be used in @request.params you can be more
obvious in your intent.
Merge pull request #5581 from jamie/custom_param_field

Allow a defining custom member field on resources
Merge pull request #5183 from lest/patch-1

use content_tag in button_to helper
ActiveModel::Name does not inherit from string
Merge pull request #5593 from lukesarnacki/activemodel_name_composition_over_inheritance

ActiveModel::Name does not inherit from string
test against ruby features in order to fix tests on Ruby 2.0
no need to freeze things all the time
sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0

sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
ActiveRecord::Coders::YAMLColumn#dump should raise an error

closes #2737

Conflicts:

	activerecord/lib/active_record/coders/yaml_column.rb
Rename raven-client back to raven.
Eliminate RavenUtils from Raven and add logging to ClientExample

RavenUtils is no longer needed by the new Raven client. All logic has
been moved to either the Client or the new Utils class. Logging has
been added to the ClientExample, so you can see what's going on in the
background.