labofsahil/github-event-dataset-2012 huggingface dataset:
contacts merge problem
headerAdded
GUI-MVC Architecture implemented (View, PresentationModels and
Controller). Base classes introduced
update dto map
add configuration for helm
Added Staff Toolbar and Bootstrap
#9 fixing skybox + tweaks
Made a simple chat
Wolf eats Rabbit
change :style => 'width:380px' to :class => 'field span4'
there is no need to merge build settings
notice mail modified
Merge branch 'master' of git@github.com:maninsoft/smartworksV3.git
uct 발생시간,로고 수정,링크아이디 추가
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git

Conflicts:
	src/pro/ucity/model/OPSituation.java
correction in .bashrc, don't assume directories for simple 'edit file' calls
added resources
podspec update
Edited RubyMine workspace.xml
Fixed mandelbrot stuff
pryconsole
#16 Created new properties on Drawable to get and set position relative to the parent size.
#16 Created new properties on Drawable to get and set size relative to the parent size.
#16 Created new properties on Drawable to get and set origin relative to the size.
own deliverys
Merge branch 'master' of https://github.com/marcobaboin/bazaya-wms.git
Ajax ending picking list
ajout possibilité suppression lien
adding styling
removed unused code
Support newaxis indexing for memoryview slices
    todo: support memoryview object newaxis indexing
added a null check for gECB variable that was causing crashing when apps were closed
fixed merge conflict
rechtschreibfeher prüfung
have coordinates correct now
unnecessary file
Tabellen uit textbestand start

* Eerste codes om tabel uit textbestand te kunnen halen (niet af)
Tabellen uit textbestand start

* Eerste codes om tabel uit textbestand te kunnen halen (niet af)
new filters moved down priority
added support for loading app context beans into servlets
Removes coffeescript for companies
Adds admins profile
Orders comment by updated_at
Adds endless page with ajax
Add Exercises 10.5 solutions
added autoUpdate from github
- will need testing and further updating

Signed-off-by: Matthew Hare <matthewhare@me.com>
Merge branch 'master' of https://github.com/matthewhare/fsmbuilder

Conflicts:
	src/utils/autoupdate/AutoUpdater.as
	updater/update.xml

Signed-off-by: Matthew Hare <matthewhare@me.com>
Draft mobile view, start refactoring code model
Move Ohm/Redis connect into boot file
Extract and mount API separately
sync ALL THE CHANGES
Merge branch 'master' of github.com:mattsgarrison/Dotfiles
Offered courses list done
Add Cubism.js intro talk slides.
RAND supported
Now trying separate graphics window
now handles :x command
Fix a warning that occurs if no cache file exists
Merge pull request #10 from tobz-nz/patch-1

Fix a warning that occurs if no cache file exists
Bump version number, year, update title and description. Minor whitespace cleanup. Fix Issue #8. Encode ampersands and fix search tracking links (Removed an extra '/?' from search URLs).
Add task description
New post -- Github and languages
Finish layout and routes
	modified:   db/development.sqlite3
	modified:   log/development.log
Merge branch 'filling-in-layout'
Made basic User model (including secure passwords)
added onChange parameter, slider array is an object var
making so won't scale tiny on retina
Updating newsletter block name, updating homepage views
more styling
...
added ig file:
Welcome www.mskatusha.com
Implemented the basics of running the game environment, console player, etc.
The game adds ConsolePlayers, asks for mulligans, can play lands, and can somehwat buggily play creatures.

Next on the todo list is to finish casting creatures, then add creature combat.
I need to consider how granular I want the actions to be - should tapping lands be part of casting a spell?  Do I want to ask what colors to use for casting the spell?
The code is really ugly right now.  Probably not the right time to be worrying about it.
add Contributer field to the Recipe object
get rid of displaying recipe ID
display Contributer and give an email link to contact
protect agains null pointer exception if recipe contributer not set
minor formatting changes on the recipe table
upgrade to 3.2 Spring
Merge branch 'master' of https://github.com/mherb63/recipe-manager.git
Forward stderr via Open3#popen3

Forwarding stderr via 2>&1 causes an additional child process to be
spawned.  Killing that process does not kill webkit_server.

JavaScipt console messages and alerts are now written to the logger
instead of directly to stdout.
Remove Qt 4.7 compatibility code from CurrentUrl
Process all pending events before checking if page is loading

JavaScipt actions and other asynchronous events which cause a WebPage
load may not be processed by the time we receive an incoming command.
Ensure that these events get processed before checking if the page is
loading by calling QApplication::processEvents().

Fixes spurious failures throughout the test suite.
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiwa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan menu soal jika login sebagai mahasiswa
commit by Lindia Khurin'in

menambahkan css untuk form quiz
Merge pull request #7 from Lindia/master

branch master dari kuyin
Added project that works

Found a project that works. I edited the contents to get out hello world
as well as some other stuff. I will be editing this file to test things.
save & update callbacks run even if the document isn't dirty
events: bugfix
display creation date on issue
Lots of images, edited WorldTiles.cs to use the new tiles
Adds support for AMD
Merge pull request #1 from nnarhinen/master

Adds AMD support
self service password with no email
email enabled password reset
Compojureの記事を追加した。
superfish, nice_menus
allow hiding of files
added hide and date fields
added date downloaded
added constructor to take timestamp as long instead of string
Merge branch 'master' of https://github.com/mingfang/AxonFramework
Ignore developement group on ci
Modified to use dao and others improvements
add 4.00.1 compiler
Add various aliases, tweaks to vimrc

