• This project
    • Loading...
  • Sign in

hh_public / hhvDoctorSDK.ios

Logo
Go to a project
Toggle navigation
  • Projects
  • Groups
  • Snippets
  • Help
Toggle navigation pinning
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 3
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
Open
Merge Request !2 opened 2019-07-10 09:04:45 UTC by shijian@shijian

Develop

Edited 2021-06-23 07:04:08 UTC
Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge develop into master (221 commits behind)
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b develop origin/develop

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff develop

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

This merge request contains merge conflicts

Please resolve these conflicts or ask someone with write access to this repository to merge this request manually.

  • Discussion 0
  • Commits 96
  • Changes 310
  • shijian
    @shijian 2019-07-11 02:39:48 UTC

    Added 1 commit:

    • effc3dbd - sdk upgrade
  • shijian
    @shijian 2019-07-11 08:21:25 UTC

    Added 1 commit:

    • 0e77ef0d - sdk upgrade
  • shijian
    @shijian 2019-07-11 09:50:46 UTC

    Added 1 commit:

    • 09df828d - sdk upgrade
  • shijian
    @shijian 2019-07-11 09:56:15 UTC

    Added 1 commit:

    • c4f04b6d - sdk upgrade
  • shijian
    @shijian 2019-07-12 03:32:49 UTC

    Added 1 commit:

    • 1024a26c - sdk upgrade
  • shijian
    @shijian 2019-07-12 03:54:13 UTC

    Added 1 commit:

    • d4cbf5f6 - sdk upgrade
  • shijian
    @shijian 2019-07-24 06:24:18 UTC

    Added 1 commit:

    • 4fb7d3e6 - sdk upgrade
  • shijian
    @shijian 2019-07-24 06:51:57 UTC

    Added 1 commit:

    • 1ed9c366 - sdk upgrade
  • shijian
    @shijian 2019-07-24 07:26:53 UTC

    Added 1 commit:

    • a4b3debb - sdk upgrade
  • shijian
    @shijian 2019-07-24 10:24:22 UTC

    Added 1 commit:

    • 8dfe07e8 - sdk upgrade
  • shijian
    @shijian 2019-07-25 04:05:54 UTC

    Added 1 commit:

    • a0bbafb9 - sdk upgrade
  • shijian
    @shijian 2019-07-25 06:59:46 UTC

    Added 1 commit:

    • 87fc1203 - sdk upgrade
  • shijian
    @shijian 2019-08-07 07:30:56 UTC

    Added 1 commit:

    • e1393eb5 - sdk upgrade
  • shijian
    @shijian 2019-08-07 07:48:13 UTC

    Added 1 commit:

    • 694e2e29 - sdk upgrade
  • shijian
    @shijian 2019-08-19 11:29:42 UTC

    Added 1 commit:

    • f16fc6ee - sdk upgrade
  • shijian
    @shijian 2019-08-20 01:54:26 UTC

    Added 1 commit:

    • fa92f21c - sdk upgrade
  • shijian
    @shijian 2019-08-20 02:05:51 UTC

    Restored source branch develop

  • shijian
    @shijian 2019-08-20 02:05:51 UTC

    Added 14 commits:

    • 985492ec..6735ed4a - 14 commits from branch master
  • shijian
    @shijian 2019-08-20 02:24:39 UTC

    Added 20 commits:

    • 04c20b89 - sdk upgrade
    • 048fd32b - sdk upgrade
    • 626a18f3 - sdk upgrade
    • effc3dbd - sdk upgrade
    • 0e77ef0d - sdk upgrade
    • 09df828d - sdk upgrade
    • c4f04b6d - sdk upgrade
    • 1024a26c - sdk upgrade
    • d4cbf5f6 - sdk upgrade
    • 4fb7d3e6 - sdk upgrade
    • 1ed9c366 - sdk upgrade
    • a4b3debb - sdk upgrade
    • 8dfe07e8 - sdk upgrade
    • a0bbafb9 - sdk upgrade
    • 87fc1203 - sdk upgrade
    • e1393eb5 - sdk upgrade
    • 694e2e29 - sdk upgrade
    • f16fc6ee - sdk upgrade
    • fa92f21c - sdk upgrade
    • 3fd1f728 - sdk upgrade
  • shijian
    @shijian 2019-08-20 02:31:08 UTC

    Added 1 commit:

    • 44b1034e - sdk upgrade
  • shijian
    @shijian 2019-08-20 03:40:25 UTC

    Added 1 commit:

    • b23cf465 - sdk upgrade
  • shijian
    @shijian 2019-08-20 08:53:48 UTC

    Added 1 commit:

    • d83cf903 - sdk upgrade
  • shijian
    @shijian 2019-08-20 11:10:40 UTC

    Added 1 commit:

    • 88134723 - sdk upgrade
  • shijian
    @shijian 2019-08-20 11:22:08 UTC

    Added 1 commit:

    • 74859074 - sdk upgrade
  • shijian
    @shijian 2019-08-21 07:29:05 UTC

    Added 1 commit:

    • 9689a4e6 - sdk upgrade
  • shijian
    @shijian 2019-08-22 02:27:50 UTC

    Added 1 commit:

    • 97a1609c - sdk upgrade
  • shijian
    @shijian 2019-08-22 02:57:40 UTC

    Added 1 commit:

    • 5a8fae6e - sdk upgrade
  • shijian
    @shijian 2019-08-23 06:59:24 UTC

    Added 1 commit:

    • c275afe9 - sdk upgrade
  • shijian
    @shijian 2019-08-23 07:44:54 UTC

    Added 1 commit:

    • 2a30ee73 - sdk upgrade
  • shijian
    @shijian 2019-08-23 10:08:40 UTC

    Added 1 commit:

    • da154720 - sdk upgrade
  • shijian
    @shijian 2019-08-26 03:22:39 UTC

    Added 1 commit:

    • db5e0bb6 - sdk upgrade
  • shijian
    @shijian 2019-08-27 02:48:46 UTC

    Added 1 commit:

    • 892efc27 - sdk upgrade
  • shijian
    @shijian 2019-08-27 05:05:08 UTC

    Added 1 commit:

    • 8bd93b35 - sdk upgrade
  • shijian
    @shijian 2019-08-27 05:22:26 UTC

    Added 1 commit:

    • 367910a4 - sdk upgrade
  • shijian
    @shijian 2019-08-27 05:37:59 UTC

    Added 1 commit:

    • 8434558e - sdk upgrade
  • shijian
    @shijian 2019-08-27 07:28:31 UTC

    Added 1 commit:

    • f9fb8a47 - sdk upgrade
  • shijian
    @shijian 2019-08-27 08:30:55 UTC

    Added 1 commit:

    • a7165e74 - sdk upgrade
  • shijian
    @shijian 2019-08-27 10:33:48 UTC

    Added 1 commit:

    • 9a059fcc - sdk upgrade
  • shijian
    @shijian 2019-08-28 11:37:13 UTC

    Added 1 commit:

    • 5d795000 - sdk upgrade
  • shijian
    @shijian 2019-08-28 11:54:26 UTC

    Added 1 commit:

    • 45ac4c37 - sdk upgrade
  • shijian
    @shijian 2019-08-28 12:00:45 UTC

    Added 1 commit:

    • c2232dcb - sdk upgrade
  • shijian
    @shijian 2019-08-28 12:05:18 UTC

    Added 1 commit:

    • 502b9ab6 - sdk upgrade
  • shijian
    @shijian 2019-08-28 12:12:49 UTC

    Added 1 commit:

    • 15936621 - sdk upgrade
  • shijian
    @shijian 2019-08-28 12:41:02 UTC

    Added 1 commit:

    • ee115f44 - sdk upgrade
  • shijian
    @shijian 2019-08-29 02:19:50 UTC

    Added 1 commit:

    • 87456cf0 - sdk upgrade
  • shijian
    @shijian 2019-08-29 02:23:31 UTC

    Added 1 commit:

    • babf1893 - sdk upgrade
  • shijian
    @shijian 2019-08-29 02:37:56 UTC

    Added 1 commit:

    • f9115fac - sdk upgrade
  • shijian
    @shijian 2019-08-29 02:59:39 UTC

    Added 1 commit:

    • 4fe752cf - sdk upgrade
  • shijian
    @shijian 2019-09-16 07:46:39 UTC

    Added 1 commit:

    • 5c2ae0fe - sdk upgrade
  • shijian
    @shijian 2019-09-23 06:32:52 UTC

    Added 1 commit:

    • 8ac8fa31 - sdk upgrade
  • shijian
    @shijian 2019-09-27 10:20:00 UTC

    Added 1 commit:

    • fd47cc9c - sdk upgrade
  • shijian
    @shijian 2019-09-27 11:11:23 UTC

    Added 1 commit:

    • 486a5ec7 - sdk upgrade
  • shijian
    @shijian 2019-11-07 11:46:18 UTC

    Added 1 commit:

    • 61c76920 - sdk upgrade
  • shijian
    @shijian 2019-11-11 08:52:26 UTC

    Added 1 commit:

    • 29cba9da - sdk upgrade
  • shijian
    @shijian 2019-11-13 01:56:05 UTC

    Added 1 commit:

    • fb0c17e6 - sdk upgrade
  • shijian
    @shijian 2019-11-13 02:57:17 UTC

    Added 1 commit:

    • 7b69d034 - sdk upgrade
  • shijian
    @shijian 2019-11-13 10:04:35 UTC

    Added 1 commit:

    • 8dabd41b - sdk upgrade
  • shijian
    @shijian 2019-11-13 10:34:49 UTC

    Added 1 commit:

    • 62e2c0bc - sdk upgrade
  • shijian
    @shijian 2019-11-13 10:49:53 UTC

    Added 1 commit:

    • cf619b88 - sdk upgrade
  • shijian
    @shijian 2019-12-26 02:43:43 UTC

    Added 1 commit:

    • 82728596 - sdk upgrade
  • shijian
    @shijian 2020-03-12 08:34:14 UTC

    Added 2 commits:

    • cc1aa150 - sdk upgrade
    • 0f6e673e - sdk upgrade
  • shijian
    @shijian 2020-03-12 08:35:32 UTC

    Added 1 commit:

    • 35a04cf3 - sdk upgrade
  • shijian
    @shijian 2020-03-12 08:46:40 UTC

    Added 1 commit:

    • f052820d - sdk upgrade
  • shijian
    @shijian 2020-03-17 06:21:58 UTC

    Added 1 commit:

    • aaa37ea3 - sdk upgrade
  • shijian
    @shijian 2020-03-17 06:42:53 UTC

    Added 1 commit:

    • 58f59411 - sdk upgrade
  • shijian
    @shijian 2020-04-07 02:36:03 UTC

    Added 1 commit:

    • 757b2a1d - sdk upgrade
  • shijian
    @shijian 2020-04-07 02:52:21 UTC

    Added 1 commit:

    • 5e08fd9e - sdk upgrade
  • shijian
    @shijian 2020-04-07 10:37:10 UTC

    Added 1 commit:

    • 6e0676ed - sdk upgrade
  • shijian
    @shijian 2020-04-09 07:44:38 UTC

    Added 1 commit:

    • 2cda4b69 - sdk upgrade
  • chengyanfang
    @chengyanfang 2020-08-17 06:36:25 UTC

    Added 2 commits:

    • 1a2516c8 - sdk upgrade
    • f677d290 - sdk upgrade
  • chengyanfang
    @chengyanfang 2021-03-17 05:06:20 UTC

    Added 1 commit:

    • fda44168 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 06:49:30 UTC

    Added 1 commit:

    • 20996555 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 08:20:00 UTC

    Added 1 commit:

    • 335916b6 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 08:50:07 UTC

    Added 1 commit:

    • aa156b7e - fix podspec
  • liumingming
    @liumingming 2021-06-09 08:52:55 UTC

    Added 1 commit:

    • c271fcde - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 09:12:13 UTC

    Added 1 commit:

    • 8438c30d - fix base
  • liumingming
    @liumingming 2021-06-09 09:14:32 UTC

    Added 1 commit:

    • 02699acc - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 09:58:20 UTC

    Added 1 commit:

    • be7220c0 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 10:00:21 UTC

    Added 1 commit:

    • 3f3e167b - fix
  • liumingming
    @liumingming 2021-06-09 10:03:16 UTC

    Added 1 commit:

    • e81e2ab4 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 10:24:54 UTC

    Added 1 commit:

    • 3e1174c8 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 10:25:51 UTC

    Added 1 commit:

    • ffad29eb - fix
  • liumingming
    @liumingming 2021-06-09 10:28:07 UTC

    Added 1 commit:

    • 91f3f7e8 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 10:32:46 UTC

    Added 1 commit:

    • 467efe40 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 10:43:06 UTC

    Added 1 commit:

    • 489900c1 - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 12:03:38 UTC

    Added 1 commit:

    • f944f2cd - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 12:24:54 UTC

    Added 1 commit:

    • 3dd6931e - sdk upgrade
  • liumingming
    @liumingming 2021-06-09 12:25:58 UTC

    Added 1 commit:

    • 4b54d4cd - rm frameworks
  • liumingming
    @liumingming 2021-06-09 12:27:59 UTC

    Added 1 commit:

    • a8e6a9ae - sdk upgrade
  • liumingming
    @liumingming 2021-06-23 06:29:42 UTC

    Added 1 commit:

    • 76d09d8d - sdk upgrade
  • liumingming
    @liumingming 2021-06-23 06:38:24 UTC

    Added 1 commit:

    • 2a66bb65 - sdk upgrade
  • liumingming
    @liumingming 2021-06-23 07:04:08 UTC

    Added 1 commit:

    • b0fc22df - remove new framwork
  • Please register or login to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
3
3 participants
Reference: hh_public/hhvDoctorSDK.ios!2