labofsahil/github-event-dataset-2012 huggingface dataset:
update performance test template to use test method
Add documentation for create_with
Add documentation for arel and build_arel
Add nodoc to create_with_value

Reason: all *_value methods are defined dynamically and so don't appear
in the documentation.
Add documentation for query_methods bang methods
Typo
Don't link to edgeguides in docs
Add docs for Relation initialize, create and create!
Fixes "Cannot visit ..." with validates_uniqueness_of

Fixes issue with overrding ActiveRecord reader methods with a
composed object and using that attribute as the scope of a
validates_uniqueness_of validation.
Fix class_eval without __FILE__ and __LINE__.
Merge pull request #7072 from beerlington/fix_validations_with_scope

Use database value for uniqueness validation scope
Merge pull request #7076 from kennyj/fix_class_eval

Fix class_eval without __FILE__ and __LINE__.
Log query plan when we use count_by_sql method.
Add support for optional root segments containing slashes

Optional segments with a root scope need to have the leading slash
outside of the parentheses, otherwise the generated url will be empty.
However if the route has non-optional elements then the leading slash
needs to remain inside the parentheses otherwise the generated url
will have two leading slashes, e.g:

Blog::Application.routes.draw do
  get '/(:category)', :to => 'posts#index', :as => :root
  get '/(:category)/author/:name', :to => 'posts#author', :as => :author
end

$ rake routes
  root GET /(:category)(.:format)              posts#index
author GET (/:category)/author/:name(.:format) posts#author

This change adds support for optional segments that contain a slash,
allowing support for urls like /page/2 for the root path, e.g:

Blog::Application.routes.draw do
  get '/(page/:page)', :to => 'posts#index', :as => :root
end

$ rake routes
root GET /(page/:page)(.:format) posts#index

Fixes #7073
Add join table migration generator

For instance, running

    rails g migration CreateMediaJoinTable artists musics:uniq

will create a migration with

    create_join_table :artists, :musics do |t|
      # t.index [:artist_id, :music_id]
      t.index [:music_id, :artist_id], unique: true
    end
AR::Integration must be included after AM::Conversion

Integration's definition of #to_param must override
Conversion's. Otherwise, there is a regression from
3.1 in the behavior of a non-persisted AR::Base instance
which nevertheless has an id.
Merge pull request #7081 from jfirebaugh/to_param_regression_master

AR::Integration must be included after AM::Conversion
Improve docs for AR Relation
Fix typos and add nodocs to NullRelation
Add nodoc to HashMerger and Merger
Add exploratory tests for river.
Add fancy-pants routing keys for river
Uncomment a pending test in river
Clean up the routing keys in river
Tweak the routing keys for River
Remove experiment from river
Add river query keys
Move rabbit-dependent tests into integration dir
Include river in pebblebed requires
Clarify rabbit queues/exchanges behavior
Try to untangle spec config/dependencies.
Don't purge in production. Ever.
Update specs for river
Make river an actual class.
Merge branch 'master' into a-river-of-bunnies

Conflicts:
	spec/connector_spec.rb
fixed deprecated theme functions for wordpress 3.4
Enter capability mode earlier.
Set output_fd on uncompress.
Move libcapsicum candidates to their own file.
adding bootstrap, hgrc and muttrc
updated dependencies in RProfile
Updating Sat Jun 23 00:00:01 UTC 2012
Save email if not exists if user is authorized
Version 1.4.0. Changelog
Fixing a few typos. I CAN ENGLISH HURR DURR
data validation 140
Added index.php
New email templates, integration with Mandrill, all passwordsconverted to salted hashes
Added email template folder to git
Updating easytags options.
d repeat
adding repeat
d salt
adding salt
Changed name to translatex
Deleted old files, deleted moved files.
Added #define-Wizard.
Re-added camera controller.
Added MVR #ifs.
Added VrController and VrInteraction scripts.
Added 'Requirements' section to 'README.md'
add files
Merge branch 'master' of https://github.com/birdroidcn/beauty
Fix some compass issues (thanks to epegzz)
compact layout fixes
Merge branch 'bootstrap' of git://github.com/blueriver/MuraCMS into bootstrap
Merge pull request #525 from stevewithington/bootstrap

compact layout fixes
知道创宇笔试题之爬虫
Oh, I removed -fPIC in my last atlas commit. I didn't mean to.



git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33790 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Fix mlton build: apply Marc Weber patch and update download URL.

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33882 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Conditional formatting, first working version

* for now, only fonts and its colors are modifiable, where blue is
the only color available.
Include gcm urls
Update README.md
Merge branch 'master' into muc
Load colours from preferences
Added basic colour preferences loading
Loading all colour prefs
Added offline message colour preference
Added remaining basic terminal colours

Added bar_text style
Added remaining colours
Update npm url
Deleted crappy bosco's paragarph from web-interface section
More search page tweaks.
Plant info page tweaks.
Calendar tweaks.
Added quick paper on model fitting.
Added the Stealth DHT line of research.
Some README formatting.
Fixed "My Dibs", hell ya
Removing ignored bundle directory
Added width/height attributes to application.coffee
remove dependence on git flow
Implemented bootstrap method for Rackspace Compute v2.
Added ability to set "metadata" and "personality" fields when creating a server on Rackspace Compute v2.
Improved response parsing when dealing with Rackspace DNS service.
Merge remote-tracking branch 'upstream/master'
Removed the commented out password setting line for Rackspace Compute v2 bootstrap method.
Clarified the logic for finding the newly created DNS record for Rackspace Cloud DNS.
[Docs] Switches to using Yard for documentation

This replaces RDoc as a developer dependency with Yard to allow
use of it's tags to be more declaritive with documentation.

The Rake task for generating and uploading API docs to fog.io has also
been updated.

