Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • m4lab_landing_page m4lab_landing_page
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Administrator
  • m4lab_landing_pagem4lab_landing_page
  • Merge requests
  • !32
An error occurred while fetching the assigned milestone of the selected merge_request.

Prepare production

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Wolfgang Knopki requested to merge prepare_production into master 4 years ago
  • Overview 0
  • Commits 108
  • Pipelines 0
  • Changes 66

Merge new landing page etc. to production

  • Loading
  • Loading
  • Loading
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
  1. 18 May, 2020 2 commits
    • Wolfgang Knopki's avatar
      Merge branch 'master' into 'prepare_production' · 2cb49313
      Wolfgang Knopki authored 4 years ago
      # Conflicts:
      #   .gitlab-ci.yml
      #   index.html
      #   js/headfoot.js
      2cb49313
    • Wolfgang Knopki's avatar
      Update .gitlab-ci.yml path adapted to apache-only (remove tomcat in the chain) · 5694dcd3
      Wolfgang Knopki authored 4 years ago
      5694dcd3
  2. 15 May, 2020 11 commits
    • Wolfgang Knopki's avatar
      Merge branch 'patch-1' into 'testing' · b9a1b396
      Wolfgang Knopki authored 5 years ago
      Update headfoot.js - fixed relative links
      
      See merge request !31
      b9a1b396
    • Wolfgang Knopki's avatar
      Update headfoot.js - fixed relative links · 5bc88988
      Wolfgang Knopki authored 5 years ago
      5bc88988
    • Varun Srivastava's avatar
      Merge branch 'MLAB-197' into 'testing' · 515351cf
      Varun Srivastava authored 5 years ago
      Mlab 197
      
      See merge request !30
      515351cf
    • Varun Srivastava's avatar
      rescaled the sandclock icon · dfab1413
      Varun Srivastava authored 5 years ago
      dfab1413
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-202' into 'testing' · 23491dc3
      Wolfgang Knopki authored 5 years ago
      Mlab 202
      
      See merge request !25
      23491dc3
    • Varun Srivastava's avatar
      Merge branch 'MLAB-197' into 'testing' · dde3c738
      Varun Srivastava authored 5 years ago
      added images and icons for project page
      
      See merge request !26
      dde3c738
    • Varun Srivastava's avatar
      added images and icons for project page · 703dd65e
      Varun Srivastava authored 5 years ago
      703dd65e
    • Christine Kraus's avatar
      Fixed links on Landing-Page · a88cc05b
      Christine Kraus authored 5 years ago
      a88cc05b
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-205' into 'testing' · 6a8f4332
      Wolfgang Knopki authored 5 years ago
      Mlab 205
      
      See merge request !23
      6a8f4332
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-201' into 'testing' · 43e88f0e
      Wolfgang Knopki authored 5 years ago
      Mlab 201
      
      See merge request !22
      43e88f0e
    • Wolfgang Knopki's avatar
      Merge branch 'testing' into 'MLAB-201' · e759ee3d
      Wolfgang Knopki authored 5 years ago
      # Conflicts:
      #   videoconference.html
      e759ee3d
  3. 14 May, 2020 4 commits
    • Rosanny Sihombing's avatar
      MLAB-205: update images and positioning · e857d332
      Rosanny Sihombing authored 5 years ago
      e857d332
    • Rosanny Sihombing's avatar
      to develop and test headfoot.js · d45b7fcf
      Rosanny Sihombing authored 5 years ago
      d45b7fcf
    • Rosanny Sihombing's avatar
      MLAB-205: add pictures from Presseabteilung · 1015d1f8
      Rosanny Sihombing authored 5 years ago
      1015d1f8
    • Christine Kraus's avatar
      Changed colors in Videoconferences and Landingpage to more likely HFT colors · 0e4a5efd
      Christine Kraus authored 5 years ago
      0e4a5efd
  4. 13 May, 2020 2 commits
    • Rosanny Sihombing's avatar
      MLAB-205 · 2598cda0
      Rosanny Sihombing authored 5 years ago
      2598cda0
    • Rosanny Sihombing's avatar
      for development and test only · aacee851
      Rosanny Sihombing authored 5 years ago
      aacee851
  5. 09 May, 2020 2 commits
    • Varun Srivastava's avatar
      Merge branch 'MLAB-198' into 'testing' · ded53d36
      Varun Srivastava authored 5 years ago
      Mlab 198
      
      See merge request !20
      ded53d36
    • Varun Srivastava's avatar
      contact link fixed · 2d8fc7eb
      Varun Srivastava authored 5 years ago
      2d8fc7eb
  6. 07 May, 2020 3 commits
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-176' into 'testing' · c7c35a4a
      Wolfgang Knopki authored 5 years ago
      Mlab 176
      
      See merge request !19
      c7c35a4a
    • Wolfgang Knopki's avatar
      copied js over from user-account · 46c7d8f7
      Wolfgang Knopki authored 5 years ago
      46c7d8f7
    • Wolfgang Knopki's avatar
      copied js over from user-account · 81fcf22f
      Wolfgang Knopki authored 5 years ago
      81fcf22f
  7. 27 Apr, 2020 13 commits
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-167-fix' into 'testing' · 59947311
      Wolfgang Knopki authored 5 years ago
      changed alignment ol
      
      See merge request !18
      59947311
    • Wolfgang Knopki's avatar
      changed alignment ol · 3fd63774
      Wolfgang Knopki authored 5 years ago
      3fd63774
    • Wolfgang Knopki's avatar
      Merge branch 'patch-1' into 'testing' · abb8c381
      Wolfgang Knopki authored 5 years ago
      Update videoconference.html
      
      See merge request !17
      abb8c381
    • Wolfgang Knopki's avatar
      Update videoconference.html · af7b9736
      Wolfgang Knopki authored 5 years ago
      af7b9736
    • Wolfgang Knopki's avatar
      Merge branch 'patch-1' into 'testing' · 3859e72f
      Wolfgang Knopki authored 5 years ago
      Update videoconference.html
      
      See merge request !16
      3859e72f
    • Wolfgang Knopki's avatar
      Update videoconference.html · ab1a214e
      Wolfgang Knopki authored 5 years ago
      ab1a214e
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-167' into 'testing' · 24977e28
      Wolfgang Knopki authored 5 years ago
      updated the jitsi help text
      
      See merge request !15
      24977e28
    • Wolfgang Knopki's avatar
      Merge branch 'testing' into 'MLAB-167' · c27416d1
      Wolfgang Knopki authored 5 years ago
      # Conflicts:
      #   videoconference.html
      c27416d1
    • Varun Srivastava's avatar
      updated the jitsi help text · 082d9c8e
      Varun Srivastava authored 5 years ago
      082d9c8e
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-159-fix' into 'testing' · a1af0021
      Wolfgang Knopki authored 5 years ago
      links adapted, removed additional navbar
      
      See merge request !14
      a1af0021
    • Wolfgang Knopki's avatar
      links adapted, removed additional navbar · 01189886
      Wolfgang Knopki authored 5 years ago
      01189886
    • Wolfgang Knopki's avatar
      Merge branch 'MLAB-159' into 'testing' · fce52226
      Wolfgang Knopki authored 5 years ago
      Mlab-159
      
      See merge request !13
      fce52226
    • Christine Kraus's avatar
      Videoconference-Page: Aligned Buttons · 9b276204
      Christine Kraus authored 5 years ago
      9b276204
  8. 21 Apr, 2020 4 commits
    • Wolfgang Knopki's avatar
      Merge branch 'loginpage_new' into 'testing' · 30e806c9
      Wolfgang Knopki authored 5 years ago
      added css for Login form
      
      See merge request !12
      30e806c9
    • Wolfgang Knopki's avatar
      added css for Login form · b5710b05
      Wolfgang Knopki authored 5 years ago
      b5710b05
    • Wolfgang Knopki's avatar
      Merge branch 'loginpage_new' into 'testing' · 5ff60e5b
      Wolfgang Knopki authored 5 years ago
      added images for new landing page
      
      See merge request !11
      5ff60e5b
    • Wolfgang Knopki's avatar
      added images for new landing page · 5670b159
      Wolfgang Knopki authored 5 years ago
      5670b159
  9. 17 Apr, 2020 2 commits
    • Christine Kraus's avatar
      added Link to GitLab in "Informationen bereitstellen" on Landing-Page · 49ff53e1
      Christine Kraus authored 5 years ago
      49ff53e1
    • Christine Kraus's avatar
      Home page: remove line break between "Daten, " and "Dokumentationen" - deleted · b1e1046f
      Christine Kraus authored 5 years ago
      b1e1046f
  10. 09 Apr, 2020 6 commits
    • Wolfgang Knopki's avatar
      Merge branch 'mailinglists_downloads' into 'testing' · 2e84d63e
      Wolfgang Knopki authored 5 years ago
      link style matched
      
      See merge request !10
      2e84d63e
    • Wolfgang Knopki's avatar
      link style matched · d1a63f3f
      Wolfgang Knopki authored 5 years ago
      d1a63f3f
    • Wolfgang Knopki's avatar
      Merge branch 'mailinglists_downloads' into 'testing' · 8feead47
      Wolfgang Knopki authored 5 years ago
      added link to landingpage button zur Projektübersicht
      
      See merge request !9
      8feead47
    • Wolfgang Knopki's avatar
      added link to landingpage button zur Projektübersicht · 18df2bb8
      Wolfgang Knopki authored 5 years ago
      18df2bb8
    • Wolfgang Knopki's avatar
      Merge branch 'mailinglists_downloads' into 'testing' · cf600d70
      Wolfgang Knopki authored 5 years ago
      added downloads for new mailinglists
      
      See merge request !8
      cf600d70
    • Wolfgang Knopki's avatar
      added downloads for new mailinglists · 9e847d70
      Wolfgang Knopki authored 5 years ago
      9e847d70
  11. 06 Apr, 2020 12 commits
    • Wolfgang Knopki's avatar
      Merge branch 'contact_mailinglist_assets' into 'testing' · 20283432
      Wolfgang Knopki authored 5 years ago
      typo contact/ impressum url
      
      See merge request !7
      20283432
    • Wolfgang Knopki's avatar
      typo contact/ impressum url · 4198b881
      Wolfgang Knopki authored 5 years ago
      4198b881
    • Wolfgang Knopki's avatar
      Merge branch 'contact_mailinglist_assets' into 'testing' · 7117fc1c
      Wolfgang Knopki authored 5 years ago
      added fontawesome css
      
      See merge request !5
      7117fc1c
    • Wolfgang Knopki's avatar
      added fontawesome css · 6b5810fc
      Wolfgang Knopki authored 5 years ago
      6b5810fc
    • Wolfgang Knopki's avatar
      Merge branch 'contact_mailinglist_assets' into 'testing' · bef546b1
      Wolfgang Knopki authored 5 years ago
      Contact mailinglist assets
      
      See merge request !4
      bef546b1
    • Wolfgang Knopki's avatar
      fixed typo headfoot.js · 20a35dd5
      Wolfgang Knopki authored 5 years ago
      20a35dd5
    • Wolfgang Knopki's avatar
      added assets for mailinglists and contact page · 72fe54a4
      Wolfgang Knopki authored 5 years ago
      72fe54a4
    • Wolfgang Knopki's avatar
      Merge branch 'new_landing_vc' into 'testing' · 55f06f76
      Wolfgang Knopki authored 5 years ago
      New landing vc
      
      See merge request !3
      55f06f76
    • Wolfgang Knopki's avatar
      changed link VC on landing page · 057cf80a
      Wolfgang Knopki authored 5 years ago
      057cf80a
    • Wolfgang Knopki's avatar
      added nonminified bootstrap for working menus, vc added js from cloudflare · c75b56b2
      Wolfgang Knopki authored 5 years ago
      c75b56b2
    • Wolfgang Knopki's avatar
      Merge branch 'new_landing_vc' into 'testing' · ba3a818c
      Wolfgang Knopki authored 5 years ago
      New landing vc
      
      See merge request !2
      ba3a818c
    • Wolfgang Knopki's avatar
      added nonminified bootstrap for working menus, vc added js from cloudflare · f2b60a93
      Wolfgang Knopki authored 5 years ago
      f2b60a93
  12. 03 Apr, 2020 1 commit
    • Wolfgang Knopki's avatar
      added new landing page and vc page · 34348b3f
      Wolfgang Knopki authored 5 years ago
      34348b3f
  13. 27 Mar, 2020 2 commits
    • Wolfgang Knopki's avatar
      removed userIsAuthenticated · ddf9abba
      Wolfgang Knopki authored 5 years ago
      ddf9abba
    • Wolfgang Knopki's avatar
      changed header: added user account button, removed login button · 670f1b27
      Wolfgang Knopki authored 5 years ago
      670f1b27
  14. 25 Mar, 2020 1 commit
    • Wolfgang Knopki's avatar
      changed mispaste login link · 8513c4e3
      Wolfgang Knopki authored 5 years ago
      8513c4e3
  15. 24 Mar, 2020 1 commit
    • Wolfgang Knopki's avatar
      links hft adapted, added menu entry Veranstaltungen Forschung · 2e999fc4
      Wolfgang Knopki authored 5 years ago
      2e999fc4
  16. 23 Mar, 2020 1 commit
    • Wolfgang Knopki's avatar
      videoconferences page changed to account · c4a96df6
      Wolfgang Knopki authored 5 years ago
      c4a96df6
  17. 13 Feb, 2020 1 commit
    • Wolfgang Knopki's avatar
      merged new header · 211eeb7c
      Wolfgang Knopki authored 5 years ago
      211eeb7c
  18. 24 Jan, 2020 12 commits
    • Wolfgang Knopki's avatar
      image width footer · 20c9bddc
      Wolfgang Knopki authored 5 years ago
      20c9bddc
    • Wolfgang Knopki's avatar
      image width footer · f3807805
      Wolfgang Knopki authored 5 years ago
      f3807805
    • Wolfgang Knopki's avatar
      Merge branch 'changes_jan' into testing · 431a356a
      Wolfgang Knopki authored 5 years ago
      431a356a
    • Wolfgang Knopki's avatar
      corrected comma in menu · 8cb0a746
      Wolfgang Knopki authored 5 years ago
      8cb0a746
    • Wolfgang Knopki's avatar
      merge corrections · 192bb16a
      Wolfgang Knopki authored 5 years ago
      192bb16a
    • Wolfgang Knopki's avatar
      [update] corrected commenting · 5b43070a
      Wolfgang Knopki authored 5 years ago
      5b43070a
    • Wolfgang Knopki's avatar
      Merge branch 'testing' of transfer.hft-stuttgart.de:root/m4lab_landing_page into testing · c9e45b66
      Wolfgang Knopki authored 5 years ago
      messed pulling before merging up
      c9e45b66
    • Wolfgang Knopki's avatar
      merged script changes · e1f1e733
      Wolfgang Knopki authored 5 years ago
      e1f1e733
    • Christine Kraus's avatar
      Dead-Links in Header commented out · d6accd07
      Christine Kraus authored 5 years ago
      Search field commented out
      d6accd07
    • Christine Kraus's avatar
      Update Links in Footer (Social Media and HFT) · 59392cb8
      Christine Kraus authored 5 years ago
      59392cb8
    • Christine Kraus's avatar
      Image neu hochgeladen · db611f2b
      Christine Kraus authored 5 years ago
      db611f2b
    • Christine Kraus's avatar
      Logo im Footer Innovative Hochschule ausgetauscht / neues Logo abgelegt in images/demo · 7aae3753
      Christine Kraus authored 5 years ago
      7aae3753
  19. 23 Jan, 2020 3 commits
    • Wolfgang Knopki's avatar
      Merge branch 'changes_jan' into 'testing' · d2f5ba59
      Wolfgang Knopki authored 5 years ago
      Bürgerbeteiligung im Text entfernt
      
      See merge request !1
      d2f5ba59
    • Wolfgang Knopki's avatar
      Bürgerbeteiligung im Text entfernt · 9d21e3ce
      Wolfgang Knopki authored 5 years ago
      9d21e3ce
    • Christine Kraus's avatar
      Bürgerbeteiligung im Text entfernt · 44255601
      Christine Kraus authored 5 years ago
      44255601
  20. 11 Dec, 2019 1 commit
    • Wolfgang Knopki's avatar
      renamed devel branch to testing for consistency · aed0a605
      Wolfgang Knopki authored 5 years ago
      aed0a605
  21. 10 Dec, 2019 8 commits
    • Wolfgang Knopki's avatar
      user profile changes reverted · a8dec53a
      Wolfgang Knopki authored 5 years ago
      a8dec53a
    • Wolfgang Knopki's avatar
      user profile fetch / change login button · 1ec3f07f
      Wolfgang Knopki authored 5 years ago
      1ec3f07f
    • Wolfgang Knopki's avatar
      user profile fetch · 1f23ea54
      Wolfgang Knopki authored 5 years ago
      1f23ea54
    • Wolfgang Knopki's avatar
      user output debugging · 909224be
      Wolfgang Knopki authored 5 years ago
      909224be
    • Wolfgang Knopki's avatar
      user output debugging · 525483de
      Wolfgang Knopki authored 5 years ago
      525483de
    • Wolfgang Knopki's avatar
      new SAML header · fa6414d9
      Wolfgang Knopki authored 5 years ago
      fa6414d9
    • Wolfgang Knopki's avatar
      new SAML header · da115f20
      Wolfgang Knopki authored 5 years ago
      da115f20
    • Wolfgang Knopki's avatar
      set login button according to SAML status · c4ac2316
      Wolfgang Knopki authored 5 years ago
      c4ac2316
  22. 06 Dec, 2019 2 commits
    • Wolfgang Knopki's avatar
      [header] change login button link to /account/ · ff996215
      Wolfgang Knopki authored 5 years ago
      ff996215
    • Wolfgang Knopki's avatar
      [cicd] addeed tags to build script · 6816389b
      Wolfgang Knopki authored 5 years ago
      6816389b
  23. 04 Dec, 2019 2 commits
    • Wolfgang Knopki's avatar
      reverted · acb4ff44
      Wolfgang Knopki authored 5 years ago
      acb4ff44
    • Wolfgang Knopki's avatar
      added id to login button · a38abd50
      Wolfgang Knopki authored 5 years ago
      a38abd50
  24. 22 Nov, 2019 4 commits
    • Wolfgang Knopki's avatar
      [cicd] deployment to testserver, dns changed · c0b656e4
      Wolfgang Knopki authored 5 years ago
      c0b656e4
    • Wolfgang Knopki's avatar
      [cicd] deployment to testserver, jar hardcoded · 91101712
      Wolfgang Knopki authored 5 years ago
      91101712
    • Wolfgang Knopki's avatar
      [cicd] deployment to testserver, java added · af6f1977
      Wolfgang Knopki authored 5 years ago
      af6f1977
    • Wolfgang Knopki's avatar
      [cicd] deployment to testserver, java added · abf449af
      Wolfgang Knopki authored 5 years ago
      abf449af
  25. 8 additional commits have been omitted to prevent performance issues.
Assignee
Wolfgang Knopki's avatar
Wolfgang Knopki
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: prepare_production

Menu

Explore Projects Groups Snippets

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal