06 Jul, 2018

7 commits

• 1a64e231   imdex empty file Browse Code »
  Elena.Budnik

  2018-07-06 11:47:43 +0200  
• f9328ec2   help cat, tt upload Browse Code »
  Elena.Budnik

  2018-07-06 11:39:10 +0200  
• 597e7dbc   TT upload help Browse Code »
  Elena.Budnik

  2018-07-06 11:29:37 +0200  
• a2409f36   no https for url upload Browse Code »
  Elena.Budnik

  2018-07-06 10:58:47 +0200  
• 76fd40dc   name == id in filter list Browse Code »
  Elena.Budnik

  2018-07-06 10:49:42 +0200  
• f6b85d48   filters help Browse Code »
  Elena.Budnik

  2018-07-06 10:35:24 +0200  
• bcb4c408   send mail for copy WS Browse Code »
  Elena.Budnik

  2018-07-06 09:40:10 +0200  

05 Jul, 2018

4 commits

• 7fda21f3   reodering Browse Code »
  Elena.Budnik

  2018-07-05 16:32:36 +0200  
• aad81034   provider list corrected Browse Code »
  Elena.Budnik

  2018-07-05 10:59:07 +0200  
• b21d09b2   mercury coord modifs Browse Code »
  Elena.Budnik

  2018-07-05 10:42:05 +0200  
• 2f79a842   filter name corr Browse Code »
  Elena.Budnik

  2018-07-05 09:48:39 +0200  

04 Jul, 2018

8 commits

• 9d68ff1d   add several filter conditions Browse Code »
  Elena.Budnik

  2018-07-04 18:28:44 +0200  
• 39d0bf07   typo msg Browse Code »
  Elena.Budnik

  2018-07-04 18:06:33 +0200  
• 311208da   typo in msg Browse Code »
  Elena.Budnik

  2018-07-04 17:22:31 +0200  
• 96df8ed1   temporary decrease filter conditions Browse Code »
  Elena.Budnik

  2018-07-04 16:17:11 +0200  
• d839d0d7   temporary decrease filter conditions Browse Code »
  Elena.Budnik

  2018-07-04 16:04:48 +0200  
• 9c1b0ea7   plotHelp == plotsimplifiedView Browse Code »
  Elena.Budnik

  2018-07-04 15:19:02 +0200  
• 82193dd4   update RemoteParams.xml Browse Code »
  Elena.Budnik

  2018-07-04 12:45:25 +0200  
• d444ba30   mkdir...,0775 doesnot work - added chmod...,0775 + copy to paramDef xml if it doesnit exist Browse Code »
  Elena.Budnik

  2018-07-04 12:26:44 +0200  

03 Jul, 2018

1 commit

• c344b37f   process simuParam deleteFromTree Browse Code »
  Elena.Budnik

  2018-07-03 16:27:06 +0200  

02 Jul, 2018

6 commits

• 113fbe39   Announcement of new instance Browse Code »
  Myriam Bouchemit

  2018-07-02 16:07:49 +0200  
• fa5e7074   bug in files transfer Browse Code »
  Elena.Budnik

  2018-07-02 15:54:48 +0200  
• 82a6dd86   window move.. temporary Browse Code »
  Elena.Budnik

  2018-07-02 14:59:45 +0200  
• 37eb7153   window move.. temporary Browse Code »
  Elena.Budnik

  2018-07-02 14:29:18 +0200  
• de5d1909   message corrected Browse Code »
  Elena.Budnik

  2018-07-02 12:53:25 +0200  
• 77237fff   if ws param was already deleted Browse Code »
  Elena.Budnik

  2018-07-02 11:35:06 +0200  

29 Jun, 2018

11 commits

• 4b3bd283   epic not ready Browse Code »
  Elena.Budnik

  2018-06-29 14:01:15 +0200  
• adcf0710   message for WS converssion Browse Code »
  Elena.Budnik

  2018-06-29 13:36:07 +0200  
• 7b514636   add migration post processing Browse Code »
  Elena.Budnik

  2018-06-29 13:19:35 +0200  
• 981cd087   ws transfer modifs Browse Code »
  Elena.Budnik

  2018-06-29 12:22:26 +0200  
• 3720136b   Merge branch 'fix-folders-fix-merge' into 'master' ... Browse Code »

  Fix folders fix merge
  
  ```
  git checkout a8cc445 # go to last master commit before conflicts
  git checkout -b master-clean # creating a new clean master branch
  git checkout fix-folders # go to fix folders branch
  git checkout 11d2107 # go to the last good commit in the fix folders branch
  git checkout -b fix-folders-fix-merge # creating a fix-merge branch
  git merge master-clean # merging the clean master branch into fix-merge branch
  nano php/classes/UserWsTransfer.php && git add php/classes/UserWsTransfer.php && git commit -m "add spectra" # manually apply the "add spectra" patch
  nano generic_data/migration/Functions.xml && git add generic_data/migration/Functions.xml && git commit -m "new functions" # manually apply the "new functions" patch
  git merge master -s ours # merge the actual master branch into fix-merge branch but with "accept mine" strategy
  git push origin fix-folders-fix-merge # push the fix-merge branch in order to create this pull request.
  ```
  
  See merge request !25

  Elena Budnik

  2018-06-29 12:11:21 +0200  
• 415ff556   Merge branch 'master' into fix-folders-fix-merge Browse Code »
  Elena.Budnik

  2018-06-29 11:22:09 +0200  
• ef2dedb3   Merge branch 'master' into fix-folders-fix-merge Browse Code »
  Nathanaël Jourdane

  2018-06-29 11:41:36 +0200  
• 3fd55894   new functions Browse Code »
  Nathanaël Jourdane

  2018-06-29 11:34:52 +0200  
• 57c64695   add spectra Browse Code »
  Nathanaël Jourdane

  2018-06-29 11:33:18 +0200  
• 23bf3e3a   Merge branch 'master-good' into fix-folders-merge Browse Code »
  Nathanaël Jourdane

  2018-06-29 11:25:10 +0200  
• 2b8ea2a7   RemoteParamManager => init exclude from constructor Browse Code »
  Elena.Budnik

  2018-06-29 10:45:04 +0200  

28 Jun, 2018

3 commits

• 3ec3ea9c   add spectra Browse Code »
  Elena.Budnik

  2018-06-28 15:31:45 +0200  
• 2ac8da6c   Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM Browse Code »
  Elena.Budnik

  2018-06-28 15:15:57 +0200  
• fc8f3d9d   new functions Browse Code »
  Elena.Budnik

  2018-06-28 15:15:46 +0200