References #1249
add support for Storage::Rackspace::File#access_control_allow_origin and #origin

Support Access-Control-Allow-Origin and Origin headers, borrowed
testing ideas from pull request #1251
add support for Storage::Rackspace::File#access_control_allow_origin and #origin

Support Access-Control-Allow-Origin and Origin headers, borrowed
testing ideas from pull request #1251
Merge origin
Adding explicit support for metadata for Rackspace compute_v2.
Merge pull request #1255 from fog/yard_docs

[Docs] Switches to using Yard for documentation
[Brightbox] Removes incorrect yard tag
Merge pull request #1261 from heyryanw/master

Support for metadata in Rackspace compute_v2
Merge pull request #1256 from brianhartsock/master

[dns] Add more record tests
Save the file instance before testing for presence of attribute
[aws|compute] add offeringType to output from describe_reserved_instances_offerings
Removes dead link to DNS tests

fog.io documentation had an outdating link to examples.

Closes #1198
Merge pull request #1265 from fog/1198_remove_dead_link

Removes dead link to DNS tests
Merge pull request #1260 from dustacio/rackspace_access_control_allow_origin

[storage] Rackspace Access-Control-Allow-Origin
Merge remote-tracking branch 'scotje/master'

Conflicts:
	lib/fog/rackspace/models/compute_v2/server.rb
Created a page.tpl.php file out of my markup and put in the basic php variables. Reduced the list of regions in the .info file and made a few css tweaks. Things are coming along!
rename esb recipe to jdbc_standalone
Fix bogus call to createUserObject
Require explicit python2 executable
Fix bug in EndBatch
Partially converted comments to jsdoc syntax.
Will still need to fix formatting at some point.
Added range checking of utf-16 strings in utf8.encode
Moved checks for 'strict' mode to beginning of conditional statements.

This may provide a negligable speed improvement but the main reason is probably OCD
Added two getters in level map
no more errors in ai
changed dumbAI
Merge branch 'master' of http://github.com/byang223/TurnBAPI
Added StrikeTemperature
firt stable release
Change up the failure graph args
no longer needed
need to go back and recover get_Da
code is looking a whole lot cleaner now.  still needs work
more updates to mailchimp notifications

added notifications for adding users to groups and modifying user
mailchimp groups

began moving 'Add Contact' to modal
fixed lvl 7
Flag! in window static opcall
Advanced search correctly displayed
Styling for advanced search
Header style
Basic tools for map (navigation)
script skell
fix usage()
clean + more accessible for api
multi select by default + fix multi delete
change: canopsis user and root user have the right group now
change: clean some group name + cps_view to canopsis groups
change: improve canopsis user update
bunch of fixes
add support of admin_group in check_right ui
 add group. for all admin_group (fix)
Add get with multi ids
Merge branch 'develop' of forge.capensis.org:canopsis into develop
Cleaned up output.html
manual updates

Signed-off-by: drsii <dan.syme@gmail.com>
Fixing headings and lists
Merge branch 'master' of github.com:cashaffer/OpenDSA
Merge branch 'master' of github.com:cashaffer/OpenDSA
Minor fixes to haiku.css to make it play nice with JSAV
Replaced $name with $username to avoid WP conflicts
Merge pull request #6 from catalin-/master

update remoteswarm test
Created Polls app and added models
Again trying scipy
removed examples
removed memcache configuration
removed memcache configuration interface
renamed cache null provider
added PHPUnit autoloader
refactored cache component
added doc comments
renamed files to match coding standards
refactoring cache compenent event related classes
refactoring cache manager for single responsibility
added event listener structure
refactored cache component listener
added missed comments
refactored event interface and implementation
refactored interface description
added a process list to memorize processed events
refactored local cache converted to a memory provider
added flush method to memory container or a more general usagepurpose
refactored event component for single responsibility behaviour
code refactoring
Fixed i element form italicizing the icons in Firefox and also fixed the table-cell parent and absolutely positioned children with 100% width bug in Firefox.
Made Event implement StatEvent, and all analog steps.
Editing layout to repositioning EditText and Button correctly
Allowing multiple lines when editing a quote
Adding gitignore to ignore bin folder
-modify gsmopen config
Update ami after rc.local changes
Fixed the network bugs, specifically the one where about half of the messages weren't being received clientside. Yeah, that one.
Update README.md

Add link to chaplin boilerplate application based on rails
Merge pull request #308 from denikus/patch-2

Update README.md
Borrow delegateEvents and undelegateEvents from Backbone
Terms can't be sorted in Py3, so don't use sorted() to do set comparisons on them
add clarifying comment and remove TODO
Adds sample metadata file of Metamorphosis book
Parsing of metadata with models for book, date, identifier and person
Add Crossing the Bar.
wscript: build without shared library
add a test command to npm
add .gitignore file
Merge pull request #6 from booo/master

Make the install process a little bit easier
ignore *.DS_Store  (FileSystem-Datei von Mac)
Merge branch 'master' of https://github.com/chrisgwerder/Elo1
Basic layout added MVC/WebApi
removed pdb
Custom SHKCostomFormControllerLargeTextField
Merge branch 'master' of github.com:chuanhao/ShareKit
add try except on socket.create_connection and some control for creating
connection
Add KeyInterrup for 1st and 2nd Server
criando diretorio Joomla
Экономика: лекции 06 и 07
Current retorna con los 2 tipos de claves cuando se usa el header
Primary framework script processing added.
commit - .Xresources and my OB Configs
name of the game is hudln
travis: fix source path
I have tried to write a registration and login sites
Highlight current node
Updated

I still do not like markdown
Update notes for submitted changes

* bat drain test
Merge pull request #1 from cnaude/master

