labofsahil/github-event-dataset-2012 huggingface dataset:
Checkpoint for argument-file parser work
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Enable argument-file index to propagate errors with missing root
argument files to the containing project
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt
Merge remote-tracking branch 'upstream/master'
Update argfile parser and (a bit) tests for new ArgFile parser
Checkpoint on argfile parsing and error propogation work
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog.txt
Initial work on argument-file parse and error propagation
Checkpoint on Arg-File parsing update
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog.txt
checkpoint
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt
Add dedicated annotation models for SV and ArgFile editors
Merge remote-tracking branch 'origin/master'

Conflicts:
	sveditor/plugins/net.sf.sveditor.ui/src/net/sf/sveditor/ui/svcp/SVDBFileDecorator.java
Merge pull request #164 from mballance-sf/master

Bug fixes and decorator changes
fixed black hole bug? and made space rips suck energy instead of killing you
Updated the date on hte domain change message again
Merge branch 'domain_change_message' into staging
When packaging file using the service, first copy it to the packaging ftp server
Start work on lexile indexing and OverDrive reporting
Fix typo scoping items
Merge branch 'marmot-sprint10' into marmot-sprint11

Conflicts:
	vufind/web/Drivers/EContentDriver.php
Add lexile code to schema
Update notices to not include reference to Douglas County
Load lexile score and codes from lexile export
Load additional awards from lexile export
Has Collision Detection
Merge branch 'master' of https://github.com/mea36/duca2012_group8
123

123
1

1
New Project
Collision detection
changes
Switched to standard architectures.
Article set up
Merge pull request #1 from rjc210/articles

Adding articles to the world project
with rvm
Merge pull request #1 from memerelics/with_rvm

with rvm
Fixed! SubjectList and SetList are both totally wired up. Working on the
FlashCards themselves now.
Will now return the list of every flash card in a particular subject and
set. Hell yes.
SubjectList, SetList, and FlashCard list are wired up. Working on
FlashCardFront now.
rm rbx-2.0 from .travis.yml
moved admin_new styles to seperate css file
Triple is positive by default.
Included the ability to update the Scala compiler libraries for a portlet
Remove test code from class file
display truncated blog preview in markdown
fix some global bindings
pass prefix to markdown select section when doing copy and paste
add updatelink, fix persona fields, add clear history func,
Add suspend and resume functions to the xenstore client
tabs to spaces, no functional change
use the cstruct-0.6.0 api
depend on 0.6.0 cstruct
Merge branch 'suspend-resume' of https://github.com/jonludlam/ocaml-xenstore
Merge branch 'ocplib-endian'
bump to version 1.1.0
Merge pull request #2 from jonludlam/suspend-resume

Add suspend and resume functions to the xenstore client
Merge git://github.com/avsm/ocaml-xenstore
Update Cstruct.blit_string -> Cstruct.blit_from_string
Updates models to work with newer locast core
webfinger: misc fixups
Got rid of CDN-hosted css/js deps in the tree, proper license cancer for unhosted stuff
More thumnail changes for EAD internal page.
RCR page now shows relationships, although they aren't grouped properly yet.
Relationships is complete on the RCR page.
Fixed a bug in the previous version.
Small formatting change to date ranges.
Collections are now displayed on the RCR page.
removed links since we won't have browse right away
stubbed out placeholder code for WP to make them render as regular images for now
automatically check license on release
Add Capybara and a simple integration test
Add new Record page. Working with tests.
fix image resizing in file browser
Update src/ResqueBoard/View/footer.ctp
Removed AppDelegate.* and moved to app.rb
Defined AppDelegate in app.rb
Moving cffi_ros_utils to cram_highlevel.
Moving cram_physics_utils to cram_highlevel.
Update script/README.md
test viewCategoryContent.php
setting up the git hub pages, basic stuff. to do etc.
Adding gibberish-aes.min to the demo.
first commit
Now loading and processing pcap files
Added conninfo datatype to facilitate comparison
Comparison now works for not-equal :-)
added .all to ConnInfo to enable strict comparison
Added support for wildcards in ip and port
Added simple DNS reader
Changed return value of DNSreader
DnsReader now saves entries seen
added attribute related to wildcards
fixed bad comparison
DnsReading now works
Added streamreader to merge multipackage datatranfers.
fixed static class brain fart
Added possibility of clearing readerlist
httpreader now works also
now including conninf in all entry replies.
Clarify my problem with the initial code.
Arvind | Activemq properties changes
Vishal, Dheeru #444 Added functionality to get total rows from a given filter criteria
*** Got ServerCommunicator and the Server finished. Ish. Need to start on Controller.java
Make b2g executable
Integrate gecko build into android build system
test_that_only_plugin_reports selects OS and days filters
test_that_only_browser_reports also filters by days and OS
add spaces for readability
Merge pull request #156 from trumans/filter_os

Filter os
JAX-RS # 000 # 01 : trying to do it with Jersey
JAX-RS # 000 # 00 : removed old obsolete README
ANT # 002 # Java EE build removed old obsolete README
depreciations
hmm
モデルとコントローラーをいくつか追加
remove problem lines in static_pages_controller
Comments are now posted asynchronously. But page content does not get refreshed yet...
Updated licence in README
Gemfile cleanup

* Have Gemfile load the version specifications from the .gemspec
* Remove Gemfile.lock from version control

http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
Change rake version spec from "= 0.9.0" to "~> 0.9.0"

