labofsahil/github-event-dataset-2012 huggingface dataset:
Add the history id in the bash prompt

Thee number between  the brace at the beginning of the prompt is the
index of the current comand in the bash history. The command will be
accessible from the history using the ! shortcut. Exemple :

    (1029)[jonathan@nestor dotfiles (master)]$ ls
    _bashrc  _fonts      install.sh       _vim    _vmdrc
    _bin     _gitconfig  README.markdown  _vimrc
    (1030)[jonathan@nestor dotfiles (master)]$ !1029
    ls
    _bashrc  _fonts      install.sh       _vim    _vmdrc
    _bin     _gitconfig  README.markdown  _vimrc
Merge remote-tracking branch 'origin'
actually alloc the interval and some app settings changes
Simple clarity
All Around You -> Don't Worry Be Happy
Executable stored in dict.
Cleared SSL verification.
Adds script to run scripts between commits.
added scientific names table/model/etc
Import crops spreadsheet.
Run 'rake db:seed' to load up the data.
Showing scientific names on the crop page
Only logged in users can add/edit scientific names
Some small tweaks to crops tests along the way
standardised some capitalisation and spelling
Merge pull request #44 from Skud/cropimport

Crop import
Create some test users in dev and test environments.

They're called test1, test2, test3 and have passwords password1 etc.
Run `rake db:seed` or `rake db:setup` to get them.
Create Update table and associated gubbins
Post new updates

 - always use the ID of the logged-in user
Merge pull request #45 from pozorvlak/test_users

Create some test users in dev and test environments.
Defuglify the "Edit update" page.
Defuglify the "show updates" page.
Link update/show to profile of author.
Show list of updates on a user's profile page.

Listed in reverse chronological order.
Add "Post an update" link to the header
Fetch updates in reverse chronological order by default.
Show updates in divs instead of tables

Using a partial to DRY out the rendering.
Link to list of recent updates from homepage.
Use Markdown to display updates
Added tests for markdown formatting
Adds additional validation option required_unless

Adds the ability to require a valid value for a field only if another field is empty. Currently, you can only do the opposite, and require a valid value only if another field is valid.

Signed-off-by: Jason Chaney <jason@creativeacceleration.com>
WIP - done cursor and margin setters
Added Lambada based Object Creation to speed up dynamic opbject creations
Added Lambada based object creation
Added first pieces of the sinatra front-end as a proof-of concept with the same basic page structure as the current rails front-end
added matlab and .pl scripts. Last commit before using  new src
added note to visualizer
Integrating PubNub and Rails project blurb stuffz.
Merge branch 'dev' of https://github.com/jdiago/case_blurb into dev
Modded blurb model and controller to accept JSON POST data
GH-26: relax thor version constraint
Merge pull request #27 from tknerr/libvirt

GH-26: relax thor version constraint
Adds support for Hive
poprawa migracji (String na string)
Update the position when the filter applies.
[maven-release-plugin] prepare release jenkins-1.475
[maven-release-plugin] prepare for next development iteration
updated changelog for release
releasing a new plugin parent POM
toward the next release
updated changelog as a part of the release
merged back the RC branch
fix habtm/:join_table bug, closes #6

fix an issue introduced in matthuhiggins/foreigner@f29d0f1 ... :join_table
could be a symbol, which causes remove_prefix_and_suffix to blow up.

table names from other associations do not have this issue, as they are
always strings. regardless, this commit adds better test coverage so that
we know if any to_ruby call breaks.
Scenario [Estimating]
added case in which all estimates were given, but a participant tries to change his estimate an exception is thrown
JERSEY-1291 fixed - considering generic type info for sending/receiving an entity

git-svn-id: https://svn.java.net/svn/jersey~svn/trunk@5754 2fda5173-fe30-0410-90bd-98ff5453417f
OSGi fix for GlassFish + updated JSONHelper.isNaturalNotationEnabled when jaxbProvider is null

git-svn-id: https://svn.java.net/svn/jersey~svn/trunk@5778 2fda5173-fe30-0410-90bd-98ff5453417f
More package reorganization.
More package reorganization.
Cleaned up packages and imports code.
DocSearch: Fix searching: Never let the calling code access (and modify) the original document list

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Image import: Workaround: On ArchLinux, PIL lazy init doesn't work. We have to force the image loading before spliting it

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
OCR: Reenable multi-threading ...

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
OCR: Score with spell checking: Change the way scores are computed

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Main window: At the end of the scan, make sure the thread dedicated to update the progress bar is correctly stopped

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Main window: Export dialog:
- Attach the "Save as" dialog to the main window
- If no export format is available (usually if no doc/page is displayed), don't let the user try to select a path: We need a mime-type to do so

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Merge branch 'master' into gobject

Conflicts:
	src/paperwork/frontend/mainwindow.py
Gobject introspection migration: Keep fixing things

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
gobject introspection: keep fixing things

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Make sure prerequisite task is not null.
Inicio de Sesión Actualizado, Creación about.php y help.php
Test Devise overrides.
From Home
From Home
From Home
created a calendar object
added all the files to the repository
bootcamps: Add latlng metadata to several bootcamps

I don't have any personal connection to these boot camps, so I mostly
used the location of the hosting university.  Some of these boot camps
actually list addresses (e.g. 2013-01-CAMH) or link to pages that do
(e.g. 2013-02-amos), and I used that location to get more accurate
coordinates where possible.
bootcamps/index.html: Auto-generate Google Map using JavaScript

Use the Google Maps' v3 JavaScript API [1] to automatically construct a
map of boot camp locations.  This commit translates work by Matt Davis
and me on an initial Jekyll-based implementation over to Jinja.  Matt's
commits are [2]:

  commit 68931d42b1b0b8f145f912f86692f1793b4a55f3
  Author: Matt Davis <jiffyclub@gmail.com>
  Date:   Tue Dec 11 21:36:39 2012 -0500

    Reformatting the the map info windows for readability.

