labofsahil/github-event-dataset-2012 huggingface dataset:
add use_returning as a postgresql connection config
update mysql for new exec_insert signature
refactor
improve test coverage
pick better names and add a little documentation
refactor configuration of insert_returning
Add partials section to getting started guide
Merge branch 'master' of github.com:lifo/docrails
Copy Edit
adds a mention of the fact that an engine's lib/assets directory is also on the load path
Merge branch 'master' of github.com:lifo/docrails
Shadowing variable warning removed
Enhance validations documentation
Add documentation for validate options
minor docs improvements
Namedspaced generator indent method test refactoring
Fix misprints in assert_file & assert_instance_method docs
Merge pull request #5998 from aderyabin/fix7

EXPLAIN only for sqlite3
Merge pull request #5997 from avakhov/test_namespaced_controller_dont_indent_blank_lines-refac

Namedspaced generator indent method test refactoring
remove deprecated #find_in_batches calls
Cursor drawing

- fixed cursor drawing in CEngine
- changed event loop to generate more events
BOOL -> bool; additional fixes in constructors/destructors
changes to how posts are displayed and ordered
Some fixes to the gen_tv ruby file.
Working on new dynamic colorboxes.
Movies (not tv shows) are now dynamic on the main page (colorbox)
fixed front page, job detail page mostly works
return feature name only
Fixed naming issue with loggers.
precompiled image logo
commit deleted
add SaveEnd() to Go
And were really eatin our own dogfood now.
ページタイトルの変更 UnclearBox
I killed stuff

dont worry no one will know
[TASK] Update submodule vim.
[BUGFIX] Allow ../ in fullstoprc.
Added Hudding equimpment list.
Made the readme syntax highlight nicely.
Move assets
Add new assets
Metro-fying it again
delete vim-pathogen
登記_預設為院訂_全系所、全年級，切到專業選修時預設為該系所該年級
Merge branch 'master' of https://github.com/alltop/ACAD_TAJ
fix css
add grunt task
Add a deploy script for Smokey
Minor fix in path resolution.
add google2.php
[android] adding screenSize to configChange list

Android's webview fires a screen size change without screenSize
on android sdk level > 13
only leader can drag other devices in the session out
clean the code and add some comments
fix the icon snapping at session panel
merge fix-problem commit
second commit, prototype phase done
lista
eliminar imagen no usada
<!-- Place this tag in the <head> of your document -->
<link href="https://plus.google.com/100689567425508642907" rel="publisher" />

