labofsahil/github-event-dataset-2012 huggingface dataset:
Enable user to select between mobi and web demo
Add country field to member
Add country field and get it to work with age gateway
Merge branch 'develop' into feature/add_country_field
Merge branch 'feature/add_country_field' into develop
Add exempted_urls field
Implement exempted urls for age gateway
Implement private site gateway
Merge branch 'feature/exempted_urls' into develop
Remove sms api key. Silly me.
added footer url entry
Rework so correct settings file is used
Different object headers for basic and web, most notably the omission of addthis widgets on basic.
Add exception handler
Fix layer order when using more than two layers
Patch listdir so collectstatic does not fail on custom layers for third party foundry-based products
Add a base_inner.html template so it is easier to override base.html
Handle module resolution if being run through Gunicorn
Update changelog
Add build essential dependency
Make require() of LocalSettings more robust
Fix memcached port to match modules/memcached/manifests/init.pp
Merge pull request #13 from mattflaschen/memcached_port

Fix memcached port to match modules/memcached/manifests/init.pp
Added two lines to hide the Prey User from login on MacOS X
Updated path.exists to fs.exists for Node v0.8 support. Asyncified existsSync calls as well.
Handle gremien which only occur in mob profiles.
Adding service for listening Motion Event
Adding service for listening Motion Event
Merge branches 'master' and 'puran'
Initial tests

- Added basic terrain generation based on custom html tags
- Added starting classes and methods
- Included quojs
Deleted jquery header from index
Fixed terrain generation

- Now uses x,y variables to make calcs
- Sets the terrain array 0 as Terrain dummy
Beautified coffeescript a bit
Split method to generate the grid item
Added a VERY BASIC terrain editor
Make the terrain element update the grid and added handlers to the buttons so the user can draw terrain
el crud de productos, falta validar los campos... y algunos detallitos
coloque en las tablas fecha_productos y en log_historico el DELETE ON CASCADE para que
no se queden esas fk ahi cuando se elimine el registro al que se le hace referencia, hay que volver a crear las tablas con esa restriccion, CHAOOOOOOOOOOOOO
Scott Young: Why the Fuss Over Lectures
Added Highroller library
MVC für verschiedene Preperation views hinzugefügt
Datenbankzugriff in DatabaseAccess Klasse ausgelagert
Merge pull request #4 from Miguel2354/master

Database access ausgelagert
fixed up the shape tool
oops, fixed the alias
doc en homebrew: update
[AS7-4090] Added reuseable service install and remove methods to CacheAdd.Added test case to test operation sequences.
[AS7-4090] Added reuseable service install to CacheContainerAdd. Updated test case.
[AS7-4090] Implement rollback for CacheContainerRemove
[AS7-4090] Add Byteman-based rollback testfor CacheContainerRemove
[AS7-4090] Fixed up CacheContainerRemove.recoverServices() and CacheRemove.recoverServices(). Added Byteman based rollback test.
[AS7-4091] Add reuseable service installation and removal for JGroupsSubsystemAdd and ProtocolStackAdd.
[AS7-4091] Add tst case for testing basic operation sequences. Also add Byteman based testcase for testing rollback.
log4j template changes. Adds timestamp.
Merge pull request #78 from sifusam/master

Fix for log4j properties template
temp use doc formatting plugin 1.0.10 to diagnose Jenkins error
ui interaction: not host form for admin new events
changing event creation logic for admins creating events they aren't hosting
fixing required fields for admin new host event creation
making not_host functional in user event management
changing event update redirect if event host is changed. updating thank you page if host is not current user
[WIP] detection of changed properties
* Changed the eye candy Particle::flare() funktion to always check for invalid particle positions.
 * Added many checks for invalid values for the eye candy Vec3 class.
 * Removed fastsqrt, inversesqrt funktions from eye candy MathCache and replaced them in the eye candy code with std::sqrt.
 * Removed all the pow* funktions from eye candy MathCache and replaced them with std::pow.
 * Removed unused funktions from eye candy MathCache.
Cosas y asi
uajsiu
rails expense report using redis added
Use Springs DigestUtils to calculate md5 hash.
Add augeas::rubylib_version variable, use it for packages.
Set ajax false for jquery mobile.
Text translated.
Styled for as jquery mobile nav bar.
Redirect to users bets after creating one.
Group bets link are now shown when not made.
Bets can now be created.
Another tiny fix to readme.
README file renamed & content is updated
Merge branch 'master' of https://github.com/ravshanoff/rails_demo
Refactored tests, updated bootstrap for current version of ZF2, and refactored where rendering options are.
Version 1.2.0.1

Fixed bug where Booksleeve RedisConnection was being disposed before
queued tasks had completed.
Auto Updating exerstack submodule
Auto Updating nova submodule
Merge pull request #268 from rcbops/sprint

Merging in nova libvirt fix
updating submodule - fixes for /etc/hosts
updated directories
updated directories
updated directories
Remove lzo.
Fix diacritics for special Vietnamese characters including those with tonal symbols and for letters with circumflex.

git-svn-id: https://autowikibrowser.svn.sourceforge.net/svnroot/autowikibrowser/AWB@8414 b999ae8e-1018-0410-9b92-f9ef6f55c712
More diacritics. Better organised those with caron and macron sign.

git-svn-id: https://autowikibrowser.svn.sourceforge.net/svnroot/autowikibrowser/AWB@8415 b999ae8e-1018-0410-9b92-f9ef6f55c712
More diacritics. Better organised those with acute and grave accent.

git-svn-id: https://autowikibrowser.svn.sourceforge.net/svnroot/autowikibrowser/AWB@8416 b999ae8e-1018-0410-9b92-f9ef6f55c712
More diacritics. Better organised those with umlaut and dot above sign.