o Add aliases for clipboard copy/paste
o Various tweaks to vim
o Primarily add more FileType support in vim
o Set backups in vim
o Update bash_functions to create backup directories
Update gitignore to include ncmpcpp log
Be clear about which posts are drafts in list
Block title stuff
Notify about unpublished
Add theme to blog
fiked include repo
Added ftdi files
started notes on ftdi comm
added sflags to globals
added parsing files.
These will parse messages from the PC
added error flags to globals
first draft of msg parsing
support for different input msges not yet inputted
first draft of rx cmd interrupt init
added isr for ftdi rx cmd
removed empty ulithp directory
Added special rules for readln and read
Consistency in marking tosURL and privacyURL as optional
Create gh-pages branch via GitHub
Merge branch 'master' of github.com:/smollersen/Presentations into gh-pages
removed some unused stuff
readied page for presentation
ready for presentation
Merge branch 'master' of github.com:/smollersen/presentations into gh-pages
Merge branch 'master' of github.com:/smollersen/presentations into gh-pages
Merge branch 'master' of github.com:/smollersen/presentations into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Dummy commit to get pages to rebuild
starting image placement
added image_container styling to week, month and year, fixed disappearing Go To Day bug on year page
use apiVersion 3
added Entry, EntryPrintout, FormVersion and Tokenmodels
updated exception list
added encoding magic comments
manage gem with bundler
added rake test task
fixing test helper
explicitely require active support extensions
fixed builing objects array
fixed tests for ruby 1.9
added logging
added travis config
Removed ErrorDialog, a file that was accidently included from an earlier
extra credit
Improved FastBroadcastEstimatorService, fixed some errors
Updated labels and made it possible to edit role names
Added dialog for editing roles
removed TFS

Signed-off-by: Morten Foshaug <mortefos@gmail.com>
Cleanup and renamed project - project is now building (but probably not working)
started work on it again,
Reduce header pollution
Ashok,Aravind | #00 | Changes to make things rigid. No defaulting version anymore.
Removed habituatl $Id$ - makes no sense in Git, apparently.
http://stackoverflow.com/questions/384108/moving-from-cvs-to-git-id-equivalent
update readme and remove unnecessary sizing code
add ignore
add README
Free up deleted node properly
tried adding version of pg
added title with YAML for pages
added js for days 10-12
add plugin.video.filin.tv archive to repository
Adding NTP module from Erik's repo
Fix spacing
Fix buffer overflow
Add first pass of implementing if in Ruby.
Perbaikan pada jumlah comment yg tampil
Added Growl preference.
bumping chef-client version
Initial commit of our public chef recipies.
solved some more bugs
radio_buttons custom label support
ex14
ex15 and test file
Remove debugging print statement
Add conversion from bullets using numbering properties to unordered list
More copy changes and clarifications
Merge remote-tracking branch 'gengo/master' into GG-1349-top-page-copy
Update link name to legacy docs
Add note about sandbox callbacks
Merge branch 'GG-1349-top-page-copy'
GG-979 switch to using requests
GG-979 add file/upload support, glossary, and order overview

- replace httplib with requests
- clean up some imports
GG-979 add tests for fileupload and fix old ones
bump version up
longer timeout needed (when not testing locally...)
GG-979 updated documentation and installation/deps
Fix merge conflict
drugie zadanie - wersja pierwsza
smth features
Added count of unread mails
Added remove button
added Integer32 support
updated the version
tests
macro instructions support
chef-client every 10 minutes cronjob
chef-client every 10 minutes cronjob
Initial commit of working app
Note there is a serious bug in Titanium SDK <3.0
So don't build with the 1.8 / 2.0 or 2.1 series
Fix some typos in TF
Ignore more
Use the general release 3.0 SDK
Correct typo in parenthesis
Merge branch 'master' of github.com:ndastur/WellsScoreCalc

Conflicts:
	Resources/DVTWindow.js
	Resources/app.js
	Resources/testflightjs.js
Use vared in zsh instead of read.

This change seems to do what you want.  It passes ! and \ untouched, it gets history from the shell and it uses the zsh line editor for arrow keys and home/end.
Merge pull request #50 from anonfunc/patch-1

Use vared in zsh instead of read.
Updating default errors to be a hash
Postgres configuration changes
Add a full_title helper
Message
Finish layout and routes
теперь local
Added and updated ecommerce submodule
Upload Fresh Project

This merged the local repository with github.
Update before chart changes
Add automated check for new runs when on IPTS summary page
Fixed a bug that caused global listeners to not get fired on certain events
boolean ops: ==, /=, <, >, <=, >=
not boolean exp; refactor on ast, specs and exps
[NOBTS] Change agent kill is done by SIG_TERM so that jvm dump is not
generated.
[NOBTS] Provide enhanced password encorder based on configuration
[NOBTS] Make the agent kill done by SIG_TERM so that JVM dump is not
generated
[NGRINDER-17] modify project document site.
fix for error in previous commit.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47529 954f8c5b-7b00-dc11-b283-0030488c597c
Python node operator for combined node collapsing and hiding unused sockets. Socket hide flag is added to RNA as well, but can only be set when the socket is not connected, to avoid dangling links in editor drawing. Currently this operator has no default hotkey, but can be called from the Node menu.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@49898 954f8c5b-7b00-dc11-b283-0030488c597c
fix for possible uninitialized pointer use in mask rasterize and remove some dead code.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47448 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for movie distoriton node in tiles

Now it works in the same way as non-tiles node in cases when image's
resolution is not equal to resolution used for calibration.

Also add some additional checks for distortion cache, so now it should
be updating properly when camera intrinsics are changing.

Potentially added support of overscan, but currently all needed computation
is commented out.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@46873 954f8c5b-7b00-dc11-b283-0030488c597c
add back game engine python api slicing, (was missing / regression, since move to py3x)