This makes is possible to use the blitz gem with projects that require
a newer version of rake. Thanks @ekampf
Bump bundler to ~> 1.1.0
Bump version to 0.1.26
Merge pull request #15 from mudynamics/dependencies

Update dependencies
debug added to view
remove unused actions
add utility functions form model deletion
add init db and clean db scripts
remove partial in the search file
Only create alert if actual parameters differ, not just cobrand/lang.
Add Bromley to searches if not present.
Fixed Enumeration Definition and simplified the text a bit.
Improved Function text and readability.
Impl OAuth authenticate.
Fix typo
Merge v2 to master
Merge branch 'next'
Made scripts use a symlink in repo user's home instead of $REPO_DIR
Clarify and hunt spelling mistakes
Make main README look nicer
Make install script create additional symlink and make README take account
Also update client-side config file to use one variable less
Merge branch 'next'

Conflicts:
	client/pullins
Refactor code and fix #1
install from sql in wnf
Move old pastes to a separate controller
入力ファイルの文字コードを変換するようにした
Added functions referenced by strings and automatic modeling. JSON is now easier and more flexible
Hack around Monarch sorting issue
limit boolean
summon limit boolean
palceholder facet action
interface multi-select facets
clear results from multi facet
move around spell suggest
summon multi facet config
spell check styling
make sure sort is in redirect
simpler facet id
bug fix, path is only one level up
request original key in xml
only show search refinement scope when there are facets
first pass through NOT facets
facet is_date attribute
padding around search box
rework summon facets included in response
summon: parse date facet
summon date filter
reworked facets so each has own form
fix author filters
lazy load records for the collection
allow mapper to be set per collection
Merge pull request #8 from TMaYaD/master