Added more character codes.
Update src/me/modwizcode/plugin/colorCom/ColorCom.java
Updated with escape code.
Added testing for colors. Need to update both methods though.
Added plugin.yml to source.
Removed deprecated PlayerChatEvent
Updated images path to match linux-sunxi github repos
fixed #1179: popup message box when invoking CCAssert on Android
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1179_CCAssert
fixed #1179: remove test codes
Merge pull request #858 from minggo/iss1179_CCAssert

popup message box when invoking CCAssert on Android
fixed #1268: Testjs will crash after clicking the close button on win32.
Also, fixed a bug in CCTextureCache::~CCTextureCache().
fixed #1268: use delete[] to destroy array.
Merge pull request #930 from dumganhar/gles20

fixed #1268: Testjs will crash after clicking the close button on win32.
fixed #1433:remove fpsxxx.png in win32 template
Merge pull request #1200 from minggo/iss1433_remove_fps_png_in_template

fixed #1433:remove fpsxxx.png in win32 template
Created 0.0.2
ArenaWatcher: new options and cleanup.
Large Scale Commit, huge additions to crawlers.py, and base/home.html
Fixed bugs for the popover button.
added jsScript api
Irresponsibly large and incomplete commit comprising failing tests and the move model.
Removing old board implementation.
removed newlines from description in rsense-pkg.el
zshrc: add git completion file enumeration speedup hack

This adds an overridden implementation for __git_files which should speed up
enumeration of files.  The source of this change is a blog post read at
http://talkings.org/post/5236392664/zsh-and-slow-git-completion
vimrc: iab #p #pragm
gitconfig: header
Fixed typo
Merge pull request #1192 from michaeldewildt/patch-1

Fixed typo
Update deps
Do not check for changes if there is no vcs dir

In case the package is in a broken state we do not want to show diffs from the main project
Enforce UTC on all datetime instances, set lock release date to datetime always, refs #923
changed string to match authorization errors
Merge pull request #750 from GordonSchmidt/master

SVN Auth doesn't work with german svn errors
ct_profile.sh -> info message added
Limit feeds to ones that you control closes #139
Nightly commit for Dec. 3, 2012.
Added = and == for Matrix.cpp and Added matrix_unittest opperations
MB-6638: use fork of file_sorter that doesn't use compression

We've found that file driver may close underlying file (either OS file
or gzFile) well before async read on it is done. With real OS file
that's mostly harmless, and kernel will synchronize racing close and
read (or any other syscall for same fd) and read will either succeed
just before close or it'll get EBADF (well, or read some other newly
opened innocent file).

But gzFile doesn't have any synchronization. So attempt to read it
concurrently or shortly after close may cause lots of problems.

Given we don't really use compressed feature of file sorter I'm just
cutting out one small piece of it that's using this efile feature.

Entire file_sorter.erl is forked inside couchdb source tree and single
change is made. It removes compressed option in file:open call in
read_fun.

NOTE: file_sorter.erl is building improper lists which dialyzer
authors choose to dislike. I had to disable that somewhat questionable
warning in order to keep code dialyzer-clean. "Fixing" file_sorter.erl
is IMHO not an option as we want to keep it as intact as possible.

Change-Id: I8ded572c18e236661d5b7df2a780c8f293fc689d
Reviewed-on: http://review.couchbase.org/23555
Reviewed-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
Reviewed-by: Filipe David Borba Manana <fdmanana@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Bug 816565 - fundraising takes over all three promo slots for the final week
Removed menubar/menu/menuitem
Fix bug 815731 - adding a page at /itu/
Merge branch 'rossbruniges-bugzilla-815731'
Bug 750912 - Manually updating home page news items
Merge branch 'master' of github.com:mozilla/bedrock
Fixing the URL - now got 29 instead of 30 as the launch date
Merge pull request #506 from rossbruniges/bug-816559

Fix bug 816559 - Fix the blog URL
Merge branch 'master' of github.com:mozilla/bedrock
Update apps/styleguide/templates/styleguide/identity/firefox-color.html

Fix firefox orange swatch hex color
Merge pull request #508 from groovecoder/patch-2

Update apps/styleguide/templates/styleguide/identity/firefox-color.html
Merge pull request #489 from icaaq/remove-menubar

Removed menubar/menu/menuitem
Merge pull request #504 from craigcook/home-news-update

Updating home page news items
Merge branch 'master' of github.com:mozilla/bedrock
Projekt erstellt
Merge branch 'master' of https://Corrison@github.com/crazysaem/easy-pc.git
Merge pull request #588 from kachok/master

missing feature in mturk/register_hit_type method
Merge pull request #641 from tpodowd/rework-bucket-logging

Reworked the bucket logging api/implementation a little.
Merge pull request #628 from agiliq/master

FPS API 2010-08-28
Reworking the Item object a bit to keep it from doing unanticipated things with hash_keys, range_keys and the attrs dict.  Closes #587.
Fix so the item_count and size_bytes properties no longer give KeyError on a new Table.  Closes #642.
Forgot to add table.py to that last commit .  Closes #642.
A few stragglers prior to branching for new release.
Merge branch 'feature_swf'
Changing version tag in master to denote it is now 2.3.0-dev.
Merge remote-tracking branch 'upstream/master'
Stupid name convention
fixing timeout from dns resolver
FormacionesTable

se crea una clase de formacionesTables para separar la tablas y los
campos verdes (de prueba)
adds rdebug
removed unnecessary files from irbrc.d
Added a SCSS file
Added some partials to the application layout
finished setting up I18n for static pages
created a category controller
included newlines on client errors, fixed extra newline issue
Added git_links.txt
Completed toolbar. Previous extent and next extent are now working.
Merge pull request #32 from csmeder/master

Added player dies message to chat log!
added chat message when a player changes his or her name. Refactored some of the code to group like functions in simpleClient.hmtl
Merge branch 'updateName'
version2