not many people must have used it since it would crash with non-zero start slice values.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@50895 954f8c5b-7b00-dc11-b283-0030488c597c
add cask for gephi
updated nodejs installer
changing this into a personal page
personal site changes
latest
renamed html page
kick the tyres. add a comment.
Update manifests/lens.pp

Ups wrong place
update
update
update exception
Suppress errors when renaming extension folders
Tell the user to rename the extension themselves
Prepend extensions/ folder so that its more clear WHAT to rename exactly
start of ssao random texture generation
only return uptime and load average in os stats if they are available
log if sigar was loaded as well
Support for Latvian stemming: `latvian` analyzer and `latvian` language for stemmer filter, closes #1842.
Stop iterating on sub readers it the parent is found
update index.html
Update at 2012/05/22/23:27:01
fixing link references
Start about_attribute_access
Working towards consistency in views.
Move rest/management classes for api up one level.
Update REST API with new features from gatein-management
README fix + cleanup.
redo-gif
Fix Array.testReversed
Added potion tasting. Hooked up missing reload command.
Make auto rank up feature customizeable via ranks.yml file
Add methods for all child classes
deploy
a
failed
a
aa
a
fixes #7: giving an appropriate translation of 'invariant.'
horribly mangled the previous form, but needed better clarityanyway. Working to reuse the old forms but refractor to increase extensiblity and clarity
forms mostly done. now needs validation and final submit handling
most of the form is done, working on validation
the form is basically done. As always could use tweaking. Next is to handle final submission and send a request to the middle-ware component
Fixed bug that caused invalid indexing
Changes to how results are stored in the database (if used)
Bumped changelog following rel. v2.122630
use MakeMaker::Custom plugin to have a more complex override for IO::Pty
test for local compiler is used for IO::Pty
add bash support to phrasebook
add requirements for new phrasebooks
Squashed commit of the following:

commit 28a76ad5468728c901da21cb4357475b8f65e822
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 09:43:13 2012 +0000

    support for out of order entries in phrasebooks

commit 3609acab4b993693702717ea648fbcc7f502f59a
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 07:27:14 2012 +0000

    fix POD in phrasebook

commit 04b28038268913c2be3733850b90f5a31abfc869
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 07:18:30 2012 +0000

    fix phrasebook loading to use all @libs
Squashed commit of the following:

commit cc9a1fb4363987a420a6edb565ff3297a45293f8
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 04:59:13 2012 +0000

    add POD for Telnet inconsistency

commit 7f84e320a9dc7fcbb1becc319b1c2e918c503af3
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 04:53:54 2012 +0000

    bug fixes - release tests pass

commit 22f2d978af238df98fb629144b59d6a2aab8991f
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 04:06:42 2012 +0000

    fix test lib for new transport ineheritance

commit ad88025968f8be668b2913f8494e5bf8ef584a5b
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 04:02:48 2012 +0000

    add opts support to serial transport

commit f6d5988b4b434020e75649cf3cc1744540ed6771
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 03:57:32 2012 +0000

    POD fixes after refactor

commit 758e0c6baeb0b93a46523711f558d8bba8fa64e5
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Mon Sep 24 03:42:19 2012 +0000

    refactor to provide unix IPC::Run support where there is no Pty
update changes
Smarter log message for output matching prompt
the prompts named "prompt" are now called "generic"
permit ASCII escape \033 in device output
refactor phrasebook load to use inheritance properly
reorg phrasebook POD
added Loopback transport for testing
find_prompt now stores a full ActionSet after success
debug level logging will use Data::Printer on last_actionset if it can

  * IMPORTANT: the prompts named "prompt" are now called "generic"
    If you have written macros depending on these, please update your phrasebooks.

  * Make IO::Pty dependency based on compiler availability
  * Refactor to provide unix IPC::Run support where there is no IO::Pty
  * Add opts support to Serial Transport
  * Fix phrasebook loading to use all library and add_library paths
  * Support out of order entries in phrasebooks (macro/prompt refs)
  * New phrasebook for Bash shell
  * Improve documentation on how to create new phrasebooks
  * Permit ASCII escape \033 in device output
  * Added Loopback transport for testing
  * find_prompt now stores a full ActionSet after success
  * debug level logging will use Data::Printer on last_actionset if it can
Change command remove to be less greedy with whitespace (C. Bennett)
Fix loading of Data::Printer for last_actionset debug
Bumped changelog following rel. v2.123370_002
Reinserted title field on ProjectAdminForm
Merge branch 'dev' of ssh://github.com/omarestrella/Stars-CMS into dev
Diamond Classes
fix a hang-on-boot bug in systemd. update opensuse license
Merge pull request #37 from marguerite/master

fix a hang-on-boot bug in systemd service, update opensuse license
list bug item, description box in form page, image picker
resolver duplicate model group in the project
Merge branch 'feature/fetchList' into develop
Merge branch 'develop' of github.com:opendream/OpendreamBug into develop
Taking kudos out of work index
Taking out another search-by-kudos field
Commenting out tests for searching by kudos
Merge pull request #732 from elzj/index_speedup

Index speedup
fixes for NaturalEarth data pack
fix voor labelPunt, werd 2x copied in XSL
libmm-common: install missing header
libmm-glib: install missing headers
api: install common headers to ${prefix}/include/ModemManager

...instead of ${prefix}/include/mm
build: provide pkg-config files for ModemManager, libmm-common and libmm-glib
iface-modem: don't try to use the bearer list if there is none