<!-- Place this tag where you want the badge to render -->
<a href="https://plus.google.com/100689567425508642907?prsrc=3" style="display:inline-block;text-decoration:none;color:#333;text-align:center;font:13px/16px arial,sans-serif;white-space:nowrap;"><img src="https://ssl.gstatic.com/images/icons/gplus-64.png" alt="" style="border:0;width:64px;height:64px;margin-bottom:7px;"><br/><span style="font-weight:bold;">The AMH News Syndicate</span><br/><span> on Google+ </span></a>
Fix duplicate names (pyffi and niflib don't like them).
Airplay WIP
Revert "Make sure we don't accidentally duplicate properties in jsobject -> prop bridge"

This reverts commit ec6753536763698d75d6ea2bc3e312b136e77f6f.
js: Correctly fix the duplicate entries in jsobject -> prop bridge
Get rid of the huge buf for media packet queue

It was only a workaround for the fragmentation issues on PS3.
Now with TLSF these issues seems to be gone
Restructure video buffer handling a bit
Initial work to do the calculations
[MOD] Indonesian translation: updated.
let's cut the bs and get with it
Revamp of the collection printing system
Upgrade to grails 2.0.3
Dont generate double set of xml files
Version 2.0.1
webcam panel
Namespace should be kept for child nodes
Remove unused xmlns attribute

false ? 'something that will never happen : 'something else' doesn't
make sense
Merge branch 'master' of https://github.com/cjblomqvist/node-soap
added ability to send mass email
mass email
dim fetch dest after templating
Merge pull request #411 from mgwilliams/bug-fetch-module

Fetch module: run dwim on dest after templating, not before
bit function fix
恐惧之心bossid修正;姓名版武僧颜色问题;raid角标修改等
德鲁伊cd
为拾取增加右键以及几个战士的BUFF&DEBUFF
修正使用skada时tooltip会部分重叠的问题
避免意外情况……
Merge pull request #2 from anson0370/fixTT

修正使用skada时tooltip会部分重叠的问题
Numeration更新
bonus roll计时条颜色
merge from master
add README version
README.md seed db
removed the benchmark module
fixed sbt build
Fixes Makefile sed substitute regex

The sed regex used to not match in the git-hg python file because
the GITHG_HOME is prepended by spaces. Fix that so the file is
modified correctly.
Added FilterScreen
Removed CMWallpapers and CMUpdater
first commit
Adding test text
Merge branch 'master' of https://github.com/aravind326/Test
downloaded the date picker
closes #8.used the bootstrap-datepicker by dangrossman
Fixed setup script
added jshintrc and fixed font issue in vimrc
fixed math for moveExactly in ArenaActor
Merge branch 'master' of https://github.com/artagesw/FROIDZ
Added 'name' in config, using random dir names
bump ver
FLEX documentation added to /misc
Misc improvements
Example script to retrieve and parse FLEX reports
README add first time .vimrc instructions
Add two part absolute
Implement win32 threads
zooming with the left hand is now much smoother
Add fixed frame rate to Tutorial 5.  Better fixed time slice frame support in LxEngine.
Fix defect with normals not being copied to VBO.  Update GLGeom.
Added limit switch query params

When the limit switch is called, the slave performs a status check on
the cell_id + 2^control_size. This activates the last control line
(highest power), which toggles to the limit switch in each cell as
opposed to it's sensor. There may be an issue handling analog vs.
digital in.
Add project presentation to the web interface
Return 404 on page not found
Pagina Toegevoegd voor het veranderen van de order Status

Nog een wijziging in de database die doorgevoerd moet worden.
add missing language for payment token
Agregando Readme
Readme Actualizado
Editando Readme
Readme Actualizado
Merge github.com:augustolzd/SAMP into dev
Corrige le titre de la fenêtre de connexion.
Attempt with mysql
Another try with mysql
Query builder mysql tests
It connects, right?
The type is important\!
Connect with default username/pass if running on Travis
Lets try posgres
getenv?
getenv?
Fix postgres tests?
fix pgsql tests
Remove echo statement
app.Config実装
Update metadata drive when power on instance.
Merge pull request #114 from axsh/fix-ssh-key

Update metadata drive when power on instance.
Moved openvz failure recovery scripts from wakame-vdc/scripts to wakame-vdc/dcmgr/script
fix architecture type of local repository path for i*68.
updted recording TODO
use UIDeviceIdentifier
add Podfile & podspec
add ignore list
added ability to add and delete users, next up, modeling and saving user permissions for devices
#105 ready for testing.
    - bill address updates
    - site_idClientContact & site_idAddressBill enters null instaed of 0
Local flood fill for XZ and YZ planes.
Modify global flood fill to use connected threshold 3d algorithm
Update slice range for flood fill when changing slice plane
Remove dependecies between visualized slice and flood fill slices' range
Global flood fill works on slices' range
Merge branch 'GlobalFloodFillEnahancement' into GlobalFloodFillFix

* GlobalFloodFillEnahancement:
  Global flood fill works on slices' range
  Modify global flood fill to use connected threshold 3d algorithm
Add wait info window
Merge branch 'GlobalFloodFillFix' into OpenMAF-2-2

* GlobalFloodFillFix:
  Add wait info window
  Global flood fill works on slices' range
  Remove dependecies between visualized slice and flood fill slices' range
  Update slice range for flood fill when changing slice plane
  Modify global flood fill to use connected threshold 3d algorithm
  Local flood fill for XZ and YZ planes.
making sure servers is passed as an array if using more than 1 server
using sbt 0.7.4 to avoid null java error
protect against NTP (or whomever) jumping the clock backwards
Add a note about running ntpd such that it won't move time backwards.
do release builds
Merge remote branch 'dcoder2099/master'
Merge branch 'master' of github.com:twitter/snowflake

Conflicts:
	README.mkd
Better thread settings for THsHaServer.

The default is 5 for min and MAX_INT for the max. It seems silly to go higher than
the number of cores available for this, since its a worker model.
improve the logging for developement
fix the admin html. 

it was static before (never regenerated)
minor thrift cleanup

No need for the protocol factory instance.
Log the threads settings.
Support datacenter id in IdWorker

Will add integration next.
upgrade specs to that it will actually print out error
relax agent parsing a bit
improve logging for idworker startup
load the datacenter config from zookeeper
make the worker id claiming simpler

Instead of loading the peer list and trying to pick an id, just walk through the range of possible ids and try to claim them.
change admin port
update to newer ostrich
a bunch of minor cleanups
cluster command updates
note on capabilities negotiation
Merge branch 'master' into one-two-add-jbs
Bug 805189 - [video] typo in error message
permissions typo
Bug 806229 - [Cost Control] "WIFI" is used instead of "Wi-Fi"
Bug 806225 - Incorrect capitalisation of word in About Your Rights
Bug 806167 - contacts.properties: wrong case for facebook string
[Diale][USSD] Message area styles after html * overflow hidden deletion.
Bug 804890 - Add shared setIdleTimeout() method that wraps idleObserver
Fixes for the typos mentioned in Bugzilla 805336
Bug 799190 - [clock] Add locale keys to alarm sounds
Bug 796739: [communications] Remove inline script.
Bug 796814 - [email] Email shows a black-screen on startup if there was a network problem when creating the account and there are no known folders. Remove assertion and automatically resync. r=squib. a=blocking-basecamp
Merge pull request #6177 from asutherland/goodbye-inbox-assert

Bug 796814 - [email] Email shows a black-screen on startup if there was a network problem when creating the account and there are no known folders. Remove assertion and automatically resync. r=squib. a=blocking-basecamp
Bug 805361 - make the text of options mutli-line to avoid truncation.
r=Alive, a=blocking-basecamp+
Merge pull request #6173 from RudyLu/value_selector/fix_multiLine_style

Bug 805361 - make the text of options mutli-line to avoid truncation
SMS Peformance
Splash removed
Merge pull request #6075 from Martin1982/bugzilla-806167

Bug 806167 - contacts.properties: wrong case for facebook string
Bug 804890: Use idletimer to correct idle time computing in screen manager
Merge pull request #6073 from Martin1982/bugzilla-806229

Bug 806229 - [Cost Control] "WIFI" is used instead of "Wi-Fi"
Merge pull request #6159 from Martin1982/bugzilla-805336

Bug 805336 - typo in multiple strings
Skip tests that don't matter
Add a gitignore.
update index.php, working on refreshing now playing page when song finishes
Merge branch 'master' of github.com:bbokorney/db-wa
outlined several attempts to set up auto refresh after song is complete.
changing port and title
fix #104 provider dynamic freemarker result builder
New configure built on Linux
Generalized internet address parsing to include host:port
Header navigation, intro and logo
added resetTime
Markdown is better.
Ensure unchecked checkboxes are saved as 'N'.
handle ConResCtxt to allow moreConnection query
small fix
handle ConResCtxt to allow moreConnection query
small fix
Merge branch 'feature-next-prev-connections' of github.com:benib/Transport into feature-next-prev-connections
simplify result array building
basic ConIntervalReq
basic ConnectionIntervalQuery
backwardCount & forwardCount is only set in ConnectionQuery
Merge branch 'feature-connection-interval-query' of github.com:benib/Transport into feature-connection-interval-query

Conflicts:
	web/api.php
ok edit by user3
emergency fix to change header requests for cjson posts and puts
added user-agent header
upped the version
Fix: System freeze, looks like we can't set manifest puppet agent service to stopped.
Fix: need to match files that ends in 'syslog.log' not full path.
Change node names to correct domain for 'asgard' and 'valhall'
Reduced the number of tripwire daily checks.
Added G_4NAND2.vhd.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
set back default user / password
new class : Player
proper class Player
KataEnglishNumerals: first commit
enhancements to DB material
merge upstream
Merge branch 'master' of https://github.com/bgirten/pgbtest.git

Conflicts:
	www/index.html
only show outline when a token ---outline--- is in the text
update translation files (fetched from Transifex) and remove translation for fr_FR, which was removed / renamed on TX
Merge pull request #1448 from Diapolo/2012-06-13_translation_updates

update translation files (fetched from Transifex - 2012-06-13)
Checkpoint at block 193,000
Merge branch 'checkpoint'
Add explicit numeric constant value for all opcodes

- Easier for debugging (what opcode was 0x... again?)
- Clarifies that the opcodes are set in stone in the protocol, and signals that it is impossible to insert opcodes in between.
change type of various bare chars to bool that are only used as bool (and never serialized)
Remove no-longer used UI hints in bitcoin core

The Qt UI has its own associated structures for temporary transaction state / cache.
Merge pull request #1129 from laanwj/2012_04_opcodes

Add explicit numeric constant value for all opcodes
Need to have OBJAVI_URL as a full URL
Fix import of UrlDownloader
Added light flag to lemmatize function
humble  update + Nyan base components and screens
Merge branch 'master' of https://github.com/blobCopter/nyan
Fix for issue #32 - twistar.validation.presenceOf is broken
Filling in some info in the READMEs
saying no to pyc
adding fitbit.py
* New 64-bit AMIs.

git-svn-id: https://nixos.org/repos/nix/nixos/trunk@33390 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
added: the plugins list is now available as JSON via the /plugins url
replace various copies of ButtonTools.java vith version in Libraries
Merge branch 'feature/admin_panel' of github.com:bonusboxme/oxid into feature/admin_panel
added version string that can be copy/pasted into composer.json
decomposition planning. Not tested
dynamically populating select-services.jade with services from DB
Updating local vimrc
Revert "deleted comment"

This reverts commit be45e4939fbf5880493dad0b8bed8f41e336c04d.
Revert "Revert "deleted comment""

This reverts commit c2a2a3195751ae1ea2916abf80d5eced31f6debd.
Revert "Revert "Revert "deleted comment"""

This reverts commit 2c089502c1da8ff377a59a13ec772a879ee84c61.
Fix some shape dimension bugs.

The tubdet geometry looks okay, now on to optical checking.
add basic support for class instances method calls
Consolodated configuration.

* Moved OAuth2 values into configuration. They are not included by
  default, and if the values are not found, OAuth2 is disabled and the
  login view does not show them as an option, or accept requests to
  authenticate that way.
* SUBMISSION_DIRECTORY has been moved into the configuration, and the
  default is now /var/local/galah/web/submissions/, it was
  /var/local/galah.web/submissions. This change will require that you
  move your files from the old location to the new one, or change it to
  the old in your configuration file.
Forgot a template statement
Ignore bucardo.restart.reason.*.
MAking the app launcher a littler prettier.
Fixing ivar alignment.
update layout.py
new algebbraic class which replaces rss.py, toa.py, tdoa.py and crb.py
Merge branch 'master' of https://github.com/mlaaraie/pylayers into mlaaraie-master

Conflicts:
	pylayers/gis/layout.py
Merge branch 'master' of https://github.com/buguen/pylayers
Add OS X Finder and Terminal
coding for fun - Uhr
rename some vars
consolidate configuration options
let's try passing in options as args to start()
better name for root path option
merge
atualizando ACK
Added a way to get a list of all interface names, this implementation will probably change, as it is more of a 'negative logic' implementation
Added timestamp command bound to F3.
Merge.
[move] git mv gFTP.c src/gFTP.c
Added raw download URL
Change skyscreamer from www.skyscreamer.org to skyscreamer.org
Too hasty I am
Boot the broken version
Renamed header for invites.
Working with contact update
Fix for the HTTP request mechanism
Delete unused mockup caller
Change for REST architecture standard support.
Merge branch 'master' of https://github.com/necronet/XTrade
Create Signup and ForgotPassword activities
Add Gson library
Set bases for the REST handling calls.
Add info debug method when for static contexts
Create processor class for interpretate JSON data.
Handle result and construct pass over to the Processors
Change Databases properties
Rename Trader in DatabaseContract to TraderEntity to avoid confusion
Remove getter/setter and expose attributes as public.
Remove comment, Debug and import classes.
Merge branch 'master' of https://github.com/necronet/XTrade
Fixing contact update
Made the stats links orange
Made the bottom downloads link orange change
remove other excessive digits in numbers in the Astra routine
Save Views Ok
client shared: Improve [Dxml_utils XMLElementBase

Signed-off-by: Chris Evich <cevich@redhat.com>
Changing the ReadMe-file
added uuid index
download bugs
Add RelayController UPnP Device.
This is used to allow override control of the different relays that control the central heating system.
citations. Sometmes TEX gets stuck, revert the aux file if that happens.
Final commit from netbook
AutoSign.html
Add custom function
Merge pull request #4 from chipdude/topic/json_ptr

refine json even more
support g++4.4
memcache example
enumerate integer conversions.  it's the only way to be sure
Removed internals.h (bad practice, NEVER use 'using' in header, updated .gitignore to ignore binaries
Merge branch 'review/removeInternal'
surround doc
i guess..
center on space
Wqall
print date
broken crap for osx
Add Chemistry module
Adding in testing code
Add more test cases
Lastest modularized VTK ...
Wrapping ..............
Java wrapping progress ...
Lastest .....................
Progress .................
Modularized version of VTK master ...
Database original
Database tests ...
Views/Infovis  module .....
getting ready for couchdb external process, current script run with 3 arguments : the XML filename, the -l library_id flag and the -a authour flag, no default values
Graphite : separate graph for each metric on webui, include warn and crit thresholds on them
some style and info
added Ctrl+Enter
Add pending arg to override default 5 secs timeout before calling console after build.
Add module name prefix to test case names.
Migrated all tests to Buster.
Item6835: New TWiki Doc Graphics icon "twiki-help"

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23255 a00a5322-12db-0310-a70b-8735589c885e
Item6835: New TWiki Doc Graphics icon "twiki-help" - upadting manifest

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23256 a00a5322-12db-0310-a70b-8735589c885e
Provide a shards option to fabric:get_all_security

To trigger syncing security objects we want to be able to just compare
the local shard object to the remote. This change allows us to just
specify a list of shards to request so we don't needlessly get values
for all shards.

BugzId: 11602
Refactor fabric calls for security objects

Instead of relying on global consistency for success we relax
constraints to only require a simple majority of shards to return
values. In the case of set_security we also require that a complete hash
ring returned successfully before indicating success to the client.

BugzId: 11602
Merge pull request #60 from cloudant/11602-sync-security

BugzID: 11602
arreglado X,Y,Z,W accesorios
Fixed wrong display string for DHCPServerIdentifierOption
Fixed errors in set_option
Fixed junos incompability due to wrong order of options
Autocompletion when '.' is typed for golang file
Add template files
add a config option to enable pretty JSON output (disabled by default)
Merge pull request #137 from aronparsons/pretty-json

add a config option to enable pretty JSON output (disabled by default)
Handle crossrefs in bibtexparser
Importing data from crossrefs
added rudder and size to visualization
Merge branch 'master' of github.com:cole14/fishtank
Adding a testcase for R()
Reorganized js templates
Show loading text when loading next page
Show followed users in Following tab
Added send suggestion buttons next to list of sources and facebook pages
Redirect to user shared page instead of story page when the user creates a new post
Upgraded moment.js. Fixed timezone issues in events
Constant section working!
Const and variable sections working!
Working functions and procedure declaration
kbOp bricks and testSet bricks ordered by id asc
fix injection on anchors
further work on modal

different structures implemented in .../tests/modal.html for testing
added tests to .../tests/spec/modal.js
fixed typo/bug in .../src/patterns/modal.js
whitespace-cleanup
cleanup modal tests
move jqueryPlugin to attic - it does not work as planned
jquery.form declares now jquery deps - the jqueryPlugin did not work
aloha without loader
modal spec without boilerplate
merge jasmine-settings into tests/main.js
slim collapsible test
parser and inject spec tests
requirejs as submodule in /lib, plugins linked next to main

the plugins need to be next to the file loaded with requirejs
otherwise paths are messed up.
jquery linked to toplevel /lib
qunit submodule and test, currently broken
update to "fixed" qunit
added pavlov submodule with some custom matchers
switched tests from jasmine to pavlov
main-qunit -> main, remove jasmine, jasmine-jquery, SpecRunner.html
pavlov with support to display jquery objects
add jquery version of require.js, now optimizer works
Merge branch 'optimizer' of git://github.com/cornae/Patterns into optimizer
skeleton structure for the transformation
removed old tests
cleaned up the testing infrastructure
Document workarounds for using crafty-local in file:// setting.
Dom3d thought the camera was in the negative of its actual position. This is fixed.
Reorder and add Priority column
now we can get rid of non-noun words in the links
- Fix redirect to mail/compose on re-login (1488226)


git-svn-id: https://svn.roundcube.net/trunk@6128 208e9e7b-5314-0410-a742-e7e81cd9613c
Fix Reference issues
Bug 816563 - Getting FB contacts in Dialer r=jmcantera
Bug 799828 - [email] Add a missing parameter to scheduleMessagePurge. r=asuth, a=blocking-basecamp

Land squib's fix from:
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/98
Merge pull request #6978 from asutherland/email-fix-message-purge

Bug 799828 - [email] Add a missing parameter to scheduleMessagePurge. r=asuth, a=blocking-basecamp
Merge pull request #6970 from jmcanterafonseca/bug_dialer_end

Bug 816563 - Getting FB contacts in Dialer r=jmcantera, albertopq
Bug 820648 - Output the error for better debugging output. r=ferjm
Merge pull request #6981 from mrbkap/ftu-debugging-output

Bug 820648 - Output the error for better debugging output. r=ferjm
Bug 820554 - Add option to not run the FTU r=vingtetun a=vingtetun
Overhaul of block filtering and #parse_block.

For #86, #87.
Added test case for #88.
Rewrite maf_tile to use Access API for #82.
DOC: Forgot a rather important "no"
Introduced flat and sharp.
Removed excess blank lines.
Don't need modulation to take a scale as a parameter, because it's always major (so far).
Added pentatonic.
Fixed the starting point of the keys - was staring them on all diatonic notes by mistake.
No need to define C separately.
Added the diatonic scale - a bit of a trival one that
Restored UI for adding groups in the right sidebar
Updated Sympa URLs to use proper api/ prefix
A role must have an application
Added second test (failing!) and corrected a bug found when running the test.
Schema development and tidying. Basic forms and partials added to allow testing of Sigma calculations and data entry
-Cleanup.
-Moved the hidden-right-recursion fix related collections to a more appropriate location.
-Replaced the propagated prefixes collection by a bitset (to improve performance and reduce memory usage).
-Cache the expects instead of the method that retrieves the expects.
This should improve performance, especially for large grammars.
Added data types Symbol and Set
Merge branch 'more-datatypes' of git://github.com/Nix-wie-weg/ohm-contrib into symbol+set
Remove puts debugging in test.
sleep for a cleaner benchmark
added trollop for options and help ui
Compilation window tweaks + some other changes

Increased git line width to 72 chars
Made C-w do backward-delete-word (instead of kill)
Put back delete trailing white space
Compilation window tweaks - will disappear automatically on success
Cleanly remove spl-modules-devel headers

Add the /usr/src/spl-<version>-<release>/<kernel> directory to
the spl-modules-devel package.  This ensures that this directory
will be removed when the package is removed.

We do not include the higher level /usr/src/spl-<version>-<release>
directory since there may be builds for multiple kernels.  Instead,
a %postun rmdir is added which attempts to remove this directory.
It will only succeed when the last spl-modules-devel-* package
for this specific release is removed.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
SPL 0.6.0-rc10
Implemented the interfaces for management client; changed the type for the subscription ID from UUID to long
added the gist # back to name
First Commit
Merge branch 'master' of github.com:damaral/try_git
Ergebnis verbessert
Removed RavenDB.Abstractions.nuspec. Added RavenDB.Database.nuspec. Embedded Raven.Abstractions.dll in Raven.Client and Raven.Database packages. Let's see how it works out.
umm
Merge branch 'dana'
Merge branch 'dana'
took out the XML list because we are no longer using.
umm
Merge branch 'dana'

Conflicts:
	res/layout/activity_launch.xml
	res/layout/custom_row_view.xml
	src/com/team2/shopperhelper/SearchProduct.java
	src/com/team2/shopperhelper/SearchResults.java
	src/com/team2/shopperhelper/ShowStore.java
	src/com/team2/shopperhelper/StoreCustomBaseAdapter.java
Merge branch 'dana'
Merge branch 'dana'
yaya
Merge branch 'dana'

Conflicts:
	bin/ShopperHelper.apk
	bin/classes.dex
	bin/resources.ap_
	res/layout/readweb.xml
	src/com/team2/shopperhelper/Launch.java
	src/com/team2/shopperhelper/ReadWeb.java
	src/com/team2/shopperhelper/SearchForStore.java
	src/com/team2/shopperhelper/SearchProduct.java
	src/com/team2/shopperhelper/SearchResults.java
	src/com/team2/shopperhelper/ShowStore.java
	src/com/team2/shopperhelper/StoreCustomBaseAdapter.java
Modification:

Simplified the Search Store Screen. Now it will only list locations 
available (currently six for academic reasons). It is using a Spinner,
which is scrollable if we desired to add more stores.

Removed the ShowStore and associated classes.

Added functionality to the help button. Waiting for help text to put in
(user documentation as part of GP3)

Change SearchForStore. Right now, it is literally searching for store.
It will collect the integer from the position of the spinner, and put it
in the intent. This will pass the information to the next activity (now
ProductSearch)

Modified the Manifest to reflect removing Show Store.
Removed custom_row_view and readdb from the layout as they are no longer
needed.
err
Added HTTP code, but put in a hard code test as HTTP is not fully ready
yet.
0.1.0 ready ..

0.1.5 will be released with HTTP support.
Changed from using Intent to pass information back and forth to using
internal preference files. Once created in Store, it will write this
information and retrieve them in ShowStore.
Fixing a bug issue via Issue 6
changed version to 0.1.2. This is the LAST minor bug fix to be addressed
under version CodeName Dana. This is primarly the reason I am doing it
under master since this will be the branch off point for Codename Chuck
apparently the APK needs a commit?
Merge branch 'master' into dana
Update README.md

Fix misspelled `git submodule` command.
DELETE CASCADES added
Check delete account
Fixed Ticket #3876 (Error (double free) detected that can't possibly happen)
add: (quite decent) caching
update docs: mostly about caching
- solved position detection
no facet limit on advanced search (closes #117)
Adding a simple test suite
Adding disconnect handler
Adding debug
Fixing error message
pamats
do fav or not fav a image
Add FIXME about using ArrayBuffer.
Implemented an area system, where areas details, such as maps, are
stored as script attributes.

Replicated the map command from Latitude, including the fancy colored X
mark, by extending the room base class to include a map generator
function.

Updated the connection screen.
growthAchievementPlot bug fixes and improvements associated with character grade
gemfile edited for sqlite3 only on development machine
We had a production issue with Mango, that lead us to find this fairly subtle corner case. It is possible for two users to come to our site *at the same time* resulting in multiple concurrent requests to Mango. This leads to performance problems due to context switching. Python tries to optimize this (see, e.g., http://www.dabeaz.com/python/UnderstandingGIL.pdf ), but in a distributed system I don't think we can assume that all nodes are implemented in python. This patch fixes the problem.
Merge remote-tracking branch 'jkreps/master'

Conflicts:
	server.py
Beta 1
1. Pass restricted parameter to index to display message to users who are not logged in 2. Deleted extraneous code 3. Redirect logged in users to the dashboard to bypass the boilerplate index page
1. Added comments throughout 2. Improved error handling by directing users to restricted page
1. Improved error handling 2. Removed extraneous code 3. Updated profile function
Addition stylized elements and modified Bootstrap defaults
Removed Home link
1. Added logic to display message on index, directing the user to log in or sign up if he/she wants access to P!NG functionality (after redirect)
Beta 1
Removed profile link from user name to create a standalone View Profile link
Added alert message to display when users have no posts to manage
Beta 1
Beta 1
Improved submit buttons on index
Improved profile appearance -- MUST EDIT the display for other users' profiles
Beta 1
View to display error messages
add selective display toggle func
fix tramp backup directory.
Apparently it is possible to make gedit do a main iteration ! Thanks lmartinking!
date fields
naviagtion menu
upgrade bootstrap on 2.0.2
link -> button (to delete action)
Task_1

Binary operations
First backbone.js and handlebars.js progress:
 - load the .summary_table dynamically
Still working on assignment updated what I have, need to change attribute names and correct other errors
Many additions to parser
fix REST URI relations
Update project documentation with dharmafly docs rakefile
Update project documentation with dharmafly docs rakefile
Fix bug
Update project documentation with dharmafly docs rakefile
Rename TinySVG to Pablo
move sipx-openfire-presence-plugin.har in sipXcommons as is needed by both sipXimbot and sipXopenfire
XX-9966: Custom AA should be replicated lo ivr location when running on distributed

cfengine to replicate AutoAttendant custom prompts on slave machine with AA enabled
replication occurs when AA prompt uploaded or AA role selected
XX-10243 - add dep in network config tool
Merge branch 'master' of github.com:dhubler/sipxecs
XX-10243 - deps for system-config-network-tui  AND  upgrade to CentOS 6.3 because of perceived deps issues which were actually unrelated
Add park, page and imbot to group install
Removed fov output.
Create .gitignore file.
Added license URL to podspec
hold on im confused!
ugh
cleanup filters. no namespacing
asdf
remove some stuff
remove mash
builds
Update release notes for M4
new 44100Hz sounds for drum and snare. balanced, with panoramic and
tested to work well together.
refs #5
- fixed language urls SEO
Removing phpInfo file from repo, not necessary
Switch Dave's river json to the JSONP

+ techmeme river.
Make case-insensitive header comparison

Fixes varspool/Wrench#28
Add ascii and csv-mode packages
Add cyberpunk-theme
Use global-hl-line-mode instead of hl-line-mode in certain mode when window-system is not nil
Add ido-ubiquitous and golden-ratio packages
Replace shell-current-directory to shell-here
Setup mongolab database
Rewrote "The Idea" section.

It's still not an easy sell…
Xresourcefile added
bump the version number to release a clean build

Change-Id: I300e330421c290eeeee5c6ff1377f99463b30579
Add user_set_fields function

Affects #14673: LDAP login performs unnecessary SQL updates 

Conflicts:
	core/user_api.php
ldap_api: use only one SQL call to update user profile

Fixes #14673: LDAP login performs unnecessary SQL updates
Fix system notice in manage_user_page.php

Removed comments left by 93eb540134203400824233fc30ed10385d7c3f98
Add optional param to columns_get_standard() to return all columns

The default behavior is to exclude the fields which are not "active" due
to config settings. The new parameter lets caller override that to
return all standard columns (ie. excluding custom fields).
Whitespace changes
Install helper api - new function install_set_log_queries()

The new function is used by install/upgrade callback functions to ensure
that only the relevant queries are logged. This avoids code duplication
in each function.
Add upgrade step to replace truncated custom field names in history

Function custom_field_get_id_from_name() contained code to check for
truncated custom fields names. This dates back to when the history
table's field_name column was only 32 chars long, whereas the custom
field's size is 64.

The history's field_name size has been increased to 64 since 1.1.0a4
(see issue #8002), so the check has been removed from the code and
replaced by an upgrade step (calling new install helper function
install_update_history_long_custom_fields(), which converts legacy
history entries storing truncated custom field names by their expanded
full name.

Fixes #14650
Fix SQL error when sorting by custom field containing special char

Incorrect behavior is due to unnecessarily escaping of special chars by
calling db_prepare_string() on the custom field's name before attempting
to retrieve it's id with custom_field_get_id_from_name(). This causes a
double-escaping which prevents a match.

Even though this is not strictly necessary to fix the issue at hand,
this commit also replaces db_query() call by db_query_bound() in
custom_field_get_id_from_name().

Fixes #12170
add catalog function
add navigation to catalog
accomplish the getCatalog method
Disabled marshalling testing since it's not needed anymore
(cherry picked from commit 7bdf0f79b8e3cf2a6a3652a1be8067cf0e7a13fd)
bugfixed, add env variable in output data. finish the base views
add administrator control panel's file, update the handler and statics file
Fixed Josh's link
README - tested python versions
fix failed SSL handshake cleanup
update the facebook-php-sdk to version 3.2.1
quick update to beta2 to reflect new facebook SDK version
Moved city images to a subdirectory.
Fix sint32 write
Jasmine Skeleton

A Jasmine test skeleton is created in the project directory.
Libraries references

The libraries used in the development of the PongJs example
are included in the SpecRunner.
Ball spec started

The specification of the ball is started.
SpecHelper.js introduced

In order to leverage the expressiveness in the specifications a
SpecHelper.js is introduced.

The SpecHelper currently provides a convenience method for determining
the position of the a Ball.
Ball's default velocity

A ball has a default velocity which is specified in the BallSpec.js.
BeforeEach introduced

An beforeEach is introduced which creates a Ball.
Ball Update introduces

An update function is introduced on the ball object.
Velocity reflections

It is possible to reflect the velocity componts along the axis.
Pong Namespace introduced

The namespace Pong is introduced to contain the various elements
in this example code.
double signals * 1000, better acceptTrackEvent debug
Add TestFlight, better refactoring.
FlxSave now works on mobile devices
Story #3 finish model logic
Merge branch 'master' of github.com:eXcalibur/Scale
CMake: add missing check for Subversion and a non-empty SVNVERSION before getting the branch

git-svn-id: http://eathena-project.googlecode.com/svn/trunk@15138 54d463be-8e91-2dee-dedb-b68131a5f0ec
Criando local_settings para armazenar comandos proibidos na query.
Criando método que verifica se a query não possui nenhum comando ilegal.
Adicionando validações para query.
Mostrando o botão de run de query apenas se a mesma estiver ok.
Alterando a exibição da ação 'run'.
Adicionando documentação do sql_statements_not_allowed.
Corrigindo regex.
Fix para visualizar a query.
Merge pull request #1 from sievetech/feature/query_validator

Feature/query validator
seed method! dangerous!
Making scripts more portable
fix Buession::getInstance bug & fix config bug

Change-Id: I5dc7188cbdd37de667451b1e99e230411bde0190
Added bash_profile
Changed .bashrc
Updated main
Merge pull request #1 from zakinster/master

Updated main
version bump to get hackage docs to build
dep bump
t2bw added
range 1e-3->10
remove preliminary from stamp
new t2bb signal model
new naming
make process stamp pick up signal model
Proper process stamp
remake limits
use new signal model
no mult in GeV
tight bounding box and stamp process not title
L=lumi, n_b -> n_b^reco
fix legend height
CLs -> CMS, L=lumi
remove preliminary
Merge pull request #186 from elaird/prelim

remove preliminary
L=
update process stamp method
toy chi2 prob program
fix typo
debug printout for StdInvHyp test
print UpperLimit graph
T1 and test points
dump ewk
toggle mode
sms xs
2011 as comment
rework options for poisson pulls
Removed local total-removed variables
Some fixes for opensuse build
Removed old EvaConfig.xml and elision.core.
Switch to use instead of behavior.

This will allow us to do more complicated setup stuff for tasks in the
future, such as a task utility module by default.
Made flag parsing output even more consistent.
Removed GLFW_ACCELERATED window parameter.
Use OpenGL to get default framebuffer properties.
Merge branch 'master' of github.com:elmindreda/glfw
Merge branch 'master' into EGL

Conflicts:
	src/internal.h
	src/opengl.c
	tests/glfwinfo.c
Removed EGL-specific context param refresh.
Fixed bad editing in Cocoa joystick code.
Trying out some bootstrap, which requires a jQuery upgrade. Also shoving js loads to the bottom of the page.
Merge branch 'fandom-pages' of github.com:elzj/otwarchive into fandom-pages

Conflicts:
	public/stylesheets/sandbox.css
* helm.el (helm-execute-selection-action): Renamed to *-1 and vice-versa.
Fixed spamming.
Got a set string passing properly.
Gitignore.
Gitignore.
Now have a command sender which is wrapped into python. Kind of buggy.
Fixed stupid bug.
Robot says hi.
Decided exec more appropriate, killed some prints.
Figured out how to stop errors from being devastating.
Made printing better.
Cleaned up printing, caught another exception.
Merge branch 'cmds'
Fixed accidentally deleting gitignore. FML.
Merge remote-tracking branch 'nbites/master'
Merge branch 'test'
Fixed conflicts with master.
Merge remote-tracking branch 'nbites/master'
Merge remote-tracking branch 'nbites/master' into cmds
Merge branch 'master' into cmds
Added comments to command sending code.
Win-64 support
Update zlib for windows
[bucket] Implement factoid searching
Project file cleanup. Run autogen.sh to generate the files.

Signed-off-by: Emerson MX <emersonmx@gmail.com>
Observe DNT header
Revert "SSL tickets page when required for GoCardless"

No reason not to switch the whole site to SSL.

This reverts commit 8a20d7b2c651c4ed53cbce0696ee56fbc81337b5.
Add rename option for DNS records

This option will make renaming DNS records much easier.
Add a unit test for this new functionality.

https://fedorahosted.org/freeipa/ticket/2600
If SELinux is enabled ensure we also have restorecon.

We don't have a specific requires on the policycoreutils package. It
gets pulled in as a dependency on the server anyway, but checking
there is like a belt and suspenders.

On the client we don't require SELinux at all. If SELinux is enabled
however we need to set things up properly. This is provided by the
policycoreutils package so fail if that isn't available.

https://fedorahosted.org/freeipa/ticket/2368
Move install script error handling to a common function

All of our install/admin scripts had a try/except block calling the
main function and handling common exceptions. These were copy-pasted
from each other and modified to various levels of sophistication.
This refactors them out of installers to a single function, which
includes a final pass/fail message for all of the scripts.

Non-install scripts that set up the same log handler levels for
stderr and log file are not changed, as it's not possible to log
to only the logfile without changing the logger configuration.

https://fedorahosted.org/freeipa/ticket/2071
setting up a test page
Add define for pin 18 and 19 in pin_to_port and pin_to_bit_mask.
Merge pull request #108 from energia/issue_108

LaunchPad pin 18 and 19 are not defined
LiquidCrystal: Minor fixes and circuit update in Sketches.
Merge branch 'master' of github.com:energia/Energia
Nachmeldung für Gangnam Style: sommersprosse

my.mods.de/sommersprosse
moved temp.css.scss => main.css.scss
Using query.exec() now instead of run().
update vim-coffee-script
Update Gundo
Update stylys
Adding vim confing to dotfiles
added tests and UC Move
fixed parametert from 0 an 1 to 1 and 2
fixed conflicts
Project Pieyr - initail
Trim leading and trailing quote from TXT record. Needed because Amazon Route53 requires quotes around the content of TXT records.
Worked on app modules.
...
merge with master
correctifs
correctifs
merging ...
Intgration ajout annot
..
...
...
Merge branch 'master' of https://github.com/esi3G12/MarkESI
Catering to machines with older Python versions.
Centralizing the pager alias.
Paging trees.
gui updated
r
DEG
.gitignore
open menu by .content, not .idea
When closing an edit form, show only the content
Fixing css build error
having two requestTimeout configs is cumbersome
Merge pull request #561 from nire/ahc_timeout

having two requestTimeout configs is cumbersome
Added update function (still testing)
Adicionando servico de ranking ordenado
PLF-3790: Delete aladin in namespace
ajout de HELPportlet dans l admin toolbar
ajout de HELPportlet dans l admin toolbar
ajout de HELPportlet dans l admin toolbar
ajout de HELPportlet dans l admin toolbar
Switch to feature/Help
Switch to feature/Help
Implement POC for Help portlet Feature
Implement POC for Help portlet Feature
Implement POC for Help portlet Feature
PLF-3858 : Implement help portlet in the top navigation bar
PLF-3858: implement POC for helpPortlet
PLF-3858: implement POC for helpPortlet: update resource bundle
PLF-3858: Implement POC for Help portlet Feature
Merge branch 'feature/Top-Navigation' of github.com:exodev/platform into feature/Top-Navigation
[ignore] added whitespace
Fix to datetime string value recognition.
Further optimise wmsFeatureInfoAlias to try and avoid repeated free/malloc cycles
tidy up indendation
Process php-short-tags
Add executable to repo
Typo.
Fire up the backlight.
Add bluetooth info.
Let's get dizzy.
add PKGBUILDs
ACRA Update
Merge branch 'master' of https://github.com/AndlyticsProject/andlytics
ACRA Update Merged with master
Cleanup
Added Changelog screen which pops-up at initial install and one time after every update (new release)
Merge pull request #53 from AndyScherzinger/master

Changelog install/app-update
pixel perfect fix
Merge pull request #54 from AndyScherzinger/master

fixed pixel perfext xhdpi icon
show shutdown time
Test implementation of custom date sorting
now?
merged
Merge branch 'master' of github.com:fgeorg/lipsynch
Merge branch 'master' of github.com:fgeorg/lipsynch
blegh
Check for `rppr` install in tests

Skip some rppr-dependent functionality if not in PATH
Plan and Kolejnosc stubs.
Fix bug with spy.logRow not being defined.
Merge pull request #25 from NikhilVerma/master

Please review my pull request regarding spy.logRow
Fixed disabled panel description layout
FBTest for issue 5400
FBTest for issue 5544
Merge branch 'master' of github.com:firebug/firebug
修改揽件信息详情关闭窗口的方式
Merge branch 'master' of git@github.com:firefoxmmx2/jdy.git
~ Added ifndef protection to transaction.hh
.gitconfigを除外するようにした
Added Leonardo to Boards.h. Changed example files from .pde to .ino extension. Added link johnny-five javascript client in the readme file. Increased bugfix version number to 2.
add: error flash if invalid linked cse
don't do coerage for uncovered files, otherwise it breaks if you don't have twig installed
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
[lib/ocaml] use ocaml Http_client from netclient lib to download files
* used e.g. to dowload tiles
* raises Blocked if we get a 403 and raises Not_Found on a 404,
  only if we get a Not_Found we try the next zoom level
* in case we get blocked, it still tries the next tile...
  maybe we should stop trying to get tiles at all in that case
[lib/ocaml] removed superfluous flush, prerr_endline already flushes
Merge pull request #276 from flixr/http_ocaml_netclient

[lib/ocaml] use ocaml Http_client from netclient lib to download files
[conf] removed dead gui.xml
[baro] baro_board_module.c was missing, sorry
Merge remote-tracking branch 'paparazzi/master'

Conflicts:
	sw/airborne/modules/sensors/baro_board_module.c
[baro] add a new i2c baro sensor (HCA)
[stm32] Fixed BMP firmware upload reset when using luftboot.
[fix][fixedwing] fix GPS_LLA message
[conf] ins_hff includes all ins files, not only the hff files.
this is more intuitive and nicer than having one ins without type
and one ins subsystem with type hff
added BlackMagicProbe upload scripts
[sw/ext] specify libopencm3 include dir for luftboot
[sw/ext] update luftboot submodule with src/luftboot added to gitignore
[conf] slightly easier configuration when using BlackMagicProbe
if FLASH_MODE=JTAG and BMP_PORT set, use jtag via bmp
if FLASH_MODE=SWD use that via bmp, print error if BMP_PORT not set
simplifly Makefiles a bit, use ?= instead of ifndef
[conf] set /dev/ttyACM0 as default BMP_PORT if FLASH_MODE=SWD
added compass and .settings to gitignore
[fixedwing] fix typo in attitude stabilization
was within an ifdef STRONG_WIND, and hence not recognized earlier
[dox] add some defines to Doxyfile
[conf] some cleaning, moved Poine airframe files to obsolete
just a quick script to print folks on the waiting list
Updated template and login
ignore the "bin" folder
Start what's cookin' for episode 26
Update master
Merge pull request #20 from obfuscurity/patch-4

Update master
add some more info to the hangouts script and break it up into 'Bs' and 'Ns'
fix for windows raising a WindowsError exception when rename fails
added separate tracking of stale types to graphs
added stacked graphs
fixed block hash format specifier for when block submittal is attempted with no bitcoin connection
Item11955: Fix '5.8.1' < 5.7 non-numeric compare

Funny, RCS is now up to 5.8.1, so apparently this bug was lurking for a
while

git-svn-id: http://svn.foswiki.org/branches/Release01x01@15028 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11983: from this series of unit tests, it seems that the extra newline is coming from outside the set&get EmbeddedStoreForm, and probably outside the Store alltogether.

   Crawford, can you poke holes in my tests and see what has actually happened?

git-svn-id: http://svn.foswiki.org/trunk@15392 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11728: fixing WikiGroup css being added multiple times to the head



git-svn-id: http://svn.foswiki.org/trunk@14556 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11891: move CRUD rest handlers to their own package

git-svn-id: http://svn.foswiki.org/trunk@14917 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Small fix to https://basecamp.com/1926109/projects/933236-unikicks-ru/todos/17108116-5-1
new event gestures