git-svn-id: https://autowikibrowser.svn.sourceforge.net/svnroot/autowikibrowser/AWB@8417 b999ae8e-1018-0410-9b92-f9ef6f55c712
Automatic update [Sun Dec 23 18:10:36 CET 2012].
Automatic update [Mon Oct 22 18:09:58 CEST 2012].
Evaluators are no longer recursive by default, need to use `recurse()` or `recursive()` to perform recursive evaluation.
pdf info
added Float class and unit test
fix a validation scope, this could also be the cause of [#43]
Merge branch 'master' into staffplan-backbonejs-implementation-needs-refactored

* master:
  fix a validation scope, this could also be the cause of [#43]
  Added link to staffplan page for users
  bugfix for sessions controller
  Put the notice back and removed TODO
  Forget to call save on the users
  Adds a company to the seeds
  Restricting redirect to proper page to GET requests
  Disables hidden client[name] field
  Doing TODO in SessionsController
Fix for https://www.apptrajectory.com/rcode/staffplan/stories/136590, make client/project names both visible but adjust the overall width so it fits on an iPad.
Merge branch 'master' into staffplan-backbonejs-implementation-needs-refactored

* master:
  Fix for https://www.apptrajectory.com/rcode/staffplan/stories/136590, make client/project names both visible but adjust the overall width so it fits on an iPad.
Fix issue creating a new client/project without a name specified in the UI.  Default to N/A.
Remove the <section> wrapping client project divs if the last project is being deleted for a given client.
Merge pull request #55 from rescuedcode/staffplan-backbonejs-implementation-needs-refactored

Staffplan backbonejs implementation needs refactored
Merge branch 'master' into netizen-id-like-able-register-my-company-myself-for-staffplan

* master:
  Fix for https://www.apptrajectory.com/rcode/staffplan/stories/136590, make client/project names both visible but adjust the overall width so it fits on an iPad.
  fix a validation scope, this could also be the cause of [#43]
Merge branch 'master' into netizen-id-like-able-register-my-company-myself-for-staffplan

* master:
  Remove the <section> wrapping client project divs if the last project is being deleted for a given client.
  Fix issue creating a new client/project without a name specified in the UI.  Default to N/A.
  pretty sure this is in good working order again
  checkpoint, pushing so G can have a look
Redirect if the save doesn't succeed, store errors on the flash (not flash.now)
Tweak registrations styles.  Make errors section use flex box.
WAT
Finishing up registrations
  * hacked around Rails' has_secure_password's shortcomings so we don't set a random password on users
  * made text emails all text, no HTML links
  * added a #complete action for RegistrationsController that does what the old #confirm does
  * added #confirm that finds the user and finalizes registration if a password exists, otherwise renders a page (as it's an invited user without a password set)
namespace backbone models according to where they're used.
Add handlebars, move shared function to bootstrap JS include.
Make isThisWeek global.  Don't show 0's on all/individual staffplans for actuals, default to the planned for that week instead.
Merge branch 'master' into staffplan-user-id-like-my-last-update-recorded

Conflicts:
	app/models/work_week.rb
GRIM: Be a bit more explicative.
GRIM: Don't use int where floats are due.
ALL: Make file executable for 'make check'. Thanks to Pino Toscano.
Add gravitation behavior
Add expression:Speed
Refactor: tidied and removed redundant dependencies.
チケットのスキン交換で失敗する場合がある問題を修正
DIVA.NETのHTML構成変更に対応
店舗検索でのGPS取得方法を改善したつもり
同時間（分単位）のプレイ履歴が取得できなかった問題を修正
エクセレントのランクポイント計算の係数が4だったので4.5に修正
プレイ履歴の共有画像から店舗名を非表示にするオプションを追加
update from rikulo
Added a simple controller that expects a post.
Fixing more HTML validation issues #889
Allowing UTF-8 report titles. Closes #908
Merge branch 'develop' of https://github.com/ushahidi/Ushahidi_Web into develop
Fix htmlentities calls not using UTF8

Related to #908
Ushahidi.js Fix broken map on /reports/view/XXX pages

* Fix the way keepOnTop event listener was added so that eventListeners
  is always defined
Restore Openlayers TMS support so cloudmade works again #911

Costs us 2kb in download size, worth it.
Fix error in reports::verify_approve() if no authenticated user

Conflicts:

	application/helpers/reports.php
	application/i18n
Add report_save hook to incidents model

Used by revision plugin

Conflicts:

	application/i18n
	application/models/incident.php
Add extra class to custom field <tr> and check to show empty fields

This is used to should empty field by the offline plugin, which
are then filled using jquery and the field classes

Conflicts:

	application/i18n
Update openlayers to fix gmaps popup
Discover valid timezones from the system.

Not only is this more portable in the inevitable event that my
geonames db dump goes stale and the system knows about more
timezones than I do, but in fact my system has a lot more timezones
defined than what was in my geonames db dump in the first place.
mexendo com a tabela
vsvjd
modified stellaboard script
added zip and backup logic
Strip whitespace off !important.
add functions: my_time() and my_time_short()
Merge branch 'master' of https://github.com/rtmp-switcher/backend

Conflicts:
	videosw.pm
Removendo provas antigas.
Ajuste na visualização de provas.
Verificação ao tentar carregar pergunta com matéria editada.
first failing test.
Update timecop dependency to version 0.5.3
Adds support for setting the message and passing a block to App.alert
Merge pull request #79 from joelmoss/alert_messages

Adds support for setting the message and passing a block to App.alert
minor change in README.
complete rewrite. filters are now separate classes. makes adding other filters easier.
separated filters out to filters.py.
accept lines without datetime only if they are between from and to.
removed debug output.
renamed to mlogparse.py
updated README to new name.
change help text for --verbose flag.
add smba1002

Change-Id: If255fe6418d39b0c1dc17720082a1798743f791e
Merge remote-tracking branch 'AOKP/ics' into ics

Conflicts:
	products/AndroidProducts.mk
	vendorsetup.sh
rm useless crap (for now)

Signed-off-by: KhasMek <Boushh@gmail.com>
Initial jellybean commit.

Signed-off-by: KhasMek <Boushh@gmail.com>
le derp
update README for jellybean
Update prebuilts and add nexus product files

ps3: remove some unneeded files

Change-Id: Iefcf786432fae548da5e9a1379dbb883dce20211
add tuna/maguro/toro overlays

Change-Id: I12148ee8b3386a47c9f8f926c8799b6defbc7283
Signed-off-by: Roman Birg <romanbirg@gmail.com>
redirect to correct path frameworks/{base=>native}/data

Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
Merge "add tuna/maguro/toro overlays" into jb
Add advanced settings bool to tuna devices.

Change-Id: Ic2a5c355d17ed4fbe1fd191172d81a011af69731
Signed-off-by: KhasMek <Boushh@gmail.com>
change ro.aokp.version to aokp_device_jb-build-x

Change-Id: I4f7c9fca826201ac4a1e4dd316abad5b6c1c489c
Signed-off-by: sethyx <sethyx@gmail.com>
Fix data/sdcard mounting issues (le derpage)

Change-Id: I5b03a8aedc124e3a4a2e7b1be307c8415f103956
Bring in d2tmo

Change-Id: I32a1e233f7ef207596e6007493be2594bf137741
Merge "change ro.aokp.version to aokp_device_jb-build-x" into jb
Fixes for Grouper

Change-Id: I24984ef33843852c64fbafa6994c8983bf6ebb3b
Signed-off-by: Mike Wilson <mwilson@acesappraisal.com>
disable camera sounds (1/4)

Change-Id: Ie81127b4000f241c6ccb3ac20f6c6009f574289f
Signed-off-by: sethyx <sethyx@gmail.com>
vendor: add d2-common overlay and enable overlay for d2tmo

Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Change-Id: If6d075684b312283e1b3fdd6b145da03739735b4
Merge "Fixes for Grouper" into jb
AOKP: add overlay for network location provider

Change-Id: I3d80300c09b6b05551ec3dd79842d9ca2860e919
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Describe using S3 HTTPS better
Add unmarshall json body
Removed VVERBOSE to prevent flooding the resque.log
Setting window/pane base index to 1.
Minimizing command delay time.
Added styling to the pages, refactored the tests, and added a new uses controller.
Added field copy function
Added field sync function, whereby a field can be linked to another field and updates to one field affects the other
Tweaked up/down arrow image size
Changed misleading 'Deleted' message in System Setup


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4145 c08608d7-6e46-0410-86ca-f2a6f1370df5
Missed a file from the last commit.


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4146 c08608d7-6e46-0410-86ca-f2a6f1370df5
Forgot another file from last commit.


git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4147 c08608d7-6e46-0410-86ca-f2a6f1370df5
make linked copied resource type fields propogate both/all ways

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4148 c08608d7-6e46-0410-86ca-f2a6f1370df5
fixes issue #242 , fixes issue #243 for feedback plugin, use escape_check instead of deprecated mysql function, add ajax, added e-mailing of results to email_notify

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4149 c08608d7-6e46-0410-86ca-f2a6f1370df5
remove a linebreak from feedback config file

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4150 c08608d7-6e46-0410-86ca-f2a6f1370df5
I had to move the feedback div out of toptoolbaradder to headertop, this fixes so it doesn't appear on login/user_request/user_password pages

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4151 c08608d7-6e46-0410-86ca-f2a6f1370df5
fixes for annotate

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4152 c08608d7-6e46-0410-86ca-f2a6f1370df5
attempt to fix issue #238 , try to trick MagicTouch object into being always instantiated by putting one in headertop

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4153 c08608d7-6e46-0410-86ca-f2a6f1370df5
another attempt to fix issue #238

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4154 c08608d7-6e46-0410-86ca-f2a6f1370df5
define button_toggle_off in jquery.annotate.js

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4155 c08608d7-6e46-0410-86ca-f2a6f1370df5
fix for missing end script tag in posixldapauth

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4156 c08608d7-6e46-0410-86ca-f2a6f1370df5
fixes for pdf_split fixes issue #245

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4157 c08608d7-6e46-0410-86ca-f2a6f1370df5
fixes issue #228 disallow access to download code for restricted resources

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@4158 c08608d7-6e46-0410-86ca-f2a6f1370df5
Initial commit
Merge branch 'master' of github.com:rzamana/resourcespace
Remove bootstrap responsive elements for now.
Loading with async set for jquery was causing problems.
Add in /css/khan.css to consolidate styling for exercises
Added in ui-tooltip css and example selector code so tips will display correctly.
Add code to format answer with radicals.
Format code
Move jquery.qtip.css to it's own file
Added scratchpad div styling
Remove clear style code
Remove stack div as we don's use it and it takes up left hand space.
Remove async during js loads as it seems to cause problems.
jQueryUI removed; does not seem to be used in the application at this point.
Comment out khan css in a way that can be used for testing

Using php type comment needed because of the embeded php.
Put css/khan.css first so that before after testing could be done.
Use base_url from CI to find urlBaseOverride location.
Added back in jquery-ui which seems to be used for some animations.
#answer_area input width set to 80px.
Added styling for #examples-show
Remove article tag and style
add .exercise-body style for GPU rendering
happy/sad images removed as not now used.
Deleted resource files, obj, etc.
Hello, Word!
Procfile
redis fix
:P
heroku port fix
heroku port fix
connect session secret
connect session secret
heroku engines fix
heroku engines fix
heroku engines fix
improve readme
imrove update config in VKAuth class
Merge pull request #2304 from jsloane/SAKIII-5838

SAKIII-5838 validate password change fields on focus out
Merge remote-tracking branch 'bp323/SAKIII-6068'
NOJIRA - Update snapshot versions
Merge remote-tracking branch 'origin/master' into 1.5.0
SAKIII-6080 fix fetching data attributes
SAKIII-6080 - Merge remote-tracking branch 'jsloane/SAKIII-6080' into SAKIII-6080
+ fix styling issue
SAKIII-5829 added missing error message text
Merge pull request #2209 from jsloane/SAKIII-5829

SAKIII-5829 added missing error message text

* jsloane/SAKIII-5829:
  SAKIII-5829 added missing error message text
Reintroduce examples.directory rc parameter

The main reason is that in Debian we store sample_data in a directory outside
the Python modules location.  This way we're able to specify that directory in a
more appropriate way, also to allow examples to work during package building (in
particular for the documentation part).

The code introduced is a partial revert of 6c5e9610 (with very tiny changes).
window size gvim
conflictテスト用commit
aaa
konoyo ha yami da
Move SDL_GetVideoInfo before SDL_SetVideoMode so it will probably fix
sizing issues for people.
Spelling

("gases" seems to be the more popular version of the plural noun)
New flood_parts function, should fix crashing due to too much recursion
Version Increment
Change order of bomb loops - delete particles before creating sparks

Fixes pressurised INVS being immune to bomb, as the sparks were being
deleted instead of the INVS.
Fix infinite loop when trying to detach soap with extra ctype bits set
Update gravity mask when loading OPS saves
Make tron follow TRON_NOGROW , thought that was in there.... (github edit because cate is annoying me)
Merge remote-tracking branch 'upstream/master'
* Fixed ordering of verteces for UV texturing in Blender plugin
Wording change on dates of Typesafe training
Added com_entityhelper to the release assembler.
[2673] EventAI cleanup Part II - Kalimdor
Changed readme to be more formal
proper names of daemons
style radios on new form
modified archive to test new layout
add _.js + filtering works on archive
[MOD] enabling file-input
Cool floor stuff.
Removed floor file.
Merge branch 'master' of github.com:secretrobotron/crunch

Conflicts:
	src/entities/platform.js
Added fuzz to platform shadow shader.
assembly election dedup dataset (threshold = 10, 20)
clinton dedup datasets with 'times' for t1=0 t2=1..10
Revert "错误文件  忽略"

This reverts commit 4ecda1a5285f973f6fdb3fd4d4276510ec60c40d.
添加完毕
错误文件 忽略
добавлены поля "дата договора" и "номер договора" в Партнеры
tab index в Customer
Have feathers check all protection
add center to the pack
Display correct share types in the listing form.
clean dirty code
clean dirty code
comment intent
reorder tests
comment
spacing
dont allow a registration for the request type in add_resource_url_adapter (we can always add it later, but can never take it away); squash an import warning
avoid deprecation warning at import
garden
dont mention arg by name
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
rendering
Merge branch 'mso'
Merge branch 'mso' into 1.3-branch
- Put ``pyramid.includes`` targets within ini files in scaffolds on separate
  lines in order to be able to tell people to comment out only the
  ``pyramid_debugtoolbar`` line when they want to disable the toolbar.
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
- Create a "MakoRendererFactoryHelper" that provides customizable settings
  key prefixes.  Allows settings prefixes other than "mako." to be used to
  create different factories that don't use the global mako settings.  This
  will be useful for the debug toolbar, which can currently be sabotaged by
  someone using custom mako configuration settings.
prep for 1.3a8
Merge branch '1.3-branch'
Merge branch 'master' of github.com:Pylons/pyramid
Features
--------

- Add an ``introspection`` boolean to the Configurator constructor.  If this
  is ``True``, actions registered using the Configurator will be registered
  with the introspector.  If it is ``False``, they won't.  The default is
  ``True``.  Setting it to ``False`` during action processing will prevent
  introspection for any following registration statements, and setting it to
  ``True`` will start them up again.  This addition is to service a
  requirement that the debug toolbar's own views and methods not show up in
  the introspector.

Backwards Incompatibilities
---------------------------

- Remove ``pyramid.config.Configurator.with_context`` class method.  It was
  never an API, it is only used by ``pyramid_zcml`` and its functionality has
  been moved to that package's latest release.  This means that you'll need
  to use the latest release of ``pyramid_zcml`` with this release of Pyramid.

- The ``introspector`` argument to the ``pyramid.config.Configurator``
  constructor API has been removed.  It has been replaced by the boolean
  ``introspection`` flag.

- The ``pyramid.registry.noop_introspector`` API object has been removed.
add tests for introspection switch
bin/Murakumo_Node_job.init and bin/Murakumo_Node_submit.init modify for pid file
Added the Hello World demo
dayz_amin commit
Added CSignal handling to MulticlassLibLinear
Guarded new L1/L2 logistic regression in for eigen3
Add libqp_gsmo implementation from libqp
As libqp.h contains the definition for libqp_gsmo_solver
the implementation of it should be included as well in shogun
Merge pull request #470 from vigsterkr/qp

add libqp_gsmo_solver
Added some dependencies to setup.py :star:
Adding travis config file
Merge branch 'master' of https://github.com/shreyu86/hello_python
Allt að gerast

Test suite úr Selenium.
added support for removing tags, left tag list only for used tags of the videos module, not all existing tags
ENHANCEMENT: Change PHP version requirements. Part of #7131.
Merge pull request #312 from robert-h-curry/7131-php-version-requirement

ENHANCEMENT: Change PHP version requirements. Part of #7131.
ENHANCEMENT Add YamlFixture String argument support

Enhanced YamlFixtureTest to cover this addition.
Merge branch 'gsoc-22-yamlfixture-import-string-rc' of https://github.com/michalochman/sapphire into michalochman-gsoc-22-yamlfixture-import-string-rc
ENHANCEMENT visual enhancements, cms tabs, main menu drop shadow adjusted, actions panel top gradient replaced
ENHANCEMENT tabs text-shadow direction change, improve visibility for IE
BUGFIX: CMS tabs were hidden in ie7, changed css to make them appear far right
API Default to Upload::$uploads_dir in UploadField
C-S communication
MAJ Menu
Changing to use contstant for unit values when writing media queries.
Updating README with browser support info
Add "Advanced" french translation part for the dependency injection component chapter
Merge pull request #113 from skeud/advanced_dependency_injection_component_french_translation

Add "Advanced" french translation part for the dependency injection component chapter
improved slicing keys
debug syspath in travis :/
Remove fileupload.md
Include bookmark folder names in suggestions.
Initial revision.

Provisionally adding new checkbox option for this:

   - If folders have long names or if folders are deeply nested, then
     including folder names is pretty ugly.

     So there should be an option to turn it off.

   - Defaults to off.
Add leading slash to bookmark folder names.
It looks nicer that way.  It also works better for searching.
Merge branch 'bookmark--include-folders' into full
preview box
'failed to lock' error runaround in internal test suite

git-svn-id: http://sphinxsearch.googlecode.com/svn/trunk@3421 8b96e2b9-35c5-2c16-bc47-5122d61876d4
uploaded latest entity models
added template print link.
Ignore Genius playlist
WOBS-1312: Omnibox update

Fixed.
Merge branch 'wobs-reloaded' of dev.sourcefabric.org:newscoop into wobs-reloaded
Fixed s/ and symbol equality checking.
Added CpsfLinkedList exercise 2
Change English string: "No, Thanks"->"No thanks"
[#1455189697067] Add README

* Modified README slightly
use xcconfig file instead of GUI of build setting, pair: Sun Long
When generating the clang crash diagnostic script, strip out the -D, -F, and -I
flags.  We have preprocessed source, so we don't need these.

No test case as it's fairly difficult to make the compiler crash on demand.  I'll
patiently wait for Ben to tell me how to do this in 2 lines of code.  :)
rdar://11283560


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@155180 91177308-0d34-0410-b5e6-96231b3b80d8
[AST importer] Do a correct import of a FunctionProtoType::ExtProtoInfo, don't pass
nodes from the imported ASTContext.

rdar://12348924

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164416 91177308-0d34-0410-b5e6-96231b3b80d8
Fix build errors.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164417 91177308-0d34-0410-b5e6-96231b3b80d8
Mark the passed in "self" for a block as an object pointer so
that the backend can mark it as the representative pointer for
the block.

rdar://12001329

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164418 91177308-0d34-0410-b5e6-96231b3b80d8
[ms-inline asm] Use mnemonicIsValid() in a helpful assert.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@164421 91177308-0d34-0410-b5e6-96231b3b80d8
[arcmt] iOS is always safe to use 'weak'. rdar://10950825

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@152878 91177308-0d34-0410-b5e6-96231b3b80d8
[arcmt] The hard-coded list of weak-incompatible classes is no longer necessary.
rdar://10673816

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@152879 91177308-0d34-0410-b5e6-96231b3b80d8
Config.h: Add another definition which the Darwin build (sometimes) uses.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@154630 91177308-0d34-0410-b5e6-96231b3b80d8
objective-c modern translator: beautify rewrite of
struct __rw_objc_super; no functionality change.



git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@154632 91177308-0d34-0410-b5e6-96231b3b80d8
clang/test/Driver/fsanitize.c: Speculative fix to improve test on win32, not to mix emissions into stdout.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@167485 91177308-0d34-0410-b5e6-96231b3b80d8
Final piece of core issue 1330: delay computing the exception specification of
a defaulted special member function until the exception specification is needed
(using the same criteria used for the delayed instantiation of exception
specifications for function temploids).

EST_Delayed is now EST_Unevaluated (using 1330's terminology), and, like
EST_Uninstantiated, carries a pointer to the FunctionDecl which will be used to
resolve the exception specification.

This is enabled for all C++ modes: it's a little faster in the case where the
exception specification isn't used, allows our C++11-in-C++98 extensions to
work, and is still correct for C++98, since in that mode the computation of the
exception specification can't fail.

The diagnostics here aren't great (in particular, we should include implicit
evaluation of exception specifications for defaulted special members in the
template instantiation backtraces), but they're not much worse than before.

Our approach to the problem of cycles between in-class initializers and the
exception specification for a defaulted default constructor is modified a
little by this change -- we now reject any odr-use of a defaulted default
constructor if that constructor uses an in-class initializer and the use is in
an in-class initialzer which is declared lexically earlier. This is a closer
approximation to the current draft solution in core issue 1351, but isn't an
exact match (but the current draft wording isn't reasonable, so that's to be
expected).


git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@160847 91177308-0d34-0410-b5e6-96231b3b80d8
move NoMoreCardException to zeileo.card
Added red/orange textures for new drone
Sentry Guns Beefing

All CC sentry guns health increased to 1800 from 1000
All CC sentry guns damage resistance increased from 80 to 100
All CC sentry guns stealth increased to 40
Sentry autocannon, rocket, and AA view range increased to 310, 340, and
350 respectively
Sentry autocannon weapon damage increased to 180 from 120
Sentry autocannon weapon range increased to 300
Sentry autocannon burst delay decreased from 1.5s to 0.8s
Sentry AA weapon range increased to 440 from 400
Sentry AA weapon damage increased to 480 from 400
Sentry AA weapon blast range increased to 35 from 25
Sentry rocket weapon range increased to 340 from 250
Sentry rocket weapon damage increased to 400 from 250
Sentry rocket burst delay increased to 1.8s from 1.5s
Sentry rocket weapon max speed and acceleration increased to 350 and
250, from 250 and 200
Sentry rocket weapon blast radius increased to 35 from 25

So basically, the sentry guns can shoot and see farther, are harder to
kill, and (with stealth) are harder to aim at.
Rename the interactive library
Module compiles correctly but for some reason manages the wrong host, have to fix later
add some stuff for modal use. get a form going that will be for entering redmine feed.
Fixed google analytics JSON bad encoding issue
A test and fix to prevent display of recipient hashes in badge details
Added welcome page for users signing up during badge acceptance.
issuer.welcome redirects to login if not logged in; tests for issuer.welcome behavior
Add javascript redirect to issuer frame in case persona returnTo isn't working
First stab at getting qunit tests run in travis-ci
run, phantomjs, run
Add issuer-frame qunit tests for phantomjs to run
Reinstating ESC key handling to the issuer frame, although in
a way that's not modaless flow friendly. I think separating the
actual framed version into a layout and content would help.
Use the unhashed recipient in the badge acceptance dialog. Closes #86 (again).
Merge pull request #220 from stenington/147-badge-detail-recipient-hash

Prevent display of recipient hashes in badge details [closes #147]
Merge pull request #258 from stenington/phantomjs-in-travis-ci

Phantomjs in travis ci
Merge pull request #260 from stenington/255-escape

Reinstating ESC key handling 
Prefix top and self with window. in issuer-frame frame detection
Merge pull request #254 from stenington/247-welcome-screens

Badge acceptance sign up welcome screen
Preparing to add modaless acceptance option:

Pulled buildChannel() out of main.js, since a modaless acceptance
process won't be needing it.
Added issuer/frameless counterpart to issuer/frame that renders
the issuer-frame view without the bits that don't make sense
without the iframe. TODO'd the renaming of the issuer-frame
view, which will no longer be in a frame, necessarily, but that
should be its own commit. The issuer API does not yet provide
a way to call the frameless version of things.
Offering issue_no_modal() alternative to issue() in the
issuer API. The method takes a list of assertions, but
no callback. Badge acceptance is done in a full window
instead of iframe, and the user is delivered to the
backpack at the end of the flow.

This version is almost certainly insecure. The assertions
POSTed are stringified and injected into the resulting page
as javascript.
Validate each incoming url from modaless issue with url regex, at least.
Returns 400 error if one doesn't match, for now.
Rename issuer frame page to something friendlier
Issuer controller tests for frame and frameless methods
configured devise email host
Comments & string fixes to pass grading
Remove daemon script
Added more examples to match documentation on website
fix ed complie
moved old MaterialGen to old/ and comment out all uses of it, everything renders white now
first commit
commit 2
PropertySet
added ConfigLoader
platform serialize
PropertySetGet, more class descriptions
add Doxyfile, move the old source again
Merge branch 'master' into materialfactory_new

Conflicts:
	source/editor/OgreApp.cpp
	source/editor/OgreApp.h
	source/editor/SceneInit.cpp
	source/editor/Update_Edit.cpp
	source/ogre/BaseApp_Effects.cpp
	source/ogre/common/TrackVdr.cpp
merge mistake
Merge branch 'master' into materialfactory_new
fixed ConfigLoader bug
definition loading
rename ConfigLoader to ScriptLoader, more changes
vector2,3,4 ; forgot to add some files
InstanceLoader
wrapped some more stuff
listener works
ShaderSet, more stuff
remove the Definition concept (un-needed), backend pass creation and assigning properties works
netw game name saved in .cfg
Create the script event.

The script event runs another VDD test script.  This change creates that event.
A few rough edges were polished off of the Javascript event as well.

Testing done:

VDD test suite.
AMSearchBar: added cancel button handler
Moved fieldStyle to AMSearchField;
Changed initializer to initWithStyle:(AMSearchBarFieldStyle)fs
Added fieldStyle property;
Changed initializer to initWithFrame:(CGRect)frame style:(AMSearchBarFieldStyle)fs
Updated copyright info
Merge branch 'development'
* nelle statistiche "entrate / uscite" è calcolato anche il fisso dovuto ai dipendenti
Make Partitioner Configurable so we can pass in the number of input records to it so it can calculate the correct partition based on it.
adding a ui label
print out hex for debugging purposes
Hieno ja tärkeä commit
don't attempt to tessellate edges if edge count == 0. Solves issue #1421

git-svn-id: http://processing.googlecode.com/svn/trunk@10527 fe3ceab9-de17-3b67-bb2e-7d58edd5e4d6
Updated Polish translation
Updated German translation
Distribute the gtksourcecompletion.ui file
Release 3.4.2
[l10n] Updated Indonesian translation
Updated Galician translations
Updated Spanish translation
Updated Slovenian translation
Updated French translation
Updated Serbian translation
[l10n] Updated Catalan translation
[l10n] Updated italian translation
Updated Hebrew translation.
Fix gobject-introspection scanner warnings
Highlight invalid hexademicals and octals in C
Expand and update Go language spec
Updated Spanish translation
Updated Hebrew translation.
Updated Bulgarian translation
Updated Slovenian translation
fixed layout and typos
add URL attribute
recenter after goto line
add save and pop context functions
Fixed problem with encoding/decoding of URLs
Improved HTML content processor to only extract links which can be
loaded according to max depth restrictions
Removed useless comments
Improved file/directory sanitization in final result
Fixed broken unit test
Extended unit tests for HTML content processor
Updated TODOs
change scraping to work with beautifulsoup
Add "unrecognized"
Make it look like paper
some more fine tuning of bomberman
finished the GUI code
comments and forms
commit 21

21
submissions_helper fix
Add index available_points [exercise_id]
Development on unlockable exercises.
Hypermutation model implementation working.
added project 3 proposal basic client/server prog
Added the servis isRunning check back into the shutdown sequence.
Se modificó Package_Booking y SearchReservation para que regresen arreglos de Package_Booking al buscar por email y nombre.
reservaciones.jsp también se modificó conforme a ese detalle, pero aún no falta revisarlo bien, algo que está en proceso.
Load Dashboad Post from Database
Add Facebook Buttons
Scala DSL: configuration for Text possible
Bump Axon version
inlining tag content from parts
encoding -> charset

meta charset parsing disabled, as it failed
Merge branch 'master' of github.com:/thepian/thepian-pages

Conflicts:
	test/test_populate.py
detect duplicate key errors on _id field
finished..except asking trevors permission for photo, feels great!
Make it easy to configure Element hit testing (from subclasses)

This unifies the 3 hit testers already defined in tripleplay using configuration flags.

Also allow the absorption behavior in Root to be configured publicly and depreacte the overriden
method approach.

NOTE: this also optimizes non-interactive widgets (and other Element subclasses) such that
interactive children outside the element bounds will no longer get hit. This doesn't affect anyone
that I know of, but to override just elem.layer.setHitTester(null).
Merge pull request #304 from tianlili/dev

Dev
[Testcase]修改report产出时间
laster opp shitts, som er finere kode slik tib liker det
Improved support for cell colors.
readme: fix syntax (not markdown)
Autobuilderの動くバージョンをとりあえずコミットしとく。
↓
ブラウザ三国志 自動建築スクリプト By nottisan + 5zen（自動内政改良）2012/04/24 人柱版+本鯖対応
Merge branch 'master' of https://github.com/timeserver/bra3script
my clients and all clients views added
avoiding html 5
fix translation of scaled shapes
fix full polygon merge

and various other fixes
nicer live gcode
adapt extrusion rate for outer shells (round lines)

outer shells get less extrusion because the lines are asusmed
to be round which makes them wider than expected

the other solution would be to offset the outer shells instead ...
add reset printer (does not really work)

pronterface.py resets the printer by setting DTR high and low
which doesn't seem to work here
Updated android plugin version and removed old scala nexus repository.
modif case => suppr name
ダイアログのHTMLの修正の途中
removing all the juno jars
Make ctrl+shift+v paste from clipboard to urxvt
set molokai as the global scheme
Disable the reporter for Mac.
Merge branch 'master' of https://github.com/tomgr/google-breakpad
Use "to-markdown" to transform raw html into markdown
Added read me
remove wrong launch informations
adding wizard to create JUnit
commit for #191 make GridData API FXML aware
commit for #191: RowData FXML compatible
Updating to hide the rate only if explicitly null
Merge branch 'master' of github.com:tonyxiao/Survey-Droid
Added themometer % to surveys_taken, also fixed the locations controller limit bug
Also remove buffer_ieee754.js, moved to buffer-browserify.
cname

added domain name www.tooxic.net
Cosmetic.
Found the failing test for @amol-'s case.
Allow Deferred as kwarg to .display().
A stab at handling function composition.  Tests pass.
This is clearly unsustainable.
Solve the function composition problem.
Adding NuGet packaging
initial
Merge branch 'master' of github.com:transong/tmxConverter
re-enable campfire notifications
1.9 gemfile
Make sure we do not override existing instance methods when defining state predicate methods.
Bump version to 1.0.4.
include clean in make
add config to priority
require correct uri
added arg
initial checkin  of prettified mailer layout and mailer view
convert more mailer views to use new layout
correct some errors in mailer view content_for blocks
add mailer helper file
convert/test/edit more user_mailer views for new mail layout
convert remaining mailler views to support new layout
add mmissing helper includes to mailer files
test batch mailer views + add some fixes
remove unused single notification mailer views for kudos and subs; bold work titles in batch sub notifications
small formatting tweaks to some user mailer views
fix errors withh item added to collection mailer view (pseuds list may be empty)
add plain text mailer layout + one trial view
Added comments to my code.
Merge branch 'master' of https://github.com/tullyj/CMPUT301F12T03.git
Commit just to get everything committed.
Battery life optimisations on iOS.  Increased background plyback battery life by 200-300%
some more updated functions
Fixing extra white space
Remove abort! macro
Merge branch 'master' of https://github.com/tygraen/COMP7481_Proj

Conflicts:
	src/bcit/comp7481/AudioRecorder.java
Merge branch 'master' of https://github.com/tygraen/COMP7481_Proj
Fix issue with MultiJson feature detection.

You can't reliably detect whether `MultiJson` responds to `load`
since Kernel defines a `load` method, so use `adapter` as a proxy.

This should resolve #39.
Merge pull request #61 from tzumainn/master

created conductor-specific partial due to conductor being unable to associate deployables with deployments
OPEN - task #373: Inferred type validator buggy with Booleans 
https://github.com/ujhelyiz/EMF-IncQuery/issues/issue/373
Fix an NPE in standalone mode #190
Translated all PHP files.
Remove invalid API method.
Fixed USC.jq not being type function.
Fix Array to string conversion error at image file uploading

This is temporary workaround.

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Translate header of alert verification pages

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Restore city selection dropdown box functioning

Restore functioning of city selection dropdown box above of the map on
the 'Submit Report' page. It was broken due merging of
reports_submit_edit_js.php and reports_submit_js.php files.

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Make cluster title translatable

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Remove dropped property reporter.service_userid from reporters view

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Recognize .jpeg files as photos

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Add tooltips to categories in report submit form

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Retrieve cities' names in site language

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
update README.txt section
moved get_pairs function into misc function section
Fichier BDD
Eliminated duplicated code for trimming the tail of the banlist.

Original patch by:	martin
changed \[\e]0;\u@\h: \w\a\]${debian_chroot:+($debian_chroot)}\W$(__git_ps1 "(%s)")\$  to make it short
add new must and must_cover for compas cmps03
metodo main

Signed-off-by: Victor <victorhugo.chalian@gmail.com>
Removed @share_count
split Signature.name into first and last name
added list of top/bottom three petitions by nps to admin/dashboard; consolidated some nps calcs into models/metrics/nps.rb
dashboard: all charts now per emails sent
Testing paypal APIs
More paypal testing
simplifies some js
receiving back form paypal
downcase header keys
paypal seems to be responding properly
fix profproect
tpl refarsh & js add
turns out this is annoying and not very funny
Version 1.5: Hand-optimize for javascript, scala, css, and CtrlP.
commit jps manu
commit bajo el logeo
commit prueba vin
Merge pull request #1 from vince-clu/master

miratelo
commit prueba vin
Creado el logueo2.
Prueba de Vin.
Prueba de Manu
commit3 jsp vin
commit3 jsp vin
commit3 jsp vin
reparaciones
HOTFIX: Spelling in README
Refactoring begining.
Rewrited option parser and get server data functions.
Fix option parser. Start rewrite server response parser.
pre release :P
enforce correct order of pages exported
restrict Page query set when PAGE_HIDE_SITES is true, fixes multiple-selection bug
json format change: content blocks now ordered by creation date

this fixes a problem with secondary languages being marked
as not up-to-date when importing pages with multiple languages
better fix for language_up_to_date, redirect_to

sort languages by latest content change in export
handle redirect_to in a separate pass, no need to import twice
remove freeze_date from json export

its use will result in broken pages because the content blocks created
will have different dates than the source
export redirect_to slugs in all languages of target page
fix for slug importing
make exporting of content language update order explicit

also switch back to dicts for language content
page list admin: fix select/deselect all pages

checkboxes for changed items in the list after expand/collapse/move pages
did not interact properly with the select/deselect-all checkbox
Merge branch 'feature-json-export'

Conflicts:
	pages/managers.py
	pages/models.py
Bugfixes!

- Fixed a weird, unknown bug with downward sloping. I have no idea what
the bug was, just that I fixed it.
- Finally fixed the infinite loop problem... To a point. It's not
completely solvable. There's a comment in character/create that
summarizes the situation.
- Added some comment documentation, updated the readme.
bump to 2.0.4
Revert "Initial commit"

This reverts commit 0b2f55639fdc7c09db12566503893df68f85e21a.
comit: inserção dos módulos que manipula a planilha.
Signed-off-by: Artur Jr <arturjunior87@gmail.com>
Minor cleanup, a couple of "api" strings.
Grab an other bit for cell types, and add a new cell type WT_CELL_VALUE_COPY.
Add support for row-store leaf page value dictionaries, using the new
cell type, WT_CELL_VALUE_COPY.

Turn on duplicates for row-store in test/format, drop probability of
Huffman encoding from 40% to 20%.
whitespace
KNF
Assert the first cell on the page isn't a copy cell.
Don't try and hide the raw cell type WT_CELL_VALUE_COPY, that way we
can check for it when verifying the disk images.

Verify both the raw and collapsed cell types when verifying the disk
image: it's not strictly an issue for the disk image, but it checks
the cell unpack code which is useful in and of itself.
When in-memory trees are created because of splits, the WT_REF.addr
may not reference an on-page cell at all, check before we assume it
is a cell.   (This is a bug shown up by test_truncate01 becuase of
the dictionary changes, but it's actually a bug in the fast-delete
implementation, ref #247.)
Configuration doesn't currently support a minimum value for a configuration
item with a different (smaller) value for turning the item off entirely (for
example, I want dictionary to have a minimum value of 100, but dictionary=0
should mean no dictionary at all).  For now, make the minimum value be 0,
and correct to a minimum value of 100 in the reconciliation code.
Merge branch 'develop' into dictionary
Reconciliation can be called by random threads on different trees, which
means the per-tree configuration can't be done once per WT_RECONCILE
structure (which is really once per session structure).  Move per-tree
configuration into the WT_BTREE structure, set when the handle is first
opened.  (close #316.)
Add more descriptive detail about the various compression options and
how they work.
Merge branch 'develop' into dictionary

Conflicts:
	test/format/wts.c
Merge pull request #318 from wiredtiger/dictionary

Dictionary
lang/python/wiredtiger_wrap.c:5726:3: warning: expression result unused
; should this cast be to 'void'? [-Wunused-value]
Merge branch 'develop' into lsm
Explaing recent trends
First commit
Adjusting package.json contents
Adjust the Procfile
Commit for the version v0.1
Merge branch 'master' of github.com:wlepinski/spotty_node

Conflicts:
	.gitignore
Remove unused files.
Fix - Active plugins display on status page.
Update master
Merge pull request #1200 from jonzon/patch-1

Update master
Filter coupons by type. Closes #1909.
Undefined index, closes #1913
Merge pull request #1914 from Geczy/issue-1913

Undefined index, closes #1913
Order data/fixed keys. Closes #1981.
added reports to api
Merge branch 'master' of github.com:worktycho/MedDataHack