labofsahil/github-event-dataset-2012 huggingface dataset:
Implementing Offering Editor
Added samples for testing
Added multi agent mover code
Oops. Put text in wrong place.
Adding post: Open Source Attribution article
Add serial number to summary table
TC-1108: iPhone Simulator sometimes launches twice

This bug is caused by a race condition: First, iphone/builder.py
launches the iPhone Simulator with a call to subprocess.Popen();
and then, it executes some AppleScript to bring the iPhone Simulator
to the foreground -- but sometimes, the simulator that is being
started by Popen() has not yet fully launched (the process has
probably started, but AppleScript doesn't "know" that yet), so when
AppleScript is told to bring it to the foreground, it launches
another instance of it.
Update support/android/builder.py

Added support for the ANDROID_SDK_HOME environment variable.

Its read by AVD Manager to look for the .android folder in an alternate
location. In the case of TitaniumStudio, setting this variable makes
sense to also affect the .titanium folder.
[TIMOB-3749]Do not scale images. Update content mode for imageView
[TIMOB-3749] Fix up hires to match documentation
[TIMOB-3749]Check hires if remote image loaded from cache
Implement KrollObject.callProperty().

Exposes a direct method for calling a function referenced
by an object property. Requires no additonal reference management
since the object will retain the function for us. In most callback
use cases this is okay and avoids circular reference bugs.
Implement Kroll.callPropertyAsync().

This wraps around KrollObject.callProperty() to make
it async. and also thread safe.
Refactor HTTPClient to use new callPropertyAsync() API.
Merge Appcelerator master into timob-10093.
Remove some debug logging.
timob-6092: implement a new activity indicator and rename the old activity indicator as ProgressDialog
timob-6092: add getLangConversionTable() in ActivityIndicatorProxy.java
timob-6092: refactor and updated doc
timob-6092: updated logging
Merge pull request #2650 from mmorearty/TC-1108

[TIMOB-10218] iPhone Simulator sometimes launches twice
Merge pull request #2687 from joshthecoder/timob-10093

[TIMOB-10093] Android: HTTPClient leaks function callbacks (ex: onload, ondatastream)
timob-6092: updated copyright
Merge pull request #2693 from pingwang2011/timob-6092

Timob 6092: Android: Feature Request Standalone Loading indicator
Merge pull request #2664 from juancgarcia/master

Added support for the ANDROID_SDK_HOME environment variable.
Merge pull request #2665 from vishalduggal/timob-3749

[TIMOB-3749]Do not scale images. Update content mode for imageView
removed dependency on the aptbpo provider.
adding pdfs for reading

getting site ready for class on 9/4/2012
new kanban! fps down to 20
Updates to sample03-character scene file.
Merge pull request #236 from blackberry-gaming/next-setaylor

Next setaylor
Twitter 1.7-3.7 compatibility.
v0.6.0
Fix namespace and web-url
fondo e iconos, cambios en las estetica.

Adri, acaba lo de miembros ya de una vez!
Adding a feature for Trevor and Matt.  Selected tweet import based on #mm flag.  Can be turned on / off with flag.
メモリー・リーク 3: 循環参照 リークを改善
Move methods out of InstanceMethods module to prevent deprecation warnings in Rails
New achievement Banker (Level 4)
New achievement Seamstress (Level 6)
New achievement Investigator (Level 4)
New achievement Master Gipsy (Level 8)
New achievement Apprentice Merchant (Level 2)
Add link when click on raspberrypi.
post 2012-12-10
added commands and scp use
Remove -disk portion on ovf references
Added NFC Reader support for two new tag types:  ISO PCD type A and ISO PCD type B

Change-Id: I61ddaff20128199776bab93a2eeb1e7f0f8feea7
Superuser: update to the 3.2-RC2 version of Superuser

From http://androidsu.com/superuser/

This brings the version in line with the current version of
the su binary and fixes the bug where su approval is
not stored.

Change-Id: I0ca67ae79942f34eaa16cc3cf26b312cf7a8cd67
Merge remote-tracking branch 'upstream/jellybean' into jb-dev
build openssh packages

ssh sshd scp stfp <3

Change-Id: Ib5dd2d687de34e1d46401f2f40c258677caf0a84
Make sure non-provided options are in the results
Site updated at 2012-08-12 04:25:58 UTC
fix the problem of missing transaction_id. Use charge id for that.
Move customer creation in front of payment submission. Fix is_authenticated call-missing (). fix user profile saving - missing get_profile() call.
find the order and order_id based on invoice urls.
Update README.md

removed reference to the URICount
Upgrade to microtype 2.5 beta 8
Fix date
Updated Version Numbers and Website Address
Simplify STO
Add lower incomplete gamma function

And an example of F_m(t)
Show MethodRef, Class info, Name And Type
Preperation for software merge
Move user args from *args to user_args kwargs and add config for new (class-based) dogstream calling convention
Fixed bad supervisor.conf file in rpm packaging

Prior to this fix both ddforwarder.log and dogstatsd.log were
incorrectly specified in the supervisor.conf. In addition to
being inconvenient because the log isn't written this results
in dd-agent hanging on a write to stderr when its pipe to
supervisord fills up.
Merge pull request #174 from Obvious/master

Fixed dd-agent hang when using RPM packaging
remove "legacy" naming for function-based dogstream parsers
Fix #175
Merge branch 'master' of github.com:DataDog/dd-agent
Merge pull request #172 from charles-dyfis-net/dogstream_plugin_object_support

Add support for class-based stateful dogstream plugins
Getting ready for 3.1.2.

Fixes #169 (optional aggregation key)
Skip empty supervisord.log lines (only seen in test data)
Don't run the watchdog on win32
Split the system checks into Unix- and Win32- specific
Simple entry point to start the agent on windows

The code for running as a Windows service is there but not yet used.
Once we have solidifed the windows agent checks, we can implement this
as a server. For now this will run run fine from the shell.
Checks interface supports multiple metrics per device
More system metrics for windows
Fix the core and system tests
Fix line endings
Better windows config lookup
Fix references to old OS naming
Run agent as a service on windows

`python agent_win.py install` then `python agent_win.py start` will do
it now.
Add py2exe with for agent and forwarder

The agent and forwarder have two different entry points for win32 and
each is used as the console script that will be compiled into an exe.
Update windows packaging
modified:   .gitignore
	new file:   .gitmodules
	modified:   server.js
	new file:   node_modules/everyauth/example/conf.js
	new file:   public/client
Site updated at 2012-08-31 10:18:14 UTC
2012年 09月 21日 星期五 18:39:21 CST: autoetc.
Make interface 'ViewCreator' unque
add annotation
Adds dress code information
improve jira rest client
Rebuild using NDK8b
Some work on the 0.7.0 release

Signed-off-by: Chris Keele <dev@chriskeele.com>
Bump version

Signed-off-by: Chris Keele <dev@chriskeele.com>
#504 - LogServiceTests modified, to make testDefaultLogging() pass.
Merge pull request #15 from juricababic/master

#504 - LogServiceTests modified, to make testDefaultLogging() pass.
Merge remote-tracking branch 'upstream/master'
Added weather service check to prevent repos from being used before the weather service is called
Merge pull request #16 from eonarheim/master

Defensive programming fix around the weather service
code cleanup; prep for new customer model
Merge branch 'master' of github.com:powertac/server-main
code cleanup; correct annotation on TournamentSchedulerService so server will run
Cherry picked changes from Jeroen's previous commit that seemed to have vanished. very weird
Expansion bars added dynamically
Merge branch 'master' of github.com:cloakedninjas/WoW-Timeline

Conflicts:
	public/js/app.js
document DocumentRoot
Hide menu if not logged in, added a logout link.
Removed devise stuff for registering users via email.
Make sure all access to the app is by an authenticated user.  NOTE:  This will break the chef status updates until that gets fixed.
Added signout message.
Removed need to authenticate new users, and created the default crowwbar/crowbar user at init time.
Removed need to validate new users
Network CRUD API: API docs
Merge pull request #175 from clement-jim/pull-req-release-rails3anddb-master-197bdf2dee

1st stage of authentication done.  Users required to login, can logout, default user crowbar/crowbar created at sys init." [1/2]
Merge remote-tracking branch 'origin/release/rails3anddb/master' into release/rails3anddb/master
Merge pull request #176 from cdearborn/pull-req-release-rails3anddb-master-2c45c26252

Yeah Docs!  Note, we will soon be changing the prefix order.  This reflects the current code and is accurate.
Merge branch 'release/rails3anddb/master'
Merge pull request #177 from galthaus/pull-req-master-64f6875e42

Merge rails3anddb to development [1/6]
merge to remove network page from docs
fix broken i18n file that I missed merging on the last pull.  Add a test to check next time
Update notes for submitted changes

* Fix snapshot bug that use wrong redis-server binary path in rollback
Site updated at 2012-03-14 03:25:39 UTC
added code to close the browser
added remote webdriver in drivers list
initial fix of the project view page to work with IDs. Modified both the project and the view page to redirect to each other based on ownership of a project
Fix building_permit placeholder values
Fixed #16: increase access token, refresh token and secret length to 500.
Add change log
Add rst file and tweaked formatting.
Rules and tests for recognizing entities.
Parse a full file!
Site updated at 2012-04-16 01:42:59 UTC
Remove Homepage Banner images
Remove ticket buttons on individual Talk and Event pages
Remove 'Buy Tickets Now' Sidebar partial from templates
Change to text on Blog Homepage banner
Fix indentation error on Member Program
Fix indentation error on Top Picks
Merge pull request #142 from dominicbruno/master

Post-CIW Wrap Up
ascending/descending
Fix typo (thanks @stanton)
Need to maybeEnableScrambleButton() when the url hash changes.
fixes #6
untracked files on master: e576ac9 Initial commit
Merge commit 'f283242ceb5f07f2f9e1bd53e9e249e21c39645e'
Another test commit
Initial proposed library and loading structure
Add boxbox physics library
Set up dependency loading for boxbox
Add small canvas for dev purposes
Skeleton demo world
Merge branch 'library-structure'
Added reference to JavaPunk
Deleted Toasts, added Logs instead
begin implementing steps
updated to steps
teste
Merge branch 'master' of https://github.com/danielfb88/BancoDeQuestoes
trabalhando nas views de usuario
Added more unit tests for pointers and containers. Wrote a wrapper for container iterators to handle memory allocation (iterators use virtual inheritence, so have to be allocated dynamically).
re-indent this match-lambda**
update for uids
this warning is only valid when none of the possible values are unknown-input
add `valid-succ-state?' which uses abstract information to term successor states
Moved special menu items to buildthat
Optimization utilities.
Check for currently selected plugin and copy it to icon_set if present.
Release Pro-7.0.0
Finally tracked down scalable sources for Oxygen icon theme; re-did launcher icons.
09/2012 dump updated
remove a return statement which was causing the status checker background job to exit early and not write status for more than 1 machine
need a continue
rework
trying something
trying something
fix typo
add a lock
Macport and dev are now one.
Fix seeds; add Devise routes.
Create the Planet class
android 1.0 9
Support building with Xcode 4.4.  Upgraded to libpng 1.2.50.
Changed main part of site
moved static assignment map of pipeline
fixes to pipeline
Add CNAME to hold domain name.
Finish Adjacency Matrix implementation and problem.
Mathematica: T -> T matrices
Adding notes about changes in Doctrine CLI
Adding travis build status icon to readme
Zusammenfassung eingefuegt, Grafiken ausgerichtet.
Namespace Prep, round 2
Brace yourselves... Facebook is coming (not?)
fix dependencies for tox tests

Adds nose and mock as dependencies so that tests can run.
project volume sum/max api commands

Adds the project volume sum/max command to the client.  This is the same
as the resource volume sum/max commands except queries by project instead
of by resource.
rename dump tool to be more descriptive
tool to dump bandwidth to csv

Adds a tool for dumping bandwidth data to a csv file.
You can specify how many days to include in the csv, and it will dump
totals for each project per day.
fix bandwidth csv tool

Change to use datetime objects rather than just date objects (this was
causing the API to error).
No longer need to wrap the calls in try blocks.
fix start/end timestamps to be on date boundary

Replaces the hour, minute, second, microsecond with 0 so that the start
and end timestamps end up on date boundaries.
simplify logic in bandwidth dump tool

Simplifies the check for if it has any data in the row.
Merge pull request #5 from berler/feature/network-bandwidth

Feature/network bandwidth
Added utility class CLerpFunctionInterval and modified Carousel tutorial accordingly.
Use the git implementation of SHA-1. From MikeC84.
more css updates
Defects templates update
Adding proifle
Adding admin to user profile
Add migrations and templates for projects
Template and css work
Wiki skeleton
Breaking out the templates
More project template work
More application dev
Adding the waka waka wiki app
Adding wiki license
Updating the wiki app to merge with central station
Merging django-git with central stationg
Projects app updates
Local and urls
Updates to defects.
Defects urls updated.
More updated tempaltes, new migration.
breaking up template docs.
Added wiki info
define init
Template Helper basico funcionando com bloco e parciais rails
README foi alterado de rdoc para markdown
added a method, "sanity_check", which helps ensure that the library can function correctly
Integration specs :
added SimpleRegistryService.queryServiceWithEndpoints()
added EndpointStateService & DevAppRegistryService draft
Fixed Cancel button so that it links to the course page instead of the semester index.
flash fixed on course new view
adcionados os novos arquivos
Update lumi label, make CL_s submit scripts
revert maintenance job which replaced page with uploaded file
Delete ChangeLog because I'm not going to maintain it.

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Slightly change how the current directory is used for new shells

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
TYPOs fixes
Clearing out left-over log
Updated Simplified Chinese language file
Merge pull request #6 from warmwinter/master

Updated Simplified Chinese language file
[jwlib #3] Removed all internal dependencies on extras.
Merge remote-tracking branch 'jwlib/jwlib-0.3' into jwlib-0.3-tests
remove legacy susy/susy import
replace percent-width() with sass core percentage()
remove legacy show-grid
Fix various connection issues.
Solved issue #30. As good as untested.
Reimplemented "edit item" in item_controller
simplified comments

no need to persist them with the data_overlay
issue #48 - avoid XSS
manual merge (should be okay)
fixed problem with being able to sign up with only a user name

Maybe some refactoring of handling error messages should be done...

Problem was: Controller did not catch all the possible exceptions - as the invalid_email-exception was thrown first and not catched, the existing has_errors method did not realize a problem.
added buy_order and createBuyOrder view
User can see his own buyOrders
added TODO's
more TODO's and some cleanUp
huge commit! read whole commitMessage for details

User can create BuyOrder that will be displayed and deletable from own profileView.
User can't create BuyOrders that are already satisfiable! If so, the user shall use search and buy item by himself
A BuyOrder has hardcoded quantity of 1!
A BuyOrder will be deleted if successful.
A BuyOrder buys as soon as a item is ready to buy (= if item is activated, the item is ready to be bought)
You can't see other Users BuyOrders.
If multiple BuyOrders want to buy the same item the first BuyOrder that gets the opportunity will buy it. This shoud correspond to the CreationTime(not sure, maybe just random)!
should fix the discard button in item edit
very unstable upload code, but still way better than before, should work with console and IDE
stable now, lol
user.profile and all item pictures are now deleted when deleting an account
nothing, only some empty line for cosmetics
implemented a new ItemMergingSystem, for more details read commit message

Item with similar Name, Price and Owner can be merged be Owner.
The MergingButton is showed in the own profileView.
If there are multiple similar Items, the View have multiple Buttons to merge.
In the MergeView the two Items are Listed.
The slaveItem (second) will be merged into the MasterItem (first).
The slaveItem will be deleted.
The images of the slaveItem will be deleted and the MasterItem keeps its previous images
After Merge the MasterItems quantity will be MasterItem.quantity + SlaveItem.quantity
Merge commit 'a147b7c3927cba68cd23c0434c4115ce5e43ed26' into dev
Refactored tests. Now including SystemUser test

Added missing StringChecker tests

	modified:   trade/test/organization_test.rb
	renamed:    trade/test/password_handler_test.rb -> trade/test/string_checker_test.rb
	renamed:    trade/test/user_test.rb -> trade/test/system_user_test.rb
	modified:   trade/test/user_test.rb
Adds dependencies using NuGet.
Get the keyboard input to work

Got the keyboard input to work by disabling the ui motion code.  Need
to do a demo project on keyboard input and then come back here to do it
properly.
Work on the README.

I really am going to want to sit down and rewrite this entire thing.
Not exactly coming out how I had hoped.
adjust look & feel.
Made CropDusterField a drop-in replacement for ImageField.

Now sizes, auto_sizes, and default_thumb are passed as kwargs to
the field.
remove all pedantic warnings
Adding DropkicK presentation
adding example structure
updating template to prep for presentation
removing the binaries for package restore (thought this folder was ignored already)
ignoring the right packages folder now
Adding dimensions to camera link
Remove the unnecessary touch event to prevent crash
RemoteSelector: use DebuggerServer.addTabActor new API
RemoteSelector: we really need a better way how to get built-in types
RemoteSelector: fix the way how remoteSelector actor ID is accessed
Added author & license info - intend short for smaller screens
Singapore country added to be blocked
Makefile: change LD_FLAGS for library linkage
README: minor correction
leak report contains diff_utc_mono

diff_utc_mono can be used by analyser to display UTC time of leaks
instead of monotonic time (abhishek bhadauria wish)
Changed opengl texture warnings to debug.
Fixed a bug in grid, added a framerate graph to scenic example
coleccion videos asignadas a mesa
Fjernet system.out til debug brug
CrowdMap reference changed to Ushahidi
WebConnectionSpec fixes
Fixed menu button width; fixed folder header padding.
Implemented integration tests for CORE-1450
Changed the amount of information passed in Announcement.list()
reverted announcement.list for performance issues. TODO: drop unecessary fields
Using custom JSOPN renderer for Announcement. Dropped 100-announcement test temporarily
Subscription Action bug fix
Merge branch 'CORE-1444'
Merge branch 'master' into CORE-1446
Correções de alinhamento
Update _posts/guide/apendix/2012-08-21-API-directory.markdown
Working with Aapigee console
Merge branch 'master' of github.com:fulgura/mercadolibre.github.com
Merge remote-tracking branch 'upstream/master'
Site updated at 2012-04-20 07:53:15 UTC
Added script to create league data for NFL and MLB
Renamed package
update fast submodules reference
Fix for Ticket #986 - Correct the calendar so that the proper language is used.
Added some missing ext js locales (CA, RU, PT, CN, FI and NO) that seems to be missing - This corrects the calendar so that the proper language is displayed.
This issues was discovered while patching Ticket #986
Merge pull request #12 from ianwallen/master

Fix for Ticket #986,  Looks good to me, thanks
#1137 Hovering over "+" symbol in editor displays "Add add"
Re-migrate 2.6.x submodule from subversion
data fixin'
add jekyll page and layout, first draft
Re-organize code to make the code available through npm.
Little shared_ptr overload fix
Working End of Episode Dialog and number of council member to rescued is patchable now..
Added a new plateau object

New plateau object to track the grid bounds and more tests.  About to
start checking the navigation of the rovers - make sure they never go
over the edge!
Updated isValid return structure.
reStructure & update readme

reStructure & update readme
phys api
fixed edge label positions
fixing csv_file_Size
Aggiunto bundle gestione delle ferie + translations
Improve formatting of Item.toString(). Partial fix for issue #33.
Code cleanup / Documentation. (Issue #28)
Changes
Trying to fix whatever's wrong with committing.
Add DANGER to README
Changed language strings a bit. A "field" could refer to checkboxes too.
Added support for N parameters in method & constructor invocation
initial work on alien fire
Update lib/generators/beautiful_scaffold_generator.rb
rounding out encryption
changes on office computer
renames test => spec
salesman iroiro wip
haroopress cli design diary
Port deprecated code.
Papiers ICASSP 2012
removed Todo: handled by Rails Composer
public/index.html is already removed by Rails Composer
Added bin ignore.
add deploy to tomcat for localhost
HPCC-7843 Temporarily dump stack trace dereferencing NULL user

Fix deref of NULL user in temp stack trace code

Signed-off-by: William Whitehead <william.whitehead@lexisnexis.com>
Merge pull request #3363 from RussWhitehead/stackDump

HPCC-7843 Temporarily dump stack trace dereferencing NULL user

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 3.8.0 Release Candidate 3

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
first wp commit
dshsdh
Failsafe plugin added
Penambahan filter rekening kas/bank pada daftar otorisasi
Upgrading to VS2008
Projects full-features.
Add custom view for updated live products

Issue #10
test cases for flush stack
0.94

reg to [[LINK]], unfinished
Update catalog/templatetags/catalog_tags.py
Update CoM balancing section in report
Merge branch 'master' of github.com:inge91/Tweedejaars-project
yet another Micklem theme
04:49

>Creado nueva Form "Act_Hora" para empezar desde 0
Creacion de Clases Libro, Disco y Pelicula
add courses to session
-requestThreads: works now

Signed-off-by: Jacob Relkin <jacobrelkin@gmail.com>
Tune the description.
Fixed blog handler
some more fluentization
agents now drop markers.. however they dont recognize them.
fixed eclipse instructions
Added Dispatcher Concept
Added Some New Generic Registration
icons for tree
Make share menu item only available in iOS6.
Update submodules
Fix folders_file_list theme call.
Added minified version and cleaned the library
Re-organised the folder structure for this project
Added ID, processingID, numCalculations, generateProcessingID to DataBlock2R1R constructor

 - ID - for identifying block
 - processingID - for identifying that block processing results are coming from the proper allowed worker node
 - numCalculations - (this to be filled in by worker node after processing) total number of iterations through processing loop for entire block
Improvements to DataBlock and DataSet constructors

 - Changed processingID format
 - Added simple/boring generateJobList
 - Added idCtr constructor for producing block IDs
 - Added more specs for data-blocks.js
Added a check for unsupported platforms and fixed a test.
Trying out gitattributes for managing Id tag.
Test
Merge pull request #1 from JeanPepin/master

pull test
Mobile: trying jquery form stuff so that jqtouch forms submits better
Updated images in slideshow on community page
Add article: Tienda Online, gestion de pedidos
fixed error of public function
notice_type can be bound to a content_type (therefore notices to an instance) in order to access object data in templates and allow generic views to update observed items
bump version
Site updated at 2012-12-12 15:38:06 UTC
- Use a slightly better heading.
big changes in crypto
Incluídos Javadocs.
Tabs convertidos para space.
Basic support for n-grams and counting
Probably counting
Slept on it, found a better solution to memory-constrained counting
package/mtd-utils: update to 1.4.5

This updates packages/utils/mtd-utils and includes all patches from
tools/mtd-utils, so the two may eventually be merged.
I also added 150-fix_ubi-utils_static.patch which is a hack needed
to include libcrc32.o in the static binaries.
Having them static makes sense as only ubiformat is required on the target.

[juhosg:
- add build-time dependency on util-linux
- allow to specify dependency for each subpackage
- update ubifs optional lzo patch
- add more patches]

Signed-off-by: Daniel Golle <dgolle@allnet.de>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@31913 3c298f89-4303-0410-b956-a3cf2f4a3e73
change the nuget package to have a dependency on the csharp-swift nuget package and increase version to 3.0.
2.2
General get_user function to return full user row
Added a server design pdf
Javadoced views

Javadoc completed for EventView and PreEventView
revert to old project
add new stuff to project
Improved the Message class again
modify screen.css to delete highlight
Fixed focus/blur response.
arreglo test testMapaAvionAterriza, agrego el metodo
borrarAvionesAterrizados en la clase Mapa para borrar los aviones ya
aterrizados y no durante la iteracion. arreglo cierre de etiqueta en el
build.xml
Merge branch 'request/3' into development

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge branch 'request/5' into development
Merge remote-tracking branch 'github/development' into development
added method for service provider
various fixes
dao problem fixed
Agrego la funcionalidad para traerse las propiedades por ID c/ Tests + Vista en Bootstrap
Merge branch 'request/6' into development
Merge branch 'development' of github.com:joseignaciosg/PAWRealState into development
Se duplico un metodo, fixed
Agrego la vista de Propiedad al web.xml (me lo olvide en el anterior)
me mande varios errores y varios refactors, agregue el metodo de crear propeidad al service
Merge branch 'development' into request/3
Agrego Mapa Funcionando, Arreglo Toggle, Modifico dependecias de JQWicket
Agrego Mapa Funcionando, Arreglo Toggle, Modifico dependecias de JQWicket
Elasticsearch Rivers
Merge commit '8e429cfb199dc0f30d714b823edd1a9e7f144b3f' into dev
Merge commit '918a386cda9d1f7546d231af9d423574941c0fe7' into dev

Conflicts:
	lib/config.json
	lib/xt/foundation/foundation.js
	lib/xt/foundation/opts.js
	lib/xt/runtime/orm.js
	lib/xt/server/server.js
interim commit, working towards unification of previous node-router project with node-datasource, remove dependency on subsequent http requests and instead use internal object for lookups, set the stage for move away from mongodb, set stage for introduction of discovery service
remove administration server/stand-alone-service
add support for multiple routers on dataserver
interim commit
add internal node-routing service that is bound to current external port which may not be appropriate for all services
Merge pull request #54 from jrogelstad/master

issue #18707: Merge to master.
add and comment out some debugging
Merge branch 'xtuple_master'
slight cleanup, fix mandatory missing changes, update sample_config
Merge pull request #55 from clinuz/internal_router

issue #18770
Merge branch 'xtdev' into dev

Conflicts:
	lib/config.json
	lib/main.js
	lib/xt/database/check.js
	lib/xt/database/database.js
	lib/xt/foundation/exception.js
	lib/xt/foundation/ext/string_buffer.js
	lib/xt/foundation/filesystem.js
	lib/xt/foundation/foundation.js
	lib/xt/foundation/io.js
	lib/xt/foundation/object.js
	lib/xt/foundation/opts.js
	lib/xt/foundation/proto.js
	lib/xt/foundation/string.js
	lib/xt/runtime/orm.js
	lib/xt/server/ext/functor.js
	lib/xt/server/ext/response.js
	lib/xt/server/ext/route.js
	lib/xt/server/ext/router.js
	lib/xt/server/ext/session.js
	lib/xt/server/ext/session_store.js
	lib/xt/server/functors/commit.js
	lib/xt/server/functors/fetch.js
	lib/xt/server/functors/retrieve.js
	lib/xt/server/functors/session.js
	lib/xt/server/routers/data.js
	lib/xt/server/routes/data.js
	lib/xt/server/server.js
	lib/xt/xt.js
	www/orm/js/script.js
issue #18509: name export file after record type
issue #18509: cleaner code
issue #18648: First pass incorporating backbone-x into datasource
issue #18648: Temporary hack to get datasource to start since dependency handling changed
issue #18648: Update sample config. file
issue #18648: incremental progress.
issue #18648: Get datasource basically working.
Add 500 template
Fix ending newlines in templates
cache_tests
add a post
add a post
del
[#69767] Import SHP into Postgreslq

Try to guess EPSG code using .prj file of SHP it this file exists.
インベントリーにkit購入に必要な空きが無い場合return
config manager
Merge branch 'master' of git@github.com:jubianchi/pick_and_destroy.git
Adding appropriate error handling
Inline html
email functions for confirm closing, defaulted deals, payment instructions
Implementing client...
Fix bad commenting.
libdisk: Support "Commando" by Elite/Capcom.
update project name and update to rails 3.2.9
new file:   .gitignore
	new file:   404.html
	new file:   README.md
	new file:   Rakefile
	new file:   _config.yml
	new file:   _includes/JB/analytics
	new file:   _includes/JB/analytics-providers/getclicky
	new file:   _includes/JB/analytics-providers/google
	new file:   _includes/JB/analytics-providers/mixpanel
	new file:   _includes/JB/categories_list
	new file:   _includes/JB/comments
	new file:   _includes/JB/comments-providers/disqus
	new file:   _includes/JB/comments-providers/facebook
	new file:   _includes/JB/comments-providers/intensedebate
	new file:   _includes/JB/comments-providers/livefyre
	new file:   _includes/JB/liquid_raw
	new file:   _includes/JB/pages_list
	new file:   _includes/JB/posts_collate
	new file:   _includes/JB/setup
	new file:   _includes/JB/sharing
	new file:   _includes/JB/tags_list
	new file:   _includes/themes/twitter/default.html
	new file:   _includes/themes/twitter/page.html
	new file:   _includes/themes/twitter/post.html
	new file:   _includes/themes/twitter/settings.yml
	new file:   _layouts/default.html
	new file:   _layouts/page.html
	new file:   _layouts/post.html
	new file:   _plugins/debug.rb
	new file:   _posts/core-samples/2011-12-29-jekyll-introduction.md
	new file:   archive.html
	new file:   assets/themes/dinky/css/pygment_trac.css
	new file:   assets/themes/dinky/css/styles.css
	new file:   assets/themes/dinky/images/arrow-down.png
	new file:   assets/themes/dinky/images/octocat-small.png
	new file:   assets/themes/dinky/js/scale.fix.js
	new file:   assets/themes/twitter/bootstrap/css/bootstrap.min.css
	new file:   assets/themes/twitter/bootstrap/img/glyphicons-halflings-white.png
	new file:   assets/themes/twitter/bootstrap/img/glyphicons-halflings.png
	new file:   assets/themes/twitter/css/style.css
	new file:   atom.xml
	new file:   categories.html
	new file:   changelog.md
	new file:   index.md
	new file:   pages.html
	new file:   sitemap.txt
	new file:   tags.html
update kitpages_target on node view
LPS-27136
LPS-25765
LPS-26544 Send necessary information to Welcome Theme
LPS-26544 Apply Welcome Theme to Guest community
LPS-26544 Source formatting
SOS-859
SOS-859 Source formatting
LPS-27191 Typo in UpgradeTaskInstanceToken.java prevents MySQL from upgrading Kaleo
SOS-759 Chat Info Icon Cutoff
SOS-759 Since IE6 isn't supported, so we can specify all of IE
LPS-27152
LPS-25342
LPS-27238 Regenerate
change thumb size for listing
add font family to caption in slider
Octopress init
Site updated at 2012-06-23 09:25:50 UTC
Fixed server issue see comments for TODO list
Add link to "Migrate from 0.3.2 to 0.4.0" page
partner section completed
added cathouse customization to app for some unique personality
275 solved
538 solved
version bump for Songhay, prerelease
20120601T07:59
Added uTF8/UTF16 comparison
Fixing issue #400

Fixes non compatable declaration.
Merge pull request #401 from geoffreytran/master

Fixes issue #400
add sample page for studios.
Добавлен файл telephone/tell.pas
Octopress init
Site updated at 2012-06-07 16:25:26 UTC
Bug in paging
Fix in setup files
forgotten test
New home page for groupstreamer.com.

Redesign of the homepage. Not very original - just standard Twitter bootstrap
stuff. Also, created a new folder in the `static` directory intended to host the
`apk` Android packages.
mutt-devel: small version number change to sidebar patch
jbig2dec: Readding to moonbase.
pango: add libxcb depend.
connman: version bumped to 1.8.
labb3 igen
[PDI-8406] Logic for handling incoming schemas in the case when they are not being cached.
Update scripts/setup.js

Fix for https://github.com/codeguy/php-the-right-way/issues/194 which was caused by https://github.com/codeguy/php-the-right-way/commit/d5d5d0725bb7658460b09489065ad29d13663af1
Merge pull request #201 from mkaatman/patch-1

Update scripts/setup.js
add Aura.SQL as a PSR-0 compliant DB abstraction layer
Merge pull request #209 from pmjones/gh-pages

Add Aura.Sql as a PSR-0 compliant DB abstraction layer
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
moved to less design
中间版本
重构Reindex
Sharding System
//感谢 Shadower http://home.cnblogs.com/u/14697/ 贡献的代码
Treeview的加减号绘制
RAR: Tweaks.
Make magnum and Clang happy at the same time
Fix bash completion for hidden options
Merge branch 'unstable-jumbo' of https://github.com/frank-dittrich/JohnTheRipper into unstable-jumbo

* 'unstable-jumbo' of https://github.com/frank-dittrich/JohnTheRipper:
  Fix bash completion for hidden options

Conflicts:
	run/john.bash_completion
Merge branch 'unstable-jumbo' into bleeding-jumbo

# By Frank Dittrich
# Via Frank Dittrich (1) and magnum (1)
* unstable-jumbo:
  Fix bash completion for hidden options
Update _posts/2012-08-12-vulnerability.md
charset bugfix
Merge pull request #64 from kpashka/master

ContentType whitelist not considering charset
site update 2012-09-24 21:29:52 +0800
Added in the basic HTML for the login dropdown
Forgot to add this file with the previous commit
Added possibility to change dye concentration
updated conflicted files
Merge pull request #5 from marqueexss/n'"><marquee>xss

'"><marquee>xss
Merge pull request #6 from marqueexss/'"><img-src=x-onerror=prompt(1)>

'"><marquee>xss
creating empty repository for the doc files
Minor bug fixes. Changes in map class and something else...
more commenting, deleted unnecessary output
updating site with completed api calls and site login
LPS-27613 Fixed Web Service Url at build-client target (Missing '/api/')
LPS-27517 Change preference set for web content import
LPS-27621 Allow resource importer to create blank pages and columns
LPS-27627
LPS-27588
LPS-27666
SOS-1077 Removing breadcrumbs from theme
LPS-27266 Guest users can export Web Form portlet data
LPS-27266 Fix for delete data also
SOS-969
SOS-969 Source format
SOS-969 Source formatting
Releng properties
Releng regenerate
LPS-27430 Guest cannot view DDL form or add new DDL record
LPS-27430 Applying permission checking for ddl-forms-portlet
LPS-27430 Source formatting
LPS-27430 Language keys
LPS-27668 Add permission checks to delete comment methods
LPS-27669 Apply to update comments
Deleted mt file
Add symlink for coffeemode submodule.
client works with pyinotify
ошибся
Full maven Dependencies
Added playlist functionality (small fix). This update features database storage creation via phone gap's storage API, "Add to Playlist" button on the song view panel, persistence of the songId within the database, and an html5 audio playlist player that's populated from the local playlist database.
demo (again -_-"), no option support, optimizations

- now, it's not necessary to set an empty object to make the slideshow
work
- some sintax optimization related with jquery (while defining the prev
and next buttons)
- the demo was added once again
- the README was updated
- a slideWrapper variable was created for optimizations
- now, the first element will be the current slide, it's not necessary
to set it manually
beautified display output in rfc2790.host-resources.xml
beautified display output in microsoft.windows.xml
Added WFP to Windows Interface Filter
Updated interface-filter to match WAN-Miniport as well
Merge pull request #7 from medea61/master

updated interface-filter in MicrosoftWindows.pm
fixed typo
Merge pull request #8 from medea61/master

fixed typo
merged with master
missing template: EmpireSystemedge::empire-disk-stats-nt50Intel
增加GAMEOVER界面按钮hint，修改客户端排行榜逻辑（待测试）
增加TOP10按钮（未定位）
Merge branch 'master' into DEBUG-branch
排行榜前后10名已完成
Merge branch 'master' of https://github.com/metaphysiks/snowball-fight
trying. take 2
Fix viewport definition error on Chrome
I got "Viewport argument value "device-width;" for key "width" not
recognized. Content ignored." from Chrome. After some googling I found
out that comma are the correct delimiters for viewport properties.
This commit fix this problem by replacing colon with comma.

Ref:
http://stackoverflow.com/questions/5555125/viewport-tag-syntax
https://github.com/h5bp/html5-boilerplate/issues/626
http://drupal.org/node/1292710

Signed-off-by: Misbachul Munir <misbcl_munir@yahoo.com>
729 work continues
Merge branch 'master' of https://github.com/micramm/HaeffnerLabLattice
AndorServer almost complete (needs debugging). AndorClient needs to do video and text-save.
Fixed lint errors, which lint on windows hasn't found
updates: Firefox now works with Hybi-13 (yay!)
invoking todo app through https instead of http
adding entire cookbook
change of upstream
Merge branch 'master' of https://github.com/cookbooks/ruby_enterprise
Adapting cookbook to the cookbooks flow
Completed the array sniff.

- Added support for multiline arrays (both for arrays starting after the opening
parenthesis of the array as for arrays starting on the next line after the opening
parenthesis of the array).
Corrections for line endings.
fix spec to work in Ruby 1.8
DeleteOperator support
Fix soundmanager swf path
Javadoc
Merge branch 'master' of github.com:mkielar/usb-drive-notifier

Conflicts:
	pom.xml
	src/main/java/pl/mkielar/usbdrivenotifier/model/USBDriveStatus.java
Update associations dialog.  Not quite done, but almost.
Associations Dialog appropriately saves items.
Yeah Yeah Yeah :D
[KGO-788]
Make robots.txt a dynamic file based on modules settings.
Remove google-specific syntax.
KGO-655: Add option to DataResponse to convert encoding
KGO-659: Localize LDAP error messages
KGO-656: added a function to trim all leading and trailing whitespace.
KGO-658: added a method named timezoneFilter and created a initial vars for search standard timezone.
pass all initArgs to DataResponse
update method to cleanContent
Merge remote-tracking branch 'private/KGO-656'
Merge remote-tracking branch 'private/KGO-655'
updated timezoneFilter to return the tzid if it's not in the timezone map. Renamed  nonStandardTimezones to timezoneMap
Merge remote-tracking branch 'private/KGO-658'
KGO-659 reduced the number of strings needed for LDAP errors
Merge remote-tracking branch 'private/KGO-659'

Conflicts:
	lib/People/LDAPPeopleRetriever.php
bug 788055 - csv format output on the /daily report, r=rhelmer
woot, code for web design:D correct
Committing the MessageQueue stub files to Git!
Merge branch 'master' of https://github.com/mroberti/CoronaDialogQueue.git
Committing the MessageQueue stub files to Git!
doc ja: add 2.10 release entry
Import of Izhikevich neural models and network
Fixed a super annoying issue with case sensitvity dealing with Mongo Mapper
Experimental Runtime Codegen

Warning: Hax.  Hax upon Hax upon Hax.  This shit be ugly, yo.
tcp netstat post module via railgun
Fix the broken reload_modules method

When using the reload_all command, the framework will trigger an
'undefined method module_history' error, because we're missing
an accessor.

Also, even though reload_modules returns "counts". That actually
returns a hash instead of a real count of modules... the return
value is also never actually used anywhere.  But to make this
part not broken, we return the actual count.
Permissions.
Rename counts to count
fixed tcpnetstat table displaying
Merge branch 'reload_modules_fix' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-reload_modules_fix
Merge branch 'tcpnetstat' of https://github.com/mubix/metasploit-framework into mubix-tcpnetstat
Make msftidy happy
Update milw0rm references.

milw0rm.com is long gone, so all milw0rm references are just
a bunch of broken links.  Change to exploit-db instead.
Make sure entries are 8-bit
Mark all libraries as defaulting to 8-bit strings
Skip module loads/db connect for existing framework sessions
Back out encoding change of empty string, done by comment
updated zdi reference
Move the db skip into the "web" console driver. FIXRM #7031
Added module for CVE-2012-0124
Merge branch 'hpdp_new_folder_bof' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-hpdp_new_folder_bof
Space space
Merge branch 'apple_quicktime_texml_zdi' of https://github.com/jvazquez-r7/metasploit-framework into jvazquez-r7-apple_quicktime_texml_zdi
Update title & description to match what ZDI has.

ZDI publishes a new advisory that's closer to what we actually
see in a debugger. So we update the reference, as well as the
description + title to better match up theirs.
And a fourth commit
modify tools.html
detailed logs
finish 1
finisth
creating placeholder brand and nav elements
b4c11a7 Turn menu and button images on r...

based on: http://github.com/torvalds/subsurface/commit/b4c11a7ed3806c7ac30666676ffe5640d6c07bca

compiled with: mingw 3.4.5

notes: 2.0 release
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
TSSPEED_AUTODETECT macro
build trash has been removed
Add Sql2008ClientDriver support in DatabaseSetup for testing against SQL Server 2008 or later.
raw SVG
document 1.0.2 version change
Add changelog for version
Update example style sheet
Reworking GFX still. As far as I can get without Jordan. XD Simplifying
and abstracting entity colours. Going to add Entity types.
Site updated at 2012-03-24 08:06:55 UTC
Site updated at 2012-12-28 18:26:16 UTC
change kddi to riken
namespace select
Minor edit from Jeremy.
update readme
raise error if record not persisted
fix accident comment
added global variables for CARS, BUILDINGS and so on
changing compare button
Check if custom image is not false, to make fallback work.
Props @carloscorrela

git-svn-id: http://plugins.svn.wordpress.org/wp-display-header/trunk@541921 b8457f37-d9ea-0310-8a92-e5e31aec5664
add of license in pom.xml
Added superfly
Game Update

Added speed and coordinate indicators
Fixed some minor issues
Try to recognize HEX firstly. This fixes a bug with expanding brackets in CSS file. Also limited expanding brackets to [] and () to exclude CSS scope from expressions.
Removed plain HEX format recognition in favor of CSS formats where 255 would be a valid HEX.
Added "upperCaseHEX" setting.
Setting for "magnification" can be 0 to use defaults from the app.
новости, исправлен глюк с версткой внутри новости
2601 kctl_isadep.c should support four serial consoles
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
2904 hxge forgets C isn't math
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Michael Speer <michael.speer@pluribusnetworks.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
3117 aac forgets C isn't math
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
3119 zonecfg(1M) still mentions sparse zones
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
2982 nfs3: cleanup debug code at nfs3_srv.c
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
3123 need a way to force loading of DTrace helpers
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Bryan Cantrill <bmc@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
1862 incremental zfs receive fails for sparse file  > 8PB
Reviewed by: Matt Ahrens <matthew.ahrens@delphix.com>
Reviewed by: Simon Klinkert <klinkert@webgods.de>
Approved by: Eric Schrock <eric.schrock@delphix.com>
3112 ztest does not honor ZFS_DEBUG
3113 ztest should use watchpoints to protect frozen arc bufs
3114 some leaked nvlists in zfsdev_ioctl
3115 poll(2) returns prematurely in presence of spurious wakeups
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Matt Amdur <Matt.Amdur@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <chris.siden@delphix.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
Merge branch 'upstream'
3121 missing SMF method directories should say something useful
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: T Nguyen <truongqnguien@gmail.com>
Reviewed by: Richard Elling <richard.elling@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Merge branch 'upstream'
Reintroduced the raw graph power statistics
Update notes for submitted changes

* Fix precise image creation.
Update notes for submitted changes

* Add missing ack to impl_qpid.
JOSM/wikipedia: add `wikipedia` tag to selected object



git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@28198 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
[josm_opendata] create an externals directory to link to jts.jar

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@28201 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
[josm_opendata] external link to jts.jar

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@28202 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
Performance improvement: lazy iterator for decks.
Edited .gitignore
Fixing double slash
Try to fix pakmak problems with copying files
http://forum.simutrans.com/index.php?topic=10985.msg106740#msg106740

git-svn-id: https://simutrans.svn.sourceforge.net/svnroot/simutrans/pak128@1068 e96eaf88-093e-0410-925f-862d53288611
omniauth.rb development-production
Fixed up styling and added logic to position by viewport
offset to kalidoscope
adding virtualenv script
Commit
Finish layout and routes
Updating Gemfile
Update README.md

dropped
Initial Commit
Initial Commit
Merge branch 'master' of github.com:paulsalem/repository.salem
update readme and add images
Fix minor bugs

* Add MapPoint model object to store placemarks.
* Build trip info view from plist.
* Extend MDLocationViewController to display satellite and hybrid
maps as well. Also, Let users refresh the location.
Successfully displaying jobs on a map.
added CS Circles fork reference
Updated post meta section
enable BLN
learned how to manipulate ENV variables. Good stuff.
New Activity model
Updating the partner banners, adding ActiveWatch
rename
rename'
"douban test"
forgot quotations
Added FizzBuzz for PHP
database
Merge branch 'master' of http://github.com/prakhar1989/researchportal
Merge branch 'master' of http://github.com/prakhar1989/researchportal
[POST] Codemotion slides.
index.html auto-update: 2012-08-18 16:39:05 +0000
index.html auto-update: 2012-04-15 17:53:29 +0000
Updated doctrine CLI with proper paths & application bootstrapping.
Merge branch 'refs/heads/release'
Updated codebase to confirm to strict standards.
Merge branch 'refs/heads/release'
Added .gitattributes file.
Added dirname var.
Added deploy script.
Changed to v0.1.
revert issue 9 fix: i18n deps must be included in dojo.js as core-web-layer might not be loaded when i18n is processed
Merge branch 'master' of github.com:pruzand/Dojo-Build-Factory
subscription: added status field to Subscription model
subscription: added data migration for status update
subscription: removed status-related workaround from admin
schedule: add "I love JSON module" back
imported TEMPLATES from settings
created common views form form processing
changed/added contact templates for installed app
imported form processing views from common_views