Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

coucou, a prendre en priorite absolue :-) #124

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

coucou, a prendre en priorite absolue :-) #124

wants to merge 12 commits into from

Commits on Mar 27, 2017

  1. merge with the last Greg taplib

    @gilleslandais
    gilleslandais committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    cc152ac View commit details
    Browse the repository at this point in the history

  2. add binary operators

    @gilleslandais
    gilleslandais committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    e8be1ad View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2017

  1. merge with Greg lib (master branch) - version date june 2017,

    @gilleslandais
    gilleslandais committed Jun 29, 2017
    Configuration menu
    Copy the full SHA
    c5f450e View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. no change

    @gilleslandais
    gilleslandais committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    6643544 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2018

  1. Merge branch 'master' of https://github.com/gmantele/taplib 

    Conflicts:
	src/adql/db/DBChecker.java
	src/adql/parser/ADQLParser.java
	src/adql/parser/ADQLParserConstants.java
	src/adql/parser/ADQLParserTokenManager.java
	src/adql/parser/IdentifierItems.java
	src/adql/parser/adqlGrammar.jj
	src/adql/query/ADQLQuery.java
	src/adql/query/from/ADQLTable.java
	src/org/json/Json4Uws.java
	src/tap/AbstractTAPFactory.java
	src/tap/db/JDBCConnection.java
	src/uws/config/ConfigurableUWSFactory.java
	src/uws/job/UWSJob.java
	src/uws/job/serializer/XMLSerializer.java
	src/uws/service/AbstractUWSFactory.java
	src/uws/service/UWS.java
	src/uws/service/UWSServlet.java
	src/uws/service/backup/DefaultUWSBackupManager.java
	src/uws/service/request/XMLRequestParser.java
    @gilleslandais
    gilleslandais committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    7d62dcd View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2018

  1. quote problem

    @gilleslandais
    gilleslandais committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    907ae54 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. last update before vollt

    @gilleslandais
    gilleslandais committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    6d963b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. vollt version

    @gilleslandais
    gilleslandais committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    9ee1c10 View commit details
    Browse the repository at this point in the history

  2. fix libraries errors

    @gilleslandais
    gilleslandais committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    4925776 View commit details
    Browse the repository at this point in the history

  3. vollt merge !

    @gilleslandais
    gilleslandais committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    637cb0c View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. change debug level for UWS backup

    @gilleslandais
    gilleslandais committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    cedef5b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/gmantele/vollt

    @gilleslandais
    gilleslandais committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    d1d4436 View commit details
    Browse the repository at this point in the history