Skip to content
Snippets Groups Projects

feature(popup): popup

Merged Krzysztof Dyszczyk requested to merge feature/popup into main
2 unresolved threads

Merge request reports

Checking pipeline status.

Approved by

Merged by Krzysztof DyszczykKrzysztof Dyszczyk 3 years ago (Aug 13, 2021 12:03pm UTC)

Merge details

  • Changes merged into main with be815c69 (commits were squashed).
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
27 plugins_url( 'popup-css-file' ),
28 array(),
29 'script-version'
30 );
31 wp_enqueue_style( 'wpdesk-activation-reminder' );
32 }
9 33 }
10 34
11 public function admin_footer() {
12 echo "<!-- footer reminder -->\n";
35 public function display_html_element() {
36 $logo_url = plugins_url( 'plugin-dir' . '/' . $this->logo_url );
37 $cookie_name = md5( site_url() );
38 $subscriptions_url = admin_url( 'admin.php?page=wpdesk-licenses' );
39 $read_more_url = 'https://flexibleshipping.com';
40 echo "<span class=\"wpdesk-activation-reminder\" data-plugin_title=\"plugin-title\" data-plugin_dir=\"plugin-dir\" data-logo_url=\"$logo_url\" data-cookie_name=\"$cookie_name\" data-subscriptions_url=\"$subscriptions_url\" data-buy_plugin_url=\"buy-plugin-url\" data-read_more_url=\"$read_more_url\"></span>";
  • 10 add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_reminder_script' ) );
    11 add_action( 'admin_footer', array( $this, 'display_html_element' ) );
    12 }
    13
    14 public function enqueue_reminder_script() {
    15 if ( get_option( 'api_plugin-dir_activated', '' ) !== 'Activated' ) {
    16 wp_register_script(
    17 'wpdesk-activation-reminder',
    18 plugins_url( 'popup-javascript-file' ),
    19 array(),
    20 'script-version',
    21 true
    22 );
    23 wp_enqueue_script( 'wpdesk-activation-reminder' );
    24
    25 wp_register_style(
  • Krzysztof Dyszczyk
  • added 1 commit

    Compare with previous version

    By Grzegorz Rola on 2021-08-11T12:05:24 (imported from GitLab)

  • added 1 commit

    • 9e0ea3a2 - refactor(code review): cr chenges

    Compare with previous version

    By Grzegorz Rola on 2021-08-11T12:23:06 (imported from GitLab)

  • added 1 commit

    • cebd3220 - refactor(code review): added salt to md5

    Compare with previous version

    By Grzegorz Rola on 2021-08-11T14:36:12 (imported from GitLab)

  • Krzysztof Dyszczyk
  • added 1 commit

    Compare with previous version

    By Grzegorz Rola on 2021-08-12T11:03:44 (imported from GitLab)

  • added 1 commit

    • 6c9cae0e - bugfix(function not exists): add actions when add_action function exists

    Compare with previous version

    By Grzegorz Rola on 2021-08-12T11:18:26 (imported from GitLab)

  • added 1 commit

    • 20dcd270 - bugfix(function not exists): add actions when add_action function exists

    Compare with previous version

    By Grzegorz Rola on 2021-08-12T11:41:42 (imported from GitLab)

  • added 1 commit

    • e5f31e08 - bugfix(function not exists): add actions when add_action function exists

    Compare with previous version

    By Grzegorz Rola on 2021-08-12T11:43:25 (imported from GitLab)

  • added 1 commit

    • cde36aeb - feature(generator): generate reminder only when configuration present

    Compare with previous version

    By Grzegorz Rola on 2021-08-12T12:07:49 (imported from GitLab)

  • added 1 commit

    • 73e70ab9 - feature(generator): generate reminder only when configuration present

    Compare with previous version

    By Grzegorz Rola on 2021-08-12T12:24:10 (imported from GitLab)

  • added 2 commits

    • a6c148aa - Feature/configuration
    • 8394194e - Merge branch 'feature/configuration' into 'feature/popup'

    Compare with previous version

    By Grzegorz Rola on 2021-08-12T16:37:55 (imported from GitLab)

  • Krzysztof Dyszczyk approved this merge request

    approved this merge request

    By Sebastian Pisula on 2021-08-13T10:59:40 (imported from GitLab)

  • unassigned @sebastian.pisula

    By Sebastian Pisula on 2021-08-13T10:59:50 (imported from GitLab)

  • Krzysztof Dyszczyk approved this merge request

    approved this merge request

    By Dyszczo on 2021-08-13T11:56:51 (imported from GitLab)

  • Krzysztof Dyszczyk assigned to @grola and unassigned @dyszczo

    assigned to @grola and unassigned @dyszczo

    By Dyszczo on 2021-08-13T11:56:56 (imported from GitLab)

  • mentioned in commit be815c69

    By Grzegorz Rola on 2021-08-13T12:03:53 (imported from GitLab)

  • Please register or sign in to reply
    Loading