refactored the collections API
Changed reconnect.max.time property of torque JPPF node settings (see issue #20).
Update mongo authentication file path.
Add submodule nexeck-alert, nexeck-debugger, nexeck-menu, nexeck-pagination
setup git script,some new aliases
Purpose: Updating Readme for 0.3
Static Pages
Finish Static pages and testing
Removed the index page
Add comment and make a contact page
Guard and spork install
Technology explanation.
There are many letters outside A-Z. Here are the danish.
Make the string By Letter/Artist/Album translatable
Sort by recording date, not rip date
Updated danish translation
removed interface, count
Improved UI in submit event page + fixed preview and upload of images.
creation of current class for top navigation.
ZSH add zshrc-command script

this executes the given commands depending on the machine and other
settings
MODULES bump submodules
ZSH add machine dependent settings for i14*
Adapt the Phantom readypgm to the replica feature in the epu recipe

Program names are now suffixed by a unique number generated inside the
epu recipe. Make a partial match with grep instead of asking for an
exact match from supervisorctl.

Since there is generally only one program per supervisord, it shouldn't
change anything.
Add log file output flag to wpa_supplicant startup command
Move node directory instead of copying
Merge branch 'master' of https://github.com/ninjablocks/utilities
Add LED support to x52 joystick driver

This commit adds sysfs files to enable or disable the LEDs on the
X52 Pro joystick. This also fixes a minor bug with the brightness
API which was always complaining not-supported.
Common syntax analyzer added
Removing getDataString() methods (replacing with Data Formatter)
Merge branch 'master' of github.com:noha/virtual-gemstone
Added patch for buggy json gem specification file that is loaded in vagrant setup.
Handle include() in urlpattern parsing.
Added 'Phase 1' to Phase1Player toString to distingush from Phase2 and Phase3
Merge branch 'master' of https://github.com/nordmoen/IT3105-poker
Make use of ChannelListeners.drainListener(..) for StreamSourceFrameChannel.discard()
removed clutter and added empty create and import methods
Fixed NSF grant number
Initial commit. Git testing.
Merge branch 'master' of github.com:nsimmonds/post-office
Add HighOrderUtils and Predicate

Signed-off-by: Niels Thykier <niels@thykier.net>
add in NumQueryThreads for tomcat datasources
Format attr
Merge pull request #5 from obazoud/set1_attr_format

Format attr
routes for metrics, refs #43
views for metrics, refs #43
cryptojs for hashing, refs #43
rickshaw and d3 for metrics charts, refs #43
wrong cryptojs; pull the new js deps in, refs #43
js for rendering metric charts, refs #43
styles for metrics, refs #43
remove debug, refs #43
tweak size, remove styles from js, refs #43
minor border tweak
add toolbar and start of graph form; link to render-common.js
reuse common functions
hook in the interval bar
open/close behavior on metrics form
remove unwanted form bits, rename metric form classes
remove list style on graph select (metrics page)
remove search form on metrics view
resize select input; add sample options; add graph preview block
styling for metrics-graph form
explicitly set renderer; no need to seed the data array
CYKLO-923: code review.
changed the license text
New building
Integration -> Delivery
Added show/hide toggle function
Removed toggle function (will need loop checking in future). Added hide function.
Untested tweaks
Add sponsorship of cameras
Move primary navigation outside of main content area, and adjust layout styles appropriately.
Extended resource_registry.find_resources_ext
Remoived unecessary decorator
fix heinlein image
Add missing String.format call to log string contents
patch by Julien Lambert reviewed by dbrosius for CASSANDRA-4574
merge from 1.0
fix toString of hint destination tokens
patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568
merge from 1.0
merge from 1.1
fixes mobile examples which were using ZoomPanel
update doc in mobile navigation
Merge pull request #336 from tonio/examples

fixes mobile examples which were using ZoomPanel
Merge pull request #333 from elemoine/patch-1

Tiles@Home has been discontinued so it should be removed from the doc as well
refers #290 - initial generic controller and page (generic.jspx) which
knows to display pages on the fly from API.
- Deleted all controllers and pages of vanilla app
refers #290 - support for composite pages in generic controller & on the
fly pages
refers #290 - fixed related test. Added back TableDefinition to PagePart
(originally replaced by fieldTableName), as without it generation gets
more complicated
fixes #290 - added relevant jspx to new application.
fixes #351 - automated using maven-ant deploy using ftp to templates
server.
The following system properties needs to be defined:
templates.ftp.user, templates.ftp.password, templates.ftp.dir

server is: templates.openlegacy.org
Enable place type filtering in the URL
- Capture an optional place type filter in the url
- Filter the placeTypes object to only include the default place type
- If default place type is set then update the Backbone history root
- Fix activity view to filter by type on action render, not just render
Update url to match character after the first slash
Handle special cases for location_type
- Set location_type to a hidden input if default type is set or only only option is set
- Update the default type from the url to the one from the config in case there are case issues
- Add overridePlaceTypeConfig to template helpers
Validate the default place type before applying it.
Add template helpers tests
Merge branch 'sa-web' into place-type-filtering
Merge branch 'sa-web' into place-type-filtering
Refactoring/cleanup of namespace implementation

Windows build not yet updated
Renamed globalXXXStream methods for convenience

globalErrorStream() -> rError()
globalWarningStream() -> rWarning()
globalOutputStream() -> rMessage()

New stream rDebug() which directs output to the rMessage() stream in debug
builds and to a null stream in release builds.
Fixed the incorrect renaming issue (#2733)

The key fix is at Namespace.cpp:261, where we need to check whether the imported
name conflicts with a name in the *destination* namespace, not the union of both
namespaces (which it always will, because we just built the union by adding all
of the new names).

Also includes further refactoring and cleanup.
Renamed method to more accurately reflect behaviour
Updated version to 1.7.2 on Windows
Updated Windows build scripts
Updated version to 1.7.2 on Linux
cherry e62-10k sw added
Fixed strange characters...
Add notes, gitignore and rename module
Remove workspace.xml
Better code and remove output file from repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/CanvasState.kt
	src/Image.kt
	src/Piece.kt
Template Article with overlay removed > the same as Touchable article with fixed illustration
Update to jclouds 1.5.2
Handle case where jclouds returns nil credentials
Updated release notes and readme for 1.5.0
[maven-release-plugin] prepare release pallet-jclouds-1.5.0
[maven-release-plugin] prepare for next development iteration
Merge branch 'release/1.5.0' into develop
interface
zakommitil ves' govnokod
version 2
Merge branch 'master' of https://github.com/pasvc/NF17---Aeroport
Version 1.2 (fichier renomme)
Update postman version; again and again...
Created a custom model for RabbitMQ handling.  Handles the lack of configuration and a good RabbitMQ install graciously.  Needs a lot of documentation.
Pull request for HHH-7245
custom font fix for ubuntu
added redirect for url persistence
set uri_segment since default is 3
added page links and changed search post method name
added search student count method
Merge pull request #37 from pcas00/search_pagination

Search pagination from keera
just input and output left
Add qa_checklist and perms
timezone now set in vmbuilder
Added codesprint twitchtv code
Merge remote-tracking branch 'gridcentric/master'
Merge branch 'master' of github.com:gridcentric/openstack
Merge pull request #74 from dscannell/master

Adding a hook into the DELETE api so that the extension can do some cleanup
Adding a log message / fixing up comment when deleting images from the image service during discard.
Initial commit of the Horizon plugin
Add gridcentric_outgoing_migration_address flag.

Lets you specify an IP address to do outgoing migrations on.
Merge 79635662fbe1ca4615594eb87481bcc4c9fc233e into 4574399f658a21b4a76873ed77ed53537f6e0181
Merge pull request #84 from peterfeiner/stable/v2.3-diablo

Stable/v2.3 diablo
Merge pull request #83 from dscannell/master

Initial commit of Horizon plugin + a small openstack change
A bit of a change up for when uuids / ids should be used when setting an instance's security group.
Merge branch 'master' of github.com:gridcentric/openstack
#212: Setting the terminated_at and vm_state fields for discarded blessed instances.
Cleanup packages on request. Part of #221 fix.
Fixing up unit tests by mocking out RPC calls/casts and importing the new RPC module.
Merge pull request #85 from dscannell/master

Fixing broken security groups in master
Merge branch 'master' of github.com:gridcentric/openstack
Merge pull request #87 from dscannell/master

Fixes units tests & setting terminated_at field [NOTE: In this changeset master diverges from stable/essex]
Fixing master test call.
Fixing test by using API.
Merge commit '33825d706734263622e363c7305792a1ebd9a33e' into stable/diablo
BE: remove faulty piece of code
GUI Scalar fix.
Fixes link/abbr/wai-lang tabs are not activated automatically
Fixes wai-lang button doesn't do anything

The toggle button's state was updated before the click handler
was invoked, which inverts the state previously set by the plugin.

Plugins should not use ui components as way to store and retrieve
state. Ui components may of course be used to reflect the component's
state.
Merge branch 'dev-jqueryui-ultra' of ssh://github.com/alohaeditor/Aloha-Editor into dev-jqueryui-ultra
Fixes tooltip positioning
Using the document top margin and padding to calculate the top gutter
rather than just the margin alone.
Fixes focus of abbr and wai-lang attribute fields
Implements missing abstract methods
Fixes enter in attribute field
Reformulates the changelog
Reducing min-height of dialog box
Merge branch 'dev-jqueryui-ultra' of github.com:alohaeditor/Aloha-Editor into dev-jqueryui-ultra
Fixes toolbar shows insert tab instead of format tab
Fixes highlight color is not restored on enter
Cleanup
Refactors assign -> adopt assignToSlot -> assignInto
Refactors child.adopt(parent) -> child.adoptParent(parent)

This is to make a distinction between the bare Ui.adopt call
which makes the parent (Ui) adopt the child component.
Allows for the slot to be the component's name
Removes debugging code

I really should stop doing this
Fixes inserting characters with the characterpicker
Fixes javascript error
deep copy for tokens
Merge branch 'no-switch-case' of https://github.com/pfirpfel/iml-compiler into no-switch-case
1st cut at filtering requests
Better showErrors - more like growl. Added syntax highliting editor.
README fix, remove httpparser.so
remove benchmark refactoring from fix branch
[feature/plugins] Rework plugin system

Some initial work on rebuilding the plugin system to a more flexible/
maintainable/understandable system.
Saner test as the real patch can be always different
small Czech translation typo correction
Merge remote-tracking branch 'origin/QA_3_5'
Sortable ability for server processlist
Merge remote branch 'upstream/master'
Fixed some code violations in PMA_DisplayResults class
Improve some tests for functions in PMA_DisplayResults class
Merge remote branch 'upstream/master'
Merge remote-tracking branch 'chanaka/master'
Introduce DisplayResults class
Add constants to DisplayResults class
Merge remote branch 'upstream/master'
Renamed display_tbl.lib.php file as DisplayResults.class.php
Fix some code violations
Implement constructor and use global variable  instead of variable , which imported from superglobals for functions
Resolved conflict in common.lib.php
use global variable _table instead of variable table, which imported from superglobals for functions
use global variable _goto instead of variable goto, which imported from superglobals for functions
use global variable _sql_query instead of variable sql_query, which imported from superglobals for functions
Remove useless variable cfgRelation from both constructor and getTable() function
Correction sql file and use docblock comment for constructor of PMA_DisplayResults class
Use superglobals instead of importing superglobals inside functions
Fixed bug due to breaking _getTableBody() into subfunctions - link is missing where foreign key pointing to relavant table
Resolved conflicts
Modifications to PMA_listNavigator() function in common.lib.php and renamed as PMA_getListNavigator()
Modifications to PMA_externalBug() function in common.lib.php and renamed as PMA_getExternalBug()
Modifications to PMA_browseUploadFile() function in common.lib.php and renamed as PMA_getBrowseUploadFileBlock()
Modifications to PMA_selectUploadFile() function in common.lib.php and renamed as PMA_getSelectUploadFileBlock()
Modifications to PMA_printButton() function in common.lib.php and renamed as PMA_getButton()()
Toutes les modifs sont listées dans la version .mss

deleted 'pieton'
changed into 'badways'
testa ta bort
Correct some key names.
Starting to implement dropdown menu.
Fixed the drodown to return the correct url and state when you select it.
Finished up basic front page school selection.
Synced up the home page with the school page.
Changed the state dropdown a bit.
Made the home page dropdown menu look more like a dropdown menu.
Added a create college model on the front page.
You will now get redirected if enter a url of a college and school that doesn't exist. Also Th ecollege page now pulls the college infor direct from the database instead of the url headers.
Merge branch 'master' of github.com:acastr7/ProfessorVote
Trying to get my query to work.
Everything up until the College page now works. The professors are loaded for that college when you go there.
Added a model button on a university page to add professors.
Added icons to buttons and also changed the name of the image folder.
latest work...not stable yet
Merge branch 'master' of github.com:acastr7/ProfessorVote
latest build, almost stable
Put clear button next to todo input field
Max playlist items set to 5
GATE text processing
Include Products.CMFCore permissions.zcml just to be safe.
Added tests for issue #12314: Member data fields cannot be set to empty string.
Setting a member data field to an empty string now works.

Fixes http://dev.plone.org/ticket/12314
Removed README_moved_to_github.txt
Preparing release 1.1.3
Back to development: 1.1.4
support came_from for the registration form in a way similar to the login form
Avoid direct zope.app.form dependency.
Merge branch 'master' into plip10959
fix i18n on merging plugin password description
Aliases for lock screen, prod deploy, fix for grep and history
argument consistency
Now seriously, was that so hard?
Добавлено редактирование рабочей схемы в диалоге рейсов.
better logging

Signed-off-by: Pooria Azimi <pooriaazimi@me.com>
better logging - global function - added an initializer

Signed-off-by: Pooria Azimi <pooriaazimi@me.com>
improved data on sleep variants
Logo Added

Words 2.0
Launched GREWordsOnline.com

Added fb, feedback button and converted db to mysql
Final Models commit
added discard button to mobile app, added manual route calculation
inverf, probability staff and pwm staff
Settings button in MAin is now connected to TrackPrefs
new chat page
Allow passing prawn document to draw on.
Updated graphics opengl blendeqn example : added comment and small fix
Updated graphics glut_game_mode and opengl_blendeqn example : added comment output
Added graphics opengl alpha example
Added graphics opengl alpha3d example
new changes in poste
new Commit Poste
new commit
fixed errors
Merge pull request #70 from ccamposcr/master

pull
bump to storm 0.8.0
[maven-release-plugin] prepare release storm-signals-0.1.2
punch
Merge branch 'master' of github.com:punchItIn/Punch-It-In
Core - Refactoring core, introducing CoreBus to handle communication between core entities.
Onboard - Roboguice & UIBinder
Onboard - Refactoring app. SensorActivity, RemoteActivity, ScheduleActivity
Fixed reopening Accessory
OnBoard - added debug mode
Onboard + Core - Merge followBWF.
Constatns -> DB
Onboard - ConfigureActivty & DebugComStream
updated Android dependencies
FSM draft.
testar
testar2
Experimented a bit with the range sensor values. Got it working together with the motor control to avoid obstacles.
down to cmTemplate error bare bones
down to cmTemplate error bare bones
不完美
update to logback 1.0.7
Add ability to read ledger_filename from configuration file.
Rename --read-file to --ledger-file
Merge pull request #14 from thdox/ledger-file-option-rc

ledger file option
Updated file structure
Organized file structure
[jslint] validator/validator.js
Added some smoke tests. Updated the other smoke tests.
adding pagesize to metrics timers
Addressing Sonar Violations
Merge pull request #169 from rackspace/Kovacs-Sonar

Addressing Sonar Violations
Added splat in practice section.
file restructuring + dlgInfos design

Involved changes to updateGui
add coordinate conversion
Utorzenie repo
Merge branch 'master' of https://github.com/rarvolt/FlightShooter
Bootstrap now supports loading modules. Wrote a couple of new tests.
fix for multiple media:thumbnail
add notifications to templates that these files were modifided by chef
Merge branch 'master' of https://github.com/rcbops-cookbooks/nova into templatecleanup
Merge branch 'master' of https://github.com/rcbops-cookbooks/nova into templatecleanup
Merge pull request #120 from rackerjoe/templatecleanup

Merged automatically by jenkins after successful build test
Find intervals by time/distance

Find interval dialog will now allow you to add
intervals by time or distance (e.g. add interval for
every 10 minutes or every kilometer).

Since there were three menu options all doing similar
things, they have now been consolidated into a single
dialog.
Correct typo in peakpower intervals

	modified:   src/AddIntervalDialog.cpp
Adding samurai package.
Adding a decorators module.
Adding a docstring for our decorators module.
Adding blocking for annoying shit.
Adding our setup.py script.
Adding a `heroku` decorator.

This decorator simply ensures that the wrapped view is *only* accessible by
Heroku's origin servers.

It does this by checking the basic auth credentials of the user making the
request, and comparing them to the username / password that you are expecting,
stored via environment variables.
Simplifying our `heroku` decorator.

It now reads from our Flask configuration file for the SAMURAI creds.
右键菜单改为“保存到为知笔记”

右键菜单不采用菜单栏方式，只显示一级，如果有客户端，则调用客户端保存，否则直接调用云端保存
Update
Merge branch 'test'
Corrected README regarding element format
added epsilon
v0.9.5.1
Add beginnings of raw data class
Add 'dev' alias.

Add classifiers for supported Python versions.
Add tox.
Upgraded client to work with access tokens. Added some simple examples of adding/removing images and getting transformed URLs, as well as metadata.
removed unused csproj file
failing test for IoC-334 : FacilityConfig is null in facility Init()
updated license headers
added .NET 4.5 Core dependencies
automatic upgrade by VS2012
fixed #IOC-354
automatic upgrade to .csproj file
narrowed scoped of locking

We didn't have to hold the lock for so long
Merge branch 'master' of github.com:castleproject/Windsor
automatic goo added by VS2010

This used to be a vs2012 project, but aparently they can't decide on what a single common .csproj layout should be
making fields on CollectionResolver protected

this will allow for better extensibility without having to re-capture those values
added overload to DependsOn so that ReSharper doesn't complain
fixed IOC-300

Also implemented it for OnDestroy obviuosly
more tests
Update src/Castle.Windsor/Windsor/IWindsorContainer_ObsoleteAPI.cs

Changed the ObsoleteAttribute message on AddFacility<TFacility>(String idInConfiguration) to be more helpful.
Merge pull request #10 from JohannesEH/master

Changed ObsoleteAttribute message to be more helpful.
Implemented ctor filtering from IOC-355
Allow for multiple BasedOn or'ed together when using fluent registration
Fixed one missing test
Altered naming and fixed comments
uts: Make sure everyone gets -fno-inline-small-functions, etc
Revert "[HACK] ctf: Temporarily workaround GCC 4 stdarg change"

We no longer need this, after va_impl.h was fixed in Illumos and thus
recent OI, etc.
Revert "cpr: Never allow if compiled with GCC."

It now works.
Clean out unrelated changes (some whitespace, random Java cleanup)
vi: tidy up getpass() stuff
1469 ttyc/ttyd should be an allowed console device
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Alexander Eremin <alexander.r.eremin@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
2581 Observability for AMD Core Performance Boost
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
2586 nfs_make_dotdot() returns sometimes EIO
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Reviewed by: Jeff Biseda <jeff.biseda@delphix.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Reviewed by: Dan Kruchinin <dkruchinin@acm.org>
Approved by: Albert Lee <trisk@nexenta.com>
uts: Don't disable -Waddress
Mark functions which return unusually (twice, skip a frame, etc.)

GCC has innate knowledge that certain functions return twice (vfork, setjmp,
getcontext).  Unfortunately, we have a handful of others (on_trap, on_fault,
some in the deep innards of libc stack unwinding), and we have vforkx which is
the innards of vfork, but also of posix_spawn, etc.

This is necessary because, without the hint, the compiler may think a variable
is dead because it is unreferenced because we have passed the last variable
reference after the _first_ return, and clobber a variable, only to leave us
consuming trash after the _second_ return.

This, in particular, has been true of posix_spawnp on SPARC.
Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade
restrict create to only users with permissions to doso
Freeze system-wide gem sources, not just root's
Add changelog info
Merge pull request #99 from rightscale/azure_12_6_etc_gemrc

@Cary Freeze system-wide gem sources, not just root's
ensure temp state file is quoted to prevent issues if thread name has spaces
remove redundant checks
Added the :use-json flag to the shoreleave.remotes/request call so now if true .getResponseJson is called when setting the value to :body
readme is here
Revert items_per_page to previous default value - matches default theme
Handle cases where count returns 0 reports #581
Show incident id in reports admin. Closes #462
Remove duplicate query on admin/reports #581

* Moving ushahidi_filter.pagination into reports::fetch_incidents()
Update RiverID to handle HTTP redirects.
Move profiler to base Controller class
Clean up categories::get_category_tree_view() - reduce repeated queries #594
Closes #589. Limiting 'Approve' button in admin reports page to approving reports only(not approving+unapproving)
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Closes #584. Updating missing language strings for SMS messages
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Closes #598 - You can now turn the timeline on/off

Signed-off-by: Linda Kamau <kamaulynder@gmail.com>
Use new settings table in the installer. Closes #592

* I've whittled down the installer  to 3 main scripts - the bootstrap
(index.php), wizard (wizard.php) and the utilities (utils.php). The
views for each of the install stages are in "installer/pages/". The
entire installation process is managed by "wizard.php" - keeps track of
the current stage in the installation process thereby allowing a user
to resume their session in case they accidentally close a tab.

* The "Base Path" field has been removed from the database info screen.
We already auto-detect this so there's no need to ask the user to
specify it.

* When using "Advanced Mode", the installer no-longer prompts for an
API key when OSM is selected as the default map provider. Google and
Bing however require a map API key to be provided.

* The salt pattern is now set by the installer. Turns out that the
numbers in the pattern have to be sorted in ascending order. Closes #494
Fix invalid property reference error. Closes #563

* The blocks helper was still using the old settings table structure.
Closes #601. Returning missing argument - Deployment localization
Fix invalid property reference error. Closes #596

* The user property was not being set in the base admin controller.
Also, the $auth property was not being instantiated.
Zoom to the current marker position when changing map view

* The map (in the map view settings page)  was not zooming to the
current position of the marker. The marker was going back to original
position prior to the zoom change. Refs #571 and #604

Reported by: @rediguana <Garvin Treadgold>
Fix retrieve cities problem. Closes #604

* The settings controller was using an old Geonames API endpoint and
therefore the city table was not being populated with the name of the
cities. Geonames changed the web services endpoint to
http://api.geonames.org. The new endpoint requires a valid Geonames
username which must be "enabled for the free web services". The maximum
no. of cities to be retrievable has been restricted to 1000 though we
ought to make this item a configurable parameter - shelved for a later
release.

Reported by: @levental
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Ushahidi 2.6 - Tripoli
Merge branch 'master' into develop
A reasonable first step. The bills table has useful stuff in it, enough to start with.
Ajustes telas compras
Fixed initialize sensor function to use BNO
Little JS refactoring.
add mplayer config
Merge branch 'master' of https://github.com/robrooms/config-files
Convert to using Nose for tests. Issue #33.

This offers an *enormous* benefit to readability and maintainability,
but there is a minor drawback in that the standard Python 'assert's
give a less helpful error message when they fail. I'm ok with this,
though, all I have to do is add a print statement before a failing
assertion and then I see what's going on.

Note that the prodigious amount of imports from the old testsuite.py
translates into just a handful of imports per file. Makes things way
more readable overall.
Alterado init e rtupdate dos nós
Fix media compilation errors.
Fix errors under Debug build.
Remvoe aura code.
[Mac] Add initial support for Menu, MenuItem, Tray API
Add unit tests for Menu API.
added elasticsearch config
Fixing event creation from build list
Finishing touches on standby list handling; adding profession icons in various places; changing some html lists to tables as appropriate
Fixing signup form and misc UI issues
La til speakers-side
rqt_console: added support to return a summary of message types by severity received in a time frame
Update libactivator/it.lproj/Localizable.strings

With new strings, assignments etc.
Sources directory added.
update changelog for 1.1.4
fix user_patch
Moving simpleModal plugin files

Bringing it inline with everything else. Also removing the extra version
of jquery that was being loaded.
Updating x.png path in css
Updating css/js/img links to simpleModal plugin
Adding recess task for grunt

Used to lint and concatenate/minify all the css
Creating compiled and minified css file

Updating the indexforLivecodelabMinified.html file to use it
Merge pull request #78 from rumblesan/simple-modal-fix

Simple modal fix [by Guy]
Merge pull request #79 from rumblesan/css-minification

Css minification [by Guy]
Ops, forgot to include the math functions in the un-minified index.html file
minor harmonsation of the vanilla build system, moving the inclusion of the math.js file according to the order I include/process it in the other files
giving a more humane form to the listOfPossibleFunctions
build and docs
Added q option to git clean tool, added char-count helper
Added communication instructions.
Larger font
addl. color schemes
escaped space.
Fix typo in authentication spec
branch
socket test
callable
reorganizing
e Please enter the commit message for your changes. Lines starting
Fixed, root symbol table initialization in parser, and removed extra in semantic analyses.
Default Class templates`

Added select box to show defaultclass templates
New DataCtrls

Added get_class_templates
Added get_defaultclasses
New Classes

Added ClassTemplates
Added DefaultClasses
Added new collection to datactrls
modified opentsdb mkmetric call to do 100 metrics / call
SAK-22345 use the user local time zone for start date. Patch from Yuki


git-svn-id: https://source.sakaiproject.org/svn/calendar/trunk@117669 66ffb92e-73f9-0310-93c1-f5514f145a0a
Revert "Merge pull request #1624 from croby/SAKIII-4856"

This reverts commit b020e1b37244a3cae7069508addd0847349c64b1, reversing
changes made to 88b37db8d1f5f70b475ad59f678c916f200aceb8.
Merge branch 'SAKIII-5574' of git://github.com/christianv/3akai-ux into SAKIII-5574

* 'SAKIII-5574' of git://github.com/christianv/3akai-ux:
  Revert "Merge pull request #1624 from croby/SAKIII-4856"
SAKIII-5761 fix page revisions for IE8
SAKIII-5796 fix i18n key lookup
SAKIII-5797 changed live to on function
Merge pull request #2204 from jsloane/SAKIII-5797

SAKIII-5797 changed live to on function

* jsloane/SAKIII-5797:
  SAKIII-5797 changed live to on function
Merge pull request #2203 from jsloane/SAKIII-5796

SAKIII-5796 fix i18n key lookup

* jsloane/SAKIII-5796:
  SAKIII-5796 fix i18n key lookup
Merge pull request #2201 from jsloane/SAKIII-5761

SAKIII-5761 fix page revisions for IE8

* jsloane/SAKIII-5761:
  SAKIII-5761 fix page revisions for IE8
SAKIII-5760 fixed css background colour

Squashed commit of the following:

commit 44278c98d115342b355c9f0e4eb8ec982e496c10
Merge: 8e56e54 b20a5b9
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Jun 20 20:56:25 2012 -0700

    Merge remote-tracking branch 'jsloane/SAKIII-5760' into jsloane-SAKIII-5760

commit b20a5b9c106ba336ab35a3eba87c978bff465521
Author: jsloane <jsloane@csu.edu.au>
Date:   Wed Jun 20 09:27:05 2012 +1000

    SAKIII-5760 reversed topnav css change

commit 0625499ab80d11b418cb028ac2ca097e2638fa1d
Author: jsloane <jsloane@csu.edu.au>
Date:   Tue Jun 19 11:45:01 2012 +1000

    SAKIII-5760 fixed css background colour
Merge pull request #2199 from jsloane/SAKIII-5760

SAKIII-5760 fixed css background colour
SAKIII-5747 fix issue with searching for character

Squashed commit of the following:

commit 24b696d95ff9cf2a60f31915cf602c0ce5b9a7da
Merge: 013d2e7 8f326de
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Jun 20 21:02:52 2012 -0700

    Merge remote-tracking branch 'jsloane/SAKIII-5747' into jsloane-SAKIII-5747

commit 8f326dee169239f79fc10f403a6a3bf3df28f416
Author: jsloane <jsloane@csu.edu.au>
Date:   Wed Jun 20 11:32:43 2012 +1000

    SAKIII-5747 renamed autoSuggest to autoSuggest.sakai-edited

commit 0adb28474f1512765fa1a3d1811b5bb0ad059dfe
Author: jsloane <jsloane@csu.edu.au>
Date:   Mon Jun 18 14:18:12 2012 +1000

    SAKIII-5747 fix issue with searching for character
Merge pull request #2194 from jsloane/SAKIII-5747

SAKIII-5747 fix issue with searching for character
SAKIII-5745 check url before redirecting

Squashed commit of the following:

commit 50d28ead3e8aa5893055d5d6a9c89f1457630918
Merge: ca3cf1c fe7e3f6
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Jun 20 21:10:23 2012 -0700

    Merge remote-tracking branch 'jsloane/SAKIII-5745' into jsloane-SAKIII-5745

commit fe7e3f6b53c6e13960e7f0bf8d502ab493de19cc
Author: jsloane <jsloane@csu.edu.au>
Date:   Wed Jun 20 09:48:56 2012 +1000

    SAKIII-5745 moved function

commit 8609c29ec3bdc90001bc407f54ea203ab946dd78
Author: jsloane <jsloane@csu.edu.au>
Date:   Fri Jun 15 13:32:05 2012 +1000

    SAKIII-5745 check url before redirecting

commit e297e9f0179b52bc81fbe6c32ab1c3cdf2988974
Author: jsloane <jsloane@csu.edu.au>
Date:   Fri Jun 15 13:24:57 2012 +1000

    SAKIII-5745 check url before redirecting
Merge pull request #2190 from jsloane/SAKIII-5745

SAKIII-5745 check url before redirecting
Merge remote-tracking branch 'sakaiproject/master' into 1.5.0
SAKIII-5471 - Fix drag/drop elements in contentauthoring
https://jira.sakaiproject.org/browse/SAKIII-5471
Merge pull request #1971 from christianv/SAKIII-5471

SAKIII-5471 - Fix drag/drop elements in contentauthoring
SAKIII-5486 - don't delete messages while page edit
https://jira.sakaiproject.org/browse/SAKIII-5486
SAKIII-5488 - Sanitize JavaScript in page in collection
https://jira.sakaiproject.org/browse/SAKIII-5488
Merge pull request #1974 from christianv/SAKIII-5486

SAKIII-5486 - don't delete messages while page edit
Merge pull request #1975 from christianv/SAKIII-5488

SAKIII-5488 - Sanitize JavaScript in page in collection
SAKIII-5487 Restoring versions wipes away widget user content (e.g., discussion messages and comments)

Squashed commit of the following:

commit e59416c6d80e26edf58862e28b22c1ad60afb909
Merge: 0e81d85 f177fd8
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue Apr 17 10:27:34 2012 -0700

    Merge remote-tracking branch 'bp323/SAKIII-5487' into bp323-SAKIII-5487

commit f177fd852a921baf91833b647932deb326085322
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Apr 17 15:56:07 2012 +0100

    SAKIII-5487 Restoring versions wipes away widget user content

commit 35e5db9b2403bd4b528674d8088320faa3d43421
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Mon Apr 16 23:26:23 2012 -0700

    SAKIII-5487 - don't remove comments on restore
    https://jira.sakaiproject.org/browse/SAKIII-5487
Merge pull request #1978 from bp323/SAKIII-5487

SAKIII-5487 Restoring versions wipes away widget user content (e.g., discussion messages and comments)
Merge remote-tracking branch 'origin/1.2.0'
Roster checks (do I own this team?, is there a valid spot on roster to promote from bench?)
Multiway Decision Tree now supported

Changes were made to the Decision Tree classes to handle nodes with any
number of children based on the number of discretization classes
specified.

2 basic Discretization algorithms are available in the discretization
class.
messaging function added
Merge branch 'gilangbranch'

Conflicts:
	message/src/main/java/com/swg/acs/message/MessageArgumentFactory.java
* Hooked character constructor return
* Gui can now display a list of characters
LDOS for 4p
Fix grammar
Merge branch 'Documentation'
[2664] Add a few fixes and adjustments to the previous commits
Refactored ruby18 method for RubyLexer.
- Rolled out brynary's symbols-no-spaces (foo:bar) changes when parsing 1.8 code
[git-p4: depot-paths = "//src/ruby_parser/dev/": change = 7296]
[ADD] painter with numeralsystem 256 and 3 layers
[MOD] Javadoc
Merge branch 'master' of https://github.com/sebastiangraf/jclouds
[MOD] fixed AWSDownload
[#1287] Fixed issue where target drop downs were only being created if they were in the manifest
[t1268] stopped flickering of targets on drag
[t1268] lint fix
[#1287] Fixed issue where target drop downs were only being created if they were in the manifest
[#1290] Prevented up/down keys moving template page when track events selected. Prevented spacebar from moving page down
[t1268] firefox specific getComputedStyle fix
Add core/config and tests
Add config merging with tests
Start rewriting our config stuff to use new Config module
Start rewriting tests and core to use new config api
Fix more callers of config
Fix variable substitution in override case
Fix use of config by ui.js
[t328] Media css -> stylus css
[t328] Added UI for multiple urls
[t328] WIP adding multiple url boxes
[t328] multiple media sources

1. Removed common.styl
2. Fixed media-view.styl and old css
3. Preparing to use _url in media.js as array
[t328] fixed popcorn-wrapper to use array url
[t328] url updates parsed properly
[t328] add cap on urls
added safe zone
Update tasks/recess.js

changed "utils" to "util" for compatibility with grunt 0.4.0
Add Scala to the example project
Small tweak to make JAll Maven plugin examle pom and this pom match
display availabe widgets only.
gui.c: prototype of style list select cb.
added TODO
gui.c: elm_list_go.
ticket:6 added jquery media for widget
Fixing a lot bugs e putting few 'gambis'
Customizations for UDD
Few more changes to ES translations suggested from UDD
Change session store to active_record_store
Fix error page CSS and add lot of translations of error pages that were missing earlier
fix bugs with statistics
Add few growth numbers to statistics
Merge branch 'feature/bugfixes' into develop
Ajuste para ambiente linux
added glyphs to readme
corrected static path
initial add
include description
include description field
more notes for next
added description field, fixed sheet name @ 31 characters as imposed by Excel, #5
initiate tooltips
simplified tooltip
simplified tooltips
added metric title tooltip
Fixed sparse matrix handling in octave interfaces
Enforced parallel to use one thread in case of directors
fix typo -> distribution
disable example when NLOPT is not available
Incremental update from SVN, Revision 943
Issued mvn clean eclipse:clean
fixes for dialyzer warnings.
OTP version and gen_server:call(…,infinity) tidy up
fixed web-fonts caching issue
updated deployment configuration
cleaned up launcher script
cleaned up middleware configuration
test exception
Servlet is working again ...
Total rollback