labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed wrong use of method addDefaultsIfNotSet() in Configuration
Added needed use statements in DatePicker type
Added needed use statements in DateTimePicker type
Fixed Form type classes due to Symfony 2.1 changes
Fixed admin form factory due to different order of arguments of CreateNamedBuilder() in Symfony 2.1
Fixed JQueryExtension class due to changes in Symfony 2.1
Fixed UserState class constructor due to new namespace of Session in Symfony 2.1
Fixed docs
Updated Travis config and composer.json
Changed values of boolean fields in search filter
Replaced vendors script with composer
ekan tehtavan b-kohta (kamala evaluointi) lisatty
remove file system related dependency
GCContext: count handled nodes during parse and compare afterwards to ensure all were handled.
GCNode: escape @-signs in gedValues
GCNode: xref logic
GCContext: Read ANSEL file by translating from NSData to unichar [] to NSString; test file encoding; added TGC55.ged torture test file (though it doesn't currently pass testing and thus hasn't been enabled); GCContext: callback blocks shouldn't have to look up the entity themselves; minor tags.json adjustments.
fix link to SO
dragin
octodrunk
few tweaks to style
created journal template
hw12 adv test case tweaked
final day13 class example added
Merge branch 'master' of https://github.com/HampshireCS/CS112-Spring2012
day13 ex code
hw14 posted
Merge branch 'master' of https://github.com/HampshireCS/CS112-Spring2012
hw15 posted
hw15 posted
Merge branch 'master' of https://github.com/HampshireCS/CS112-Spring2012
hw15 done
Update README.txt

barkeley db licence
Move call to _before_post() to before POST params are touched

I.e. before getting list of relations or columns to be set. Extending class may add or remote data to params but it wouldn't change anything if cols and relations to set are found before this change.
Merge branch 'ext-hooks' into dev
changed to !!!
added ignores
bin update
blog page UI changes
refactor per Ben Marini
add size and period flags
create delete examples
Style changes for mobile devices
JAVA-682: Changed MongoURI.getOptions() to return a cached instance, so as not to break clients that are mutating that instance before passing the MongoURI to a Mongo constructor
reverting addition of posix-spawn for jruby

The posix-spawn gem does work under jruby (finally) but it's still
problematic at best. Its support for JRuby is mostly just for
conveinence (ex. tools like foreman) but it still uses a C-extention
under the hood.

While C-extensions work under JRuby, they're generally not not
recommended unless you just don't have any other choice.

All that said, I'm actually reverting this primarily because Travis-CI
doesn't support C-extensions under JRuby and the builds won't pass with
this gem included.

CI for JRuby on our pull requests seems more important than the gains
we get from fork+exec, but hopefully can find a better solution to this
anyway.
RUBY-472 actually test different things
RUBY-472 minor fixes
White "Lord of"
Added TableFeatureForTinyMCE package.
New Example Target
Added logfile and redirected commands output to logfile
Merge branch 'upstream'

Conflicts:
	index.md
Fixed index.md conflict
Created a script to convert between rst and markdown
Answered question What is a deterministic finite automaton
Converted changes back to markdown
Answered question about DFA
Commiting to pull?
Added Abstract Syntax Trees
Answered method inlining
Lexical Analyzer
Update index.md
Merge branch 'master' of github.com:CyDrive/CompilerDesign
Merge branch 'master' of https://github.com/lawrancej/CompilerDesign
Update master
added semantics description
Added example for Terminal 
added definition for interpretation
fixed previous interpretation entry
Update master
Trying to fix my repo
Merge remote-tracking branch 'CyDrive/master'
Added the new question type templates
parsing manifest before inject backbone
[maven-release-plugin] prepare release mule-module-github-2.0.2
[maven-release-plugin] prepare for next development iteration
adding quantum not extending dual clause to list of forbidden
Cleaning up the mess and stoping to try to reduce search space. Lets change the data structures
Merge branch 'master' into prunningnextStatesattheend
dummy client tidy
goto add eps images.
Fix IE-only issue in TileStream layer handler
pluie + vent 1000-2000m
fixing dropdown for mobile
component host object now correctly respects hardpoint configurations and slots; hardpoint display text on component name
Updated readme for using existing connection feature of db-meta
Merge pull request #4 from tvernon/updateAPI

Updated readme for using existing connection feature of db-meta
new version
Merge branch 'master' of github.com:nearinfinity/node-persist
initial commit for 3d rotation
implement cache limit
remove unused parameters
cleanup
add gmt+2:00
added figure cover
faster rendering through batch submission
1. extract the wibox part from the main config file, add more widgets
2. make left click to hide the main menu
Trying to make the enemy editor look cleaner
DevSynch
Example updates
Adding timeout examples
testing git step 1
testing git step 2
Checking resourceType = 'user' in user search documents
Merge pull request #2553 from mrvisser/profilepictures

Checking resourceType = 'user' in user search documents
Also check for 'user' in topnavigation for auto-suggest
Merge pull request #2554 from mrvisser/profilepictures

Also check for 'user' in topnavigation for auto-suggest
adds: new design
automatically changed price while changing book's amount
Initial layout change
- Created login notice
- Removed background
Merge remote-tracking branch 'battlelog/dev' into loginUIChange
Merge pull request #104 from peter-budo/loginUIChange

Login ui change
Added a license tab for the About-drawer & Activity. Refurbished the EULA-ish text.
List row was empty due to wrong method call

The list rows for the headings were empty due to the adapter calling the wrong method - headings have no name, only a resource so AppContributorData.getName() would return "".
Added a comment pointing to the issue
Merge pull request #105 from ninetwozero/addGPLLicenseInApp

