Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
navigationmenu [2013/11/08 12:23]
thew add quantum optics theory page
navigationmenu [2019/03/16 19:48] (current)
Line 6: Line 6:
       * [[research:​Nonlocality and Entanglement:​Theory|Theory]]       * [[research:​Nonlocality and Entanglement:​Theory|Theory]]
       * [[research:​Nonlocality and Entanglement:​Experiment|Experiment]]       * [[research:​Nonlocality and Entanglement:​Experiment|Experiment]]
 +    * [[research:​macro|Macroscopic Entanglement]]
     * [[research:​quantum_memories_and_repeaters]]     * [[research:​quantum_memories_and_repeaters]]
       * [[research:​quantum_memories_and_repeaters:​Multimode Quantum Memories]]       * [[research:​quantum_memories_and_repeaters:​Multimode Quantum Memories]]
-      ​* [[research:quantum_optics-theory|Quantum Optics Theory]] +    ​* [[ http://​www.unige.ch/​gap/​qtech/​research:quantum_communication ​|Quantum Photonics and Quantum Communication ]]
-    * [[research:qpqc|Quantum Photonics and Quantum Communication]] +
-      * [[research:​quantumphotonics|Quantum Photonics]] +
-      * [[research:​quantumcommunication|Quantum Communication]] +
-      * [[research:​device_independent_technologies|Device Independent Technologies]]+
   * [[publications:​start|Publications]]   * [[publications:​start|Publications]]
     * [[publications:​new_publication]]     * [[publications:​new_publication]]
Line 20: Line 17:
     * [[members:​group-photo|]]     * [[members:​group-photo|]]
   * [[teaching:​start|Teaching]]   * [[teaching:​start|Teaching]]
 +  * [[events:​start|Events]] ​
   * [[jobs:​start|Open Positions]]   * [[jobs:​start|Open Positions]]
-  * [[:​contact|Contact ​Us]]+  * [[:​contact|Contact]]