labofsahil/github-event-dataset-2012 huggingface dataset:
re-organised the tests
Changed button size for batch delete
addpages as array
new bootstrap-dropdown, module.php now listens+injects menu items
优化部分错误处理
Delete content-type header for nginx server backend, to make nginx guess mimetype
Merge pull request #245 from bercab/nginx-content-type

nginx X-Accel-Redirect server backend needs no Content-Type header in django response
Update docs/upgrading.rst

fixes #252: Wrong SQL for migration docs from 8.7 to 9.0

thanks @hixi for pointing this out.
Merge branch 'develop' of https://github.com/stefanfoulis/django-filer into develop
dev account mention
Singleton class support for Mongoid
Mongoid 2.4.4 support
get rid of isolate garbage
Removed useless assets
Removed gem cached
Updated Gemfile for production
Add a process specification for running cat
Typo
Merge branch 'QA_3_5'
Remove unused import
Add the environ context to each WS implementation
Move socket/environ context in to base class
Refactor http info in to lazily evaluated properties to conserve memory
Add version too
Remove unused method
gevent.coros is deprecated.

Switch to the new package.
Support encoding non byte/string objects
Refactor `_encode_text` to `encode_bytes` and make it a helper.
Add some docs for exception classes
Add specific `ProtocolError` exception.

Hybi support error codes and this will help better support that.
Move `close` in to the base class and refactor accordingly,
`_read_until` -> `_read_message`

More descriptive name
Be consistent about hex capitalisation
Add a helper function to wrap fobj.read semantics
Missed a couple of _close refactoring spots
Refactor close to be more fault tolerant and easier to read
Small optimization to save the attribute access each time there is a read
Refactor `WebSocketHixie.receive` to be paranoid about broken sockets.

If an error is encountered, the socket is forced closed.
Refactor `WebSocketHixie._read_message`
Overhaul of sales page
Namespacing step #2

see https://github.com/Automattic/_s
Fix missing plugin parameters in scaffolding.

Add missing plugin parameter to scaffolded associations.
This improves link generation and correctness overall.

Fixes #3396
comp mod for saveAll()

better approach

test case to assert saveAll still behaves like previous versions
Correct inflection rules for cookies, fixes fixes #3291
Pushed before fxing error in test case, I suck. Refs #3291
Fix issue where createSchema() would omit primary keys sometimes.

Fix missing primary key SQL when using the primary flag + other indexes.

Fixes #3292
Remove bad test.
Merge pull request #894 from dereuromark/comp-fix-save-all

BC mod for saveAll()
Moving multibyte encoding setting to bootstrap.php. Closes #3290
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/bootstrap.php
Moving the mb_* functions to bootstrap.php
Fix problems in TestTask.

Remove some integration testing as namespaces make it tricky.
Form cellFormatters cleanup
8.1c zeilenumbruch
Keys for spawning.
NXBT-414: Disable unresponsive script warnings
v1.2.3

Fixed an issue with the form action not returning to the correct page.
Added LICENSE
Added requirements lists & tests
Added matcher code

This commit includes some matcher code to allow matching of status codes
and redirects
Merge branch 'feature/statusMatchers' into develop
Initial commit of setup.py
Added travis-ci config file
Fixed errors for python 2.6
Updated Readme with some actual information
Merge branch 'feature/setup' into develop
Added syntax highlighting to README
Merge branch 'release/0.1'
Pom cleanup (renamed vars pom.x -> project.x, use scala-maven-plugin from net.alchim31.maven instead of maven-scala-plugin from org.scala-tools to get the doc-jar goal)
JNAerator: fixed raw bindings of functions that return typed pointers.
JavaCL: release subdevices
descarga
descarga
Merge branch 'master' of github.com:ocornejo/massivedynamic.git
Revert "Updated README."

This reverts commit 2d39bf5cf033bc5b74a8e8e41c2dbba3075466dd.
Attempt to solve first-run issue and move hashmap file.
Fix #594
Fix #616
Merge pull request #42 from ogail/dev

Bug Fixes
Ajout des balises twitter et facebook
modify sampe path
make editable table
Production mode error handling removed
updated docs and better exception handling when a user declines the Auth connection
updated the README for evernote
Merge pull request #358 from hassek/master

docs and error handling
drop down menus, uploader, background image processing, and style additions
Redirect calls to admin_http_auth_user to more generic wrapper admin_current_user
Pull out a bit of shared setup code.
Add some specs for admin_current_user
If we're doing admin authentication internally, don't bother with the request environment, set the admin_name on the session instead.
Move methods used only in admin controllers to admin_controller.rb
Make twitter widget fit inside sidebar
Update twitter widget to latest version
Merge branch 'feature/flexible-admin-username' into develop
Merge remote-tracking branch 'openaustralia_github/blog_margin' into develop
Uncomment TWITTER_WIDGET_ID in general.yml-example file to stop our deployment system complaining. Shouldn't have any material effect.
Handle the case where there is no encoded element, but a description element instead.
Update modbase/src/game/g_cmds.c
vsite logo's imagefield_crop progress. #464

I've updated the Imagefieldcrop field handler.  It should be cropping the image correctly now.

I still have to swap in the cropped image after it's saved.

There's also a bit of code cleanup.  Vsite is doing some stuff that the field handler should be doing.
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Add taxonomy support for simple view list box
Adding clippy button to the view.
Merge branch '455' of github.com:openscholar/openscholar into 455
fix router issues
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Slideshow styles: default dark and light, and IQSS version
OpenScholar logo (double vision) fix
remove software key field from software_project node type

no longer required since we decided to forgo drupal-style release
naming conventions.
Forms css. Dialed back the padding on submit buttons
Migrate - generalized more cck code
#318: Add contextual links for all blocks, not just boxes. Move it to os to reflect this.
use way_get_list function in gazetteer