When the modem gets unplugged, or system gone into suspend, we start losing the
modem ports one by one. When the last is lost, we trigger the disposal of the
modem (we call g_object_run_dispose() and then we call the main-reference
unref()). So, if we end up losing all ports while the connection sequence was
being run, we would end up in this situation, where we try to disconnect the
bearers (the bearer and modem objects are still valid, as we have references
around, but the list of bearers won't be available any more in the modem object
as it was cleared in the modem dispose().

Thread 0 *CRASHED* ( SIGSEGV @ 0x00000000 )

0x7f5cdbd5cda0   [ModemManager]                 - mm-bearer-list.c:163]      mm_bearer_list_foreach
0x7f5cdbd6a4bd   [ModemManager]                 - mm-iface-modem.c:110]      bearer_status_changed
0x7f5cdbad0903   [libgobject-2.0.so.0.3000.2]   - gclosure.c:774]            g_closure_invoke
0x7f5cdbae1dbb   [libgobject-2.0.so.0.3000.2]   - gsignal.c:3272]            signal_emit_unlocked_R
0x7f5cdbaeac82   [libgobject-2.0.so.0.3000.2]   - gsignal.c:3003]            g_signal_emit_valist
0x7f5cdbaeae5e   [libgobject-2.0.so.0.3000.2]   - gsignal.c:3060]            g_signal_emit
0x7f5cdbad3876   [libgobject-2.0.so.0.3000.2]   - gobject.c:925]             g_object_dispatch_properties_changed
0x7f5cdbad5ceb   [libgobject-2.0.so.0.3000.2]   - gobjectnotifyqueue.c:132]  g_object_notify_by_pspec
0x7f5cdbd56b08   [ModemManager]                 - mm-bearer.c:112]           bearer_update_status
0x7f5cdbd56ffd   [ModemManager]                 - mm-bearer.c:393]           disconnect_ready
0x7f5cdbbcc676   [libgio-2.0.so.0.3000.2]       - gsimpleasyncresult.c:749]  g_simple_async_result_complete
0x7f5cdbbcc788   [libgio-2.0.so.0.3000.2]       - gsimpleasyncresult.c:761]  complete_in_idle_cb
0x7f5cdb7cff44   [libglib-2.0.so.0.3000.2]      - gmain.c:2441]              g_main_context_dispatch
0x7f5cdb7d0597   [libglib-2.0.so.0.3000.2]      - gmain.c:3089]              g_main_context_iterate
0x7f5cdb7d0b51   [libglib-2.0.so.0.3000.2]      - gmain.c:3297]              g_main_loop_run
0x7f5cdbd4e331   [ModemManager]                 - main.c:150]                main
0x7f5cdb1ea41c   [libc-2.15.so]                 - libc-start.c:234]          __libc_start_main
0x7f5cdbd4de48   [ModemManager]   + 0x00019e48]

Reported by Ben Chan <benchan@google.com>
Update notes for submitted changes

* turn debug on for euca-upload-bundle
Update notes for submitted changes

* Implement version filtering for oslo.
карта для организаций
style sauna_hall_schedules_attributes
Fix import db capistrano task
CSS Logo bug fixed
sort dates appropriately fixes bug 794643
Merge pull request #848 from ossreleasefeed/crash-trends-ensure-dates-are-sorted-794643

sort dates appropriately fixes bug 794643
v 2.2.0.0 Añadidas acciones
basic-jekyll
JS finally right

Create the "fix" 10 pixels earlier for a smoother transition.
Tests using display name for fetching attributes
new erpk
fix for last imported id check and callback error, and update to debug section
Rename Spree::InventoryUnit.backorder to backordered
We only care about shipped units in Spree::LineItem#quantity_no_less_than_shipped
Add lambda to scopes, see reasons at https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4960
RUBY_PALTFORM problem

For some windows OS which RUBY_PALTFORM is like i386-mingw32.

Fixes #1903
Remove un-used Spree::BaseHelper helper methods

Remove un-used Spree::SearchHelper

Remove un-used class_for_error method from Spree::Admin::BaseHelper

Remove ironically duplicate method

Remove un-used render_txn_partials method

Remove un-used render_ordes [sic] method

Remove taxons_checkbox_tree method

Which was only referenced from inside itself

Remove list_roles helper

It belongs in the authentication extension, not in core

Remove un-used Spree::Admin::ZonesHelper
Squashed all migrations down into one each for core and promo

Spree preferences text field should not have a limit on it

As per this failing build: http://travis-ci.org/#!/spree/spree/jobs/2292654

Squash all promotion migrations into one
Remove spree/search helper reference from Admin::BaseController
Fix mis-spelling of prop in checkout.js
Decrease wait-time for customer autocomplete box
Fixed order/customer_details_spec

This spec was failing due to the renamed Spree::User class (to Spree::LegacyUser)

respond_to is stupid and doesn't have an option to force the root node name, so we bring Rabl in to help us out there (see search/users.rabl template).

