labofsahil/github-event-dataset-2012 huggingface dataset:
new tcpdf version
new tcpdf version
moved tinyButStrong classes to libraries
new classes to handle and render invoices
moved invoice templates to new directory
moved invoice templates to new directory
removed duplicate templates
code format
support subdirectories for html templates
code format
create invoices from html to pdf
adjusted config to use kimai specific path
support multiple invoice renderer
use absolute path
new kimai view class
merge with master, html to pdf invoices
preparing new stage site
preparing new stage site
package_install: add better uninstall support for osx
More API methods, thread safe stdout redirection

Some general cleanup and methods to get filenames and url and filename
hashes. Plugin output redirection is now also thread safe.
Thread safe stdout redirection

This class now has an IO object which all calls to #puts, #print,
#printf and #putc from the plugins are redirected to.
feature: download all vidoes from a user
edited i386-kernel-build.sh
Changed CGUIViewStateVideoTVShows constructor

Replace current sort methods with the same ones used in
CGUIViewStateVideoMovies class. Used by smart playlists for sorting
operations.

Changed the constructor

Fixed constants in constructor.

As suggested, fixed the constants used in AddSortMethod(). Bad
copy-paste from the movies class constructor. It's strange that it
worked even like that (tried for example to sort by date).
FIX: JSON-RPC: Setting the playcount does not produce expected announcement
Merge branch 'master' of https://github.com/kozeris/RVM.git
nieko nepadaryta
small fix
ARQ support +
随机词库
Merge branch 'master' of https://github.com/kundy/ghost
add/browse routes
Fix of a typo
Update README.md

Adding LD48 submission / contact info
new and awesome find tag and edit function, for all your packet editing needs
New INET 2.0
Fix MX and SSHFP __str__ methods
Resource.as_record shortcut
Add __str__ methods to resource and questions
RAID tests
Merge pull request #417 from lgritz/lg-texblur

Anisotropic texture blur fixes
oiiotool and iinfo: print info properly about non-byte bit depths.  That is,
say "uint12" for a file that's presented through the interface as UINT16 but
contains a "oiio:BitsPerSample" metadata of 12.
oiiotool: only infer output tile size and data format for freshly-read files.
bmp bug fix -- wasn't setting oiio:BitsPerSample correctly.
atrac3: cosmetics: pretty-printing and renaming

also does some minor refactoring.
atrac3: simplify some loop indexing
atrac3: use AVCodecContext.channels instead of keeping a private copy
atrac3: move the 'version' field from ATRAC3Context to where it is used
atrac3: move the 'delay' field from ATRAC3Context to where it is used
atrac3: use AVCodecContext.block_align instead of keeping a private copy
atrac3: remove unused ATRAC3Context field, samples_per_channel
atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
atrac3: remove unused ATRAC3Context field, bit_rate
atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
atrac3: separate window initialization from IMDCT initialization
atrac3: initialize static tables in AVCodec.init_static_data()
atrac3: simplify MDCT window calculation
atrac3: use sizeof(variable) instead of sizeof(type)
atrac3: remove unused ATRAC3Context field, sample_rate
atrac3: replace a calculation with FFALIGN()

This allocates 4 bytes less than the previous code if avctx->block_align is
a multiple of 4, but the extra 4 bytes is not really needed.
fix space type in Changelog
wmadec: Adjust debug printf argument length modifier
avformat: const correctness for av_hex_dump / av_hex_dump_log
mpegts: Drop pointless casting of hex_dump_debug arguments
avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()
avutil: use align == 0 for default alignment in audio sample buffer functions
avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()

Use default alignment in audio_get_buffer()
avconv: use default alignment for audio buffer
Реализована отправка письма с заказом менеджеру.
Работает поиск по аналогам для autopiter
Подсветка аналогов.
Аналоги.
-
- Codage du chargement de plugin ;
Eriytetty haastajan rooli
smarter object creation, no metatables
lcd almost complete
using new interface
fixes, using new interface
Garrrr.
Users with status of 0 can no longer login. Changed the way the anonymous user is name so the first name is now 'Anonymous User' and last name is blank
Fix type parser to properly handle Ruby's operator and special method names

Closes #535
Add http benchmark examples
Fix implicitly introduced variables problem
Added sample file upload.
Merge branch 'master' of https://github.com/maiah/synth
correcoes feitas no CharacterSelect
corrigido CharSelect
added required attribute value of input elements to formToArray return object
v3.05 - allow additional fields to be cleared in clearFields and clearForm
#178
Merge branch 'doochik-patch-1'
version bump
Update license links.
Merge branch 'master' of https://github.com/collingo/form into collingo-master
version bump for pull #189
implement access class support for export ics file
finally add input timeout in run().
ProofSet-is-Proof changes; kernel split off.
Split into trusted kernel and built-in extensions.

The kernel is in the mepk.kernel package, and the built-in extensions
are in mepk.builtin.
bug fixes

Signed-off-by: Jordan Watkins <incohatus.none@gmail.com>
Remove call to |stepFailed| in the KIFTestCondition macro

This call is not strictly necessary because it is also being made in
|KIFTestController _advanceWithResult:error:|. It is also inconsistent
because:

* the KIFTestWaitCondition macro does not call |stepFailed| itself.
* the macro originally didn't make any assumptions about local
  variables when it is being called, as the error parameter must be
  passed explicitly. This allowed you to use the macro in more
  contexts (see below).

Without this change, you cannot define a step execution block inline
in a scenario method. This worked before but was broken by:
http://goo.gl/0AKuT

Example:

@implementation KIFTestScenario (MyScenarios)

+ (id)scenarioToDefineExecutionBlock {
  ...
  [scenario addStep:[KIFTestStep stepWithDescription:@"..."
      executionBlock:^(KIFTestStep *step, NSError **error) {
        KIFTestCondition([foo bar], error, @"[foo bar] should be YES");
      }]];
  ...
}

@end
uncomment bson loading, since rabl is not compatible without the latest bson(_ext) gem and rails fails to start with it
changed crossfilter viz (fixed js errors)
Add agent arguments
battle & character classes
[css]service page - css
added import to my view controller files
Mark hadoop dependencies provided in all library artifacts
Merge pull request #325 from tomdz/master

Mark hadoop dependencies provided in all library artifacts
Fixed build environment to include crypto pp correctly
D-separation algorithm
Tweeked the colors used in the pure theme
Removin pyCrypto for troubles with random bytes generation
Moving and updating python.sh
Adding data_directory parameter to base.main - workaround bug in android's tempfile for permissions
merge
crypto/sss.py - more comments
Added the update single feed functionality, and also feedname verification in create to avoid duplicate feeds
Started a Datastore class that will interface with the sqlalchemy DAL.
use gemname
added cube cluster and cube rotation
Add Setting for Open file
oprava zmeny poradi data se odesilaji v jednom argumentu (vsechno obaleno prvku all_data, all_data[<id>] = <poradi>) a z id odstraneny stringy - uz jen int...
Using Optimization Toolbox
url migrations
url migrations
convert measure_time() to output in seconds using double

measure_time() currently prints and returns some cpu tick count. For
identifying spots which take a long time is sufficient to relatively
compare cpu ticks. In order to get some real world reference we
convert the output to seconds. This helps when trying to match
to the waited real time.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
squash! add timer function

--New commit message:
add measure_time() function on mingw to identify performance issues

This is a debug helper function which can be sprinkled into the
code and used to measure between function calls.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
fixup! Let measure_time() output also <file>:<lineno>
adding 'trim' attribute migration
Merge branch 'master' of github.com:mugoweb/eep
WIP SMS Records page
Merged with upstream.
Merged with upstream.
Renamed schema file to be consistent with site installer and other extensions: ezflow, ezstarrating, etc.
Changed directory structure to follow eZ Publish extension package skel
Updated package meta data
Set release version
Implement related_objects_count attribute for tag object
Implement initializeClassAttribute for eztags datatype
Update Croatian translation
Merge branch 'master' of https://github.com/ezsystems/eztags
Revert "Changed directory structure to follow eZ Publish extension package skel"

This reverts commit 67a385c23f9daac15700e780e40841acea115ab5.

Conflicts:

	packages/eztags_extension/package.xml
Revert "Renamed schema file to be consistent with site installer and other extensions: ezflow, ezstarrating, etc."

This reverts commit 0e23101eefd8808225b136b2eb27823413442eac.
fix typo in french
Merge pull request #41 from npanau/french

fix typo in french
Merge branch 'master' of https://github.com/ezsystems/eztags
Allow plugins to avoid opening a context if not needed
Was to make it work
key_commit: add logging to receipt procs
key_commit: added owner name to Grady tax receipt - tr5002
key_commit: Added station column to current receiptlist report for Grady
key_commit: put the payment number key3 on the bank statement
key_commit: Added support to the apportionment report functions for handling special apportionments
larger cache for results RIDs
Fixed RangeError: Maximum call stack size exceeded bug.

Bug: app/assets/javascripts/quorum/quorum.js line #94.
Instead of calling tipsy on all a[rel=quorum-tipsy] elements,
only call tipsy on mouse enter .sequence events.
Updated specs.

Conflicts:

	Gemfile.lock
Added Hsp gaps to Blast job reports.

* Added migration for gaps
* Added sequences to test blast db to generate blastx and tblastn hits.
* Updated specs
* Updated gems
Updated Quorum executable files.
Switch to ncgr/blastxmlparser branch hsp_gaps.
Upgraded to blastxmlparser v1.1.0

* Bug Fix
* https://github.com/pjotrp/blastxmlparser/pull/1#issuecomment-7593069
Merge branch 'gaps' into data_export

Conflicts:
	Gemfile.lock
	README.rdoc
	spec/dummy/db/schema.rb
Upgraded to Rails 3.2.8 and dumped db schema.
correct offset conversion in terrasolid reader
Fixes an issue where a file lock for a store wouldn't be released when closing
Discourages use of Future#get() (without timeout). There was an issue where a call to ResponseFuture#get() never complete, which would mean that there was no response, and no timeout. That in itself is a bug and should be investigated. Short term though, including a timeout will solve it
Merge pull request #319 from tinwelint/ha-robustness-fixes

Ha robustness fixes
Http\Response: fixed strange session bug in IE9

See http://phpfashion.com/bug-in-ie9-twice-sent-cookie-is-ignored
Http\Session: better error message
Replace Channel.Unsafe.setEventLoop() with register()