Added a license tab for the About-drawer & Activity. (Cont...)
Removing debug output
Fixed the merge fail.
Made sure the default tab would be #1 (about) and not #0 (license)
Found issue with ProfileActivity, have no time to fix it
Fixed a bug where newly introduced DIV elements would break the algorithm.
Chat works again, refactored COMClient and relevant files.
Added a number to the weapon listing
Feed is now displaying avatar images again
Added a comment as to where an error occurs
Refresh functionality, initial setup
Merge pull request #106 from ninetwozero/bugFixSunday

Bug fix sunday
Trying an logging
added .table class to tables
Slight improvement for year method
xmris append.
Interim Chapter 15
Imported rendering pipeline
login y la nueva biblioteca de funciones sql
rename package; remove some not mandatory classes
User added

See mail
without cache
updated git ignored
added fabfile and supervisord file
arreglados los tests. ATENCION:tener cuidado al probarlos que es posible
que modifiquen la base de datos actual.
bloqueado el appcontext para que no se puedan usar bien los tests, leer
commit anterior.
gitignore ChangeLog and add to MANIFEST.in.

Change-Id: I6dde5a0411f3e814bb34c0936010f1b46a4248a3
Implemented GridBagLayout :(
update gallery administration
bump all add-on versions to 1.6.x after api changes
Added friendlyid, slugs to database
Update french translations (elevator instructions).
add timezone params to DateUtils methods, use in building routingRequest
add abstract sample operator base class
add default sample operator (minimizes elapsed time)
rename package analysis -> internals to match ws package name
Cleaning up reset window state tests
[PAXEXAM-387] Resin CanDI container. 

Regression tests are currently disabled, as DeltaSpike seems to be
hitting a bug in Resin.
Use configured vcl_conf

Previously broken, because didn't match location used in
custom-default.erb.
Make the template cookbook configurable

(And also the source--not so important but may as well have that too.)
Restart varnish after changing VCL
Merge branch 'COOK-1261'
updated wording on Shriver page
updates to Shriver Center and Students pages

New side menu, new pictures, new wording
Removed Muffins again
Database
Merge branch 'master' of github.com:oveis/Emotion_Recognition
added a product controller which loads only products from the current taxon
error in l2
Initial commit
display states added
Fixed bug : when on clipping state, rectangle was not drawn correctly
Bugfix: corner1 and corner2 had the same values
Find intersections works for all lines of rectangle now
Added functionality. Corrected some bugs
Merge branch 'master' of https://github.com/pakallis/polygon_clipping
Uncommented some code
finished the first 2 koans
Added support for function values.
Release 0.0.2.
Fixed license comment.
Added Ruby highlighting to Ruby code in README.md
added license
Merge pull request #1 from parndt/patch-1

Added Ruby highlighting to Ruby code in README.md
Replaced the generate_definitions with a Rails generator
Fixed a typo in the readme
Fixed a bug in the fedex:generate_definitions generator that caused the initializer to try an load the definitions from an absolute path rather than one relative to Rails.root
Removed the Railtie that was used with the recently removed rake task
FIX pattern to include method name in logs.
Add trimmed dictionaries. Recover hash table for possible parallel processing
add Float class to exports
* Change naming from randumb to random_model
* Make the whole thing alot quicker!
Add libv8 gem to Gemfile to make sure Travis-CI has access to it to be able to run therubyracer
Update README
nose
Revert 9d087901f8bea63b0ff015145aebea29114c432c^..HEAD
added a few methods

added :
void setup(); //default, sets the wrappers size to 0,0,ofWidth, ofHeight
void setup(int _x, int _y, int _w, int _h); //sets the upper left
corner position and size of the wrapper.
void draw(); // draws the borders of the wrapper.
changed how the enable/disable feature works.
fixed the examples so this now work with the lattest changes. cleaned the code a bit
aded save and load methods. Fixed some bugs in the examples
exercício de lêr arquivo json
Merge branch 'master' of github.com:paulovf/Aula-Web_Services
created HypnoTime project
added tabs and images
initial commit
Merge branch 'master' of github.com:pellcorp/PellCorpExchange
Update app/views/passwordlost/index.html.erb

Add init header support
Do not add Sass functions if sprockets-helpers is not available
flashcard js7
working on card deletion16
fix unit test compile
Fix for Bug NMS-5677
should support empty lists?
upgrade to 1.0-beta8
Increase single player unit limit to 140.

Removed another demo section I missed.
Moved to src were it belongs
Forgot to update project files
zebra camo
New plugin to get the device mac address
Merge branch 'strings' of github.com:obrand/phonegap-plugins into strings
Merge pull request #589 from obrand/strings

New plugin to get the mac address of the device. Returns 00:00:00:00:00:00 if not running on the device
Even betterer docs.
footer
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fix footer
Merge remote-tracking branch 'origin/master'
Добавлена тема plain-white
added disparity map
smalll changes
Merge branch 'master' of https://github.com/pinkupdater/Hackathon2012
app.conf
Merge branch 'master' of https://github.com/pinkupdater/Hackathon2012
Merge branch 'master' of https://github.com/pinkupdater/Hackathon2012
If no resource provided, JID ends up with trailing slash what causes SASL authentication failure.
Providing jid parameter here breaks RFC3920, section 6.1 point 7 during SASL auth.
Guest as a User. Add to basket. Item belongs_to Product. Do I need to open a new basket?
[Piyush,Yahya] Setting Travis CI and adding shotgun for faster development
moving menu into own controller. Adding dev mode - default to business view
transcription for XML Record element
Fixed disabled attribute.
Use formatted date in feed templates.
Added pagination to default collection templates.
/ ‘Backup/bar_B1/bar.scn’
/ ‘Backup/bar_B1/bar.scntoc’
/ ‘Backup/bar_B2/bar.scn’
/ ‘Backup/bar_B2/bar.scntoc’
/ ‘Backup/bar_B3/bar.scn’
/ ‘Backup/bar_B3/bar.scntoc’
/ ‘Backup/bar_B4/bar.scn’
/ ‘Backup/bar_B4/bar.scntoc’
/ ‘Scenes/env/bar.scn’
+ ‘Pictures/props/gun/gun-ao.png’
make code working with ZfcTwig package
I failed to commit a very old fix
paranoid -- removing acts_as_paranoid =(
paranoid -- correct migration syntax
Logout na home
Merge branch 'master' of github.com:rafaelmachado/fb-hack-ita
Impress files can be read. Sync_Impressionist changes merged to Master.
Continue wiring up the cell buttons.
Deleting rows.
Editing cells.
update todos
Column headers: remove the active header class completely. (Will still keep on showing the caret on hover.)
Attempt to fix the show-hide events of the options button bar.
Attempt to fix the show-hide events of the options button bar (really, now)
In addition stage a handle to grab-resize the headers.
Use same travis configuration as in main refinerycms repo.
Add license notice.
Fix violation of io.Writer contract for large writes.
Default module
Default modules

Change-Id: I1870c264ffa4b465a92bb2623e1e96831b3d2b29
rfrrr   tttt
added stub methods to the chip-8 system for initialization, the emulation cycle, and to generate the fontset (un-umplemented)
updated the project readme - intro description of the Chip8System class.
remove active support dependency as carrierwave loads the version it needs without conflict
Password checking works. Also added a cleardatastore view to clear out the database. The test views should probably be moved into a unit test suite
Added a logout button to the logout block on the pages
Merge branch 'develop-password-checking' into develop
Siemens Water referencing: factor of 2.0 added for gabaiu calculation.
Entity Framework Integration
Show changed files of a pull request and fixed showing removed files in diffs
Removed view controller automatically generated by Xcode template
Moved toolbar to stay below the navigation bar instead of being the table header view.
Show full file name of changed files in pull request
* Atualizado appcache
non natural KEGG ids (entrez) for sce gave some problems now solved
change to file4
added gitignore
deleted file 4
Merge branch 'master' of https://github.com/rogeliosevilla1/test-repo
code refactoring & optimization
fixing add url page
add odata4j InternalUtil until they fix the NPE problem in odata4j
altering logging to determine which handler failed to find a specified collection (problem with having a logger statically linked to a base class
replaced User with user-name (String) so it can be a property (to keep as object must be added as collection); removed obsolete convertDateTime(), fixed bug in StimulusParameters and DeviceParameters return (convert underlying storage to Property), fixed DateTime return type
fixed getDateTimeProperty to properly handle odata4j server response and added getObjectProperty() (not currently used)
added toString(Iterable<T>) for debugging purposes
added assertNotNull()s to assertEquals()
added comment to assertEquals(String,DateTime,DateTime)
replaced Assert.assertEquals() with JUnitUtils.assertEquals() for DateTime and assertEquals(String,Enumerable<OEntity>,Iterable<T>) for comparing server results to Ovation API results
Rebase from 'release/pluginlib' @ version '1.9.15'
Generated debian files for precise
Matching algo updated
Fixing controller
added .idea to gitignore
ignoring .idea/ files
ha_tools should catch ConnectionFailure, not AutoReconnect PYTHON-396
Implement alive() for Connection and RSC PYTHON-275
We don't support python 2.3 at all.
MongoClient/MongoReplicaSetClient PYTHON-423

This change adds two new top level classes, MongoClient
and MongoReplicaSetClient. They work almost exactly the
same as Connection and ReplicaSetConnection with a few
differences:

1. These connection objects awknowledge write operations by default.
2. The network_timeout parameter is gone, use socketTimeoutMS instead.
3. auto_start_request defaults to False.

Default acknowledged write operation will be the biggest change for
most users. Using MongoClient and MongoReplicaSetClient you no longer
have to pass safe=True to a write method (save, update, insert, remove)
to request an acknowledgement from the server.

Connection and ReplicaSetConnection are now deprecated but retain their
previous behavior. This should not be a backward breaking change.
Fix skiptest issue.
Skip tests that tickle a V8 bug in mongo nightly.
Minor doc fixes for Mongo(ReplicaSet)Client.
Update tutorial to use MongoClient PYTHON-423
More Connection -> MongoClient in docs PYTHON-423
Fix a number of doc test failures.
Use Mongo(ReplicaSet)Client in examples PYTHON-423
Fix a few ReadPreference doc issues.
Fix typo in ensure_index docs PYTHON-438
Support copy of UUIDLegacy
Work around V8 issues in tests.

See SERVER-7705 for details.
Document return value for write methods PYTHON-429
Rewrite "requests" doc for MongoClient and new w=1 default PYTHON-423
Fix RST formatting in requests doc
Remove unnecessary auto_start_request=False in example code
GridFS writes must be in request PYTHON-423
Fix ResourceWarning in replica set test_low_network_timeout
Remove dead test code
Larger timeout for slower machines
Fix test failure due to 2.1.2 behaviour change.

See SERVER-6226 for more information.
Fix replica set monitor issues PYTHON-365.

Note: In CPython the monitor is no longer a daemon thread. This means that
care must be taken in the interactive shell and simple scripts to set
ReplicaSetConnection references to None so the monitor dies.

The monitor is still a daemon thread in Jython and PyPy.
Get rid of a few weird timeout tests.

These never made much sense to me. They seem to
cause issues in CI and don't seem to be correct
either way.
Update distribute_setup for python 3.3.

distribute 0.6.27 fixes some issues with python 3.3. See
https://bitbucket.org/tarek/distribute/changeset/a2685f3af854

There are other distribute bugs related to python 3.3 but
that change fixes the biggest problem. See also:

https://bitbucket.org/tarek/distribute/issue/283/bdist_egg-issues-with-python-330ax
More reliable test_max_pool_size
Shutdown RSC monitor in RSC.close()

This allows applications to have some control over
termination of the replica set monitor thread or
greenlet. It also makes RSC more useable in the
interactive shell and with contextlib.closing.
Add a note about RSC background tasks.
Changelog for 2.2.1.
Minor doc updates.
Fix test_max_pool_size for Gevent
re-flow text to 70cols
PYTHON-145: prefer to use separate wsgi daemon processes
BUMP 2.2.1
Updated code based on code reviews
Merge branch 'master' into PYTHON-366
Accented quotes are from the devil
Fixes to docs
more changes for course edit form
Update fixture templates so tests pass
Split up Preferences

Moved font_size pref into OS specific files since 8 is teeny-tiny on OSX
OSX based update of packages
Greg's Head and Zombie
from apple
implementing access
Allow default index
Add the url for the vagrant box

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Map the right ports

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Updated Read Me, added CSV file
updated Read Me
bugfix: security token forgotten for ban form in view_ip.html
merge dev_4_4 --exclude conflict broken needs-fixes: PR 179 (CLI documentation)
merge dev_4_4 --exclude conflict broken needs-fixes: PR 187 (Extlinks review)
merge dev_4_4 --exclude conflict broken needs-fixes

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 179 sbesson 'CLI documentation'
  # PR 187 sbesson 'Extlinks review'
simplify, add right pane, dialogue on button
Update the linuxdays talk and almost complete the KDE talk.
Forgot to add SuperZombieMut to server packages and fixed none issue with bleeding and poisoned pawns
Updated README
homework finished with 100% score
Merge pull request #8 from sdobberstein/master

File renaming
Merge pull request #9 from sdobberstein/master

Added RemoteLocation Test and fixed some decorating issues.
Check properties object for key before running through the files again
Merge pull request #10 from danbogert/master

Check properties for key before running through all of the locations again
Adding unit tests for TagFactory
Adding readme
Adding UsernameTag to mimic Twitter.
Refactored and cleaned up Tag logic
refactored tags
Fixed parse error when trying to build Decorators for DoubleTags.
Reactorded Decorators and Locations to use MagicProperty class
Changed URI encoding in testURIFileSetting test to work with spaces
Changed URI encoding in testURIFileSetting test to work with spaces
Merge pull request #11 from PeterPlatt/master

Made changes to a unitTest
Corrected a test case. It was refering to an incorrect location.Refactored some of the cases
Corrected a test case. It was refering to an incorrect location.Refactored some of the cases
Added from the old blue magic repo
Merge branch 'master' of https://github.com/bluemagicsource/magic-config
Refactored, moved Tag classes out
fix score calculation for comments / posts, add whenever gem for
scheduling rake task to update user scores every day
fixed ordering issues conflicting with ancestry
fixed whenever scheule.rb config
reorg'd folders
add pluralizations
Added some basic unit tests for the utils classes.

Fixed a bug the unit test caught where date of the messages were not equal.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Added other level of details

Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3@ulaval.ca>
backbone.js flickr demo
Slight modification of craigslist ToU xpath
period counting done, test has some large-scale checks of random clock period-counts
new date picker for webinterface in
task,tasklist,project
	modified:   app/views/projects/_form.html.erb
	modified:   app/views/tasklists/_form.html.erb
	modified:   app/views/tasks/_form.html.erb
	modified:   app/views/tasks/_form_non_slide.erb
update missileRegistry
dzil: Update prereqs
Contact page Added
소서다!
Documentation DateRange
Documentation readme fix
fixed issue when passing symbol to page_url and invoking multiple times
version bump
Neue und aktualisierte Mockups
Merge branch 'master' of github.com:silkslostsoul/Eventalizer
Update UML-Diagramme
Fixed a bug where the FTPs version was one step after.
Bag#to_a should be sum of savedObjects and unsavedObjects
Adding _type to Oahu::Index
move 'Saints at Packers' to 4:15 and change 'Texans at Lions' to 12:30
re-generate JSON based on text changes
Update to reaadme for new templates
- now creates dir for the split files
- simplified the date
Moved controller and models to Copycopter namespace, introduced Copycopter::DependentModels
Updated to build for swap armv6 for armv7s
Bumping version numbers, updating build scripts
cleanup
suppression des polices custom (trop de pbs avec)
ajout du logo soat sur la page de ranking
RED: PokerCard#value can be 2
GREEN: PokerCard#value can be 2
RED: PokerCard#value can be 9
GREEN: PokerCard#value can be 9
RED: PokerCard#value can be {ten, jack, queen, king}
GREEN: PokerCard#value can be {ten, jack, queen, king}
REFACTOR: Rename variable for 9 of clubs
REFACTOR: Renamed constructor arg to reflect the correct order
RED: Ace is more valuable than king
Split the asciidoc for Maven by Example into seperate chapter files.   This work is being performed in preparation for a refresh of the O'Reilly book from the forked Sonatype content.
Updated the CSS.  The Sonatype Maven books are sort of joined at the ankle with the ezPublish system.  When that CSS is updated the book template also has to be updated.
Merge pull request #2 from tobrien/master

Split the book up into several chapters and fix the CSS
Fix UT

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Artifacts path fixed
Update README to reflect the new app directory name (twitter2).
Draw a gpx track! Woohoo!
Extract the gpx stuff from the proof-of-concept into the Canvas
Get range automatically

Now I need to make it work manually too
Preparing for 1.3.5 release. Will re-add PSR entries after release.
Added these sniffs back in because some other sniffs rely on them now. Wont annouce PSR 1 or 2 standards in changelog though as they are not complete.
Update changelog for next release
Begin tests for s3 support
s3 Integration using string type attributes
s3 Integration tests finished
Change name to SMBinaryDataConversion, merge master into branch
Move Base64EncodedStringFromData method into separate file.
Merge branch 's3_support'
test programs working
cluster
cluster groups
+ redirecting to signup as default
Merge remote-tracking branch 'upstream/master' into pagination

Conflicts:
	src/Application/Bundle/DefaultBundle/DataFixtures/MongoDB/LoadWallpapersData.php
composer.lock updated
Merge pull request #59 from emeraldMaster/pagination

Pagination controls were added
Updated pom to be a child of Sonatype's OSS pom so we can deploy to oss.sonatype.org and then sync to Maven central trivially.
Start stats after all rooms/robots are active
10207160521
Bug Fixes

Fixed a couple of problems with the whistling behavior.
build 121226
added close button to datepicker
Ensure more tests worked on php 5.2

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24686 44c647ce-9c0f-0410-b52a-842ac1e357ba
debugging file tree issues
Makes reload of rules work across processes using signals and a rule reload table.
0.11 release announcement on front page.
Correct link.
Update several pages for 0.11 release.
Update download links for new site.
Correction to release announcement.
Update screenshot to show Qt console's inline image powers.
Merge pull request #1 from takluyver/0.11

Updates for official 0.11 release.
Update version info, add links to talk video and Chris Fonnesbeck's post.
Update with a few 2011 presentations.
Minor language fix
Update doc links
Fix doc links
Language fixes in intro
Fix hosting section
Add links to Python 3 release versions.
Make link to docs introduction more prominent.
Update links to Python 3 version.
Correct 0.11 release date.
Improve header in front page and add acknowledgements.
Complete acknowledgments.
Update _posts/2012-03-12-welding.markdown
arreglos publicar flujo
1)Eliminadas urls centralizadas.
2)Modulo de usuarios adaptado a las convenciones
Merge branch 'cesar_arreglarurl'

Conflicts:
	flujosdetrabajo/urls.py
	usuarios/templates/consultar_datos_de_usuario.html
	usuarios/templates/index.html
	usuarios/templates/modificar_datos_de_usuario.html
	usuarios/urls.py
	usuarios/views.py
Resolucion de conflictos con la version del branch master.
The basic recipe.
transform to space done
Merge branch 'master' of github.com:tarstars/beam_struct_vica
[AS7-5680] Separate framework SPI from API
[AS7-5680] Separate framework SPI from API
[maven-release-plugin] prepare for next development iteration
working on memory management
Homework day 6
Agregando faltantes i18n
Allow user to enter spaces and handle invalid characters.  Tidy up when starting up application
Release 1.0.9

bugfix
Explanation of the application added.
Directory tree reorganization
Removed robotSafe
Merge pull request #1130 from thearn/guidev

Guidev
added test file
Einleitung in tex eingefuegt
Vergleichsmatrix Basis eingefuegt.
Vergleichsmatrix Basis
corrected values for kgsl
Update daily word count.
Added: Classes for communicating with the Navision database (@author Jormen Janssen)
Fixed: Spelling in most functions and comments within those classes
Added: Implemented server connection. Now successfully connects to the Info server.
Changed: clientConnection is now a static variable in Main.java, so it doesn't need to be passed around anymore.
Changed: Status strings through System.out.println for clarity.
Merge branch 'master' of github.com:thomasbaart/ISM2IKBS.V111.git
Add tcsh to package list.

Not strictly required for LOFAR, but useful for some science users.
fix spell errors within README
add more information to package
exploring the nuances of and setOrigin:  in program 8.5...
Fix builder/install templates
Fix builder/install templates
Started removal of IToken instances being leaf nodes of the AST
Removed WhitespaceNode and TextNode
mkinitramfs-ll.{ba,z}sh init: (m) update
Misc updated areamap activity
Updating the information.
Week 1 homework PA1 submited
added a2posted final
Order properties alphabetically.

The order can change.
Special handling for byte[].
Added default schemes per domain
Added default subdomains group processing
ISPN-2200 Make ClusterCacheLoader configurable via configuration builder API and via XML
quick fix for selection/click failures
Commit com alterações realizadas em sala.
Add command execution form
+resizing, rethought architecture of MapRenderer.class
Merge branch 'master' of https://github.com/unknownhybrid/jkd-lpc-git

Conflicts:
	Code/Memento/src/com/pixilic/javakat/mapdemo/Origin.java
Simple i2c_read command implementation
Improved redis checks script, added template and README.
Merge branch 'master' of https://github.com/untergeek/zabbix-grab-bag
gitignore
fix some errors which prevented debug toolbar to be shown
fix for transport fallback and multiple reconnect
Update lib/data_active.rb

Added require nokogiri
Correção excluir recado
Removing Ask.com from pinged SearchEngines. They no longer use this method and was causing an error when running "rake sitemap:ping"
Merge pull request #5 from lilibethdlc/master

Removing Ask.com from pinged Search Engines
Create a create action that can handle signup failure (but not success)
Adding the Actors Migration Guide for RC2
include crustache c-source into driver code
add share to story page
Move isfile check out of OSX special case.
Test "libusb_path is None" once, special cases are system-specific.

Also, they are mutually exclusive.
Add Cygwin support.
Retry load after connection failure
SEO Friendly Forum Title 2.0.3
we_clearblue 1.0.4
we_universal 2.2.4
Added background and menu circles
finished test 3, destroy file is still wrong.
Use 'Update' consistently in english messages

Thanks to siebrand for catching this
Split Jenkins and job docs into two files

Change-Id: I34e1dffe63b4370961dcea9da4ec8be4cbc693e9
Updated documentation: we had to revert to Firefox 16

There was a timeout bug with Firefox 17

Change-Id: I878e65f04ab71209d9cb94138f4285f597c1e8cd
Updated Jenkins documentation, added mobile job

Change-Id: I8fa4cbfca06244d6526995f1fbc5528ff3ba290f
Documentation: simpler page title

Change-Id: I7335dbddd6c63545d979c1c162175028dd147be2
Documentation: basic Jenkins job template

Change-Id: Ic368f99a41f87f6f0a5074510548d0c84e470dbf
Documentation for Jenkins job template

Change-Id: I2b5bb0c47ed2595fb9eff849c116f6f0898d83e9
Fixing styles and inline label for image filter
Always show a created by tooltip for all tags (see #9384)

The original intention appears to have been to show a tooltip for tags owned by other users, and no tooltip for tags owned by the current user. For some reason Java doesn't seem to allow a mix of elements with/without tooltips, and just uses an existing tooltip for those without. Solution is to have a tooltip for everything.
Code cleanups suggested in PR432 (#9384)

Using EditorUtil.formatExperimenter to format experimenter name, and other code cleanups.
Fixed regression introduced in PR432 (#9812)

try-catch block is necessary when creating a new tag since it is a two step process, and tag.getOwner() throws due to lack of owner information
Create an empty tooltip for unconstructed tags (#9812)
Specify user logged in instead of his/her id.
Merge pull request #455 from manics/insight_tag_owner_9384_9812

Insight tag owner 9384 9812
Adding description for release-webstart in build.xml
Don't show alert messages for failed drag/move in Tree. See #8776
Don't import jQuery in split-view

Small bug found when looking at #9172.
When you use AJAX to load a page that includes jQuery link, jQuery will
override existing $.jstree etc.
Fixed split-view plugin for corrupted images. See #9172

For failed imports etc, where getChannels() is null, or rendering engine fails to load,
we now ignore these images in split-view plugin
Blitz handles nulls for getStatsInfo() See #9695

getWindowMin() and getWindowMax() will return None if getStatsInfo() is None
Removing swearing from base_header.html. See #9761
jsTree only allows Siblings to be selected. See #9756
Fix wide tables in Split-view for IE8
Use pixelType when getStatsInfo() is null. See #9695
Blitz image.getROICount() uses conn.SERVICE_OPTS
Fix export scripts (mimetype + permission check)
Web allows Chgrp for Data-Owners only. See #8974
Fix bug in batch annotation of wells.
adding check_files.pl plugin
Shelved bible_gateway provider pending response from Bible Gateway on licensing
Work in progress; using css selectors for now
Scraper work in progress
Psalm 23 (ESV) passes!
Modified gem required files and added scraper tests for German language and NLT
Fixed gemspec and added sugar method to the ScriptureLookup module
Initial scripture lookup executable added
refactoring in progress - error handling needs major work
working draft
stuff for heroku
good PORT for heroku
fixed positioner setup screen
check getBrowserEvent
Window Drawing Features
insert values in the new db_slave_host column
solve problem 37 and 38
gitignore
- correctly import sssd status (bnc#779010)
- 2.22.3
Merge pull request #1 from jsuchome/master

	- correctly import sssd status (bnc#779010)
some decks
Merge branch 'master' of https://github.com/yinian1992/foolish-burial.git
Homework 5: complete homework 5 by adding JSON to permalink page.
added readme / bumped default cache to 30m
Use a setter for curSpinningReq
Make search requests cancellable
Don't migrate saved pages that were saved with a 1.2 beta

<=1.1.x didn't save a lang param, 1.2+ does. Use this to
differentiate
Ask the user for confirmation before upgrading
optimize db check
fix steven, haha, and fix bug
faq kinda there
refs #9327 バグFIX適用：顧客毎のポイント設定で更新ボタンが無効になっている
Merge branch 'VB_point_base'
initial commit
Merge branch 'master' of github.com:zeroro713/TWRequestSample
Add code to compare partitions
Initial Commit
first time
Merge branch 'master' of https://github.com/zhangkf/CustomizedViewIOS
Added permissions in Android app AndroidManifest.xml to access WiFi,and Telephony features

Jira-Issue: WP-161
Fix railtie, perhaps?
Fix build error in y-offset
add furniture images
Site updated at Sun Nov 18 2012 00:58:14 GMT+0900 (KST)
Removed post I'm not going to finish
ahora se pueden pegar mas las cartas para mas niveles.
siempre arranca desde el nivel 3
Versione 1.0<Stable>
Versione stabile del programma. Il suo funzionamento è verificato.

Signed-off-by: Alessandro Beltramo <beltramo.ale@gmail.com>
[OData] Add new HttpConfiguration.EnableQuerySupport to enable querying globally for the server

Also [Queryable] refatoring and adding an error message when the ObjectContent is not of ObjectType IEnumerable, IQueryable, IEnumerable<T>, or IQueryable<T>
Do not strip trailing slash of canonical URLs.

Usually, links for posts are generated with a trailing slash, but
canonical URLs aren't.  Some services (e.g. http://b.hatena.ne.jp/)
are confused with that behavior.

We can fix it by removing canonical URLs, but then anyone may read
a post with /index.html URL and post the URL to some tool or service.
Therefore rel="canonical" seems useful IMHO.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
Merge pull request #592 from omasanori/fix-rel-canonical

Do not strip trailing slash of canonical URLs.
Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 and beyond.

Support for automatically handling .rvmrc files in projects is being deprecated in
POW version 0.4.0 and beyond. RVM will still work but project will need to have a
.powrc file that detects the presence of and then loads RVM.

The code in the .powrc could also be in the .powenv file, however the .powrc loads
first and is the configuration file recommended for inclusion in version control.
Merge pull request #602 from zan5hin/powrc

Adding .powrc to allow RVM to work when POW is updated to version 0.4.0 ...
Example repo URL - see Github issue 516
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #666 from nathanl/example_repo_url

Example repo URL - see Github issue 516
Updated gems and rubies to 1.9.3
Merge branch 'master' of github.com:imathis/octopress
Fix for issue #622

The filters bundled with Octopress are not applied to files ending in 
`.md`, because the match in octopress_filters.rb does not match `.md`.
Merge pull request #706 from Confusion/patch-1

Fix for issue #622
bumped rbenv version fixing #743
Merge branch 'master' of github.com:imathis/octopress
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Updated Github API to V3.

Github API V2 has been removed.  The response data format also changed.
Merge pull request #675 from zlu/master

Update Github API to V3
Twitter API call and links are now protocol relative
Merge branch 'master' of github.com:imathis/octopress
Pull upstream changes
Add bariol font files to source/assets/fontface
Add a basic _typography.scss file
Fill out a few more of the custom typefaces
Change base font to Bariol
Correct typo in post
allowing curlHttpClient upload files and send post/get arrays with any deep lvl
gitignore update
Makefile
vortrag layout
pro contra list
Add support for ios6 ASIdentifierManager
Looking at MyCurator
local changes
code structure
Fix missing import of `rpc.dispatcher` in `rpc.service`

Change-Id: I7bdd5fbff1addef4a855aa72f3551930630299f5
Added a missing `cfg` import in service.py

Change-Id: I7e98686cb72ba6287b93746267390cc79f18bb6d
Merge "Fix missing import of `rpc.dispatcher` in `rpc.service`"
Use our new refresh_coauthor_term() to refresh the data in the coauthor term when ajax searching
Documentation for chord voicin done
Merge branch 'master' of https://github.com/BjornNAL/Haskell_exercises
TIMOB-10462 Protect bubbleParent from an overactive kroll setter call.
fixed 4 Makefiles
Merge pull request #70 from paulrd/makefile-fix

fixed 4 Makefiles
v0.80: Some hiccups fixed from big synch changes.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80b: more fixes to "hiccups" since sync changes
were added.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80c: Optimized to remove many boxReceipt DLs.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80d:  Various crypto / password fixes.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80e: OTMasterKey was needed for scripts.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80f: Some fixes + master_key_timeout in config.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80g: Fixing a memory bug related to OpenSSL.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80h: removed get pass, used UI_UTIL_read_pw()
instead.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.80j: Fixed OpenSSL threads crash bug.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.a: API for Scripts + Added signal handling.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.b: Fixed missing funcs in Java build.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.c: Bug fix related to integer sizes...

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.d: Fixed crash in passwords.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.e: Fixed OTPassword/SWIG inconsistency.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.f: Regenerated SWIG wrappers. 

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.g: Removed signal handler for Linux.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Added stack trace for Win64 to signal handler.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
v0.81.h: Fixed OTMessage stack frame bug.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Mini Project

ATM machine. Java connects to PostgreSQL server in order to create accounts and retrieve information.
Blog routes
Fixed mass assignment for Region model and Rails3-itized validators
first commit presentation
Updated the product_details_to_db function to include price and image
corrected the formating of the README
support web sql
gestion du projet sélectionné.
"caching" of latitude and longitude radians
implemented midpoint computation
Add unit tests and copy multiply and comparison string behavior
Update notes for submitted changes

* bionic: Fix aliasing violations
Merge pull request #850 from 9rnsr/fix7773

fix Issue 7773 - UCFS syntax on built-in attributes too?
fix Issue 7695 - Regression(2.058): ICE(mtype.c) on associative array with keys of struct type with const members
fix Issue 7396 - Indicate default alignment with 0.
Add few more methods to Blackjack to handle game state
added connected boolean
Added a link for the To-Do List
add Brent Weeks' Lightbringer serie to Readlist
Modify build status to look at the DrillingInfo travis build
added lfm dep
Divided into smaller .php files
API: new version 0.1 build=19
Client: new version 0.1 build=23
Removed importance, and keep urgency for task
Added support for tags on task
Added preference to open task in edit mode when double-clicking
Better filter managment
Fixed a json unserialization issue with VOCABULARY
Changed an image
Finished work on StormProxy's file integrity checks, a big thanks to Subv & Nayd (of TrinityCore).
init.d: new script for external gapps

principle: save precious nand space by putting gapps on /sd-ext
  and symlink to /system
enable by extracting the system folder in gapps zip to /sd-ext/gapps/system
 and creating the file /sd-ext/gapps/.extgapps

Change-Id: I8ecf0047e43f01e28215dc0274451aa7b29f2e77
fix bug with static parameter in Setting.php
2.3 changes file with dpad from controller now
Add a test to reproduce [JACKSON-877]
initial commit

still working on but uploading initial files.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Keep the details about copying arrays in one place in the backend.
Factor out array rewrites from the c99 rules into its own set of rules.
Merge pull request #20 from pjonsson/master

Keep array information for copying in a single place
Added tests for v4 packet convert module.

Verify support for all OFP 1.3.1 conversions
from pkt:packet() to ofp_field().
Merge branch 'dev' of github.com:FlowForwarding/LINC-Switch into dev
completed all user data in beijing
Merge branch 'master' of github.com:Flowerstars/bubargaintools
pooling char location objects
Merge branch 'master' of git://github.com/PrimaryFeather/Starling-Framework
now merging QuadBatches in compile method; fixed missing alpha application in compiled batch (refs #92, closes #110)
Merge branch 'master' of git://github.com/PrimaryFeather/Starling-Framework
Update src/it/francescotrillini/shutdown4j/server/Shutdown4j.java
增加reply回复表，记录bug回复
ESC bug fixed.
Screenshots modal sheet can be showed.
Added image format support.
securis frames33
switched to w3c validator as validation service
reajustes no painel solicitacoes pendentes.
change book model
add MDP demo #1
use jQuery instead of $ in ajax_collections.js ajaxSetup. move baseurl variable above plugin processing to allow it to be used in config files

git-svn-id: http://svn.montala.net/svn/resourcespace@3986 c08608d7-6e46-0410-86ca-f2a6f1370df5
scroll to top on annotation count link in search

git-svn-id: http://svn.montala.net/svn/resourcespace@3987 c08608d7-6e46-0410-86ca-f2a6f1370df5
Fix for caching issue with flash video preview in IE7/8


git-svn-id: http://svn.montala.net/svn/resourcespace@3988 c08608d7-6e46-0410-86ca-f2a6f1370df5
Added option download_filename_id_only. Sets downloaded fielanme as ref.extension


git-svn-id: http://svn.montala.net/svn/resourcespace@3989 c08608d7-6e46-0410-86ca-f2a6f1370df5
_WENHAI COMMIT

Signed-off-by: JSopener <i.hold.my.steps.forever@gmail.com>
Added font family selection to settings and implemented in the document view
moved font selection into a separate dialog
Merge pull request #150 from belfryimages/issue147

Adds editor font selection per issue #147
Added a new help command that shows an example markdown file which is contained as an embedded resource. If the user modifies it in any way, they are then prompted to save
#147 added font reset button, also cleaned up settings layout
#147 changed initial settings to use defaults from constants.cs (including font size)
using statements and var usage
Merge branch 'markdown-syntax-help-118' of https://github.com/markheath/DownmarkerWPF into markheath-markdown-syntax-help-118
some R# cleanup and using statements
merged with master, continued cleaning up UI, etc
Merge branch 'master' into UICleanup

Conflicts:
	src/MarkPad.Services/MarkPad.Services.csproj
	src/MarkPad/Constants.cs
	src/MarkPad/MarkPad.csproj
	src/MarkPad/Settings/SettingsView.xaml
	src/MarkPad/Settings/SettingsViewModel.cs
	src/MarkPad/Shell/ShellView.xaml
	src/MarkPad/Shell/ShellViewModel.cs
merge fail, again
Alignment fixes
bugfix - catch missing or unset font family and use defaults
FontSizes namespace fix
Merge pull request #156 from Code52/UICleanup

Ui cleanup
#159 handles invalid cast exception when getting settings
Merge pull request #160 from belfryimages/issue159_invalid_cast_in_settings_service

#159 handles invalid cast exception when getting settings
Deprecate some relics
first part of twitter client
Refactored xmls for consistency.
Added comment to the top of each activity xml for sanity
Added class RestaurantHelper which extends SQLiteOpenHelper with no
functionality for now.
executed SQL statement in onCreate to create a restaurant table
Removed extraneous code for the progress bar and options menu
Added RestaurantHelper member variable to LunchList and overrode
onDestroy.
Added insert method to RestaurantHelper and called it from onSave in
LunchList
Added getters to RestaurantHelper using a Cursor
Changed RestaurantHolder and other stuff to work with Cursor instead of
ArrayLists
Fixed onListClick to work with cursor and not arraylists
Added requery call to the database in onSave
Suprersion des clés non utilisées
Petite modification sur les requetes DQL
Mise en place d'un listener qui met à jour gitolite à l'évènement de création d'utilisateur
Ajout de tout les listeners afin de mettre à jour gitolite à chaque changement.
Mise en place de mon css dans le bundle :D
Merge branch '0.2.x'
Added inserts until end of 2012

Also added description blocks to the table and insert.
Fixes Mac segfault. Permanently.

Correctly returns the class in question when encountering a class name inside a template. Corrects further issues wherein an abort attempt leads to a token with a dead definition being operated upon.

Still remaining: Implementing constructors from outside the class scope. Esp. template constructors.
Fixes macro concatenation issue.
I hope to God this is the last one.
add uploader files V1.2
fixed #49
Site updated at 2012-09-27 07:27:26 UTC
Map generating with enlargement UPDATE

HUGE LAGS! With bigger maps. Have to optimize rendering. READ IT!
improved Bauernhof-version
Update app/config/config_dev.yml

use rotating file handler in stead of stream
expaneded application facade 'Application.as'
Added an option to override the sandbox/live mode for a specific
creditguard gateway instance + unit tests
flexible jspTrack
Updated to add stub API calls for timeline, triggers and slideDetails
Test brew outdated
Accidently put logo under header XD
chrome travis
objectOrientedProgramming - TP1
OOP - TP3 : First implementation
Item screen is done. Starting to change how movement is handled. Backed
up a version pre-fix.
Update od Toma - Dávání a braní věcí mezi osobami
Histagram hooked to apis.
Improved histogram view.
Türkçe karakter sorunu için "# encoding: utf-8" satırı eklendi.
Revert "Revert "Showing how happy you are!""

This reverts commit 25c61a67c190cd19545acc638eb34b7c657b965e.
Save last active task when task switching
Implement internal ERROR status for really horribly wrong happenings.

Signed-off-by: Robert Xu <robxu9@gmail.com>
lava fixed, old gfx again, more data display
[#36257837] Removing junk code, better DataSource resource handling.
[#36257837] Adding location table to db.
Fix disposition codes schema ref.
magazine capricho
update capricho to capricho magazine
update ip & port