git-svn-id: http://svn.openstreetmap.org/applications/utils/export/osm2pgsql@28761 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
There are too many building=yes in OSM, and very few that specify the type, which is probably due to this menu being hidden in a tab, so lets expose it on the basic tab.
Localisation updates from http://translatewiki.net.
Add missing Library POI on the map

Icon was generated from the existing icon in the resources/features/pois via:

convert -resize 16x16 amenity_library.n.24.png amenity_library.n.16.png
Merge remote-tracking branch 'upstream/master'
Add nightclub

Re: https://trac.openstreetmap.org/ticket/4025 - added to Food and Drink
section (where bar is) and Sport and Leisure (as it is for leisure
purposes). Also icon in core-pois added.
Added further destination dropdown options

Having only added the one previously
inputSet - payments

Attached just to vending machine for now, but can be attached to other
items (and once they have been could perhaps close trac ticket 3716).
Trac #4378 - creating one node ways

This change treats 1 node ways created by deleting a node from a way as
deleted ways. Tests that I've done suggest this works, including for
undo and redo, but would like someone else to see whether it messes
something else up that I've missed.
Revert "Trac #4378 - creating one node ways"

This reverts commit ab6c2e9a31446d4f930d18f9043a8302d7e5f61c.
Merge remote-tracking branch 'upstream/master'
Merge pull request #81 from smsm1/improve_presets

Make the building type selector more prominent.
Merge pull request #85 from EdLoach/master

Nightclub ref trac ticket 4025
Merge pull request #88 from tomhughes/master

Beat flash into submission
Fix for DFL-3336, Element selection from inspection tooltip doesn't work on the first attempt.
Merge branch 'master' into task_DFL_2973_Make_Request_reviewed
Merge branch 'task_DFL_2973_Make_Request_reviewed' into task_DFL_2491_Resource_Inspector_Improvements_reviewed
fixed license (MIT)
going from alpha -> beta (readme), first release number (0.2.1) in asd
stats notes
READMEEEELOL fixes
Interface changed

Removed the button based interface. Added gesture recognizers to use
swipes to control the app.
Updated info

Screenshot changed
+info
+info
+info

Merged touch branch
UIGestureRecognizers created programmaticaly

Removed the UIGestureRecognizers from Stroryboard into code to simplify
code reading.
random vs alphabetical sorted list

User can double tap to shift from a random ordered list of verbs to an
alphabetical shorted one at any time
Error definition

I didn't like the prural for an object thar is used as a single one
Persistence of sort order and last position in ordered list
+info
Experimental GAE API use

Still in a sincronous way. Still wihtout persisting the downloaded data
bewteen sessions (because there are not real live data).
+info and preferences screenshot
Asynchronous download

Asynchronous download, but still without any UI element to inform the
user that the downloading is taking place on backgrouund.
Background data updating protocol

Now the UI shows a little spinner while the app is downloading a new
dataset
Modified the IrregularVerbDelegate protocol to add error handling
Automatically advance to a new verb when download ends
Implemented the new API
+info
dispatch_async moved from model to view controller

Moved from model to ViewController the distpach to main queue
added .gitignore
hook-neco を追加
hook-inu を追加
Index: fix a typo
Initial edit location changes
Lots of layout tweaks
configuration: prepare to parse options

Set up the background code for connecting pagespeed configuration structures
(RewriteOptions) to the companion nginx ones.  Passes all the actual work
through to NgxRewriteOptions::ParseAndSetOptions which isn't written yet.
(All it does so far is interpret "pagespeed on/off".)

Adding nginx subclasses of RewriteOptions and ServerContext are a bit overkill
for this change, but we're going to need them a lot.

Once configuration is complete, any mod_pagespeed configuration directive should
work in ngx_pagespeed:

    mod_pagespeed.conf:
      ModPagespeedEnableFilters collapse_whitespace
      ModPagespeedRunExperiment on
      ModPagespeedExperimentSpec id=3;percent=50;default
      ModPagespeedExperimentSpec id=4;percent=50

    ngx_pagespeed.conf:
      pagespeed ModPagespeedEnableFilters collapse_whitespace
      pagespeed ModPagespeedRunExperiment on;
      pagespeed ModPagespeedExperimentSpec "id=3;percent=50;default";
      pagespeed ModPagespeedExperimentSpec "id=4;percent=50";

The `ModPagespeed` is optional, and discouraged:

    ngx_pagespeed.conf:
      pagespeed EnableFilters collapse_whitespace
      pagespeed RunExperiment on;
      pagespeed ExperimentSpec "id=3;percent=50;default";
      pagespeed ExperimentSpec "id=4;percent=50";
added the header file dependences to ngx_pagespeed
Merge pull request #101 from yaoweibin/add_deps

added the header file dependences to ngx_pagespeed
added js libraries, reload tweaks, and test content
Recover last changes before format
Merge branch 'release/0.2.0' into develop
Updated version for next release cycle
Fix update-file-version for case of multiple matches in file

When the search matched more than once there was an infinite loop. Fixes #2
Add test for multiple matches in file
Updated project.clj, release notes and readme for 0.2.1
Merge branch 'release/0.2.1'
Początki Hough'a
test pull pour ouissem
v 0.4 + 
Merge branch 'master' of github.com:parsimony/parsimony_cms.git
Enhance class entity insertinto
Расширенная система логов;
Use our own implementation of extract_options!
XyJax and MathJax submodules should point to their git:// and not to https:// locations
Fixed a small issue in parse_preview with already parsed \ref's not being recognized
Fixed describe
New version of code for Github

Methods in routesfordummies gem don't need 'params' as an argument any more
Merge branch 'master' of github.com:pdxrod/routesfordummies