and [3]:

  commit ebe218697314c04de9fd9e35012b013bedb488b5
  Author: Matt Davis <jiffyclub@gmail.com>
  Date:   Tue Dec 11 18:19:56 2012 -0500

    Adding an info window to map pins when they are clicked. Includes
    the venue, date, and a link to the boot camp page.

[1]: https://developers.google.com/maps/documentation/javascript/
[2]: https://github.com/wking/boot-camps/commit/68931d42b1b0b8f145f912f86692f1793b4a55f3
[3]: https://github.com/wking/boot-camps/commit/ebe218697314c04de9fd9e35012b013bedb488b5
Merge pull request #165 from wking/bootcamp-latlng

bootcamps: Add latlng metadata to several bootcamps
Merge pull request #21 from wking/google-map

Write program to sync the Google Map and Google Calendar with actual workshop data
A simpler solution to getting excerpts for blog posts right.
Merge pull request #166 from gvwilson/master

Expanding template variables in blog post excerpts in blog/index.html.
This closes #159.
Changing Google Analytics account to admin@software-carpentry.org
Merge pull request #167 from gvwilson/master

Starting to consolidate accounts
compile.py: Remove date from iCalendar SUMMARY

Reported by Matt Davis:

On Sat, Dec 29, 2012 at 08:18:13PM -0800, Matt wrote:
> The events in http://software-carpentry.org/bootcamps.ics have the
> date in their `SUMMARY` field, e.g. `SUMMARY:University of Oslo\,
> Sep 17-18\, 2012`. The summary field is used in the embedded Google
> calendar and the date adds a lot of text and makes it look
> crowded. This is on a calendar so it shouldn't be necessary to
> repeat the date in the summary.
Merge pull request #169 from wking/calendar-no-dates

Remove dates from calendar event summaries
Putting an image on the home page and using multi-column layout
Merge pull request #170 from gvwilson/master

Making home page a little more attractive
setter is done
test commit
Merge branch 'master' of https://github.com/jin-young/RepCRec
first commit
PVR context wasn't saved/restored correctly
Merge pull request #155 from dekani/master

