Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: subhra74/xdm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: VRDate/xdm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 356 files changed
  • 3 contributors

Commits on Aug 10, 2018

  1. Upgraded to Eclipse+IntelliJ Maven Project 

    mvn clean compile jar
Improved Logger with timestamp
    @VRDate
    VRDate committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    ee320fe View commit details
    Browse the repository at this point in the history

  2. code cleanup

    @VRDate
    VRDate committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    bc43a7a View commit details
    Browse the repository at this point in the history

  3. code cleanup

    @VRDate
    VRDate committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    672cd1e View commit details
    Browse the repository at this point in the history

  4. pom.xml update packaging jar names

    @VRDate
    VRDate committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    3d9a8de View commit details
    Browse the repository at this point in the history

  5. updated script

    @VRDate
    VRDate committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    61de1c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2018

  1. Config 

     using files instaed of strings.
 encapsulated fields
 creating folders in constructor
Logger logging to TemporaryFolder XDM.log
DownloadQueue
  queuedItems replaced ArrayList<String>
   with ArrayDeque<String>
  improved logs
QueueManager
 replaced ArrayList<DownloadQueue> queueList
  with LinkedHashMap<String, DownloadQueue> downloadQueueMap
  improved save anl load null handling
    @VRDate
    VRDate committed Aug 11, 2018
    Configuration menu
    Copy the full SHA
    b0b9c9c View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. Merge branch 'master' of https://github.com/subhra74/xdm into subhra7… 

    …4-master

# Conflicts:
#	XDM_NEON/.classpath
#	src/main/java/xdman/monitoring/MonitoringSession.java
    Tomer Bar-Shlomo committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    11dd416 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/subhra74/xdm into subhra7… 

    …4-master

# Conflicts:
#	XDM_NEON/.classpath
#	src/main/java/xdman/monitoring/MonitoringSession.java
    Tomer Bar-Shlomo committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    d25dfaf View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from VRDate/subhra74-master 

    Subhra74 master
    @VRDate
    VRDate authored Aug 17, 2018
    Configuration menu
    Copy the full SHA
    91232aa View commit details
    Browse the repository at this point in the history

  4. App version in window title 

    he=Hebrew Translation WIP
About and pom update
    Tomer Bar-Shlomo committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    032374e View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2018

  1. Merge pull request #3 from VRDate/subhra74-master 

    App version in window title
    @VRDate
    VRDate authored Aug 20, 2018
    Configuration menu
    Copy the full SHA
    00f0c52 View commit details
    Browse the repository at this point in the history

  2. Updated logging 

    Updated File load and save
    Tomer Bar-Shlomo committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    752bdc7 View commit details
    Browse the repository at this point in the history

  3. Updated logging 

    Updated MediaFormats load and save
    Tomer Bar-Shlomo committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    e0d5792 View commit details
    Browse the repository at this point in the history

  4. version 2018.08.20

    Tomer Bar-Shlomo committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    939c99e View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. Merge pull request #4 from VRDate/subhra74-master 

    version 2018.08.20
    @VRDate
    VRDate authored Aug 21, 2018
    Configuration menu
    Copy the full SHA
    e88e8b4 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2018

  1. Add Heroku generated app.json

    @VRDate
    VRDate committed Sep 12, 2018
    Configuration menu
    Copy the full SHA
    c8df672 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

  1. Merge pull request #6 from subhra74/master 

    merge from master
    @VRDate
    VRDate authored Jul 11, 2019
    Configuration menu
    Copy the full SHA
    b5b0406 View commit details
    Browse the repository at this point in the history
Loading