Conflicts:
	lib/routesfordummies.rb
	spec/rockonruby/Gemfile
	spec/rockonruby/Gemfile.lock
	spec/rockonruby/app/controllers/dummy_controller.rb
	spec/rockonruby/app/controllers/new_controller.rb
	spec/rockonruby/app/controllers/old_controller.rb
	spec/rockonruby/app/helpers/application_helper.rb
	spec/rockonruby/app/views/main/index.html.erb
	spec/rockonruby/config/application.rb
	spec/rockonruby/config/environments/development.rb
	spec/rockonruby/config/environments/production.rb
	spec/rockonruby/config/environments/test.rb
	spec/rockonruby/config/routes.rb
	spec/rockonruby/public/routes.rb.html
	spec/rockonruby/spec/integration/routes_rb_spec.rb
	spec/rockonruby/spec/integration/routesfordummies_spec.rb
	spec/rockonruby/spec/spec_helper.rb
	spec/rockonruby/test/integration/url_test.rb
Remove duplicate readme
Reword
Press enter to start
Merge branch 'UI' of github.com:pebblecode/Hacker-Typer into UI
Prevent default
Updates to the painting algorithm
Merge branch 'UI' of github.com:pebblecode/Hacker-Typer into UI
Added "Jon Ritman: from Artic to apps" (project code corrected)
Merge branch 'master' into fixes
Three fixes, see extended description

Fixed field.size() check
Fixed header comment to say that input is CSV
Enabled calculations
Merge branch 'fixes'
fixed django 1.4 compatibility
Merge pull request #8 from llonchj/master

Django 1.4 compatibility
moved sqlite3 to dev + test enviornments
moved sqlite3 to dev + test enviornments
Let's try advanced optimizations again. *crossing fingers*
onmouseup
Searching for tmux binary and perl-5.8.9 minimum

Ticket: 104 (eb29821a-4247-4f54-b851-f6ee696fde56)

  Try for several tmux locations

  Searching is made in:

    - $ENV{PATH}

    - Perl interpreter binary's directory

    - Current directory

  Just 'tmux' is the last default if that fails.

Ticket: 117 (eb4b4931-7c76-4547-a0b3-cf1278251224)

  perl-5.8.9 in POD

  Documentation is made according to the fact that 'make test' is 'just
  fine' under Tmux in perl-5.8.9.
alterado qualquercoisa.txt
Updating config for update.php
Update src/derri/core.clj

added game of life
Start the jQuery UI CSS cull

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5095 2fea6a4d-a838-0410-917b-93a53c48e9d2
Use an image fallback for lack of rgba overlay in old browsers

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5096 2fea6a4d-a838-0410-917b-93a53c48e9d2
Better CSS for jQuery UI clearfix

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5097 2fea6a4d-a838-0410-917b-93a53c48e9d2
Don't rely on a classname for Datepicker RTL support

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5098 2fea6a4d-a838-0410-917b-93a53c48e9d2
Introduces textpattern.encodeHTML().

Can be used to encode HTML for sanitization purposes.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5099 2fea6a4d-a838-0410-917b-93a53c48e9d2
Use textpattern.encodeHTML() for textpattern.gTxt().

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5100 2fea6a4d-a838-0410-917b-93a53c48e9d2
Reduce z-index levels to guarantee jQuery UI overlay is always on top

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5101 2fea6a4d-a838-0410-917b-93a53c48e9d2
Darken jQuery UI overlays

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5102 2fea6a4d-a838-0410-917b-93a53c48e9d2
Introduces textpattern.tr().

Translates given substrings. Works similarly to other tr()
functions met in other languages, e.g. PHP.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5103 2fea6a4d-a838-0410-917b-93a53c48e9d2
Arrange jQuery UI CSS rule attributes in consistent manner

Makes it easier for me to skim read

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5104 2fea6a4d-a838-0410-917b-93a53c48e9d2
Use textpattern.tr() in textpattern.gTxt().

Using textpattern.tr() instead of replace() prevents
recursion and (re-)replacing tags included in translations.

For user-defined values this would mean preventing
tag injections which would lead to loading unwanted
translations.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5105 2fea6a4d-a838-0410-917b-93a53c48e9d2
Should probably assign it back to string.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5106 2fea6a4d-a838-0410-917b-93a53c48e9d2
added PROJECT_ROOT to put the db and templates back in thier place
Revert "Merge branch 'master' of heroku.com:beelogger"

This reverts commit b62563926268714a1b4d7a057ad243c7c0e2c18d, reversing
changes made to bc70c8a118da9eb29c13724870938f12900799e1.

Conflicts:
	hive/settings.py
Merge branch 'master' of github.com:pierrebeugnot/rhok-hive

* 'master' of github.com:pierrebeugnot/rhok-hive:
  views functional, need design and interface
  add db to commit
  fix model error
sanitise build script
thread experiments
msgs regarding untracked trains
Move kss package includes to plone.app.kss.
New tools interface module.