version 2
Merge pull request #17 from kumar303/exit-status

Make compress_assets exit non-zero on errors
update yuicompressor to 2.4.7
Merge pull request #18 from jlongster/master

Update yuicompressor to 2.4.7
Don't hang waiting on input from stdin with incorrect MINIFY_BUNDLES, raise an exception instead.
Merge pull request #27 from nickolay/master

Don't hang waiting on input from stdin with incorrect MINIFY_BUNDLES
tell us the arguments of failed commands
deaths as observables
tested mail
CyberCBM: Build Files added for other platforms
CyberCBM : Added pages to add data in website ....
improve jython detection. close #4
Minor cleanup on SimpleCollectionViewSpec
Simplify test Makefile.am and remove check dependency

Now we could run unit-test anywhere. Just |make check|
Remove old test supporting files
Fix genkeystroke build with newer automake
Merge latest version
[Issue #42] Update parking index view
[Issue #64] Refactor authenticate method to be more readable
Changed the way that backgrounds work.
Added some new background images.
Now backgrounds are handled by one class, BackgroundHandler,
instead of having MainClass handle it with two Background classes.
Also now I have 3 layers of backgrounds, which should scroll at different rates.
I haven't added any new images for different layers though, so that isn't implimented.
It is functioning though I think.
Cart fixes and enhances
DurationSecValueType#getにおいて、DB上のint値が負数の場合にIllegalArgumentExceptionが発生するバグ修正。この負数の場合は Duration#NONE を返すように対応。
add TimePointLabel constructors
add JSR-303 validator implemations
Merge commit '724eba2'

Conflicts:
	src/main/java/jp/xet/baseunits/mirage/DurationSecValueType.java
fix typo in IntervalComparatorLowerUpper
enhance RelativeTimeLabel to use IModel to get timezone and config
Start to move event processing logic to GeoChat.EventProcessor
responsive bootstrap moved down to support my phone and tablet viewport widths
Add .h Files
Deprecate old establishment search viewmodel javascript file.
Bring in People entity aggregate.
Bring in LooseFile entity.
Bring in InstitutionalAgreement aggregate entities.
Add object relational mappers for newly added entities.
Add entities and object relational mappers for Activities aggregate.
fix view caching in production mode
issue #14: createBootstrappedSamples() function created and working
issue #14: added 'copy files' in the project target, datasets are added in the source tree too
issue #14:  added a few macros and overloaded << operator to easily print complex datatypes for easy debugging
- Checking pushing
cleanly detect attempts to add duplicate repo problem tags

Report a meaningful error message in this case.
working on allowing repository users to tag exercises

Not quite working yet.
Merge branch 'master' of git@github.com:daveho/CloudCoder.git
Fixes image scaling for custom resolutions

Original code used division from __future__
remove xmledit for now
Added Cluster Class
updating the gitignore settings
take 2 at multiple test assemblies in 1 mstest run by convention
progress, but still no luck.
changed assets config
Merge branch 'master' of https://github.com/davidsevcik/mixit
Merge branch 'master' of https://github.com/davidsevcik/mixit
Merge branch 'master' of https://github.com/davidsevcik/mixit
added xml examples for rest service, fixed cart model
Merge branch 'master' of https://github.com/davidsevcik/mixit
fixed price formats, refactoring
Introduced a log console to the webpage.

Now errors are displayed directly on the webpage
avoiding the alerts on every device that 
subsequently would need clearing.

The following functions are also now available for
custom logging to the webpage:
 * log.info()
 * log.error()
 * log.warn();
 * log.trace();
 * log.debug();
arg
arg2
Fixed some mistake.
Varis bug fixes for trading
Got some pulsation
Merge branch 'master' of github.com:deckman/unitymidi
Fixing issues from jshint
added release notes for tools4j-config
logging through log4r
Minor news format edit
Stylize portfolio
Minor style editing
Link social network icons to correct sites
Move SASS to development group in Gemfile
Move HAML to development group
Added idl support status
adding Fields to Feature
invalid maf file, mafValidator to the resuce.
assertEquals order correction
Updated TradeSession and removed comment from InventoryClickListener
Add orders orders_lines and relations
Add test report config app.yml file
ADDED: Added media query types.
popoverに成功したテストを表示しないようにする

以下の2つのコミットをrevertした。
"popoverに成功したテストも表示するようにした"
commit 4c4d95ad0d2621c9272eb58ceafdfd9287002aee.
"popoverのテスト結果表示の誤りを修正"
commit fa09057dccf8b3bbe8de1dab43954edc40bd0fb3.

スコアボードは実装の進捗や達成度を表現するものではなく、
実装に誤りがあるかどうかを表現するものであるため。
Refs added.
added solution for 03_reverse_complement
Fixed selection with disabled items
Border selection fixes

* Regarding minimum drag size before the border selection starts
* Fixed exact screen location of the selection rectangle
* Added mouse capturing to allow dragging the rectangle everywhere
reset values in clear function
small fix for jasmie that works in chrome and ff
try reconnecting after every cuke for postgres only to try and deal with travis issues
add bootstrap tooltips for great justice (and clarity) [ci skip]
Support ActiveRecord not loaded, but in Rails.

Signed-off-by: Jason Weathered <jason@jasoncodes.com>
Merge pull request #2 from ennova/pull-2

Support ActiveRecord not loaded, but in Rails.
Version bump to 0.0.3
Test with Rails 3.2.
Include ActiveModel::Conversion on Post.

Fixes:

  DEPRECATION WARNING: ActiveModel-compatible objects whose classes
  return a #model_name that responds to #partial_path are deprecated.
  Please respond to #to_partial_path directly instead.
Output backtrace with deprecation warnings.
Add development instructions to the README.
Move 'Posted on' outside of the time tag.

This makes it possible to style the date separately.
Move outstanding TODOs into the README.
Rename acceptance spec folder to integrations.
Isolate index integration spec in a context.
Add pagination using Kaminari.
Bump version.
Add pkg/ to the git ignore.
Improving batch test name
Compiles for linux with cmake
Make video_options and audio_options separate JS objects.
Update changelist.  Prepare release.
Bump version.
Add .eco files to ack
tabelki fix
shared examples and application helper specs
Add a timed wait method for service controllers
Add some convenience methods for the enums
changing to send in consumer key
Some repair work
add card res file

copy from ms card game . >_<
Implement all entries page.
Add a couple of notes on how to use UEFI support.
Add updated submodule references for master
Merge pull request #1254 from VictorLowther/pull-req-master-3458157901

Dumbify Ubuntu's network handling [2/5]
Add README for hetrogenous OS support.
Add updated submodule references for master
Merge pull request #1286 from VictorLowther/pull-req-master-b57ee06b13

Forward-port execute state changes from Fred, and add hetrogenous OS support. [4/7]
adding barclamp-tempest submodule
using http instead of https while pulling from barclamp-tempest
Merge pull request #1295 from MirantisDellCrowbar/master

adding barclamp-tempest as a submodule to the master
Remove tempest from master.  It should be in openstack-os-build.
Merge pull request #1301 from galthaus/pull-req-master-0a21bfcf74

Fix tempest add [1/4]
Prototypes dynamic sudoku solver. Sub-region constraint still problematic.
changed all PS to use bb params and created a string list->bb list transformer method
Fixed update method docs, which were out of date
(cherry picked from commit 60fe5d909960f7f6f5f798fd76f8500ae9a7786f)
try new api access
validaciones y tests corregidos
instalar devise, user y nombre
generate devise:views
adaptar vistas devise
User Sites relation
Nombre de usuario, adaptación vistas y seeds.rb
scaffold trip
migracion trip
mejorar vistas e incluir cleditor
scaffold y migracion visit
adaptar relaciones, vistas y controladores de visit
correccion /trip/show.html.erb
Create visit con AJAX
Subir ficheros con Paperclip
Contador de visitas
Use sqlite3 in development and pg in production
Avoid problem when deploying to Heroku
prueba1
Merge remote-tracking branch 'upstream/master'
prueba de merge
Conflicts:
	app/models/type.rb
	app/views/layouts/application.html.erb
	db/schema.rb
scaffold comment
Se termina el metodo toString del objeto CuentaT

Este metodo, necesita diversas pruebas, puesto que el equipo en el que se desarrollo, presento lentitud extrema y no permitio probar el metodo en cuestion.
Hello

Added Hello
no msg
no msg
Merge remote-tracking branch 'origin/master'
Fixed typo in docs

Ticket #115 closed.
1.9.2.1

Удален костыль «stripos_clone», спасибо ГовноКод.ру. Полностью удалена
поддержка старого редактора SPAW2
Python plugin: added pygrep command, simplified pyclean
added aliases for sublime text
changed the alias to use to cli provided by sublime text
Don't drop everything after a trailing slash, as this breaks standard svn branches:
^/branches/featurename
^/releases/Release-vx.y
^/trunk
Suppress "zsh: no matches found" error when $ZSH_CUSTOM has no files

The addition of `(.N)` enables the `NULL_GLOB` option which suppresses
the error output in question.

Reference: http://www.zsh.org/mla/users/2004/msg00621.html
Load themes from `$ZSH_CUSTOM` instead of `$ZSH/custom`

This seems like a simple oversight, everything else uses `$ZSH_CUSTOM`
rather than `$ZSH/custom`.
Merge pull request #1111 from jimeh/fix-ZSH_CUSTOM-variable

Fix $ZSH_CUSTOM variable
Merge pull request #1105 from Drarok/fix-svn

Fix the svn plugin only outputting the 1st path segment
Merge pull request #1079 from dylnhdsn/feature/sublime_text_plugin

added aliases for sublime text
Merge pull request #1026 from dir01/patch-1

Python plugin: added pygrep command, simplified pyclean
Prevent the heroku command from being automatically bundle-exec'ed
The heroku command should not be executed via bundler, see:
https://github.com/heroku/heroku/issues/173 
Make the $apt_pref variable evaluatet at alias expansion by using single-quotes instad of double quotes
Add command to directly install the output of acs
Now with 50% less auto-updates.
Merge pull request #1140 from mappleconfusers/pull_req_debian

Enhancements for the Debian Plugin
Merge pull request #1138 from amarraja/master

Remove heroku from the bundler plugin
Customized the svn plugin and gozilla theme ever so slightly.
Merged in changes from upstream.
Added some "zipWith" combinators, allowing an event stream to be zipped
with another stream, a timestamp, a staleness function, or an index. For
testability and extensibility, the zipWithTime method requires an
implicit `Time[T]` object that provides the current time as an instance
of type `T`. This way we avoid hard-coding calls to
System.currentTimeMillis, and allow for clients to specify their own
Time type.
inital js file added
* Moved from shinra to bprompt.
remove spurious articles2 dir
Fixed some of the overzealous _() wrapping to exclude the parameters being handed to the format strings.
I fixed a bug where every datapoint field was being magicked into a number!
install cmake because non-catkin stacks are missing that dependency
clean up temp dirs every time
more prints to understand system
Adding a script to translate from old rosdistro files to the new format
Added hooks for next and previous events to allow shortcut keys.
Removes spurious, extraneous test packages
Merge branch 'master' of github.com:ejesse/elasticosm
Adds dashboards to app
[vim] add ctrlp submodule
[vim] set ctrlp_map and ctrlp_cmd
Fix Big Logo
[AndoridManifest]: corretto
[esercenti base activity layout]: prove varie per il layout con pager 
[EsercentiBaseActivity]: creato il page adapter ecc per visualizzare lo slider
[EsercentiListFragment]: inserito costruttore per passaggio dati
[EsercentiPagerAdapter]: adapter per lo spider tra fragment
[TestFragment]: fragment di test per le varie prove
ignore "killed" and "hangup" events in sentinel
whitespace cleanup
Fix issue #163 - exclude ns from nrepl-load-file.
updated readme, added styles
Add suse zkbd profile for cl boxen
Se trabajo en casoUso0100. Se arreglo un memory leak que tenia.
add thumbnail view link
Fix return value of portage.util.movefile.movefile() for symlinks with Python >=3.3.
Use _pkg_str.version more.
match_from_list: preserve input in result

This fixes an unintended change in behavior from commit
f31320b67c9f593a2a8592e1a4e547f5f641943a.
refactoring paprequester
Change image output thread to pass image instead of file.
Merge branch 'master' of github.com:SeniorProjects-CS-Illinois/USGS2012
Merge pull request #49 from eparsons/master

Broke down the QMake files and changed output dir creation
Merge pull request #50 from billbindi/master

Image Threading pt. 2
Collapse imagethread into progressthread.
Fixes #51
Merge pull request #52 from billbindi/master

Collapse ImageThread into ProgressThread
WIP control logic outlining

Added "Control table.docx", recording 11 cases and their desired result.
fixed duplicate entry in xsd
eric upate ..
- IamgeC
added memeat
added timer
Me acorde de la sobrecarga de funciones
Make Pretty

Add design elements
Add Settings to Popup

Access Settings through Popup
Fixed random segfault connected with Payloads parsing
Compile with latest qbs
[Indicator] Remove icons for the chats without new messages
Merge pull request #186 from gorthauer/master

Some files
Clean up deals_js_spec.rb and removed debugging code from DealsController#destroy
Added Emacs settings for highlighting todo tags.
Added Eclipse settings directory to the git ignore list.
Documented the decision to retain root returning itself as it's own root.
Factored out the JSON conversion code.
DOC-1558 update SCM
DOC-1167 add code highlight for doc website
DOC-1167 add code highlight for doc website
DOC-1442 Doc-website: Unnecessary information at the beginning of Tables of Content of some guides.
DOC-1575 update scm infos in pom.xml
[maven-release-plugin] prepare release 1.0.6
[maven-release-plugin] prepare for next development iteration
DOC-1660 Fix empty parts for separate guides
DOC-1655 Doc-website: Create style for <preface> attribute
DOC-1656/DOC-1578 Change chunk element from 0 to 6 to create separate page for all sections
DOC-1365/DOC-1656 Ensure there is no empty information in the right pane in Doc-website
DOC-1656/DOC-1510 Doc-website: Study why the links to the sections do not work
DOC-1656/DOC-1590 Remove the default text (Table of Contents) from the index of each book in Doc-website
DOC-1656/DOC-1573 SOC ref guide: Starting a new page should be h1
Merge pull request #2 from exodev/fix/1.0.x/DOC-1660

Fix/1.0.x/doc 1660
DOC-1720 URLs used in the ref guide are not good (http://platform35.demo.exoplatform.org)
DOC-1658 fix incorect dispplay of notes, tips, warnings
DOC-1657 fix incorrect display of listitem
DOC-1723 Reduce toc level in each chapter
DOC-1722 Change warning backround color
* Updated Debug functions
* Fixed possible issue if colorAttribute is undefined, text would set to black
* Updated WidgetBase.as to include all valid HUDModes
* Added skyui.defines.* which includes defines from SKSE and additional SkyUI ones
* Removed duplicate branch in ItemCard.as
* Menus now use new data processors. Basic item data/icons are no longer set via [Properties] section in config, but config can still be used to override values if necessary
* Added function fixSKSEExtendedObject to ItemcardDataExtender which renames properties sent by SKSE
* Disabled colour for shouts now matches default disabled colour
* Added config option to change the quantity menu trigger value (replaces InventoryDefines.QUANTITY_MENU_COUNT_LIMIT)
* Added config options to show combined value/weight in the value/weight columns
* Removed unnecessary values in skyui.util.Defines
* TODO: Specific formId matched item data/icons
* Added quantity menu trigger value to config menu
* Added toggle options to enable showing combined value/weight in value/weight columns
Merge branch 'HUDWidgets' of https://github.com/schlangster/skyui
* Modified L/RAlt/Ctrl and Home art
* Addressed translate string issues with ConfigMenu
* Fixed #25
* Refactored InputDefines and InventoryDefines to skyui.defines.*
* Changed InputDefines->defines.input for configpanel.
Merge branch 'HUDWidgets' of https://github.com/schlangster/skyui
* Made sure HUDMenu is really open when checking its version.
* Improved HUDMenu check.
* Fixed mistake.
* Enumeration protected prototype functions
* Removed Sort column form config
* Changed _extConstantTables to be an object in ConfigManager
* Constants are now referred to as Class.CONSTANT in config
* Moved category flags from skyui.util.Defines to skyui.defines.Inventory
Merge branch 'master' of https://github.com/schlangster/skyui into HUDWidgets
* Renamed constants
* Fixed wrong path to constant in MagicMenu.as
test git
Merge branch 'master' of github.com:ezheng/patchBased
make a parallel version (using parfor)

Signed-off-by: ezheng <ezheng@cs.unc.edu>
Entrega Practica 5
Recover from all file upload exceptions; add "--skip-binaries" flag

Summary: We recover from Conduit exceptions, but not from transport exceptions or other general classes of error here. Recover from everything, and add an explicit flag to skip uploads.

Test Plan: Added a "throw", created a diff, skiped upload. Removed throw, created a diff with --skip-binaries. Created a diff normally.

Reviewers: btrahan, vrana

Reviewed By: vrana

CC: aran

Differential Revision: https://secure.phabricator.com/D2598
name -> IP is a normal DNS lookup not a reverse
Merge pull request #97 from grooverdan/simplefix

name -> IP is a normal DNS lookup not a reverse
Fixed the vignette filter and renamed its properties to make more sense. Sped up the bilateral filter. Significantly improved the Harris corner detector.
Fixed the orientation of the front camera when switching between the two using -rotateCamera.
Improved the speed of the box blur.
Added a crosshair overlay generator for visualizing image features. Completed my Harris corner detector, which now returns corner points from an image.
Returned the SimpleImageFilter back to its normal operation and integrated the new Harris filter into the showcase.
Documented the Harris corner detection filter, and tweaked the FilterShowcase defaults to better show it off on iPhone 4.
Merge remote-tracking branch 'upstream/master'
Added Perlin Noise Filter
variables 変更
Post/show pages
Several fixes found during testing of NLM_SHARE

nfs4_op_open and nfs41_op_open should use nfs4_Errno_state(state_status)
when returning error from state_add.

Be explicit about if(care != CARE_NOT) in Protocols/NLM/nlm_util.c

Get NSM Client references for locks in NSM Client lists, not NLM Client
references in SAL/state_lock.c.

Return NFS4ERR_SHARE_DENIED instead of NFS4ERR_PERM for STATE_STATE_CONFLICT
in nfs4_Errno_state.

Signed-off-by: Frank Filz <ffilzlnx@us.ibm.com>
Cosmetic changes to files to be affected by NLM_SHARE work

Signed-off-by: Frank Filz <ffilzlnx@us.ibm.com>
Add NLM_FREE_ALL, NLM_NM_LOCK, and empty stubs for NLM_SHARE and NLM_UNSHARE

NM_LOCK and FREE_ALL are simple wrappers around existing code.

SHARE and UNSHARE require more work and will be implemented in a subsequent
commit, but including them now gets all the protocol level infrastructure
in place.

Signed-off-by: Frank Filz <ffilzlnx@us.ibm.com>
Add lists of NLM Share reservations plus state_nlm_share_t

Signed-off-by: Frank Filz <ffilzlnx@us.ibm.com>
Implement NLM_SHARE and NLM_UNSHARE

Requires some changes to share routines used for NFS v4 to accomodate
NLM_SHARE. Since NFS v3 operations can not be tied to an NLM_SHARE,
but we should still enforce NFS v4 deny modes against v3 operations,
we also keep separate track of the v4 cumulative deny mode for each
file.

This implementation does not actually make use of that capability
yet.

Signed-off-by: Frank Filz <ffilzlnx@us.ibm.com>
WCG added
Remove un-needed package resource for make.
Add CTRL-P
Several updates.

[ADD]: Application's entry point: main.cpp.
[ADD]: TinyXML2 as an external dependency in the form of source code.
Added the CGFlib headers.
Added the OpenGL tools headers.
Moved the OGL headers to the standard 'GL' folder.
Some more improvements on the headers' location.
Added some ignore files for the exernal libs folder.
Updated Visual Studio 2010 setup.

[ADD]: Ignored the folder 'ipch'.
[ADD]: Added the external .lib dependencies.
alphabetical order in lists
migrated brics_actuator
deleted surplus include_directories(include)
man: add color
new file:   frmcitas.py
new file:   gld_frm_colavirtual.wxg
Merge branch 'master' of http://github.com/foxcarlos/pyganzo
added signature and extenders to doc2txt
fixed string and var type info
Refrain from exposing maxLength constraint when enumeration constraint is
present.
Add some more setup information to the README.
Updates to new death mechanics to fix bug related to multiple instances of death.
made it so (-1)/0 returns INT_MIN+1
Merge branch 'master' of github.com:frogatto/frogatto
Shuffled around some milgram-related objects, and consolidated a few of them into single object files.
CT: Noticed duplicate of previous undo bug on redo. Fixed.
Another long conversation for the kitty dormitory.
CT: Changed a setting in Blender so that some shadows aren't glitched-out. I have also toned down the shadow effect a bit.
Mark non-printing characters as such in PS1
Add version file

Signed-off-by: ilia paev <funordie@gmail.com>
Mongo migrations
Entity with more than 22 properties support
CustomTuple > 22
Fixed: UnQlocked would crash on a missing string ID. Now, the token is simply skipped and a error message logged.
Didn't include a working example. Also messed up setup.py
Version 1.0
Merge branch 'master' of github.com:geezee/tweetogram
Several SAM parser bug fix
Merge branch 'master' of https://github.com/gemtools/gemtools
Reverting to old files
Adding Subscriber modules of nrc.nl
Implementation for Recio's method

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17578 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Removed debugging

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17579 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Changes to Recios method prover (points are chosen by name)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17580 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
ToBase / FromBase improvements

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17573 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fix for Min, Max (#2895) [needs backport]

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22395 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Support for 3D applets in exported html

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22396 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
remove debugging

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22397 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
fix for #2065 (Input box: different behaviour in ggb40 vs ggb42) (needed fix for web yet)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16583 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
"flag" menu to change language

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17708 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Table is more fancy


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17709 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Automatic update of propset svn:ignore via for svnignore.txt's by svnignore

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17710 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fixing CAS test

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17245 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Network: Litres -- loading by set of 40 books, sort for bookfeed is enabled by default
Network: fixed bug -- litres -> buy book -> authentication dialog -> cancel -> 'no auth' message
Network: refactoring -- remove code for old network library
Merge branch '0.99' into mac-menu

Conflicts:
	fbreader/src/fbreader/FBReader.cpp
	fbreader/src/fbreader/FBReader.h
	fbreader/src/fbreader/SearchOnNetworkAction.cpp
	fbreader/src/network/NetworkLinkCollection.cpp
	fbreader/src/network/tree/NetworkCatalogRootTree.cpp
	fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp
Merge branch 'mac-menu' into search-box
Async Network: support in UI for partial catalog loading and OPDS partial loading has been implemented
Merge branch 'partial-async' into 0.99
add css next/preprocessor sample
Refactor findTempName: factor out file creation.

Add openNewFile function, which creates a new file and returns a file
descriptor for it.

MERGED from commit cd94cd74527ff3d812a083d903f68c1f9bd571b2
Allow openTempFile to retry when it hits a directory (#4968).

Windows returns an EACCES error instead of EEXIST when a call to `open`
fails due to an existing directory, so add a special case for this
situation.

MERGED from commit 6172212097337923b621be9e12b3542c34cad10e
correct spelling of "sextillion" as per http://mathworld.wolfram.com/LargeNumber.html
add print statements for debugging
get rid of check for ew author
Adding aqms2db related scripts - no man pages yet though
remove old code, add gists by click
Remove profile columns from user
allow bootstrap.sh to be executed successfully as non-root user
Basic application setup.

Initializes:
- Sinatra modular app
- RSpec testing framework

Adds an empty "/" action.
Initializes the database.

Uses datamapper as database library.

Configures the database for development and testing only for the time being:
- development: uses an sqlite3 file database
- testing: uses an sqlite3 memory database
Adds course and lecture models.

Along with the model definition, a factory and unit tests were also added.
Adds basic actions.
Adds course tests.
Reset db between tests.
Adds basic course test.
Adds get course tests.
Adds get course test.
Use new serializers.
Better tests implementation.
Adds course tests.
Adds skeleton.
fixup! Adds course tests.
Factored out body as a function.
Changes scope.
Adds a couple of instructions.
Refactoring the post method.
Removes useless error message match.
Adds better read version.
do not try to set properties that don't have a ds equivalent
set salt and iterations when creating, and do it after everything else
don't suggest a corrupt file when only permissions have been checked
Merge pull request #1 from djmitche/12833_fixes

12833 fixes
various fixes, DOA2 mostly working
remove external reference to twig debug filter
remove external reference to twig debug filter
cluster/stripe: minimum blk size log message

Change-Id: I16ba2e17796cd91e89a6216d4981c09f1bcdc5cb
BUG: 807637
Signed-off-by: shylesh kumar <shylesh@gluster.com>
Reviewed-on: http://review.gluster.com/3026
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Updated implementation so that unit tests succeed using MSVC 2010.
Add group and user parameter to cli tool
Refactoring module.
Modified setup. Updated config. WIP.
Bump version.
docs: added many more operations to data-structs_operations.md
Merge branch 'main'
Implemented bouncing open method, to allow the left or right view to be opened with a swap of the center view controller when it is fully hidden offscreen
Merge pull request #114 from gpascale/initWithCoder

Add initWithCoder in IIViewDeckController
Merge pull request #113 from cbpowell/master

Bounce open methods
add typedef for viewdeckcontroller block
Fixes #46. Ignore UISlider in gesture recognizer
Merge pull request #117 from AnfiniL/UISliderFix

Fixes #46. Ignore UISlider in gesture recognizer
Deal with compiler warnings.
Removed unused variables from panned function

Removed 2 unused variables that are no longer used or needed
handle pan gesture cancel, failed status as well
Merge pull request #127 from xuzhe/master

Handle UIGestureRecognizerStateCancelled, Failed status as well
Merge pull request #119 from zhen9ao/patch-1

Deal with compiler warnings.
Merge pull request #123 from dmitric/master

Remove unused variables and remove compiler warning
Merge pull request #116 from jhersh/master

Add typedef for ViewDeckController block
Exposed panners gesturerecognizer delegate: panningGestureDelegate.

You can use this delegate to override or block the panning behavior (e.g. prevent from firing when you do a swipe-to-delete).
Added demo of panningGestureDelegate to MultiViewDeckExample.
Updated version.
Add initWithCoder in IIViewDeckController
Added a ratio of differences plot
Adding background images and parallax bg functionality
AnimatedSprite forceFrame(int)
Changed around some of my comments to better represent what is happeneing in my main html page
added to OutputStuff.  Learned about LINQ queries
Our initial compiler
A human-readable form of our first example
Modifications to CMakeLists.txt for intel compiler.
I'm looking forward to a nice merge
before merge
New Design
added model logic to association
add uniqueness validation to tags
Made a custom adapter and pass the Event around instead of the id
Set up preliminary view of beer list.
fleshing out football steps
refactoring football cukes, and added auto-update test
get first element from qwery nodelist
turning on all football features
commenting out 'next' pagination of competition fixtures
updating features
merging
Added neilsen tracking code to page footer
Merge branch 'omniture' of github.com:guardian/frontend into omniture
Moved Diagnostics onto single config file
Merge branch 'master' of github.com:guardian/frontend into configuration
Killed off unnecessary merge for diagnostics
Put IDEA settings back in
Merge pull request #352 from guardian/configuration

Configuration
adding sbt 0.12
removing old build.sbt
ignoring bin
bumping to sbt 0.12 and snapshot play plugin 2.1
moving over to RC1 and removing broken dependencies
- [ADDED] Added Smarty as the template engine (not yet finished)
[ADDED] README
trim seg tail string
Adição do controller PaginasEstaticas.
Fim da criação das páginas estáticas.
ExtrusionSymbol: add wallGradientPercentage
ADD: annotation_flat.earth (test for projected map annotations)
Started refactor for nearby_places
created main method class driver
完成runninginfo-windows.py