The test itself needed some cosmetic changes also, but nothing too major.
Revert inadvertent bump of rabl gem, back to 0.6.5
Remove pending line from checkout_spec which seems to be running OK with the spec it claims to NOT run OK with
Remove pending lines from shipment_spec tests that function fine without them
Remove pending lines from payment_method_specs
Remove unimplemented test from order_spec
Remove pending from 'should always be false when inventory tracking is disabled' test in order_spec
Remove pending tests from spec/models/order/state_machine_spec
Remove pending lines in line_item_spec
Remove pending lines from inventory_unit_spec
Remove pending test from adjustment_spec
Added installation instructions and simple profile.
Removed EJB from Technique quadrant and fixed numbering
generate nginx.conf dynamically based over the capistrano deploy file using ERB
rename Record to getRecord to more accurately reflect that getRecord returns the record from a local storage string
retreive alltime stats for all games
add stats button support
add glowing frame around popups and style the stats popup
add stats support and add the win screen display to the base HTML
update solver bar classes to use hyphens for consistency
comment to indicate the analytics interface copies that of GA
update dev build
Add tests to package.json
Add comments.
Rename msg => message.
Improve readme.
Fix MPV...
Merge branch 'master' into phpbb-com
detabified
练习了intent的使用
进入ListView会崩溃的版本
不知道为嘛，崩溃时候和List的id有关，改成和simple一样的id就不崩溃了
网络恢复，找了篇文章来看了下，可以正常显示了
http://blog.csdn.net/redoffice/article/details/6666185
引入一个JSon的实现
http://www.eoeandroid.com/thread-70961-1-1.html
咩哈哈，折腾了整个晚上，看了一堆资料，纠结于如何将ListView用布局方式决定元素排布，又要和其他控件整合在一个视图
在绝望之际忽然想到既然都是res，应该不需要放在一个xml，测试果然可以，可以安心休息了
deleted an obsolete command
[users] implementing the users app
[design] Piosenka 2.0 - developed new bootstrap-based design, migrated
frontpage and songbook to new design
pasta raiz dos vhosts
formatting issues with headers
formatting issues with headers
- halfway to rpm5
Get all the repos
fix an issue on model

if JenkinsRun::getJenkinsGroupRun is used it will probably load the JenkinsGroupRun and store the JenkinsRun has the only in the JenkinsGroupRun
and later, when the GroupRun is used, the collection of run is initiliazed but uncomplete and it'll display a GroupRun with this only only Run
Merge pull request #36 from srogier/master

fix an issue on model
fixing header parsing in the response
Wire in the first url
Set `-a` to be default
Only treat public methods as routes
Actually make assuming all routes the default
Forget checking for public methods

it messes up mixed-in methods and such
Allow options for before_rescan_of tests
Fix rescan test for route removal

because it only matters if we care about routes
Merge pull request #219 from presidentbeef/ignore_route_information_by_default

Ignore route information by default
Added closure to index page, fixed make.bat to work on windows with python 2.7
Bug fix.

Signed-off-by: Duc Ngo <duc_ngo_2006@hotmail.com>
feelers-distance --rotation considered
added a post method to new medications
added post method
merge
Kommentare in Field, FieldContent und FieldGenerator angepasst#
fixed bombe +explosion
Menu aufgebaut
Kleiner Bugfix: Game over pic nun richtig
editor bug22 fixed
"JavaStringSplitExample.java" geloescht
drawHero, eraseHero, moveRight
Nurnoch Bomberman relevanter Kram. Grundlegende Funktionalitaet
sound: bombe
moved direction code a little
added AI class
Merge github.com:propra12-orga/gruppe40
Am vergangenen Sonntag hat die holländische Nationalmannschaft das Waisenhaus in Danzig, Polen, besucht.

"Es war ein sehr emotionaler Moment in diese zutiefst traurigen und hoffnungslosen Gesichter zu blicken", erzählte uns der sechsjährige Pavel hinterher sichtlich bewegt.
Alles gelöscht und Neubeginn
Die drei seperaten alten Menueklassen rausgeworfen (hoffe ich)
Erster Versuch zu Hosten
Add Test Code correctly
Fixed the highlight function to also update the text So that it would
highlight properly
Highlight works 100% properly because it now updates the text in the
box.
Merge remote-tracking branch 'origin/jsan_master' into Joe_master
Highlighting is completely correct as is the spacing issue.
Possibly fixed classification issue
Merge remote-tracking branch 'origin/Joe_master' into jsan_master
update line endings to be normalized
Improve compiler search logic for Windows

Adds a case to the compiler search logic for Windows, when fsc.exe and
fsi.exe are not on the path
simple fix to xml for addin that enables parser (though errors still not reported)
Add module declaration to template file for application

This prevents a background error occurring
Merge pull request #1 from funnelweb/master

Normalize line endings and update compiler search logic for windows
Curse commas
Add a "jsonrdf" version of the attribute output

In this version the json is annotated with elements from other ontologies adding semantic to the output
reorder
Let's close the double quote where needed and add the first line saying it is XML
Merge pull request #8 from pypingou/jsonrdf

Add a "jsonrdf" version of the attribute output
Merge pull request #9 from pypingou/dev

Let's close the double quote where needed and add the first line saying it is XML
Fixed some bugs with jsonrdfa
Fix the XML structure itself

- Add missing </rdf:RDF> tag
- Add missing </oboInOwl:Definition>
- Remove un-necessary <oboInOwl:Definition>
- Add missing reference to the OWL ontology

XML document should be valid now
Merge pull request #10 from pypingou/dev

Fix the XML structure itself
Created logic for ordering attributes on the client
upload can now support different languages - still in beta
more translation upload
latest translation effects
can upload translated excel files
ibfieldbook can now see the translation
better order of attributes
Better Trait Upload
upload of template separate method. scales to be done
better upload for template version 4
much better PRINT functionilty
Hrm, terms on the left tree that have no translation, and you're
translating, are hidden
Readme détaillé
1:16pm Sat, about to add more function
before refatoring
before tweaking style
looks fine
prototype on final pitching
using batch request to fetch likes 5 at the time
Don't reset project between requests
initial tp checkin
initial commit
Merge ssh://github.com/rahul-deshmukhpatil/tp
Prelim work on orders
Clearing of the filters and no results text
Enter php extension sample
Updated research statement.
Updated the About Me page.
Updated the navigation bar. Removed the excess.
organize resouces
reflection Perf 1

-add config manager tests
-some reflection helper methods
add reflection perf tests
more reflection tests
use list to avoid possible double iteration bugs
Add ProfileManager tests
perf fix on profile manager
more info in tests
more info in perf tests
add some cecil times
remove redundant field
more list stuff
Refactored NuGet into its own powershell script.