I just need a place to put CMF tool interfaces and doing one interface
per module seems stupid. So why not add another module named tools.
Straight copy of Products.CMFCore.interfaces._tools.IRegistrationTool to CMFPlone
Use the newly moved interface rather than CMFCore's version of it.
Test the getToolByName lookup works as expected. I'm not sure if this is a useful test...
SERVER.txt added.
abstracting custom handling of clicks and adding tests for jquery.iframe.js
Fixed appearance for group and user modules
Update to the nofitication system for the website
get stories from github
better
cleanup
show sources in prefs pane
poll for stories and better dates
show current user email in admin area
grey areas
first last template helpers, skip hr on last article
cleanup
use ui helpers and blog meta editing
better default blog info
use one keymap file for all systems
one default keymap for all
elimate race condition when incrementing view count
forgot to add these
bump version number
Merge branch 'release/0.0.2'
Merge branch 'master' of https://github.com/praekelt/jmbo-downloads
move attributes to the Attributes directories, update .gitignore file
Added windows and osx profiles. Adding more manual documentation for getting libraries not in Maven Central
removed unused exception handlers
HTTPTransport: basic curl_setopt moved to __construct().
call() throws exception if ES responded invalid JSON.
default config for connections with index & type in tests/units/Client
removed unused default values for port & host in AbstractTransport
1.No default index & type.
2.Allowed operations over whole index or type.
3.Support for url params (full support for routing & search_type).
Docs
Client::setIndex() now also set type (clear if nothing was given).
Client::map() puts mapping as is. no modifications
1. composer & vendor in .gitignore;
2. rename files & classes;
3. more exceptions;
4. little fix for empty post data (replaced with '{}').
default method 'GET' for Client::request()
DB/SAI: Fixes for Quest 9738 "Lost in Action". One NPC left to script
Core/AI: Remove "enforced override"-check in the EventAI-manager in case of AI not being set to EventAI.
Docs: Re-add descriptions for the PREFIX, CONF_DIR and LIBSDIR cmake parameters to the Unix installation instructions
Merge remote-tracking branch 'upstream/master'
unwanted file remove
started implementing service to commit transactions to webservice
błąd tworzenia proxy dla elementów z referencji == null
- smaller padding for .well class in project grid

- TODO: include this css by default again

Signed-off-by: Kyle Ledbetter <kyle@kyleledbetter.com>
- adjusting btn color classes for task priority

Signed-off-by: Kyle Ledbetter <kyle@kyleledbetter.com>
- adding percentage number to progress

Signed-off-by: Kyle Ledbetter <kyle@kyleledbetter.com>
Update SBT, Scala 2.10.0-M4
Minimal changes for Scala 2.10.0-M4.

 - Add a few explicit types to workaround inference regressions.
 - Update to SBT 0.12.0-RC1
Enable GPG.
fix compile error ScalazBuild.scala
Merge pull request #100 from xuwei-k/patch-1

fix compile error ScalazBuild.scala
bump SBT version; update SBT launcher
Issue #25 seems to be fixed, so disable `pendingUntilFixed` in the tests
replace `sys.error` with portable `error_`
Giving my best to fix the build.

* Sonatype resolvers added
* tune Specs and Scalacheck versions
* Tests work for <= 2.9.*, but not for 2.10-M4
Utils.h: _utils_error() novo nome da função

alteração no nome da função para indicar apenas uso
da função internamente, não é necessário usar esta
função fora da biblioteca.
Selection Sort: Implementado com exemplo
Gitignore: Ignorar arquivos *~, *.hcg e pasta tests
Exemplos: Alguns exemplos com valores aleatórios

* Criei alguns exemplos usando a função de utils.h random_array()
* Criei um exemplo usnado a função de utils.h random_array_with_range()
que abrange os métodos bubble, heap e quick sort.
table example added
Fix #222 patch to handle retval type None
Fix English typo in log.
pass the whole view to the action
Try to uppercase the first character in the type if no absolute
type is found. Makes completion of "string" work for example.
mention #1262 in the release notes
new file:   elisp/sbgSupp.el
Improve diagnostics on destinations test failures.
Tweak wait time in lifecycle tests for CI.
Merge cosmetic changes from bug25045
cosmetic
Merge in default
running a bunch of stuff, mostly making poster figs
added python scripts to generate M and P ROIs
use config file for credentials
Add tavis-ci configuration
Edited Calendar
inclued jquery in the edits
talk to tineye, first try
remove 1.8.7 and ree from travis config for now
Trees are nice
Added our NAMES to every file

except viewGUI and minimal class that doesn't exist yet
SHRINKDESC-51: Allow for escaping slashes in node queries.
[SHRINKDESC-94] Support Taglibs Descriptors
[SHRINKDESC-94] Taglibs cleanup, Add tests for Taglibs 2.0 Descriptor
[SHRINKDESC-93] Support jboss-web.xml
ALR Testing Commit Hook
ALR Remove Commit Hook test remnants
[SHRINKDESC-99] Introduce BOM for SWD
[SHRINKDESC-100] Add a "depchain" module for SWD
[SHRINKDESC-101] Update build configuration
[maven-release-plugin] prepare release 1.2.0-alpha-2
[maven-release-plugin] prepare for next development iteration
[SHRINKDESC-92] Create tool for XSD->Java generator
[SHRINKDESC-92] Create tool for XSD->Java generator
[SHRINKDESC-92] Create tool for XSD->Java generator
[SHRINKDESC-92] Create tool for XSD->Java generator
[SHRINKDESC-92] Create tool for XSD->Java generator - supporting connector_1_0.dtd as converted xsd
[SHRINKDESC-92] Create tool for XSD->Java generator - supporting connector_1_0.dtd as converted xsd
[SHRINKDESC-92] .gitignore on log.txt in CLI module
[SHRINKDESC-92] Update version for branch/fork
[SHRINKDESC-92] Create tool for XSD->Java generator - added cli-plugin module; service files are created optionally
db:setup should run seeds as well
need to load the environment before connecting to a database
Este commit agrega la sección de policiaca, modifica el archivo index y header
Initial commit for the cloudswipe wordpress e-commerce plugin
Updating to live API URL
Merge branch 'refs/heads/development'

Conflicts:
	CS/Library.php
remove recipress plugin
diddle break window
Add installation instructions for post-review.

This adds much-needed installation instructions for post-review on
Windows and Linux. It covers some tricky parts, like requiring the
32-bit installer on Windows, and being clear about 2.x vs. 3.x.
Todo log
Add rakefile to use with puppet-lint
Make puppet lint a bit happy.  WIP
tests/events: use the document reader API
mmap_buffer: close() requires including <unistd.h>
c++11: provide std::begin/std::end functions if not available (gcc 4.5 support)
Merge branch 'master' into debian
fix natty and quantal build issues
languages.py: explicitly save the languages.rdf file
Removed Startup App.