PVR Fix : Contest wasn't saved/restored correctly
duplicate aliases
More debug. Strange that dir1 is not being picked up, but it's subdirectory is.
Add PasswordEncoder
make code a little difficult-reading.
- remove obsolete = { syntac
- print context for yyerror()
- add a production to clarify a syntax error
support anti-aliased fonts
Correct inverted boolean logic for the coherent flag introduced in r1.61

Fixes slow nfs seen by msaitoh@
make anti-aliased character drawing work on hardware where stride != width * bytes per pixel
allow non-command keysyms to be mapped as commands (experimental)
Run $(TOOL_CTAGS) instead of ctags: sometimes it's better than the host's
native ctags, and it's nice to have consistent ctags from one host to another.
+ ly
- use {g,s}etprogname()
- fix usage
Add --date and --reference to SYNOPSIS.
When allocating the kernel virtual addresses, make sure to match the
color of the user addresses.
Add MEMSIZE as an option.
Support a MEMSIZE option
fix the mystery of the bad directory times.
apply 2012g via patch
update for tzcode2012g
remove error(1) output.
The id chgrp command is required to change is not uid but gid.
Note that -d, -r, and -t are mutually exclusive and only the last one
is used.

While here, alphabetize the other list of r/d/t flags.
Remove useless md_may_remove_boot_medium messages.  PR/47039
xen: don't use grants 0-8

Not all grants from the first frame can be used, grants from 0 to 8
(both included) are reserved for external tools. Using this grants
caused system crashes and fs corruption.

Closes PR port-xen/47057 and port-xen/47056
Reviewed by bouyer@
introduce programme C16LNAPP.SCN
Removed Unity Project Files

Removed unity project files because I am just going to keep the code
files in the repository from now on. Added the character state files.
toolchain: fix up lib64 symlink to lib before copying the initial prefix dir to avoid errors on copying

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32556 3c298f89-4303-0410-b956-a3cf2f4a3e73
uClibc: split the package into the main directory and the headers/ and utils/ subdirectories to clean up build order and fix quilt support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32557 3c298f89-4303-0410-b956-a3cf2f4a3e73
uClibc: add -Wno-unused-but-set-variable to get rid of unnecessary warning logspam

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32558 3c298f89-4303-0410-b956-a3cf2f4a3e73
config: tag parallel build options with high build breakage probability with a BROKEN dependency to discourage users from spamming us with tickets about them

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32559 3c298f89-4303-0410-b956-a3cf2f4a3e73
dnsmasq: Bump to v2.60
[lantiq] add mtd split and atm patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34129 3c298f89-4303-0410-b956-a3cf2f4a3e73
[lantiq] a few more dts files (WIP)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34130 3c298f89-4303-0410-b956-a3cf2f4a3e73
[lantiq] add more profiles

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34131 3c298f89-4303-0410-b956-a3cf2f4a3e73
[package] toolchain: fix libgcc and libgfortran packages for avr32 and coldfire

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32772 3c298f89-4303-0410-b956-a3cf2f4a3e73
Reorganized a bit, added polymorphism Element => Building
digital: these classes are part of the digital library
Merge branch 'master' into next
Bidirectional-streams Over Synchronous HTTP (BOSH) is a transport
protocol that emulates a bidirectional stream between two entities (such
as a client and a server) by using multiple synchronous HTTP
request/response pairs without requiring the use of polling or
asynchronous chunking.

It is a draft standard of the XMPP Standards Foundation.

The related standard XMPP Over BOSH defines how BOSH may be used to
transport XMPP stanzas. The result is an HTTP binding for XMPP
communications that is intended to be used in situations where a device
or client is unable to maintain a long-lived TCP connection to an XMPP
server.

This is a imlementation of the BOSH protocol specified by XEP-0124.
It is not very compliant but it is a stable one.
Note that is is still in development and it is unstable, use it at your
own risk.
Support for multiple file upload.

Squashed commit of the following:

commit fb8814186380c7444e3dfe602215761497b4e606
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 22:06:07 2012 +0200

    Improved implementation. Removing need for YAML. Extending the driver API to take an Array when 'multiple' attribute is present.

commit 977f1c50c2637b9689f45c292bb8a4a7ea10d105
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 11:56:04 2012 +0200

    Changing decision criteria to support 1.8.7

commit b217deef4a4200a84bad61bc195dc929f00e9409
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 10:38:16 2012 +0200

    Support for 'multiple' attribute in input tags, see https://github.com/jnicklas/capybara/issues/778

commit 155b9fcf7904cfd65bafe79974f9b930543e32c7
Author: Jarl Friis <jarl@softace.dk>
Date:   Mon Sep 3 10:33:00 2012 +0200

    Test that demonstrates lack of support for 'multiple' attribute in input tags, see https://github.com/jnicklas/capybara/issues/778

Conflicts:

	lib/capybara/node/actions.rb
	lib/capybara/selenium/node.rb
	lib/capybara/spec/session/attach_file_spec.rb
Merge pull request #825 from softace/master_multiple_file_upload

Support for multiple file upload.
Rename parameter.

original is more revealing than source.
Some query cleanup.

* added Query#cursor which returns Mongo::Cursor with query's criteria
and options applied.
* added Query#criteria_hash and Query#options_hash which call to_hash
on related source hash
* added hash_for_key to determine which hash should be used based on
the key provided
first commit
Merge branch 'master' of github.com:jojo2056/sacinter
#15949, 15899: avoid using non-latin1 chars in the doc (they break `make all-pdf`).
#15949, 15899: merge with 3.2.
#15925: fix regression: return None for null and non-date strings.

Since the logic for null detection had to move into the _parseaddr
functions, I removed the wrappers from email.utils and just import the
_parseaddr functions directly.
Renamed ReferenceDoc.md to REFERENCE.md
Can now overwrite default settings
Work in progress: PEP-0008
Limited zooming, worked on layerhandler
Merge branch 'master' of github.com:joniz7/Multiplaya
Worked on layer stuff
# [#29387] unpublish button don't work. Thanks Roberto
# [#29307] getComponentsWithConfig does not work for custom components.
Thanks Patrick
JXMLElement and JFactory::getXML() are deprecated. SimpleXML should be used directly.
Add tests and documentation about --recursive
added some defensive coding to part two of the blog tutorial
Bump version in prep for next release
Update ignores
Update the release target name
Create multiple solution.tmp files if multiple concurrent runs in the same directory
Update to use TimerUtils.getCounter() instead of System.currentTimeMillis()
Increase cache size
Remove completely unused thread pool
Extract ToolFrame to a top-level class
Move parallel simulation support to SwarmSimulation class
Modified the DromeGLView class for iOS to create an ES1 context if an ES2 context can't be created.
Timeout length
Update unnethack to 4.0.0. No change in patches needed.
PLIST cleanup.
combox bug fix
Fixes #266, if document.readyState is in interactive, it means dom can be touched.
Fixed return type in PHPDoc.
Issue #27
Added delete team feature #29
Merge pull request #30 from jrogde/develop

Delete team + preference long/short click for selecting player added
adding TODO items with links
Since we now are going to work in master, all changes were moved there from develop
#POULPE-319 Made small fixes
Re-fixed some fixes already pushed but overwritten (7cbdd38).
Also uncommented out the code the update window icon on status change.
Merge pull request #12 from Porlington/src-testing

Re-fixed some fixes already pushed but overwritten (7cbdd38).
readded profile, pythonrc, xdefaults from sontek

don't know why this got lost, certainly useful and helpful
removed leftover border
users looking good
Add disclaimer and GameDevLogo
Fix issues with non-base validation processors

Fixed issues that didn't allow non-base validation processors to be
run. This was related to using default version of
BackboneFieldAnnotationWriter instead of one given with constructor
arguments. The bug affected mainly the tests but it could have affected
production code (if only someone would use this in production someday).
Fix also enables the user to add custom validation processors
on-the-fly.
refactoring and small work
refactoring make_pinya
editing baix group
added baix groups
added baix groups
corrected call
JACK typo fix.
Couple of additions to MemoryInputStream.
Linux compile error fix.
Razred Ucitelj
Adding servlet support
First version integrating felix with web
Ssh working now
max table size
Merge branch 'tp/ibm_next_03_07_2012' into ibm_next_tmp
Merge branch 'tp/jim_next_logs' into ibm_next_tmp
Merge branch 'tp/fix_v4_check_access_1' into ibm_next_tmp
Merge branch 'tp/lwr_create' into ibm_next_tmp
Merge branch 'tp/jim_next_log2' into ibm_next_tmp
Merge branch 'tp/secinfo_fix_0709_1' into ibm_next_tmp
Merge branch 'tp/mspac_0709' into ibm_next_tmp
Merge branch 'tp/lwr_fhexp2' into ibm_next_tmp
Merge branch 'tp/ibm_next_w_debuginfo_and_snmp_Script' into ibm_next_tmp
Merge branch 'tp/ibm_next_log1' into ibm_next_tmp
Merge branch 'tp/mount_fix_pt' into ibm_next_pt_tmp
Merge branch 'tp/config_doc' into ibm_next_pt_tmp
Merge branch 'tp/81022367' into ibm_next_pt_tmp
Merge branch 'tp/81021878' into ibm_next_pt_tmp
This is to remap the following FSI_XXX trace level to ganesha
NIV_XXX level

- FSI_FATAL -> NIV_MAJ
- FSI_ERR   -> NIV_CRIT

Signed-off-by: Hin Lam <hincheuk@us.ibm.com>
Merge branch 'tp/mount_fix_pt' into ibm_next_pt_tmp
Merge branch 'tp/config_doc' into ibm_next_pt_tmp
Merge branch 'tp/81022367' into ibm_next_pt_tmp
Merge branch 'tp/81021878' into ibm_next_pt_tmp
Merge branch 'tp/81022368_v2' into ibm_next_pt_tmp
Merge branch 'tp/disable_symlinks' into ibm_next_pt_tmp
Added debug flag to serve, inboxServer, and processMessage. If the flag is false, processMessage doesn't add to the log.
Remove trailing error
Changed disclaimer position from absolute to relative
Added css file
Getting started with haml
big ass commit
Increased required Android version for location module.
Accept blocks while defining attributes
v0.0.6
[core] fix i18n issue in class_groups/students/destroy
No need to export variables. Added one more test.
add : link to position papers posted by attendees
Use git instead of darcs in source distribution target
Remove duplicate code in UFO detection.

The code was looping twice for Crafts, once inside the other. This was probably
a result of a bad automerge.
Merge pull request #208 from karvanit/fix-remove-duplicated-loop

Remove duplicate code in UFO detection.
New localization code.

We are now returning LocalizedText instead of plain std::wstring. LocalizedText
understands how to replace markers with arguments, although no one is using it
yet.
Refactored translation calls.

Added translation functions State::tr() and changed all State-derived classes to
use them instead of going through the _game pointers.
Use the plural code for STR_DAY.

This is actually the only obvious place where we had this distinction.
L10N: STR_NOT_ENOUGH_ammotype_TO_ARM_HWP

Instead of making the sentence out of parts, allow translators to translate the
whole message.
Created basic model framework, and implemented Users.pm.
avoiding ByteString.Char8.
avoiding ByteString.Char8.
main参数个数至少有1个
deprecated classToXML - no changes can be made to the classes now..haha.
haha, thanks https://twitter.com/accohen/status/238313827383533568
Reduce the line weight on the main revision graph
Change the ref display to be less heavy and more "Mac-like"
Add gitignore
Change gitignore
upraded pciutils
Nuevo adaptador para representar los elementos de la consulta.
Añadido campo "luminosidad" a la base de datos.
Added search more functionality
Resolved 'view all' button click issue. No filters are applied on click
LEA 追加。
Invoice fix for nextBillingDate timezone
entitlement: fix NPE in transfer code

We ignore cancel events altogether that happen after the transfer date
- we assume that we're not interested in transferring cancelled
subscriptions (i.e. transferred subscriptions should always be active).

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
entitlement: fix account_record_id for transferred bundles

We need two contexts while doing a transfer, so the right
account_record_id is used both to cancel the old subscription and to
create events for the new one.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
invoice: fix NPE in tests

Make sure to mock the account timezone - it is now required to compute
the next invoice notification date.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
invoice: fix another NPE in tests

Same issue as 9073a3bd3f.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Implement a dirty fix to allow NCs to chnage their plans after they got migrated but before the billing starts happening in Killbill. The fix will reflect the new entitlement correctly but only start billing when they reach their first billing date. The billing will happen with the latest plan they are on.
Fix for previous commit 9a912805c488ac9a7ddf3e7454be0a771a94b026; need to look at prev instaed of cur
logs: update various log messages

To make it easier to debug invoice generation in production,
revisit how we pretty-print billing events and invoice items generated.

More work is required, this is only a first pass.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge branch 'master' of github.com:killbill/killbill
Merge branch 'master' into queues-rework
junction: fix test issue

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
[maven-release-plugin] prepare release killbill-0.1.44
[maven-release-plugin] prepare for next development iteration
Refactoring for entitlement to remove SubscriptionFactory dependency
Implement auto relbalancing of CBA
Merge branch 'master' into queues-rework-low-latency

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/api/svcs/DefaultEntitlementInternalApi.java
Refactoring around Subscriptionfactory
Remove SubscriptionFactory completely
Remove dependency on notificationQ when requests are IMM. That way we can lower the poll interval to something bigger and reduce load on database.
new list items better view
restructured the Db and Template classes to use the AbstractFactory trait to fix some DRY issues
fixed emerald's init file
moved all config settings to core/config while testing the site
worked on seafoam and crimson. seafoam can now do ultra basic read operations and the way crimson's config is handled is a bit different. i hesitate to say better. just different. also added an article model and modified the article controller to help test the seafoam models
small doc updates, added pep8 test
added config vars support
Severino now takes screenshots under screenshots/pagename/browser-pagename.png
AOJ #0000-#0025
AOJ #0026-#0051
header isn't being fix now
Actually works :P
Add initial website
Add support stuff
Add Jasmine
Add source
Add specs
Add Cakefile
Add package.json
Update website
Clean up

* Remove Milk.Match module, put all matchers into spec-helper
* Remove Milk.Core.Date, will probably be added later releases again
* Remove Milk.Core.Function, will probably be added in later releases again
Restructure modules
Remove token support
Add specs for #is_comparable()
Add specs for #is_copyable()
Add specs for #compare_to()
Tweak spec descriptions & comments
Update website
Add specs for #mixin()
Add specs for #merge()
Add specs for #with_defaults()
Tweak #with_defaults()
moved lists to def files so they won't get overwritten with a git update
rubyconfigure.rb
teach ruby symbol rule to gtags
add --disable-shared
first commit
own version of slime to have the contrib and install anything-slime
refactoring
fix hook variables
Merge branch 'master' of github-kototama:kototama/.emacs.d
Fixed a problem with weird digits repositioning after rotation.
Merge branch 'master' of https://github.com/kovpas/PMCalendar
umhang iwrd sinnvoll angezogen
adding diets
changed diet layout
Changed diet tab
Changed diet tab
Mergine
Merge branch 'master' into develop
Fixed button in diets
Extended features

Added options capabilities
Added the ability to set characterset
Added the option wather the unicode characters in the response must be
ASCII encoded (RFC 4627 - IETF)
renamed hgroup regions to header so they fell in line with template suggestions
adding git-flow submodule
nesten fungerende rendermsze
Merge branch 'master' of ssh://git@github.com/kryel/SecretRobot.git
rendermaze updatew
Reformatted & small fixes
Update DropboxUploader.php
Povolení cachování textur (druhý loading bude již rychlejší)
dired編集機能, rakefile開くときにruby-mode, ミニバッファの履歴
Mod sign out
updated to be more reactive by integrating methods for use by a java DDP client
changed structure of data and some of the files
Added error checking for URLs that were imported from gPodder.

In case we can't parse the response.
removed hammer from vimrc
What is Raw Socket?
adding a chrome dll build configuration that auto pairs
Merge branch 'master' of github.com:kzahel/btlauncher
#22 use sqlite for development
#22 use sqlite for development
1) Cleaned up CLContext
Apps Ini
Merge branch 'master' of github.com:lagden/sfSorocaba
add five
add six
add ten
add seven
resolve conflict
Frequency Response working
Some more values that need rounding in the native drivers