- Added AbstractChannel.doRegister()
Clear Channel.eventLoop on deregistration
Mark constructor as @deprecated. See #283
Remove unnecessary 'return's / Clean up QueryStringDecoder
added milestones... temporary fix
added jquery cookie plugin
added jquery geturlvars plugin
added jquery recaptcha plugin
Fix: Updated URL for ExamController
fix a bug in ActualTimeMetric
Code style fixes
Updated ChangeLog for 0.7.1 release.
Added polyfilly for missing assertCount() in PHPUnit 3.5.X
RDFa: wrote script to parse the RDFa test suite manifest and list RDFa 1.1 + XHTML5 tests.
Removed tests that aren't required.
RDFa: Accidentally deleted wrong test cases.
RDFa: added support for attributes describing the root or head of doc (tests 59-71 now passing)
RDFa: Added support for <base> tag (tests 72-74 now passing)
RDFa: added test 75-198, but commented out 17 tests that are failing.
Added setters for each of the components of the URI to the class EasyRdf_ParsedUri.
Merge branch 'master' into rdfa
RDFa: fixed test 117: fragment is now stripped from the base URI
RDFa: added support for @prefix (tests 177-179, 182 now passing)
New minimum version of PHP is 5.2.7 - which is what PHPUnit 3.6 requires.
Fixed test for checking the class of an object in PHPUnit 3.6.
Changed Turtle serialiser to not escape Unicode characters unnecessarily.
changed h1 fontsize and width to %.
Add custom version to custom settings
Create pengiriman.java

pengiriman.java
fix for previous issue
Implement some builtins
Minivect update (use native itemsize for types)
overwrite release tag
Fixed new packages layout
Moved classes
Added copyright notice
added routes to login and changes notifications
Minor docblock update in SimplePages
Uses translatable strings for 'View Public Page' and 'Delete', groups featured and public checkboxes and their respective labels.
ptt_gpio_raspi and audiocap_pcm_gpio_raspi
Fix button focus
Fix license.
(Xronos) OpenForge, removing some warnings
fix to showing watched videos - includes downloads
mark comics as read too
Implemented 'commit' for Solr and added a clear_index function.
TODO: Not sure if the clear_index function is working or not?
Celery tasks for all Moxie places importers.
Some default settings for the importers.
Not sure where configuration should live. Or if we need multiple config files.
fix error conditions, send headers so data is not cached by intermediate servers
Update: 05/01/2012 - Dinner
config.action_mailer.default_options

Instead of  config.action_mailer.default which do not work
because default is not a setter
Add CHANGELOG entry about mailer.default_options=

Use config.action_mailer.default_options= when setting via
Railtie instead of config.action_mailer.default
Fix default_options description

Fix config.action_mailer.default_options
description in guides.
Update uploading of products for administrators
inliner makes fields public only when actually inlining
refactoring to functional style Inliner's isStampedForInlining()
SI-2796 Warn if early definitions are used with a trait.

For which they (currently) have no special meaning.
SI-2807 Avoid catch all warning for Stable Id patterns
SI-4176 A repeat dose of repeated parameter type sanitization.

 - During eta expansion, treat parameters of type A* as Seq[A]
 - Do the same for method/class parameters as referred to by an Ident.

Also fixes SI-5967, which shows up during pattern matching.
SI-5932 Tone down non-sensible == warning with refinements.

Errs on the side of avoiding false positives.
SI-5489 Avoid accidentally adding members to Object in erasure.

`Symbol#classBound` assumed that `refinedType` would return a
a type based on new refinement class symbol; but that isn't so
during erasure. Instead, it returns the first super class, into
which we entered new members. Needless to say, the next run of the
resident compiler didn't take kindly to these hijinks.

To remedy the situation, I've added (yet another) condition
on `phase.erasedTypes`.
readability of MethodTFA.mutatingInterpret()
GenASM: pipeline disk-write with building of classfiles
GenASM gets a 10% performance boost via switch
moves reflective compiler into scala.tools.reflect
Merge pull request #804 from scalamacros/topic/reflectglobal

moves reflective compiler into scala.tools.reflect
Merge pull request #800 from retronym/ticket/5932

SI-5932 Tone down non-sensible == warning with refinements.
Merge pull request #771 from retronym/ticket/4176-2

SI-4176 A repeat dose of repeated parameter type sanitization.
Merge pull request #802 from retronym/ticket/5489

SI-5489 Avoid accidentally adding members to Object in erasure.
better module classes support in the reflection API
Improves backward compatibility of manifests

1) type ClassManifest[T] = ClassTag[T] (solves a problem
with toArray[T: ClassManifest] defined on most of the collections;
if these types weren't aliases, then we won't be able to change
the signature of that method to toArray[T: ClassTag], because
that would break source compatibility for those who override
toArray in their custom collections)

2) Compiler-generated manifests no longer trigger deprecation warnings
(this is implemented by using ClassManifestFactory instead of ClassManifest
and ManifestFactory instead of Manifest)

3) Deprecation messages got improved to reflect the changes
that were introduced in 2.10.0-M4.
further improves reflection printers
Fix SI-5929 - Verify error with finally and pattern match

Don't enter all labels in a method when emitting a forward jump, since some
labels will be duplicated (if defined inside finally blocks). For each forward
jump, enter only the label that is needed for that jump.
Merge pull request #798 from retronym/ticket/2807-4

SI-2807 Avoid catch all warning for Stable Id patterns
Adds test and check files for SI-5666. Covers common non-newable types.
Improved formatting/display of documentation.

