Merge branch 'develop'

premhunt · Mar 17, 2017 · 31ab1b6 · 31ab1b6
2 parents 4bc5fa4 + 5d891b6
commit 31ab1b6
Show file tree

Hide file tree

Showing 75 changed files with 1,539 additions and 451 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,45 +1,33 @@
 # Change Log
 
-## [1.0.1](https://github.com/zammad/zammad/tree/1.0.1) (2016-11-14)
-[Full Changelog](https://github.com/zammad/zammad/compare/1.0.0...1.0.1)
+## [1.4.0](https://github.com/zammad/zammad/tree/1.4.0) (2017-03-16)
+[Full Changelog](https://github.com/zammad/zammad/compare/1.3.0...1.4.0)
 
 **Implemented enhancements:**
 
-- Missing translation/edit abilities \(Notification mails, contact form\) [\#388](https://github.com/zammad/zammad/issues/388) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
-- Automatically join users to organizations based on the email address [\#356](https://github.com/zammad/zammad/issues/356) [[feature](https://github.com/zammad/zammad/labels/feature)]
-- Create emails via fetchmail / procmail [\#326](https://github.com/zammad/zammad/issues/326) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
-- Display origin url from tweet/facebook post [\#317](https://github.com/zammad/zammad/issues/317) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
-- Vagrant version [\#253](https://github.com/zammad/zammad/issues/253) [[feature](https://github.com/zammad/zammad/labels/feature)]
-- Page posts from facebook and tweets from twitter as tickets [\#251](https://github.com/zammad/zammad/issues/251) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Show images of incoming html inline images [\#343](https://github.com/zammad/zammad/issues/343) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- email filter issues - unable to set additional ticket attributes [\#394](https://github.com/zammad/zammad/issues/394) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- Auto-assign ticket owner on first reply [\#395](https://github.com/zammad/zammad/issues/395) [[feature](https://github.com/zammad/zammad/labels/feature)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Stiked out text displayed as normal text [\#807](https://github.com/zammad/zammad/issues/807) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
+- New ticket object attributes won't disappear in Triggers and SLAs [\#436](https://github.com/zammad/zammad/issues/436) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
 
-**Fixed bugs:**
-
-- Some windows in the config area too wide in firefox [\#392](https://github.com/zammad/zammad/issues/392) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- \[Critical\] Short display of "Setup a new system" on public site while restarting Zammad! [\#389](https://github.com/zammad/zammad/issues/389) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Mailresponse to customer not working at all after editing a "Trigger" event text [\#385](https://github.com/zammad/zammad/issues/385) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Click on "Reports" leads to Error 500 [\#384](https://github.com/zammad/zammad/issues/384) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- TicketSelector in Overview or SLA not working with filter for ticket customer or owner [\#383](https://github.com/zammad/zammad/issues/383) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Changelog generator breaks packager.io builds [\#379](https://github.com/zammad/zammad/issues/379) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- script/scheduler.rb crashes after recreation of Zammad database [\#374](https://github.com/zammad/zammad/issues/374) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- ticket search cache issue [\#349](https://github.com/zammad/zammad/issues/349) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- IMAP mail fetching stops because of broken spam email \(invalid Content-Transfer-Encoding header\) [\#348](https://github.com/zammad/zammad/issues/348) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- IMAP mail fetching stops working on spam mail and invalid email format [\#345](https://github.com/zammad/zammad/issues/345) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Unable to create tickets [\#323](https://github.com/zammad/zammad/issues/323) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Admin -\> Channels -\> Email -\> Filters not shown / no name shown [\#313](https://github.com/zammad/zammad/issues/313) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- In object manager, blank line in object deleted all values for selections [\#312](https://github.com/zammad/zammad/issues/312) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- triggers do not work? [\#306](https://github.com/zammad/zammad/issues/306) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Answers from google mail shows complete quote [\#286](https://github.com/zammad/zammad/issues/286) [[minor bug](https://github.com/zammad/zammad/labels/minor%20bug)]
-- Avatar in Chat not showing - wrong url [\#275](https://github.com/zammad/zammad/issues/275) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- chat not working / http 404 [\#274](https://github.com/zammad/zammad/issues/274) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Zammad Docker container for rpi/ARM [\#271](https://github.com/zammad/zammad/issues/271) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Zendesk: unknown article type fails import. [\#270](https://github.com/zammad/zammad/issues/270) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- No space at comment on ticket bulk action  [\#268](https://github.com/zammad/zammad/issues/268) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- After adding a new attribute - zammad won't start [\#248](https://github.com/zammad/zammad/issues/248) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Images/Avatars blank [\#217](https://github.com/zammad/zammad/issues/217) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Docker/Ubuntu Not starting postgresql-9.6 service [\#213](https://github.com/zammad/zammad/issues/213) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- Can´t choose Organization for Customer [\#211](https://github.com/zammad/zammad/issues/211) [[bug](https://github.com/zammad/zammad/labels/bug)]
-- CentOS 7 HTTPS Error 404 - Not Found [\#210](https://github.com/zammad/zammad/issues/210) [[bug](https://github.com/zammad/zammad/labels/bug)]
 
+**Fixed bugs:**
 
+- Extended characters on AD users causes weird OTRS import issues [\#842](https://github.com/zammad/zammad/issues/842) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Customer names are sometimes wrapped with quotes [\#763](https://github.com/zammad/zammad/issues/763) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Unprocessable emails [\#795](https://github.com/zammad/zammad/issues/795) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Overly exact gauge at re-opening rate [\#843](https://github.com/zammad/zammad/issues/843) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Wrong encoded string [\#438](https://github.com/zammad/zammad/issues/438) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- multiplication of the attachment-field in \#channels/form [\#833](https://github.com/zammad/zammad/issues/833) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Disabled macros are still shown in ticket screen [\#838](https://github.com/zammad/zammad/issues/838) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Can't select object with type date as filter for overviews [\#821](https://github.com/zammad/zammad/issues/821) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Simple triggers resulting in error condition [\#779](https://github.com/zammad/zammad/issues/779) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- trigger "set to public" requested [\#298](https://github.com/zammad/zammad/issues/298) [[bug](https://github.com/zammad/zammad/labels/bug)] [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[trigger](https://github.com/zammad/zammad/labels/trigger)]
+- User password reset doesn't work - user not able to login [\#791](https://github.com/zammad/zammad/issues/791) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- admin interface -\> time accounting setting will not be saved [\#677](https://github.com/zammad/zammad/issues/677) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Checkboxes im merge dialog won't show until one clicks [\#786](https://github.com/zammad/zammad/issues/786) [[bug](https://github.com/zammad/zammad/labels/bug)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)]
+- Telegram: Open communication with only a picture [\#774](https://github.com/zammad/zammad/issues/774) [[bug](https://github.com/zammad/zammad/labels/bug)]
+- Some adjustments with regard to \#698 [\#783](https://github.com/zammad/zammad/pull/783) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] ([johan12345](https://github.com/johan12345))
 
 \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/LICENSE-ICONS-3RD-PARTY.json b/LICENSE-ICONS-3RD-PARTY.json
@@ -1,4 +1,34 @@
 {
+    "printer.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "note.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "telegram.svg": {
+        "author": "Telegram",
+        "url": "",
+        "license": ""
+    },
+    "phone.svg": {
+        "author": "Michael Zenaty",
+        "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
+        "license": "CC 3.0 Attribution"
+    },
+    "email.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "radio-checked.svg": {
+        "author": "Zammad",
+        "url": "",
+        "license": "MIT"
+    },
     "oauth2-button.svg": {
         "author": "Felix Niklas",
         "url": "",
@@ -179,11 +209,6 @@
         "url": "",
         "license": "MIT"
     },
-    "radio-checked.svg": {
-        "author": "Zammad",
-        "url": "",
-        "license": "MIT"
-    },
     "plus.svg": {
         "author": "Zammad",
         "url": "",
@@ -194,11 +219,6 @@
         "url": "",
         "license": "MIT"
     },
-    "phone.svg": {
-        "author": "Michael Zenaty",
-        "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
-        "license": "CC 3.0 Attribution"
-    },
     "person.svg": {
         "author": "Felix Niklas",
         "url": "",
@@ -239,11 +259,6 @@
         "url": "",
         "license": "MIT"
     },
-    "note.svg": {
-        "author": "Felix Niklas",
-        "url": "",
-        "license": "MIT"
-    },
     "mute.svg": {
         "author": "Felix Niklas",
         "url": "",
@@ -384,11 +399,6 @@
         "url": "",
         "license": "MIT"
     },
-    "email.svg": {
-        "author": "Felix Niklas",
-        "url": "",
-        "license": "MIT"
-    },
     "dropdown-list.svg": {
         "author": "Zammad",
         "url": "",
@@ -429,47 +439,52 @@
         "url": "https:\/\/thenounproject.com\/search\/?q=cloud&i=84976",
         "license": "CC 3.0 Attribution"
     },
-    "arrow-down.svg": {
+    "clock.svg": {
         "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
     },
-    "arrow-up.svg": {
+    "checkbox-indeterminate.svg": {
         "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
     },
-    "arrow-right.svg": {
+    "checkbox-checked.svg": {
+        "author": "Zammad",
+        "url": "",
+        "license": "MIT"
+    },
+    "arrow-down.svg": {
         "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
     },
-    "arrow-left.svg": {
+    "arrow-up.svg": {
         "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
     },
-    "clock.svg": {
+    "arrow-right.svg": {
         "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
     },
-    "clipboard.svg": {
+    "arrow-left.svg": {
         "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
     },
-    "checkmark.svg": {
-        "author": "Zammad",
+    "clipboard.svg": {
+        "author": "Felix Niklas",
         "url": "",
         "license": "MIT"
     },
-    "checkbox.svg": {
+    "checkmark.svg": {
         "author": "Zammad",
         "url": "",
         "license": "MIT"
     },
-    "checkbox-checked.svg": {
+    "checkbox.svg": {
         "author": "Zammad",
         "url": "",
         "license": "MIT"

diff --git a/Procfile.frontend b/Procfile.frontend
@@ -0,0 +1,5 @@
+web: bundle exec puma -p 3000
+worker: bundle exec script/scheduler.rb start -t
+websocket: bundle exec script/websocket-server.rb start
+guard: bundle exec guard -P livereload
+gulp: bundle exec gulp
diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
@@ -95,8 +95,8 @@ class App.ControllerGenericEdit extends App.ControllerModal
 class App.ControllerGenericIndex extends App.Controller
   events:
     'click [data-type=edit]': 'edit'
-    'click [data-type=new]':  'new'
-    'click .js-description':  'description'
+    'click [data-type=new]': 'new'
+    'click .js-description': 'description'
 
   constructor: ->
     super
@@ -621,10 +621,10 @@ class App.ActionRow extends App.Controller
     for item in @items
       do (item) =>
         @$('[data-type="' + item.name + '"]').on(
-          'click',
-          (e) ->
+          'click'
+          (e) =>
             e.preventDefault()
-            item.callback()
+            item.callback(@el)
         )
 
 class App.Sidebar extends App.Controller
@@ -657,24 +657,25 @@ class App.Sidebar extends App.Controller
     @toggleTabAction(name)
 
   render: =>
-    @html App.view('generic/sidebar_tabs')
+    localEl = $(App.view('generic/sidebar_tabs')(
       items: @items
       scrollbarWidth: App.Utils.getScrollBarWidth()
+    ))
 
     # init content callback
     for item in @items
+      area = localEl.filter('.sidebar[data-tab="' + item.name + '"]')
       if item.callback
-        item.callback( @$( '.sidebar[data-tab="' + item.name + '"] .sidebar-content' ) )
-
-    # add item acctions
-    for item in @items
+        item.callback( area.find('.sidebar-content') )
       if item.actions
         new App.ActionRow(
-          el:    @$('.sidebar[data-tab="' + item.name + '"] .js-actions')
+          el:    area.find('.js-actions')
           items: item.actions
           type:  'small'
         )
 
+    @html localEl
+
   toggleDropdown: (e) ->
     e.stopPropagation()
     $(e.currentTarget).next('.js-actions').find('.dropdown-toggle').dropdown('toggle')