This makes comparison with the LaTeX2e ones a little easier


git-svn-id: svn+ssh://comedy.dante.de/serv/latex-project/svn/experimental/trunk@3649 de43f980-851b-0410-b2f7-c40aca1f87e0
This dumps the mixed variable and it preserves both spaces and line breaks instead of putting the var_dump all into one line like dd().
地图中心位置可以跟随转动
still changes for twFilemanagerPlugin
users can now edit and update their information
Protecting edit and update with a before filter
Access control (Cant edit a user who isnt you)
Working index page (see all users)
Users index pagination
Can now delete users (as admins)
Hello World Spring 3
<libmaple/dma.h>: Assert LeafLabs copyright.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Change the version and repository to deploy
Minor change to ois text
Merge pull request #41 from cfinn2010/master

Minor change to ois text
Fixed Beach and LCOT matches.
This sets all un64_t to ld (instead of lld). Reverts previous commit, part of another.
added pyc files to list
user remove
ちょっとゴミ掃除。
鉤縄を離す際の入力を[S]キーに変更。
細かい調整。
アニメーション、描画周り整備中。
Edit carousel content
add gitignore file
modify gitignore
backup Sat Sep 22 07:35:02 UTC 2012
Disable binary mode

I was unable to connect with binary mode enabled. "WebSocket binary
sub-protocol requested but not supported" error in Firebug console (Firefox
14.0.1) then state goes to failed.
Mucking around with weighted one vs many
Made spooling configurable for `batch_notify_users`.
Added exception catching to `batch_notify_users`. Improved exception messages.
Created a config for MxitApi.
Created controller extensions for MxitApi.
Merge pull request #14 from linsen/api-wrapper