Upgraded psake to latest version.
Added nuget properties
The gateway notifier is now registered as singlecall so that users can
actually register for notifications. Closes #580
Gateway is now handling default channels correctly. Closes #599
Squashed commit of the following:

commit c326c3cdc563f243668f5341c19d354dfaf2c529
Author: andreasohlund <andreasohlund2@gmail.com>
Date:   Tue Aug 21 11:25:20 2012 +0200

    Improved the logging for the gateway sample

commit a8d105b306694fb8f6fd6ff33035aac33def534f
Author: Chris Bednarski <chris.bednarski@outlook.com>
Date:   Mon Aug 20 09:39:44 2012 +1000

    ReceiveChannel.Default property always false
Databus properties are now transmitted correctly when using the gateway
Closes #584
Re-introducing the skip deserialization feature from nservicebus 2.X.
Closes #609
The timeout manager is now preserving the replytoaddress across timeouts. It
now also supports timeouts beeing rerouted to other endpoints when they fire
using the RouteExpiredTimeoutsTo header. Closes #613
The reply to address is now beeing preserved across retries with the SLR
Closes #586
Fixing a failing unittest after refactoring the SLR. Relates to #586

(cherry picked from commit 9f811ebb293a3b0b89d2f34e5ec08aafed7f1c79)
changed main method to call assignUsers and allocate users
- ‘.sparkleshare.no’
Sprite-Demo2 added (collisions)
Refatorando tela de entrada
sort the banned words list. fix for ruby 1.8.7
Cambios menores.

Falta poner una NavigationBar (o algo parecido) en los ejemplos, porque
no es posible volver al inicio ahora mismo.
Updated gitignore. Index.html
cleaner urlencode
FB group updated
Fix wrong indent
 Candy template #2
Minor update on debugger module
tocgen integration using grunt-shell
fixed incorrect initialization
rm accidentally committed changes
Incluindo middleware para adicionar analytics
remove gpl license
Speed up for the scrolling text
add prebuilt hwc
Update pCanvas.java

UPDATED 3007!!
huaaaaaaaaaaaaaaaaaaaaaaaaa
Add a README file showing where we left off on this module.
version for heroku
Make simple implementation pass the remove node test
Order SQL changes and additional method
Service Switch statement fix
Merge branch 'robert' into chris_web_app
Fixed a parameter in the post body of game creation
added intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) to all intent launches to clear activity stack
Actualizando el modelo... como se debe hacer
Add MIT license.
Merge branch 'master' of github.com:rondale-sc/vim-creeper
New branch dbviewer
pvp

pvpvpv
Fix autoloading of authenticators.

Authenticator autoloads must be defined before Server.init_authenticators!
is run Also the active_directory_ldap autoload entry was incorrectly
pointing to a directory instead of the actual file.
Also fix active_directory_ldap path in spec_helper

Should have caught this in the last commit. Oh well.
Merge pull request #157 from biola/fix_authenticators_autoload

Fix autoloading of authenticators
Moved dashboard changes into their own class, customized the right now widget to who dat.
add live-paredit-reindent-defun to bindings under M-q
(Hopefully) Final change of .gitignore
reports vc in + labels and storyboard changes.
Preferences XML file is not a layout, move it to xml resource directory
Use switch preference to activate the service
Use lists to choose ring and minutes count
Always restore default preferences if absent
Market version 1.18
hack for heruko.. lets see if this works
working Player v/s CPU (Multiple Recursion levels) ... Cleanup of the code remaining
Deep cloning -_-
Sort the hashes to avoid random order

See also https://projects.puppetlabs.com/issues/16266
Use BlitzGateway, test if dataset is linkable and improve output message
Fix images/datasets loading
Fixes spanish translation pull request so as to display newly added translations
Actually make the application start. making it actually work correctly is for another day
finished draft with comments
fixed bug on excel import
Move around the files for the online demo.
Preparing a package manifest for a Node.js module.
Command-line version for Node.js.
Make it possible to run the unit tests from the command line.
Mention cssbeautify package for Node.js.
Mention cssbeautify package for Node.js.
Merge branch 'master' into gh-pages
simple tcp client/server
Added a parameter for resource path.
basic gui and variable declaration
Initial structure
Updated compose.json for packagist
引入本地数据相关逻辑以方便UI开发
use whenever to define cron jobs
few loader fixes
version 0.9 added to assembly and help file
updated version correctly for setup
Added Internet permission, and converted hardcoded lat/long to get from
local server on timer.
corrected some on Customer screen
removed references to missing files from the Makefile
style fixes, added codelta and injection functors
style fixes
Added mdtiler
Added headgen
Added vgi2eif
Technicality...
UFTC update, now supporting larger data! :)
Massively derped something in the UFTC update. Derp.
* Opening bookmark collection tab
* routing to them
* special handling of ids, through base64 and data-
* included base64 lib (dojo .. sgrunt.)
* prefixed notebook and bookmark collection tab names
* showing notebook name on tab name when it's available
Added a router to rout players where they should go.
Added Makefile and binaries for Windows
ajout ligne type csv a importer
add ticket submissions
Add the manifest and a readme.
Made some changes to the menu so items are evenly spaced.
Dropdown items are now left justified.
Updated REST route
am i using git correctly?
[TASK] Rename Eel to TYPO3.Eel
smal fix
deleted gitignore
added IRC channel info on index page
Added timer for movement
changed some shader code
sort pending headers before they get processed
tie confirmation icons to payment verifier
return zero if unconfirmed
set command: authorize by default, forbid only when dangerous
callback everytime there is an update
start verifier thread only after the first wallet synchronization
use WalletVerifier.add() method to register transactions
document public methods of verifier
protocol v0.4: use position for branching
spv: request previous headers recursively in order to support blockchain reorgs
readme for merchant script
verifier: download chunks first for efficiency
bugfix: address->addr
bugfix: add channel when calling send
new command: 'get'
by default, use user dir
bugfix: default to [], so that we do not create new addresses if the history was deleted
use print_error
fix: var_int encoding
fix: below or equal in var_int encoding
Worked on a sensible readme, added some default vendor scripts
design change in notifications
added images to notification design
modify Edit grow
modify Edit grow Student update datatable select show data
modifyEvent
Merge branch 'master' of https://github.com/smtacampus/Campus_Smta.git
modifyEvent
Fix social_buttons layout
NR-213: Core implementation of MVC framework