Signed-off-by: Richard Hancock <rjhancock@me.com>
model: Parse spec/typereps.txt
model: Parse spec/typecanonreps.txt
model: Add and parse spec/inherits.txt
sphinx: Restore model primitive writing
sphinx: Restore model enum writing
sphinx: Restore model compound writing, including templated params
compressing unneeded data
Added missing Gemfile.lock
Added missing Gemfile.lock
changed from bing to google map and made map recenter based on event location
Swap const pointers with references.
Corrigindo bug do css da home do z-index do slider de conteudos que conflitava com os modais
drag&drop的demo增加
Cache git archives.
Extract the vendored git source instead of cloning/fetching.
Add the --local option to install.
Enforce the --local option on the forge source.
Merge pull request #24 from benburkert/install-local

adds 'install --local'
readme
foo
Merge pull request #2 from rogopag/stats

Stats
Cucumber setup
Cucumber setup
added activeadmin
activeadmin setup
active admin setup
aa module prep
Added Shoulda matchers
added sermon model
initial aa_module setup
Merge branch 'feature/aa_module' into develop
loaders
resolve conflicts
Rebase from 'upstream'
Added a package.xml file
update package.xml file
update package.xml depends
adding a description
bump version in package.xml
custom CMakeLists.txt and package.xml
upadte package.xml
Move washtml class into Roundcube Framework (rcube_washtml), add some improvements
Move date.timezone check to 'required' block, add date.timezone value validation
init unfinished vs of split_file script
Removed #! line from benchmark.hs
faltaba un input
Add vantransp2040 followers
gi: add FunctionInfo#symbol
Correct Twitter references
Use icons based on the meegotouch calendar icon.
Fix adding new entries.
Added login with Facebook, opentokJS functionality, and POST from UI side
roster uploads finished
Finished about_open_classes.rb
Stub out a spec for MerchantAccount (waiting for test account before implementing)
form hash
models for each app is created
MD code for solvers first commit
Fixed bad link to epub docs
Completed section about specific datapoint retrieval

Including description of adding an index to the MySQL table.
reg expr for detecting url is added
New gitignore file!
postgresql: do not create a recovery.conf file if role is "slave"
barman: searching for master servers and adding them automatically
adding bashrc and ssh agent functions
removing ref to _CAT_BIN
prevent advices on constructor (closes #9)
converted one multiline docstring to a single line
fun with particles: mr. soul placeholder when the special attack button is pressed.
better syntax. support either or both directions
bump revision to 57
update to synergy 0.70 extension registration method (t4055)
new file:   menu.lst
more accurate installation instructions
fix error with ends
deleted:    scripts/local_scripts/curatenie.sh
	deleted:    scripts/local_scripts/curatenie_deborphan.sh
	deleted:    scripts/local_scripts/curatenie_eng.sh
	deleted:    scripts/local_scripts/instalare.sh
muchos cambios como pa comentar :P
updating flickr gallery, deleting unneeded views
* reworked tabbar router, added skeleton, swap function, and baseview
Fixed issue with mouse, ssh, and tmux. Corrected pathogen symlink. Added multiplexer support to .zshrc
Add authentication of users
Fixed Universe.java
Fix styling for .gtkstyle-fallback:insensitive
LPS-26260 Revert logic change
LPS-26260 Fix logic change a different way. Having a getGroupId method is handy
LPS-26260 SQL indexes never got regenerated?
LPS-26260 Language keys
LPS-27294 added removed tests w/o hardcoded strings.
LPS-27294 Source formatting
LPS-27294 Source formatting
Adding facetracking classifier observer
Fixed whitespace conflict in cs.
merge
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge

Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Fixed bug causing toolbar to interfere with the width of the content. Errors no longer thrown.
Merge pull request #426 from brooksryba/develop

Sidebar issue resolution
Get some low-hanging fruit for tests.

Also, fix the delete_key() function in GitHub. It was relying on get_key()
which is now just key().
Updated messaging API documentation
added installer for windows. This installs platform into AppData and registers .appjs file association. Includes uninstaller that unregisters the extension.
Work around App Engine not allowing access to the attributes of the ssl module
Add oacd_ouc env to sys.config
Allmost works
fixed stupid bug, 1 issue with database
plugin now allows for a close button with a callback function passed into the plugins options as the option "close"
Fixed|Graphics: World dimensions of high resolution sprite replacements

The world dimensions of a sprite are determined by those defined by
the metadata for the original Patch graphic format.

Also, switched to using LumpDir URNs for sprites as this avoids the
potential mix up with other lumps.
u
fix
fix
f
f
k
f
f
f
f
Fix
f
rails 3.0.14
rails 3.0.14
rails 3.0.14
remove .swp file that was added by mistake
Readme updat4e
moved required JS files to be stored and deployed with component itself
Zmiany w pliku Makefile
kosmetyka cd :)
add functionality add to cart
Add keepalive_timeout to nginx configuration