API wrapper updates
Score counter updated
[WP8 Sample] DrawingSurface

Fix GetTexture
[*] Address pattern search changes.
Added imperative insertion-at
update recommender_multi.py
index school
sort position
add vim-smartinput as submodule
Some renames to use the 'visitor' nomenclature, no functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165083 91177308-0d34-0410-b5e6-96231b3b80d8
Introduce ASTConsumer::HandleImplicitImportDecl() callback that is invoked
when an ImportDecl that was implicitly created due to an inclusion directive.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165084 91177308-0d34-0410-b5e6-96231b3b80d8
Add a FIXME.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165085 91177308-0d34-0410-b5e6-96231b3b80d8
Set the file entry for a Module* that was created during deserialization
of a module file.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165086 91177308-0d34-0410-b5e6-96231b3b80d8
[PCH] Fix serialization of an ImportDecl.

ImportDecl's module ID was not written out and the reader accepted as module ID
the serialized:
  Record.push_back(!IdentifierLocs.empty());

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165087 91177308-0d34-0410-b5e6-96231b3b80d8
InlineObjCInstanceMethod.m: Remove lines introduced in r165079. It broke some builds, on FreeBSD, Linux and Windows.

error: 'warning' diagnostics expected but not seen:
  Line 94: types are incompatible
1 error generated.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165088 91177308-0d34-0410-b5e6-96231b3b80d8
Fix the location of the fixit for -Wnewline-eof.

It turns out SourceManager treating the "one-past-the-end" location as invalid,
but then failing to set the invalid flag properly.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158699 91177308-0d34-0410-b5e6-96231b3b80d8
Improve the specification of spellings in Attr.td.

Note that this is mostly a structural patch that handles the change from the old
spelling style to the new one. One consequence of this is that all AT_foo_bar
enum values have changed to not be based off of the first spelling, but rather
off of the class name, so they are now AT_FooBar and the like (a straw poll on
IRC showed support for this). Apologies for code churn.