Added Register functionality
Implemented edit own posts.
updated .rvmrc file in order to create the gemset (helfang) if it doesn't already exist.
Merge pull request #2 from rpearce/master

First commit to help out! Nice job :)
Minor refactor of formatFunction to make TypeInfo reusable
Merge pull request #105 from thanpolas/minor-refactors

Minor refactor of formatFunction to make TypeInfo reusable
많은 수정
- 제어코드 입력 가능
- 번역된 텍스트를 관리자가 선택 가능
- 제일 첫번째 텍스트인 621번 텍스트만 ips로 export가능(테스트용) 
- 선택된 번역 전체에 대한 ips export 가능
- translateText entry 에 choosed 추가
- 그 외 기억안나는 다수 추가

다음 계획
- 번역 안된 텍스트 리스트만 보기
- 제어코드 리스트 확인하기

이제 거의 다 끝났다!
Added Media ability from 20 Recipes for Programming PhoneGap...   Great resource book.
20 Recipes for Programming PhoneGap: C
add note on how to pull in bundler gem
Add entity and other kotyahi
name the geojson encoded csv column 'geojson' as per the discussion at mapbox/tilemill#1618
objects in options can now be saved as hash/array
add fuzzy search filter for string fields

in SimpleSearch, the '#' operator can be used to do a fuzzy search with a default 80% fuzyness
example : title#"rok and roll"
additionally the fuzziness can be controlled with :
- using ## will make a search with 70% fuzziness, and ### 60%
- adding >nn at the end of the pattern to use nn% fuzziness
- adding <n at the end of the pattern will use a fuzzyness resulting in n errors or less
fix encoding warning wrongly displayed in folder/file entries
add "hide non-matching" option to type-ahead search in FilterLists
FilterPanes: fix search bar not working for genres/labels/number/dates tabs
modified parent c
updating build tools
updated wurf tools
update docs
fixes a path bug in the document store loader
Split bash files
Brew init / install + commonly used packages
Commit transaction in destructor
Saving data to database or file
dsggs
Mucha mierda
AWESOME BLOSSOm
Merge pull request #2 from abmirayo/frontend

Frontend
removed decorators, because of import error
Handle the case where no stats are sent

If there are no timing stats, drop out early.
Merge pull request #10 from streeter/patch-1