Made the primary constructors private to prevent them from appearing in ScalaDoc.
SI-5663: Tweak warnings on case class equals

Re-enable testing the sensibility of comparing instances
of two case classes.  In particular, warn if we detect that
the two objects inherit from different case classes.  In
addition, avoid emitting misleading warnings when comparing "new C".
Fixing the docs.scalap breakage
Adapted implicits testsuite for SIP18
Reimplemented shadowing between class members

and implicit pimped on members. Thanks to Lukas for pointing it out!
Move primitive widening implicits to companions.

Take a 15-implicit load off Predef and put it where it belongs: on
those brave souls who like their longs to get floaty by way of T.
Merge branch 'develop'
Merge commit 'refs/pull/387/head'; commit 'refs/pull/388/head'; commit 'refs/pull/392/head'; commit 'refs/pull/397/head' into develop
css fix on svg text
remove lcfirst.t

"I know a dead function when I see one"
Test pushing non-Str-keyed things onto a Hash.
legend corrections
figure updates
spacing change?
prepping tex writing
initial version, remove unused files, add taglist
add failure indication and prevent deletion scheduling when uploading fails
add file extension stripping flag
Moved render() to LoggingDecorator and renamed it format().  Added "dir" to ILogger and implementing it ConsoleLogger.
added interface to cli
Update version and SDK to 3.1.1.0.
Hoan chinh review code, chuan bi viet SE
fix bug #61065
fd fix
Add preliminary README.md for github

Github uses a special markdown syntax and display the content of the README
formatted on the front page of the repo. This readme contains information for
github users.
Fix 126 tests failed of phar when --enable-zend-multibyte
Merge branch 'PHP-5.3' into PHP-5.4
- Comment unused function to avoid warnings
- fix missing include for unix sockets
- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src: (27 commits)
  Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
  sort NEWS
  fix bug #55042 - erealloc without updating pointer
  Fix bug #62186 readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
  fix test
  fix test
  Typofix in comment in proc_open.c
  fix CVE-2012-2143
  updated the libmagic patch after Felipes regex fix
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug #62082
  sync with HEAD
  sync with HEAD
  ...
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  UPdated NEWS
  Updated NEWS
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
Huge amount of changes:

* New classes: Moveable, Role, Status, Type, Node, XMLParser

Parsing XML files should now be easier and more reproduceable

Data is slowly being cleaned up, hence the addition of Status, Role, and
Type. 

Changed 'Object' to 'Model'

External data is now stored in library files: EntityLib.xml,
BuildingLib.xml, ItemLib.xml, ShaderLib.xml. 

All calls to the javax Vector2d or Vector3d classes have been replaced
with calls to the lwjgl Vector2f and Vector3f classes.
Brand new menu system!

Menus are read from the /res/menu/ directory, clicklisteners for buttons
must be explicitly defined before drawing the menu (if you want the
button to work). I will do a mini presentation on this to explain how it
works and how you can add super awesome stuffs.
detect when compiling with MINGW32 to avoid typedef redefinition error on
C99 size types
Refs #3163 Added the --log-hostname option, thanks to aseques.

git-svn-id: http://dev.piwik.org/svn/trunk@6474 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Refs #3163 Added a reference in README to the Debian/Ubuntu default vhost_combined, thanks aseques.

git-svn-id: http://dev.piwik.org/svn/trunk@6475 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Refs #3177, fixing build.


git-svn-id: http://dev.piwik.org/svn/trunk@6534 59fd770c-687e-43c8-a1e3-f5a4ff64c105
scripting changes.  modules can reload
- fixed Tcl/Tk support
- rel 7
Use ~/.config/pip to store configuration/logging instead of ~/.pip
Use tempfile for temporary pip directories
Removed some redundancy with the new temporary folders
Fix/hack: after creating the temp dirs, delete them and save their names so pip can create them properly later
Removed readme so pull requests would actually work
Removed the ~/.config changes from devel branch, will put into a different branch later
Merged with upstream
Merge pull request #550 from pnasrat/7e9836c9c87d45500cee7873e49df35ed375c7ce

Enable travis IRC notifications
Fix error message for pip install -e path

When setup.py missing give appropriate error message.

Fixes issue #546
Merge pull request #551 from pnasrat/issue-546-improve-edit-error-message

Fix error message for pip install -e path
Merge pull request #516 from TC01/develop