Most attributes have GNU spellings as a temporary solution until everything else
is sorted out (such as a Keyword spelling, which I intend to add if someone else
doesn't beat me to it). This is definitely a WIP.

I've also killed BaseCheckAttr since it was unused, and I had to go through
every attribute anyway.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158700 91177308-0d34-0410-b5e6-96231b3b80d8
Implement IRGen for C++11's "T{1, 2, 3}", where T is an aggregate and the
expression is treated as an lvalue.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156781 91177308-0d34-0410-b5e6-96231b3b80d8
add embedded linux variants that occur in the field

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156813 91177308-0d34-0410-b5e6-96231b3b80d8
Fixes crasher bug in JSONCompilationDatabase for invalid input.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156814 91177308-0d34-0410-b5e6-96231b3b80d8
This patch makes the behavior of clang consistent with the behavior of gcc 4.6 in cases where both -fPIC and -fPIE is used.

- Separately check if -fPIE was specified in the command line and define both __PIC__ and __PIE__ when -fPIE is used. We need to check this separately because -fPIE will infer -fPIC even if its not explicitly used.
- Fixed existing tests.
- Added new tests for cases where both -fPIC and -fPIE is used.

Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Fixes: PR13221
Review: http://llvm-reviews.chandlerc.com/D94

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167846 91177308-0d34-0410-b5e6-96231b3b80d8
Allow -verify to be used with files that don't have an associated FileEntry.

In Debug builds, VerifyDiagnosticConsumer checks any files with diagnostics
to make sure we got the chance to parse them for directives (expected-warning
and friends). This check previously relied on every parsed file having a
FileEntry, which broke the cling interpreter's test suite.

This commit changes the extra debug checking to mark a file as unparsed
as soon as we see a diagnostic from that file. At the very end, any files
that are still marked as unparsed are checked for directives, and a fatal
error is emitted (as before) if we find out that there were directives we
missed. -verify directives should always live in actual parsed files, not
in PCH or AST files.

Patch by Andy Gibbs, with slight modifications by me.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162171 91177308-0d34-0410-b5e6-96231b3b80d8
MIPS: Move tests check float ABI macros definitions to the more appropriate place.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154184 91177308-0d34-0410-b5e6-96231b3b80d8
Reducing idiocy
Merge pull request #11 from lncd/Uploader

Reducing idiocy
Fixed problem with public files not being found
Minor fixes

+ Project public view changes
User can delete files
Preserve milliseconds for UNIX timestamps.
Merge pull request #213 from ralphm/master

Preserve milliseconds for UNIX timestamps in date filter.
Added match config option to date filter (with test) - LOGSTASH-735
Added match config option to date filter (with test) - LOGSTASH-735
Merge remote-tracking branch 'logstash/master' into LOGSTASH-735
- style fix
- all new plugins should start life as 'experimental'
update changes
Merge branch 'LOGSTASH-735' of https://github.com/semiosis/logstash into semiosis-LOGSTASH-735

Conflicts:
	spec/filters/date.rb
Backport KSM from Linux 3.5 (latest)-edoko
Update public/upload.html
Fixed RPN logic bug in minus and divide tests.  2, 3, 4, -, -  == (4-3)-2
Updated Visual Studio 2008 project file.
Updated Korean translation. Thanks to JaeHyung Lee <kolanp@gmail.com>.
you can only have one custom domain for any given set of Pages... removed biodec.com subdomain
Add an active download to get_queue_query_response.json.
adding lazy list iteration for log file processing
trying to get tests more reliably working/printing with vows
Allow finding by id or node.
Add Edge class.
Simplify the types of stored things
fix google repo's for bluetooth
Set up copying to x clipboard from tmux
add license to master branch
Merge branch 'master' of github.com:lprincehouse/MiCA into dev
ring overlay builder abstraction
Merge branch 'dev' of github.com:lprincehouse/MiCA into dev
API is getting better.  Add / removal from decks is now supported.  Updates deck on server (but in a somewhat hackish manner).
Merge branch 'uirefresh' of github.com:luke-segars/regis into uirefresh

Conflicts:
	face/templates/question.tpl
	face/views/api.py
Added {Question|User}Providers to generalize the data sources for each.
Added LocalProviders of both types as well as (untested) QuestionProvider for CourseSharing.
Fixed a few frontend bugs.
Merge branch 'uirefresh' of github.com:luke-segars/regis into uirefresh
Fixed a couple of bugs and faked the API responses for a demo.  Everything in api_questions and api_demo was commented out, not deleted.
Currently running off of LocalQuestionProvider.
Added git to nocorrect and updated git merge tool to vimdiff
Added new git aliases with all my new git knowledge
Commmit nuevas clases, Board y Rotation
Merge branch 'master' of https://lukkm@github.com/lukkm/ScrabbleEDA.git

Conflicts:
	EDA-TPE/src/main/Dictionary.java
CIMI: Prevent re-using Struct constants in models
CIMI: Added syntax sugar for collection members
Update CIMI fixtures for server tests (fixes failing build
http://travis-ci.org/#!/mifo/deltacloud/jobs/2393329)
FGCP: move default cert dir to ~/.deltacloud/drivers/fgcp

This avoids any conflicts with the file ~/.deltacloud/config
去掉清算历史数据的相关补充数据和程序
在UpdateTIV_BookDate中加入tfund和tstgplan中bookdate的修改，但有以下需要注意:

1.这只是个临时的方法
2.指令服务器的清算并没有编写
修正了更改tfund/tstgplan中日期的一个bug
股票现金分红金额由税后修改为税前
修复头寸映射的一个重大bug
Merge branch 'fixXR'

Conflicts:
	ClearBookXR.suo
	ClearBookXR/Business.py
	ClearBookXR/Main.py
完成股票、基金、期指的证券资料导入
修改了一些中文处理的bug

1.证券名称的中文问题
2.账户名称的中文问题
3.计划中的中文问题
Merge branch 'master' into histclear
手工调整了Main.py中的一些合并的逻辑错误
package setup commit
interleave and deinterleave, credit CTB!
finall terst
finall terst
finall terst
A few odds
	../Content/map_old.txt
Merge pull request #1117 from mahagr/master

Fixes for #1116, #1098, #1084, #867
Fix #1115: User menu item redirect to integrated component not working
Remove hard limit from #971 nesting levels
Fix #844: Rank Manager changed image in backend not changed on frontend

* Move all ranks into /media/kunena/ranks
Add all missing (=empty) language files
Install translations for quickicon plugin
Check and fix some administrator and moderator permissions
Joomla 2.5: Add missing parameter to Forum menu item
Small fix into KunenaUser::isModerator/admin() functions
Fix small bug in Blue eagle remember login checkbox
Send email notifications when moderator approves topic/post
Regression: moderator in any category check has been changed, fix it
Fix broken subscriptions for global moderators whose ACL "deny" access
test
Merge pull request #2 from mahesh-p/branch1

test
adaptation to the latest connector changes
add support for assign to variable in validation regex smarty helper
Clear out unnecessary prints
clean up device.py
documentation update
added user pages, follow links on recipes to access; Following works
Updated to latest release. Package still needs a lot of work. qtcreator
exits with:
Failed to load core: /usr/pkg/lib/qtcreator/plugins/Nokia/libCore.so: Cannot load library /usr/pkg/lib/qtcreator/plugins/Nokia/libCore.so: (/usr/pkg/lib/qtcreator/libBotan.so.1: Undefined symbol "_ZTVN5Botan11POSIX_TimerE" (symnum = 7752))
Many entries added and removed due to update.
Regenerated due to package update, commenting and updating patches, and
adding a new patch.
Commented and updated to reflect changes in source file.
Source file no longer exists nor a similar file exists in distribution.
Facility that patch fixes no longer exists in source file. Patch seems
unnecessary.
Reverting to version 1.1.1.1 (removing all entries). obache@ says they're
handled automatically.
qtcreator has been updated, although the package still needs work.
- Update to 1.2
- Add LICENSE
xcowsay has been updated.
tint2 was imported into pkgsrc/x11
Added PKG_DESTDIR_SUPPORT=user-destdir. Maintainer needs to comment patches
zinf has been updated.
- Update to 1.3.1
- Remove unsupported option Firebird
Add inet6 to default suggested options. It's 2012.
Wrong string contaminated, corrected  ${PKGVERSION} -> rc.
(MORE) Wrong string contaminated, corrected  ${PKGVERSION} -> rc.
Synchronize comments with pkgsrc.
Update to OpenMPI-1.6.1a1r26586
- Take maintainership with the approve of previous maintainer(via email)
Implement SPELL_ATTR_EX4_TRIGGERD, this allows you to cast WE's Freeze without cancelling its Waterbolt. Thanks to dr.tenma!

Signed-off-by: lovelol <tifxoxo@web.de>
Signed-off-by: LilleCarl <lillecarl@gmail.com>
Fix whitespace
Improve access level check to reopen issues
Manage config workflow page does not reflect actual config

The code did not properly reflect the configuration state when building
the Access Levels form, if the minimum access level was defined using
update_bug_status_threshold and set_status_threshold wass empty, showing
'viewer' for each status except 'new'.

Consequently, saving the page without changes would cause the config to
be saved with all access levels as 'viewer'.

Fixes #14496
Simplify and improve code in manage_config_workflow_page.php

- Avoid code duplication with a function set_color_override to determine
  override of cells bgcolors attribute
- Use a single loop over the status enum in access_row()
- Removed unnecessary assignments and useless code
Workflow config: delete override if identical to parent

The code in manage_config_workflow_set.php now deletes the config
override for the current project if the new settings are identical to
the parent's (ALL_PROJECTS level if project, or file-level if all
projects).

Follow-up fix for issue #14496
Define default $g_set_status_threshold for NEW to REPORTER

This prevents incorrect highlighting of NEW status as an override in the
Access Levels section of manage_config_workflow_page.php, when
$g_bug_submit_status is different from default.

Fixes #14496 (see atrol's bugnote ~33192 and my follow up in ~33325)
Removing double version
initial Import

Signed-off-by: Marc Buils <marc.buils@gmail.com>
initial Import

Signed-off-by: Marc Buils <marc.buils@gmail.com>
Added a new test file for the supported-out-of-the-box rules
changed __get access modifier to public as it is required by php
Added tests for some rules, fixed the Rule's magic __get method that returns the next arg in queue. Now I reset the args index at the beginning of the validation in case we call validate multiple times
Update languages/nl-NL/nl-NL.mod_mdadsense.ini
Staff assistants and member services reps should be able to use the filter on the wall calendar now when they are logged in from the store.
left over name change in MANIFEST.in
added autodownload ability
fixed case issue
Warn when no plugin found (no plugin object created) even though a plugin is apparently present.
Random bits of clean-up
Started refactoring ResultInfo/Builder
Added SCOPED_CAPTURE
Disabled WIP code
Merge branch 'master' of git://github.com/philsquared/Catch

Conflicts:
	include/internal/catch_resultinfo.h
	include/internal/catch_resultinfo_builder.h
	projects/SelfTest/MiscTests.cpp
	single_include/catch.hpp
putting the rest of the readline stuff in the try/catch block. is readline built in? not 100% sure
Update venci.c
Moving to boost::asio.
Switched to treating the OPML as html fixes the unusual ttrss filter attribute
bugs
Reverting ternary statement

Not sure why the ternary version here isn't working, reverted to an if
else
Fix precise package dependencies.

Signed-off-by: Max Fierke <max@maxfierke.com>
Make kernel cleaning device agnostic and clean before switching build types.

* Left over kernel build stuff from CM7 will break AOKP and CM9 builds.

Signed-off-by: Max Fierke <max@maxfierke.com>
Minor organization correction.
Skin: Implemented focusable scrollbars.

This closes #36.

Oh! Two issues in one shot! This also closes #57.
use css instead of xpath
Garima | 1323 | Fixed duplicate controller failing on invalid id
CONFLICT RESOLVED
Fixing incorrect merge issue
#1350 Prasanna|Kavitha Added Disable User permission
Merge pull request #266 from singhgarima/master

Merged to mainstream, Thanks!
ci | Subhas | Updated travis configuration
Added IRC details
#000 Prasanna/Kavitha Removed the check for update by users with disable permissions
#1350 Prasanna|Kavitha Added device controller.Put in a link to the Devices tab
#1375 - Akash - requiring export permission to export data
#1366 - Suganthi - Linked Go button with Search functionality
#1366 - Suganthi - Fixed tests for basic search
Merge branch 'master' of http://github.com/jorgej/RapidFTR
#1366 - Suganthi - Fixed features dependent on basic search
#1350 Prasanna|Kavitha Devices page added
#1350 Prasanna/Kavitha Added Block IMEI Permission
#1348 - Ashok - Adding view and search permission for the child record
#1348 - Ashok - Removed access all data and fixing the features
1348 - Ashok - Fixed the feature Added the permission specifically to all the features
solution to #1359
index.jade fixed
Clean code - now single function traffic(dir,type,from_date,to_date)
Add per-ip traffic collection
trying popover still doesn't show but things are not broken
Merge branch 'master' of github.com:iLanguage/iField

pu;;ed from upstream
on the way to refactor permission
Merge branch 'master' of github.com:iLanguage/iField

pulled from upstream
slowly editing permission
Merge branch 'master' of github.com:iLanguage/iField

pulled from upstream
tried to get popover to work but not successuful with twitterbootstrap. alert shows up for the moment
pulled from upstream, some file I was working on was deleted and caused merge conflict, removed the file and committing the pull
Storing the number of Datum to be visible in the UserPreference #235.

Default is 3.
Made 3 Datum visible on the home page #235.

Lots not working.
listing use cases for permission in lib/users.js
solvnig merge conflict with a corpus handlebars
Merge branch 'datumContainer' of github.com:trisapeace/Drag-and-Drop-FieldLinguistics into HEAD
updating the gravatar when the user logs out
Merge branch 'master' of github.com:iLanguage/iField
somehow lost the full fix on the corpus_summary_read_embedded.handlebars, maybe i didnt commit it or the merge conflicts refverted it
Moved the "Fullscreen" icon from the datum handlbars to the datum container handlebars. #235.
Merge branch 'master' of github.com:iLanguage/iField

pulled from upstream
Resize buttons works for datum container #235
Added a dropdown on the User Preferences page to choose the number
of Datum you want to appear on the page at a time. #235.
Add generated sufia files
немного изменил вид ответа
clarity fixes to session structure and byte stats for containers and objects
GROOVY-5672: Fixed @TypeChecked not being compatible with @CompileStatic (though pointless to use both annotations on the same class node)
Made suggested changes to endpoints to be as follows:

GET /disabled - lists the disabled resources
PUT /disabled/{path} - adds a disabled entry (or POST /disabled with location of resource)
DELETE /disabled/{path} - removes the disable entry, causing the endpoint to reactivate.
Made cadmium cli command commit only make one commit per execution.
CADMIUM-85
Added javadoc comment.
Merge pull request #7 from meltmedia/commit-fix

CADMIUM-85 Consolidated git commits.
CADMIUM-87 Changed cli clone command to not copy content but to update
the target to match the source (branch and revision only).
CADMIUM-90 added secure and secureContentRoot to init-war
Merge pull request #9 from meltmedia/init-secure-war

CADMIUM-90 added secure and secureContentRoot to init-war
CADMIUM-89 Fixed initial history creation bug.
Merge pull request #10 from meltmedia/init-history-fix

CADMIUM-89 Fixed initial history creation bug.
Merge pull request #8 from meltmedia/direct-clone

CADMIUM-87 Changed cli clone command to not copy content but to update
Fixed duplicate dependency in email pom and made slf4j-simple scope test
to remove from wars.  This was causing a ClassCastException.
CADMIUM-88 Made git repo switchable.
Made rollback logic safe for github outages or network issues.
Fixed cadmium-commit script to use the correct version of docpad when
generating the content to commit.
Merge pull request #12 from meltmedia/changeable-repo

CADMIUM-88 Made git repository switchable.
CADMIUM-86 Added maven remote fetching of artifacts in deployer war.
Changed the meltmedia-oss parent to version 1.
Added a repositories block for the JBoss releases repository.
Excluded apache-xerces xml-apis from the jboss-as dependency.
Changed the group id of com.meltmedia.jgroups.aws to com.meltmedia.jgroups.
Removed commented out plugin and added source filtering in deployer pom
and removed hard coded version from DeployerService.
Merge branch 'master' of github.com:meltmedia/cadmium into maven-artifact-resolution

Conflicts:
	pom.xml
Merge pull request #13 from meltmedia/maven-artifact-resolution

CADMIUM-86 Added maven remote fetching of artifacts in deployer war.
BITO-132: Added putenv for NODE_ENV=production to the cadmium-commit
script.
MB-7440: change stat name in "Incoming XDCR Operations" section

Per request from support engineer, we change the name of "gets per
second" to "metadata reads per sec".

Change-Id: Ib0b55f429f9bf3448edb67deb0e51ec15e4bc6f4
Reviewed-on: http://review.couchbase.org/23480
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
MB-6454: compare_rep_history returns incorrect value

The incorrect value returned will crash vbucket replicator and even
make rebalance-in fail at source cluster. This change-set will fix
this issue.

Change-Id: Icc7cb516a6bee47aea02f685f8b27de98f92a550
Reviewed-on: http://review.couchbase.org/20277
Tested-by: Junyi Xie <junyi.couchbase@gmail.com>
Reviewed-by: Junyi Xie <junyi.couchbase@gmail.com>
MB-7224: Capture all .ini files

Change-Id: Ifed1b1b30dfab7c568e3dd9a6c183af880c84dde
Reviewed-on: http://review.couchbase.org/23288
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Bin Cui <bin.cui@gmail.com>