Handle the case where no stats are sent
version bump
added a metlog backend for django-statsd (issue #11)
fixed versioning on the sphinx docs and renamed references of
django-statsd to django-mozilla-metlog
Revert "fixed versioning on the sphinx docs and renamed references of"

This reverts commit 6639c182dec81e167f7d2e27024ae971d18fa4d7.
Merge pull request #13 from crankycoder/vng/metlog_client_rebased

added a metlog backend for django-statsd (issue #11)
Merge branch 'master' of github.com:andymckay/django-statsd
add in contributors
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  add in contributors
  Revert "fixed versioning on the sphinx docs and renamed references of"
  fixed versioning on the sphinx docs and renamed references of django-statsd to django-mozilla-metlog
  added a metlog backend for django-statsd (issue #11)
  version bump
  Handle the case where no stats are sent
Guard against missing example file.
Removed bundle install, rails do this automatically.
Removed the dummy README.md
muitas melhorias: loja de compras, tela de ganhou finalizada e bugfixes
icone novo e entitlements
adds and installs rspec-rails
fix for infinite wrapping multi iterator
Disassembly Viewの右クリックメニューからCopy Linkを削除 コピーできない時 コピーメニューを無効化する
Cleanup code.
Moved Qt stuff from Main.cpp to Hook.cpp.
Updated minimap. Split minimap parts and floors into different files.
The minimap ui now uses QGraphicsView to display the map.
set first date of  month for PERIOD_ID_MONTHLY



git-svn-id: https://svn.wikia-code.com/wikia/trunk@58828 e846bd91-c042-42a7-a218-4b65e2c1904d
VideoFileExampleを削除
inkluderet EIM modul til haandtering af alt-tekst paa billeder
Make the Entry object consistent in the Publish context
Automatically rename files when a clash is detected in the Upload field. Closes #672
sph2car canvas test
login & registration part 1
article name
Fixded LBadd, LBupdate and LBdelete commands are disabled problem
Merge branch 'master' of ssh://ssh.github.com:443/tacahiroy/vim-logaling
Support "x-jphone-copyright" header.
Merge branch 'develop' of github.com:tangosource/dimensions into develop
augmented timeout just to be sure
add this would be a good idea also...
New administration information menu pick under full menu.
change date_received format in condensed inc header
Merge branch 'master' of https://github.com/tedmanahan/Animal-GRIN
Add Elk to web_classification_refs, update taxonomies to remove unknown web_classification_refs.
Merge branch 'master' of github.com:tedmanahan/Animal-GRIN
Fix primary key for Elk web_classification_ref
Many changes to public pages
fix auto-merge conflict
Merge branch 'ted'
Merge branch 'master' of github.com:tedmanahan/Animal-GRIN
Merge branch 'ted'
Add google_charts gems to list of required gems
slightly changing methods...
upgrade to titanium 1.7.5
Put log files to log/ dir instead of work/.
Added Daemons around webapp.rb
Added `rake init:install` to install init script.
languagexmlfiles
STS not yet giving correct treeheight distribution...
add new project of phonegap
added closure-library as a submodule
Fixed Error with class not wanting to show up
According to log, the include db class needs to be in all the files
Devise installed
User seeding
Updating assets with some legacy styling for supporting older designs.
add flush_digits action to get_digits module. contributed by Star2Star.
adding turnitintool 2012092401
Arrumado um bug de indexacao de strings.Qdo voltava uma busca vazia, o indice dado para o selectedIten era -1
Make HTML match JS
DRY views
Instead of 'and' and 'not', use the punctuation
Bumped version to 1.5.0.
Merge branch 'release-1.5.0'
getTimeout for order cancellation API integrated
back to :nothing, stop it in default if it should not run
Aborting movements after collision
Merge branch 'master' of github.com:timehome/game-off-2012
adding prepackaged option
open module : part 2
update exporter : specular and diffuse ramps
Site updated at 2012-08-20 17:25:54 UTC
Enable modules Organic groups field access and Organic groups register
Set up the event recorder.
Merge pull request #144 from tmeryu/master

Added AES Encryption to the hashing functions in utils. Thanks it fix #77
Merge pull request #143 from levicc00123/master

Fixes issue #142. Thanks
Merge pull request #145 from tmeryu/master

Moved boilerplate handlers, models, config, routes and other files to their own folder. Awesome job, thanks a bunch @tmeryu a lot of devs will love it. It fix #106
Travis integration
indentation in travis file
Added an empty routes file, where the application routes can be inserted. Also added a line at the config file to load the application templates (/templates) and boilerplate's templates (boilerplate/template). Finally fixed the test_handler file to load templates correctly (it's hardcoded)
sys-kernel/mkinitramfs-ll: update/edit, single ebuild now to manage
{,profiles/}pubkey.gpg: moved GnuPG key
sys-kernel/mkinitramfs-ll-0.10.4 digest update
Removing PostBuildEvent
Boilerplate conf
Sorted Zscore statistics 2
Add SNAPSHOT label to version
added bin folder to qooxdoo lib
added a link page2
Refactor layout for static pages

[#40820139]
About page

[#40820095]
refactor app/auth stuff
remove the auth controller and view
"fix" column heights, probably need a different approach to the 3-colum layout
switch back to master
go back to the faux columns based layout
Merge branch 'master' of github.com:travis-ci/travis-ember

Conflicts:
	Gemfile.lock
	assets/javascripts/app/app.coffee
	assets/javascripts/app/auth.coffee
	assets/javascripts/app/store/rest_adapter.coffee
	public/javascripts/application.js
	public/stylesheets/application.css
do not show the signing in status on auto-sign-in for now
recompile
fix unacceptable long user names
improve paddings on the sign-in/out handle and drop down
fix z-index for tail button and main margin-right when sidebar collapsed
replace the help icon, glyphicons is the new famfamfam, right
fix duration label icon/text switch
fix background color for empty space on the left bottom
optimize duration icon, further narrow the left column on small screens ESPECIALLY FOR JOSH
stop autoscrolling on scroll up event, idea by courtesy of @rkh
add a "to top" link
fix persisting the minimized sidebar status
load pusher key from api endpoing (allows running locally against api.travis-ci.org)
Merge branch 'master' into rkh-pusher

Conflicts:
	public/javascripts/application.js
Added SWIG in requirements
remerciements
Configuration générale
updated for heroku use
TOC Bump for MoP
Updating to jQuery UI 1.8.22
Style and animation tweak
New controls and build options cleanup
post stubs
Only required fields are required
added statics module
added node-static instead
try out adding a Mozilla Persona button
Add XInput.lib to the Release configuration.

Was added to debug only, so Release doesn't build, preventing tests.
I think x64 is broken also.
Update pagination.min.js
added semantics description
New concrete widget JQuery Autocomplete.
updated to latest javascript. Enable sorting of events before display on the main page. Added processAddEvent.php to add the event to the main page. Modification of add event page in progress
Merge branch 'master' of https://github.com/verzify/timeslice-jktm
added processAddEvent.php
using deleteLater() to correctly free up memory resources
Drag and drop to Finder implemented
see #1 add input form for external css
merge
see #1 upload form
see #1 add bootstrap.css
README again in textile
add provider
...
test
test
Merge remote-tracking branch 'origin/master'
Tweeking and new todo bullets
add load config msg
synch from Tank
修改首页

修改section宽度
加入头像上传.但存在一些问题
Merge. 完成上传功能
Merge branch 'master' of git://github.com/FroboLab/FroboMind
Fixed #169. The new version stuff now works in python 2 & 3.
refact0red the code for reusability
Use colour variables throughout the stylesheet.
Merge pull request #4 from webdetails/master

Enforce visible=true on plugin-samples/index.xml
Merge pull request #5 from webdetails/clean

Clean pull request. Down from 350 commits to 80.
[MARKET-35] Fixed issue with uninstalling plugins on Windows
Merge branch 'master' of git://github.com/pentaho/marketplace
Corre el index de usuario.
catalog materia
improve click area of navigation items
Done with this for now
Added are you a human captcha
Merge branch 'master' of github.com:willfults/Course_Stats
DOC Corrected doc string
Adicionado o javascript oficio/create.js
conditionally init and update rosdep
update ignore filee
manually changed the item on the map from 188 to 51