Temporary build and src directories no longer created in cwd/pwd (bugs #339, #381)
dedicated --user test suite; use system_site_packages option for reset_env
Merge pull request #553 from qwcode/userscheme_pt2

--user fixes part 2
Make the unknown VCS error message generate its text from the actual
list of known VCSs rather than hard-coding the ones supported now.
Python >= 3.3a4 handles url fragments automatically
Merge pull request #554 from msabramo/dynamic-vcs-error-message

Make the unknown VCS error message generate its text from the actual list of known VCSs rather than hard-coding the ones supported now.
Merge pull request #555 from orutherfurd/develop

Python >= 3.3a4 handles url fragments automatically
Remove unix line ending assumption.

These tests fail on Windows - issue #557
Merge pull request #560 from pnasrat/557-fix-windows-ci

Remove unix line ending assumption.
Fix windows CI build tests.

On windows we can't assume os.getcwd returns url friendly format. Use
urllib pathname2url.
move color
sprite2DMaterial opt
Fixed changed path.
Added syntax highlighting for most common files.
Increase contrast. Fixes #119

@samanpwbb maybe you wanna further adjust. I'm on the master branch for the moment, just doing fixes.
Added support for organizations.
Added support for listing repositories of an org.

Or user.
Minor fixes.
Consider default branch if no branch is provided.
Use dedicated route for profiles (user / organization).
UI for organizations and user profiles.
Consider username in breadcrumbs.
Sort by updated timestamp.
Error handling for empty repositories.

Closes #121
Added loading indicators.

Closes #154.
Don't show parent link for root path.
fixed bad url in readme
vertically centered text properly when browsing files.
Fix routes.

Now routes conform to the GitHub URL scheme.
Merge branch 'master' of github.com:prose/prose
vertically centered text properly.
Merge branch 'master' of https://github.com/prose/prose
fitting organization icons to grid.
model testing
Updated.
Merge branch 'gh-pages' of github.com:prswb/prswb into gh-pages
updated
updated
Updated.
Updated.
Merge branch 'gh-pages' of github.com:prswb/prswb
proto filtro
Merge branch 'master' of github.com:psyrax/fbwh
proto filtro
proto filtro
welcome
Merge branch 'master' of github.com:psyrax/fbwh
Uses Default Rule for Function Call

The default reduction on object when Bison sees the '(' in
a function call is what we want anyway, so I surpressed the output
of conflicts on that case to temporarily solve the problem.

If this is the only conflict we ignore from now on, then we
will have no problems building the tree.
Fixes default case in assign.
Implemented result summary
Added rolling boulder support on the map
Added exp check
Fix characterImage in backup
Fixed relative serverUrl
Splited action into server side and client side actions. The boulder can now be placed
Do not die if no packets are coming in.
Add commandline options and verbose mode with on-the-fly statistics
Allow easy selection of the serial device
Add support to change screen titles
Better use wildcard source ip.
ACAD-1199 included new dynamicField definition to allow for case insensitive searching of any alternate ID field
ACAD-1199 removed changes to email and newemail - that is a separate concern; marked dynamic alt. ID field as store=false
Merge pull request #7 from dgillman/ACAD-1199

ACAD-1199
Fix decorator loading code to:

- Only load decorators in app/decorators
- Actually load the decorators
- Find decorators at Rails.root rather than ugly file path

Related to #260 and fixes #266
creando metodo1 en ambas clases
rama1 clase1
rama master clase2
Merge branch 'rama1'
AS::Callbacks: deprecate monkey patch of object callbacks
Merge pull request #7560 from bogdan/deprecate_callbacks_monkeypatch

AS::Callbacks: deprecate monkey patch of object callbacks
Integrate ActionController::Parameters from StrongParameters gem
Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gem
Remove MassAssignmentSecurity from Rails

This will be moved out to protected_attributes gem
Remove mass assignment security from ActiveRecord
Delete protected attributes in AR::AttributeAssignment#assign_attributes
Add tests for ForbiddenAttributesProtection in ActiveRecord
Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash instead of monkey patch permitted? method in regular hashes
Remove all references to attr_accessible/protected and old mass_assignment_sanitizers
Change scaffold_controller to generate and use private method to encapsulate permissible params
Remove integration between attr_accessible/protected and AC::Metal::ParamsWrapper
require abstract_unit in parameters tets
Add attributes list to ScaffoldController to use it in parameters sanitization method on controller
Update ScaffoldGenerator tests
Remove attributes whitelist tests from AppGenerator tests
Session variables for mysql, mysql2, and postgresql adapters can be set
in the new 'variables:' hash in each database config section in database.yml.
The key-value pairs of this hash will be sent in a 'SET key = value, ...'
query on new database connections.

The configure_connection methods from mysql and mysql2 into are
consolidated into the abstract_mysql base class.
Merge pull request #8346 from sodabrew/patch-1

Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters
Update star's Makefile.in with new release numbers.
update version in Makefile.in
check for existance of key rather than value of key that may or may not exist
more config parsing fix
Merge pull request #7 from mancdaz/master

change to config file parsing
Fix #135 – -o- broken with LDMD.
Merged druntime.
Fix #136 - return static arrays as sret parameters on non-x86.

This should eventually be done on x86 and x86_64 as well, but as
discussed in GitHub issue #110/pull request #120, the ABI there needs a
closer look: at least on x86_64, we need to treat static arrays exactly
like if they were a struct containing T.length members of the same type
to be compatible with DMD (as soon as the ABI is correctly implemented
there, that is).

While for this reason I want to avoid a ABI change which could silently
break some code only to change the x86 ABI again shortly after, this
commit only touches the "default" ABI for unknown targets and thus
should be safe (as we give absoultely no ABI guarantees there anyway).
Define ARM even in Thumb mode.
Merge pull request #137 from alexrp/master

Define ARM even in Thumb mode.
Merged alexrp's initial ARM patches.

The Phobos changes have, as far as I can tell, already landed in
upstream master as well. But since 2.060 will probably take some time
to arrive, I figured it makes sense to merge them right now, so that
collaboration on ARM support can continue.
Fix #138 – in precondition of methods broken in D1.

Not sure why the code was special-cased for D2 in the first place –
are there any cases where we expect a »full« context struct in the
contracts for D1. At least, they don't occur in DStress/Tango/….

As a general note, this is one of many bugs which would have not gone
unnoticed if we didn't use so many bitcasts.
Added some missing files, renamed VoxelGeometry -> VoxelMesh
a new categorization, first commit
added Context#getPathParameterNumeric(String)
Do not copy .git or .svn files
macro and bps
new version
changed format of CHANGES file
Added reader-demo.py HTTP server script for testing
Bug fixes
Added demo webserver and AJAX viewer with examples
Site updated at 2012-05-21 20:46:36 UTC
Eliminamos pagina por default
Правильное определение случая, когда пользователь залогинен
Тест - подача объявления
rake task typo fix
Торговое и холодильное оборудование - апдейт страницы
Проверка счетчиков при выделении и оплате ОП
Проверка счетчиков при поднятии, премиуме и оплате ОП
Auto-technics-5: убрана проверка города
Исправление работы с ресурсами с учетом Qt4.6
Добавление тэга [ruby]
Удаление исторических файлов проекта для eclipse - более не используются
tests of two php files
Added error handling for posting events with a creator without an ID. Correctly returns 400 now.
Added error handling for posting occurrences with event and/or venue without an ID. Correctly returns 400 now.
Merge branch 'master' of github.com:rtoal/wutup
Fix a test
Merge branch 'master' of https://github.com/rtoal/wutup
remove information about v2 from the changelog
ofxdna is mutating
removed permuted space and WTM.Access removes a non necessary SEQ.Rank
oops, fix last commit as I sent the wrong version

git-svn-id: https://svn.salilab.org/imp/trunk@15448 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Merge branch 'develop' into feature/openmp
changing the name
init
Updated to latest version
updated nbody - only one marshal
Proposed fix for SI-6490.

Issues a "companions must be in same file" error only if both class and module exist. This can certainly do no harm. I believe it should adress SI-6490, but, lacking a test case, I don't have evidence for that.
Merge pull request #1481 from odersky/ticket/6490

Proposed fix for SI-6490.
Avoid warning by making output port in pipe op non-blocking.
Adjust Makefile to new locations, cleanup
Merge pull request #1 from pfrischmuth/master

Makefile adjustments
descriptive error message when AR adapter was not found. Closes #7313
локализация
crud depth
Initial tinkering with game analytics
Script for populating Playbook data.

This is the list of all the known plays in the game. Invokes the web
service apis for storing that information in the datastore.
Offensive Play Analysis interprets Playbook

This now has updated logic to deduce the formations being utilized on
the field. Also has checks to lookup known playbook definitions based
on the name of the play and the formation of the offense.

Fixed one playbook entry which had a name incorrectly (due to search
and replace rapid script creation).
fix equation formatting
remove examples/diffusion/subdomains.py + test

- obsoleted by examples/acoustics/acoustics3d.py
add custom view for acoustics3d.py example to script/gen_gallery.py
docs: sync module index of developer guide with current sources
poodle prototyp
"CAP Alert" --> "Alert"
чуть-чуть добавлено
ladniej napisane semafory, moze ktos zrozumie :)
Add compiled to excluded folders
Add numbermind and tests for it
reactivated display of paper scale and level of openness
Merge branch 'master' of github.com:siigna/main
Removed DelayedModule and made the jar loading lazy
modify login controller.
make file and class names in line with popular convension in c++.
Updated the documentation of variables.
  Ignore built-files from the examples.