This prevents stale SSL connections from consuming resources.
Fixed a bug disabling startup
adding user argument to pip
updating pip to support user and group
fixing pip owner/user
[#23] Add a module loading function
[#23, Fix #80] Move themes into the prompt module
[#23] Add if to conditions to not wrongly return 1
[#23] Rename keymap indicator zstyles
[#23] Prevent errors when completion is disabled
[#23] Remove unnecessary compdef calls
[Fix #23] Ensure dependencies are loaded
Shorten git zstyle namespace
Move Git zstyles into the git-info header comment
Remove compleat

Compleat (http://git.io/4foLxQ) has not been updated in two years and
should be considered abandoned.
Move history-stat from utility into history
Simplify Git submodule ignore settings
Convert add-zsh-trap into a module
Remove a no longer needed .gitignore
[Fix #88] Allow arbitrary git-info formats

The terms 'prompt' and 'rprompt' are not always appropriate.
A multi-line theme may choose 'line-one' and 'line-two' instead.

@ColinHebert contributed to this commit.
Merge completions into functions

Completions are nothing more than auto-loadable functions prefixed with
an underscore placed somewhere in $FPATH.
Remove '--mixed' from the 'gir' alias

Fix a bug introduced in d4a5bed.

Though '--mixed' is the default for 'git reset', using it with paths
returns the following warning.

warning: --mixed with paths is deprecated; use 'git reset -- <paths>'
instead.
Simplify a few unsets
Generación de reportes segun rol de usuario Administrador/Medico/PersonalSalud

Modificacion de reportes, se selecciona el reporte deseado de una lista de reportes disponibles segun el tipo de usuario colocando fecha inicial y final de la consulta
Solve problem 11
Merge branch 'master' of github.com:sourcefrog/projecteuler
version bump to 4.2.0 [ci skip]
bug fixes for OBJ and Display
Add SPDispatchSyncIfNeeded macro for safely using dispatch_sync.
fixed lp6 and lp7 images
небольшие исправления
слияние с devэ
разрешение конфликта
переношу папку content в игнор чтобы не было конфликтов на продакшене
изменил файл conf/main.json для тестирования сборки пакетов
halfway to go to random write for gps
Merge branch 'master' of github.com:stanford-ppl/Green-Marl
implementing random write
TST: fix bug in test for test_monotone_fn_inverter
Merge pull request #265 from josef-pkt/bug_monotone_fn_inverter_test

TST: fix bug in test for test_monotone_fn_inverter
write the database data to a csv file.
Changed the .gitignore file
Added --required flag for turning off the require of the app file
Change to flag to --ignore-modules
Merge pull request #5 from nathanoehlman/master

Added in --required flag for excluding app require in publish
removed unused function
jsdoc for general command 'exit'
jsdoc and some comments
jsdoc
Moved addListeners into painted events to prevent operation on non-existing dom elements.
Ultrapagination
fire events whenever the blood moon rises/falls
Changed all of the words to numbers.
Added a fifth file
Changed the wording in file 5 to match the others.
Merge pull request #1 from stevenhauser/words-to-numbers

Words to numbers
creating new project file structure.
Adding mura scope to contentRenderer inside settingsBean.
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
libsoup: have configure not check for apache.

This stops the libsoup configure stage hanging while trying to
find apache. This might be something cross related or specific
to my machine, however ultimately the apache httpd test are not
needed.
docs: android-env.sh needs to be sourced.

NDK varibles are required to build the app.
fix sld_get_post_thumbnail() regex for first image
Schema to be updated
BH
Merge branch 'master' of https://github.com/stuycs-ml7/project2-pd7
no more type=text/javascript
factor out fix_images and clickable_rows
added style sheet to git include
shame [ci skip]
added .couchapprc to ignore list
deleted .couchapprc
Make live code and master versions of notebooks
Support non-const instance field initializers.
Review URL: https://chromiumcodereview.appspot.com//10873033

git-svn-id: http://dart.googlecode.com/svn/branches/bleeding_edge/dart@11305 260f80e4-7a28-3924-810f-c04153c831b5
Fix test after changes in member iteration order.
Review URL: https://chromiumcodereview.appspot.com//10875049

git-svn-id: http://dart.googlecode.com/svn/branches/bleeding_edge/dart@11306 260f80e4-7a28-3924-810f-c04153c831b5
Don't emit variable = variable; code from explicit slow versions of math functions.

We currently do this to ensure that we use the correct types in the remainder of the function. This explicityly uses javascript code since we know the type, but avoids the overhead.
Review URL: https://chromiumcodereview.appspot.com//10868018

git-svn-id: http://dart.googlecode.com/svn/branches/bleeding_edge/dart@11307 260f80e4-7a28-3924-810f-c04153c831b5
Fix for 4613- The error message for opening a parent directory in the Editor is better with this CL.

BUG=

Review URL: https://chromiumcodereview.appspot.com//10870062

git-svn-id: http://dart.googlecode.com/svn/branches/bleeding_edge/dart@11308 260f80e4-7a28-3924-810f-c04153c831b5
Merge remote-tracking branch 'origin/master' into cmake
source code cleaning and wait get_description until database is ready
formula appears when you add a term, and it also saves the term and operator in a temporary formula that will be added later in the add formula button action listener whatever thing blah
Merge branch 'master' of git@github.com:tan01/G05-NewtonToolbox.git
ver 1.0 demo
add the new newsgroup to gnus
modif affiche matière
modif visuel appel / affichage matière
changement redirection page index si pas logé
changement lien ban en fonction du role de l'user
debut d'affichage des élève
commit pour merge
Correction bug getStudents dans le BackEnd
modif : podif si session existe pas -> lien ver l'index
ligne teste enlever du dernier commit
@ sur php self
Remise du satch
add really fast hit detection using TileMill-style 'UTF-8 Grids'
remove unique on the map layer name column, add a way to circumvent the cache on the demo page
sidekiq retry:true
Added a TODO doc.
Fixed inheritance of InterruptException.
Removed crusty old documentation.
Experimental adding of a Fortissimo accessor.
Updated tests to run as a group.
Updated TODO
Updated Runner.

Runner now creates a Fortissimo object once per registry
instead of once per request execution.
Updated CLI runner to test for exception catching.
Reduced error handling.

Error handling of certain exceptions is now the responsibility of
the runner, which should know whether the request is HTTP or CLI.
Refactored runners.

Runners now handle certain error conditions that were handled
by Fort before.
Versoes enviadas para o ml-class. Todas OK
add core sample test.
including 1 auto and 1 manual case.
the auto case is fail by purpose
Document pluggable UI callback events on article partials.

Make event definitions bit more recognizable by
moving them out from markup blocks. Let's anyone to
clearly see what is passed to the callback functions.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4754 2fea6a4d-a838-0410-917b-93a53c48e9d2
Since when?

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4440 2fea6a4d-a838-0410-917b-93a53c48e9d2
Returns what?

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4441 2fea6a4d-a838-0410-917b-93a53c48e9d2
Few examples.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4442 2fea6a4d-a838-0410-917b-93a53c48e9d2
Script and CSS tags don't need a 'type' attribute under HTML5

Saves a few bytes

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4128 2fea6a4d-a838-0410-917b-93a53c48e9d2
Added VFW Project 1
add README.md
Merge branch 'master' of github.com:thawatchai/usablecacher
Fix undefined variable when relating issues
almost done making group chat work for two people..
Fix PR#5702: remove never used value Bytelibrarian.lib_sharedobjs

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12786 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Update gcc.rb

GCC 4.7.2 and multi
Globalize3
VersionGroups data
Group pages added
Final Draft

Added final draft. Not super happy with it but I should be updating even
more this summer. :)
Changed the Dropbox alias.
added interface.py
fix lots of errors in latest Singleton
minor
sync with latest ceylon def
Ceylon implementation of #112 mapItems
better impl of segment()/span() on Range
additional tests
much better impl of segment() and span() on Range
mapItem -> mapItems
Add mapItems to fix #112
Tests for #112
Merge branch 'master' of github.com:ceylon/ceylon.language
fix typing errors in mapItems()
Implement findLast for #113
Refine findLast for #113
Implement findLast for #113
Implement findLast for #113
Refine findLast for #113
Refine findLast() for #113
Test for findLast, to fix #113
Move List.string up to Collection, fix #115
* Geral:
  - Tela MesaGUI funcional;
  - Alteração de DAOController para Configuracao;

* MesaCadastro
  - Implementado o método proximoCodigoIdentificacao();

* Mesa
  - Alterado o atributo quantidadeMaximaPessoas para cadeiras, junto com seus getter e setter;

* MesaGUI
  - Alterado o atributo edicao para novoRegistro;
  - Removido o parâmetro MesaDAO do construtor;
  - Alterado a ordem das colunas no jTable;
  - Método habilitaEdicao() faz limpeza dos campos;
  - Implementado botão confirmar;
  - Implementado botão excluir;
Making the intersect planes in each point.
oops
Merge branch 'master' of github.com:timehome/djangodash2012
fxd error in LINQ query in DashBoardController
Reverting, don't like new one
Fixed CSS issue caused by changing main div ID, as well as updated the main stylesheet.
Update index.html
Merge pull request #8 from jenstrickland/master

Add my salutations to Mols.
adding Hadley's comment
Opnieuw committen om verplaatsing van Energy, etc. naar auxiliary naar github te pushen
Adding text output
Adding in first iteration
stripping tags from output
Adding text option to alert delivery
removing unnecessary file
Link to slides from RubyConf India
Update app/controllers/devise/omniauth_callbacks_controller.rb
A config that works better with Hyde's "server" operation. Not a good one though...you'd better rework it...you better...
DFW Fan's Sports Experience
New development task that builds Haskell projects
Cleaning up the repo to make way for a WordPress implementation of my site.
Make USB_SERIAL fit for the Arduino IDE.

This also includes renaming of USE_USB to USB_SERIAL for more
consistency.
Give up on REPRAP_HOST_COMPATIBILITY.

Was never really accepted and these days, hosts usually adjust
to the firmware instead of the other way around.
expert promo
changing all projects to run as x86 so they all work together bitwise.
can add a new brag and see it on the dashboard
fixed a timing issue in the mock setup of the runtime session
Merge pull request #2 from WpgDotNetUG/master

Add a brag and see it on the dashboard
geowiki: set encoding line, set exception messages
Ignore generated EPUB files
Use development version of tooling if present.
* Fixed up remainder of merge.
Import of the initial sources
Add more custom date options

Create class to handle customization
Allow date and time to be fixed or relative
Pull NSDate category into separate file
first stab at supporting hscroll, seems to work
サブディレクトリに配置されたSNSで動作するように修正
Incremented version
Failing tests are so timing particular it seems
Set certain tests to not run on TeamCity cause they always break the build
Remove ohloh badge from pandas
moving from mysql 2 sqlite
Update src/csv.c
commit transaction added at the end of for loop
implements ppsrecraller, refactor pssrecrawler and ppscrawler to use Crawler function, and use methode closesession and rollbacktransction of hibernate util
 function to crawl /recrawl a page
Merge branch 'master' of https://github.com/vgramer/alogWeb-crawler
remove unnecessary variables
fix bug: rediection when ressource not exist
Fix minor bug in update playlists function
Fix minor bug in library cache
Update README
Merge branch 'develop' into release
version bump
Merge branch 'release'
Don't catch DatabaseError
Provider example
implemented login authentication and personal pages
fixing global-work-size usage with offset. speed issues are fixed
Modified some
Added checking to make sure that it isn't set.
Fixed a coppasta mistake in Raphael.
Went back to using Raphael.min.js
Merge branch 'master' of github.com:vikstrous/game-off-2012
edited user form
pkcs11 framework: segfault due to null-pointer dereferencing

Thanks to Magosanyi Arpad <mag@magwas.rulez.org>

Change-Id: I06d2644f7cd3b6d4f370e6dcaff651cbb83774bd
Remove mentions of colour customisation in install scripts
Delete colourschemes shipped with vo
Remove mentions of colour customisation
More mentions of colour scheme from rc
Apply Bill Powell's linked colour fix
Dedent, tidy attribution
Merge pull request #19 from tlvince/dev-colour-fix

Dev colour fix
Merge pull request #1 from vinniefalco/master

Mr. Vinnie, so magical. Thumb! !
Next, how can I do?
Menu included
Should be possible to remove expired locks by other instances
- ListTask now implement collection interface
- few changes in samples
pull前保存

Signed-off-by: ElmerNing <ffxhina@gmail.com>
solve conflict

Signed-off-by: ElmerNing <ffxhina@gmail.com>
1，修正baseView合并后的一些问题
2，修改spi.cpp的一个小bug
3，添加分析菜单的第三级显示

Signed-off-by: ElmerNing <ffxhina@gmail.com>
add eaverage control
Working on quiz
Added Quiz band and responsive styles
small chages in CheckReport
Fix binary expressions priorities
Fix parenthesis in binary expressions
Added support for iPad retina file extension. Implemented pull request 

https://github.com/cocos2d/cocos2d-iphone/pull/181
box2d test updated for new ipadhd extension
CCArray changed int to NSInteger 
Added drawSolidPoly test
Last small changes before new beta.
tests: documentaions said that default was "-ipad-hd" when if fact it is "-ipadhd"
Small changes
-authors removed whitespaces
-added armv6 armv7 as default architecture. 
last minute changes 

fixed armv6 version of CCParticleExamples, uses quad system so particle batchnode can be used.
deleted log from particleSystem
changed version number on various places 
changed incorrect message in sprite test
Merge remote-tracking branch 'origin/develop' into ipadHD
Merge pull request #185 from araker/ipadHD

several small fixes before releasing beta 2
changed ipad-hd to ipadhd
Merge pull request #186 from araker/ipadHD

changed ipad-hd to ipadhd
Don't keep a stack of CFGs during UnreachableCodeElimination.

R=blickly
DELTA=259  (85 added, 77 deleted, 97 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5950


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2377 b0f006be-c8cd-11de-a2e8-8d36a3108c74

Automated g4 rollback 

*** Reason for rollback ***

causes issues with subclassing

*** Original change description ***

Do template type replacement of unknown types too

DELTA=38  (1 added, 22 deleted, 15 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5951


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2378 b0f006be-c8cd-11de-a2e8-8d36a3108c74

Automated g4 rollback

*** Reason for rollback ***

causes arity problems

*** Original change description ***

Preserve template keys when building derivative function types for
.call, .apply, and .bind

DELTA=22  (0 added, 20 deleted, 2 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5952


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2379 b0f006be-c8cd-11de-a2e8-8d36a3108c74

Modified the jQueryCallback JSDoc to accomodate callbacks with arguments.

For example, the following line used to generate warnings before the change:
$.ajax('/some/path').done(function(data) { ... });

R=nicksantos
DELTA=2  (0 added, 0 deleted, 2 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5953


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2380 b0f006be-c8cd-11de-a2e8-8d36a3108c74
Allow a class method to be "templated" to reference the specific
subclass at the call site.

R=dimvar
DELTA=104  (98 added, 1 deleted, 5 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5636


git-svn-id: http://closure-compiler.googlecode.com/svn/trunk@2257 b0f006be-c8cd-11de-a2e8-8d36a3108c74
Update learn/felipe/passwords
satisfy jslint a bit more
Make code compatible with windows
fix encoding issues (use locale.getpreferredencoding() in 'preview mode'; close issue #9;
use different default settings (python->pythonw) on Windows platform
merge hotfixes
update version
Set up MVC structure, separated the views into different files. Project is now much more managable. Map, buddies bugged.
added parser for TSV format
Duplicate keys in Evals causing mayhem
[maven-release-plugin] prepare release praqmajutils-0.1.26
[maven-release-plugin] prepare for next development iteration
Merge branch 'master' of github.com:Praqma/praqmajutils
Added logging option
Praqmatic logging
added meta-description. lil bit of seo
win/loss conditions!
after one drink they're pretty fucking wasted already
updated the component system to mix with the scene graph better. now the entities are subclasses of fcontainer and the spritecomponents just add their sprite to the parent entity. much cleaner.
right structure added
v1.0.0-beta-1
snapshot
Added flags to remove stack protection
added WHOIS command
added HELP command
Added PM capability
Cleaned up client processing
Fixed pm bug where it would crash with an empty mesasge
something
Fix user_set_perm command
Basic Sprite
Initial Sprite
dfg
Modified README.md to fix missed links.
add "reduce sensitivity"
[Improvement] limited ruby-debug gem to development and test environment
Edited First Run Pages.
Changed slightly the transition
adding new signed apk
seperate functions for transactions
added requirement for psycopg2 2.4.1
updated settings
added tests directory (BROKEN)
workign towards our sms app from the tutorial, new data model in progress
Added -v.  This will allow for database storage of the Ragnarok version number to allow for upgrading.
Restored prior javascript so form is working for now.
Replace *.html with Jade
Brightened caption links.
moved helper directory load first, then load the route directory
First version of the new table scrapping method, and of the horizontal piled bars that only use the new methods : lines() and lineHeaders(), columns() and columnHeaders()
move ReadMe.txt
works when there are no parentheses around the parameter list
use compass sass url helpers
Merge branch 'master' of github.com:zurb/giving-tree-static
Merge branch 'master' of github.com:zurb/giving-tree-static
about.php contains tabs
detect_scan
[Autotools] Move and rename m4 file

move and rename acinclude.m4 to m4 folder and rename it
compiler-flags.m4

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
[Logging] Add logging feature - step 1

Add functions to log messages to syslog/glib/files
Only syslog is enabled for instance
Add a configure option to choose the logging level (--with-log)

Next step: Use a configuration file to choose logging system
           Use an option to dynamically change logging level

Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>