Use correct DOUBLE type for PostgreSQL, and DOUBLE & FLOAT for SQL Server
Merge branch 'master' of git@github.com:slick/slick.git
Fixed: Purchase failure when using djmaxcrew.com instead of www.djmaxcrew.com.
Fixed: cssmin.php uses php short tag.
Fixed: sacy.php attempts to include the wrong file (external-translators.php)
Correct flash key for spree/admin/products_controller_spec
Change successful flash messages to success key in admin backend
Use within_row in shipping_methods_spec.rb
Click edit icon in shipping_methods_spec
Don't make select beautiful in test

Because it is problematic to test it accurately
Include a 'named' blank option in shipping method shipping category select

So it appears as an actual option in the select2 variant
Stop trying to test select2 things

This is proving extremely difficult, and is better if we just test select boxes are being functional
Memoize the call of current_api_user in testS
Line items cannot be added to an order if the user isn't authorized to do so
Use edge rabl
Expanded line items API, now allow for creation and WIP on updating line items
Fixed the call to select_month and select_year

Signed-off-by: Tommaso Visconti <tommaso.visconti@gmail.com>

Fixes #2259
WIP: Images API as per #1353
Make attachment and position accessible on image
MTP: Add file transfer tests and fix libmtp not returning correct storage_id values in the object dict
...
MTP: Add mem leak test for file operations
...
...
WPD: put_file works
WPD passes all tests
CIPER Chile by Darko Miletic. Fixes #1041189 (New recipe for CIPER Chile)
Add a method to get the list of available transliterators in ICU
...
When generating ICU sort keys handle strings with NULL bytes in them
Fix #1041389 (Drop down lists behaviour not consistent)
libmtp: Filter ro storage at the python level for better debugging
Remove legacy code
Update Time
Business Week Magazine and Chronicle of Higher Education by Rick Shang
...
Create a libusb based device scanner and use it on OS X. This is needed to enable MTP support.
libmtp: Only use list of known vids/pids for detection
...
Added basic logging and Nomo::Model methods now pass options to callback AR Class methods.
fix libz
Add update operators (+=, -=, *=, /= and //=)
remove dependencies that should be depended upon elsewhere
Fixed make file usage so its compatible with machines whos default make is not gmake
project list page tidied and reactive
nice New Project page
MOAR pretty
pretty and icons in repo
detailed explanations started
functional express mongoose implementations
Use a real connection for tests
Allow History#{perform,replace} to run multiple actions
StartWay -> AddWay (for parallelism with AddNode)
More mode and action overhaul

Pass entities to actions via id; this allows safe composition
of actions that modify the same entity.

Fix remaining ghost node cases (#213).

Create more logical undo states when drawing.
added Kenya Shilling
Backward compatbility break: Remove RFC3339ToTimestamp() method: use '$a = new sTimestamp($str, NULL, sTimestamp::DATETIME_TYPE_RFC3339); $a->format('U');'
Refresh
Merge the GraphView in the Graph class
Last update
add specs
bump version
commit before changing the method for calculating the concordance in the function allelic_concordance_Baganda
ALSA: HDA: Lessen CPU usage when waiting for chip to respond

When an IRQ for some reason gets lost, we wait up to a second using
udelay, which is CPU intensive. This patch improves the situation by
waiting about 30 ms in the CPU intensive mode, then stepping down to
using msleep(2) instead. In essence, we trade some granularity in
exchange for less CPU consumption when the waiting time is a bit longer.

As a result, PulseAudio should no longer be killed by the kernel
for taking up to much RT-prio CPU time. At least not for *this* reason.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Tested-by: Arun Raghavan <arun.raghavan@collabora.co.uk>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
ALSA: hda - Remove pre_resume and post_suspend ops

Since the recent commit, the resume procedure is always performed at
the resume time.  This makes the pre_resume hack for VREF mute LED on
some HP laptops superfluous.  As this is the only user of pre_resume
(and there is no user of post_suspend) ops, let's kill them again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
ALSA: hda - More robustify the power-up/down sequence

Check the power_transition up/down state instead of boolean bit, so
that the power-up sequence can cancel the pending power-down work
properly.  Also, by moving cancel_delayed_work_sync() before the
actual power-up sequence, make sure that the delayed power-down is
completed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch 'topic/hda' into for-next
Merge branch 'fix/hda' into for-next
ASoC: sh: fix migor.c compilation

Fix a recent compilation breakage, caused by a change in SH clock API.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Build fix for SH in 3.4

An API update which wasn't sufficiently thorough in updating the tree...
Merge branch 'for-linus' into for-next
xlive: add initial stub dll
xlive: stub enough functions to make Fallout 3 happy
xlive: add initial tests, make them pass under wine
xlive: update configure for tests, remove stray whitespace
d3dx9_36: Add more traces.
wined3d: Get rid of APPLE_flush_render, it doesn't exist.
wined3d: Fix some EXT_gpu_shader4 function names.
d3d10: Add support for parsing depth/stencil states.
d3d10: Implement d3d10_effect_depth_stencil_variable_GetBackingStore().
po: Update Brazilian Portuguese translation.
po: Update French translation.
po: Update Chinese (Taiwan) translation.
po: Update Chinese (Taiwan) translation.
po: Update Chinese (Taiwan) translation.
include: Fix alignment of cabinet structures on 64-bit.
advapi32/tests: Add some more well known SIDs to tests.
kernel32: Added GetSystemDefaultLocaleName().
kernel32: Forward GetLocaleInfoEx() to GetLocaleInfoW().
kernel32: Added InitOnceInitialize() implementation.
kernel32: Single thread test for InitOnceExecuteOnce().
changed some git settings
Update for 2012F
Form表单及验证错误信息使用bootstrap样式
PCH default OFF for GCC
修正爆炸和落地的问题。
计划使用状态机。
New user issue
* More work on +bridge. Firebird dropship tile almost there.
* added mail msgids
* added perl script to replace the msgids in the existing po files
* fixed parsing of " in translatable strings
* use the msgids for the campaign descriptions
* added missing gettext markers
* reduced code duplication and introduced CL_Translate
* use msgids for the event mails
* use msgids for technologies
* added CL_Translate to cgame interface
* translate the campaign texts via msgid
* converted po files to use the long msgids
* add msgid support to mail headers
* add hashmap support to msgids
* removed union from installation_t - some checks are not yet prepared for this
* always #include yourself first
* removed useless include
Drunks!
Drunks!
アレを消した
fixed cache size reporting in 32bit
added router_cache plugin
[feature] social share buttons
[fix] api/links
Cleans Gemfile.lock
add args for makefile
Updated _posts/2012-12-02-interesting-the-world.md
initialize ProcessInfo::SystemInfo at startup, add pageSize
Removed ending slash on opauth.org
Some improvements to exception handling
Merge branch 'master' of https://github.com/STEllAR-GROUP/hpx
Manually merging vamatya's fixes to sheneos (see https://github.com/STEllAR-GROUP/hpx/pull/560)
Fixed #561: Boost.Tuple is not move aware
Fixing gcc compilation problems
Adding hpx::util::make_tuple
Fix warnings
More gcc 4.4 fixes for regression tests
Revert "More gcc 4.4 fixes for regression tests"

This reverts commit 1c7b4bc2bc08effe6f136657bfc5cfb0e3d16981.
Merge branch 'master' of https://github.com/STEllAR-GROUP/hpx
Merge branch 'master' of https://github.com/vamatya/hpx
fixed: added missing FileTimeToLocalFileTime implementation in order to handle utc dates correctly
Schachbrett hinzugefügt
* WIP: Computation of Flow Control RWIN

Signed-off-by: Jiri Hnidek <jiri.hnidek@tul.cz>
fixed a bug with this._ in a class, happens when want to override a method of its super
remove quoting on agent-provideses
新增产品详情页面
Undoing my changing. Git-fu is not strong :(. Need to create a new branch.
cherry-pick: don't forget -s on failure

In case 'git cherry-pick -s <commit>' failed, the user had to use 'git
commit -s' (i.e. state the -s option again), which is easy to forget
about.  Instead, write the signed-off-by line early, so plain 'git
commit' will have the same result.
Fix library reference ordering in Makefile
Distributed rendering with multiple remote nodes and a job queue now functional... in gdb; abort on normal run
Remove cruft from node_modules
Experimenting with a volofile requiring a global volo module. Does not work.
lgkvs;mg
Sun Jul  8 00:30:31 JST 2012
impl more libm funcs
improve float compatibility
sql to create all tables and fix typo
Added -P flag to SFTP put command to allow preserving of file date information
Fix a lot of translations
* 为RequestContext增加了commitHeaders功能，这样，当buffering关掉时，确保headers能正常输出到浏览器。
添加测试
添加测试
改进interface implementor builder，支持一次添加多个接口。
* 为RequestContext增加了commitHeaders功能，这样，当buffering关掉时，确保headers能正常输出到浏览器。
添加多线程测试
改进LazyCommitRequestContext为TwoPhaseCommitRequestContext
改进BasicRequestContext为TwoPhaseCommitRequestContext
  * 改进了CookieStore，确保cookie能在response被提交前写入。
修正mail的测试
当cookie store无法提交时，显示warn日志
Merge branch 'dev-3.1.2' into dev-3.0.10
Made cell field and label public
reorder again vundle ignore... order is not the problem
Adding xcode open in zshrc
too-large a batch of changes forgotten long ago
bugfix: handle editing files containing ansi escape codes (badly)

Still causes editing problems, but at least it doesn't crash.

	modified:   editor.rb
bugfix: puts->print in menu method

	modified:   editor.rb
bugfix: backspace/delete problems when not enough columns in the row

	modified:   editor.rb
log if resource has VersionableV2 not implemented
(ipad experimentation)
(ipad experimentation)
fixed ccw order for triangle generation
Merge branch 'master' of github.com:x3dom/x3dom
when, configuring the Finders, the scale is set b4 the Finder is
configured, to ensure the correct value is used
Merge branch 'master' of github.com:xalpha/iris
Merge branch 'master' of github.com:xalpha/iris
Merge branch 'master' of github.com:xalpha/iris
redesigning the Error tab to offer an overview of the cameras
- added configuration dialog and selection for the cameras
- added option to use a preexisting Intrinsic matrix to the tow opencv
calibration Dialogs
- The error polot now also shows the current camera and the current pose
modifications all around the bord in order to support guessed or fixed
intrinsic parameters
Merge branch 'master' of github.com:xalpha/iris
Merge branch 'distortion' of github.com:xalpha/iris
window => win
Added functionality on the volume indicator button.
Avoid parallel initialization of slf4j logger
add enable for y2012s
Use a if, not a switch, in the hash() function

With some browsers, switch are terrible performance wise.
Add an option to disable the in_word_set function generation
bugfix in Form::disable_fields()
reprise. Want it bad ? Success !
Fixes #1201. CMenu now supports HTML attributes for the links' wrap element specified in $linkLabelWrapper.
Merge branch 'master' of git://github.com/yiisoft/yii into 1201-cmenu-link-label-wrapper

Conflicts:
	CHANGELOG
Merge branch 'master' of git://github.com/yiisoft/yii into 1201-cmenu-link-label-wrapper

Conflicts:
	CHANGELOG
Fixed styling issues.
Merge pull request #1202 from resurtm/1201-cmenu-link-label-wrapper

Fixes #1201. CMenu now supports HTML attributes for the links' wrap element specified in $linkLabelWrapper.
Method "CWebUser::getReturnUrl()" has been fixed, allowing to determine default URL correctly if "CUrlManager::showScriptName" is set to "false".
Fix for issue #126 has been added to CHANGELOG.
Merge remote-tracking branch 'klimov-paul/126-CWebUser-incorrectly-determines-returnUrl'

Conflicts:
	CHANGELOG
* init-edict.el: el-get check hg
GRAPHICS SHIT

Chicken / Platform
Move hookmanager
Remove EventManager and ServiceManager code and update resource file
Fix typehint
Fix typehinting and removed files
New models mockups and minor fixes
Support AN 6.0.0.5 (new build, same version)
New version: 1.8.4
update mydebug.h
add clean of make
change version for rubygems
Dodanie shoutboxa
changed url to dummy url
deactivate credit action
progress bar into ajax dialog
count entities on sales page
date format
sales report init
change log format
del zmq serv
Fixed bug in Draft working plane (Jose)
Small bugfixes in Draft

+ Draft point is now disabled when no document is open
+ Fix in Draft DXF import
poeta scroll offsets
Merge branch 'master' of github.com:8manos/pombo