Compare commits

...

7456 Commits

Author SHA1 Message Date
Martin Edenhofer
a12d45896b Update for 3.4.1 release. 2020-09-22 08:41:38 +02:00
Mantas
f33a872204 Fixes #3186 - Endpoint api/v1/ticket_articles/by_ticket ignores X-On-Behalf-Of 2020-09-15 09:17:40 +02:00
Mantas
51b204bb3c CVE-2020-15169 2020-09-10 18:00:47 +02:00
Thorsten Eckel
dac46df54c Refactoring: Use more explicit methods to reason about code. 2020-09-08 20:53:10 +02:00
Thorsten Eckel
6c849bd2dc Maintenance: Ensured HTTP request verbs according to REST paradigm. 2020-09-07 15:02:57 +02:00
Thorsten Eckel
cb3732e872 Refactoring: Reverted unneeded HTML option customization of bootstrap-tokenfield.js. 2020-09-07 15:02:57 +02:00
Marcel Herrguth
994a609113 Fixes #3128 - Add SSO login button to login page. 2020-09-07 15:02:57 +02:00
Thorsten Eckel
6d14fcc4da Maintenance: Improve logging of failures when sending SMS via Massenversand.de. 2020-09-07 15:02:57 +02:00
Mantas Masalskis
1ef8fd727a Maintenance: Show less error details to non-admin users 2020-09-07 15:02:57 +02:00
Thorsten Eckel
c1f711d3af Maintenance: Updated Ruby dependency to 2.6.6. 2020-09-07 15:02:57 +02:00
Mantas Masalskis
f63c5bc463 Maintenance: Enhance KB global search result scope. 2020-09-07 15:02:57 +02:00
Thorsten Eckel
b6eccc11b2 Fixes #3167: Active Google channels cause Email channels to loose email addresses. 2020-08-28 14:01:49 +02:00
Mantas
1adc98bfaf Follow up to #2985: fixes spec backporting issue 2020-08-06 08:46:16 +03:00
Thorsten Eckel
0b32492232 Maintenance: Updated Clearbit marketing claim in test. 2020-08-03 17:05:33 +02:00
Thorsten Eckel
6ef2d85460 Fixed test: Ensure action is performed by current Ticket Owner to mark it as seen. 2020-08-03 10:45:14 +02:00
Thorsten Eckel
669ed9d26e Fixed issue #3136 - Attribute changes remove Owner of closed Ticket. 2020-08-03 10:45:14 +02:00
Rolf Schmidt
54e8f2c912 Fixes #3138 - Article body gets updated/re-sanitized when updating other Article attribute. 2020-07-30 16:54:03 +02:00
Thorsten Eckel
9cf40f76a4 Fixes #3123: Merging Tickets/Users/... does not update ExternalSync references. 2020-07-20 09:30:26 +02:00
Mantas Masalskis
4cacfa4b61 Fixes #2985 - Adding a note during bulk operation only works for one ticket 2020-07-15 16:55:13 +02:00
Mantas
6a6c346d27 Fixes #3091 - Enhanced/reworked message header of forwarded mails. 2020-07-15 14:10:16 +02:00
Mantas Masalskis
207e481032 Fixes #3086 - Deletion of communication article works for admins 2020-07-13 19:22:07 +03:00
Martin Edenhofer
80fd9c3c68 Fixes #2494 - Plus characters are stripped from email addresses and urls in ticket body 2020-07-13 08:39:14 +02:00
Martin Edenhofer
80c434ac87 Fixes #3095 - Not all attributes if chats are indexed by elasticsearch (chat.name and tags are missing) 2020-07-13 08:37:02 +02:00
Rolf Schmidt
3382cbe739 Fixes #3108 - Allow uploaded S/MIME certificates to download in admin interface (like in other certificate managers). 2020-07-10 16:19:52 +02:00
Thorsten Eckel
98561ceb00 Follow up - 6309eacc55 - Fixes #3110 - ServiceNow mails from other service providers are not detected: Enhanced handling of key insensitive ServiceNow sender address. 2020-07-10 08:17:42 +02:00
Thorsten Eckel
65376a8197 Fixes #3087: Search taskbars cause DeadLocks. 2020-06-18 10:47:26 +02:00
Thorsten Eckel
2650d1b528 Fixes #3090: Failed to run import backend 'Import::Exchange'. Cause: Missing implementation of 'mapping' method for 'Sequencer::Unit::Import::Exchange::FolderContact::Mapping::Login'. 2020-06-18 10:43:24 +02:00
Thorsten Eckel
58040ee64b Follow up - b9b3a73474 - Fixes #3085 - Required Doorkeeper scope is missing and fails authentication. 2020-06-16 11:41:18 +02:00
Mantas
e0f43f88c0 CVE-2020-8184 2020-06-16 08:40:16 +03:00
Martin Edenhofer
3f1faf600b Added 3.4. changes. 2020-06-15 13:00:05 +02:00
Rolf Schmidt
6e56aee254 Enhancement: Added authorization checks for ticket controller actions: ticket_customer ticket_history ticket_related ticket_recent ticket_merge ticket_split. 2020-06-10 13:39:54 +02:00
Rolf Schmidt
4014839242 Fixes issue #2907 - Password strength settings are ignored when creating new customer accounts. Make login available to verified users only. 2020-06-10 13:39:53 +02:00
Thorsten Eckel
a336d5232d Follow up - 2ffca390a9 - Fixes #1961 - S/MIME integration: Encryption and Sign buttons can be clicked even if disabled. 2020-06-10 12:24:27 +02:00
Thorsten Eckel
4bb4f7d542 Maintenance: Fixed trailing whitespaces. 2020-06-10 12:07:04 +02:00
Thorsten Eckel
72bb320fb0 Updated rubocop(-* gems) to latest version (0.85.1). 2020-06-08 17:01:40 +02:00
Mantas Masalskis
90f1442dc8 PR #3073 - adds Portuguese Brazilian translation to chat. Thank you @ jhenriquejrc! 2020-06-08 14:24:46 +02:00
Rolf Schmidt
dc4d61ca49 Follow up - 5f06c8c6b4 - Added last run to prevent conflict with missing function after migration. 2020-06-08 09:58:57 +02:00
Thorsten Eckel
1cca1870bf Maintenance: Removed duplicate "sles-12" entry in packager.io configuration. 2020-06-08 09:21:42 +02:00
MrGeneration
3a3d036a7b Maintenance: Enabled support for Ubuntu 20.04 LTS package building on packager.io. 2020-06-08 09:21:42 +02:00
Mantas
b16b78e46a Bumped Websocket-Extensions to 0.1.5 (CVE-2020-7663) 2020-06-06 13:37:15 +03:00
Mantas
c78652867b Follow up - 2ffca390a9 - Fixes #1961 - S/MIME integration: S/MIME manage view not update after adding certificate or key. 2020-06-05 13:56:37 +02:00
Thorsten Eckel
47a46fb6fb Maintenance: GMail skip without present ENVs does not work because channel is created before. 2020-06-05 08:58:02 +02:00
Thorsten Eckel
2ffca390a9 Fixes #1961 - S/MIME integration. 2020-06-02 13:01:16 +02:00
Mantas Masalskis
d64ea29efb Fixes #2498 - Japanese encoding 7-bit iso-2022-jp is processed incorrectly 2020-06-02 11:30:19 +02:00
Thorsten Eckel
09268cc09c Maintenance: Maintenance message change spec checks for wrong message. 2020-05-28 16:06:28 +02:00
Thorsten Eckel
5f06c8c6b4 Fixes #2866 - G Suite accounts will only allow access to apps using OAuth. Password-based access will no longer be supported. 2020-05-28 15:28:07 +02:00
Thorsten Eckel
f14607e265 Maintenance: Unpredictable JS parsing and App boot up time causes race condition for JS Core interval (timing) tests. 2020-05-28 15:22:09 +02:00
Thorsten Eckel
a7ee192c9d Enhancement: Increase number of Capybara puma threads from 4 to 16 to make tests more stable by handling more parallel requests. 2020-05-28 15:22:09 +02:00
Thorsten Eckel
8a20892a8d Enhancement: Log executed RSpec example name to reason about related log lines. 2020-05-28 15:22:09 +02:00
Mantas Masalskis
1da20d3f90 Fixed #3060 - Loading KB-Answers doesn't work for contained images 2020-05-28 10:02:07 +02:00
Ryan Lue
09a808162d Bugfix: Add missing authorization check for tickets#create 2020-05-27 17:21:45 +08:00
Mantas Masalskis
ea395db5c6 Fixes #3065 - Updating KB answers throws error 500 for agents without edit rights 2020-05-26 16:35:54 +02:00
Ryan Lue
95de420a35 Fixes #3064: Double-render error on HTTP Basic auth
This commit fixes a regression[0]
introduced in becbdb1ba (the Pundit migration).

Specifically, `CalendarSubscriptionsController` appears to be
the only controller that supports HTTP Basic authentication
(for calendar clients like Thunderbird Lightning or Calendar.app),
and the migration changed the control flow
for HTTP Basic authentication + authorization:

    # before
    authentication_check({ basic_auth_promt: true, permission: 'user_preferences.calendar' })

    # after
    authentication_check(basic_auth_promt: true) && authorize!

After this change, `#authentication_check` is expected
to communicate success or failure through its return value,
but prior to this bugfix, its return value was always truthy.
This led to a double-render error,
where a response code and message were set twice,
upon the failures of both authentication and authorization.

This fix adds a `return false` in the authorization failure case,
short-circuiting the `#authorize!` call and eliminating the error.

[0]: https://github.com/zammad/zammad/issues/3064
2020-05-26 16:33:11 +02:00
Martin Edenhofer
acd28480b0 Maintenance: Removed deprecate warnings. 2020-05-26 13:44:46 +02:00
Mantas Masalskis
9b459556cd Fixes #3014 - Fullquote Header for forwarded mails. Thanks to @drbw ❤️ 2020-05-25 13:44:18 +02:00
Mantas Masalskis
5d51eb68f6 Fixes #2282 - SLA GUI - inconsistency when no checkmark is set and other SLA form element improvements 2020-05-25 12:01:49 +02:00
Thorsten Eckel
8690916936 Updated rubocop(-* gems) to latest version (0.84.0). 2020-05-25 10:19:53 +02:00
Mantas Masalskis
e037b6015e Fixes #2990 - Backward compatibility of deleting own notes 2020-05-25 09:42:48 +02:00
Mantas Masalskis
222e8c0dd3 Fixes #2853 - Deletion of notes impossible if internal and communication = true 2020-05-25 09:42:48 +02:00
Mantas
4b487dbfab Maintenance: updates Puma due to CVE-2020-11076 2020-05-23 10:39:24 +03:00
Mantas Masalskis
cc2bc4f188 Fixes #2867 - KB links are in the header and footer of the public KB, Fixes #2834 - unclear meaning of "Public Menu" tab in KB admin 2020-05-20 16:06:04 +02:00
Mantas Masalskis
a69aebcd0c Fixes #2964 - Ensure email channel authentication to be ASCII-8Bit 2020-05-20 16:04:45 +02:00
Mantas Masalskis
c4c372c976 Maintenance: Ruby on Rails bump to 5.2.4.3 due to several CVEs 2020-05-19 01:00:37 +03:00
Mantas Masalskis
87987ac71d Specs enhancement: avoids showing clues modal 2020-05-15 09:38:03 +02:00
Mantas Masalskis
fa143749e4 Specs enhancement: reusable websocket status check 2020-05-15 00:26:15 +03:00
Mantas Masalskis
ed830f61b2 PR #3055 - adds Hungarian translation to chat. Thank you @bartfaics! 2020-05-14 16:34:40 +02:00
Mantas Masalskis
e953090dc7 Maintenance: update <time> tag rendering to match HTML specs 2020-05-14 15:32:20 +02:00
Mantas Masalskis
4d17b78181 Fixes #3054 - "Get latest translations" update all but latest locales 2020-05-14 15:30:36 +02:00
Thorsten Eckel
163dbc4e9e Updated rubocop(-* gems) to latest version (0.83.0). 2020-05-11 14:49:22 +02:00
Mantas Masalskis
1c160abf7a Maintenance: removes legacy MAILBOX_AUTO and MAILBOX_MANUAL tests 2020-05-10 00:59:58 +03:00
Mantas Masalskis
23a438ec03 Fixes #3044 - resets attribute position if custom object is being updated 2020-05-08 11:19:54 +02:00
Martin Edenhofer
35329d9d1d Maintenance: Fixed user agent test by utilising new dedicated test server. 2020-05-06 13:15:16 +02:00
Thorsten Eckel
d99c596ab8 Follow up - 7aeeb6ed1a - removed unnecessary TODO. 2020-05-06 11:42:40 +02:00
Denny Korsukéwitz
7aeeb6ed1a Refactoring: Reorganise GitLab CI definition by splitting it up in dedicated, logical parts. Also introduce SINGLETESTNAME ENV to run single test 🚀 2020-05-06 11:32:26 +02:00
Thorsten Eckel
d146919a07 Maintenance: Applied required updates for GeoIP service update. 2020-05-06 09:33:54 +02:00
Rolf Schmidt
b9b3a73474 Bumped doorkeeper to 5.3.2 (CVE-2020-10187). 2020-05-05 11:00:55 +02:00
Thorsten Eckel
e98ebb7b3e Maintenance: Wrong log level (error) for debug line. 2020-05-04 08:45:12 +02:00
Thorsten Eckel
7ebd7a731d - Refactoring: Ticket create capybara system test is not idiomatic.
- DX: Extract Ticket create view template selection into dedicated common action capybara helper.
2020-04-30 17:41:24 +02:00
Thorsten Eckel
215cfb7990 Follow up - 9402699a42 - DX: Developer should not need to add a password for each created user that should login. Therefore create one if non is set yet. 2020-04-30 17:41:24 +02:00
Mantas Masalskis
49b21b147f Fixes #2548 - Do not sort tables by (click on) header names if sortable by dnd is enabled 2020-04-28 23:47:45 +03:00
Ryan Lue
b7afa91cc0 Refactoring: Remove unused method 2020-04-28 13:40:16 +02:00
Ryan Lue
29670cd05a Testing: Fix false positive and cover edge case for Channel::Driver::Twitter#fetch
Originally, a spec for race condition handling
in Channel::Driver::Twitter#fetch
used a `travel_back` call in the wrong place:
it needed to be called _after_ `subject!(:channel)` was created,
but since it was placed in an `around` block,
it ran before all preceding setup blocks.

Moving it to a `before` block changed the order in which it was called,
thus fixing a false positive in the test.

An additional expectation was added
to prevent this false positive in the future,
and a new test case was added to capture yet another edge case.
2020-04-28 13:40:16 +02:00
Ryan Lue
3f28c5f54e Bugfix: Add nil handling to CommunicateTwitter::BackgroundJob 2020-04-28 13:40:16 +02:00
Ryan Lue
284e504bcd Testing: Add coverage for CommunicateTwitter::BackgroundJob 2020-04-28 13:40:16 +02:00
Ryan Lue
f55f4b8874 Testing: Add coverage for Observer::Ticket::Article::CommunicateTwitter 2020-04-28 13:40:15 +02:00
Ryan Lue
ad5bc765fd Bugfix: Fix nested error messages from faulty rescue clause 2020-04-28 13:40:15 +02:00
Ryan Lue
64e08dfc48 Bugfix: Improve error messaging in Twitter app configuration flow 2020-04-28 13:40:15 +02:00
Ryan Lue
bdec29179d Testing: Add coverage for ExternalCredential::Twitter 2020-04-28 13:40:15 +02:00
Ryan Lue
847cf02b49 Testing: Enhance authenticated_as spec helper
Originally, the `authenticated_as` spec helper
made it impossible to persist session state in request specs.
This made it impossible to test external_credentials#callback
or any other controller actions that rely on session state.

This commit fixes that.

=== How exactly was `authenticated_as` broken?

`authenticated_as` passes user credentials via request headers.
In practice, this auth method is for API requests by machine clients,
since they don't have cookies or store session state.

Because machine clients don't use cookies or session state anyway,
Zammad disables them for this auth method:

    # app/controllers/application_controller/authenticates.rb
     1 module ApplicationController::Authenticates
    42 def authentication_check_only(auth_param = {})
    57     request.session_options[:skip] = true

As a result, in tests using `authenticated_as`,
session data is discarded between every single request.
Some controller actions will not work without session data,
so this limitation made testing these actions impossible.

=== Why couldn't we just set the session values directly in test setup?

This is possible in controller tests,
but the Rails & RSpec team soft-deprecated controller tests
in favor of integration tests (request specs) a long time ago.

For more details, consider the following comments:

> The session is an internal structure for the controller.
> Integration test is more black box than controller tests were.
> I don't think we should be testing internals of the controller like this.
> I would rework the test to test something visible in the UI instead.
>
> --@dhh via https://github.com/rails/rails/issues/23386

> Integration tests doesn't allow you to set session.
>
> --@rafaelfranca via https://github.com/rails/rails/issues/25394

=== Solution

This commit adds a `via: :browser` option to the spec helper
which simply prepends a valid sign-in request to the spec example.
2020-04-28 13:40:15 +02:00
Ryan Lue
494474f11a Testing: Add cases for Channel::Driver::Twitter#fetchable? 2020-04-28 13:40:15 +02:00
Ryan Lue
c290a89a8b Testing: Add convenience option to Channel factory 2020-04-28 13:40:15 +02:00
Ryan Lue
227b2b25b3 Testing: Speed up Twitter tests by paring down VCR cassette content
This commit reduces the execution time of the specs for
Channel::Driver::Twitter#fetch by a little over 50%.

The #fetch method calls out to the Twitter API
and receives a list of tweets (serialized as JSON),
then converts them to tickets and articles.
Even with HTTP caching (via VCR), this is an expensive operation:
each transaction may contain dozens of tweets to be processed.

This commit reduces the processing burden
by manually editing the tests' VCR cassettes,
removing the vast majority of incoming tweets
and keeping only those necessary to run meaningful tests.

The result is a set of tests for the #fetch method that,
on a given machine, now take 65 seconds instead of 140.
As an ancillary benefit, the file size of the associated
VCR cassette directory has been reduced from 16MB to under 5MB.
2020-04-28 13:40:15 +02:00
Ryan Lue
2c0b858312 Testing: Complete coverage for Channel::Driver::Twitter#fetch 2020-04-28 13:40:14 +02:00
Ryan Lue
165c44c056 Testing: Prevent synchronization issues with VCR
=== Background: What is VCR?

VCR caches HTTP network traffic for tests
that call out to third-party services (e.g., the Twitter REST API).
It "records" to a YAML file the first time a test is run,
and we save those files to the repo so they can be "replayed" later.

=== The problem & the naive approach

The ways Zammad uses third-party services can be time-sensitive.
For instance, Zammad assumes that when it fetches new tweets,
it's getting an up-to-date response from the Twitter API,
and ignores all tweets 15+ days old.

Of course, if we're using VCR, that's not the case--
in the test, Zammad receives a listing of tweets that's frozen in time.
Thus, 15 days after the test was first run,
it won't import any tweets at all.

Initially, the fix was to add the following to the spec file:

    before { travel_to '2020-02-06 13:37 +0100' }

This hardcodes the date when the tests were first written,
and it has significant drawbacks:

1. It leads to hard-to-diagnose bugs when adding new test cases.

   Your new test case will not have a VCR cassette associated with it;
   the first time you run it, it will travel way back in time
   and try to interact with the Twitter REST API.

   The Twitter REST API requires an OAuth signature
   based on a current timestamp,
   and will reject the one generated during the test:

       Twitter::Error::Unauthorized: Timestamp out of bounds.

   Because RSpec, VCR, and Channel#fetch all suppress error output in
   different ways, this error message takes some work to find.

2. If you succeed in adding new test cases,
   they won't match the timestamp above.

=== A better solution

This commit adds a new option to the :use_vcr metadata tag:

    it 'does something', use_vcr: :time_sensitive

Examples tagged in this way will automatically travel back to exactly
when a VCR cassette was recorded prior to using it.

=== Discussion

You may notice that the VCR auto-record logic was moved
from a helper module to a simple block.

The helper module was intended to improve organization and clean up the
config code, but due to context/binding issues, it was not possible to
call `travel_to` from inside the helper module.
2020-04-28 13:40:14 +02:00
Ryan Lue
71dad38129 Testing: Migrate Channel specs to channel-driver spec file 2020-04-28 13:40:14 +02:00
Ryan Lue
a6ee25e15e Testing: Spec Channel::Driver::Twitter#send
This commit is part of a larger effort to overhaul test coverage
for Twitter-related logic throughout the application.

The logic tested in this commit _could_ have been tested
at other interfaces:

* Channel#deliver
  (higher abstraction; calls Channel::Driver::Twitter#send)

* TwitterSync#from_article
  (lower abstraction; is called from Channel::Driver::Twitter#send)

So why did we choose to test at the channel driver level?

Channel#deliver accepts many different adapters
(of which Channel::Driver::Twitter is just one).
Testing Channel#deliver with every possible combination of inputs
would quickly lead to a single, unmanageably large test file
with an explosion of context blocks.
Testing each adapter in isolation seemed the wiser approach.

TwitterSync is a helper class without a cohesive single responsibility,
and thus is strong candidate for refactoring.
It is safer to change its interface than the channel driver's.
2020-04-28 13:40:14 +02:00
Ryan Lue
3df00e7e1b Testing: Expand factories for Twitter API testing 2020-04-28 13:40:14 +02:00
Ryan Lue
5ffad2a7e7 Testing: Fix bug in VCR helper from a5d4cd8
In our test suite config, we have a helper
to enable HTTP caching ("VCR cassettes")
via RSpec metadata tags (from 1ebddff).

This helper can potentially lead to confusing test failures,
so we added an error message,
hooking into RSpec::Support.notify_failure (from a5d4cd8).

This error message logic did not take the same exact arguments
that RSpec::Support.notify_failure does,
which led to errors like the one below:

    ArgumentError:
      wrong number of arguments (given 2, expected 1)
    # ./spec/support/vcr.rb:78:in `inject_advisory'
    # ./spec/support/vcr.rb:60:in `inject_advisory'
    # ./spec/support/vcr.rb:36:in `block in auto_record'
    # ./spec/support/vcr.rb:35:in `auto_record'

This commit fixes the above error.
2020-04-28 13:40:14 +02:00
Ryan Lue
f69d7a0962 Refactoring: Utilize existing channel driver pattern for Twitter
The Channel model is built around a "driver" pattern,
where records may invoke a method (e.g., #fetch)
and that method call then delegates to the same method
in a given driver class (e.g., Channel::Driver::Twitter).

Originally, the controller that handles incoming Twitter webhook events
ignored this interface, directly instantiating the driver class
and invoking the desired method.

This commit hides this invocation behind the appropriate interface
(i.e., Channel#process vs. Channel::Driver::Twitter#process).
2020-04-28 13:40:14 +02:00
Ryan Lue
917de2a417 Refactoring: Prep refactoring of Twitter webhook processing logic
This commit rescopes test coverage added in 9678b1857
from TwitterSync#process_webhook to Channel::Driver::Twitter#process.

When Zammad processes an incoming webhook event from Twitter, it enters:

* ChannelsTwitterController#webhook_incoming, which thinly wraps
* Channel::Driver::Twitter#process, which thinly wraps
* TwitterSync#process_webhook

The core logic for webhook processing is contained in this last method,
so that's the method that test coverage was written around.

After examining the classes more carefully,
it seems that this logic doesn't quite belong in the TwitterSync class,
which is principally for outbound communication to the Twitter API.
Rather, it is more analogous to Channel::EmailParser#process
(which takes an incoming email and converts it into the appropriate
Zammad assets; i.e., users, tickets, and articles),
and so will be migrated upstream into Channel::Driver::Twitter#process.

This refactoring will be undertaken in subsequent commits.
2020-04-28 13:40:14 +02:00
Ryan Lue
8ffd593616 Refactoring: Fix bugs discovered in preceding commit 2020-04-28 13:40:14 +02:00
Ryan Lue
64c882b090 Refactoring: Add coverage for TwitterSync#process_webhook
Prior to this commit,
the TwitterSync#process_webhook method had only partial test coverage
(in `spec/requests/integration/twitter_webhook_spec.rb`).
This commit replaces the existing, incomplete tests
with a direct spec of the TwitterSync class,
giving individual test cases for all reasonable edge cases
of the #process_webhook method.

Since this method is responsible for a lot of complex behavior,
there are a _lot_ of such test cases.
Putting them all in the same spec file makes it hard to read through,
so a future goal is to break them up into smaller methods
and move some of these methods into other, more appropriate classes.

This could not be achieved with a request spec,
since they enforce testing at a single interface /
level of abstraction (i.e., HTTP requests).

=== Note: This commit will not pass CI.

Some bugs in the existing code were uncovered
in the process of adding comprehensive test coverage
for the #process_webhook method.

In the interest of isolating changes into discrete chunks, fixes for
these bugs have been reserved for the next commit.
2020-04-28 13:40:14 +02:00
Ryan Lue
b990145875 Refactoring: DRY up TwitterSync.preferences_cleanup spec 2020-04-28 13:40:14 +02:00
Ryan Lue
e26fe9cc50 Refactoring: Remove test redundancies (from 9409d17de)
9409d17de added test coverage that
turned out to overlap with existing tests.
This commit removes the old test cases to eliminate redundancy,
and polishes some of the language in the new test case descriptions.
2020-04-28 13:40:13 +02:00
Ryan Lue
b23a6ae6ff Maintenance: Fix outdated code comment 2020-04-28 13:40:13 +02:00
Mantas Masalskis
8c7ac9143f Fixes #2995 - Sorting overviews sometimes causes columns to jump 2020-04-28 11:45:32 +02:00
Thorsten Eckel
f54df50154 Fixes #3040: Reply Article box closes when replying multiple times and placeholder covers input. 2020-04-27 15:43:41 +02:00
Thorsten Eckel
9402699a42 DX:
- Add `password_plain` method to all `User` records created by FactoryBot to access the plain password for reuse to avoid variable spaming.
- Enable Capybara system test meta attribute `:authenticate` to handle a user as lambda return value which will be used for authentication instead of default `master@example.com`.
2020-04-27 15:43:41 +02:00
Thorsten Eckel
d9bda79385 Maintenance: Make login clue check Capybara system tests more robust in local environments. 2020-04-27 15:42:47 +02:00
Marcel Herrguth
57f40539f2 Restoring Zammad from backup: Workaround for missing DROP TABLE IF EXISTS statement in DB dumps created with an older pgdump version. 2020-04-24 09:47:25 +02:00
Mantas Masalskis
62a6d5e2ca Maintenance: improves Websocket stability in CI 2020-04-24 08:56:17 +03:00
Mantas Masalskis
c59a627383 Fixes #304 - more stable calendar test 2020-04-24 08:55:59 +03:00
Mantas Masalskis
db9f0eb772 Fixes #2698 - Custom ordering of Macros impossible (ordered by time added). 2020-04-20 14:22:11 +02:00
Mantas Masalskis
5bcb650b54 Fixes #2598 - RTL writing system support in Public KB 2020-04-20 13:28:53 +02:00
Mantas Masalskis
880f1d5e3a Fixes #2644 - Including Knowledge Base Answers into Ticket Articles doesn't attach Attachments 2020-04-20 11:47:45 +02:00
Mantas Masalskis
3306de2d1f Maintenance: Resolve RSpec should_not deprecation warning. 2020-04-17 10:00:31 +02:00
Mantas Masalskis
57b1defd8d Refactoring: Set wait timeout to 0 for modal element checks to improve lookup performance. 2020-04-17 10:00:31 +02:00
Rolf Schmidt
afa6b9984a Fixes #3022 - Detect ServiceNow follow-ups 2020-04-17 09:24:57 +02:00
Thorsten Eckel
3f453c31e9 Updated rubocop(-* gems) to latest version (0.82.0). 2020-04-16 12:37:53 +02:00
Thorsten Eckel
562c842c8a Updated rubocop(-* gems) to latest version (0.81.0). 2020-04-14 15:26:50 +02:00
Mantas Masalskis
dd5ca52e18 Fixes #2941 - Zendesk import error 2020-04-08 08:23:58 +02:00
Martin Edenhofer
16b876e3e8 Closes #3004 - Enhance Check_MK integration to set ticket attributes (e. g. for SLAs) and improve code snippeds for integration 2020-04-02 13:28:18 +02:00
Mantas Masalskis
2843a92de0 PR #2979: Fixes #2977 Resize overview fields in RTL language 2020-04-01 16:22:53 +02:00
Martin Edenhofer
9b191a5541 Follow up for #2999 - Customer chat widget translation in Norwegian (no & nb) is missing 2020-04-01 13:33:26 +02:00
Martin Edenhofer
5e6769e6f5 Closes #2999 - Customer chat widget translation in Norwegian is missing 2020-04-01 06:03:33 +02:00
Mantas Masalskis
c30796aaca PR #2965 Hebrew translation added to chat widget. Thanks to @YosefAdPro ❤️ 2020-03-26 08:37:43 +01:00
Rolf Schmidt
58e18b4f27 Follow up - 13ddd3af38 - Fixed issue #2981 - OTRS migration priority color wrong for 3 normal. 2020-03-25 13:11:59 +01:00
Rolf Schmidt
39e6dbe05a Fixes #2640 - Signup view broken after logout. 2020-03-25 11:46:19 +01:00
Rolf Schmidt
13ddd3af38 Fixed issue #2981 - OTRS migration priority color wrong for 3 normal. 2020-03-24 18:54:45 +01:00
Rolf Schmidt
1ab179f22f Fixed issue #2923 - Zammad should not inform himself. 2020-03-24 17:15:34 +01:00
Mantas Masalskis
92f7d9307c Fixes #2982 - Trigger with current_user.id as precondition is executed correctly 2020-03-24 16:40:53 +01:00
Rolf Schmidt
eabc924230 Fixed issue #2971 - Mails with voicemails attached not being added (#<ActiveRecord::ValueTooLong: PG::StringDataRightTruncation: ERROR: value too long for type character varying(2500) (RuntimeError)). 2020-03-23 00:38:28 +01:00
Thorsten Eckel
0004c72624 Refactoring: Improved error logging
- Remove unnecessary "ERROR" prefix
- Log missing ES index as WARN instead of INFO
- Log actual JSON ES payload in cases of an error (for e.g. manual cURL replaying) if possible
2020-03-20 14:01:58 +01:00
Martin Edenhofer
16fec3d888 Fixed issue #2976 - Not possible to copy inline images text from article to article (copy text and image image - via clipboard ctrl+c/ctrl+v). 2020-03-20 14:01:06 +01:00
Thorsten Eckel
1aeb0a9ba5 Performance: Parallelize Session.jobs if ENV 'ZAMMAD_SESSION_JOBS_CONCURRENT' is provided with number of dedicated worker node processes to spawn. 2020-03-20 06:11:50 +01:00
Martin Edenhofer
1061803fba Updated rails to 5.2.4.2 (CVE-2020-5267) and json (CVE-2020-10663). 2020-03-19 23:19:19 +01:00
Ryan Lue
becbdb1baa Refactoring: Replaced home-rolled authorization logic in Controllers with Pundit. 2020-03-19 10:39:51 +01:00
Martin Edenhofer
706e51d27b Maintenance: Browsers get slower and so is our CI browser test stage. Added necessary sleep-s to make it more reliable. 2020-03-19 09:17:49 +01:00
Thorsten Eckel
33a20f2cf2 Follow up - af10e5d1d2 - Fixes #535: Send Trigger and Scheduler Notification Email/SMS to single user. Job/Trigger#perform notification.* recipient User Assets are not resolved. 2020-03-18 18:25:24 +01:00
Thorsten Eckel
bf874d77c6 Enhancement: Add support for optional Sequencer Unit attributes. 2020-03-18 10:56:37 +01:00
Mantas Masalskis
e865826810 Maintenance: Updated Ruby dependency to 2.6.5. 2020-03-18 09:09:12 +01:00
Rolf Schmidt
af10e5d1d2 Fixes #535: Send Trigger and Scheduler Notification Email/SMS to single user. 2020-03-17 08:52:57 +01:00
Mantas Masalskis
b644a571fb Fixes #2714 - Roles and Users selection in Overview administration UI ambiguous. 2020-03-12 14:48:52 +01:00
Rolf Schmidt
355b6d5f84 Performance: selector2sql for operator "contains one" of tags generates heavy CPU load on database server. 2020-03-12 14:45:10 +01:00
Felix Niklas
5bfe289811 ColumnSelect: hide group labels when filtering 2020-03-11 17:58:10 +01:00
Felix Niklas
eeadee2d5e Trigger: group and label the perform action inputs 2020-03-11 17:58:10 +01:00
Felix Niklas
a3e4691a72 ColumnSelect: add support for grouping
Similar to html’s select, options can be put into groups:

[
  { label: "Germany", group: [{ value: 0, name: "Bavaria" }, { value: 1, name: "Berlin"}],
  { label: "USA", group: [{ value: 0, name: "New York" }, { value: 1, name: "California"}]
]
2020-03-11 17:58:10 +01:00
Felix Niklas
136937b7db Generic Controller: forward modal size small and veryLarge 2020-03-11 17:58:10 +01:00
Felix Niklas
1df24fe354 Modal: only add scrollbar spacing when there is a scrollbar 2020-03-11 17:58:10 +01:00
Rolf Schmidt
664d433d3a Enhancement: Increased read timeout for SearchIndexBackend and changed total timeout passed to UserAgent to not overwrite (lower) open- or read timeouts for handling larger payloads. 2020-03-11 16:45:39 +01:00
Thorsten Eckel
dd96c57f48 Follow up - 0798e7d47e - moved from circle ci to github actions. Fixed bug: GITHUB_ACTOR is the user initiating the commit not the repository owner. Applied workaround to extract the repository owner from the GitHub Actions GITHUB_REPOSITORY ENV instead because there is no dedicated ENV for that. 2020-03-11 09:44:26 +01:00
Thorsten Eckel
51ce176c2d Follow up - 0798e7d47e - moved from circle ci to github actions. Fixed bug: Can't use GitHub repository secret as GitHub Actions ENV for git checkout command. Migrated to given GITHUB_ACTOR GitHub Action ENV and aliased it to have the possibility to change it in the corresponding workflow YAML (e.g. for testing purposes). There is a workaround needed because aliasing an ENV is not possible. 2020-03-11 09:18:44 +01:00
Thorsten Eckel
bb7950255e Follow up - bca16dee16 - Enhancement: Provide unique error code for technical errors to make it easy to find them in the logs.
- Show all error messages if `current_user` has `admin` permission(s) right away.
- Pass messages of `ActionController::RoutingError`, `ActiveRecord::RecordNotFound`, `Exceptions::UnprocessableEntity` and `Exceptions::NotAuthorized` exceptions to user.
- Fix regression: 'Not authorized' errors lack of cause.
- Remove diverged behavior for different environments.
2020-03-10 19:18:03 +01:00
André Bauer
584680e7e4 Follow up - 0798e7d47e - moved from circle ci to github actions. Extract REPO_USER to GitHub secret to make it reusable in Zammad Docker Omnibus and Compose repository. 2020-03-06 14:12:06 +01:00
Thorsten Eckel
231a7aaf65 Follow up - 0798e7d47e - moved from circle ci to github actions. (Re-)enable rubocop. 2020-03-06 09:54:05 +01:00
Mantas Masalskis
3c73022272 Follow up for #2713 - Content Security Policy allows embedded content from Youtube and Vimeo. 2020-03-06 09:27:42 +01:00
Alex S
77e096e211 Pull Request #2940 - fixes typo in IntegrationClearBit
Thanks to @sabatale ❤️
2020-03-06 09:34:41 +02:00
Martin Edenhofer
e08f4d180c Fixed issue# 2957 - Inline images are note shown on split or forward 2020-03-06 07:56:58 +01:00
Thorsten Eckel
312820379b Follow up - 0798e7d47e - moved from circle ci to github actions. Add ShellCheck disable for externally provided ENV DOCKER_IMAGES. 2020-03-05 19:49:58 +01:00
Thorsten Eckel
ea1bff6c54 Follow up - 0798e7d47e - moved from circle ci to github actions. Migrated CircleCI tests to GitHub Actions for testing Pull Requests. 2020-03-05 19:43:50 +01:00
Thorsten Eckel
99cc3c4b22 Follow up - 0798e7d47e - moved from circle ci to github actions. Fixed bug: Wrong tags for zammad-docker omnibus image. 2020-03-05 12:56:53 +01:00
Thorsten Eckel
1ab4518775 Follow up - 0798e7d47e - moved from circle ci to github actions. Fixed syntax errors. Thanks ShellCheck! 2020-03-05 12:05:28 +01:00
Thorsten Eckel
2440dc6a00 Follow up - 0798e7d47e - moved from circle ci to github actions. Used ENV GITHUB_REPOSITORY collides with GitHub actions ENV and gets overwritten. Ref: https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables 2020-03-05 11:55:11 +01:00
Thorsten Eckel
48f639ab52 Follow up - 0798e7d47e - moved from circle ci to github actions. Can't use tags in shallow clone of repository. Ref: https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches 2020-03-05 11:43:50 +01:00
André Bauer
0798e7d47e moved from circle ci to github actions
Signed-off-by: André Bauer <monotek23@gmail.com>
2020-03-04 21:23:02 +01:00
Rolf Schmidt
e61fa6795e Enhancement: Reduce shown messages after password reset/verify to one single version. 2020-03-04 10:00:55 +01:00
Rolf Schmidt
bca16dee16 Enhancement: Provide unique error code for technical errors to make it easy to find them in the logs. 2020-03-04 10:00:55 +01:00
Thorsten Eckel
b0c4c0cb3f Enhancement: Reflect current_user in ticket_customer lookup. 2020-03-04 10:00:55 +01:00
Rolf Schmidt
1cbb139476 Enhancement: Made CORS Preflight Check specification conform. 2020-03-04 10:00:55 +01:00
Thorsten Eckel
49b0ca4d58 Maintenance: Add Content Security Policy. 2020-03-04 10:00:55 +01:00
Rolf Schmidt
33498bac91 Feature: Chat origin whitelisting functionality. 2020-03-04 10:00:55 +01:00
Thorsten Eckel
eb830a2e15 Enhancement: Improve handling of Ticket number in frontend. 2020-03-04 10:00:55 +01:00
Thorsten Eckel
e78af42b3c Enhancement: Limit data send back to the browser for valid session. 2020-03-04 10:00:55 +01:00
Rolf Schmidt
7a78645e3b Enhancement: Harden default reverse proxy configuration to not send it's name and version number to the client. 2020-03-04 10:00:55 +01:00
Rolf Schmidt
deaac071cb Enhancement: Requests should never be cached by the browser. 2020-03-04 10:00:55 +01:00
Rolf Schmidt
2236cd0367 Enhancement: Ensure added HTML is converted back to its original format when identifying signature. 2020-03-04 10:00:55 +01:00
Martin Edenhofer
f4084fb011 Prepared for 3.4.x. 2020-03-03 15:24:32 +01:00
Rolf Schmidt
2b9f5c85c6 Fix. 2020-03-03 10:39:16 +01:00
Rolf Schmidt
eafb6dd236 Follow up - ed8a152f28 - Fixes #2911 - Performance: Improved touching assets of users, organizations and tickets. Rollback of indexed data behavior change (structure instead of name). 2020-03-02 15:25:33 +01:00
Thorsten Eckel
5b262c75b0 Follow up - ed8a152f28 - Fixes #2911 - Performance: Improved touching assets of users, organizations and tickets. Touching of Organization causes endless SearchIndexJob creation / Organization touch loop. 2020-03-02 10:33:37 +01:00
Thorsten Eckel
5bacbadf2f Bumped puma to 3.12.4 (CVE-2020-5247). 2020-03-01 15:16:07 +01:00
Thorsten Eckel
a6285f6566 Refactoring: Extract ActiveJob logic into concern to prevent/avoid fat class. 2020-02-27 16:41:35 +01:00
Thorsten Eckel
754231cfbf Bumped nokogiri to 1.10.8 (CVE-2020-7595). 2020-02-25 08:15:33 +01:00
Thorsten Eckel
be1898120f Follow up: Removed RSpec tests that got added by accident. 2020-02-20 17:46:24 +01:00
Thorsten Eckel
082cbed915 Follow up: Applied required rubocop changes to newly introduced specs. 2020-02-20 14:56:52 +01:00
Martin Edenhofer
22911f8616 Refactoring: Improve performance by pushing Ticket create screen information on demand to the client instead of checking every X seconds via the Scheduler. 2020-02-20 14:34:03 +01:00
Rolf Schmidt
ec23915bd0 Fixes #1553: Calendar as filter condition for Trigger/Automatization. 2020-02-20 13:34:16 +01:00
Thorsten Eckel
ddd49271e2 Refactoring: Migrated Capybara system tests to folder structure that matches JS app URL path. 2020-02-20 13:15:03 +01:00
Mantas Masalskis
82149f463a Fixes #2920 - Link-Template attributes within Organizations and user cause Organization and user creation to fail within UI 2020-02-20 09:44:50 +01:00
Mantas Masalskis
0a70711695 Fixes #2713 - Knowledge Base does't support animated GIFs and embedded Video (Youtube/Vimeo) content. 2020-02-19 18:07:52 +01:00
Mantas Masalskis
695d05689b Fixes #2810 - Attachments of Knowledge Base Answers don't get added to Elasticsearch 2020-02-19 17:41:25 +01:00
Mantas Masalskis
6c60021196 Fixes #2641 - Can't use HEX/HSL color value in KB Admin color picker. 2020-02-19 16:02:28 +01:00
Martin Edenhofer
bcce8c51f9 Fixed issue #2904 - Error when changing passwords for users without email. 2020-02-19 15:57:32 +01:00
Mantas Masalskis
116606416c Fixes #2918 - Editing of KB article not possible if long text is pasted. 2020-02-19 12:56:27 +01:00
Rolf Schmidt
047a3aba87 Enhancement: Ticket#number should be read only for API requests. 2020-02-19 12:54:06 +01:00
Mantas Masalskis
c7ab3e1fe2 Github PR #2935 - Fixes #2781 - Users can't remove their Sessions from Device list. 2020-02-19 12:43:58 +01:00
Mantas Masalskis
55db5688f1 Fixes #2890 - Auto-Complete on Typing for Tags is hidden behind Pop-Up Windows. 2020-02-19 10:25:00 +01:00
Mantas Masalskis
d7ca9d7484 Fixes #2505 - Wrong language on login screen. 2020-02-19 10:15:11 +01:00
Mantas Masalskis
95e5a46d4b Github PR #2934 - Fixes #2764 - Removing last condition or action in Trigger/Automatization/Postmaster breaks dialogues. 2020-02-19 09:56:55 +01:00
Thorsten Eckel
a976b9fb43 Maintenance: Updated rubocop(-* gems) to latest version (0.80.0). 2020-02-18 20:51:31 +01:00
Rolf Schmidt
ed8a152f28 Fixes #2911 - Performance: Improved touching assets of users, organizations and tickets. 2020-02-18 15:49:52 +01:00
Mantas Masalskis
a01a2f3c91 Fixes #2628: KB link to public interface loses HTTP type. 2020-02-18 15:36:47 +01:00
Ryan Lue
212e07e322 Refactoring: developer_mode should not be active in test environment
The `rails zammad:bootstrap:{init,reset}` rake tasks
worked for RAILS_ENV=development (default), but not RAILS_ENV=test.

The problem was that the DB seed data would set

    Setting.get('developer_mode')  # false

but then `contrib/auto_wizard_test.json` would re-set it to `true`.
This caused some tests to fail (e.g., spec/models/channel/driver/sms)
where application behavior varied based on the "developer_mode" setting.

This commit ensures that "developer_mode" is only set to `true`
in development by setting it dynamically during DB seeding,
and leaving it alone during the auto-wizard.
2020-02-18 15:06:02 +01:00
Mantas Masalskis
52baaea5a8 Fixes #2782 - Trigger/Automatization infos visible for Customer Ticket detail view. 2020-02-18 11:28:44 +01:00
Thorsten Eckel
03164b26a7 Fixes issue #2937: Bumped omniauth-github to 1.4.0 (Please use the Authorization HTTP header instead as using the access_token query parameter is deprecated and will be removed July 1st, 2020.). 2020-02-18 11:19:04 +01:00
Mantas Masalskis
f15226301a Refactoring: Migrate maintenance message browser test to Capybara and make it more robust. 2020-02-18 11:17:49 +01:00
Ryan Lue
355b54654d Follow up: Fix CI failure introduced in 0b8b6148b
The previous commit introduced a CI failure which was caused by a test depending on the execution time. The Twitter channel implementation ignores tweets older than 15 days.
Therefore we need to travel to the time when the VCR snapshot was recorded to fix it.
2020-02-17 17:42:12 +01:00
Ryan Lue
0b8b6148b7 Improve Twitter-related factories
The Channel & ExternalCredential factories used for Twitter-related
tests originally contained attributes that did not reflect those created
during actual use (e.g., the Channel#options hash does not store a
consumer key or secret in practice, but the factory for it did).

This commit makes tests more realistic by amending the factories so that
the attributes/data they hold matches the format found in actual use.
2020-02-17 11:37:36 +01:00
Mantas Masalskis
1579bebad4 Maintenance: Send checked CTI checkboxes AJAX calls via queue to avoid race conditions in updating the UI. 2020-02-14 16:08:45 +01:00
Thorsten Eckel
4b6839cd82 Refactoring: Error request specs are not in RSpec format. 2020-02-12 15:50:18 +01:00
Martin Edenhofer
ddb4bb5150 Fixed issue #2924 - Unable to paste from clipboard in note field in ticket zoom. 2020-02-10 09:06:39 +01:00
Martin Edenhofer
343415d6e8 Maintenance: Migrate email tests to new host. 2020-02-05 13:50:49 +01:00
Ryan Lue
e42d62d1c6 Fix broken references to Zammad documentation pages
Recent changes to the file structure of Zammad's official
documentation[0] (commit 2717255) have broken some web links in the
Zammad application.

This commit fixes those broken links.

[0]: 271725591c
2020-02-05 16:54:39 +08:00
Thorsten Eckel
f4ef3636ff Maintenance: Wait for modal to be ready/disappeared in Twitter system test to make it more stable. 2020-02-02 16:45:25 +01:00
Thorsten Eckel
201027d23c Maintenance: Update selenium to latest compatible version. Current issue with latest: Chrome crashes in chat test when reloading page. 2020-02-02 16:40:13 +01:00
Thorsten Eckel
fbbc50f24a Maintenance: Invalid email error message is not expressive. 2020-01-31 22:40:55 +01:00
Thorsten Eckel
090fcb5408 Maintenance: Make browser tests more robust by waiting for search to stop loading. 2020-01-30 08:13:22 +01:00
Thorsten Eckel
208c0b0211 Maintenance: Processing of checked CTI Log entries via Scheduler and pushing of new information to the JS App takes longer than 6 seconds which fails CI browser test. 2020-01-30 08:13:22 +01:00
Mantas Masalskis
85c03460aa Pull Request #2905 - broken px handling in no-jQuery version of Chat. Thanks to @ma-jahn ❤️ 2020-01-29 17:01:38 +01:00
Rolf Schmidt
a7bd3f7135 Fixed issue #2910 - Ticket split does reference article inline images instead of copying them 2020-01-28 13:48:21 +01:00
Mantas Masalskis
6692869dd8 Fixes issue #2894 - Emails with binary body (attachment as body) get handled as if they were text messages which breaks the attachment. 2020-01-28 10:42:40 +01:00
Mantas Masalskis
264853dcbe Pull Request #2908 - Fix storage log message typo. Thanks to @saz ❤️
https://github.com/zammad/zammad/pull/2908
2020-01-28 01:44:03 +01:00
Mantas Masalskis
ca6f5faf12 Fixes issue #2837 - ?? and :: Ticket article composing shortcuts added to Keyboard Shortcuts helper. 2020-01-27 10:32:00 +01:00
Mantas Masalskis
7fab92d074 Fixes issue #2169 - Time format always english if generated from system. 2020-01-27 10:28:17 +01:00
Mantas Masalskis
b294708ec0 Fixes issue #2906 - Missing Content-Type header of parsed email fails processing. 2020-01-27 10:07:55 +01:00
Thorsten Eckel
fa2ff2138b Follow up - 4c9919a23e - Scheduler fails to execute ActiveJobLock cleanup job before application restart and deactivates it. 2020-01-23 12:45:58 +01:00
Martin Edenhofer
dd54f8a787 Improved perforamnce of global search (reduced throttle of search queries, ony start queries if query has changed). 2020-01-22 09:25:54 +01:00
Denny Korsukéwitz
ab6634bcfe Issue #2897 - StatsTicketChannelDistribution - set channel.overal_percentage to 0 if the calculation produces no result. 2020-01-21 09:09:34 +01:00
Thorsten Eckel
965218ac8c Feature #2888: Added Chat JS callback hooks: onReady, onCloseAnimationEnd, onError, onOpenAnimationEnd, onConnectionReestablished, onSessionClosed, onConnectionEstablished, onCssLoaded. Thanks to @ma-jahn ❤️ 2020-01-18 17:51:20 +01:00
Rolf Schmidt
9472af70f1 Fixed issue #2893 - Granted field access gets redacted by a later (alphabetically) permission. 2020-01-18 12:01:51 +01:00
Rolf Schmidt
f9a26d7254 Performance: User preference store YAML parsing for notification settings is slow. 2020-01-17 17:13:30 +01:00
Rolf Schmidt
b468134e93 Performance: Existing Notification type History lookup should be done on DB level. 2020-01-17 17:08:43 +01:00
Rolf Schmidt
22a25f266d Performance: Cache DB transaction locking of Karma::ActivityLog.add. 2020-01-17 14:49:42 +01:00
Mantas Masalskis
e0dc13949a Fixes #2895 - moving from Manage Knowledge base view to another Manage view requires multiple clicks 2020-01-16 10:42:36 +01:00
Thorsten Eckel
44806e79e5 Fixes #2881: Chat button is no longer optional in no jQuery version. Thanks to @ma-jahn ❤️ 2020-01-13 10:58:16 +01:00
Thorsten Eckel
3bd3eeb163 Add apple-touch-icon to HTML head for improved homescreen bookmark icon. Thanks to @xf- ❤️ 2020-01-13 09:49:06 +01:00
Mantas Masalskis
ceb9bf6e14 Fixes #2406 - Forwarding: Attachment of original content gets removed starting from the second forward without reloading per ticket 2020-01-10 13:01:33 +01:00
Thorsten Eckel
1772e9f1e4 Maintenance: Error message about existing user with same email address is not expressive. 2020-01-10 11:43:36 +01:00
Thorsten Eckel
87be5318c3 Fixed bug: ActiveJobLock is no actual ApplicationModel and don't need to inherit Model logic and capabilities. 2020-01-08 15:57:17 +01:00
Thorsten Eckel
3d69f66898 Maintenance: Make OmniAuth print it's log to the application log. 2020-01-08 12:06:21 +01:00
Martin Edenhofer
a1f2346a24 Fixed issue #2860 - "Enter answer" textual change 2019-12-23 12:11:08 +01:00
Mantas Masalskis
14dfdb4db9 Allows to define custom class name in CoffeeScript when frontend and backend class names don't match 2019-12-23 11:10:16 +01:00
Mantas Masalskis
ebe4746ace Improves stability of a failing test in FF 1 2019-12-23 10:37:47 +01:00
Martin Edenhofer
34704cd2ba Fixed issue #2873 - Tweet which is containing * will not send out, Twitter::Error::Unauthorized: Could not authenticate you. 2019-12-23 08:26:43 +01:00
Thorsten Eckel
8696c62de8 Updated rake to 2.0.8 (CVE-2019-16782) and rails to 5.2.4.1. 2019-12-20 16:47:00 +01:00
Thorsten Eckel
84c1d21279 Closes #2869 - Added Swedish chat translation - thanks to @pitah81 ❤️ 2019-12-18 17:12:20 +01:00
Thorsten Eckel
e9d416582b Fixed typo in translation of french user_invite email template - thanks to @Pelt10 ! 2019-12-17 17:39:02 +01:00
Ryan Lue
25cd644951 Fixes #2715 - Twitter status URLs are broken
This commit is a complement of its parent:
the parent fixes broken links to Twitter DMs,
while this one fixes broken links to Twitter statuses.

When importing tweets (articles of type "twitter status"),
Zammad generates a source link URL using the following format:

    https://twitter.com/statuses/:id

and then stores that URL under `article.preferences[:links]`.

This URL template worked until as recently as 2017[0],
but currently fails for users actively logged in to Twitter.
Now, the correct URL template appears to be

    https://twitter.com/:user_id/status/:id

where `:user_id` is not strict, and may be any word (\w+) <= 20 chars.
Try it yourself:

    $ curl https://twitter.com/elonmusk/status/1069382411899817990
    <html><body>You are being <a href="https://twitter.com/medenhofer/status/1069382411899817990">redirected</a>.</body></html>

In this commit, we replace `:user_id` with a single underscore (`_`).
This behavior is not officially documented anywhere (as far as I know),
but it works (for now).

This commit also extends the previous commit's DB migration/bg job
to rectify existing, broken tweet URLs stored in the database.
For performance purposes, this migration is performed in the background
and limited to the latest 10,000 Twitter articles.

[0]: https://stackoverflow.com/questions/41786123
GitHub: https://github.com/zammad/zammad/issues/2715
2019-12-17 16:03:05 +01:00
Ryan Lue
147cbc29b8 Fixes #2715 - Twitter DM URLs are broken
When importing Twitter DMs (articles of type "twitter direct-message"),
Zammad generates a source link URL of an incorrect format:

    https://twitter.com/statuses/:id

This format is for statuses (or "tweets").
The appropriate URL scheme for direct messages is:

    https://twitter.com/messages/:recipient_id-:current_user_id

This commit adds conditional logic for setting Twitter link URLs
based on message type.
It also provides a DB migration to rectify existing, broken DM URLs.
For performance purposes, this migration is performed in the background
and limited to the latest 10,000 DMs.

GitHub: https://github.com/zammad/zammad/issues/2715
2019-12-17 16:03:05 +01:00
Ryan Lue
9409d17de6 Request-spec controller actions for Twitter API webhook
This is the first of many commits
to add missing test coverage for Zammad's Twitter functionality.
The testing process begins from the broadest scope possible,
and will proceed in future commits
to more granular, fine-grained behaviors.

(Request specs provide integration testing at the controller level,
and webhook controller actions are the main point of entry
for incoming Twitter API functionality.)
2019-12-17 11:59:20 +01:00
Ryan Lue
889dd92aea Maintenance: Migrate Twitter browser test to RSpec
This commit migrates `test/integration/twitter_browser_test.rb` to RSpec
as directly as possible.
2019-12-17 11:59:20 +01:00
Ryan Lue
65d1ba133d Refactor .csv_import 2019-12-17 10:37:13 +01:00
Ryan Lue
7a7ab6a95a Follow up - 045902351 - fixes #2754
045902351 adds a `rescue` clause
to fix a bug in which IMAP parsing errors
cause the entire email import process to fail.[0]

This bugfix contains an error:
we're still not sure why,
but the `next` inside the `rescue` clause
does not act like the `next`s outside of it
(execution of the containing `.each` block continues,
even after passing `next`).

This commit puts `next` in the right place,
so that the method will skip processing of the current message
and move onto the next one.

[0]: https://github.com/zammad/zammad/issues/2754
2019-12-17 09:47:15 +01:00
Thorsten Eckel
5f861c566d Added options for external database server
Database config file has allowed only localhost database server. If you
want to use a database on a different host, you need the ability to set
hostname and port
- for MySQL see:
"https://stackoverflow.com/questions/5872264/correct-mysql-configuration-for-ruby-on-rails-database-yml-file"
- for PostgreSQL see:
"https://gist.github.com/jwo/4512764#file-postgres-database-yml"
2019-12-16 15:17:08 +01:00
Thorsten Eckel
aa6c647187 Bumped puma to 13.12.2 (CVE-2019-16770). 2019-12-06 10:15:37 +01:00
Thorsten Eckel
5ee0d0b31f Follow up - ff6b4256e1 - Fixes #2826: Call of private method #blank? on Twitter client instance blocks migration. 2019-12-05 15:05:46 +01:00
Thorsten Eckel
2317537f0e Added CentOS 8 support for packager.io 2019-12-05 08:17:51 +01:00
Thorsten Eckel
4c9919a23e ActiveJobLock enhancements (cleanup and Delayed::Job destroy sync) 2019-12-04 15:29:43 +01:00
Thorsten Eckel
ff6b4256e1 Fixes #2826 - Invalid stored Twitter credentials block migration. 2019-12-04 11:30:26 +01:00
Martin Edenhofer
3921820ae8 Fixes #2824 - Elasticsearch 7.5.x support. 2019-12-04 10:52:54 +01:00
Martin Edenhofer
209951b19b Fixed issue #2823 - Unable to open notifications (if chat is enabled). 2019-12-03 12:49:41 +01:00
Martin Edenhofer
1340d26501 Prepared for 3.3.x. 2019-12-03 08:07:19 +01:00
Martin Edenhofer
133b570fba Implemented feature to transfer chat sessions to another chat topic. 2019-12-03 07:29:02 +01:00
Martin Edenhofer
3c788ca426 Fixed browser unit test. 2019-12-02 14:42:35 +01:00
Thorsten Eckel
96d300b912 Maintenance: authentication_check Controller callback runs after CSRF token check which leads to failing POST/PUT, non-Session authenticated requests. 2019-12-02 14:17:57 +01:00
Thorsten Eckel
47778f2d2f Follow up - 2c8825b387 - ActiveJobLock lock update fails due to ActiveRecord::Deadlocked "Mysql2::Error: Deadlock found when trying to get lock; try restarting transaction" exception. 2019-11-29 16:48:21 +01:00
Martin Edenhofer
4e8cf209ca Performance: Observing every Overview of each Agent Session doesn't scale well on larger systems (60 Overviews per Agent). With this change only the last 5 used Overviews are checked on every iteration. A full check is still performed ever 60 seconds. This reduces the overall load. 2019-11-28 07:59:22 +01:00
Mantas Masalskis
f41aa097ce Fixes Javascript crash when plain text is pasted as html (e. g. a phone number without html tags) into rich text field. Follow up for #2645. 2019-11-27 14:40:30 +01:00
Marcel Herrguth
a9dd937968 Fixes #2400 - Local Elasticsearch is recognized as remote installation. 2019-11-27 10:23:05 +01:00
Martin Edenhofer
8c27cbb05e Fixed issue #2692 - ticket auto assignment is not working if only one excluded user is defined. 2019-11-26 16:22:04 +01:00
Martin Edenhofer
8996134214 Fixed issue #542 - Cant add new articles via Macro. 2019-11-26 11:40:23 +01:00
Ryan Lue
0459023514 Fixes issue #2754: Unparseable IMAP responses block email import from inbox
Some users experienced an error while fetching emails over IMAP (see
GitHub issue below for complete traceback). This error was caused by
certain unparseable character sequences in the responses Zammad received
from users' configured IMAP servers. The Zammad dev team was not able to
reproduce this issue when fetching identical emails from its own
servers.

Details remain unclear, but we have tracebacks from two distinct
occurrences of this issue, and the problematic strings followed the same
format:

  * "\"Jetzt"
  * "\"RE:"

This commit rescues the error in question, records details to the
application log, and allows IMAP fetch to proceed to the next message.
2019-11-25 09:02:10 +01:00
Martin Edenhofer
7225899cf9 Fixed issue #2813 - Useless display of delete icon below note. 2019-11-25 07:59:48 +01:00
Thorsten Eckel
3d00f4d25b Follow up - 2c8825b387 - ActiveJobLock PG::TRSerializationFailure exception is actually ActiveRecord::SerializationFailure. 2019-11-23 10:44:23 +01:00
Thorsten Eckel
5c6bc72d1b Follow up - 7e4b46b65c - avoid possible spam. 2019-11-21 17:39:24 +01:00
Jens Pfeifer
7e4b46b65c Refactoring: Added consistent email address validation to backend. 2019-11-21 16:49:14 +01:00
Martin Edenhofer
2beb1b4506 Fixed issue #2818 - TimeAccounting modal dialog input not focused. 2019-11-21 14:40:59 +01:00
Jens Pfeifer
9478c49fcd Fixed typos and name generation in user unit test. 2019-11-21 14:36:42 +01:00
Mantas Masalskis
377f8995a9 Enhancement: Allow selection of multiple values in Trigger custom select attribute filter. Closes #1559. 2019-11-21 14:18:23 +01:00
Martin Edenhofer
e9adb2adc2 Fixes issue #2291 - Chat enhancement: Option to set Agent display name. 2019-11-21 08:47:05 +01:00
Mantas Masalskis
149a086aab Fixes issue #2274 - Datepicker in bulk action not usable in bulk action if ticket list is longer the one page. 2019-11-20 15:53:24 +01:00
Mantas Masalskis
265d60a65f Fixes #2645 - Insertion of inline pictures does not work, if you copy an image in your Browser 2019-11-20 12:34:41 +01:00
Ryan Lue
a5d4cd80b2 Maintenance: Enhance VCR helper with better failure messages
1ebddff95 added an RSpec metadata flag to simplify the use of VCR:

    describe 'super cool feature', :use_vcr do
      it 'totally works' { ... }
    end

Under the hood, this option automatically generates filenames
for the VCR cassettes it uses on each example it's applied to.
These filenames are based on the example descriptions;
for the sample block above, the resulting filename would be

    super_cool_feature_totally_works.yml

This introduces the risk of test regressions
that could be extremely confusing and hard to debug,
simply because someone changed the example description.

This commit injects custom error messages into RSpec
to elucidate this problem and avoid needless debugging.

=== Design challenges

This error message injection uses Ruby's Module#prepend
to monkey-patch methods defined in RSpec,
meaning that the changes are coupled to RSpec's implementation.
In short, if the implementation changes,
this custom error messaging could break.

Specifically, there are two different modes of failure in RSpec,
and the custom error was thus injected in two corresponding places:

* `.notify_failure` for normal test failure
  (i.e., when an expectation is not met); and
* `.handle_matcher` for exceptions raised during a test.
2019-11-20 10:37:24 +01:00
Thorsten Eckel
9ce331be14 Follow up - f35cd7fbe9 - Race condition in (wrong) test fails CI. 2019-11-19 15:49:53 +01:00
Thorsten Eckel
2c8825b387 Follow up - 5ca41c8389 - ActiveJobLock lock update fails due to PG::TRSerializationFailure, 'Could not serialize access due to concurrent update' exception
It indicates that the UPDATE or DELETE statement was queued behind another UPDATE/DELETE statement on the same row. That other statement finished, and due to the guarantees of the Serializable isolation level, the statement in this session was canceled.

The PostgreSQL states that the transaction should automatically retry the UPDATE or DELETE when seeing this error message, whilst taking the updated state of the row into account.

See 'Serializable Isolation Level' section of https://www.postgresql.org/docs/10/transaction-iso.html
2019-11-19 15:21:50 +01:00
Thorsten Eckel
7ca577ab82 Maintenance: UserAgent integration test fails because previously non but now existing host URL 'existing.host'. 2019-11-19 15:20:47 +01:00
Thorsten Eckel
4cc3ed640b Follow up - 848175a290 - Can't access session information for User ObjectManager::Attribute in fields URL template. 2019-11-19 10:17:06 +01:00
Martin Edenhofer
94fd8c2957 Fixed issue #2809 - Array values (e.g. several states) nuke reporting profiles. 2019-11-19 09:03:46 +01:00
Mantas Masalskis
c448587eda CI maintenance for (not only) tests that fail right after midnight in user's timezone 2019-11-18 20:20:42 +01:00
Thorsten Eckel
20c7cf9502 Performance: Don't check record associations if record is already present in assets structure. 2019-11-18 20:19:35 +01:00
Thorsten Eckel
cccec58c2e Fixed bug: OTRS import - User queue/group permissions are not transfered depending on export data type. 2019-11-18 16:49:22 +01:00
Martin Edenhofer
2b92d28b89 Fixed issue #2808 - Unprocessable mail if follow up search is enabled for attachments with contains invalid charsets (postmaster_follow_up_search_in with attachment). 2019-11-18 16:16:49 +01:00
Martin Edenhofer
3b63fbeca0 Maintenance: Updated nokogiri gem - CVE-2019-13117 2019-11-18 14:23:52 +01:00
Ryan Lue
1ebddff95f Refactoring: Automatic RSpec VCR cassette name helper
This commit was prepared to support upcoming additions to the test suite
(specifically, better coverage for existing Twitter functionality).

These upcoming changes will depend heavily on VCR.[0]
(VCR is a Ruby gem that makes it easier to write and run tests
that call out to external services over HTTP
by "recording" HTTP transactions to a YAML file
and "replaying" them later.)

VCR is widely-used (4600 GitHub stars), but its API is a little clumsy--
You have to manually specify the name of a "cassette" file every time:

    it 'does something' do
      VCR.use_cassette('path/to/cassette') do
        ...
      end
    end

This commit adds an RSpec metadata config option
as a shorthand for the syntax above:

    it 'does something', :use_vcr do
      ...
    end

This config option automatically generates a cassette filename
based on the description of the example it's applied to.

=== Analysis of alternative approaches

Ideally, these auto-generated cassette filenames should be unique:
if filenames collide, multiple examples will share the same cassette.

A first attempt generated names based on `example.full_description`,
but that led to errors:

    Errno::ENAMETOOLONG:
      File name too long @ rb_sysopen - /opt/zammad/test/data/vcr_cassettes/models/ticket/article/ticket_article_callbacks_observers_async_transactions_-_auto-setting_of_outgoing_twitter_article_attributes_via_bg_jobs_when_the_original_channel_specified_in_ticket_preferences_was_deleted_but_a_new_one_with_the_same_screen_name_exists_sets_appropriate_status_attributes_on_the_new_channel.yml

Another idea was to use MD5 digests of the above,
but in fact both of these approaches share another problem:
even minor changes to the description could break tests
(unless the committer remembers to rename the cassette file to match):
an altered description means VCR will record a new cassette file
instead of replaying from the original.

(Normally, this would only slow down the test instead of breaking it,
but sometimes we modify tests and cassettes after recording them
to hide sensitive data like API keys or login credentials.)

The approach taken by this commit was to use partial descriptions,
combining the parent `describe`/`context` label with the `it` label.
This does not guarantee uniqueness--
even in the present refactoring, it produced a filename collision--
but it's a good middle ground.

[0]: https://relishapp.com/vcr/vcr/docs
2019-11-13 15:18:18 +01:00
Mantas Masalskis
6d684c74cf Fixes #2784 - new Knowledge Base modal in settings is removed properly when moving to another setting tab 2019-11-13 11:30:16 +01:00
Thorsten Eckel
5ca41c8389 Feature: Added centralized ActiveJob locking based on lock key. This prevents unnecessary executing/queuing of unique jobs multiple times. 2019-11-13 08:03:47 +01:00
Martin Edenhofer
8a5552c9f8 Fixes issue #2441 - Zammad ignores disabled Chat-Topics for agents. 2019-11-12 17:06:42 +01:00
Mantas Masalskis
d24a7c5584 Fixes #2777: Knowledge Base - Attachments not working for internal readers. 2019-11-12 15:08:00 +01:00
Ryan Lue
86a90d287c Fix issue #2460 - corrupted IDs on Twitter channels break Direct Message functionality
In some cases, editing a Twitter account via the admin panel
would cause new DMs to stop coming in. Why?

All Twitter usernames correspond to a numeric user ID
(see https://tweeterid.com/).
Zammad stores this ID on Twitter channels
(under `channel.options['user']['id']`)
and uses it to monitor incoming DMs.

Zammad was storing these user IDs to the DB as integers,
then passing those values to the frontend (JS) for account editing.
Some user IDs are longer than JavaScript's `Number.MAX_SAFE_INTEGER`,
and so got truncated on their way back to the update endpoint
(e.g., 984608854112718800 instead of 984608854112718848).

This commit enforces string storage of Twitter user IDs on new channels,
and includes a migration to verify and stringify IDs on existing ones.

Zammad Community: https://community.zammad.org/t/1799/34
GitHub: https://github.com/zammad/zammad/issues/2460
2019-11-12 14:58:02 +01:00
Mantas Masalskis
ea3522c7a2 Maintenance: Local history log consistency bugfix 2019-11-12 13:54:55 +01:00
Denny Korsukéwitz
f35cd7fbe9 Fixes #2687 - Article deletion for agents limited to 10 minutes after article creation. 2019-11-11 16:47:51 +01:00
Denny Korsukéwitz
a9dbe2d555 CSS Bug 2019-11-11 09:08:59 +01:00
Thorsten Eckel
1287e9968e Fixed bug: Regular Model list imports (e.g. Tickets) sequences fail import because of attribute that is not required and can't be provided. 2019-11-07 12:09:46 +01:00
Mantas Masalskis
022efe7921 Follow up - a883bbadb3 - UserAgent interface unification is reflected in tests 2019-11-06 11:57:08 +02:00
Mantas Masalskis
6c569e5085 Maintenance: Replaced not used list method by introducing keys method of App.LocalStorage to support deleting all keys for a certain user only. 2019-11-05 18:32:07 +01:00
Martin Edenhofer
70619f29ea Maintenance: Changed modal size of ldap wizard to get more readable information viewable. 2019-11-05 17:33:33 +01:00
Martin Edenhofer
d58233d0ce Fixed issue #2796 - Image/attachment preview is to small, need to download image and open it locally. 2019-11-05 15:46:13 +01:00
Mantas
0a5c3f4f8a Follow up - a883bbadb3 - UserAgent sends SearchIndexBackend DELETE request options as parameters. Fixed by unifying UserAgent interface to support parameters as other request methods do. 2019-11-05 15:40:58 +01:00
Mantas Masalskis
6e6285aedd Maintenance: Race condition after Knowledge Base creation modifies configuration and pushed it to frontend fails CI. 2019-11-05 15:40:01 +01:00
Martin Edenhofer
232c7b9bb4 Fixed issue #2797 - Allow direct or extention numbers in answeringNumber of CTI API. 2019-11-05 15:32:49 +01:00
MrGeneration
cc1268a8b6 Fixes #2508: Change into backup directory
This fix ensures that the backup-script will change into the backup directory before running.

Users backup via root user will no longer get a warning, that the script couldn't change into '/root'
2019-10-30 17:05:58 +01:00
Ryan Lue
54d590491e Fixes issue #2608 - missing default permission ("admin.trigger")
Zammad's permission model supports fine-grained permissions
so that, e.g, a user may be allowed to modify triggers but not channels.
Permissions are assigned to roles, which are then assigned to users.

A set of default permissions is provided in `db/seeds/permissions.rb`;
these are the permissions that appear in the admin interface
when creating a new role and selecting which permissions it grants.

Somehow, we forgot to include the "admin.trigger" permission in this
default set, and no one noticed until earlier this year.

Zammad Community: https://community.zammad.org/t/2584
2019-10-30 14:28:21 +01:00
Martin Edenhofer
f204b89fe3 Fixes issue #2785 - Reporting does not return all tickets when using values with that "divide" values (e. g. some_value).
* Fixed SearchIndexBackend.selectors() in case if value if condition containing e. g. ::, _ or spaces.
* Moved to standard elasticsearch field naming .keyword to save raw strings (in previous we used .raw which in not common)
* Reindexing of elasticsearch is needed (zammad run rake searchindex:rebuild)
2019-10-30 08:45:31 +01:00
Thorsten Eckel
a343fb4f7a Maintenance: Enabled support for Debian 10 buster package building on packager.io. 2019-10-29 19:34:35 +01:00
Thorsten Eckel
def0525c6d Maintenance: Reduce memory consumption by setting MALLOC_ARENA_MAX.
The Zammad environment variable `MALLOC_ARENA_MAX` will now default to `2`. This environment variable was previously unset.

The goal of setting this value is to decrease memory usage for the majority of Zammad installations - especially the Worker and Puma processes. To understand more about the relationship between this value and memory please see the following external resources:

- https://www.speedshop.co/2017/12/04/malloc-doubles-ruby-memory.html
- https://www.mikeperham.com/2018/04/25/taming-rails-memory-bloat/

Heroku also maintains a [documentation on tuning the memory behavior of glibc by setting this environment variable](https://devcenter.heroku.com/articles/tuning-glibc-memory-behavior).

The default as specified by the [linux man page](http://man7.org/linux/man-pages/man3/mallopt.3.html) is 8 times the number of (virtual) cores on the system.
2019-10-29 14:49:03 +01:00
Mantas Masalskis
d4afb0e867 Fixes issue #2789: not possible to search or link KB-answer within ticket. 2019-10-28 16:38:14 +01:00
Mantas
f17c181427 Fixed bug: ExcelSheet timezone conversion doesn't take DST into account. 2019-10-28 14:20:07 +01:00
Mantas
d2912ff25f Maintenance: Disable Rails default caching behavior because in memory cache leads to diverging cache state in multiple processes and no-cache is usually not a desired behavior. 2019-10-28 11:22:19 +01:00
Jens Pfeifer
67d3f35b05 Refactoring: Resolved vendor/lib/* path by moving OmniAuth custom authentication backends to lib/omniauth/. 2019-10-28 08:51:22 +01:00
Thorsten Eckel
8d45328d32 Bumped loofah to 2.3.1 (CVE-2019-15587). 2019-10-24 08:45:02 +02:00
Mantas Masalskis
8386a07a7b Refactoring: Prefer RSpec matchers over selectors for expressive output and isolated scope. 2019-10-22 11:40:35 +02:00
Denny Korsukéwitz
7c935655d5 Telegram refactoring:
- Fixes #2289 - Added Telegram video support.
- Improved error handling via raise Exceptions.
- Removed unused methods.
- Fixed typos.
- Improved messages to client - return status: :ok even if the message could not be processed. This stops the Webhook loop for these message.
2019-10-21 16:50:45 +02:00
Mantas Masalskis
8d16bcbfdd Fixes #2229 - Wrong dates on synced calendars. 2019-10-21 13:03:54 +02:00
Mantas
a883bbadb3 Refactoring: DRYing up HTTP calls in SearchIndexBackend. 2019-10-21 12:53:28 +02:00
Ryan Lue
dbe13c2ed6 - Fixes #2658 - CSV-Import doesn't lookup records by "name" field.
- Fixes #2659 - CSV-Import doesn't (always) handle database errors correctly.

Attention: This introduces a behavior change: Before (other) data was still imported on errors, now data only will get imported when no error occurs.
2019-10-21 12:44:52 +02:00
Thorsten Eckel
1d0d227575 Maintenance: StatsStore column related_o_id is never used. 2019-10-15 12:17:53 +02:00
Thorsten Eckel
b9c82a4c7f Maintenance: All models should inherit from ApplicationModel. 2019-10-15 12:15:58 +02:00
Thorsten Eckel
e2af543016 Refactoring: Prefer ActiveJob helpers instead of quering job processing backend (Delayed::Job) directly. 2019-10-11 22:51:48 +02:00
Thorsten Eckel
3667cacab0 Refactoring: SLA id paramater for SlaTicketRebuildEscalationJob is never used. 2019-10-11 22:48:40 +02:00
Thorsten Eckel
c8d19fc0af Maintenance: Completely disable Metrics/AbcSize rubocop for now. A list of files would be prefered but is currently not available. 2019-10-11 17:16:47 +02:00
Ryan Lue
3107d684b5 Fixes #2740 - Signature detection fails if no signature range could be found. 2019-10-11 17:10:41 +02:00
Ryan Lue
adf4442648 Fixes #2701 - Can't forward articles containing a <img> tag without src attribute. 2019-10-11 17:04:01 +02:00
Martin Edenhofer
1afa52f5f7 Maintenance: Added logging of scheduler jobs execution time to identify long running tasks. 2019-10-10 13:51:35 +02:00
Martin Edenhofer
2ab17db3e4 Fixes #2768 - Unable to process email where group has option follow_up_possible: 'new_ticket' and arriving email has no subject header. 2019-10-08 15:13:27 +02:00
Olivier Sallou
69600b0b7c Fix typos in Unprocessable Entity error message
🎉🎉🎉 Big thanks to Olivier Sallou (@osallou) for this contribution!
2019-10-08 17:42:22 +08:00
Martin Edenhofer
886c718e12 No timestamp of unprocessable mail to prevent double import of mails. Follow up if issue #2092. 2019-10-08 09:19:04 +02:00
Martin Edenhofer
f57f0486a3 Performance: When many tickets have reached the reminder or are escalated (more than 1400) processing of those causes a high CPU load and long blocking of background processing. Caching Group permission lookup for users reduces this load. 2019-10-04 11:42:44 +02:00
Martin Edenhofer
4182b0b567 Improved History.list to only retrive history entries of last 2 days (by generic condition as method argument) to save scheduler resources. 2019-10-03 14:41:07 +02:00
Martin Edenhofer
d01dfce8cb Removed unused sla get of ticket in Ticket.process_escalation to save system ressources of scheduler. 2019-10-03 13:43:41 +02:00
Martin Edenhofer
6018d864db Performance: Sessions::Backend::TicketOverivewList check whether data has to be sent to the client was wrong. The correct check now compares the list of tickets instead of comparing the whole hash structure including assets. 2019-10-02 15:57:08 +02:00
Thorsten Eckel
d1ed72a071 Existing user session when requesting SSO session create endpoint will fail device check because of missing fingerprint param (which is required as soon as a user/session is present). 2019-09-30 19:34:13 +02:00
Martin Edenhofer
817cc72194 Updated rubyzip / CVE-2019-16892 2019-09-30 13:45:39 +02:00
Thorsten Eckel
d354dee74c Refactoring: Move Ruby class definitions to dedicated files to improve orientation and expressiveness. 2019-09-27 09:22:16 +02:00
Thorsten Eckel
f0fdf7e7f3 Maintenance: Disable execution of ES RSpec tests in CircleCI env. 2019-09-26 14:08:17 +02:00
Martin Edenhofer
f806ac3611 Fixed issue #2742 - Removing a record drops whole index on Elasticsearch 6 and later. 2019-09-26 13:41:20 +02:00
Mantas Masalskis
c33bd9c7e3 Maintenance: Added test coverage for Knowledge Base initial data loading and translation update. 2019-09-24 17:44:32 +02:00
Mantas Masalskis
21c3b31c97 Maintenance: Added test coverage for public Knowledge Base search. 2019-09-24 15:04:42 +02:00
Martin Edenhofer
5e38ca46fc Fixed issue #2750 - Can't change Ticket attributes of "Shared Organization" Ticket. 2019-09-20 08:48:57 +02:00
Mantas Masalskis
6606aa29cd Don't use stubs for UserInfo.current_user_id because it blocks the use case where UserInfo.current_user_id is changed at runtime. 2019-09-18 19:25:04 +02:00
Thorsten Eckel
8096ee0892 Fixed bug: ApplicationModel.lookup returns invalid cache entries. 2019-09-18 18:22:15 +02:00
Thorsten Eckel
2d70134d72 Fixed bug: Empty ActiveRecord::AttributeMethods::Dirty#saved_changes in cache invalidation callback (ApplicationModel::HasCache) leads to wrong cache entries if record is a ticket. 2019-09-18 18:22:15 +02:00
MrGeneration
f01d71d73b fix typos in html tags
This will satsify issue https://github.com/zammad/zammad/issues/2747 found by abeluck.

Earlier the two patched files did not correctly close divs, which caused broken Mails to be generated.
2019-09-18 14:10:00 +02:00
Mantas
dabb415b8b test added to JS unit test runner 2019-09-18 12:09:31 +03:00
Mantas
e4bd02e4d3 Fixes deleting LocalStorage item with user-id prefix 2019-09-18 11:02:17 +02:00
Mantas
296a024c4b TaskManager#ensureWorker method guarantees worker is up and running. Helps to mitigate race condition on UI launch 2019-09-18 11:01:06 +02:00
Thorsten Eckel
dfb2b1bc8a Follow-up #2741: Authenticate users via SAML. Missing setting for new systems. 2019-09-18 10:07:46 +02:00
Martin Edenhofer
ba2afc0c16 Fixes #2699 - Excel export of report or time accounting drops additional fields in row if integer field contain null/nil/undefined. 2019-09-16 22:36:03 +02:00
Mantas Masalskis
2e3b7e07ad Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.33.0 to 1.35.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.33.0...v1.35.0)
2019-09-16 17:04:17 +02:00
Thorsten Eckel
a93250e210 Fixes issue #2741: Authenticate users via SAML. 2019-09-16 15:03:21 +02:00
Thorsten Eckel
128e8dea72 Revert "Fixes issue #2734 - Enhance postmaster filters to be able ignoring vacation mails (out of office)."
This reverts commit 568ed22074.
2019-09-16 14:40:01 +02:00
Thorsten Eckel
250bf2abcf Fixes #2726: System mail notification subjects ending with =0A. 2019-09-16 14:20:59 +02:00
Thorsten Eckel
568ed22074 Fixes issue #2734 - Enhance postmaster filters to be able ignoring vacation mails (out of office). 2019-09-16 14:19:18 +02:00
Mantas Masalskis
89c74ba829 Maintenance: Prefer selector from used variable over hardcoded string. 2019-09-16 12:34:26 +02:00
Mantas Masalskis
6000b9f5c1 Maintenance: Improved stability of the CI by gracefully stoping the websocket server instead of killing the thread which results in a blocked port sometimes. 2019-09-16 12:29:04 +02:00
Thorsten Eckel
1c63e96675 Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.1.0 to 1.4.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.1.0...v1.4.1)
2019-09-16 11:21:10 +02:00
Thorsten Eckel
429b95e65d Maintenance: Make ES connection establishment more stable by:
- performing a retry when Net::OpenTimeout exceptions occur
- cache the result of ES version check
2019-09-16 11:15:12 +02:00
Mantas Masalskis
256e7513b3 Maintenance: Improves CI reliability of browser:core tests in batch 2 by adding delay before performing ticket zoom secondary button action to avoid accessing stale element. 2019-09-16 11:08:44 +02:00
Thorsten Eckel
01729584f0 Revert "Fixed issue #1653: Default value not set for attributes of type input, select, tree_select, richtext, textarea, checkbox."
This reverts commit 93c5708ba8 and c2bdbe62d8.
2019-09-12 13:34:37 +02:00
Martin Edenhofer
37687e32a1 Fixed mail delivery postmaster to sender test. 2019-09-09 14:45:44 +02:00
Ryan Lue
33bef7123d Feature: Single sign-on (SSO). 2019-09-05 16:02:31 +02:00
Thorsten Eckel
0afb105dd7 Refactoring: Removed unnecessary OnlineNotification.seen method. 2019-09-05 15:52:25 +02:00
Thorsten Eckel
9c76def19d Maintenance: Applied rubocop Performance/Casecmp. 2019-09-05 15:51:13 +02:00
Thorsten Eckel
f50c079df9 Maintenance: SQLite dependency is obsolete. 2019-09-05 13:55:46 +02:00
Denny Korsukéwitz
20ee2e87ca Fixes #1010 - display only used channels in dashboard 2019-09-04 11:30:46 +02:00
Denny Korsukéwitz
feac4bb938 Removed macro event for TicketCreateFormHandler. This is not needed, because there are no macros when creating tickets. 2019-09-04 09:42:50 +02:00
Thorsten Eckel
7e2f55d91f Fixed issue #2595: GitLab OAuth2 provider URL misses api/v4/ suffix. 2019-09-04 08:38:28 +02:00
Thorsten Eckel
39c78662d0 Fixed issue #2730: Registering of Twitter App fails for Twitter App with existing webhooks. 2019-09-03 20:23:29 +02:00
Denny Bresch
1c730e9154 Fixes #2702 - Use assignee_id to set the ticket owner. 2019-09-03 17:04:47 +02:00
Denny Bresch
781ffa3209 Maintenance: Improve handling of Zendesk API to get the correct count of objects while import. 2019-09-03 17:04:47 +02:00
Denny Bresch
fb027c514b Maintenance: Improve handling of Zendesk API hickups/temporary errors. 2019-09-03 17:04:47 +02:00
Denny Bresch
f1eee78381 Fixes #2694 - Zendesk import doesn't consider all tickets. 2019-09-03 17:04:47 +02:00
Denny Bresch
f1f93b773e Follow-up - #1161 - Zendesk import fails for deleted tickets. 2019-09-03 17:04:47 +02:00
Denny Bresch
371a4638ec Fixes #2538 - Zendesk import fails due import of (too long) ticket description as (unused) note 2019-09-03 17:04:47 +02:00
Thorsten Eckel
c2bdbe62d8 Follow-up: Fixed issue #1653: Default value not set for attributes of type input, select, tree_select, richtext, textarea, checkbox. 2019-09-03 16:06:04 +02:00
Martin Edenhofer
f79555ecc6 Fixed issue #2728 - Put _type, _doc and _id to reserved words for object managaer becasue of elasticssearch internal use. 2019-09-02 18:20:32 +02:00
Martin Edenhofer
180502d03b - Prefer oversized_preferences naming prefix for consistency reasons.
- DRYed up code by using yield.
- Idiomatic ruby: Use ?-suffix for true/false methods.
2019-09-02 18:03:10 +02:00
Martin Edenhofer
77256c99b9 Follow up for issue #2720 - makes Model.search_index_reload more robust - Sometimes elasticsearch takes longer as expected and will raise timeout in Zammad. 2019-09-02 17:32:54 +02:00
Denny Korsukéwitz
c88739cde8 Fixes #2710 - ignore 'new line' between trigger chars. 2019-09-02 15:28:39 +02:00
Thorsten Eckel
40dcb0e132 Updated rubocop to latest version (0.74). 2019-09-02 13:52:11 +02:00
Martin Edenhofer
366a0b32e3 Improved wording. 2019-09-02 09:55:10 +02:00
Martin Edenhofer
c8ef769829 Fized issue #2723 - Unable to process mail with enabled follow up detection in content of attachments. 2019-08-30 15:09:31 +02:00
Martin Edenhofer
7f1d30e089 Fixed issue #2722 - mail processing impossible: invalid byte sequence in UTF-8. 2019-08-29 18:05:17 +02:00
Martin Edenhofer
d57ac5338e Fixed issue #2720 - Sometimes es takes longer as expected and will raise timeout in Zammad. 2019-08-28 11:41:04 +02:00
Martin Edenhofer
bea44638d5 Martin Edenhofer's avatar Fixed issue #2719 - Unable to set owner via X-Zammad-Ticket-owner header. 2019-08-26 22:14:33 +02:00
Thorsten Eckel
ffa2b61087 Maintenance: Not having an active Email::Notification is a valid use case. 2019-08-21 14:55:26 +02:00
Denny Bresch
08a98efca4 Fixes #2647 - Enhance CTI-Caller-Log to "mark as seen" all unread entries at once 2019-08-17 00:24:50 +02:00
Billy Zhou
ebe053efca PR2597: Fixed issue #2596 by correcting chat header's height 2019-08-16 17:44:43 +02:00
Denny Bresch
832b2ec28a Fixes #2661 - Inconsistency in "follow up" strings 2019-08-16 17:39:31 +02:00
Thorsten Eckel
6a5c5a3e2a Maintenance: Improved HTML sanitization timeout handling. 2019-08-16 15:15:07 +02:00
Martin Edenhofer
b0a806e886 Implemented issue #2703 - Added new placetel outbound support for call logging. 2019-08-16 14:10:36 +02:00
Thorsten Eckel
93c5708ba8 Fixed issue #1653: Default value not set for attributes of type input, select, tree_select, richtext, textarea, checkbox. 2019-08-16 11:14:29 +02:00
Martin Edenhofer
f165cbfbc2 Fixes issue #2696 - Limit on copy and paste in note box for new articles 2019-08-16 08:47:32 +02:00
Denny Bresch
7f0fd8b346 Fixed typo 'form_active'. 2019-08-14 10:15:36 +02:00
Thorsten Eckel
7cb550bfdf Bumped nokogiri to 1.10.4 (CVE-2019-5477). 2019-08-13 18:37:03 +02:00
Denny Bresch
92b38dcb75 Fixes #2695 - Telegram not possible to close ticket via '/end'. 2019-08-12 17:25:32 +02:00
Martin Edenhofer
848175a290 Fixes issue #2103 - clickable URL (template) for ObjectManager Attribute. 2019-08-12 09:53:24 +02:00
Denny Bresch
29c9d3546b Fixes obsolete texts or add translations. Fixes #813 2019-08-12 09:49:48 +02:00
Martin Edenhofer
19ca528635 Follow up for issue #2697 - Time zone incorrectly calculated in ticket list. 2019-08-11 21:52:54 +02:00
Martin Edenhofer
31cd45d0a4 Fixed issue #2697 - Time zone incorrectly calculated in ticket list. 2019-08-09 13:16:44 +02:00
Martin Edenhofer
b7bcc2aeff Improved subject in oversized mail template. 2019-08-09 12:47:21 +02:00
Denny Bresch
77d0b2d5c9 Maintenance: Improve RSpec 'text modules group dependency examples' 2019-08-07 14:55:54 +02:00
Billy Zhou
fae194918e Implemented issue #2092 - Send postmaster email to sender if email is too big 2019-08-06 17:26:29 +02:00
Denny Bresch
bc38f1c1ae Maintenance: Fixed typos in inline comments. 2019-07-31 10:23:48 +02:00
Denny Bresch
106bfd56da Fixes #2664 - ObjectManager::Attribute names collide with reserved application words ( e.g. url) and break functionalities 2019-07-31 09:45:27 +02:00
Denny Bresch
59f9f1a1b6 Follow up - ec8b7b5be1 - Fixes #2325 - remove blockquote blocks before checking if attachment is referenced in message. 2019-07-30 15:52:14 +02:00
Denny Bresch
1db27646d5 Fixes #2379 - Zammad ignores group mapping on Telegram if same sending user. 2019-07-30 15:47:53 +02:00
Ryan Lue
68c56c7b87 Maintenance: Added support for Cookie secure-Flag. 2019-07-30 15:43:27 +02:00
Thorsten Eckel
0cdc3ffb7b Fixed bug #2675: Follow up to 9503ff20ce - Linking auth provider account from profile fails. 2019-07-29 13:46:50 +02:00
Denny Bresch
ec8b7b5be1 Fixes #2325 - remove blockquote blocks before checking if attachment is referenced in message. 2019-07-26 16:44:30 +02:00
Ryan Lue
1b7140bb1d Prevent extreme import delays by skipping image preview generation 2019-07-26 16:36:23 +02:00
Ryan Lue
a9144638a9 Maintenance: Introduced 'deprecation_toolkit' to handle deprecation of internal Zammad APIs and those of dependencies. 2019-07-26 16:33:26 +02:00
Martin Edenhofer
2d7846e7af Fixed issue #2685 - Scheduler/Job with current_user in condition is not working. 2019-07-26 16:31:24 +02:00
Denny Bresch
c57a320d8d Added 'dropdown' buttons and dropdown-menu to layout_ref/button. 2019-07-26 16:18:55 +02:00
Martin Edenhofer
595dd01c4e Cleanup - moved from file based ttl checks to object based ttl checks. 2019-07-25 08:55:56 +02:00
Denny Bresch
0d8a7b7155 Changed 'Create User' to 'New User' to reduces the number of similar translations. 2019-07-23 17:31:33 +02:00
Denny Bresch
f756aed7a5 Revert "Tidied scss."
This reverts commit dcf8a2ba25c2e11f2837f1700dd897d6974bef09.
2019-07-23 12:17:31 +02:00
Thorsten Eckel
3424416809 Fixed issue #2663: DB migration blocks update when records with 'current_user.id' in selector of Job or Trigger exist. 2019-07-12 16:02:22 +02:00
Thorsten Eckel
b361c422f8 Refactoring UserInfo:
- Pass return value of given block back to caller.
- Ensure that exceptions don't cause the temporary UserInfo.current_user_id to leak.
2019-07-12 15:59:18 +02:00
Denny Bresch
b60dc34b1f Fixes article icons for 'twitter status', 'twitter direct-message', 'facebook feed post', 'facebook feed comment', 'telegram personal-message'. 2019-07-12 12:55:53 +02:00
Denny Bresch
51865bf78e Maintenance: Improves layout_ref/ui. 2019-07-12 12:55:11 +02:00
MrGeneration
272344ae35 Unset RAILS_LOG_TO_STDOUT by default
This will solve issue #2660 and ensure that we're not changing the logging by default.

Set RAILS_LOG_TO_STDOUT=true to enable logging to STDOUT.
2019-07-12 12:08:24 +02:00
Ryan Lue
3f20b05469 Support NullDB adapter (used in Docker packaging) in DBPreflightCheck initializer 2019-07-12 12:05:41 +02:00
Felix Niklas
d8242181a4 See more: make last row of text selectable
fixes #2654
2019-07-11 16:20:58 +02:00
Thorsten Eckel
c09e698709 Applied workaround for issue #2656: Disable new Rails database connection reaping functionality until the Thread-Zombie issue is resolved: https://github.com/rails/rails/issues/33600 . 2019-07-10 13:58:51 +02:00
Denny Bresch
eafe412d87 Fixed Version typo. 2019-07-10 08:25:32 +02:00
Martin Edenhofer
76959f1919 Prepared files. 2019-07-10 01:22:28 +02:00
Martin Edenhofer
7faa4c310d Implemented CTI ticket create screen popup on answering call. 2019-07-10 00:07:32 +02:00
Thorsten Eckel
9503ff20ce Maintenance: Applied required changes to resolve 'omniauth' CVE-2015-9284
While Zammad was not affected it was using GET requests. These are now prohibited because they enable the attack vector (in other scenarios).
Since it's not a general 'rails' or 'omnniauth' issue but an issue affecting scenarios where both are combined. It is required to use the 'omniauth-rails_csrf_protection' gem instead of 'omniauth' for those scenarios.

More information can be found here:
https://github.com/omniauth/omniauth/pull/809
https://github.com/omniauth/omniauth/pull/809#issuecomment-497376674
https://nvd.nist.gov/vuln/detail/CVE-2015-9284
https://github.com/cookpad/omniauth-rails_csrf_protection
https://github.com/rubysec/ruby-advisory-db/pull/390#issuecomment-509108186
2019-07-08 17:18:14 +02:00
Denny Bresch
5e0e6bb8ea Fixed core.js test. 2019-07-05 17:49:42 +02:00
Denny Bresch
0a819f8d3c Fixes obsolete texts or descriptions - which are no longer in use 2019-07-04 15:50:05 +02:00
Thorsten Eckel
183a893883 Maintenance: Improved explicitness of CSRF token check logic. 2019-07-04 15:43:49 +02:00
Thorsten Eckel
51ccc23307 Maintenance: Removed unneeded 'Special exceptions' of rubocop cops. 2019-07-04 15:43:49 +02:00
Denny Bresch
c60e1c0780 Fixed issue #2611 - SearchIndexBackend.remove() (ES) is not removing entries 2019-07-04 15:23:58 +02:00
Thorsten Eckel
5745fa46bd Bumps [rails](https://github.com/rails/rails) from 5.1.7 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v5.1.7...v5.2.3)
2019-07-04 13:16:55 +02:00
Denny Bresch
c788c3e053 Added migration for group_dependent_text_modules - renamed table text_modules_groups to groups_text_modules. 2019-07-03 18:14:28 +02:00
Ryan Lue
a295a84771 Refactoring: Migrate ticket_article_communicate_test to RSpec 2019-07-03 18:12:05 +02:00
Ryan Lue
52f5b33484 Refactoring: Migrate tag_test to RSpec 2019-07-03 18:02:29 +02:00
Billy Zhou
7dce5315e1 Added Enhancement #2569 - Enhance tag search to use fulltext search 2019-07-03 17:50:47 +02:00
Thorsten Eckel
811c0cc744 Exclude tmp dir from backups 2019-07-01 17:13:19 +02:00
Thorsten Eckel
7a965d7385 Pull Request #2637 - Add Rails 5 log to STDOUT env variable support (RAILS_LOG_TO_STDOUT). Huge thanks to @thegcat. 2019-07-01 17:10:17 +02:00
Lorenzo Milesi
fd21a49a41 Removed duplicate Mailing-List tag from postmaster match ui element, fixes #2639 2019-07-01 16:03:38 +02:00
Ryan Lue
4a1477b1ff Refactoring: Migrate history_test to RSpec 2019-06-28 15:07:14 +02:00
Ryan Lue
a1da3a27f9 Enable Lint/UselessAssignment cop. 2019-06-28 13:38:49 +02:00
Ryan Lue
7930ffdf03 Refactoring: Migrate session_basic_ticket_test to RSpec. 2019-06-28 11:10:05 +02:00
Thorsten Eckel
5c71350eb6 Bump spring from 2.0.2 to 2.1.0
Bumps [spring](https://github.com/rails/spring) from 2.0.2 to 2.1.0.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v2.0.2...v2.1.0)
2019-06-27 20:26:44 +02:00
Thorsten Eckel
83c77a4a35 Applied required changes to install and use PHP 5.6 for testing the Zammad PHP API client - until @jepf adds PHP 7 support (for tests). 2019-06-27 20:26:28 +02:00
Billy Zhou
29f96527a7 Fixed #2339 - Integer minimal is ignored. 2019-06-27 13:53:17 +02:00
Thorsten Eckel
7e113870a7 Bump rszr from 0.4.0 to 0.5.2
Bumps [rszr](https://github.com/mtgrosser/rszr) from 0.4.0 to 0.5.2.
- [Release notes](https://github.com/mtgrosser/rszr/releases)
- [Changelog](https://github.com/mtgrosser/rszr/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mtgrosser/rszr/compare/v0.4.0...v0.5.2)
2019-06-27 13:52:28 +02:00
Thorsten Eckel
1e54645223 Fixed issue #462 - Password hashing: upgrade to argon2 2.x (argon2id), fix non-unique salt bug - huge thanks to @martinvonwittich ! 2019-06-27 13:51:29 +02:00
Denny Bresch
4a142f307b Fixed #2624 - Concern 'CanLatestChange' returns wrong updated_at 2019-06-27 12:01:40 +02:00
Denny Bresch
812266b80e Fixed wrong score (range) for karma level Evangelist. 2019-06-27 11:01:11 +02:00
Billy Zhou
4d0c618baa Contributed by Lorenzo Milesi <maxxer@ufficyo.com>:
Fixed typo in timezone.coffee
2019-06-27 10:55:33 +02:00
Denny Bresch
5555043dbf Fixes #1561 - fix translation strings. 2019-06-25 14:16:45 +02:00
Denny Bresch
df657a3e96 Added DashboardStatsWidget help description. 2019-06-24 16:34:04 +02:00
Denny Bresch
95404e0fd8 Fixed typo in file and class name - form_handler_dependencies. 2019-06-24 16:31:05 +02:00
Denny Bresch
2d08316e36 Fixed issue #2615 - Misleading 'Escalation' ticket attribute name in SLAs, Scheduler and Trigger should be named 'Escalation_at'. 2019-06-24 16:29:47 +02:00
Felix Niklas
bc061bdf55 Contain tag-field inside sidebar, add max-height
Fixes #2570
2019-06-24 16:18:14 +02:00
Felix Niklas
a7a2a8b1f0 KB public: fix IE11 layout bug
It adds a wrapper element around the contents inside the body  to workaround the wrong height calculation bug in IE11 : https://github.com/philipwalton/flexbugs#flexbug-3
Additionally it fixes a text overflow bug in grid elements.
Fixes #2600
2019-06-24 16:15:38 +02:00
Billy Zhou
96f6d5e0e5 Contributed by Silsha Fux <hallo@silsha.me>
Update "Attached Files" string in knowledge base to use existing translation.
2019-06-24 11:32:43 +02:00
Ryan Lue
3ed8463e3e Refactoring: Clean up Ticket::Number & Ticket::Number::Increment classes 2019-06-24 11:30:02 +02:00
Ryan Lue
37393b26de Refactoring: Migrate ticket_number_test to RSpec 2019-06-24 11:30:02 +02:00
Ryan Lue
03b2456dd9 Fix migration (Nov 2018) which set a hash value on a boolean Setting 2019-06-24 11:30:02 +02:00
Billy Zhou
1bdab1c4aa Fixed issue #2593 - missing OTRS.png asset in Import Wizard 2019-06-24 10:08:27 +02:00
Martin Edenhofer
04d829c7e9 Fixes #2594 - Wrong date format in Excel Exports of reporting download. 2019-06-24 09:28:34 +02:00
Martin Edenhofer
bd5170b731 Fixes #2614 - Tree Select shows empty value in ticket zoom after submit when value contains trailing spaces. 2019-06-24 01:15:27 +02:00
Martin Edenhofer
af9fcf4565 Added support for elasticsearch 6 and 7. Fixes #1688. 2019-06-20 12:45:27 +02:00
Thorsten Eckel
9949dd18dc Fixed issue #2604 - Broken Edit-button in public KB interface for KB editors. 2019-06-13 13:56:42 +02:00
Denny Bresch
8b435e2295 Fixed issue #2599 - Activation of Knowledgebase is impossible on IE11 - agent interface 2019-06-13 11:27:32 +02:00
Martin Edenhofer
80294b0b51 Added knowledge base categories and answers to status monitoring. 2019-06-13 03:52:23 +02:00
Martin Edenhofer
84feacd816 Followup for issue #2541 - only update active jobs and triggers. 2019-06-13 02:07:09 +02:00
Thorsten Eckel
757af308a8 Maintenance: Use corresponding ES docker image tag. 2019-06-12 17:02:36 +02:00
Martin Edenhofer
7f8e268ae0 Cleanup of redirect to admin interface if user is only admin and no agent or customer (only one central place). 2019-06-07 23:00:25 +02:00
Martin Edenhofer
db531e66b3 Fixes issue #2516 - trigger email notification UI defective on removal of recipient. 2019-06-07 13:28:58 +02:00
Felix Niklas
c7d1b9d8d7 KB public UI: fix list layout - prevent icon from shrinking 2019-06-06 10:35:32 +02:00
Felix Niklas
a4bbe09a8c KB public UI: add overflow-ellipsis to placeholder 2019-06-06 10:30:45 +02:00
Felix Niklas
f34ce5c292 KB public UI: fix viewport size
- add viewport header
- adjust headline sizes for mobile
2019-06-06 10:26:42 +02:00
Felix Niklas
986285c216 Improved layout op public Knowledge Base:
- fix bug where search result title has to much spacing around (its a h3)
- remove border from h2
- size & spacing finetuning
- bigger spacing around hr
- add hr between categories and answers
2019-06-06 08:26:15 +02:00
Martin Edenhofer
b4dcfcc009 Updated changes to 3.1.0. 2019-06-06 03:59:38 +02:00
Martin Edenhofer
048ec05195 Updated version information. 2019-06-06 03:48:16 +02:00
Mantas Masalskis
97e3d0b4f0 Added KB icon modifiers to categories and answers in editor mode. 2019-06-06 03:23:45 +02:00
Martin Edenhofer
0244ac9a87 Small improvement to wording. 2019-06-06 02:13:49 +02:00
Mantas
19c222e7f3 KB answer-to-answer link slug wrong locale bugfix 2019-06-05 22:08:27 +03:00
Martin Edenhofer
110d60dd30 Improved wording. 2019-06-05 17:44:29 +02:00
Martin Edenhofer
97d14a93b3 Initial knowledge base support. 2019-06-04 05:40:48 +02:00
Felix Niklas
5d2398a3aa Fixes issue #2518 - Add missing icon file-text
The icon file-text is referenced from https://github.com/zammad/zammad/blob/develop/app/assets/javascripts/app/lib/mixins/view_helpers.coffee#L187 but didn't actually exist so far. It's grey version of the word icon.
2019-06-03 08:47:36 +02:00
Mantas Masalskis
48766c7db9 Maintenance: Fixed caching issue in authenticate_as spec helper and enhanced capabilities. 2019-05-31 09:54:38 +02:00
Thorsten Eckel
4767aa0771 Bump zendesk_api from 1.17.0 to 1.19.0
Bumps [zendesk_api](https://github.com/zendesk/zendesk_api_client_rb) from 1.17.0 to 1.19.0.
- [Release notes](https://github.com/zendesk/zendesk_api_client_rb/releases)
- [Changelog](https://github.com/zendesk/zendesk_api_client_rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zendesk/zendesk_api_client_rb/compare/v1.17.0...v1.19.0)
2019-05-29 14:43:16 +02:00
Thorsten Eckel
20f0e36741 Bump rubocop-rspec from 1.32.0 to 1.33.0
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.32.0 to 1.33.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.32.0...v1.33.0)
2019-05-29 14:21:36 +02:00
Thorsten Eckel
5cd906a6c9 Bump twilio-ruby from 5.22.2 to 5.23.0
Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.22.2 to 5.23.0.
- [Release notes](https://github.com/twilio/twilio-ruby/releases)
- [Changelog](https://github.com/twilio/twilio-ruby/blob/master/CHANGES.md)
- [Commits](https://github.com/twilio/twilio-ruby/compare/5.22.2...5.23.0)
2019-05-29 14:06:46 +02:00
Thorsten Eckel
d42a588d9e Bump coveralls from 0.8.22 to 0.8.23
Bumps [coveralls](https://coveralls.io) from 0.8.22 to 0.8.23.
2019-05-29 14:06:05 +02:00
Thorsten Eckel
cb4e45478c Bump test-unit from 3.3.2 to 3.3.3
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.2...3.3.3)
2019-05-29 14:00:22 +02:00
Thorsten Eckel
005e88afbe Bump selenium-webdriver from 3.142.0 to 3.142.3
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.0 to 3.142.3.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)
2019-05-29 10:06:50 +02:00
Billy Zhou
4f44edcd8f Fixed #2510 - Zammad Customers shown as Agents in IE. 2019-05-29 10:03:55 +02:00
Thorsten Eckel
e27079f0a0 Bump capybara from 2.18.0 to 3.21.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.18.0 to 3.21.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/2.18.0...3.21.0)
2019-05-28 18:57:15 +02:00
Ryan Lue
2ac28bf906 Fix auto-correctable rubocop offenses in test suite 2019-05-28 15:07:19 +08:00
Billy Zhou
e907c13cbe Ticket zoom: increased double-click/metaToggle timeout (fixes #2586) 2019-05-24 15:34:39 +02:00
Billy Zhou
5caaaeb2bd Use $server_name instead of hardcoded domain. 2019-05-24 11:48:43 +02:00
Martin Edenhofer
cd896bc6e1 Skip user ticket counter background jobs on import. 2019-05-23 15:34:01 +02:00
Ryan Lue
73472484a9 Rephrase GitLab MR template to encourage more complete reporting 2019-05-23 14:23:11 +02:00
Martin Edenhofer
b209b0ca57 Delay search index background jobs on error. 2019-05-23 14:03:42 +02:00
Martin Edenhofer
049adbe469 Improved spine stopListeningTo() - In certain cases (e. g. http://localhost:3000/#knowledge_base/1/locale/en-us/edit just change the title and submit) a Uncaught TypeError: Cannot read property 'obj' of undefined is raised. The reason is that listeningToOnce is an empty array. 2019-05-20 16:12:40 +02:00
Martin Edenhofer
dd1a6c30fc Fixed issue #2574 - Every night tickets are updated (system need to use SLAs). 2019-05-20 14:18:15 +02:00
Thorsten Eckel
1fd0e82254 Maintenance: Increased encoding detection timeout because of ZombieLoad CPU limitating mitigations. 2019-05-20 11:42:25 +02:00
Thorsten Eckel
f3862de9fc Fixed bug: received_merge Ticket history entry has timestamp of previous history entry. 2019-05-20 11:41:28 +02:00
Thorsten Eckel
d44b5afd19 Fixed bug:
- Migration gets executed unnecessarily on newly installed systems.
- Migration looks for `changed_at` column which should be `updated_at` instead.
- Migration removes `limit: 3` on `created_at` timestamp colums (MySQL millisecond support).
2019-05-20 11:37:34 +02:00
Martin Edenhofer
9775af5e98 Improved error handling if proposed calendar is not valid. 2019-05-20 11:22:36 +02:00
Martin Edenhofer
6ae6ee44ba Let tests work correctly even if calendar based escalations is calculated over midnight. 2019-05-14 15:34:41 +02:00
Ryan Lue
2ca17b913f Refactoring: Migrate email_process_follow_up_test to RSpec 2019-05-13 11:29:49 +02:00
Ryan Lue
7a79f97bb9 Refactoring: Migrate email_process_out_of_office_test to RSpec 2019-05-13 11:23:20 +02:00
Ryan Lue
3b1e51c789 Refactoring: Migrate email_process_state_open_test to RSpec 2019-05-13 11:10:36 +02:00
Billy Zhou
d4b0d953d0 Fixed CI failures on Circle CI introduced by commit 8f04e32. This is a follow-up to original issue #2534 - Agents should always be able to re-open closed tickets, regardless of group.follow_up_possible. 2019-05-06 07:46:47 +02:00
Martin Edenhofer
c16c86e99e Skip overview in list if overview was deleted in the meantime (race condition). 2019-05-02 11:08:25 +02:00
Martin Edenhofer
1e745f00d8 Fixes issue #2554 - Downloading of emails via IMAP takes longer as one minute. E-Mail seems to be lost. 2019-04-30 15:45:01 +02:00
Martin Edenhofer
5e522f4276 Improved logging - do not log article.body and body. 2019-04-30 09:47:02 +02:00
Martin Edenhofer
34037219b7 Fixed issue #2552 - Apply changes (updated or if channel is deleted) to email channel even if channel is already fetching emails. 2019-04-30 09:27:32 +02:00
Thorsten Eckel
44adbd03b9 Bump twilio-ruby from 5.22.1 to 5.22.2
Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.22.1 to 5.22.2.
- [Release notes](https://github.com/twilio/twilio-ruby/releases)
- [Changelog](https://github.com/twilio/twilio-ruby/blob/master/CHANGES.md)
- [Commits](https://github.com/twilio/twilio-ruby/compare/5.22.1...5.22.2)
2019-04-25 12:24:34 +02:00
Thorsten Eckel
802e5f88ad Bump selenium-webdriver from 3.141.5926 to 3.142.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.141.5926 to 3.142.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)
2019-04-24 16:39:36 +02:00
Thorsten Eckel
013b0d82e9 Bump sassc-rails from 2.1.0 to 2.1.1
Bumps [sassc-rails](https://github.com/sass/sassc-rails) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/sass/sassc-rails/releases)
- [Commits](https://github.com/sass/sassc-rails/compare/v2.1.0...v2.1.1)
2019-04-24 14:15:22 +02:00
Rolf Schmidt
60715c36c6 Updated nokogiri gem (CVE-2019-11068). 2019-04-23 16:54:04 +02:00
Thorsten Eckel
dd2c602cff Bump selenium-webdriver from 3.141.0 to 3.141.5926
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.141.0 to 3.141.5926.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)
2019-04-18 15:48:24 +02:00
Billy Zhou
8f04e32079 Closes #2531 which fixes #2534 - Agents should always be able to re-open closed tickets, regardless of group.follow_up_possible - huge thanks to @martinvonwittich! 2019-04-18 15:01:21 +02:00
Thorsten Eckel
7919f341ff Maintenance: Don't sync dependabot CI MR branches to GitHub. 2019-04-18 10:21:10 +02:00
Thorsten Eckel
f2592cb632 Bump telephone_number from 1.3.4 to 1.4.0
Bumps [telephone_number](https://github.com/mobi/telephone_number) from 1.3.4 to 1.4.0.
- [Release notes](https://github.com/mobi/telephone_number/releases)
- [Commits](https://github.com/mobi/telephone_number/compare/v1.3.4...v1.4.0)
2019-04-18 09:05:17 +02:00
Thorsten Eckel
b6f277c97b Follow up - 6839f040e0 - Fixed bug: Failed jobs get executed more times than configured. 2019-04-18 08:19:58 +02:00
Ryan Lue
093d8e4722 KB Prep: Backport changes that generalize implementation of Links in FE 2019-04-17 20:45:51 +02:00
Ryan Lue
b96fb53a71 Refactoring: Migrate ticket_xss_test to RSpec 2019-04-17 11:22:32 +02:00
Martin Edenhofer
8a6ffc23cb Fixed issue #2059 - Incorrect display count of a report profile if tree_select is used. 2019-04-17 08:26:26 +02:00
Ryan Lue
4cd36cb200 Refactoring: Migrate auto_wizard_test to RSpec 2019-04-16 16:35:23 +02:00
Thorsten Eckel
5283da9f4f Bump rubocop-performance from 1.0.0 to 1.1.0
Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.0.0...v1.1.0)
2019-04-16 13:21:18 +02:00
Thorsten Eckel
864a7c6cf2 Bump test-unit from 3.3.0 to 3.3.2
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.0 to 3.3.2.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.0...3.3.2)
2019-04-16 13:15:43 +02:00
Thorsten Eckel
a2243693a7 Bump rails from 5.1.6.2 to 5.1.7
Bumps [rails](https://github.com/rails/rails) from 5.1.6.2 to 5.1.7.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.1.6.2...v5.1.7)
2019-04-16 13:14:32 +02:00
Thorsten Eckel
4f125ff747 Bump factory_bot_rails from 5.0.1 to 5.0.2
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.0.1...v5.0.2)
2019-04-16 13:12:33 +02:00
Thorsten Eckel
d562eb860b Bump twilio-ruby from 5.21.2 to 5.22.1
Bumps [twilio-ruby](https://github.com/twilio/twilio-ruby) from 5.21.2 to 5.22.1.
- [Release notes](https://github.com/twilio/twilio-ruby/releases)
- [Changelog](https://github.com/twilio/twilio-ruby/blob/master/CHANGES.md)
- [Commits](https://github.com/twilio/twilio-ruby/compare/5.21.2...5.22.1)
2019-04-16 13:11:04 +02:00
Thorsten Eckel
a355f776d7 Bump autoprefixer-rails from 9.5.0 to 9.5.1
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.5.0 to 9.5.1.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/9.5.0...9.5.1)
2019-04-16 12:16:54 +02:00
Ryan Lue
c4ea7cdae6 Refactoring: Migrate user_device_test to RSpec 2019-04-16 11:20:41 +02:00
Billy Zhou
3c5d274575 Fixed #2539 - search pagination broken in users_controller.rb 2019-04-16 11:14:19 +02:00
Thorsten Eckel
9373a42944 Maintenance: After server change IPv6 is enabled on test host which will cause a different error to be thrown. 2019-04-12 15:43:28 +02:00
Ryan Lue
cc33feee40 👮 Crack down on style violations with rubocop-rspec 🚓 2019-04-12 12:58:15 +02:00
Ryan Lue
6613b07143 Refactoring: Migrate ticket_article_dos_test to RSpec 2019-04-11 17:12:59 +02:00
Ryan Lue
545339fe8e Replace :application_handle spec helper with ApplicationHandleInfo.use method 2019-04-11 17:12:59 +02:00
MrGeneration
e6697cdd21 Make sure that restoration script sets correct rights on files
These changes ensure that, no matter if migrating from a online instance or importing some other Zammad-Export, that the filesystem rights on the Zammad-Directory are always correct.

We're using fixed user "zammad" here, the Backup-Documentation needs enhancement and will hold a warning for this to ensure, other users don't crash here.
2019-04-11 09:36:24 +02:00
Martin Edenhofer
e26db17d75 Table: add no-side-padding class
used in priority column to make the column slimmer
2019-04-11 07:23:35 +02:00
Ryan Lue
a32f5bb01c Refactoring: Migrate job_test to RSpec 2019-04-10 17:50:01 +02:00
Ryan Lue
cdf4eaf92a Fix Issue 2541 migration spec (prevent leaky test setup) 2019-04-10 17:50:00 +02:00
Ryan Lue
00934ef4f4 Refactoring: Clean up SignatureDetection class 2019-04-10 14:39:13 +02:00
Ryan Lue
eb97516bfc Refactoring: Migrate signature_detection_test to RSpec 2019-04-10 14:39:13 +02:00
Jens Pfeifer
4b97d9e5d0 Added .editorconfig file 2019-04-10 11:05:51 +02:00
Felix Niklas
6f67f417ee Clock widget: render sharp on retina (support devicePixelRatio) 2019-04-09 15:54:12 +02:00
Ryan Lue
74e1fa8722 Refactoring: Migrate ticket_escalation_test to RSpec 2019-04-09 14:17:27 +02:00
Martin Edenhofer
48cccd186b Removed unless code. 2019-04-09 12:18:59 +02:00
Martin Edenhofer
668e272cfd Fixed issue #2541 - Existing scheduler email notification without body will raise an exception. 2019-04-09 11:30:43 +02:00
Ryan Lue
9a0df2729b Refactoring: Migrate {ticker,user}_ref_object_touch_test to RSpec 2019-04-08 13:48:19 +08:00
Martin Edenhofer
a11fb318d4 Use image preview in sidebar attachments list. 2019-04-08 02:19:05 +02:00
Martin Edenhofer
04c1cf2fb9 Followup for commit b1b137bb0d - verify if object manager attribute exists for user only (not locale for any other object). 2019-04-08 00:11:11 +02:00
Martin Edenhofer
ffd7ae99b1 Fixes issue #2530 - Not used SQL index with PostgreSQL in certain cases on very large setups. 2019-04-07 17:23:03 +02:00
Thorsten Eckel
44e9e04949 Maintenance: Updated rubocop to latest version (0.67.2). 2019-04-07 15:45:46 +02:00
Thorsten Eckel
fcd0708e9a Fixed bug: Auto reloading in development Rails env is broken. 2019-04-07 14:10:09 +02:00
Thorsten Eckel
55bbda9969 Refactoring: Unused code from development phase slipped into final merge. 2019-04-07 14:10:09 +02:00
Martin Edenhofer
57b17f7b81 Small memory footprint improvements. 2019-04-07 07:46:29 +02:00
Martin Edenhofer
13854f7fa7 Improved message_id generation (more random). 2019-04-05 18:18:34 +02:00
Martin Edenhofer
b6093930e3 Improved error handling. 2019-04-05 18:13:37 +02:00
Martin Edenhofer
8e25338a11 Improved inline documentation. 2019-04-05 18:12:10 +02:00
Mantas Masalskis
15687b8609 Fixed bug; Popover getting rendered multiple times and/or stuck. 2019-04-05 14:18:55 +02:00
Ryan Lue
6393e398c1 Refactoring: Migrate email_process_customer_selection_based_on_sender_recipient_test to RSpec 2019-04-05 14:13:59 +02:00
Ryan Lue
f702b34891 Refactoring: Migrate ticket_owner_reset_on_follow_up_test to RSpec 2019-04-04 20:54:41 +08:00
Ryan Lue
b65a84f95e Refactoring: Migrate email_process_follow_up_possible_test to RSpec 2019-04-03 16:15:55 +08:00
Ryan Lue
d3bbdd3b00 Refactoring: Migrate organization_ref_object_touch_test to RSpec 2019-04-02 22:43:11 +08:00
Ryan Lue
6fd6af9e75 GitLab: Add "Default" Merge Request template 2019-04-01 16:04:12 +02:00
Ryan Lue
b1b137bb0d KB Prep: Refactor & backport User#locale method 2019-04-01 09:22:29 +02:00
Mantas
b3f636a5d1 SearchableSelect retains visible text to indicate that value wasn't cleared 2019-04-01 09:48:35 +03:00
Ryan Lue
914f2f313f Refactoring: Migrate ticket_state_change to RSpec 2019-04-01 08:39:38 +02:00
Thorsten Eckel
153032e82f Follow up - 444e48e377 - Obsolete ObjectManager::Attribute data_option missing :diff option fails migration. 2019-03-28 15:03:55 +01:00
Ryan Lue
969012584a Refactoring: Migrate permission_test to RSpec 2019-03-28 08:22:40 +01:00
Felix Niklas
1870081022 Refactor ticket list
- user ticket list popover: ticket → customer → tickets
- ticket link list
- user & organization profile

now use: `generic/ticket_list.jst.eco` instead of copies of it.

Template options:
- tickets: list of tickets
- (optional) object: for example ‘Ticket’ or ‘KnowledgeBase:Answer’; needed for deletion; activates the delete UI
- (optional) linkType: defaults to ‘normal’; is additional info for deletion
2019-03-27 17:04:36 +01:00
Billy Zhou
30d3ce2b88 Upgrade mail gem from 2.6.6 to 2.7-stable to solve 4 issues:
#2362 - Attached text files get prepended on e-mail reply instead of appended
#2507 - PDF Attachments are corrupted into blank pages
#2458 - Zammad fails to parse filename\* in Content-Disposition header of attachment
#2499 - eml-File Attachments will be destroyed by zammad
2019-03-27 13:02:56 +01:00
Martin Edenhofer
3acfa4a277 Fixed issue #2089 - timezone issue with report graphs not displaying or displaying $timezone hours out of step. 2019-03-27 10:01:36 +01:00
Thorsten Eckel
8f30c37ddf users_controller.rb: removed useless Ticket.search from def search
The Ticket.search block was accidentally copypasted here in
cf16264940 and serves no purpose; its return
value isn't actually used anywhere afterwards.
2019-03-27 08:34:56 +01:00
Ryan Lue
296f37ef23 Refactoring: Clean up User.authenticate spec 2019-03-26 15:43:31 +01:00
Ryan Lue
33c44d3486 Refactoring: Migrate auth_test to RSpec 2019-03-26 15:43:31 +01:00
Ryan Lue
a2148ecc68 Knowledge Base Prep: Backport bugfix for cache key writing race condition in SearchableAjaxSelect 2019-03-26 15:41:03 +01:00
Ryan Lue
48352ece6d Extract CoffeeScript view helper methods into their own mixin 2019-03-26 15:39:45 +01:00
Ryan Lue
17fd53f175 Refactoring: Migrate email_process_sender_name_update_if_needed to RSpec 2019-03-26 15:37:38 +01:00
Ryan Lue
5b06840b33 Refactoring: Migrate user_out_of_office_test to RSpec 2019-03-26 15:29:42 +01:00
Ryan Lue
97530e0d78 Refactoring: Migrate stats_ticket_waiting_time_test to RSpec 2019-03-26 15:27:11 +01:00
Thorsten Eckel
9d7485bf71 Maintenance: Run more tests with random DB services to increase overall CI speed and ensure independence of DB layer. 2019-03-26 10:56:21 +01:00
Thorsten Eckel
c7f8045569 Refactoring: Created generic UploadCache class, controller and routes to handle attachment upload. 2019-03-26 08:37:15 +01:00
Martin Edenhofer
f5b671729d Fixed issue #2089 - timezone issue with report graphs not displaying or displaying $timezone hours out of step. 2019-03-26 01:46:09 +01:00
Thorsten Eckel
50ca3cde9c Maintenance: Run browser tests for random DB service. 2019-03-26 01:26:59 +01:00
Martin Edenhofer
f72b44234e Fixed issue #2089 - timezone issue with report graphs not displaying or displaying $timezone hours out of step. 2019-03-26 01:17:17 +01:00
Thorsten Eckel
a1bb61bf56 Maintenance: Fixed cache test that is error prone to timezone DST changes. 2019-03-25 18:41:40 +01:00
Felix Niklas
eb9767278d Common style for radios & checkboxes 2019-03-25 13:58:52 +01:00
Thorsten Eckel
d998f36f11 Updated rubocop to latest version (0.66). 2019-03-18 10:37:45 +01:00
Thorsten Eckel
e75419d40b Bugfix: Missing brackets causes calendar_subscriptions layout_ref to not render properly. 2019-03-15 12:10:37 +01:00
Thorsten Eckel
e3d2192210 Refactoring: Prefer Rails fixture_file_upload helper method instead of using Rack::Test::UploadedFile (directly). 2019-03-15 11:48:09 +01:00
Thorsten Eckel
d5bf8a533c Fixed regression: Newly created ObjectManager::Attribute::Validation breaks Spring because of already/auto loaded constants. 2019-03-15 11:04:57 +01:00
Thorsten Eckel
4e07079056 Follow up - 444e48e377 - Removed future and past data_options of Date ObjectManager::Attribute because they are not determinable due to time zones. 2019-03-15 11:04:57 +01:00
Martin Edenhofer
2ccda12cc2 Added ObjectManager::Attribute count to monitoring status result. 2019-03-14 16:31:56 +01:00
Martin Edenhofer
124d979e44 Fixes issue #2514 - Zammad Webcam-Avatar-Feature broken. 2019-03-14 15:24:44 +01:00
Ryan Lue
17ed0a13f6 Refactoring: Migrate user_mail_delivery_failed to RSpec 2019-03-14 14:01:29 +01:00
Thorsten Eckel
444e48e377 Fixed issues #1259 and #1598 by adding ObjectManager::Attribute validations. 2019-03-14 00:51:22 +01:00
Martin Edenhofer
e579c809e0 Update to rails 5.1.6.2 - CVE-2019-5419. 2019-03-13 22:42:47 +01:00
Billy Zhou
f080a144e0 Fixed #2483 - #{article.body_as_html} now includes attachments (e.g. PDFs). Fixes #2487 - Forwarding: Attachment is missing if original HTML Mail contains an image. 2019-03-11 18:17:08 +01:00
Thorsten Eckel
2f0f01a0d0 Maintenance: Fixed inconsistent usage of Setting html_email_css_font. 2019-03-11 14:35:12 +01:00
Ryan Lue
b19ac485bf Refactoring: Migrate email-process unit sub-tests to RSpec. 2019-03-11 08:28:18 +01:00
Ryan Lue
92d7ee95e0 Knowledge Base Prep: Reduce priority of Organizations in search results (so KB results appear above them) 2019-03-07 11:56:17 +01:00
Martin Edenhofer
160b521116 Fixes issue #2497 - Missing business hours validation for calendars creates infinitive loop (also for background jobs). 2019-03-07 10:00:56 +01:00
Ryan Lue
2367e1e31c KB Prep: Added App.Utils.baseUrl() and .joinUrlComponents() helper functions. 2019-03-07 09:39:16 +01:00
Thorsten Eckel
30361f1bb1 Maintenance: Go back to Selenium version 3.14.0-p19 because of failing CI jobs until https://github.com/elgalu/docker-selenium/issues/296 is resolved. 2019-03-07 09:31:55 +01:00
Ryan Lue
bb20ca6d92 Knowledge Base Prep: Prevent potential conflict from HTML elements with identical IDs 2019-03-06 22:27:44 +08:00
Martin Edenhofer
9ebf4697bb Do not log base64 encoded attachments in logfile. 2019-03-05 13:42:34 +01:00
Martin Edenhofer
cdb4042961 Fixes issue ##2504 - Login into Zammad not possible, application server puma will raise 100% or more cpu. 2019-03-05 03:52:54 +01:00
Ryan Lue
909f4b7eaf Refactoring: Migrate email_regex_test to RSpec 2019-03-04 15:32:34 +01:00
Ryan Lue
365e8db792 Knowledge Base Prep: Rescue DeleteRestrictionError with 422 Unprocessable Entity 2019-03-01 05:26:53 +01:00
Ryan Lue
bf4e1c19c6 Knowledge Base Prep: Fix name attr on tag name input field 2019-03-01 03:02:18 +01:00
Martin Edenhofer
922309b2b5 Improved after_callbacks and skip_callback behaviour on bulk changes (e. g. CSV import). 2019-02-28 15:21:59 +01:00
Ryan Lue
5b64aeb14d Implement @current method in App.User, and replace throughout codebase where appropriate. 2019-02-28 12:42:05 +01:00
Ryan Lue
9e0d535483 Update App.Session.get() method to use direct pointer to current user record 2019-02-28 09:04:56 +01:00
Martin Edenhofer
94513f4f38 Updated puma and unicorn gem to use current stable version. 2019-02-27 16:03:29 +01:00
Martin Edenhofer
a3ed795e09 Fixed import test. 2019-02-27 15:14:38 +01:00
Martin Edenhofer
ace7cea315 Refactoring: Applied factory best practices (only required attributes and values, proc based attribute assignment, sequence attribute). 2019-02-27 14:02:16 +01:00
Martin Edenhofer
d36c88d441 Fixed flanky job test. 2019-02-26 15:49:05 +01:00
Thorsten Eckel
a679c713a8 Maintenance: Gem dependency psych update causes encoding issue to be fixed. Changed test case to ensure special unicode chars are handled properly. 2019-02-26 14:42:46 +01:00
Thorsten Eckel
0fe24ab1b7 Maintenance: Updated delayed_job and delayed_job_active_record gem dependency because of usage of deprecated method which breaks rails after rubocop update - see https://github.com/rails/rails/issues/30522 and https://github.com/collectiveidea/delayed_job/pull/996 . 2019-02-26 14:42:46 +01:00
Thorsten Eckel
d2b6bff74d Maintenance: Updated rubocop to latest version (0.65). 2019-02-26 14:42:46 +01:00
Billy Zhou
399fef668d Refactoring: Simplyfied if statement and removed reference to issue #2431 because it's more of a byproduct than an actual fix. 2019-02-26 14:28:11 +01:00
Thorsten Eckel
fa0ed8c0ba Refactoring: Improve browser test suite speed by starting ruby/rails context only once for all tests by using Rails build in test running rake task. 2019-02-26 13:01:27 +01:00
Ryan Lue
ca73fdd9b7 Refactoring: Migrate *_assets_test.rb to RSpec 2019-02-26 12:00:46 +01:00
Jens Pfeifer
e48256c130 Refactoring: Removed use of unnecessary exception wrapper method response_access_deny. 2019-02-26 11:37:31 +01:00
Ryan Lue
4f494b57ac Extract renderScreen* methods into their own mixin 2019-02-26 11:27:48 +01:00
Billy Zhou
c9f3641cad pr2480 - Added Finnish translation to the chat UI. Huge thanks to @ismism48! 2019-02-25 15:53:02 +01:00
Martin Edenhofer
8831b57b9b Remove model-open class if App.ControllerModalLoading class is used without container. 2019-02-25 13:04:45 +01:00
Martin Edenhofer
12eb5381b0 Fixes #2491 - Email is not processed if attachement as "space" as filename like Content-Disposition: inline; filename="=?utf-8?b??=". 2019-02-24 15:53:58 +01:00
Thorsten Eckel
d10df2b03b Update pkgr.yml for consensisty with Ubuntu 18.04
This patch updates pkgr.yml as it seems to be inconsistent.
Ubuntu 18.04 is currently the only system missing "- libimlib2-dev" for installation dependency and "- libimlib2" for build dependency.
This looks wrong.

If you don't install libimlib2-dev manually, zammad will not start cleanly.
2019-02-24 12:15:43 +01:00
Martin Edenhofer
43d2418377 Fixes #2486 - Unable to process email on CentOS with large images but only 1px height. 2019-02-22 08:22:52 +01:00
Billy Zhou
6d7480ab3f Added new feature from issue #2469 - Add information "Ticket merged" to History 2019-02-21 06:32:21 +01:00
Ryan Lue
89385aaca6 Refactoring: Migrate search_index_backend_test to RSpec 2019-02-20 14:04:42 +01:00
Ryan Lue
c5afbaba00 Refactoring: Migrate Cti::Log test cases in cti_caller_id_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
2dd4c74be4 Refactoring: Migrate seventh test case in cti_caller_id_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
84d0bf605b Refactoring: Migrate sixth test case in cti_caller_id_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
a95c4e988d Refactoring: Migrate fifth test case in cti_caller_id_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
d425b0fd19 Refactoring: Migrate fourth test case in cti_caller_id_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
768a350160 Refactoring: Clean up ticket/article_spec.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
c02d7f2159 Refactoring: Clean up user_spec.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
590a8f7614 Refactoring: Migrate third test case in cti_caller_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
39f769aa13 Refactoring: Migrate second test case in cti_caller_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
9bb1edea69 Refactoring: Migrate first test case in cti_caller_test.rb 2019-02-20 14:02:18 +01:00
Ryan Lue
44822d5483 Refactoring: Add example descriptions to existing Cti::CallerId spec 2019-02-20 14:02:18 +01:00
Rolf Schmidt
6839f040e0 Refactoring: Migrated Observer::Ticket::Article::CommunicateEmail::BackgroundJob (Delayed::Job) to TicketArticleCommunicateEmailJob (ActiveJob). 2019-02-20 12:18:47 +01:00
Thorsten Eckel
ff0330d5c7 Fixes issue #2464: Mails send by older mailers with x-uuencode Content-Transfer-Encoding of attachments are not processable. 2019-02-20 12:07:09 +01:00
Ryan Lue
755c8afb6e Refactoring: Migrate notification_factory_slack_template_test to RSpec 2019-02-20 12:05:35 +01:00
Ryan Lue
d281c1b177 Refactoring: Migrate ticket_customer_organization_update_test to RSpec 2019-02-20 09:30:10 +01:00
Ryan Lue
b045381d2d Remove debugging cruft (call to console.log) 2019-02-20 16:06:38 +08:00
Ryan Lue
93d2a6a76f Refactoring: Migrate migration_ror_42_to50_store_test to RSpec 2019-02-20 00:34:45 +01:00
Ryan Lue
45effb93fb Refactoring: Migrate token_test to RSpec 2019-02-19 22:03:23 +01:00
Ryan Lue
31adff6a42 Refactoring: Migrate ticket_article_time_accounting_test to RSpec 2019-02-19 22:02:44 +01:00
André Bauer
94536705e6 Merge pull request #2480 from ismism48/patch-1
Finnish translation to the chat
2019-02-19 15:25:29 +01:00
ismism48
64b015c1a5 Finnish translation to the chat
Added Finnish translation of the chat UI
2019-02-19 15:01:23 +02:00
Ryan Lue
0ab78d9f1c Refactoring: Migrate ticket_state_test to RSpec 2019-02-19 08:59:10 +01:00
Martin Edenhofer
9637d1200e Improved error handling for assets if recored got deleted in meantime. 2019-02-19 07:04:46 +01:00
Martin Edenhofer
3e50a06306 Improved content type detection for image preview of attachments. 2019-02-19 07:03:48 +01:00
Martin Edenhofer
5b24e7beaf Fixed typo. 2019-02-18 17:03:54 +01:00
Martin Edenhofer
10c47b6898 Fixed test result. 2019-02-18 15:34:13 +01:00
Martin Edenhofer
4dcc82a01a Improved error handling if ticket got deleted in the meantime. 2019-02-18 11:46:36 +01:00
André Bauer
6aa189ee09 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2019-02-15 17:34:51 +01:00
André Bauer
9005dc3463 use develop branch for build badge 2019-02-15 17:34:07 +01:00
Martin Edenhofer
76a4b66417 Fixes issue #2478 - Unable to update ticket with IE11. 2019-02-15 16:45:48 +01:00
Martin Edenhofer
20104e9b2e Updated to 2.10.0. 2019-02-14 08:40:32 +01:00
Martin Edenhofer
a2447fe4e3 Enabled debian 8 for packager.io again. 2019-02-14 06:57:28 +01:00
Martin Edenhofer
5dedd6ecfc Implemented preview feature as default feature. 2019-02-14 06:42:41 +01:00
André Bauer
11b0d4d286 fixed docker image build hook path 2019-02-13 10:52:33 +01:00
André Bauer
17acd8f992 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2019-02-12 12:39:38 +01:00
André Bauer
413d8eb03b fixed docker repo
Signed-off-by: André Bauer <andre.bauer@kiwigrid.com>
2019-02-12 12:39:03 +01:00
Thorsten Eckel
f106ad0ef0 Improved header handling. 2019-02-12 11:23:55 +01:00
André Bauer
de15ce2cdf Merge remote-tracking branch 'monotek/develop' into develop 2019-02-12 11:19:24 +01:00
Martin Edenhofer
dabce01ec2 Sanitize html for note fields of tickets, users and organizations. 2019-02-12 08:38:59 +01:00
Ryan Lue
f28cd627f8 Refactoring: Migrate notification_factory_template_test.rb to RSpec 2019-02-12 07:46:04 +01:00
André Bauer
06e1bb94dd removed exit 0 from install.sh
Signed-off-by: André Bauer <monotek23@gmail.com>
2019-02-11 23:23:25 +01:00
André Bauer
7e93c1969f fixed build badge
Signed-off-by: André Bauer <monotek23@gmail.com>
2019-02-11 22:16:41 +01:00
André Bauer
d16a5a98bd removed travis ci
Signed-off-by: André Bauer <monotek23@gmail.com>
2019-02-11 22:11:38 +01:00
André Bauer
6dc34f4f76 added circle ci
Signed-off-by: André Bauer <monotek23@gmail.com>
2019-02-11 22:05:28 +01:00
Thorsten Eckel
575606981b Updated rubocop to latest version (0.64). 2019-02-11 17:55:20 +01:00
Rolf Schmidt
b370975a01 Refactoring: Migrated Observer::Sla::TicketRebuildEscalation::BackgroundJob from Delayed::Job to Active Job. 2019-02-11 14:54:22 +01:00
Ryan Lue
b3cb67836d Refactoring: Migrate email_address_test.rb to RSpec 2019-02-11 08:46:48 +01:00
Ryan Lue
7639ef46d3 Refactoring: Migrate object_type_lookup_test.rb to RSpec 2019-02-11 08:46:26 +01:00
Ryan Lue
107fd5e995 Refactoring: Migrate ticket_article_store_empty to RSpec 2019-02-10 13:24:22 +01:00
Martin Edenhofer
63214c9327 Fixes #1589 - No localised time displayed in trigger (autoreply/slack/...) notifications. 2019-02-10 12:01:38 +01:00
Billy Zhou
487f36a5a5 Fixed #2399 - Attached images are broken on trigger reply with #{article.body_as_html} 2019-02-10 09:40:55 +01:00
Billy Zhou
f7a59c6bbd Fixed #2242, required attribute not being enforeced, for the frontend only. 2019-02-06 10:56:15 +08:00
Ryan Lue
8e52cb52a8 Remove unneeded options on ApplicationModel shared examples 2019-02-05 09:45:56 +01:00
Mantas
8d84bbb0a6 ControllerModal gets method for displaying inline alerts 2019-02-05 06:36:33 +01:00
Billy Zhou
0b472fae67 Follow up to #2456 - removed unnessary call to Mail::Encodings.value_decode and corrected test cases 2019-02-05 12:13:02 +08:00
Martin Edenhofer
d6d4b6bee4 Fixed test results with new rspec factories behaviour (now groups will have email addresses which will generate auto responder per default now). 2019-02-04 17:43:56 +01:00
Billy Zhou
d09c9c606d Fixed browser CI tests by downgrading selenium docker image to use older Firefox 64 2019-02-04 19:04:57 +08:00
Ryan Lue
a4281154d1 Fix CI failure in Ticket::Article request spec caused by limiting agent_user groups 2019-02-04 17:44:36 +08:00
Ryan Lue
9f33ca5c0a Fix EmailAddress dependency issue in Ticket factory 2019-02-04 07:56:18 +01:00
Ryan Lue
85d6d78eea Fix test failures caused by faulty id generator in ChecksImport examples 2019-02-04 07:54:39 +01:00
André Bauer
27d027773e removed travis ci addon postgres 9.4 2019-02-01 23:07:15 +01:00
André Bauer
5d044ee3b8 final travis ci mysql fix
Signed-off-by: André Bauer <monotek23@gmail.com>
2019-02-01 22:30:43 +01:00
André Bauer
82c080263f next try to fix travsi mysql
Signed-off-by: André Bauer <monotek23@gmail.com>
2019-02-01 21:10:07 +01:00
André Bauer
7c6b7d1ec5 fixed travis mysql-server install
Signed-off-by: André Bauer <monotek23@gmail.com>
2019-02-01 20:54:38 +01:00
Chikachi
2d5fc012cb Added Danish translations to chat. Huge thanks to @Chikachi! 2019-01-30 19:23:31 +08:00
Martin Edenhofer
18978ee7fe Fixed typo in ticket perform widget. 2019-01-30 11:19:46 +01:00
Thorsten Eckel
1e25d2804d Merge branch 'develop' of https://github.com/zammad/zammad into develop 2019-01-30 10:42:11 +01:00
anuzhin
1dada055ce Fixed issue #2439 - Import 'On-hold' status 2019-01-30 10:38:48 +01:00
Billy Zhou
a68f307a23 Revert "Added Danish translations to Chat (#2450)" (#2459)
This reverts commit 016e74b058.
2019-01-30 14:49:26 +08:00
Chikachi
016e74b058 Added Danish translations to Chat (#2450)
Thanks a lot to @Chikachi 😍!
2019-01-30 14:26:58 +08:00
Billy Zhou
84ff625257 Fixed #2456 - parsing utf8 encoded email subject 2019-01-30 07:12:12 +01:00
Martin Edenhofer
4a67fcd10b Fixes #2422 - Browser resize for pasted images is not resizing the image in edit view. 2019-01-30 00:34:09 +01:00
Martin Edenhofer
a17137c4a5 Improved email processing - added error/timeout handling. 2019-01-29 21:35:22 +01:00
Martin Edenhofer
295e67cb6f Fixes #2454 - Missing validation for trigger.notification.* at Model/API/REST level. 2019-01-29 15:04:47 +01:00
Martin Edenhofer
37d4abc6dd Improved error handling and performance of escalation rebuild_all. 2019-01-29 12:01:56 +01:00
Martin Edenhofer
233198ffd6 WIP. 2019-01-29 08:32:43 +01:00
Martin Edenhofer
3e0f5caffe Improved error handling if ticket already got deleted in the meantime. 2019-01-29 08:22:35 +01:00
Ryan Lue
8275b56d54 Wrap ChecksImport spec examples in a single describe block (for clearer spec report output) 2019-01-29 08:09:29 +01:00
Ryan Lue
205a99c56a Fix checks_import_examples.rb when applied to non-importable classes 2019-01-29 08:09:29 +01:00
Martin Edenhofer
2cf614d302 Fixes #2452 - Slow UI with over 150 ticket attributes. 2019-01-29 08:06:47 +01:00
Ryan Lue
46615333f9 Refactoring: Eliminate explicit coupling of classes in ChecksImport concern 2019-01-28 21:57:58 +08:00
Billy Zhou
7df5c18182 Fixed #2437 - square brackets are deleted in links 2019-01-27 15:39:37 +08:00
Ryan Lue
db69e55158 Prevent CI failure caused by factories using duplicate #name attributes 2019-01-25 14:28:15 +01:00
Ryan Lue
a97e959119 Prevent namespace collisions for let/subject in shared examples
When referencing shared example groups in specs,
use it_behaves_like instead of include_examples.
This runs shared examples in their own, nested context,
so that any top-level let/subject methods in the spec
do not leak into the shared example groups.
2019-01-25 15:51:03 +08:00
Denny Bresch
39bdbf22db Refactoring: Migrated static dashboard widgets to extendable backend structure. 2019-01-24 09:58:58 +01:00
Billy Zhou
9d8ce06948 Merged PR #2440 - Request timeout while importing large attachments from Zendesk (thanks a lot to @anuzhin 😍). 2019-01-24 08:38:53 +01:00
Ryan Lue
175db6f123 Refactoring: Migrate setting_test.rb to RSpec 2019-01-23 12:53:11 +01:00
Thorsten Eckel
a7e2f9092f Updated rubocop to latest version (0.63.1). 2019-01-22 18:10:55 +01:00
Ryan Lue
a546e7c6fd Refactoring: Migrate organization_domain_based_assignment_test.rb to RSpec 2019-01-22 17:42:39 +01:00
Ryan Lue
1d1e75c743 Refactoring: Migrate ApplicationModel::ChecksImport part of db_auto_increment_test.rb to RSpec 2019-01-22 17:35:01 +01:00
Ryan Lue
14614244cb Refactoring: Migrate ticket_priority_test.rb to RSpec 2019-01-22 09:55:39 +01:00
Mantas
1694094ea5 Allows to abort all ajax calls in the controller without releasing whole controller. 2019-01-22 08:57:47 +01:00
Felix Niklas
9e5318fdb5 Private fn chat no jquery 2019-01-22 07:12:32 +01:00
Billy Zhou
74ec8912bd Fixed #2424 - Unavailable ticket template attributes get applied 2019-01-21 18:17:18 +01:00
Marcel Herrguth
a159eaf882 Corrected facebook channel documentation link 2019-01-21 09:33:05 +01:00
Martin Edenhofer
50d85a1429 Improved monitoring amount_check, no state if no limit params are used. 2019-01-21 08:01:51 +01:00
Thorsten Eckel
d28086af95 Refactoring: On premise CI infrastructure doesn't scale. 2019-01-20 15:36:34 +01:00
Thorsten Eckel
ae5ccc11df Merge branch 'develop' into private-te-refactoring-constantize 2019-01-19 18:16:34 +01:00
Martin Edenhofer
9300fd732c Unable to open customer chat widget via separate open button. Fixes #2435 2019-01-19 16:20:31 +01:00
Billy Zhou
1c55fc0a56 Fixed #2416 - HTML sanitizer blocks email processing because of an endless loop. 2019-01-18 16:33:07 +01:00
Thorsten Eckel
cfc1bdbb45 Refactoring: NO_RESET_BEFORE_SUITE is not practical for the general use case of running RSpec multiple times and slows down/decreases DX. 2019-01-18 14:59:15 +01:00
Thorsten Eckel
a211d20db9 Refactoring: Migrated BackgroundJobSearchIndex (Delayed::Job) to SearchIndexJob (ActiveJob).
Refactoring: Enable MonitoringController to handle ActiveJob background jobs.
2019-01-18 14:58:28 +01:00
Thorsten Eckel
a84edbe764 Refactoring: Infered spec type from file location applies unwanted support files which cause tests (ApplicationJob) to fail. 2019-01-18 14:58:28 +01:00
Thorsten Eckel
3a5d597ab9 Adding ActiveJob RSpec helper for using Test queue adapter. 2019-01-18 14:58:28 +01:00
Thorsten Eckel
10110e03cb Refactoring: Rails/SkipsModelValidations cop is unnecessarily active for RSpec files. 2019-01-18 14:58:28 +01:00
Thorsten Eckel
6870c11103 Updated omniauth-google-oauth2 gem - due to Google Plus (G+) sunsetting in Q1 2019 (https://github.com/zquestz/omniauth-google-oauth2/issues/340). 2019-01-18 14:29:11 +01:00
Thorsten Eckel
f0caad9725 Stabilize tests: Unstable tests require recurring examination. 2019-01-18 11:57:16 +01:00
Thorsten Eckel
eb559755eb Stabilize tests: JS AJAX UnitTest is flanky in single process Capybara test. 2019-01-18 11:57:16 +01:00
Thorsten Eckel
5c10c2c859 Merge branch 'develop' into private-te-refactoring-constantize 2019-01-18 11:56:01 +01:00
Ryan Lue
2d5ec5d485 Add test case for removed edge case handling in Cache.clear 2019-01-18 10:25:35 +01:00
Ryan Lue
f84408dfc3 Support clearer layout of '.and change(...).to(...)' in RSpec files 2019-01-18 10:25:35 +01:00
Ryan Lue
0e6a6ff1fd Remove outdated edge case handling from Cache class 2019-01-18 10:25:35 +01:00
Ryan Lue
dbf24b2f6c Refactoring: Migrate cache_test.rb to RSpec 2019-01-18 10:25:35 +01:00
Ryan Lue
043a0af9f2 Add Null email driver (support workaround for #224) 2019-01-15 14:11:57 +01:00
Ryan Lue
7006d573b4 Refactoring: Migrate role_test.rb to RSpec. 2019-01-15 13:55:59 +01:00
Thorsten Eckel
87c3163e46 Merge branch 'develop' into private-te-refactoring-constantize 2019-01-15 13:40:09 +01:00
Thorsten Eckel
5356c9f9f1 Refactoring: Make asset fetch more robust for records referring to deleted records. 2019-01-15 13:11:07 +01:00
Ryan Lue
ce27170434 Refactoring: Capybara tests use wrong route check method. 2019-01-14 16:31:31 +01:00
Martin Edenhofer
6faaee3a97 Fixed issue #2423 - Unable to update already configured email channel, verify email will not arrive. 2019-01-14 15:53:26 +01:00
Martin Edenhofer
dadb8e207b Follow up for issue #2419 - Zammad Icon (Bird) on page top left disappears and does not come back - fixed test. 2019-01-08 23:14:47 +01:00
Thorsten Eckel
e43154c373 Refactoring: Removed unneeded screenshot taking (to speed up tests). 2019-01-07 10:22:00 +01:00
Thorsten Eckel
b2c065812f Refactoring: Migrated Kernel.const_get to Rails .constantize. 2019-01-06 19:41:29 +01:00
Thorsten Eckel
8df6e3c33b Refactoring: Use GitLab CI cache functionality to cache gem dependencies between pipelines/jobs/runners and replace obsolete zammad-application with zammad-ruby docker image. 2019-01-05 23:43:22 +01:00
Thorsten Eckel
4d0130810f Refactoring - Delayed::Job to ActiveJob migration: Allow tracking of ActiveJob#executions via Delayed::Job#attempts sync workaround. 2019-01-05 16:41:07 +01:00
Ryan Lue
50c1cfcb0a Refactoring: Migrate ticket_null_byte_test.rb to RSpec. 2019-01-04 16:29:56 +01:00
Thorsten Eckel
27b9bbd401 Updated rubocop to latest version (0.62.0) and applied required changes. 2019-01-04 15:54:33 +01:00
Martin Edenhofer
1e08fd7350 Fixed issue #2419 - Zammad Icon (Bird) on page top left disappears and does not come back. 2019-01-04 14:36:51 +01:00
Ryan Lue
caa5c96260 Refactoring: Migrate Calendar unit test to RSpec. 2019-01-04 08:37:30 +01:00
Thorsten Eckel
f289d99fbf Fixed failing CI: Date comparison checks for hour format 'HH' (as described in all comments) while App.PrettyDate.humanTime generates hour format 'H' for absolute type date strings. 2019-01-03 11:39:50 +01:00
Thorsten Eckel
0f484d0ed5 Fixed bug: App.PrettyDate.humanTime generates broken HTML markup if escalation flag is true. 2019-01-03 11:39:50 +01:00
Thorsten Eckel
178f0dfa17 Refactoring: Stopping of scheduler worker process (via SIGTERM) isn't handled gracefully and prints Error (with Backtrace). 2019-01-03 11:39:49 +01:00
Martin Edenhofer
ed448c7f50 Fixed issue #2420 - Unable to show ticket history. 2018-12-31 20:15:17 +01:00
Thorsten Eckel
3d45432f78 Fixed issue #2418 - Missing table name quoting causes MySQL 8 incompatibility. 2018-12-29 23:07:11 +01:00
Thorsten Eckel
b361b43836 Refactoring: Improving performance by memorizing app_model string generation. 2018-12-24 08:30:07 +01:00
Thorsten Eckel
197ecade07 Working around failing RSpec tests on Travis CI by skipping system tests. 2018-12-22 16:56:02 +01:00
André Bauer
75b5cba8e9 fixed travis dependencies 2018-12-22 16:39:23 +01:00
André Bauer
7bdbda0175 use xenial in travis build 2018-12-22 16:12:49 +01:00
Jens Pfeifer
21f1841f5b Refactoring: Migrated TicketUserTicketCounterJob from Delayed::Job to Active Job. 2018-12-21 17:35:15 +01:00
Jens Pfeifer
953d902a74 Refactoring: Migrated TicketOnlineNotificationSeenJob from Delayed::Job to Active Job. 2018-12-21 17:33:45 +01:00
Thorsten Eckel
4044394139 Fixed issue #2412 - i-doit version >= 1.12 integration requests fail with 'Can’t fetch objects from...' due to missing payload attribute 'id'. 2018-12-20 15:54:03 +01:00
Thorsten Eckel
76dfdbaf83 Merge branch 'develop' into private-te_rubocop_update 2018-12-20 09:16:35 +01:00
Thorsten Eckel
5491b1b910 Invited Capybara to the party 🎉 Taking browser tests to the next level 🚀. 2018-12-19 19:11:41 +01:00
Thorsten Eckel
e8a57517f4 Updated rubocop - applied custom Layout/AlignHash style. 2018-12-19 18:33:22 +01:00
Thorsten Eckel
0fd2efa0cf Refactoring: Exctracted Websocket Server logic from script file into lib backend class for better encapsulation, easier testing and reusage possibilities (e.g. Capybara). 2018-12-19 15:31:06 +01:00
Thorsten Eckel
fdfb1ca972 Refactoring: Splitted Rake CI Test start task up and created new prepare job which can be re-used. 2018-12-19 15:26:50 +01:00
Thorsten Eckel
030f80e3eb Refactoring: Allow re-usage of existing DB connection instead of creating/resetting existing one. 2018-12-19 15:26:30 +01:00
Thorsten Eckel
7ffa03731e Refactoring: Make sure Puma environment matches RAILS_ENV ENV. 2018-12-19 15:26:22 +01:00
Thorsten Eckel
b5a44ee0d0 Refactoring: Make Scheduler more robust against job deletion while processing. 2018-12-19 15:26:11 +01:00
Billy Zhou
1be60c91db Fixed #2367 - cannot sort by pending til 2018-12-19 06:40:32 +01:00
Billy Zhou
77794e0b26 Fixed #2390 - Add a filter to not show emails with potential issue - Display a… 2018-12-19 03:54:03 +01:00
Billy Zhou
0c97a66d6a Fixed #2382 - Added Option to switch the Full-Quote-Header on and off 2018-12-18 12:15:32 +01:00
Ryan Lue
2077fac218 Refactoring: Twitter webhook spec. 2018-12-18 11:40:56 +01:00
Martin Edenhofer
7326122e28 Fixed issue #2405 - Unable to load Zammad in web browser, because of online notification of ticket which was already deleted in the meantime. 2018-12-18 08:33:54 +01:00
Thorsten Eckel
5e05fadbb8 Applied required changes to run in GitLab docker CI env 🐳. 2018-12-15 00:07:21 +01:00
Thorsten Eckel
f34de820ac Test stabilization: Creation of and communication to remote Selenium browser instance fails in load intense CI scenarios. 2018-12-14 18:57:02 +01:00
Thorsten Eckel
5eed9c7506 Refactoring: Improving logging of remote browser instance creation errors by logging earlier and adding exception to log. 2018-12-14 18:54:54 +01:00
Thorsten Eckel
955608a427 Marked flanky browser tests for further investigation. 2018-12-14 18:43:10 +01:00
Thorsten Eckel
6dbb6d316a Test stabilization: Timout for maintainance message to dissappear is too low and causes test to be flanky. 2018-12-14 18:38:30 +01:00
Thorsten Eckel
8f713a96a2 Test stabilization: Reduced range of random number because to large numbers will cause the test to be flanky on CI env. 2018-12-14 18:33:29 +01:00
Thorsten Eckel
ab4e03f0ab Test stabilization:
- Use standard way to navigate to manage view.
- Use standard way to wait for closing modal dialog.
- Selected user is not system state agnostic.
- Take screenshot if group selection fails.
2018-12-14 18:29:31 +01:00
Thorsten Eckel
b2b2afb333 Test stabilization: Non standard way to wait for modal close causes flanky test. 2018-12-14 18:24:47 +01:00
Billy Zhou
3ca697dab7 Fixed #2398 - Missing custom object in database causes error on export in time_accounting 2018-12-14 22:20:06 +08:00
Martin Edenhofer
805bbcb542 Updated doc links for new structured admin documentation. 2018-12-14 10:48:39 +01:00
Ryan Lue
30beecd3e7 Improve Zendesk import when DNS resolution fails etc. 2018-12-14 02:59:19 +01:00
Thorsten Eckel
fb612f34d1 Merge branch 'develop' of https://github.com/zammad/zammad into develop 2018-12-13 16:18:46 +01:00
Jens Pfeifer
a92f7b2153 Migrated AppVersionRestartJob to Active Job. 2018-12-13 15:40:22 +01:00
André Bauer
8f999e6100 Merge pull request #2404 from kevin-olbrich/patch-1
Fix detection of local elasticsearch service
2018-12-13 14:23:28 +01:00
Ryan Lue
6e3f32825f Refactor External credentials request spec 2018-12-13 12:04:47 +01:00
Kevin Olbrich
fb8f02fa61 Fix detection of local elasticsearch service
If elasticsearch is local and the URL was set via rake cli to "localhost" instead of "127.0.0.1", the service is not restarted.
This results in a broken state (search does not work, background tasks fail, etc.) if zammad is updated together with elasticsearch.
2018-12-13 11:05:07 +01:00
Ryan Lue
ad19b532a9 Refactor user_spec.rb 2018-12-13 10:10:32 +01:00
Ryan Lue
d056feae94 Rewrite twitter_spec.rb 2018-12-13 10:06:44 +01:00
Thorsten Eckel
eed5fe1459 Refactoring: Improved logging of exceptions by using standardized way. 2018-12-13 09:42:51 +01:00
Jens Pfeifer
d7401b6a57 Refactoring: Migrated UserDeviceLogJob from Delayed::Job to Active Job. 2018-12-12 13:51:29 +01:00
André Bauer
6854ad0903 bettter license description 2018-12-12 12:44:06 +01:00
Felix Niklas
2fae7d478a Modal: position backdrop absolute instead of fixed to..
a) improve the scroll performance
b) prevent that touch/mousewheel scrolling doesn’t work in some cases
c) prevent that scrolling using the scrollbar closes the modal
2018-12-11 16:57:20 +01:00
MrGeneration
26648e3752 Update Webserver configs (apache2 and nginx)
This fixes issue 2365 and simply changes config files to ipv4-connects to the Zammad-Backend.
2018-12-11 16:13:55 +01:00
Felix Niklas
2140134ebe Avatars: support transparent avatars (png)
fixes #1807
2018-12-11 10:38:52 +01:00
Martin Edenhofer
3fb7e5bee3 Fixed issue #2397 - Unable to process emails without From (but with Sender) header. 2018-12-11 09:36:16 +01:00
Martin Edenhofer
23059d7c90 Implemented issue #2395 - Search term is deleted after I opened a object/ticket. 2018-12-07 20:48:36 +01:00
Martin Edenhofer
ecad97f5ef Fixed issue #2394 - Jump to bottom after article has been created to show that the article has been saved. 2018-12-07 15:20:47 +01:00
Martin Edenhofer
d105bc4c60 Fixed/ improved test. 2018-12-07 13:11:08 +01:00
Rolf Schmidt
079c4c9593 Fixed issue #2391 - Wrong file size calculation in monitoring controller (postgres only) 2018-12-06 15:35:00 +01:00
Ryan Lue
ffb64d65d3 Convert aaa_string_test to RSpec 2018-12-06 12:39:16 +01:00
Ryan Lue
2af6392172 Migrate email_process_identify_sender_max_test to RSpec 2018-12-06 12:35:14 +01:00
Felix Niklas
80c7dec624 lock-open icon: make it more distinguishable
- turn lock-open in a wide open lock, fixes #945
- add small-search and mood-sad icons to the sketch file (they got lost in previous merges)
2018-12-06 09:33:54 +01:00
Rolf Schmidt
14437f92f9 Migrated remaining Minitest controller tests to RSpec. 2018-12-05 11:43:53 +01:00
Billy Zhou
6ff974e6ec Fix #2344 - Missing translation for quote header timestamp 2018-12-04 18:01:44 +08:00
Felix Niklas
be7767468a RTL language: mirror arrow icon direction, fix alert icon spacing 2018-12-03 17:12:24 +01:00
Martin Edenhofer
4b4e3f67ae Updated to 2.9. 2018-12-03 15:36:23 +01:00
Martin Edenhofer
6e061ab894 Implemented issue #2023 - Twitter Account Activity API support. 2018-12-03 15:10:36 +01:00
Martin Edenhofer
6f4d584fae Improved browser unit test. 2018-12-03 13:07:07 +01:00
Martin Edenhofer
947744e502 Fixed/improved tests. 2018-12-03 09:02:04 +01:00
Ryan Lue
12fe223664 Add DB indices to histories and tickets tables (fixes #2368) 2018-12-01 13:02:06 +01:00
Thorsten Eckel
8c1ae9fe9d Test stabilization: MX check for example.com mail address should be false but it true sometimes which causes test to be flanky. 2018-11-30 08:45:13 +01:00
Thorsten Eckel
4b2630e713 Updated rails gem (CVE-2018-16476). 2018-11-28 14:43:02 +01:00
Thorsten Eckel
87b49f402a Improve reasoning of log lines in threaded processes. 2018-11-27 10:35:18 +01:00
Thorsten Eckel
f1dfbafdcd Refactoring: config.log_formatter is for all environments the same but configured in each. 2018-11-27 10:35:18 +01:00
Thorsten Eckel
19ec7fe5f1 Refactoring: Added missing _spec.rb filename suffix. 2018-11-27 10:33:39 +01:00
Thorsten Eckel
1e512f6cd0 Follow up #2345: Default value for Setting 'es_attachment_max_size_in_mb' is not in sync and to high. 2018-11-27 10:33:39 +01:00
Martin Edenhofer
6be530bb1c Improved performance of utf8_encode!() and html2text() (issue #2374). 2018-11-27 10:27:40 +01:00
Thorsten Eckel
af1781ff2a Improve performance by fetching 'fqdn' Setting in HTML sanitization only once instead for each link found (issue #2374). 2018-11-27 10:27:39 +01:00
Thorsten Eckel
4e024291a4 Improve performance by not checking empty strings or strings not containing ':' for URLs (issue #2374). 2018-11-27 10:27:39 +01:00
Thorsten Eckel
0711953beb Improved performance by checking in memory Cache TTL with integers instead of TimeZone objects (issue #2374). 2018-11-27 10:27:39 +01:00
Ryan Lue
2537dbeceb Switch to sassc-rails for faster SASS compilation 2018-11-26 10:30:21 +01:00
Martin Edenhofer
50c2a8540e Only do resizing of columns if table is shown. Followup for issue #2031. 2018-11-26 07:50:41 +01:00
Ryan Lue
aa6dd3f2ca Add Guard to Procfile (to simplify using livereload plugins) 2018-11-23 13:51:32 +01:00
Ryan Lue
2618a51f1b Fix Zendesk import failure on lowest subscription tier, aka "Essential" (fixes #2262) 2018-11-22 02:33:02 +01:00
Ryan Lue
a780745349 Hide autosaved article drafts from server logs (fixes #2363) 2018-11-21 11:37:09 +01:00
Martin Edenhofer
4ae5e656d4 Fixed typo. 2018-11-20 12:37:53 +01:00
Martin Edenhofer
ce38a6c9ab Do not set max-width to regular .dropdown-menu like delete or clone (only to shortcuts). Followup for issue #2335. 2018-11-20 11:00:34 +01:00
Martin Edenhofer
c6411fd914 Fixed resizing of table by browser window resize. Related to issue #2031. 2018-11-19 18:43:44 +01:00
Felix Niklas
f2644cd622 Textmodule widget: dynamically increase width
Only use as much space as needed but allow the dropdown to grow as big as possible (textarea width) to show as much as possible of the text module name.
2018-11-19 15:09:19 +01:00
Martin Edenhofer
1f36b5b65f Updated Italian translations in .js files. Follow for issue #2359. 2018-11-19 15:01:30 +01:00
Martin Edenhofer
ba4e3231a4 Fixed issue #2031 - Column width is resized to a non readable minimum. 2018-11-19 09:41:39 +01:00
André Bauer
9c712d2d89 Merge pull request #2359 from itbabu/patch-1
Update italian translations for chat messages
2018-11-17 21:47:29 +01:00
Martin Edenhofer
d0a36c36a8 Fixed issue #2353 - Chat does not work due to errors in WebSocket (Database connection). Credits to @d--j for providing the solution. 2018-11-17 07:34:45 +01:00
Marco Badan
ae7ef13278 Update italian translations for chat messages 2018-11-16 21:08:56 +01:00
Martin Edenhofer
ff60c57f3e Followup for issue #2330 - selecting the overviews on the I Pad does not work. 2018-11-16 00:13:05 +01:00
Martin Edenhofer
2329a1c007 Fixed issue #2345 - Elasticsearch payload is going too big if a ticket has more then 9000 articles. 2018-11-15 10:52:42 +01:00
Thorsten Eckel
fa60f25185 Fixed informal/formal mix of language in customer facing notification templates texts to formal language - as discussed in #2348 and #2350. Thanks to @Charburner who did the actual change! 2018-11-14 16:14:25 +01:00
Thorsten Eckel
db9e2800a8 Added temporary workaround for issue #2343 - Lost DB connection causes jobs to not be processed anymore. 2018-11-13 14:45:02 +01:00
Billy Zhou
5796f78c4f Fixed #2332 - Role-Filter shows inactive Roles 2018-11-12 19:56:26 +08:00
Martin Edenhofer
5bfe56b476 Follow up #2321 - In certain cases the timeout for IMAP actions isn't sufficient (e. g. expunge for 20k E-Mails takes longer than 1 minute). 2018-11-12 08:47:56 +01:00
Billy Zhou
cd65dcdb40 Fixed #2333 - Object country already exists
by adding the corresponding country attribute to the existing country column
2018-11-09 13:29:47 +01:00
Billy Zhou
f711e1019e Fix #2318 - migration 20180220171219 CheckForObjectAttributes failed 2018-11-09 13:28:14 +01:00
Martin Edenhofer
4c90a87f5b Fixed issue #2330 - selecting the overviews on the I Pad does not work.
Dropdown menus should have been on top of their backdrop because when the dropdown is triggered via the button the backdrop is inserted before after the button and before the dropdown menu. So the backdrop is behind the menu in the DOM and they could be on the same z-index but the menu would still be in front of the backdrop because of the order.

When triggering the dropdown via javascript the backdrop gets inserted behind the backdrop. Now the backdrop is overlaying the dropdown menu making its items unclickable. This only happens on touch devices because only there the backdrop gets inserted.

Change: we increase the z-index of the dropdown menu (lvl 5 to lvl 6) to be always on top of the backdrop, no matter how the elements are ordered. At the same time we increased the z-index of the elements laying on z-index lvl 6 to lvl7 which was previousely unused. This applies to the global search, modal clues and popovers.
2018-11-09 12:18:44 +01:00
Felix Niklas
0db8c28bd5 Some search enhancements and fixes. 2018-11-06 22:24:29 +01:00
Martin Edenhofer
c2f4755a6c Search query extension refactoring to use params and not arguments. 2018-11-06 17:11:10 +01:00
Thorsten Eckel
9ef3cb62c0 Updated rack gem (CVE-2018-16470, CVE-2018-16471). 2018-11-06 13:14:29 +01:00
Thorsten Eckel
ea318fb695 Fixed issue #2321 - IMAP fetch stops because of request timeout 2018-11-06 09:43:14 +01:00
Martin Edenhofer
13b3b841d5 Fixed issue #2329 - Unable to import (update) users with email addresses als lookup index written in upper letters. 2018-11-06 06:42:52 +01:00
Martin Edenhofer
27dfeacf1d Fixed calendar test with timezones. 2018-11-05 06:03:04 +01:00
Martin Edenhofer
75230c3db3 Fixed issue #2327 - Websocket messages are not working correctly via Ajax long polling (e. g. multiple browser tabs can get opened with one session). 2018-11-02 18:42:57 +01:00
Martin Edenhofer
764d262cff Implemented issue 2326 - Add AccountedTime to tag selection for text modules or triggers. 2018-11-02 08:39:22 +01:00
Martin Edenhofer
a97e261ac7 Improved monitoring controller with amount_check (e. g. monitoring will alert about unusual amount of ticket creation). 2018-11-02 07:35:28 +01:00
Martin Edenhofer
385d6e69da Stabilised test. 2018-11-01 08:18:50 +01:00
Martin Edenhofer
41ef5fa789 Follow up for issue #2324 - improved comments and test - Improved error handling of invalid tag for text modules and add current time format (to not use 2018-10-31T08:02:21.917Z format). 2018-11-01 07:33:12 +01:00
Martin Edenhofer
9bed6c8a9b Fixed issue #2324 - Improved error handling of invalid tag for text modules and add current time format (to not use 2018-10-31T08:02:21.917Z format). 2018-10-31 17:41:35 +01:00
Martin Edenhofer
d53a848331 Updated loofah gem (CVE-2018-16468). 2018-10-31 06:54:03 +01:00
Billy Zhou
a960cdf422 Fixed issue #2042 - incorrect notification when closing a tab after setting up an object (fixes #2042) 2018-10-30 22:51:20 +01:00
Martin Edenhofer
a2c52538be Enabled Placetel integration. Added user info via Placetel API lookup (optional). 2018-10-30 17:00:33 +01:00
Ryan Lue
66e8d58f29 Show list of customer/org tickets in created_at order (fixes #2296) 2018-10-30 13:28:37 +01:00
Billy Zhou
bbabae7c2c Fixed issue #1568 - select attribute in trigger shows internal id (fixes #1568)
This alternative approach does not use the database_cleaner gem.
2018-10-30 08:37:53 +01:00
Martin Edenhofer
aa363ee130 Define max attempts for elasticsearch background job (to not endless queue not indexable items). 2018-10-29 16:21:25 +01:00
Martin Edenhofer
9fc841d7a1 Merge branch 'develop' into private-rl_2278_email_display_name 2018-10-29 13:59:36 +01:00
Martin Edenhofer
cefe250c8f Fixed admin calendar sla test (time zone adjustment). 2018-10-29 13:58:20 +01:00
Martin Edenhofer
0cf674dd15 Updated germany translation. 2018-10-29 11:32:38 +01:00
Ryan Lue
fc9b8de922 Ignore <img src="cid:..."> in forward-email text field (fixes #2305) 2018-10-29 16:18:03 +08:00
Denny Bresch
96eaac4771 Fixed typo 'Mai' to 'May'. 2018-10-26 09:31:46 +02:00
Martin Edenhofer
195e264cb8 Added article to placeholder options. 2018-10-25 10:30:26 +02:00
Martin Edenhofer
004d3c1cbb Updated for 2.8.0. 2018-10-25 07:29:39 +02:00
Martin Edenhofer
dd583d753c Fixed mysql/mariadb issue (Mysql2::Error: Invalid default value for 'initialized_at'). 2018-10-25 03:03:01 +02:00
Martin Edenhofer
f074c0c734 Followup for issue #1394 - Reindex elastic search not possible because of <null>/Twitter::NullObject. 2018-10-25 01:46:43 +02:00
Thorsten Eckel
e0fd1e52ec Fixed usage of wrong assert (which resulted in always true/success by checking hard coded values). 2018-10-24 10:07:53 +02:00
Felix Niklas
a3e531af21 Avatars: replace image with initials when printing 2018-10-23 15:38:43 +02:00
Billy Zhou
47120f0585 Fixed regression introduced by 8fb46b0448 where replying to a phone ticket no longer works 2018-10-23 05:27:18 +02:00
Martin Edenhofer
5492f4f24f Followup for issue #1394 - Reindex elastic search not possible because of <null>/Twitter::NullObject. 2018-10-23 05:03:26 +02:00
yasirazgar
2f0171b6db change real name to display name in email account add 2018-10-19 20:23:00 +05:30
Ryan Lue
8b554e9d66 Use zammad-deps github repos for custom-patched dependencies 2018-10-19 08:59:50 +02:00
Thorsten Eckel
3d49bf32c8 Fixed bug: Application is in undefined state while using spring because of usage of 'require' instead of 'require_dependency' to track dependencies. 2018-10-19 08:58:12 +02:00
Thorsten Eckel
b538b05209 Switched over to DB reset strategy in tests and removed DatabaseCleaner because it can't guarantee a clean DB state for all test scenarios. 2018-10-19 08:58:12 +02:00
Thorsten Eckel
7d9c087a84 Fixed bug: RSpec tests are broken because of not using RSpec hooks and structures. 2018-10-19 08:58:12 +02:00
Thorsten Eckel
f3e20bca29 Improved ObjectManager::Attribute factory defaults. 2018-10-19 08:58:12 +02:00
Thorsten Eckel
28793f1338 Fixed bug: Tests are not ID agnostic. 2018-10-19 08:58:12 +02:00
Thorsten Eckel
b80cfda86e Added ENV NO_RESET_BEFORE_SUITE to allow RSpec test suite start without DB reset (for e.g. running single tests where no DB reset is needed). 2018-10-19 08:58:12 +02:00
Martin Edenhofer
c8ab4275d6 Fixed issue #2297 - rake searchindex:rebuild is not working after Elasticsearch 2.4 upgrade to Elasticsearch 5.6 "Limit of total fields [1000] in index" 2018-10-19 00:40:57 +02:00
Thorsten
e8e0bf93b9 Merge pull request #2295 from maysam/patch-1
Fixed link to Telegram Bot registration documentation.
2018-10-18 15:31:33 +02:00
Maysam Torabi
21617f7c2f Update bot_add.jst.eco 2018-10-18 16:55:31 +03:30
Martin Edenhofer
bca9312ce0 Follow up for issue #2292 - improved migration. 2018-10-18 13:20:39 +02:00
Denny Bresch
cdb0895984 Added new stylesheets directory 'addons' to store all addon css files. 2018-10-18 11:44:39 +02:00
Martin Edenhofer
86c2df69ad Fixed issue #2292 - CTI Log: duration_talking_time is incorrect and after update initialized_at is a string (not timestamp) 2018-10-18 11:42:37 +02:00
Billy Zhou
fb24de11cc Fixed issue #2279 - performance issue in bulk action selection in overview (fixes #2279) 2018-10-17 10:19:19 +02:00
Martin Edenhofer
5b38c9e546 Improved migration. 2018-10-16 16:44:19 +02:00
Martin Edenhofer
c35e2a0aab Removed debug information. 2018-10-16 16:43:58 +02:00
Martin Edenhofer
a160c518e1 Merge branch 'develop' into private-me-several_enhancements 2018-10-16 16:42:31 +02:00
Martin Edenhofer
3f284003eb Improved doc. 2018-10-16 16:38:20 +02:00
Martin Edenhofer
23f499dffc Improved test. 2018-10-16 16:37:46 +02:00
Martin Edenhofer
d0bafea5e7 Improved test. 2018-10-16 16:35:31 +02:00
Martin Edenhofer
7972ec9b6c Added twilio test jobs. 2018-10-16 16:33:30 +02:00
Thorsten Eckel
0cca58f0b7 Missing GitLab CI browser tag causes job to run on non-browser CI server and fail. 2018-10-16 13:11:27 +02:00
Thorsten Eckel
2ad28ecfcc Fixed unstable tests: ObjectManager Attribute creation/migration fails on fast/slow systems. 2018-10-16 13:11:27 +02:00
Thorsten Eckel
18cec289b6 Fixed bug: Having multiple associations to different attributes of one Model lead to invalid association data. 2018-10-16 13:11:27 +02:00
Billy Zhou
ea12b0f676 Fixed issue #2277 - note is not shown for customer/organisations if it's empty (fixes #2277) 2018-10-16 10:57:58 +02:00
Martin Edenhofer
22b2f44ba0 Initial SMS integration for trigger notifications and additional channel. Thanks to sys4 AG! 2018-10-16 10:45:15 +02:00
Martin Edenhofer
271102057d Initial Placetel integration. 2018-10-15 11:47:59 +02:00
Martin Edenhofer
402b28b3e7 Fixed issue #2285 - Permission issue: response templates only usable when admin is also agent. 2018-10-12 13:05:37 +02:00
Billy Zhou
b1caed65f5 Fixed issue #2273 - Bulk Form javascript error when checking item (fixes #2273) 2018-10-12 16:28:37 +08:00
Martin Edenhofer
6439203900 Fixed issue #2281 - O365/Office365 authentication missing given- and surname. 2018-10-11 14:40:12 +02:00
Martin Edenhofer
7dd6675552 Implemented issue #2223 - Callback issue when Zammad if internal and external FQDN differ. 2018-10-10 15:26:32 +02:00
Billy Zhou
5ff371f51b Fixed issue #2246 - Records in Reporting not updated when single ActiveRecord can not be found (fixes #2246) 2018-10-10 09:12:48 +02:00
Ryan Lue
58a8c047bb Prevent LDAP sync from needlessly deactivating inactive users (fixes #2256) 2018-10-10 08:23:45 +02:00
Billy Zhou
bfccecc012 Fixed issue #2195 - Search with id:123 does not work anymore (fixes #2195) 2018-10-09 09:46:28 +02:00
Thorsten Eckel
f15ac3be7e Follow up - 9af50f2a4e: Fixed Layout/EmptyLineAfterGuardClause rubocop complain. 2018-10-09 08:22:20 +02:00
Thorsten Eckel
9af50f2a4e Updated rubocop to latest version (0.59.2) and applied required changes. 2018-10-09 08:17:41 +02:00
Thorsten Eckel
3d4d5414f1 Fixed stuck CI env: Organization search results in endless loop while creating a user because ES is not ready yet. 2018-10-08 15:51:58 +02:00
Martin Edenhofer
3a5cd0bce5 Implemented issue #2270 - Italian and Spanish translations for notifications. 2018-10-08 14:04:55 +02:00
André Bauer
e2deedef28 Merge pull request #2269 from vaibhavgeek/develop
Update zammad_ssl.conf
2018-10-07 22:39:34 +02:00
Vaibhav Maheshwari
f19b14f31f Update zammad_ssl.conf
Use return 301 instead of rewrite.
2018-10-08 02:04:32 +05:30
Thorsten
f74bcdda5b Merge pull request #2268 from zammad/te-travisci_fix
Fix failing Travis CI build
2018-10-07 20:51:14 +02:00
Thorsten
fbc167944c Update .travis.yml 2018-10-07 20:16:35 +02:00
Thorsten Eckel
22ba8f8fcb Fixed bug: Form request spec is not testing ES search (DB only). 2018-10-07 14:24:55 +02:00
Thorsten Eckel
02ba0e455e Added db_strategy (:truncaction) meta helper to switch to DB cleanup via truncation (from transaction) for single examples. We choose to stick to Rails/RSpec transactional cleanup over DatabaseCleaner transaction strategy because of performance reasons. Rails default performs between 30 and 50% better. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
44e89271fe Refactoring: Momorize result and more idiomatic ruby. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
e006684c83 Added RSpec support file to initialize database into clean state before running suite. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
50162cc250 Refactoring: Split up RSpec rails_helper into separate support files. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
a00f3c51a8 Improved RSpec suite by having dedicated last_admin_check meta attribute instead of polluting the whole suite (and adding side effects by being to assumtious). 2018-10-07 14:24:55 +02:00
Thorsten Eckel
86bab028a4 Fixed bug: Setting change_id is always nil after re-initializing of app in test env and prevents (re-)loading of Settings. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
83ed53d245 Fixed bug: Re-seed-ing not possible in same process because require_relative loads file only once. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
8d078e7398 Fixed bug: Argon2 secret differs after app-reinitialization in test env. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
dbcac7083c Made spec indenpenent of user id. 2018-10-07 14:24:55 +02:00
Thorsten Eckel
1897e3a76c Fixed filename typo. 2018-10-07 14:24:55 +02:00
Martin Edenhofer
e42725246f Updated nokogiri gem (CVE-2018-14404). 2018-10-05 07:12:46 +02:00
Thorsten Eckel
a3444472ea Fixed issue #742: IPs in Sessions list are all 'localhost'. 2018-10-04 11:57:56 +02:00
Martin Edenhofer
f5c588be0b Implemented issue #2261 - Make stats store and cti log searchable via elastichsearch & destroy stats store if user got deleted. 2018-10-03 08:23:22 +02:00
Billy Zhou
8fb46b0448 Fixed issue #2184 - Reply does not work as expected (fixes #2184) 2018-10-02 06:50:04 +02:00
Billy Zhou
381e00b74f Fixed issue #2173 - Invalid date causes errors (fixes #2173) 2018-10-02 06:45:52 +02:00
Thorsten Eckel
6718d2eb7c Invited spring to the party 🎉 Taking development speed to the next level 🚀- Enable via ENV 'ENABLE_SPRING'. 2018-10-01 22:00:26 +02:00
Thorsten Eckel
e4d7dc449f Refactoring: DRYed up .gitlab-ci.yml. 2018-10-01 19:41:17 +02:00
Ryan Lue
97b17caea4 Test and fix time accounting API endpoint bug (replaces #2243) 2018-09-28 08:49:06 +02:00
Martin Edenhofer
8e99a010ca Improved external credential managment via rest controller. 2018-09-26 11:51:53 +02:00
Martin Edenhofer
6c82931245 Improved error handling if file already exists in file store (verify if file is corrupt in filesystem and remove it in case). 2018-09-26 10:06:48 +02:00
Martin Edenhofer
ce9ebe828f Fixed issue #2255 - CTI: Limit used caller log states and prevent race conditions (if callback comes later). 2018-09-25 16:52:46 +02:00
Martin Edenhofer
cff3dba0a8 Improved quote line, reduced length by removing email address. 2018-09-25 15:27:54 +02:00
Billy Zhou
280ab7471f Extended the fix for issue #2233 to cover User objects as well. Also added hiding of empty string attribute fields. 2018-09-25 14:59:32 +02:00
Billy Zhou
9c02d2e02b Added signatureIdentifyByHtml to detect signatures and blockquotes through HTML nodes. 2018-09-25 11:43:52 +02:00
Martin Edenhofer
e31d2751cf Fixed issue #2254 - Unable to process spam email "ERROR: #<Exceptions::UnprocessableEntity: Invalid email>". 2018-09-24 20:16:28 +02:00
Martin Edenhofer
567daf0053 Fixed issue #2253 - Unable to index elasticsearch if article.preferences[:delivery_status_message] has no utf8 charset. 2018-09-24 15:21:21 +02:00
Martin Edenhofer
1568909afb Fixed issue #2252 - Unable to process email "ERROR: #<NoMethodError: undefined method match' for nil:NilClass>"`. 2018-09-24 11:21:30 +02:00
Thorsten
e6f434328d Merge pull request #2251 from mbeijen/404
Fixed typo in 404: Ressource -> resource
2018-09-24 08:22:46 +02:00
Michiel Beijen
818f88c352 Fixed typo in 404: Ressource -> resource 2018-09-24 08:15:02 +02:00
Billy Zhou
8bf3ab24d5 Fixed issue #2233 - Boolean object set to false is not visible (fixes #2233) 2018-09-21 16:21:55 +02:00
Martin Edenhofer
9a7118123d Fixed issue #2245 - Unable to process spam mail with invalid date field. 2018-09-20 18:54:54 +02:00
Billy Zhou
45fee1b752 Fixed issue #2026 by checking for change permission before showing bulk action form (fixes #2026) 2018-09-20 08:24:00 +02:00
Billy Zhou
dc8748896d Fixed #2236 by adding instance_method_already_implemented? check for invalid attribute names (fixes #2236) 2018-09-19 17:08:31 +02:00
Martin Edenhofer
dd848ad135 Added new pretty_date_format option "timestamp" to show only the timestamp e. g. "2018-09-19 15:25". 2018-09-19 16:49:27 +02:00
Rolf Schmidt
208ed18fdd Removed obsolete test exeuction of controller tests in travis (because they are migrated to rspec now). 2018-09-19 16:46:30 +02:00
Billy Zhou
1efcb9d89f Fixed issue #2235 - Overview setting isn't applied on submit (fixes #2235) 2018-09-19 16:42:52 +02:00
Rolf Schmidt
29b616d61d Refactored all controller mini tests and migrated them to rspec request specs 2018-09-19 15:54:49 +02:00
Martin Edenhofer
769fb19064 Added missing admin.time_accounting permission entry. 2018-09-19 09:22:08 +02:00
Felix Niklas
46db068a65 Print: support modals
if a modal is open the whole modal gets printed, hiding the content behind, the close x and the modal footer.
2018-09-18 14:57:11 +02:00
Billy Zhou
ccf97ee077 Issue #2232 hide inactive report profiles 2018-09-17 09:01:17 +02:00
Mantas
9d5b83169d Popovers refactoring 2018-09-13 15:08:39 +02:00
Martin Edenhofer
254c8c1e4b Improved error handling of system_agent_limit setting it the number was supplied as string. 2018-09-13 11:38:12 +02:00
Martin Edenhofer
54e65e5156 Implemented issue #2228 - Global Bcc for all outgoing emails for external archive options. 2018-09-13 09:09:05 +02:00
Martin Edenhofer
cd93bccfed Updated rubyzip to v1.2.2. 2018-09-12 06:26:09 +02:00
Ryan Lue
68861cab31 Update RSpec to 3.8.0 2018-09-12 02:48:06 +02:00
Ryan Lue
e07f41ed16 Automate clearing of broken LDAP configurations (fixes #2140) 2018-09-12 02:48:06 +02:00
Billy Zhou
4f6503593e Fixed #1690 - renaming tags will break overviews condition 2018-09-11 16:57:48 +02:00
Ryan Lue
3c1e8ba123 Modify SQL in RecentView factory to support MySQL 2018-09-11 12:58:17 +02:00
Ryan Lue
d51d22213f Refactor RecentView 2018-09-11 12:58:17 +02:00
Ryan Lue
768788da7e Order results of RecentView.list (fixes #2194) 2018-09-11 12:58:17 +02:00
Ryan Lue
6bc72e6b46 Migrate RecentView test from Minitest to RSpec 2018-09-11 12:58:17 +02:00
Martin Edenhofer
dd722f94c9 Improved UX if ticket title is ''. 2018-09-11 08:44:51 +02:00
Thorsten Eckel
ccbf10cb7a Fixed Rails namespace lookup issue and removed remaining foreign key records in Token table when deleting a user. 2018-09-10 14:35:12 +02:00
Martin Edenhofer
9d860fbc03 Fixed issue #2227 - Unprocessable email ERROR: #<ArgumentError: invalid byte sequence in UTF-8> and improved email parser tests to also verify attachments. 2018-09-07 14:20:11 +02:00
Martin Edenhofer
33346ddea9 Do not display article meta links text at all (because it's not important to know that there is a raw download link if you want to print it). 2018-09-06 19:06:09 +02:00
Felix Niklas
7236e2e703 Print: prevent chrome from displaying urls when printing links 2018-09-06 18:18:52 +02:00
Felix Niklas
2733581551 Overview print: remove padding 2018-09-06 15:21:17 +02:00
Felix Niklas
83da6332da Overviews: fix table width when printing 2018-09-06 15:20:04 +02:00
Felix Niklas
d2a5a32954 Overview: optimize layout for print 2018-09-06 08:48:59 +02:00
Ryan Lue
fa678f938a Support processing of emails with Windows-1258 encoding (fixes #2224) 2018-09-06 04:07:30 +02:00
Felix Niklas
d9528438bc Ticket print: remove empty scrollbar 2018-09-05 13:12:14 +02:00
Felix Niklas
000c188d0c Ticket print: Firefox multi-page fix, remove colors, show meta
Incorporates the Firefox multi-page fixes (display: flex print bug) from @MrGeneration

see #2162
2018-09-05 12:33:28 +02:00
Martin Edenhofer
cc4ce92072 Only allow 1800 loops in a thread, to prevent email IMAP fetch stops working if mailserver is once unreachable. Fixes issue#1861. 2018-09-05 07:14:39 +02:00
Martin Edenhofer
15d8cb213d Enable Rack::LiveReload via environment variable RAKE_LIVE_RELOAD. 2018-09-04 16:54:38 +02:00
Martin Edenhofer
5bfa535b62 Improved initial import and sync of translations (about 5-8 times faster). 2018-09-04 13:37:51 +02:00
Ryan Lue
b58fcbb5fc Really fix regression introduced in 23879bc (fixes #2220) 2018-09-04 11:49:44 +02:00
Ryan Lue
19319d9d83 Fix nil handling regression from #2152 fix 2018-09-03 15:20:00 +08:00
Martin Edenhofer
9e124593b6 Merge branch 'develop' of github.com:zammad/zammad into develop
# Conflicts:
#	app/assets/stylesheets/print.scss
2018-09-02 13:18:24 +02:00
Felix Niklas
752a65e9ba Print layout: fix cut off when printing a ticket
+ show full articles (disable show more) when printing.

fixes #2162
2018-09-02 10:20:57 +02:00
Mr.Generation
a370d01e29 Fix printview for browsers (Issue#2162)
This patch fixes the currently broken view of ticket zoom (when you try to print a ticket). All "read more" tags will be "open" so that you get the full artcle content. The scrollbar is now hidden and you can also print all pages. 

Verified on current Chrome and Firefox. In case this brakes the print overview within the browser, I'll fix that on Monday - promise!
2018-08-31 20:12:27 +02:00
Ryan Lue
81a6fc3d97 Stop converting binary user attributes to text during LDAP setup (fixes #2140) 2018-08-31 17:27:57 +02:00
Martin Edenhofer
925ff56066 Private me issue2219 reopen delivery delay message 2018-08-31 17:17:59 +02:00
Martin Edenhofer
2774bc207d Fixed issue #2218 - CTI Caller Log blocks user deletion/destroy and fails 2018-08-31 12:25:06 +02:00
Ryan Lue
ec74d56b77 Improve handling of emails from addresses with spaces (fixes #2198) 2018-08-30 10:39:50 +02:00
Thorsten Eckel
7c1a4d413c Added new FactoryBot factories for SLA and Calendar. 2018-08-30 08:27:20 +02:00
Thorsten Eckel
ee176d3761 Moved RSpec Webmock configuration in own support file and allowed requests to Google for Calendar setup. 2018-08-30 08:27:20 +02:00
Ryan Lue
2d8badcb8c Added TCR dependency for replaying TCP connections in tests. 2018-08-29 08:54:14 +02:00
Ryan Lue
f046c80c79 Improve 'URL' parsing in Avatar model (fixes #2199) 2018-08-28 14:51:01 +02:00
Thorsten Eckel
f0690f8754 Added dependency vulerability check exclusion for CVE-2018-1000544 (https://github.com/rubyzip/rubyzip/issues/369) which only affects test env (selenium-webdriver dependency) until it's resolved (https://github.com/rubyzip/rubyzip/pull/376). 2018-08-27 14:43:31 +02:00
Ryan Lue
a25d094d5f Ensure CTI Log caller ID entries include user organization names (fixes #2075) 2018-08-27 03:24:21 +02:00
Ryan Lue
902300e840 Refactor NotificationFactory and support custom templates (replaces #2081) 2018-08-24 11:55:36 +02:00
Thorsten Eckel
fb697f6ae7 Test stabilization: Fixed timing issue in time comparsion by allowing 1 second off. 2018-08-24 11:32:41 +02:00
Thorsten Eckel
04e1dc78bd Fixed issue #2197: Chat-Widget disappears after close. 2018-08-24 11:30:37 +02:00
Ryan Lue
ae8fa91260 Remove quotation marks from email addresses (fixes #2154) 2018-08-24 14:45:34 +08:00
Ryan Lue
f848f8d151 Refactor validations and callbacks on ObjectManager::Attribute (fixes #2159) 2018-08-24 03:39:17 +02:00
Martin Edenhofer
1bc9f245e6 Fixed issue #2209 - Order of relation select fields (Group, State etc.) values is broken. 2018-08-23 22:23:05 +02:00
Thorsten Eckel
2c86e2cae1 Don't sync cherry-pick branches over to Github. 2018-08-23 15:43:37 +02:00
Billy Zhou
9be7269646 Fixed issue #2206 and #2207 by limiting historical_options to only select attributes 2018-08-23 15:24:45 +02:00
Ryan Lue
fddc165d86 Clarify RSpec example cases 2018-08-23 10:54:24 +02:00
Ryan Lue
28db7f1434 Add happy path test cases to Exchange folder encoding fix 2018-08-23 10:54:24 +02:00
Ryan Lue
b902fe10ae Revert changes from previous commit 2018-08-23 10:54:24 +02:00
Ryan Lue
5888f1ba44 Preliminary fix per code review [skip ci] 2018-08-23 10:54:24 +02:00
Ryan Lue
7d63868996 Force UTF-8 encoding for Exchange folders (fixes #2152) 2018-08-23 10:54:24 +02:00
Billy Zhou
2656ee965c Corrected mistake in reply creation time (article.created_at) and removed extra <br> from quote header formatting 2018-08-23 10:49:44 +02:00
Martin Edenhofer
61b1a8733f Fixed issue #2204 - Max size of tabs is not recognised 2018-08-23 02:13:00 +02:00
Thorsten Eckel
4dec6209dc Test stabilization: Extended user creation browser helper by phone and active attribute. 2018-08-22 21:24:28 +02:00
Thorsten Eckel
79ff7a66fc Fixed broken test: Check of wrong result order. Default is newest first but test checks oldest first. 2018-08-22 20:44:39 +02:00
Thorsten Eckel
6682037e3c Test stabilization: Travel back after each test to avoid missing cleanup of stubbed Time objects. 2018-08-22 20:44:31 +02:00
Ryan Lue
b0c53fe925 Private rl 2056 autorefresh translation list 2018-08-22 12:45:11 +02:00
Martin Edenhofer
64c6d706c6 Fixed issue #2200 - Unable to process email EncodingError: could not find a valid input encoding. Needed to downgrade mail gem because of parsing issues of valid mime issues. 2018-08-22 12:05:14 +02:00
Billy Zhou
35a2e991a6 Fixed issue #1426 by adding full time format string to Email quotes (fixes #1426) 2018-08-22 09:55:39 +02:00
Billy Zhou
10007e6409 Fixed issue #1864 - Bulk-Action: Not possible to change owner (fixes #1864)
See merge request zammad/zammad!8
2018-08-22 02:59:08 +02:00
Billy Zhou
16a4c2dcd1 Renamed alternative_user_options to possible_groups_owners 2018-08-21 16:22:04 +08:00
Martin Edenhofer
d22164631d Improved regex to also match host without new line at the end. 2018-08-21 08:03:51 +02:00
Billy Zhou
d42d0ff469 Addressed QA comments on merge request 8 2018-08-21 12:58:54 +08:00
Billy Zhou
54055bcc5d Switch to overview_open 2018-08-20 19:53:44 +08:00
Billy Zhou
943c793232 Fixed issue #2020 by checking against past select attribute options (fixes #2020) 2018-08-20 15:12:23 +08:00
Martin Edenhofer
a8642d3ed0 Follow up for issue #2193 - re-enabled shown anonymous if no caller is exists. Fixed triggering event of new/changed caller log items. 2018-08-17 16:12:28 +02:00
Billy Zhou
1f7841340c Fixed issue #2020 by checking against past select attribute options (fixes #2020) 2018-08-17 17:45:58 +08:00
Martin Edenhofer
c60be2140e Fixed issue #2193 - Puma performance is going worst if users with phone attribute are updated or new tickets are created. 2018-08-17 09:48:12 +02:00
Martin Edenhofer
a284421ed7 Fixed issue #2191 - Sometimes automatisation is not executed. 2018-08-16 15:12:55 +02:00
Martin Edenhofer
6cd63bde54 Added api doc to controller (and also to docs repo). 2018-08-16 13:13:20 +02:00
Thorsten Eckel
e619fceb28 Follow up: Fixed issue #2183 - Mysql2::Error: Invalid default value for 'start_at'. 2018-08-16 09:32:58 +02:00
Ryan Lue
1f3da97cc9 Avoid saving users during LDAP import if unchanged (fixes #2187) 2018-08-16 09:53:46 +08:00
Thorsten Eckel
c6e6423dd0 Fixed issue #2183 - Mysql2::Error: Invalid default value for 'start_at'. 2018-08-15 21:43:38 +02:00
Martin Edenhofer
cc326ad93b Follow up for issue #2171 - Overview not showing unassigned tickets "if not defined" (e. g. for owner but also for select or input fields). 2018-08-15 17:16:41 +02:00
Martin Edenhofer
1306ca16a9 Implemented issue #2188 - WebApp (monitoring section) claims scheduler not running, if delayed jobs get too many. 2018-08-15 09:11:48 +02:00
Billy Zhou
9c600bbfe5 Fixed issue #1864 - Bulk-Action: Not possible to change owner (fixes #1864) 2018-08-14 12:41:59 +08:00
Ryan Lue
88938024cd Adjust Channel::EmailParser#parse to try charset supplied in header (fixes #2167) 2018-08-13 16:01:23 +08:00
Ryan Lue
4ec3f1324d Change call log to display inactive users with strikethrough (fixes #2096) 2018-08-10 17:43:54 +08:00
Martin Edenhofer
abd3332524 Improved migration. 2018-08-10 08:09:03 +02:00
Martin Edenhofer
e36bf7ef53 UpdatedUpdated CHANGES. 2018-08-10 02:36:07 +02:00
Martin Edenhofer
101d7d975c Use rake script for elasticsearch index deletion. 2018-08-10 02:14:51 +02:00
Martin Edenhofer
72792fadd6 Improved data structure of cti caller log to get better statistics. 2018-08-09 23:58:01 +02:00
Ryan Lue
a93f81e20b Make String#utf8_encode more robust (fixes #2176) 2018-08-09 18:54:51 +08:00
Martin Edenhofer
be11e9a1d5 Added headless support for ff and chrome. 2018-08-09 06:05:41 +02:00
Martin Edenhofer
e9c26a5f7c Enabled cti integration for RPM installations. 2018-08-09 06:04:33 +02:00
Martin Edenhofer
c73d48485b Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-08-09 06:03:50 +02:00
Billy Zhou
428c68d06a Fixed issue #2170 by moving channel setting to the model 2018-08-08 20:34:49 +08:00
Martin Edenhofer
a7d21e416b Improved notification logging for better support/debugging. 2018-08-07 14:49:32 +02:00
Martin Edenhofer
768fdf08a0 Follow up for issue #1267 - added Russian translation. 2018-08-07 12:38:20 +02:00
Martin Edenhofer
1755163c00 Fixed issue #2172 - Do not allow to create pre existing attributes like updated_at via object manager. 2018-08-06 20:44:37 +02:00
Martin Edenhofer
0c7c33b64c Fixed issue #2171 - Overview not showing unassigned tickets "if not defined". 2018-08-06 19:36:27 +02:00
Martin Edenhofer
ce5f5a035e Fixed issue #2108 - 30 concurrent agents + each of them 30 overviews - script/scheduler.rb takes 100% CPU time - background jobs cannot be processed. 2018-08-06 12:57:24 +02:00
Billy Zhou
fb0ef19e7d Fixed issue #1616 by adding adding observe active: true to org profile 2018-08-03 23:00:06 +08:00
Ryan Lue
9b495847d2 Restore missing email parser test cases 2018-08-03 14:07:01 +08:00
Martin Edenhofer
e5cd5ce845 Fixed issue #2164 - i-doit: Double click needed to select object after searching (w/o category). Fixed issue #2165 - i-doit: Setting object before filling in the ticket information removed the i-doit objects. 2018-08-02 23:21:13 +02:00
Billy Zhou
b358374ff5 Fixed issue #2141 by switching to strict_decode64 for validating base64 content 2018-08-02 18:04:09 +08:00
Ryan Lue
e341d07d6b Stop wrapping <a> tags around URLs without a scheme/protocol (fixes #2139) 2018-08-02 16:21:59 +08:00
Billy Zhou
4479e180bd Fixed issue #2141 by switching to strict_decode64 for decoding base64 2018-08-02 10:43:18 +08:00
André Bauer
59b8ccde1f get elasticsearch index from settings too 2018-07-31 12:01:02 +02:00
André Bauer
4a610346cc some additions for external elasticsearch servers 2018-07-31 10:06:20 +02:00
André Bauer
0dec2e5045 fix elasticsearch setting on update 2018-07-31 08:29:04 +02:00
Felix Niklas
fbf6133dfd Searchable Select: prevent modal closes when closing a autocompletion dropdown 2018-07-29 16:37:17 +02:00
Felix Niklas
9a09532718 Searchable Select: fix tab-back bug
make the shadow input non-tabable via tabindex=“-1” to prevent it from accepting tabs, fixes #1958
2018-07-29 16:36:52 +02:00
Felix Niklas
7d5d2626c2 Attachment: add focus style so that it gets highlighted when tabbing through inputs
- also, usability: use a <label> for “select attachment…” and connect it to the <input type=“file”>
2018-07-29 15:20:40 +02:00
Felix Niklas
23dd56feb1 Revert "Search: loading indicator, no result screen, extended search on enter"
This reverts commit 2639df5a97.
2018-07-28 15:33:53 +02:00
Felix Niklas
b411cabe5b Revert "Icons: add mood-sad"
This reverts commit 0445b4ee49.
2018-07-28 15:33:39 +02:00
Felix Niklas
0445b4ee49 Icons: add mood-sad
message smilie with a sad face and changeable color
2018-07-28 12:32:22 +02:00
Felix Niklas
2639df5a97 Search: loading indicator, no result screen, extended search on enter
- open extended search on enter, solves #560
- show searching indicator, requested in https://community.zammad.org/t/delay-after-querying-a-search/405
- show no result screen, solves #788
- fix bug: when on ‘#search’, ‘show search results’ in the search sidebar was highlighted as active too because it links to #search
- clear search when entering a search result
2018-07-28 12:15:30 +02:00
Felix Niklas
dc884fc604 TicketZoom: don’t show scroll-header when its not needed
fixes the bug mentioned here: https://community.zammad.org/t/chrome-min-height-101/1004
2018-07-27 18:09:39 +02:00
Felix Niklas
5ac5932320 Better sidebar scrollbar spacing
With the sidebar tabs overlapping the main content there needs to be a gap between the sidebar and the tabs for the scrollbar. The most elegant solution would be to only open up this gap when a scrollbar is visible. But the tabs are part of the sidebar and thus life in a different controller. For now a cleaner solution that to force a scrollbar is to show an empty scrollbar.
2018-07-27 18:08:38 +02:00
Martin Edenhofer
52bfa30bac Improved i-doit browser test. 2018-07-27 12:02:52 +02:00
Martin Edenhofer
16fdc8ee10 Added sort tests for select, checkbox and radio element. 2018-07-27 11:32:10 +02:00
Martin Edenhofer
093c9e7621 Fixed #2132 by putting the I-doit objects in ticket preferences by creating the ticket. 2018-07-26 16:24:31 +02:00
Martin Edenhofer
525086d09c Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-07-26 09:06:29 +02:00
Martin Edenhofer
0cc00bfbea Added comments for icon methods. 2018-07-26 09:05:57 +02:00
Martin Edenhofer
d48e2ffd0f Small improvement to test. 2018-07-26 09:04:03 +02:00
Martin Edenhofer
699804f945 Added logger if ticket got deleted via trigger. 2018-07-26 09:02:34 +02:00
Thorsten Eckel
cab0d43d5e Test stabilization: Applied required changes for HTTPS migration of VZ 'test' server. 2018-07-25 13:48:57 +02:00
Thorsten Eckel
7a40517cb4 Test stabilization: Improved handling of modal dialogs. 2018-07-25 13:48:32 +02:00
Thorsten Eckel
5727c571ff Test stabilization: Unjoined threads lead to stuck test suite. 2018-07-25 13:47:15 +02:00
Thorsten Eckel
14afe747f9 Test stabilization: Macro execution and result checking lead to race condition. 2018-07-25 13:47:09 +02:00
Thorsten Eckel
31af83e9e6 Test stabilization: Input fields in modal get filled before modal is faded into view and while focus is set to a different field. 2018-07-25 13:45:50 +02:00
Thorsten Eckel
1795ffdb9e Improved modal_ready browser test helper to check for actual css class. 2018-07-25 13:45:36 +02:00
Thorsten Eckel
53db2cfc8e Test stabilization: Race condition between clicking and receiving a new article causes click to fail. 2018-07-25 13:45:29 +02:00
Thorsten Eckel
6998eb9be2 Test stabilization: The combination of sleep and exists_not is slow and prone to timing issues. 2018-07-25 13:45:19 +02:00
Thorsten Eckel
5e4958e7ac Test stabilization: Upload is sometimes faster than the button can be checked. 2018-07-25 13:45:14 +02:00
Thorsten Eckel
364f74f558 Test stabilization: Updated overview push via the Scheduler to the frontend might take a bit longer. 2018-07-25 13:45:04 +02:00
Thorsten Eckel
6b50097f95 Added browser test helper to navigate to overview by name or link. 2018-07-25 13:44:50 +02:00
Ryan Lue
1819941989 Add example for User callback spec (for #2057 fix) 2018-07-23 23:33:35 +08:00
Billy Zhou
a6fea45bcf Fixed issue #1564 by using proper localeCompare for string comparisons 2018-07-23 22:15:09 +08:00
Ryan Lue
9cfeec86be Update CallerId table when user phone numbers change (partially fixes #2057) 2018-07-23 16:28:21 +08:00
Ryan Lue
0afd2ba741 Make new CallerId records adopt matching call logs (partially fixes #2057) 2018-07-23 16:27:07 +08:00
Ryan Lue
8c02483334 Add ActiveJob configuration / base class 2018-07-23 16:23:01 +08:00
Martin Edenhofer
902b5aca32 Enhancement to issue #2117 - added generic approach with callback methods for submit disable/enable of attachment uploading. 2018-07-23 08:50:26 +02:00
Martin Edenhofer
0fd7dde63e Enabled elasticsearch 2.4 support by using type string. 2018-07-22 20:24:06 +02:00
Billy Zhou
b4bbe26313 Fixed #1564 by using proper localeCompare for string comparisons 2018-07-20 22:16:06 +08:00
Billy Zhou
eebec0aebb Fixed failing tests in test/integration/elasticsearch_active_test.rb 2018-07-20 21:20:21 +08:00
Billy Zhou
719b80f98b For Elasticsearch, sort by active flag first before everything else 2018-07-20 19:32:22 +08:00
Billy Zhou
01717bcc7f For Elasticsearch, sort by active flag first before everything else 2018-07-20 19:29:40 +08:00
Ryan Lue
a7749d663f Handle race condition when calling ActivityStream#assets (fixes #2066) 2018-07-20 17:51:18 +08:00
Martin Edenhofer
45ed1b3638 Follow up for issue #641 - make macro working also on slower network connections (close tab if macro is executed sucessfully). And disable update button until macro is executed. 2018-07-20 10:31:03 +02:00
Ryan Lue
c61dd3eab4 Specify updated_by_id in LDAP deactivation sequencer unit (fixes #2111) 2018-07-20 09:12:03 +08:00
Muhammad Nuzaihan
903777588a Add option for body to be searchable for new triggers (fixes #1989)
add tests for new body field in trigger condition
2018-07-20 09:10:49 +08:00
Ryan Lue
3800db6386 Add nil handling to Associations::Assign sequencer unit (fixes #2110) 2018-07-20 09:10:49 +08:00
Billy Zhou
1a6e58ac8f Fixed #2117 by disabling the create/update button during file uploading 2018-07-20 08:55:53 +08:00
Martin Edenhofer
96e31cd8ae Moved tests into organizations_controller_test.rb. 2018-07-20 02:08:50 +02:00
Martin Edenhofer
d2d6fa981c Resolved merge conflict. 2018-07-19 19:19:30 +02:00
Martin Edenhofer
86c79c3dba Follwup for issue #2031 - restored original default sort_by updated_at attribute and unified names of controller tests. 2018-07-19 18:54:12 +02:00
Martin Edenhofer
29c61f0586 Implemented issue #2136 - Improve admin -> user -> default shown users are sometimes different with and/or without search text -> unify search. 2018-07-19 16:28:08 +02:00
Billy Zhou
166e1e04f1 Added fix for #2117 by disabling the create/update button during file uploading 2018-07-19 15:07:25 +08:00
Thorsten Eckel
f2ff8ee532 Merge branch 'develop' of https://github.com/zammad/zammad into develop 2018-07-19 08:24:21 +02:00
Ryan Lue
156d837573 Update doorkeeper gem (security issue) 2018-07-19 11:37:08 +08:00
André Bauer
1912e56534 made examples ssl config mor letsencrypt specific 2018-07-18 16:39:11 +02:00
Martin Edenhofer
ef8e08b270 Merge branch 'develop' of github.com:zammad/zammad into develop 2018-07-18 16:01:20 +02:00
Martin Edenhofer
597cd01b5a Implemented issue #2073 - Allow sort_by and order_by for tickets, users and organisations search REST API. 2018-07-18 16:00:06 +02:00
Ryan Lue
e64c2f3c9d Add spec for #2019 migration (and fix Trigger factory) 2018-07-18 18:52:08 +08:00
André Bauer
9a74975fba renamed ssl_trusted_certificate 2018-07-18 09:43:42 +02:00
André Bauer
486c1635dd Merge pull request #2072 from Impyus/Impyus-NGINX-SSL-Template-1
Update zammad_ssl.conf
2018-07-18 09:40:13 +02:00
Ryan Lue
0b39137cd7 Add sanitize duplicated domains in rich text form input (fixes #2019) 2018-07-18 10:17:21 +08:00
Thorsten Eckel
02d0802099 Test stabilization: Clearbit return value varies for APIHub Organization. 2018-07-17 17:41:32 +02:00
Martin Edenhofer
213f2d153f Fixed issue #2128 - Route for /auth/failure is missing to show login failure messages form oauth provider (if request was technical ok - only login was not possible by oauth provider). 2018-07-17 10:35:51 +02:00
Martin Edenhofer
ef179bf67b Improved email processing and cleaning up firstname/lastname detection. 2018-07-16 17:07:23 +02:00
Martin Edenhofer
673b7c3d65 Fixed issue #2125 - Auto responder is not set from correct group. 2018-07-13 19:50:10 +02:00
Billy Zhou
bc489aecef Fixed issue #2104 - image modal not closed when opening new ticket 2018-07-13 11:07:55 +08:00
Billy Zhou
e6fd81b5b4 Fixed #2104 image modal not closed when opening new ticket 2018-07-12 23:14:25 +08:00
Billy Zhou
4685f147e6 Merge branch 'private-bz_2105_update_button_unusable_after_modal_dialog_is_gone_rebased' into develop 2018-07-12 21:43:04 +08:00
Billy Zhou
f1b7639467 Merge branch 'develop' of https://git.znuny.com/zammad/zammad into develop 2018-07-12 15:19:52 +08:00
Billy Zhou
09313ed326 Revert "Revert "Added group by direction feature to Overviews""
This reverts commit d02edbfc3b.
2018-07-12 15:18:39 +08:00
Ryan Lue
f041fef7ff Add migration to retroactively convert HttpLogs to UTF8 2018-07-12 13:52:33 +08:00
Ryan Lue
680a560c06 Convert HttpLog request/response attrs to UTF8 before saving (fixes #2100) 2018-07-12 13:49:25 +08:00
Ryan Lue
2e4b7128f1 Add autodiscovery exception handling to ExchangeController 2018-07-12 13:24:16 +08:00
Billy Zhou
d02edbfc3b Revert "Added group by direction feature to Overviews"
This reverts commit 817f39e8c6.
2018-07-12 11:32:12 +08:00
Billy Zhou
817f39e8c6 Added group by direction feature to Overviews 2018-07-12 11:11:26 +08:00
Martin Edenhofer
ae3e2141b1 Refactoring of perform/set attributes in trigger and postmaster filter ui (now use clean template - not side effects regarding autocompletion and tags). 2018-07-11 09:40:23 +02:00
Billy Zhou
730ed13b7b Fixed issue #2105 update button unusable after modal dialog is gone 2018-07-11 15:08:32 +08:00
Ryan Lue
370b1a2645 Refactor Import::Exchange::Folder#children 2018-07-11 09:52:43 +08:00
Ryan Lue
97f55bcd83 Add error check if Exchange config gives empty folder list (fixes #1802) 2018-07-11 09:52:38 +08:00
Ryan Lue
a6d554cfb3 Organize gitignore 2018-07-10 11:54:43 +08:00
Thorsten Eckel
7750f4cdca Migrated RSpec UserController test to request test because controller tests are soft deprecated. 2018-07-09 13:00:52 +02:00
Thorsten Eckel
348429940d - Skip CSRF validation if config.action_controller.allow_forgery_protection is disabled (Rails standard).
- Improved CSRF request method check (inspired by Rails).
2018-07-09 13:00:43 +02:00
Thorsten Eckel
b96de74964 Fixed bug: Setting changes in RSpec test are leaking. 2018-07-09 13:00:38 +02:00
Thorsten Eckel
132a88005f Test stabilization: Increase read timeout of Elasticsearch index creation to avoid index_already_exists_exception because of retry. 2018-07-07 11:12:03 +02:00
Thorsten Eckel
8172b17733 Test stabilization: Once in a while uploads take longer than expected. 2018-07-07 11:11:55 +02:00
Thorsten Eckel
12ea65f84f Ordered failed background jobs by number of entries which also stabilizes test. 2018-07-07 11:09:31 +02:00
Thorsten Eckel
7e9728b970 Test stabilization: Application reboot might take some time after ObjectManager Attribute change. 2018-07-07 11:09:20 +02:00
Thorsten Eckel
821415a916 Test stabilization: Freezed time to avoid timing issue while decimal minutes block changes. 2018-07-07 11:09:05 +02:00
Mantas
7bb7e7a438 Fixes #1123 Attachments get doubled when suspending a draft 2018-07-06 15:14:20 +02:00
Mantas
3545893c3d Fixes #1693 pending till date issue 2018-07-06 15:10:03 +02:00
Mantas
ada6efa3bc Fixes #1730 When forwarding a message, prefix FWD is added 2018-07-06 15:07:10 +02:00
Mantas
9cdb0d5ce4 Fixes #2088 User doesn't appear in drag&drop overlay in a group if access is via roles 2018-07-06 15:02:41 +02:00
Martin Edenhofer
468b5bf12e Fixed issue #2118 - A ticket created by customer via web with state new is set to open on second update by customer. 2018-07-06 14:30:12 +02:00
Martin Edenhofer
dd48e4dae5 Updated nokogiri gem - CVE-2018-8048. 2018-07-06 08:13:26 +02:00
Ryan Lue
113d13c3ad Rename CanLookup RSpec shared example group to follow existing pattern 2018-07-05 23:43:52 +08:00
Ryan Lue
6ca5054d03 Add RSpec for newly refactored CanLookup 2018-07-05 22:20:51 +08:00
Ryan Lue
901cc3fadf Improve NULL handling to Ticket#selector2sql (fixes #1316) 2018-07-05 21:26:24 +08:00
Thorsten Eckel
aeb5dbc4b1 Devs are responsible for their ENV management themselves. 2018-07-05 15:22:13 +02:00
Ryan Lue
743bbcd794 Refactor CanLookup concern 2018-07-05 15:43:15 +08:00
Martin Edenhofer
2b31311bea Fixes #1847 - Report profiles - ticket.tags conditions are not working. 2018-07-04 18:24:51 +02:00
Martin Edenhofer
7bdec55960 Follow up for issue #2087 - improved tests - No mime_type on nil message (no message body) / email will not be processed. 2018-07-04 17:03:04 +02:00
Felix Niklas
3186d5e4d7 autocomplete: also indicate inactive organizations 2018-07-04 14:58:40 +02:00
Felix Niklas
f4c50ae0fa autocomplete: indicate inactive users and make them non-selectable 2018-07-04 14:58:40 +02:00
Felix Niklas
690843fcf1 icons.svg: remove non-existing icons 2018-07-04 14:58:22 +02:00
Martin Edenhofer
3b107f0a31 Fixes issue #2087 - No mime_type on nil message (no message body) / email will not be processed. 2018-07-04 13:59:05 +02:00
Martin Edenhofer
5bbff10764 Fixes issue#2098 - Report profiles: "before(relative)" and friends broken. 2018-07-03 16:39:42 +02:00
Thorsten Eckel
35771d6ab6 Fixed bug: Icons in /public/assets/images/icons are ignored but shouldn't. 2018-07-03 10:18:42 +02:00
Billy Zhou
cf327a09a1 Fixed issue #2058 - Autocomplete hangs on dot in the new user form 2018-07-03 15:18:55 +08:00
Thorsten Eckel
866c31587e Fixed bug: Outdated data is used for Websocket session data gathering and is send to the frontend in some cases. 2018-07-02 10:19:16 +02:00
Thorsten Eckel
e9bbff97a9 Fixed duplicate code that causes additional SQL queries. 2018-07-02 09:38:20 +02:00
Thorsten Eckel
2f5ce86d28 Reordered git excludes to have all env management tools in one place and added byebug history to list of excluded files. 2018-07-01 17:41:53 +02:00
Martin Edenhofer
40a663198c Fixed issue #2099 - Changing data type of new object attributes will lead to errors. 2018-06-29 08:14:18 +02:00
Martin Edenhofer
4bae98e55a Fixed typo. 2018-06-28 18:44:47 +02:00
Martin Edenhofer
5980b7ab59 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-06-28 17:17:36 +02:00
Martin Edenhofer
39d57f3428 Follow up for issue #1394 - added Twitter::Geo as object to convert - Reindex elastic search not possible because of <null>/Twitter::NullObject. 2018-06-28 17:17:27 +02:00
Thorsten Eckel
f1296f6500 Stablized tests: Organization select in user create modal is stale. 2018-06-28 13:48:02 +02:00
Thorsten Eckel
295844c72e Fixed race condition: AJAX data fetch requests re-set sessions that should get deleted by logout request. 2018-06-28 13:39:06 +02:00
Thorsten Eckel
967105b97f - Reduced Sequencer logging to debug.
- Added Setting to change sequencer log level for various actions.
2018-06-28 13:32:14 +02:00
Martin Edenhofer
5c4c41db6f Fixed follow up for issue #2090 with order/group overviews - Unable to create an overview with a new ticket file which is starting with number like "1_test". 2018-06-28 13:26:27 +02:00
Thorsten Eckel
05adf9a534 Enable Rack::LiveReload on demand to avoid JS errors. 2018-06-27 18:44:15 +02:00
Thorsten Eckel
48ff43aaed Replaced system_agent_limit Setting MiniTest with RSpec. 2018-06-27 18:42:40 +02:00
Martin Edenhofer
baa7b97d07 Fixed issue #2101 - Inline images are lost on forward or quoted reply. 2018-06-27 15:38:25 +02:00
Thorsten Eckel
82feb10fce Allow taking screenshots in selenium session without the need of providing parameters. 2018-06-27 11:45:13 +02:00
Thorsten Eckel
d4ac9302d8 Refactored failing Macro browser test. 2018-06-27 11:44:13 +02:00
Thorsten Eckel
fb397822be Added browser test helper to create and perfom Macros. 2018-06-27 11:43:50 +02:00
Thorsten Eckel
a9239997ef Fixed race condition: Running AJAX requests after logout was performed cause side effects. 2018-06-26 09:01:02 +02:00
Thorsten Eckel
a70153106a Fixed race condition: Scheduler job pushes outdated data to the client. 2018-06-26 08:59:46 +02:00
Thorsten Eckel
20ea94d34b Fixed regression: Escalation logic is not active. 2018-06-25 16:20:45 +02:00
Thorsten Eckel
5865d94339 Fixed cache invalidation bug race condition: Changes to group relation participant are not reflected to the other side and FE updates will be incomplete/outdated. 2018-06-25 15:24:23 +02:00
Thorsten Eckel
e5d05349db Invited pry-rescue and pry-stack_explorer to the party 🎉 Taking debugging to the next level 🚀. 2018-06-25 15:24:23 +02:00
Thorsten Eckel
cde033f8f7 Fixed bug: RSpec tests get stuck in time 👽 2018-06-25 15:24:23 +02:00
Martin Edenhofer
f80fbf4744 Small code cleanup. 2018-06-25 13:11:42 +02:00
Martin Edenhofer
24a30ad26c Improved cleaning up migrations later and applied ux_flow_next_up = 'next_task' for default "Close & tag as spam" macro. 2018-06-25 13:08:26 +02:00
Martin Edenhofer
76f3a2876b Review of correct test helper for integration tests. 2018-06-25 13:07:47 +02:00
Martin Edenhofer
4120afb131 Fixed issue #1246 - Filename of images (c&p) downloaded via lightbox is invalid. 2018-06-25 11:25:30 +02:00
Martin Edenhofer
d19f8c2b66 Improved test to match use case/settings of issue #2038. 2018-06-25 00:11:10 +02:00
Thorsten Eckel
cda05285f3 Invited byebug to the party 🎉 Taking debugging to the next level 🚀. 2018-06-24 18:57:13 +02:00
Ryan Lue
d6f1c3d9ec Fix word boundary check in Ticket::Number::{Date,Increment}#check 2018-06-23 19:49:06 +08:00
Thorsten Eckel
df0b213691 Stablized tests: Delayed::Job entries added in previous tests cause failing tests. 2018-06-23 08:18:41 +02:00
Thorsten Eckel
6a1eb1fef4 - Test stabilization: Overview prio rearrangement fails in the case that an Overview with the same prio as the one changed to exists.
- Migrated Overview MiniTest to RSpec.
2018-06-22 14:59:19 +02:00
Thorsten Eckel
b4ffbc963c Fixed bug: New model record won't get refreshed in current function call as it should be if param 'later' is given. 2018-06-22 14:55:15 +02:00
Thorsten Eckel
4f6b0f7384 Improved logging of restart command. 2018-06-22 14:53:53 +02:00
Thorsten Eckel
6ff324094c Fixed race condition and improved performance: Refresh models after all new records of _all_ types were added instead of current model only. 2018-06-22 14:53:29 +02:00
Thorsten Eckel
798add3642 Test stabilization: Limited window for possible race condition between server restart and availability check. 2018-06-22 14:52:24 +02:00
Thorsten Eckel
db1378244c Test stabilization: Test expects that Setting 'system_id' has different initial value than ID 999 but hasn't because of other tests storing ID 999 before in some scenarios. 2018-06-22 14:39:32 +02:00
Thorsten Eckel
e57707336c Test stabilization: Disconnect connected chats only
There is a race condition between clients exiting the chat session and disconnecting via a click. In cases where the client disconnects first the disconnect button is already hidden (not clickable) and Selenium will fail.
2018-06-22 14:32:51 +02:00
Thorsten Eckel
bfd560ab49 Test stabilization: Unexpected order if Tags get created in same ms. 2018-06-22 14:29:04 +02:00
Thorsten Eckel
789f2b4807 Refactored code layout and prefer pluck over select to avoid unnecessary memory allocation. 2018-06-22 14:27:54 +02:00
Thorsten Eckel
c3105bb804 Add response body to result of client errors because there might be information provided by the server. 2018-06-22 14:27:32 +02:00
Thorsten Eckel
21d8862988 Test stabilization: Check Clearbit address against list of possible result values. 2018-06-22 14:25:01 +02:00
Thorsten Eckel
f34f0d14de Test stabilization: Make ES indexes more unique and remove delete indexes only if necessary. 2018-06-22 14:23:23 +02:00
Thorsten Eckel
c25a55457b Increase waiting time for app-restart after adding OM attributes. 2018-06-22 14:08:47 +02:00
Thorsten Eckel
b03576f617 Fixed unstable test caused by not being able to click on Avatar at the top of the zoom view. 2018-06-22 14:07:42 +02:00
Martin Edenhofer
2c654404ce Follow up fix for issue #2082 - escalation_at are not updated correctly. 2018-06-22 12:51:42 +02:00
Ryan Lue
adda2dfa5e Refine email followup search logic (fixes #2038) 2018-06-22 14:10:07 +08:00
Ryan Lue
2da68fa177 Add minimal test for existing followup search feature 2018-06-22 14:10:07 +08:00
Ryan Lue
77ae51c914 Refactor frontend ticket navigation with TicketNavigable mixin 2018-06-22 14:06:07 +08:00
Ryan Lue
14fb64ba0a Implement ux_flow_next_up feature for macros (soft fix for #641) 2018-06-22 14:06:07 +08:00
Martin Edenhofer
82acddc420 Fixed issue #2046 - Special characters get HTML encoded when displayed in overviews. Improved PR #2049. 2018-06-21 00:33:44 +02:00
Martin Edenhofer
947d2bcc25 Follow up for issue #1991 - improved browser unit test. 2018-06-20 20:15:44 +02:00
Muhammad Nuzaihan
0442efe8c8 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-06-20 20:13:52 +08:00
Muhammad Nuzaihan
9f559276e4 improve email filters by adding a tag option - closes #1991 2018-06-20 20:13:35 +08:00
Martin Edenhofer
2ec4c965de Fixed issue #2016 - Scheduler will stop after removing own ticket attribute but overview with condition which is including attribute git dropped. Merge pull request #2033. 2018-06-20 13:39:41 +02:00
Martin Edenhofer
577776c324 Improved stability of test. 2018-06-19 23:43:40 +02:00
Martin Edenhofer
1aeb5b3f12 Updated sprockets gem. 2018-06-19 20:11:19 +02:00
Martin Edenhofer
0dbfcd0edf Fixed issue #2090 - Unable to create an overview with a new ticket file which is starting with number like "1_test". 2018-06-19 19:32:28 +02:00
Martin Edenhofer
db82816f87 Follow up for issue #2082 - improved tests - escalation_at are not updated correctly. 2018-06-15 15:08:10 +02:00
Martin Edenhofer
28a1bbe4c6 Fixed issue #2082 - escalation_at are not updated correctly. 2018-06-15 13:54:07 +02:00
Thorsten Eckel
a4d000cda5 Fixed issue #1531: Inserting space character in translations (in Overviews menu item and User menu) not possible. 2018-06-14 16:07:30 +02:00
Liam Sullivan
f50bd63c41 Update zammad_ssl.conf
Indentation corrected
2018-06-13 11:07:21 +01:00
Liam Sullivan
0a619bc3f7 Update zammad_ssl.conf 2018-06-13 10:22:48 +01:00
Martin Edenhofer
8af6e2b9eb Implemented issue #2064 - Add delete existing records to CSV import feature. 2018-06-12 22:58:59 +02:00
Martin Edenhofer
4b8e615640 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-06-12 15:03:31 +02:00
Martin Edenhofer
8d0c0c634a Fixed issue #2069 - Cannot close tickets when you reply to an email at the same time. 2018-06-12 15:03:06 +02:00
Ryan Lue
23f30921dc Fix regression in HtmlSanitizer::cleanup_target (whitespace deletion) 2018-06-12 15:39:17 +08:00
Ryan Lue
5583369d8b Render umlauts and other multi-byte characters correctly in HtmlSanitizer::strict 2018-06-08 13:25:15 +08:00
Ryan Lue
c17a29cd0f Refactor Channel::EmailParser#parse method 2018-06-08 11:45:22 +08:00
Ryan Lue
8951d3f1bd Refactor email parser test &c. 2018-06-08 11:45:22 +08:00
Ryan Lue
dfebe8d767 Relocate test data files from test/fixtures to test/data 2018-06-08 11:45:22 +08:00
Ryan Lue
13ef5d4246 Rewrite Encode::conv as String#utf8_encode 2018-06-08 11:45:18 +08:00
Ryan Lue
2233cded7f Add type coercion to fix #2054 2018-06-06 23:55:23 +08:00
Martin Edenhofer
0693420fa1 Update for 2.6.0. 2018-06-06 03:35:42 +02:00
Martin Edenhofer
b58ac7e1be Improved issue #675 - Added web UI for import of users and organisations via csv files. 2018-06-06 03:30:17 +02:00
Martin Edenhofer
52ab76d7a7 Implemented issue# 376. Added more headers to match. 2018-06-05 20:46:46 +02:00
Martin Edenhofer
492f6f994c Updated lables. 2018-06-05 16:48:57 +02:00
Martin Edenhofer
7338b91a31 Improved monitoring controller to get storage usage. 2018-06-05 16:11:44 +02:00
Thorsten Eckel
9d972f9efd - Revert "Fixed/stabilized User access browser test." 61aa8fb84a.
- Removed dead comments.
- Simple code cleanup without changing behavior.
2018-06-05 14:30:52 +02:00
Thorsten Eckel
c50d6a49ed Centralized Elasticsearch and searchindex logic into single support helper module. This fixes an issue on the CI env that is caused by not removed ES indexes. 2018-06-05 12:38:16 +02:00
Thorsten Eckel
7f4c540fa0 Retry on stale element reference to avoid race conditions while interface is not ready yet. 2018-06-05 12:38:16 +02:00
Thorsten Eckel
ba9845cb68 Moved coverage logic into support folder to increase clarity and only include on TravisCI runs to reduce test runtime. 2018-06-05 12:38:16 +02:00
Thorsten Eckel
11e63fe21a Migrated after_* callbacks to after_commit to avoid race conditions between cache creation and database insert/update. See: http://api.rubyonrails.org/classes/ActiveRecord/Transactions/ClassMethods.html\#module-ActiveRecord::Transactions::ClassMethods-label-Callbacks . 2018-06-05 12:37:52 +02:00
Thorsten Eckel
809a698c03 Fixed bug: Organization search queries don't find case insensitive results. 2018-06-05 12:37:09 +02:00
Thorsten Eckel
61aa8fb84a Fixed/stabilized User access browser test. 2018-06-05 12:37:09 +02:00
Martin Edenhofer
9a9e37c1a6 Improved CTI tests, removed removed potential race condition. 2018-06-05 10:31:59 +02:00
Martin Edenhofer
89a46cf045 Follow up for issue #2029 - fixed check if sipgate_config already is filled. 2018-06-04 16:41:00 +02:00
Martin Edenhofer
58ec1cbc8e Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-06-04 15:01:25 +02:00
Martin Edenhofer
3fa9ca8001 Improved logging messages. 2018-06-04 14:59:16 +02:00
Martin Edenhofer
fd120eda96 Improved UI for ignore certains agents to not use auto assignment - follow up for issue #1825. 2018-06-04 14:57:53 +02:00
Ryan Lue
e7caca5854 Update mail gem 2018-06-04 14:41:48 +08:00
Ryan Lue
312278c2d6 Prettify phone numbers displayed in Call Log 2018-06-01 18:13:12 +08:00
Mantas
7fd539359d Fixes #1339 deny ticket creation over web 2018-05-31 08:24:00 +03:00
Martin Edenhofer
8f708b75ea Implemented #1865 - Date of last contact (customer) - make behaviour configurable. 2018-05-30 10:49:54 +02:00
Martin Edenhofer
b403432c76 Initial support of recursive triggers for tickets - issue #2035. 2018-05-29 17:42:14 +02:00
Martin Edenhofer
53fb7e6b0b Renamed to integration_sipgate_notify_not_clearing_on_leftside_test.rb. 2018-05-29 02:46:11 +02:00
Martin Edenhofer
29a0336809 Implemented issue #2044 - Generic CTI integration. 2018-05-29 01:45:29 +02:00
Felix Niklas
7966bb3b16 icons: update icons.svg & svg-dimensions.css 2018-05-28 14:22:25 +02:00
Ryan Lue
67e8b0a2d2 Add max_allowed_packet check to MySQL initializer (fixes #2034) 2018-05-25 19:36:43 +08:00
Ryan Lue
5eb5720df3 Change default option to overwrite config/database.yml in bs:init rake task 2018-05-25 17:55:20 +08:00
Martin Edenhofer
659a288d09 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-25 08:00:32 +02:00
Martin Edenhofer
de36ffcd8a Fixed issue #1957 - "Create new Customer" form delayed display. 2018-05-25 07:59:20 +02:00
Ryan Lue
5dd699ce6f Fix sequential execution of multiple email notification triggers 2018-05-25 08:49:56 +08:00
Mantas
3a645d1c6e Fixes #2017 phone notify not clearing 2018-05-25 00:31:31 +03:00
Martin Edenhofer
c46cf246b9 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-24 19:22:35 +02:00
Thorsten Eckel
ad3362e94c Fixed issue #2040: Zendesk import: To/From extraction for system comments fails. 2018-05-24 14:49:45 +02:00
Thorsten Eckel
c21be6e928 Fixed issue #2039: Import fails for ObjectManager Attribute with non-ASCII name. 2018-05-24 14:49:38 +02:00
Thorsten Eckel
4b98c61698 Improved handling of disposition URL parameter for local URLs. 2018-05-24 14:46:22 +02:00
Thorsten Eckel
c4ea22470a Fixes #2014 - Import job (LDAP/Exchange) hangs on scheduler restart. 2018-05-23 18:58:40 +02:00
Thorsten Eckel
163a5f2f26 Refactoring - DRYing up code. Use existing .backends method. 2018-05-23 18:58:32 +02:00
Ryan Lue
3034ff7e97 REALLY revert last fix 2018-05-23 19:19:49 +08:00
Ryan Lue
77c2dc7705 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-23 19:17:54 +08:00
Ryan Lue
461505545a Revert previous fix (pending specs) 2018-05-23 19:17:05 +08:00
Ryan Lue
03c586e7fc Fix sequential execution of multiple email notification triggers 2018-05-23 19:04:51 +08:00
Ryan Lue
b057155832 Update error message in bootstrap.rake 2018-05-23 18:49:11 +08:00
Thorsten Eckel
0deedf3fea Fixed failing browsertest: Mysql2::Error: Incorrect datetime value
https://dev.mysql.com/doc/refman/5.7/en/datetime.html
The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC.
2018-05-23 10:23:09 +02:00
Thorsten Eckel
53ca6bd4c1 Fixed issue #2037: Restart of processes form application context fails. 2018-05-23 10:22:54 +02:00
Martin Edenhofer
ff11f7f3d3 Improved error handling of of invalid setting attributes. 2018-05-22 08:14:13 +02:00
Martin Edenhofer
ebebfef8b1 Fixed test (updated with new reference data). 2018-05-22 01:07:44 +02:00
Martin Edenhofer
d2446531a1 Just create screenshots of failed selenium actions (increase speed of tests too). 2018-05-22 00:58:50 +02:00
Martin Edenhofer
5b0b10ce59 Fixed issue #1930 - bulk action is not executed for a pending-state. 2018-05-22 00:57:26 +02:00
Ryan Lue
c0e02c3d89 Add LDAP user_filter to Ldap::Group#group_user_dns_memberuid search 2018-05-18 16:45:19 +08:00
Martin Edenhofer
401923c738 Fixed issue #2029 - Make sipgate.io integration working by just enable it. 2018-05-18 09:06:31 +02:00
Ryan Lue
74597ba566 Comment out default postgres credentials in database.yml 2018-05-17 11:42:44 +08:00
Ryan Lue
441def375f Update Gemfile.lock for telegramAPI v1.4.1 2018-05-17 09:37:30 +08:00
Ryan Lue
739f8e9c99 Reformat ticket_spec to avoid calling rubocop:disable/enable 2018-05-16 16:13:18 +08:00
Ryan Lue
f086b30957 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-16 16:08:10 +08:00
Ryan Lue
690b9b78a5 Fix regression from refactoring NotificationFactory::Template#to_s 2018-05-16 16:07:51 +08:00
Mantas
db2eb161b1 Fixes #2012 granular and full group permissions 2018-05-16 10:07:58 +03:00
Mantas
264ab24aed Fixes #2011 user with granular permissions is shown only once in overlay 2018-05-16 10:07:51 +03:00
Mantas
498980b52c Fixes #1591 Drag&Drop groups empty 2018-05-16 10:07:45 +03:00
Ryan Lue
c3ad7e307b Fix #2001 (Use non-bang gsub in NotificationFactory:Template) 2018-05-16 13:04:25 +08:00
Ryan Lue
ca454dd461 Add /doc to .gitignore 2018-05-15 08:09:15 +08:00
Mantas
bd5e63801e Follow up for #1990 fixed test 2018-05-14 15:18:30 +03:00
Martin Edenhofer
d044219cf9 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-14 11:14:15 +02:00
Martin Edenhofer
cabb1c89d1 Improved error messages for type attributes. 2018-05-14 11:09:23 +02:00
Martin Edenhofer
91bdf9f814 Allow to access origin sender if postmaster_sender_based_on_reply_to is used (is available in mail['origin_from_*']). 2018-05-14 10:50:18 +02:00
Thorsten Eckel
9d71bb2a57 Improved logging for failed cache creation. 2018-05-11 14:21:07 +02:00
Mantas
896e4f0492 Fixes #1987 makes ticket create types configurable 2018-05-11 14:22:10 +03:00
Ryan Lue
e7ce4b9d68 Clarify Gemfile.local instructions in Gemfile 2018-05-11 19:00:25 +08:00
Ryan Lue
07411d6efa Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-11 16:56:24 +08:00
Ryan Lue
1a8221f4f0 Add pry-rails and pry-remote to Gemfile (dev/test) 2018-05-11 16:48:07 +08:00
Martin Edenhofer
f2c7ced74d Log search backend errors also to application log. 2018-05-11 10:16:18 +02:00
Martin Edenhofer
6263762ac4 Fixes issue #1971 - Admin UI does not allow to select Timezone in "Calendars" options. 2018-05-11 10:09:24 +02:00
Ryan Lue
011b3cd139 Revert accidental change to dev environment log_level 2018-05-11 13:15:13 +08:00
Muhammad Nuzaihan
813ed09d5f improve on the range selection - resolves #1956 2018-05-11 13:13:36 +08:00
Ryan Lue
3558f9a0ec Update bs:init rake task with new database.yml location 2018-05-10 19:11:31 +08:00
André Bauer
b359e2624c Merge remote-tracking branch 'github/develop' into develop 2018-05-10 13:04:47 +02:00
André Bauer
436783703b fixed typos 2018-05-10 12:55:40 +02:00
André Bauer
378bf007b7 set execute bit on before.sh 2018-05-10 12:54:29 +02:00
André Bauer
45854246da some rework on database config, packager.io & cleanup scripts 2018-05-10 12:51:19 +02:00
André Bauer
24aa7d396c Merge pull request #2006 from lr1980/optimize_backup_script
suppress tar warning
2018-05-09 17:13:48 +02:00
André Bauer
7667b98d05 Update functions 2018-05-09 17:13:08 +02:00
Mantas
54a72907a7 Follow up for #1990 improves test by using watch_for 2018-05-09 18:01:04 +03:00
Ryan Lue
2662c17bad Avoid running websocket server spec on Travis (lacks IPv6 support) 2018-05-09 18:26:17 +08:00
Ryan Lue
8a8e775a95 Disable websocket server spec IPv6 example on systems without IPv6 support 2018-05-09 16:42:32 +08:00
Ryan Lue
f5880d537b Set RAILS_ENV in websocket server spec 2018-05-09 15:17:14 +08:00
Lutz Reinhardt
aa8f6aadd5 suppress tar warning
suppress "tar: Removing leading `/' from member names" warning
2018-05-09 09:11:40 +02:00
Ryan Lue
7faed507cf Really fix port assignment issue in websocket spec 2018-05-09 14:10:08 +08:00
Thorsten Eckel
81f958a18a Improved wording and removed unnecessary comment/dead code. 2018-05-08 17:31:04 +02:00
Thorsten Eckel
ccbf1d4a71 Removed unnecessary info text for already completed import jobs. 2018-05-08 17:27:19 +02:00
Martin Edenhofer
cd0a6fe596 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-08 16:24:08 +02:00
Martin Edenhofer
7ed98af7ee Folllow up for issue #1977 - recent_views fk already exists (no test needed). 2018-05-08 16:19:34 +02:00
Mantas
662032aa13 Fixes #1990 missing CC autocomplete 2018-05-08 16:00:52 +03:00
Martin Edenhofer
6e899948c1 Follow up for issue #1995 - Missing DB index on article columns queried by ticket waiting time report backend - limit the max. ticket count to 20_000 each day. 2018-05-08 14:37:36 +02:00
Martin Edenhofer
9379d7afe6 Follow up for issue #1977 - recent_views fk already exists, reconnect on postgres to be able to execute further sql statements. 2018-05-08 14:34:40 +02:00
Martin Edenhofer
b764e7b3e5 Fixes issue #1995 - Missing DB index on article columns queried by ticket waiting time report backend. 2018-05-08 14:18:15 +02:00
Martin Edenhofer
f75986af52 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-08 13:45:19 +02:00
Martin Edenhofer
156abbbcf9 Folllow up for issue #1977 - recent_views fk already exists. 2018-05-08 13:29:43 +02:00
Ryan Lue
f1c1a16c7f Hotfix for CI build broken by 297d9bb 2018-05-08 19:16:28 +08:00
Ryan Lue
121c06e4be Hotfix for websocket-server spec (port assignment) 2018-05-08 18:31:43 +08:00
Ryan Lue
edee264e38 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-08 18:27:37 +08:00
Ryan Lue
1960136b5e Hotfix for moved database.yml.pkgr file 2018-05-08 18:27:05 +08:00
Martin Edenhofer
cf88f53095 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-05-08 12:22:59 +02:00
Ryan Lue
297d9bb044 Clean up database.yml files 2018-05-08 18:18:29 +08:00
Martin Edenhofer
cb56a53a07 Fixed issue #1977 - Remove online notifications too if user is deleted. 2018-05-08 12:10:19 +02:00
Muhammad Nuzaihan
cd4dc311ae Refactor and test IPv6 support in websocket server 2018-05-08 18:10:04 +08:00
Martin Edenhofer
d19d49fea4 Let's click text module on every area (also on keyword). 2018-05-08 11:50:52 +02:00
Martin Edenhofer
45c4488b7d Improved error handling. 2018-05-08 11:50:11 +02:00
Mantas Masalskis
57c1124a42 Fixed issue #1770 - Owner reset after group selection (#1926) 2018-05-08 08:46:28 +02:00
Mantas
ee20aa2a12 Merge branch 'private-issue1996-reply-recipient' into develop 2018-05-07 16:17:02 +03:00
Martin Edenhofer
7b01f6e538 Fixes issue #1996 - Use of wrong recipient if sender is also an agent (verify all recipient in to of article of there is a local address somewhere - not only the first one). 2018-05-07 14:30:39 +02:00
André Bauer
d596389c15 added ubuntu 18.04 on packager.io 2018-05-06 16:38:31 +02:00
Thorsten Eckel
ddd7cb315a Fixed rubocop complains by restoring the deactivation of Rails/InverseOf. 2018-05-05 19:03:14 +02:00
Ryan Lue
04055f7095 Replace unless with if ! (project-wide) 2018-05-04 22:05:10 +08:00
Ryan Lue
b79a76d6f8 Add nil-check to fix failing browser test 2018-05-04 17:31:20 +08:00
Ryan Lue
79d4284365 Fix rubocop violations 2018-05-04 14:04:18 +08:00
Ryan Lue
1c386bc0b1 Setup & test zh-tw locale fix for 2.5.0 release 2018-05-03 21:59:37 +08:00
Thorsten Eckel
8f07ac70f4 Fixed URL required for mocking X-On-Behalf-Of header. 2018-05-03 10:09:53 +02:00
Martin Edenhofer
b48a8c9b42 Improved sleep of ci tests (groups test jobs). 2018-04-30 14:51:18 +02:00
Ryan Lue
18dee9e6c9 Use existing config values in LDAP wizard
Fixes #1854
2018-04-30 16:05:59 +08:00
Ryan Lue
4465fbeb63 Use existing config values in LDAP wizard
Fixes #1854
2018-04-30 15:54:42 +08:00
Thorsten Eckel
db48e92ace Fixed flanky test by using same value for check as for stored instead of dynamic. 2018-04-30 09:28:03 +02:00
Muhammad Nuzaihan
162b1ac093 include custom attributes when generating reports and time accounting data. Closes #1894 #1964 2018-04-27 21:35:20 +08:00
Martin Edenhofer
a541e6194c Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-04-27 13:41:32 +02:00
Martin Edenhofer
e49fa1cbbc Improved order of overviews if prio is equal (use also name). 2018-04-27 13:40:55 +02:00
Thorsten Eckel
68682b3607 Refactoring: Improved test performance and stability by sleeping only in production env. 2018-04-27 11:52:04 +02:00
Martin Edenhofer
12fb3c9126 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-04-26 23:23:58 +02:00
Martin Edenhofer
f023a5ad59 Fixes issue #1980 - ObjectManager: New select attributes with empty selection will lead block UI. 2018-04-26 23:18:37 +02:00
Thorsten Eckel
845c9d105b Improved logging for delayed job cleanup logic to reason about left over jobs scheduler restart issue. 2018-04-26 13:00:25 +02:00
Thorsten Eckel
8db4ff31cf Follow up #1814 and #1822: LDAP sync BaseDN detection is broken because of ambiguously Coffescript syntax statement evaluation. 2018-04-26 12:58:22 +02:00
Ryan Lue
56a8481b64 Revert changes to RuboCop style guide, refactor bootstrap rake task 2018-04-26 17:38:46 +08:00
Thorsten Eckel
f541694225 Fixed bug: Setting 'system_init_done' has to be set before Zammad allows the login. 2018-04-26 11:30:43 +02:00
Thorsten Eckel
b66adbaba7 Refactoring: Execute AutoWizard.setup instead of starting a new process since we are already in the Rails application context. 2018-04-26 11:29:47 +02:00
Thorsten Eckel
ee0b51b670 Fixed bug: Missing file extension causes flushing of wrong file. 2018-04-26 11:28:23 +02:00
Thorsten Eckel
20f69f3cc1 Changed the order to don't have the setup output in the log files. 2018-04-26 11:27:37 +02:00
Thorsten Eckel
5f3c793f37 Refactoring: Fixed autoloading issues and workarounds by doing dependency requirement the "Rails Way".
- Removed unneeded `require`s
- Replaced needed `require`s with `require_dependency`
- Replaced `load` with Concers
- Kept gem and core `require`s

Read more about ``nrequire_dependency here: http://guides.rubyonrails.org/autoloading_and_reloading_constants.html#require-dependency

Read more about Concerns here: http://api.rubyonrails.org/v5.1/classes/ActiveSupport/Concern.html
2018-04-26 10:58:16 +02:00
Ryan Lue
7c3a289103 Add bootstrapping rake tasks (bs:init & bs:reset) 2018-04-26 16:21:43 +08:00
Thorsten Eckel
8d4b4a0152 Fixed issue #1891: Missing identifier attribute on LDAP entry causes Sync to fail. 2018-04-26 09:07:41 +02:00
Martin Edenhofer
43c38dcd97 Follow up to #1963 - changed default behaviour back to only disable ssl if ssl param is explicit false to keep backward compatibility of old channel settings. 2018-04-25 22:27:23 +02:00
Martin Edenhofer
54eab60f6e Updated test with new realtime data. 2018-04-25 15:04:47 +02:00
Martin Edenhofer
fc43615554 Fixes #1974 - If fingerprint is an integer background job for verifying will fail. 2018-04-25 14:50:36 +02:00
Martin Edenhofer
3779ccc919 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-04-25 14:24:34 +02:00
Martin Edenhofer
11639e2d33 Added test for model binding after relogin. 2018-04-25 14:24:06 +02:00
Ryan Lue
856666db63 Merge pull request #1822 from sscholl/develop
Check for LDAP `namingcontexts` before calling it (fixes #1814)
2018-04-25 17:54:33 +08:00
Martin Edenhofer
5aee0b7d4b Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-04-25 01:51:01 +02:00
Thorsten Eckel
f2bf4cbd02 Refactored Channel::Filter RSpec test and added helper. 2018-04-24 15:26:09 +02:00
Martin Edenhofer
3160efc1d9 Removed duplicate test file (it's no located under test/controllers/integration_sipgate_controller_test.rb). 2018-04-24 14:48:30 +02:00
Ryan Lue
cd40b8754a Revamp Travis CI build (add RSpec, rm integrations) 2018-04-24 20:36:17 +08:00
Thorsten Eckel
3d565458b2 Fixed issue #1972: 'Host unreachable' is shown when configuring an IMAP email inbox with SSL on port 993. 2018-04-24 09:40:00 +02:00
Martin Edenhofer
12c26bcc88 Merged sipgate controller tests into regular controllers tests to increase total speed of tests (no extra job needed). Removed duplicate calendar subscription tickets controller. 2018-04-23 15:33:29 +02:00
Martin Edenhofer
33f0082da6 Fixed issue #1669 - Ticket templates disappear after logout/login in same browser session. 2018-04-23 15:12:19 +02:00
Martin Edenhofer
59d20eb30a Merged auto wizard test into unit tests to increase total speed of tests. 2018-04-23 11:52:08 +02:00
Thorsten Eckel
4a4deff2a7 Fixed issue #1969: Password reset: No such file or directory @ rb_sysopen - app/views/mailer/application_wrapper.html.erb . 2018-04-23 08:59:49 +02:00
Thorsten Eckel
c2042d0595 Fixed issue #1332: CalendarimportSync-Errors in Outlook 2016:
As described in https://github.com/icalendar/icalendar/issues/116
2018-04-22 20:15:21 +02:00
Thorsten Eckel
74dd1b21ec Fixed issue #1966: Paginated search results on Organizations can never be empty for queries that have at least one result (on an earlier page). 2018-04-20 18:28:01 +02:00
Thorsten Eckel
fd96ac58e6 Merge branch 'develop' of https://github.com/zammad/zammad into develop 2018-04-20 13:49:30 +02:00
Thorsten Eckel
050fdca64b Fixed issue of unnecessary "Unable to get asset for 'article':..." logging. 2018-04-20 13:49:10 +02:00
Martin Koppehel
e4c233a710 Implement STARTTLS for IMAP (#1963)
Fixes #769 - Imap + STARTTLS.
2018-04-20 13:46:09 +02:00
Thorsten Eckel
7a1acbe101 Fixed issue #1642: Incorrect redirect_uri during OAuth2 access token request breaks integrations. 2018-04-20 11:18:31 +02:00
Ryan Lue
5f728f20c3 Merge branch 'develop' of github.com:zammad/zammad into develop 2018-04-19 17:40:44 +08:00
Ryan Lue
a04edeb7ff Add wait before retrying failed jobs (Fix #1950) 2018-04-19 16:18:39 +08:00
Jochen Hepp
0afa283a20 Slack::Notifier::post (slack-notifier-2.3.1) returns an array of UserAgent::Result (#1878) 2018-04-19 14:04:23 +08:00
Martin Edenhofer
2f7f9bb183 Adopted test with new live api behaviour. 2018-04-18 11:20:27 +02:00
Martin Edenhofer
c5e794d37b Implemented issue #1954 - Allow to automatically linking of existing user by initial login via third party authentication provider. 2018-04-18 11:17:29 +02:00
Muhammad Nuzaihan
c02393399a improve on detection of mime-type via Store object. fixes #1919 2018-04-16 17:58:03 +08:00
Martin Edenhofer
7fac7501f7 Follow up fix for issue #1952 - New ticket attributes is also show for customers (which should not). 2018-04-16 02:43:30 +02:00
Martin Edenhofer
6b2e43baef Fixed issue #1952 - New ticket attributes is also show for customers (which should not). 2018-04-14 09:49:44 +02:00
Martin Edenhofer
221c8a0538 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-04-13 16:26:11 +02:00
Muhammad Nuzaihan
28b789c47b improves twitter outgoing direct message, fixes #1931 2018-04-13 22:19:48 +08:00
Martin Edenhofer
1088a30086 Code cleanup. 2018-04-13 16:10:21 +02:00
Martin Edenhofer
711a704602 Fixed javascript runtime error of no icon name is given. 2018-04-13 15:37:07 +02:00
Thorsten Eckel
16795605e4 Fixed bug: Changes to Setting 'html_email_css_font' are only reflected after restarting Zammad. 2018-04-13 13:43:18 +02:00
Felix Niklas
edc39d801e Chat: prevent clicking onto the status from closing the chat
Users might accidentally close the chat because they click on the online status of the agent since it looks a bit like a button

fixes #1826, thanks to @silsha for the request
2018-04-13 13:24:18 +02:00
Martin Edenhofer
cf16264940 Implemented issue #1951 - Allow pagination in search result with more then 100 results. 2018-04-13 09:22:55 +02:00
Martin Edenhofer
9791c6b72c Fixed issue #1933 - Can't find organization anymore after index rebuild. 2018-04-13 09:11:48 +02:00
Thorsten Eckel
fbeccbc85c Updated to latest rubocop version. 2018-04-12 16:59:07 +02:00
Felix Niklas
777fe192eb CSS refactor: clickable areas now inherit base css from %clickable
- adds touch-action: manipulation that improves the click latency for touch input
2018-04-12 16:52:26 +02:00
Felix Niklas
b585f46ac6 Datetime: add rtl support (correct arrows & positioning), fixes #1842 2018-04-12 16:52:25 +02:00
Felix Niklas
d8faaebbc7 Icon: support rtl {helpers} in icon names
Some arrows have to change their direction in an right-to-left layout. Based on the idea in css that start means left in ltr and right in rtl for now the icon method supports the {start} and {end} helpers that get turned into left and right depending on the directionality.
2018-04-12 16:52:25 +02:00
André Bauer
cdf0dd9d11 Merge pull request #1948 from MrGeneration/patch-1
Addition to zammad_ssl.conf
2018-04-12 13:43:24 +02:00
Martin Edenhofer
1247425310 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-04-12 13:23:56 +02:00
Martin Edenhofer
e2addae80a Fixed issue #1337 - "Signin detected from a new device" Spam. 2018-04-12 13:23:48 +02:00
Mr.Generation
cc61015062 Addition to zammad_ssl.conf
Added commented-out Proxy-Pass-settings that make the options work on openSuse and maybe other systems too. My apache 2.4 did not proxy without " "retry=1 acque=3000 timeout=600 keepalive=On" " and just threw 404. Might need testing if this is new in general. I know Ubuntu systems that work the same way.
2018-04-12 12:20:32 +02:00
Felix Niklas
d0202d73d3 Timepicker: fix highlight minutes & parse hour
- fix highlight minutes when typing in the hour, fixes #1928
- parse hour when a column gets typed
2018-04-12 12:18:28 +02:00
Martin Edenhofer
ec905e160f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-04-12 11:28:19 +02:00
Martin Edenhofer
46d9fad169 Updated md5 sum of delivered avatar images. 2018-04-12 11:28:08 +02:00
Felix Niklas
88e53e18da Action Dropdown: make sure that the action-icon is white 2018-04-12 11:02:59 +02:00
Felix Niklas
3d93443b01 Table: fix that actions in inactive rows are shown correctly
fixes #1941
2018-04-12 11:02:41 +02:00
Muhammad Nuzaihan
d98f78e50d improve on icinga detection of recovery alerts for autoclose function #1907 2018-04-12 00:44:04 +08:00
Thorsten Eckel
b60775627d Merge branch 'develop' of https://github.com/zammad/zammad into develop 2018-04-10 11:58:44 +02:00
Thorsten Eckel
577e2b1204 Fixed issue #1936: Generated chat widget code misses required option chatId. 2018-04-10 11:56:49 +02:00
Thorsten Eckel
d4519e3444 Improved gitignore file to ignore automatically and dynamically generated files when running Zammad. 2018-04-10 11:56:49 +02:00
Thorsten
53f6118e2c Merge pull request #1898 from mbeijen/812-descriptions
Fix descriptions on calendar, overview, twitter
2018-04-09 09:04:46 +02:00
Muhammad Nuzaihan
96bd39d861 improve on tests to count attachment and check attachment size 2018-04-09 14:49:32 +08:00
Muhammad Nuzaihan
f8adf31ec6 make sure any attachments should be attached with a content-id 2018-04-07 13:01:57 +08:00
Martin Edenhofer
7dc66a14f4 Log message if of every processed email (to have a better debugging possibility in general). 2018-04-06 10:58:00 +02:00
Thorsten Eckel
79a652b917 Fixed dependency issue: composite_primary_keys 10.0.1 is not compatible with Rails 5.1.5 due to the following change: 1a723c65bb 2018-04-05 15:30:17 +02:00
Martin Edenhofer
7e91e3ca4a Fixed issue #1923 - Pulldowns are not sorted currently. 2018-04-05 06:13:04 +02:00
Martin Edenhofer
49d2b040de Allow postmaster filter and signatures to clone. 2018-04-05 04:59:46 +02:00
Martin Edenhofer
f710f8f7ad Improved code layout. 2018-04-05 04:58:53 +02:00
Martin Edenhofer
050f5527e6 Fixed issue #1920 - Sometimes notifications are note marked as seen if somebody else already closed the ticketed. 2018-04-05 04:53:07 +02:00
Martin Edenhofer
20e0784c34 Fixed issue #1917. Only images in new note are lost on submit. 2018-04-04 10:52:29 +02:00
Martin Edenhofer
cef84ef74f Improved UX for destroy confirm dialog. 2018-04-04 10:32:26 +02:00
Thorsten Eckel
0c917e13aa Fixed issue #1902 - Spaces in link URLs are removed. 2018-04-03 17:46:45 +02:00
Thorsten Eckel
e48ca057fd Fixed issue #1913 and #1914: Given template parameters for rendering ticket create view are not displayed. 2018-04-03 17:08:42 +02:00
Thorsten Eckel
7954ee0dce Follow up 8c5f87c9d4: Improved detection of ES attachment plugin error and output message. 2018-04-03 16:23:01 +02:00
Thorsten Eckel
525de8413c Follow up: Removed validation code since Selenium tests work in the PRODUCTION environment while the test code runs in TEST environment. That's why you can't access the DB from within a browser test. 2018-04-03 11:01:28 +02:00
Martin Edenhofer
213ec47696 Update gem --system to work on travis environment. 2018-04-03 01:40:49 +02:00
Martin Edenhofer
5ec7293212 Update gem to work on travis environment. 2018-04-03 01:29:19 +02:00
Martin Edenhofer
cea06831df Updated travis to ruby 2.4.4. 2018-04-03 01:10:30 +02:00
Martin Edenhofer
822db47014 Upgrade to rails 5.1.5 and ruby 2.4.2. 2018-04-03 00:23:39 +02:00
Martin Edenhofer
2688c23d9a Implemented config setting to show total number of objects in a grouping in a table view. 2018-03-30 13:09:57 +02:00
Thorsten Eckel
76df6d32f9 Fixed issue #1905: Stored Exchange remote_id in login causes sync to update wrong user. 2018-03-29 16:26:57 +02:00
Thorsten Eckel
50fa66fdd7 Refactoring: Provide of :mapped is already handled in ::Sequencer::Unit::Import::Common::Mapping::Mixin::ProvideMapped. 2018-03-29 16:26:47 +02:00
Thorsten Eckel
7680c51624 Fixed issue #1660 - ObjectManager Attribute of type Tree-Select mixes up children. 2018-03-29 16:22:52 +02:00
Thorsten Eckel
1e04b35d5a Improved RSpec system_init_done helper for DB migrations
Since DB migrations usually always check for system_init_done this is the new default behavior for all examples in a `type: :db_migration` spec. The default state is that Zammad is already initialized. This can be changed by passing `false` as a value to the meta tag `system_init_done`. See `spec/support/db_migration.rb` for more information.
2018-03-29 16:22:47 +02:00
Thorsten Eckel
2eaae8e5c4 Follow up - Fixed issue #1838 - Follow up issue #1752: Unable to migrate old object manager attribute fields. 2018-03-29 13:46:15 +02:00
Martin Edenhofer
a088321498 Followup fix for issue #1752 - tree got lost after update. 2018-03-29 03:07:13 +02:00
Martin Edenhofer
968074d8ef Prepared for 2.5.0. 2018-03-29 00:23:54 +02:00
Martin Edenhofer
7c23e2a2d0 Fixed issue 1882 - Clearing the entered value in a not required ticket field. 2018-03-28 12:24:57 +02:00
Martin Edenhofer
3b27a22364 Follow up for issue #1133 - use correct constructor name to work also in precompiled environments. 2018-03-28 10:02:06 +02:00
Martin Edenhofer
d52634701d Fixed issue #1794 - Admin users can be disabled by Agents. 2018-03-28 07:33:41 +02:00
André Bauer
46ed7a053b more travis-ci trigger name fixes 2018-03-26 21:21:30 +02:00
André Bauer
fc50ad600a fixed travis trigger names
# Do not touch the line above.
# Everything below will be removed.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Auf Branch develop
# Ihr Branch ist auf dem selben Stand wie 'origin/develop'.
#
# zum Commit vorgemerkte Änderungen:
#
# 	geändert:       .travis.yml
2018-03-26 20:46:11 +02:00
André Bauer
9e38a2ee82 fixed travis trigger scripts names 2018-03-26 20:43:14 +02:00
Thorsten Eckel
81dfe88d99 @muhammadn fixed issue #1866 - Failing Scheduler Delayed::Job - jobs are not listed in the monitoring result. 2018-03-26 17:43:52 +02:00
Martin Edenhofer
c300fdd4af Removed race condition in App.Collection.loadAssets() - sometimes shown online notifications was without title. 2018-03-26 12:03:45 +02:00
André Bauer
434c154d57 Merge pull request #1901 from rlue/bugfix/travis-build
Switch to container environment for Travis CI (really this time)
2018-03-26 08:54:28 +02:00
Ryan Lue
1a8054c1a4 Switch to container environment for Travis CI (really this time) 2018-03-25 11:39:46 +08:00
André Bauer
8978e74355 Merge pull request #1900 from zammad/revert-1899-bugfix/travis-build
Revert "Fix Travis CI build failures (by switching to containerized CI environment)"
2018-03-25 00:13:23 +01:00
André Bauer
59eb5c17ec Revert "Fix Travis CI build failures (by switching to containerized CI environment)" 2018-03-25 00:13:05 +01:00
André Bauer
d5e66d2c73 Merge pull request #1899 from rlue/bugfix/travis-build
Fix Travis CI build failures (by switching to containerized CI environment)
2018-03-24 17:30:10 +01:00
Ryan Lue
5f66ac73b2 Switch to containerized environment for Travis CI
Original (virtualized) environment led to a test failure not
reproducible in development. Containerized CI builds permit debugging
and troubleshooting on local development machines via Docker.
2018-03-24 23:06:18 +08:00
Michiel Beijen
d26d75fbbd Fix descriptions on calendar, overview, twitter
Closes #812.
2018-03-23 21:12:21 +01:00
luto
0cfaaab9cd fix typo in email settings: differenct=>different (#1897) 2018-03-23 17:26:21 +01:00
Thorsten Eckel
fd0e6d1b36 Fixed issue #1838 - Follow up issue #1752: Unable to migrate old object manager attribute fields. 2018-03-23 15:26:21 +01:00
Martin Edenhofer
4302da264d Updated gem for security reasons (CVE-2018-3741). 2018-03-23 07:39:04 +01:00
Thorsten Eckel
bf6192113a Improved overall performance by using logger.debug { ... } instead of logger.debug(...). This decreases the LDAP import dry runtime by ~33%. 2018-03-22 10:39:32 +01:00
Thorsten Eckel
307ce2f506 @muhammadn fixed issue #1716 - 'absolute' time formatting setting is not reflected on pending tickets. 2018-03-21 15:13:41 +01:00
Martin Edenhofer
6c90628944 Merge branch 'develop' of github.com:zammad/zammad into develop 2018-03-21 14:36:09 +01:00
Martin Edenhofer
2a39321959 Upgrade to rails 5.1.4 (upgrade will happen later). 2018-03-21 14:35:49 +01:00
Thorsten
23f13f7d8b Merge pull request #1885 from mbeijen/organisationen
Related to #812 and #556 - Admin object descriptions are in german an not translateable.
2018-03-21 14:33:48 +01:00
Martin Edenhofer
80b535df0f Fixed issue #1859 - Login fails after fast logout right after previous login. 2018-03-21 11:28:52 +01:00
Michiel Beijen
251e039255 Organisations: fix description
It was auf Deutsch. Fixes second bullet of #1867.
2018-03-20 20:44:09 +01:00
André Bauer
b103ffb9fb Merge pull request #1884 from mbeijen/do-you-to
User permissions: fix typo in popup
2018-03-20 20:37:26 +01:00
Michiel Beijen
6a7228aa82 User permissions: fix typo in popup 2018-03-20 20:25:57 +01:00
Michiel Beijen
626bf02a08 Device mails: make profile link clickable (#1883) 2018-03-20 20:04:50 +01:00
Martin Edenhofer
70847f2b41 Improved fetching activity stream, online notifications and recent viewed items. Improved REST API with full and expaned attributes. 2018-03-20 13:16:17 +01:00
Martin Edenhofer
2df0ddc248 Updated gem loofah to 2.2.1. 2018-03-20 11:31:44 +01:00
Martin Edenhofer
ee7319ab1f Follow up for issue #338 behaviour reply behaviour. 2018-03-19 11:33:47 +01:00
Martin Edenhofer
cc5a5fb9ae Implemented issue #338 - Autocomplete Email-Address-Fields. 2018-03-19 01:19:42 +01:00
André Bauer
55c45b15c4 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-03-16 22:20:20 +01:00
André Bauer
46fed0810a use ES_CONNECTION env var to delete old es index 2018-03-16 22:19:29 +01:00
Thorsten Eckel
6a0784ab4f Minor refactoring: Removed duplicate code. 2018-03-15 10:11:39 +01:00
André Bauer
15a280b449 delete old es index if mapper attachments plugin is found 2018-03-14 13:51:57 +01:00
Martin Edenhofer
e7c6f7413c Allow message id as selectable field in postmaster filter. 2018-03-12 12:06:39 +01:00
Felix Niklas
fadcf25060 Table: fix checkbox background 2018-03-09 13:50:56 +01:00
Thorsten Eckel
dc00c7703b Fixed issue #1856 as a follow up of issue #949: Unpermitted customer field in customer create ticket view. 2018-03-09 08:56:35 +01:00
Thorsten Eckel
c479fba664 Added check for supported elasticsearch version. 2018-03-09 08:55:25 +01:00
Thorsten Eckel
8c5f87c9d4 Humanized error messages created by failing elasticsearch requests. 2018-03-09 08:55:19 +01:00
Thorsten Eckel
ee5983cb03 Fixed issue #1857 - Direct access to organization tickets possible even though shared is deactivated. 2018-03-09 08:53:11 +01:00
Thorsten Eckel
68881113e4 Refactored FactoryBot User factory. 2018-03-08 15:32:59 +01:00
Thorsten Eckel
d00f82b63a Added FactoryBot Organization factory. 2018-03-08 15:32:59 +01:00
Martin Edenhofer
0f884b5342 Improved new "one" click to ticket create screen feature. Allow relogin without permanent changes to navigation registration. 2018-03-07 22:58:03 +01:00
Martin Edenhofer
5e62e3b2e5 Skip Zendesk tests. Some network outages. 2018-03-07 20:23:20 +01:00
Martin Edenhofer
e05c0f6064 Added probing for modal dialog to prevent conflicts of more modal dialogs at same time. 2018-03-07 16:04:36 +01:00
Thorsten Eckel
a553e4c118 Fixed typo and removed old comment about purpose of the now relevant block for catching race conditions. 2018-03-06 17:07:48 +01:00
Thorsten Eckel
6b73ff3c24 Fixed broken browser test. 2018-03-06 16:09:07 +01:00
Martin Edenhofer
d830f0eb2d UI improvement: Show only real attachments in attachment list. Move original formatted message into footer of article (beside donwload raw message). 2018-03-06 15:07:40 +01:00
Thorsten Eckel
4d7db317cc Added browser test to verify the fix. 2018-03-06 13:49:30 +01:00
Thorsten Eckel
2ecc60f22a Added Setting to define custom HTML Email CSS font. 2018-03-06 13:28:21 +01:00
Thorsten Eckel
414d739ff8 Fixed issue #1856 as a follow up of issue #949: Unpermitted customer field in customer create ticket view. 2018-03-06 12:25:48 +01:00
Martin Edenhofer
95e5eb57a8 Implemented issue #1133 - Added generic clone method for admin features. 2018-03-06 11:44:38 +01:00
Martin Edenhofer
0d644ea7c7 Show overview options in overview screen also if permissions are available. 2018-03-06 10:37:16 +01:00
Martin Edenhofer
e5f732f1e1 User user order attributes based on object attribute manager. 2018-03-06 08:10:33 +01:00
Martin Edenhofer
e64ec3fa67 Improved memory food print by using pluck in large select. 2018-03-06 08:10:19 +01:00
Martin Edenhofer
008cfeea69 Fixed issue #1857 - Missing To and Cc field when forwarding an article of a customer without an email address. 2018-03-06 06:31:53 +01:00
Martin Edenhofer
7e1b25468f Use direct click in personal navigation area if only one entry exists. 2018-03-06 06:30:12 +01:00
Martin Edenhofer
b91fceff08 Removed debugging. 2018-03-04 05:57:58 +01:00
Martin Edenhofer
3bd0642b50 Moved from full to change permissions to merge tickets. Added controller tests. 2018-03-04 05:11:04 +01:00
Martin Edenhofer
d76facd0d5 Fixed missing form dependency function in bulk action. 2018-03-04 03:25:35 +01:00
Thorsten Eckel
b1af9b8050 Improved readability of HTML parser error message and backtrace. 2018-03-02 20:27:13 +01:00
Thorsten Eckel
1e9ed11126 Fixed issue #1852: Can't configure local MTA after SMTP was configured as outbound server. 2018-03-02 20:26:49 +01:00
Thorsten Eckel
8bc0237a06 Fixed issue #1852: Can't configure local MTA after SMTP was configured as outbound server. 2018-03-01 20:25:11 +01:00
Thorsten Eckel
afb78f2200 Fixed issue #1488 - Role - Group can't be unchecked. 2018-02-28 15:02:06 +01:00
Thorsten Eckel
16d89b1fa7 Fixed bug: Empty given parameter overwrites/removes group access structure. 2018-02-28 12:58:10 +01:00
Martin Edenhofer
56c9d87ac9 Improved css for attachment list and attachment list with preview. 2018-02-28 02:04:23 +01:00
Martin Edenhofer
c4c96d0f2b Generate list for overview group by based on current ticket attributes. 2018-02-28 01:11:23 +01:00
Thorsten Eckel
3c1744af0b Fixed issue #1733: Can't un-link i-doit Objects in a Ticket. 2018-02-27 16:52:58 +01:00
Thorsten Eckel
77ec399fe9 Further refactoring and bugfixing. 2018-02-27 16:52:30 +01:00
Thorsten Eckel
db9d0a0eae Follow up: Fixed issue #1810 - Reset notification receiving to 'full' again to avoid unwanted spamming to users that have no direct permissions to the ticket. This needs a broader refactoring. 2018-02-27 11:41:59 +01:00
Thorsten Eckel
196672c50e Fixed issue #1810: To high permissions required to move Ticket into Group (change) and receive notification about changes (full). 2018-02-27 10:48:56 +01:00
Martin Edenhofer
8005d3aee5 Added plugin mechanism to configure plugins if a form field in ticket create or ticket zoom has changed (ported group based signature and form dependencies to plugins). 2018-02-27 09:54:50 +01:00
Rolf Schmidt
1e311034a0 Fixed issue #949 - Sometimes pending time is show as first ticket attribute. 2018-02-26 11:40:57 +01:00
Martin Edenhofer
8d725040a9 Show also roles based groups in profile notification settings. 2018-02-26 11:36:19 +01:00
Thorsten Eckel
5aa0d5b184 Fixed bug: There is nothing like console.notice. 2018-02-23 08:41:36 +01:00
Martin Edenhofer
8ed2bdd234 Improved preview detection for attachment. 2018-02-22 14:51:59 +01:00
Martin Edenhofer
8a2579139e Unique Avatar: Follow up fix randomness. 2018-02-21 10:54:47 +01:00
Felix Niklas
3bd83e7cba Unique Avatar: fix randomness 2018-02-21 10:40:09 +01:00
Thorsten Eckel
0f28d1f0b6 WIP TE. 2018-02-20 16:29:31 +01:00
Martin Edenhofer
077d631ef2 Added config option to display email in result of user organization selector widget. 2018-02-20 13:26:07 +01:00
Martin Edenhofer
327749c29b Improved attachment preview api, introduced @canPreview(). 2018-02-20 12:40:14 +01:00
Martin Edenhofer
b0597ad04d Implemented attachment preview in ticket zoom and optional an dedicated sidebar to show all attachments if whole ticket. Thanks to @mrflix. 2018-02-20 07:47:32 +01:00
Martin Edenhofer
fa53eeb33a Merge branch 'private-richtext-object-resizing-shim' into develop 2018-02-20 06:03:02 +01:00
Martin Edenhofer
38a7995c05 Improved test for activity stream. 2018-02-20 05:30:46 +01:00
Martin Edenhofer
6a0f5d4c25 Initial generic csv based import of text modules, users, organizations and tickets for model and controller. 2018-02-20 05:29:30 +01:00
Martin Edenhofer
4537a281a3 Performance improvement to generate faster assets (just lookup groups once). 2018-02-20 04:52:52 +01:00
Thorsten Eckel
f25815b31d Fixed issue #1841: Taskbar item race condition causes JS exception. 2018-02-19 18:00:45 +01:00
Martin Edenhofer
313e0c3ee9 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-02-19 11:16:18 +01:00
Martin Edenhofer
a43d7a7aa7 Fixed typo. 2018-02-19 11:16:09 +01:00
Martin Edenhofer
ab9e503b2b Do not validate owner id in import mode (needed for historical reasons). 2018-02-19 11:15:47 +01:00
Martin Edenhofer
a6b61f31c5 Increased body size of trigger email message. 2018-02-19 11:13:12 +01:00
Felix Niklas
30b995a58c TicketMerge: use veryLarge modal size
might fix #1266
2018-02-17 23:11:59 +01:00
Felix Niklas
73160c25d1 Modal: add support for size veryLarge (990px)
Largest so far was ‘large’ with a max-width of 740px.
2018-02-17 23:11:31 +01:00
Thorsten Eckel
ef1236b3ab Added .active? to Import backends default API for e.g. monitoring checks. 2018-02-17 12:40:14 +01:00
Felix Niklas
fa449de9ed enableObjectResizingShim: fix deselect & allow delete
- fix deselect when clicking somewhere else
- allow to delete the image via backspace
2018-02-16 14:08:32 +01:00
Martin Edenhofer
7dc2875a49 Enhancement to issue #1816 - also reset owner if agent isn't agent anymore. 2018-02-16 14:05:02 +01:00
Martin Edenhofer
a1391a5cd3 VIP. 2018-02-16 12:18:44 +01:00
Martin Edenhofer
faad5f9ebd WIP. 2018-02-16 11:19:26 +01:00
Martin Edenhofer
894afeeb42 WIP. 2018-02-16 10:35:50 +01:00
Martin Edenhofer
db8b54f64c WIP. 2018-02-16 09:41:50 +01:00
Martin Edenhofer
347dd95c2f Extended tests for checkbox and radio element. 2018-02-16 09:08:08 +01:00
Felix Niklas
15e9fe7186 enableObjectResizing shim 1. step
open bugs: the blur event doesn’t fire. so when clicking into the text after the controls appeared the controls don’t disappear as they should. also when clicking onto another image when the controls of one image are visible first the controls of the active image dissapear and the controls of the current image don’t directly disappear
2018-02-15 19:13:21 +01:00
Thorsten Eckel
506fe55608 Follow up 6f87ebf7c7: Fixed wrong permission key. 2018-02-15 19:01:39 +01:00
Felix Niklas
76f261ecb3 contenteditable & textmodule: refactor bindEvents 2018-02-15 17:08:04 +01:00
Martin Edenhofer
47c079d5d7 Improved logging for used backeds. 2018-02-15 12:25:47 +01:00
Martin Edenhofer
7dbc69549d Improved shown open ticket color indicator. 2018-02-15 12:24:37 +01:00
Martin Edenhofer
5f5e97bb40 Improved token copy dialog. 2018-02-15 12:23:44 +01:00
Felix Niklas
888e0e79b8 Scheduler: prevent filter value from shrinking
fixes #1765
2018-02-15 08:42:53 +01:00
Felix Niklas
9860f9e121 LTR text in a RTL profile: prepare css #1835 2018-02-14 16:26:06 +01:00
Felix Niklas
c6f1ab7074 Dropdown menu: contain the scroll - prevent window scroll
see https://developers.google.com/web/updates/2017/11/overscroll-behavior
2018-02-14 15:47:12 +01:00
Felix Niklas
cb51a91b61 Textmodule dropdown: correctly limit the width 2018-02-14 15:46:25 +01:00
Felix Niklas
6d4b039811 fix RTL profile, wrong place for Text modules pop-up windows after pressing
#1832
2018-02-14 15:45:55 +01:00
Felix Niklas
e40209f3f6 fix #1831 Close search button at the wrong side when using RTL language 2018-02-14 14:49:26 +01:00
Felix Niklas
55421ba912 Unique avatars: fix position for bigger avatars 2018-02-14 14:46:19 +01:00
Rolf Schmidt
6daaecb5fd Fixed issue #1805 - API: Ticket creation - wrong user in notifcations, activity stream. 2018-02-13 17:19:22 +01:00
Martin Edenhofer
bc0777274f Fixed issue #1829 - The column widths of a table are shifted after manual change and use of pagination. 2018-02-13 17:13:31 +01:00
Martin Edenhofer
2432b852b2 Implemented issue #1825 - Auto assignment of unassigned tickets at first open time. 2018-02-12 17:31:02 +01:00
Thorsten Eckel
3fd1c2de7a Added monitoring check for stuck ImportJob backends. 2018-02-12 15:04:24 +01:00
Martin Edenhofer
bc11d4c2b0 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-02-12 09:44:20 +01:00
Martin Edenhofer
a987c10051 Improved usage (autoset) of origin_by of article model. 2018-02-12 09:35:54 +01:00
Muhammad Nuzaihan
8718745a81 Fix a problem with default value not being shown #1792 2018-02-12 16:16:27 +08:00
Muhammad Nuzaihan
315f1fcc57 Merge branch 'develop' of https://github.com/zammad/zammad into develop 2018-02-10 18:44:21 +08:00
Muhammad Nuzaihan
09caba6aed Improve auto assignment for inactive agents or agents in inactive groups to default "-" user for issue #1816 2018-02-10 18:42:05 +08:00
Muhammad Nuzaihan
5940a9f6de Improve auto assignment for inactive agents or agents in inactive groups to default "-" user 2018-02-10 18:40:57 +08:00
Simon Eric Scholl
858f259b96 avoid null pointer exception
fixes #1814
2018-02-09 16:50:39 +01:00
Rolf Schmidt
4bd9dcf518 Fixed issue #1769 - Ticket shown multiple times in overview. 2018-02-09 16:46:55 +01:00
Martin Edenhofer
351b0dec66 Fixed issue #1813 - JS error on creating new customer. 2018-02-09 14:21:02 +01:00
Martin Edenhofer
4b99614503 Revert "Fixed issue #1769 - Ticket shown multiple times in overview."
This reverts commit 371a0494b7.
2018-02-08 06:37:15 +01:00
Martin Edenhofer
d0e25f2e5b Do not auto probe avatars in import mode (to increase import speed). 2018-02-08 06:35:02 +01:00
Martin Edenhofer
3328641834 If no content type is set for attachment, use application/octet-stream as fallback. 2018-02-08 06:33:23 +01:00
Rolf Schmidt
0f539febdd Merge branch 'develop' into private-bugfix-1769-rs-develop 2018-02-07 11:51:29 +01:00
Rolf Schmidt
bfd89995f4 Allow clearbit failure. 2018-02-07 11:50:19 +01:00
Rolf Schmidt
2f0f704ddf Fixed issue #1322 - Customer response via note does not trigger escalation. 2018-02-07 11:46:17 +01:00
Rolf Schmidt
371a0494b7 Fixed issue #1769 - Ticket shown multiple times in overview. 2018-02-07 11:44:38 +01:00
Muhammad Nuzaihan
d33c80bbaa Fixes and improves reporting in #1809 by not showing merge but still use user's input 2018-02-07 17:15:00 +08:00
Martin Edenhofer
261ef6f368 Updated nokogiri to verion 1.8.2. 2018-02-07 05:32:35 +01:00
Muhammad Nuzaihan
76ceb4e9b3 #1617 make code conform to the style used, add tests for false boolean to improve coverage 2018-02-06 16:57:17 +08:00
Thorsten Eckel
c63e6e5be3 Fixed issue #1795 - Forcing samaccountname as login attribute is not suitable and causes issues in divergent setups. 2018-02-05 14:43:14 +01:00
Thorsten Eckel
fc6220600f Fixes an issue introduced with commit 1ec2b514bb which causes the functionality of the Sequencer Unit Import::Ldap::User::Lookup::Attributes to change. New attribute dependencies are introduced that the Exchange Sequence can not fulfill. The original functionality was moved to the more generic Sequencer Unit namespace Import::Common::Model::FindBy::UserAttributes. This should be used for the Exchange FolderContact Sequence. 2018-02-05 14:43:09 +01:00
Muhammad Nuzaihan
6d814d535a Merge branch 'develop' of https://github.com/zammad/zammad into develop 2018-02-05 21:36:32 +08:00
Muhammad Nuzaihan
8de1064c24 Merge branch 'private-pull-request-1617' into develop 2018-02-05 21:32:36 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
97a9991609 Merge pull request #1617 from umarsheikh/cast-boolean-object-attribute
cast 'true' to true and 'false' to false in case of boolean column ad…
2018-02-05 21:31:58 +08:00
Muhammad Nuzaihan
4a31f32e45 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-02-05 21:00:50 +08:00
Muhammad Nuzaihan
4c38d7a719 Improved checks on 'Follow Up Possible' on frontend/backend API if set in user group 2018-02-05 21:00:30 +08:00
Umar Sheikh
c45e826551 rubocop fix 2018-02-04 20:54:24 +05:00
Umar Sheikh
49223a51c7 Merge branch 'develop' into cast-boolean-object-attribute 2018-02-04 20:11:09 +05:00
Martin Edenhofer
9cc1c471a3 Small code improvement for lookup of existing customer. 2018-02-02 21:06:55 +01:00
Martin Edenhofer
026a153ebb Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-02-02 21:05:33 +01:00
Martin Edenhofer
5b65107619 Removed platform list. 2018-02-02 21:05:16 +01:00
Martin Edenhofer
06404c74eb Fixed use of new namespace for App.Utils.parseAddressListLocal(). 2018-02-02 21:04:16 +01:00
André Bauer
956525fd55 Merge branch 'backup' into develop 2018-02-02 14:28:44 +01:00
Martin Edenhofer
d2d597b05c Added possibility to create customer at ticket create with customer hash. 2018-02-02 13:10:52 +01:00
Muhammad Nuzaihan
7f45bf69fc Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-02-02 18:55:11 +08:00
Muhammad Nuzaihan
10dc56c7b8 #1522 improve on adding option to add new customer when changing ticket owners 2018-02-02 18:54:48 +08:00
Martin Edenhofer
17aa655dcc Improved html markup. 2018-02-02 07:45:42 +01:00
Martin Edenhofer
f67dce2266 Refactoring of sidebar and sidebar tabs backends. Added config option to show sidebar customer ticket indicator colored. 2018-02-02 07:34:57 +01:00
André Bauer
228b800df9 changed shebang in backup scripts 2018-02-01 07:09:32 +01:00
Martin Edenhofer
0d62ee7b9a Fixed typo. 2018-01-31 18:57:23 +01:00
Muhammad Nuzaihan Bin Kamal Luddin
be71c6c37d Merge pull request #1762 from menthol/develop
Add french email template
2018-01-31 23:52:11 +08:00
Martin Edenhofer
a0c04ed190 Fixed issue# 1790 - On reply of an email, the recipient will not be set if sender header contains invalid email addresses. 2018-01-31 14:13:23 +01:00
pebosi
6f08071c3d Fix typo to fix chat (#1791) 2018-01-31 14:04:53 +01:00
Martin Edenhofer
789afc592a Extended editable() method to parse requested permission type as argument. 2018-01-31 10:26:41 +01:00
Martin Edenhofer
3ad13472d8 Improved error handling. 2018-01-31 10:25:31 +01:00
Muhammad Nuzaihan
93b527ad85 Merge branch 'develop' of https://github.com/zammad/zammad into develop 2018-01-31 16:02:25 +08:00
Muhammad Nuzaihan
54d6f4a680 Merge branch 'private-pull-request-1718' into develop 2018-01-31 16:01:29 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
52e34e82fe Merge pull request #1718 from umarsheikh/add-integer-and-tree-select-in-conditions
fixes #1706, add integer and tree_select types to Triggers Management(New Trigger)…
2018-01-31 15:55:01 +08:00
Martin Edenhofer
5415e3462e Increased overview limit from 500 to 1000. 2018-01-30 15:06:28 +01:00
Martin Edenhofer
402300c848 Added helper method to process unprocessable mails again (Channel::EmailParser.process_unprocessable_mails). 2018-01-30 15:05:52 +01:00
Martin Edenhofer
5514023ac9 Updated for Zammad 2.4. 2018-01-30 14:59:45 +01:00
Martin Edenhofer
eb43369754 Added tests for CanCleanupParam concern. 2018-01-30 01:19:23 +01:00
Martin Edenhofer
90f4b03e07 Only linkify http urls, not mailto urls. 2018-01-30 00:34:58 +01:00
Martin Edenhofer
5e3f854cca Improved client ticket editable check. 2018-01-29 04:04:00 +01:00
Martin Edenhofer
724879c6c8 Implemented issue #422 - Convert Chat into Ticket. 2018-01-29 03:44:50 +01:00
Martin Edenhofer
5fb6bfed7d Added feature to restrict chat by ip or/and country. 2018-01-29 00:52:02 +01:00
Never
b7d949bf38 Fixed #1783 - Dixed otrs migration plugin download links / unified host names (#1784) 2018-01-28 20:25:21 +01:00
Martin Edenhofer
4c70e9e677 Merge branch 'develop' of github.com:zammad/zammad into develop 2018-01-28 19:10:47 +01:00
Martin Edenhofer
a324553072 Added counter support for sidebar tab (per default show open tickets of customer). 2018-01-28 19:10:22 +01:00
Never
5451c75846 Fixed #1781 - added OTRS 6 download link. 2018-01-28 19:07:15 +01:00
Martin Edenhofer
cc1d38f506 Added ability to add custom notes to ticket create screen. 2018-01-28 01:24:54 +01:00
Martin Edenhofer
b1c57552d3 Improved wording. 2018-01-28 01:01:45 +01:00
Muhammad Nuzaihan
eb8d23ba75 Fixes #1758 disallow assigning admin/admin.*/ticket.agent if default_at_signup is set to true 2018-01-27 02:57:27 +08:00
Martin Edenhofer
95779712b5 Improved shown idoit information. Moved title of object to foreground (title is more important then the id). 2018-01-25 14:30:21 +01:00
Martin Edenhofer
8895e878f0 Fixed issue #1778 - Attachments with content-id header but not shown as inline part are note taken for forward action. 2018-01-25 13:13:57 +01:00
Martin Edenhofer
de9058e704 Support correct article sender if sender address is system email address (needed to us correct reply recipients in ui). 2018-01-25 11:09:29 +01:00
Muhammad Nuzaihan
f3e5412de4 Fixes issue again for #1752 #1742 with object manager 2018-01-25 16:33:30 +08:00
Martin Edenhofer
2a6abbabee Improved CPU usage. 2018-01-25 06:42:12 +01:00
Thorsten Eckel
a67299d7fe Added failed Import::Job backend results to the monitoring endpoint. 2018-01-24 17:16:26 +01:00
Thorsten Eckel
57294646a9 Improved performance by caching the result process wide instead of globing and accessing the database multiple times. 2018-01-24 17:01:33 +01:00
Thorsten Eckel
38d757c65b Fixed issue #1771 - LDAP sync should keep local role assignments if no LDAP Group <-> Zammad Role map is configured. 2018-01-24 15:07:35 +01:00
Martin Edenhofer
7f3d889bed Added support for short year format. 2018-01-24 09:24:34 +01:00
Martin Edenhofer
4fa67c3d0c Set mask for password if email wizard is opened again. 2018-01-24 09:24:10 +01:00
Martin Edenhofer
b059549d88 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-01-23 16:44:07 +01:00
Thorsten Eckel
361ee96b3b Follow up - Fixed bug: OTRS import - User queue/group permissions are not transfered. 2018-01-23 15:48:16 +01:00
Martin Edenhofer
27265b0596 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-01-23 13:48:47 +01:00
Martin Edenhofer
85b9875714 Improved wording. 2018-01-23 11:25:54 +01:00
Thorsten Eckel
225cf81ce2 Fixed bug: OTRS import - User queue/group permissions are not transfered. 2018-01-23 10:09:20 +01:00
Thorsten Eckel
bef740612a Fixed bug: OTRS import fails for Roles without users assigned. 2018-01-23 10:08:07 +01:00
Martin Edenhofer
ff93c7f22c Improved closing modal dialog, ask user if form has changed. 2018-01-23 06:48:25 +01:00
Thorsten Eckel
c66e22bef9 Fixed issue #1764 - LDAP login not possible since change to objectguid. 2018-01-22 16:54:07 +01:00
Muhammad Nuzaihan
4b8f1b9452 fixes #1756 with security issue of content injection in excel generated data 2018-01-22 22:37:42 +08:00
nath
12726b8aaa Add french email template 2018-01-19 20:47:14 +01:00
Martin Edenhofer
8104d7756a Improved email processing with corrupt from headers. 2018-01-18 13:48:57 +01:00
Thorsten Eckel
33c09ee2e5 Follow up: Fixed issue #1709 - Use 'samaccountname' as login default. 2018-01-17 19:26:23 +01:00
Muhammad Nuzaihan
a316df0829 Fixes issue #1752 #1742 with object manager 2018-01-17 22:24:49 +08:00
Thorsten Eckel
119783d48d Fixed issue #1751 - Loss of LDAP group assignment is not reflected in Zammad role assignment. 2018-01-17 11:26:41 +01:00
Thorsten Eckel
2a71c6104b Fixed issue #1753 - Ticket search fails for limit exceeding 100 with internal server error. 2018-01-16 17:14:08 +01:00
Thorsten Eckel
5f3f2e4e45 Added generic Sequencer Unit to have a statistics diff with a custom key. 2018-01-16 09:16:27 +01:00
Thorsten Eckel
5208d3212a Improved code layout: Made method internal. 2018-01-16 09:16:27 +01:00
Martin Edenhofer
b4ec936db0 Fixed test. 2018-01-16 09:06:26 +01:00
Martin Edenhofer
a7b65d473a Improved past in from word/excel (also allow border-style in backend). 2018-01-16 08:39:28 +01:00
Martin Edenhofer
cef163fcc0 Added support to ignore system id for follow up checks. 2018-01-16 07:41:30 +01:00
Martin Edenhofer
4c703fb38e Improved past in from word/excel. 2018-01-16 00:29:48 +01:00
Muhammad Nuzaihan
7c19f175ff fix conflicts 2018-01-16 01:19:12 +08:00
Muhammad Nuzaihan
62b3d7ddcb #1683 fix trigger with "contains one not" not ignoring the tag(s) set 2018-01-16 00:49:46 +08:00
Martin Edenhofer
22c5b24fb7 Fixed issue #1749 - Unable to send auto reply if from contains 2 or more senders with invalid email address. 2018-01-15 16:22:52 +01:00
Muhammad Nuzaihan
c2a5c3d9e2 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-01-15 19:55:07 +08:00
Muhammad Nuzaihan
84121e9fda #1741 do not show merged issues in reports 2018-01-15 19:54:26 +08:00
Thorsten Eckel
1ec2b514bb Fixed issue #1746 - Multiple LDAP users with same samaccountname cause repeatedly update of local user. 2018-01-15 11:29:36 +01:00
Thorsten Eckel
132a9997eb Fixed issue #1709 - LDAP User uid attribute is not reliable. 2018-01-15 10:09:50 +01:00
Martin Edenhofer
df33dc1d71 Implemented issue #1745 - article.body support for triggers. 2018-01-12 14:59:25 +01:00
Martin Edenhofer
6f87ebf7c7 Improved performance of ticket zoom and reduced cpu load scheduler. 2018-01-12 13:44:02 +01:00
Thorsten Eckel
686f56828d Improved error logging in case of failing ImportJob. 2018-01-12 12:54:47 +01:00
Thorsten Eckel
21421f0695 Follow up: Revoked commit 50215b0b8e which fixes issue 1663 - remote_id-s case sensitivity and storage format should be decided per remote_id / remote. 2018-01-12 09:38:48 +01:00
Thorsten Eckel
50215b0b8e Fixed issue #1663 - Sequencer ExternalSync lookup and storage is affected by ID collisions. 2018-01-10 15:26:34 +01:00
Thorsten Eckel
0ea8dd7c45 Fixed issue #1740 - Exchange is limited to 1000 entries and wont sync more. 2018-01-10 14:24:36 +01:00
Thorsten Eckel
8300887bae Added advanced thread logging for better reasoning and error handling of Scheduler threads. 2018-01-10 11:56:24 +01:00
Thorsten Eckel
405a8ce77b Improved handling of non StandardError exceptions in Scheduler Threads for better debugging, reasoning and error handling of Scheduler threads. 2018-01-10 11:56:24 +01:00
Martin Edenhofer
48f3a7efe5 Fixed table width in admin interface if delete col. is shown. 2018-01-10 11:28:56 +01:00
Thorsten Eckel
23018aa603 Follow up: Fixes issue #1664 - Missing support for groupOfUniqueNames / uniquemember in LDAP sync. 2018-01-09 20:08:46 +01:00
Thorsten Eckel
7e22b9bd29 Merge branch 'private-pull-request-1677' into develop 2018-01-09 19:26:41 +01:00
Thorsten Eckel
a8e11c50f3 Follow up: Fixes issue #1664 - Missing support for groupOfUniqueNames / uniquemember in LDAP sync. 2018-01-09 14:58:41 +01:00
Martin Edenhofer
26800ad02f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2018-01-09 14:15:17 +01:00
Martin Edenhofer
be751c8176 Added backlisting for certain css properties. 2018-01-09 14:15:06 +01:00
Thorsten Eckel
8272ae2bb5 Fixes issue #1664 - Missing support for groupOfUniqueNames / uniquemember in LDAP sync. 2018-01-09 12:45:50 +01:00
Thorsten Eckel
66988facc1 Ensures resolved issue #1665 - Added RSpec test to ensure LDAP attributes get reset if no value is provided from remote. 2018-01-09 12:20:04 +01:00
Thorsten Eckel
13b763bfad Fixed wrong file location. 2018-01-09 11:50:52 +01:00
Martin Edenhofer
c6cb0e5531 Small SQL improvement to overview generation. 2018-01-09 08:39:50 +01:00
Thorsten Eckel
49e444d1f6 Added Delayed::Jobs plugin to reset Settings before each job execution to prevent loading of obsolete Setting values from cache. 2018-01-08 16:30:26 +01:00
Thorsten Eckel
540eab58e3 Fixed bug: Missing extend causes wrong delegate method to get called. 2018-01-08 16:30:20 +01:00
Thorsten Eckel
e37328d201 Refactoring: Migrated LDAP and Excachange statistics to new sum/total structure for clearer results and better performance. 2018-01-08 16:30:09 +01:00
Thorsten Eckel
f0cf7c3605 Replaced old Zendesk import with refactored Sequencer based version 🚀. 2018-01-08 16:29:34 +01:00
Thorsten Eckel
fc1b66d646 Refactoring: Changed attribute name instance_action to more re-useable and generic name action. 2018-01-08 16:28:53 +01:00
Thorsten Eckel
a42531ce46 Removed obsolete import structures which were used for the LDAP import which was migrated to the Sequencer. 2018-01-08 16:28:49 +01:00
Thorsten Eckel
1821c97506 Intoduced new generic model class structure based on simple provider structure and DRYed up LDAP and Exchange sequences. 2018-01-08 16:28:45 +01:00
Thorsten Eckel
c3255f0018 Migrated multi-purpose Units (antipattern) to new simple provider structure. 2018-01-08 16:28:40 +01:00
Thorsten Eckel
5a6f3f1a38 Migrated custom LDAP import_job.dry_run Unit to shared Unit based on new simple provider structure and delegation pattern. 2018-01-08 16:28:30 +01:00
Thorsten Eckel
de6d8c54ae Introduced new simple provider structure to DRY up Units and enforce sanitized naming. 2018-01-08 16:27:59 +01:00
Thorsten Eckel
59d642faa5 Fixed bug: Using alias causes error for inheriting Units because the old method is called instead of the one of the sub-class. 2018-01-08 16:27:48 +01:00
Thorsten Eckel
0ce0a9c06e Fixed bug: Calling .shift on class variables provides leads to errors when Unit class is used multiple times. 2018-01-08 16:27:43 +01:00
Thorsten Eckel
eb00d57bac Improved output to show real content of variable via inspect instead of calling .to_s on it. 2018-01-08 16:27:38 +01:00
Thorsten Eckel
8a2e117995 Fixed typo. 2018-01-08 16:27:31 +01:00
Thorsten Eckel
12a63ac17f Replaced old LDAP sync with refactored Sequencer based version 🚀. 2018-01-08 16:27:23 +01:00
Thorsten Eckel
e73f75c458 Introduced Sequencer Unit base class Sequencer::Unit::Common::FallbackProvider to handle simple setting fallback values of state attributes if not already present. 2018-01-08 16:26:58 +01:00
Thorsten Eckel
598d7b2060 Added LDAP sync Sequencer Sequences and Units. 2018-01-08 16:26:50 +01:00
Thorsten Eckel
4a8650b132 Added Mixin for skipping entities with missing mandatory attributes in mapped structure. 2018-01-08 16:26:33 +01:00
Thorsten Eckel
3b16ae8ab9 Added Mixin to disable rails Model callbacks via block for e.g. creating a User but not fetching the avatar. 2018-01-08 16:26:29 +01:00
Thorsten Eckel
9677e1aee7 Refactoring: Use each_with_object if possible. 2018-01-08 16:26:24 +01:00
Thorsten Eckel
eaf097c262 Refactoring: Splitted ExternalSync and Lookup namespaces. 2018-01-08 16:26:15 +01:00
Thorsten Eckel
b1f1dc2e12 Refactoring: Unified and improved SubSequence handling. 2018-01-08 16:24:57 +01:00
Thorsten Eckel
92930a0e8f Refactoring: Namespace cleanup. Mixins should be placed the most specific path possible. 2018-01-08 16:24:52 +01:00
Thorsten Eckel
e47b366d6a Refactoring: Replaced custom implementation with Ruby core Delegator classes. 2018-01-08 16:24:45 +01:00
Thorsten Eckel
b23f0d21d5 Refactoring: Improved naming. 2018-01-08 16:24:35 +01:00
Thorsten Eckel
ab0e64d3a9 Refactoring: Splitted up instance_action statistics diff for different usages. 2018-01-08 16:24:11 +01:00
Thorsten Eckel
00f0bd8212 Refactoring: Improved and unified instance_action skipping possiblities into one Mixin. 2018-01-08 16:24:07 +01:00
Thorsten Eckel
90c1a0faef Refactoring: Improved folder structure for Mixins. 2018-01-08 16:24:01 +01:00
Thorsten Eckel
702b792eb9 Refactoring: Improved ExternalSync source name for Exchange. 2018-01-08 16:22:06 +01:00
Thorsten Eckel
4abd20a49f Fixed bug: Inconsistent data state for instance attribute on failed save! attempt. 2018-01-08 16:10:55 +01:00
Thorsten Eckel
6812c581c6 - Fixed bug: Pluralization of association name is inverted.
- Refactoring: Usage of each_with_object to cleanup code.
- Refactoring: Improved logging for association extraction.
2018-01-08 16:10:22 +01:00
Thorsten Eckel
4aae89b2b0 Fixed bug: Wrong method name. 2018-01-08 16:10:15 +01:00
Thorsten Eckel
b01bf8a723 Refactoring: Prefer using attr_accessor over direct instance variable access. 2018-01-08 16:10:10 +01:00
Thorsten Eckel
2fd72b673d Added functionality to use Mixin::RailsLogger as singleton class method. 2018-01-08 16:10:00 +01:00
Thorsten Eckel
5f0bb91481 Added OTRS 6 migration tests. 2018-01-05 15:43:58 +01:00
Muhammad Nuzaihan
b82dfc0d21 #1727 fix telegram channel issues 2018-01-05 16:02:51 +08:00
Felix Niklas
93c7ffbfdb Datepicker: scroll into view
fixes #1021
2018-01-03 16:26:57 +01:00
Martin Edenhofer
24bfb7d5bf Improved error handling of invalid emails. 2018-01-02 17:00:51 +01:00
Martin Edenhofer
e376a0f872 Improved error handling of invalid emails. 2018-01-02 14:28:34 +01:00
Martin Edenhofer
56846b2fe9 Allow a href for paste, images and text link with different content. 2018-01-02 01:36:05 +01:00
André Bauer
b03ea68d49 switched to certbot command in nginx & apache ssl example configs 2017-12-22 16:51:31 +01:00
André Bauer
4a0a3abd0a added apache ssl config example 2017-12-22 14:48:36 +01:00
André Bauer
6a288edc3f changed issue template 2017-12-22 10:21:39 +01:00
Martin Edenhofer
e9f4b5af08 Improved error handling of email processing with invalid email addresses. 2017-12-20 17:15:40 +01:00
Martin Edenhofer
aef865a916 Fixed issue #1723 - Wrong ticket number count in preview. 2017-12-20 10:55:54 +01:00
Martin Edenhofer
9805fa176a Enabled tests, Zendesk infrastructure is working again. 2017-12-19 09:08:58 +01:00
Umar Sheikh
b7a33ea0e3 Merge branch 'develop' into add-integer-and-tree-select-in-conditions 2017-12-18 15:37:23 +05:00
Martin Edenhofer
fe2c77df9f Just update chat window title if title exists. 2017-12-18 04:49:08 +01:00
Martin Edenhofer
9c54b3382d Added support to search for chat sessions. Added set name and tags for chats. 2017-12-18 04:36:56 +01:00
Felix Niklas
69ccf09906 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-12-16 13:57:15 +01:00
Felix Niklas
6cd203a050 Chat: fix open/close icon and status alignment 2017-12-16 13:57:12 +01:00
Martin Edenhofer
8ac7356184 Small refactoring of search index backend. 2017-12-15 14:58:41 +01:00
Umar Sheikh
db650b9fbb add integer and tree_select types to Triggers Management(New Trigger) form under conditions for effected objects 2017-12-15 17:57:15 +05:00
Martin Edenhofer
34c14a22b5 Push users.preferences to elasticsearch to enable searches for certain features. 2017-12-14 21:05:59 +01:00
Martin Edenhofer
e460c99cad Introduced REST expand=true/false/1/0, full=true/false/1/0 and all=true/false/1/0 options. Improved controller tests. @hanneshal 2017-12-14 14:19:24 +01:00
Martin Edenhofer
5ebeb51e2e Fixed issue #1711 - Zammad Api for idoit.object_ids broken. 2017-12-14 08:37:20 +01:00
Martin Edenhofer
504bc58d47 Fixed issue #1710 - Unable to login with Office365. 2017-12-13 18:38:21 +01:00
Martin Edenhofer
97a5cd3cf5 Improved max. agent limit check. 2017-12-13 12:17:57 +01:00
Martin Edenhofer
d0a0dc7d37 Show ticket edit form as disable if agent has read only permission. 2017-12-12 12:18:17 +01:00
Martin Edenhofer
09af88a578 Fixed usage to twitter initials setting. 2017-12-12 10:15:07 +01:00
Martin Edenhofer
95e8aa2dce Improved reload and table rendering of report screens. 2017-12-12 07:19:44 +01:00
André Bauer
0064a5bb6a moved elasticsearch index rebuild process to background 2017-12-09 14:48:45 +01:00
André Bauer
4b54642fcc added elasticsearch plugin update 2017-12-09 14:31:30 +01:00
André Bauer
c36c288be3 added database & elasticsearch fields to github issue template 2017-12-09 11:04:51 +01:00
André Bauer
aa596e4ab7 added executable bit to travis bash script 2017-12-07 18:00:01 +01:00
Martin Edenhofer
b42b7cf6ee Fixed issue #1699 - No user preference for out-of-office available. 2017-12-07 16:42:39 +01:00
André Bauer
5da4d8f466 added univention docker image build trigger for travis-ci 2017-12-07 15:55:44 +01:00
Martin Edenhofer
82b5b6af2f Improved config input validation for issue #1698 - SipgateController - undefined method `each' for nil:NilClass (NoMethodError). 2017-12-07 15:34:47 +01:00
Martin Edenhofer
4108c78722 Improved wording. 2017-12-07 09:29:48 +01:00
Martin Edenhofer
de1e62e79f Updated to ruby 2.4.2. 2017-12-07 05:08:11 +01:00
Martin Edenhofer
95a8f95af8 Prepared for 2.3.0. 2017-12-06 17:10:05 +01:00
Martin Edenhofer
648a4c2522 Improved storing locale_default at initial setup. 2017-12-06 16:49:20 +01:00
Martin Edenhofer
6c0f7fc1e7 Set locale_default at initial admin creation too. 2017-12-06 15:31:27 +01:00
Martin Edenhofer
fd8511e44c Applied new forward icon. 2017-12-06 09:37:09 +01:00
Felix Niklas
c74e0dac46 forward icon, adjust ticket action icons height
# Conflicts:
#	public/assets/images/icons.svg

- prettify svg output
2017-12-06 09:16:40 +01:00
Martin Edenhofer
18329a1379 Applied rubocop. 2017-12-06 00:53:00 +01:00
Felix Niklas
63ff844f38 Code cleanup. 2017-12-06 00:50:28 +01:00
Martin Edenhofer
712acdfe2a Fixed issue #573 - email forward of article (like regular email client forward - e. g. forward customers message to third party contact). 2017-12-05 16:12:52 +01:00
Martin Edenhofer
75ac4252f3 Implemented issue #195 - Take over attachment on ticket split. 2017-12-05 15:49:59 +01:00
Martin Edenhofer
de55dbeb33 Fixed issue #1604 - Webform isn´t available | 401 Unauthorized. 2017-12-04 16:17:40 +01:00
Martin Edenhofer
84ed5ee451 Improved issue #1591 - Improved js snipped for form channel (use div, not button for non modal forms). 2017-12-04 16:17:32 +01:00
Martin Edenhofer
bb2537b49b Implemented issue #1689 - Enable state "merged" for admin overviews, triggers and jobs. 2017-12-04 09:52:05 +01:00
Martin Edenhofer
3bdb3dacb2 Applied rubocop. 2017-12-04 08:05:31 +01:00
Martin Edenhofer
486802770b Added option to use multiple session instances. 2017-12-04 08:00:00 +01:00
Martin Edenhofer
a08d5f1b51 Improved error handling. 2017-12-04 02:12:55 +01:00
Martin Edenhofer
f3cbe7f10e Added ability to delete elasticsearch processors first (for cleanup). 2017-12-04 01:48:41 +01:00
Martin Edenhofer
68b85efc24 Applied rubocop. 2017-12-04 01:34:27 +01:00
Martin Edenhofer
0d1d86511f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-12-04 01:25:50 +01:00
Martin Edenhofer
5ba83da6f5 Fixed issue #599 - Elasticsearchs mapper-attachments plugin has been deprecated, use ingest-attachment now. 2017-12-04 01:24:58 +01:00
Martin Edenhofer
f62225dbde Improved white listing for mail probing. 2017-12-03 17:32:33 +01:00
André Bauer
88da94e80d changed servername in nginx config 2017-12-03 14:33:31 +01:00
Martin Edenhofer
adc2564fa6 Removed debug log. 2017-11-30 11:33:47 +01:00
Martin Edenhofer
122c7167b1 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-11-30 11:13:14 +01:00
Martin Edenhofer
b61e98206b Fixed issue #1571 - Improve i-doit filtering (without type). 2017-11-30 11:12:58 +01:00
Thorsten Eckel
eebe7ccdc4 Fixed bug: Exchange sync does not show current import state statistic. 2017-11-30 10:12:51 +01:00
Thorsten Eckel
8b3b90b9d0 Improved Sequencer logging of removed unneeded attributes to show inspect dump instead of .to_s 2017-11-30 10:12:51 +01:00
Martin Edenhofer
d3062592ea Fixed issue #1513 - TimeAccounting ticket condition prevents submit of Zoom. 2017-11-30 09:29:18 +01:00
Martin Edenhofer
7599e8e17a Fixed issue #1681 - Unable to re-order overviews in admin interface with over 100 overviews. 2017-11-27 11:50:57 +01:00
Muhammad Nuzaihan
1a9a23ce0e #1674 make sure login data is downcased. included tests to check as well 2017-11-25 00:49:40 +08:00
Martin Edenhofer
ce1135a55c Fixed issue #1670 - Reset customer selection in ticket create screen if input field cleared. 2017-11-24 16:54:56 +01:00
Martin Edenhofer
6c707dc5f5 Fixed test. 2017-11-23 23:09:11 +01:00
Martin Edenhofer
fa63fbae8a Added Italian and Polish translations. 2017-11-23 22:13:02 +01:00
Martin Edenhofer
9b0f51461b Fixed issue #1671 - Add config option for intelligent customer selection of incoming emails of agents. 2017-11-23 20:43:01 +01:00
Martin Edenhofer
b952880d5d Fixed issue #1666 - Unable to open trigger in admin interface. 2017-11-23 09:14:03 +01:00
Thorsten Eckel
705487154c Applied changes for Rubocop 0.51. 2017-11-23 09:09:44 +01:00
André Bauer
ca4e2920e2 Merge pull request #1667 from jaykijay/patch-2
Create symlink to latest Backup.
2017-11-22 17:18:34 +01:00
jayki
e2dec9b046 Update functions
This is needed for automated restore via Script to the latest Backup file. So the files latest* always point to the newest Backup.
2017-11-22 16:33:50 +01:00
Thorsten Eckel
492ca261ce Fixed bug #1663 - Exchange integration tries to import user twice and fails. 2017-11-22 10:18:47 +01:00
André Bauer
b9d728f890 replaced deprecate FactoryGirl gem with FactoryBot 2017-11-21 22:50:03 +01:00
André Bauer
112edd362c added dalli gem 2017-11-21 21:30:53 +01:00
Martin Edenhofer
460182e663 Small code cleanup. 2017-11-21 15:25:04 +01:00
Martin Edenhofer
9f204806db Fixed issue #1661 - Users mail_delivery_failed is not removed after changing the email address. 2017-11-21 11:01:07 +01:00
Martin Edenhofer
3417618798 Improved removing of html comments. 2017-11-21 08:24:03 +01:00
Martin Edenhofer
17ce2dcbde Improved agent limit detection (do not complain if role with ticket.agent permission is assigned and agent already owns a role with ticket.agent permission). 2017-11-17 15:39:56 +01:00
Martin Edenhofer
eb5ad7d9fa Fixed issue #1649 - Tickets are deleted but database is still the same size. 2017-11-17 11:41:44 +01:00
Martin Edenhofer
f627df1447 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-11-17 11:40:47 +01:00
Martin Edenhofer
753af9d589 Small improvements for jobs model and execution of jobs. 2017-11-17 11:39:57 +01:00
Martin Edenhofer
2203d9bd05 Merge branch 'develop' of github.com:zammad/zammad into develop 2017-11-16 22:58:09 +01:00
Martin Edenhofer
b04e0c1b64 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-11-16 22:54:37 +01:00
Martin Edenhofer
cb35d2b4fb Code cleanup. 2017-11-16 22:54:31 +01:00
Johannes Nickel
c7606f66ce Update ISSUE_TEMPLATE.md
added reference to the new community board.
2017-11-15 17:33:14 +01:00
Martin Edenhofer
601960f5fb Implemented issue #1171 - The ability to set the platform default language. 2017-11-15 15:06:53 +01:00
Martin Edenhofer
70565938ba Implemented issue #1623 - Translation for form widget in Dutch. 2017-11-15 12:07:37 +01:00
Martin Edenhofer
17e107aa0a Fixed this binding/proxy in callback. 2017-11-14 17:16:07 +01:00
Martin Edenhofer
f3ff650bfe Split of article actions into separate backends. 2017-11-14 17:15:49 +01:00
Umar Sheikh
509450fd30 stick to test naming convention and better variable name 2017-11-09 17:06:13 +05:00
Umar Sheikh
c1f2fb77fe tests for #1613, ensure that string is converted to boolean 2017-11-09 15:53:34 +05:00
Thorsten Eckel
ab189f46ec Fixed issue #1628 - Added support for new Twitter tweet length limit of 280 chars. 2017-11-08 17:14:12 +01:00
Martin Edenhofer
aca6073eba Fixed issue #1618 - Chat language setting or behaviour in dutch. 2017-11-07 14:42:51 +01:00
Umar Sheikh
35d8a05e8a whitespace 2017-11-07 15:40:58 +05:00
Umar Sheikh
749fe8df5e cast 'true' to true and 'false' to false in case of boolean column addition, fixes #1613 2017-11-07 15:01:12 +05:00
Martin Edenhofer
e75ce991cb Clear cache after migration is finished. 2017-11-06 17:55:34 +01:00
Martin Edenhofer
68cb27f0c1 Improved file name detection of attachments. 2017-11-06 17:43:06 +01:00
Martin Edenhofer
d185ecf469 Added additional fixtures. 2017-11-06 04:35:50 +01:00
Martin Edenhofer
99af4f187a Improved filename detection of incoming postmaster emails (use subject.eml and no file-1). 2017-11-06 04:26:00 +01:00
Martin Edenhofer
967f814ff3 Stabilised tests. 2017-11-06 02:32:47 +01:00
Martin Edenhofer
3f633f252a Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-11-06 02:29:14 +01:00
Thorsten Eckel
cb02d21118 Updated autodiscover dependency to fix an issue with not reachable redirected HTTP URLs in Exchange autodiscovery process - see https://github.com/WinRb/autodiscover/issues/10 . 2017-11-03 14:44:55 +01:00
Thorsten Eckel
3fc78c657c Exchange changes:
- Fixed bug: Not possible to disable SSL certificate check for import but only for autodiscover.
- Improved SSL certificate error message to show domain of affected domain to prevent users from thinking that there is an issue with their Zammad installation.
2017-11-03 14:44:50 +01:00
Thorsten Eckel
c87f75cc97 Added placeholder for better usability. 2017-11-03 14:44:46 +01:00
Martin Edenhofer
2d032e9a00 Code cleanup. 2017-11-03 08:54:13 +01:00
Martin Edenhofer
641a883227 Improved test - compare time in delta. 2017-11-03 08:51:20 +01:00
Martin Edenhofer
766bf548ef Fixed issue #1606 - Ignore Twitter search key with only #. 2017-11-03 08:13:44 +01:00
Martin Edenhofer
b82b0375f0 Improved error handling for strange/invalid email addresses. 2017-11-02 14:09:47 +01:00
Martin Edenhofer
70a03d657e Improved migration for issue #1375 - Improved handling assignment_timeout. 2017-11-02 10:00:44 +01:00
Martin Edenhofer
5f088cf8f2 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-11-02 09:15:10 +01:00
Martin Edenhofer
1ef49c9e1b Added permission check for integtrations plugins. 2017-11-02 09:14:59 +01:00
Thorsten Eckel
1d2c9eded3 Follow up: Fixed issue #1442 - SSL certificate verification for certificate not matching hostnames fail. 2017-11-01 15:41:36 +01:00
Martin Edenhofer
725f21337d Fixed issue #1375 - Improved handling assignment_timeout. 2017-11-01 15:23:44 +01:00
Martin Edenhofer
dcc44feb81 Improved test. 2017-11-01 08:52:17 +01:00
Martin Edenhofer
aa50375356 Updated. 2017-10-30 13:35:18 +01:00
Martin Edenhofer
7bf73984c4 Fixed issue #1595 - Unable to sort overview by priority. 2017-10-30 13:23:23 +01:00
Thorsten Eckel
0afcc33b14 Fixed issue #1442 - IBM bluepages searches fail. 2017-10-27 12:11:50 +02:00
Thorsten Eckel
6093f96f45 Fixed typo - thanks to @MBekspert . 2017-10-25 19:45:16 +02:00
Martin Edenhofer
77ba574449 Added email channel for Check_MK integration. 2017-10-25 13:58:23 +02:00
Martin Edenhofer
878fdb64a8 Sync new translations on package update too. 2017-10-25 13:15:09 +02:00
Martin Edenhofer
ba12920a01 Removed debugging. 2017-10-25 08:12:41 +02:00
Martin Edenhofer
e7fab8d5c4 Added monit support. 2017-10-25 01:24:07 +02:00
Martin Edenhofer
b35ff0fef2 Fixed issue #1579 - leading and tailing utf8 spaces are not removed for email addresses are not removed. 2017-10-24 22:34:52 +02:00
Thorsten Eckel
aeb1feb826 Fixed issue #1457: Comprehensive LDAP settings are to big for the DelayedJobs database table. 2017-10-24 18:16:50 +02:00
Thorsten Eckel
378d19c691 Merged pull request #1483 - Working on issue #1439: Refactoring - moved out the regex matching code to better readability. Huge thanks to @muhammadn . 2017-10-24 16:58:03 +02:00
Thorsten Eckel
7e3b63a7ba Disabled params wrapping. 2017-10-24 16:55:49 +02:00
Thorsten Eckel
af22e22fb2 Merged pull request #1518 - Fixes issue #1509: Conflicting roles can get saved. Huge thanks to @muhammadn . 2017-10-24 16:55:40 +02:00
Martin Edenhofer
f25b822065 Implemented issue #1578 - Import emails with same message_id but target was different channels. 2017-10-24 10:18:33 +02:00
Martin Edenhofer
340fe10d07 Added permission support for auto wizard. 2017-10-23 16:33:16 +02:00
Martin Edenhofer
b258ae24e6 Improved store migration for RoR 5. 2017-10-23 04:35:38 +02:00
Martin Edenhofer
9d7b377652 Improved store migration for channel.options with multi mixed content. 2017-10-23 02:16:29 +02:00
Martin Edenhofer
036a2f6274 Small code layout cleanup. 2017-10-20 15:59:59 +02:00
Martin Edenhofer
2c39eb47de Fixed issue #1563 - prevent admin from locking out. 2017-10-20 13:32:52 +02:00
Martin Edenhofer
93345553ad Fixed permission check with ticket.agent lookup. 2017-10-20 10:58:02 +02:00
André Bauer
a0e0dfcc3a remove ruby 2.3 dir again 2017-10-19 19:57:34 +02:00
Thorsten Eckel
cb0002710e Follow up: Merge branch 'private-pull-request-1479' into develop (omniauth-weibo-oauth2 dependency). 2017-10-19 18:19:46 +02:00
Thorsten Eckel
bb36e05264 Added info to use mailinglist instead of the issue tracker.. 2017-10-18 16:13:37 +02:00
Thorsten Eckel
0dab96a9c6 Added info about removage of the template to prevent issues that are hard to handle. 2017-10-18 15:29:53 +02:00
Thorsten Eckel
b1eb729d2d Merge branch 'private-pull-request-1479' into develop 2017-10-18 11:39:08 +02:00
Thorsten Eckel
b43dff2be4 Merge branch 'private-pull-request-1489' into develop 2017-10-18 11:37:50 +02:00
Thorsten Eckel
5afb92dbdc Refactoring: Improved lookup of association IDs by performing one JOIN instead of multiple SELECTs. This is especially usefull for systems where the DB runs on a separated system. 2017-10-18 11:21:51 +02:00
Thorsten Eckel
34ec90bd73 Refactoring: Removed N+1 performance issue by implementing correct join. Thanks to @rolfschmidt! 2017-10-18 11:21:51 +02:00
Thorsten Eckel
ef17e67b60 Refactoring: Prefer each_with_object over tap. 2017-10-18 11:21:51 +02:00
Thorsten Eckel
c710389c80 - Refactoring: Replaced Object.const_get with absolut namespace call.
- Refactoring: Removed broken cache.
- Refactroing: Removed obsolete preferences[:selectable].
2017-10-18 11:21:51 +02:00
Martin Edenhofer
136954f46a Increased ttl time for pushed assets from 1 hour to 2 hours. 2017-10-18 11:09:50 +02:00
Martin Edenhofer
fa83de523e Improved reply recipients on phone article. 2017-10-18 02:44:02 +02:00
Martin Edenhofer
80ab16a2d3 Improved performance of ticket overview backend job. 2017-10-18 02:09:45 +02:00
Thorsten Eckel
7bccc25d75 Fixed some typos - with the help of @natseg - Pull request #1437. 2017-10-17 14:20:27 +02:00
Thorsten Eckel
0632e421b0 Fixed issue #1418 - with the help of @natseg - Pull request #1437. 2017-10-17 14:20:20 +02:00
Thorsten Eckel
bb057277ff Merge branch 'private-pull-request-1499' into develop 2017-10-17 11:11:45 +02:00
Martin Edenhofer
57c6a25357 Improved error handling. If string in invalid charset (e. g. on binary fields), .blank? will fail (call it later). 2017-10-16 15:46:41 +02:00
Martin Edenhofer
228a0df54a Improved code layout. 2017-10-16 15:45:04 +02:00
Martin Edenhofer
383eee4db9 Fixed small twitter ui/usability issues. 2017-10-16 15:43:48 +02:00
Simon
d3a9d26130 fixed intention 2017-10-16 08:22:38 +02:00
Martin Edenhofer
e54f3f99a8 Improved table rendering. 2017-10-16 05:36:44 +02:00
Martin Edenhofer
036b364387 Fixed issue #1538 - Unable to reindex tickets / elasticsearch error "MapperParsingException[failed to parse [article.ticket]]; nested: JsonParseException[Current token (START_OBJECT) not of boolean type". 2017-10-16 00:30:53 +02:00
Martin Edenhofer
7b50730185 Provide ticket sidebar with tags and links from origin all=true ticket request. 2017-10-15 20:51:35 +02:00
Martin Edenhofer
a7cf3da7da Improved d&d batches (sometimes mouseleave is fired if seleced batch is fade out - so no ticket is processed). 2017-10-15 20:36:01 +02:00
Martin Edenhofer
a84c65f6c7 Improved test. 2017-10-15 18:48:12 +02:00
Martin Edenhofer
1a71444c22 Added table pagination support. 2017-10-15 15:49:23 +02:00
Martin Edenhofer
734c821abc Improved streaming reconnect (only reconnect if options has changed, if streaming connect was not successful, delay reconnect for 70 seconds). 2017-10-15 09:14:34 +02:00
Martin Edenhofer
645c1c3de4 Improved rendering of tables. 2017-10-15 08:20:58 +02:00
Martin Edenhofer
21588220c4 Improved usage of fill db. 2017-10-15 08:19:57 +02:00
Martin Edenhofer
8894374afd Fixed typo in permission name. 2017-10-13 09:18:55 +02:00
Martin Edenhofer
8dcb17627c Fixed issue #1528 - Unable to show overview if selected order by attribute is not show in header. 2017-10-12 12:42:47 +02:00
André Bauer
96f6b4ae83 fixed travis commit message quotes 2017-10-11 21:49:42 +02:00
André Bauer
facf95a199 added zammad commit message to travis-ci docker triggers 2017-10-11 20:54:12 +02:00
André Bauer
a3e29a15cc added debian 9 support for packager.io 2017-10-11 20:46:02 +02:00
Thorsten Eckel
6adce80bae Added test requirement info text for pull reqeusts. 2017-10-11 11:25:03 +02:00
Thorsten Eckel
402ba4e26f Added rubocop and coffeescript requirement info text for pull reqeusts. 2017-10-11 11:12:25 +02:00
Thorsten Eckel
f1417b5592 Applied coffeelint. 2017-10-11 10:52:51 +02:00
Thorsten Eckel
698ea1737f Merge branch 'private-pull-request-1463' into develop 2017-10-11 10:37:25 +02:00
Thorsten Eckel
eccf00ade4 Updated dependecy 'composite_primary_keys' to newly released gem for Rails 5.1. 2017-10-10 18:15:57 +02:00
Thorsten Eckel
7b28ad80a4 Applied rubocop. 2017-10-10 16:37:27 +02:00
Thorsten Eckel
b0bfe42437 Fixed bug: Import detects unchanged associations as changed and unnecessarily updates record. 2017-10-10 16:21:59 +02:00
Thorsten Eckel
4dcdcf1d30 Fixed bug: Rails model lookup fails in Zendesk import. 2017-10-09 22:48:51 +02:00
Martin Edenhofer
ac8ae54841 Follow up for issue #1276 - only set channel data if matrix exists. 2017-10-09 17:01:25 +02:00
Dinh Ngoc Hien
fb8f07e6e9 Update notification preferences when nothing is selected #1276 (#1514) 2017-10-09 16:11:48 +02:00
Martin Edenhofer
fe8fba8cb9 Improved reply to / recipient tests (in case agent is sending to system). 2017-10-09 03:57:23 +02:00
Martin Edenhofer
0016cb21a5 Improved reply to / recipient tests (added real name for tests). 2017-10-09 02:21:07 +02:00
Martin Edenhofer
6e227f5b71 Improved reply to / recipient tests. 2017-10-09 01:37:08 +02:00
Martin Edenhofer
6afd9f99b5 Fixed issue #1303 - ReplyAll - moves recipients from "To" to "CC". 2017-10-09 00:54:51 +02:00
Martin Edenhofer
ff9def59a0 Fixed issue #986 - Zammad sends reply to itself. 2017-10-08 21:52:15 +02:00
Never
44418b71cb fixed description typo of systemd script (#1515) 2017-10-07 10:24:26 +02:00
Felix Niklas
55bb97e8f4 Improve error message output 2017-10-05 17:16:16 +02:00
Thorsten Eckel
caa85bbf5a Fixed issue #1442 - Self signed SSL certificate fails Exchange autodiscovery. 2017-10-04 17:22:57 +02:00
André Bauer
acb1df1c4a disable debian 9 in packager.io again (still not supported: https://github.com/crohr/pkgr/issues/128 ) 2017-10-03 16:35:51 +02:00
André Bauer
77e2fb697c debian 9 2017-10-03 15:58:30 +02:00
Umar Sheikh
e6f6d38ca6 enable list of tags in tag input without typing two character, and show list on focus, fixes #1498 2017-10-03 17:01:30 +05:00
André Bauer
d7eefa1d69 fixed systemd services 2017-10-03 12:50:29 +02:00
André Bauer
8a61de28eb removed defaults from systemd vars. systemd is not bash... 2017-10-03 11:37:33 +02:00
André Bauer
f4efae18c9 changed systemd scripts to use env file 2017-10-03 11:27:27 +02:00
André Bauer
45087f76f6 fixed packager.io builds 2017-10-03 00:02:23 +02:00
André Bauer
12e664b84c added real zammad version to docker builds on travis-ci 2017-10-02 23:13:13 +02:00
Muhammad Nuzaihan Bin Kamal Luddin
e353e89c6d change character length limit in "note" column in both organizations … (#1497)
* Change character length limit in "note" column in both organizations and users #1495.

* Update config seed to set maximum 5000 characters for validation, update base migration for new installs and migrations for installed instances #1495.
2017-10-02 20:28:27 +02:00
Martin Edenhofer
38ef22e4e5 Improved error handling of channel streaming. 2017-10-02 15:10:07 +02:00
Martin Edenhofer
4c7309303f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-10-02 15:07:22 +02:00
Martin Edenhofer
c3ba2cabaf Change online notification limit from 100 to 200. 2017-10-02 14:34:34 +02:00
Martin Edenhofer
5fa34aa559 Fixed issue #1406 - Channel: Twitter streaming is complaining about. 2017-10-02 13:23:14 +02:00
Martin Edenhofer
b76be9eebc Small code layout improvements. 2017-10-02 12:31:59 +02:00
Thorsten Eckel
4e8bc9564e Follow up: Applied RuboCop Style/BlockDelimiters to improve readability. 2017-10-01 14:31:29 +02:00
Thorsten Eckel
757f0ac9bd Applied RuboCop Style/BlockDelimiters to improve readability. 2017-10-01 14:25:52 +02:00
NeverMin
572cfc8ea4 fixed db migrate issue 2017-09-30 16:21:16 +08:00
Rolando
ba2d22e8a4 Adds customer_ticket_create requirement to enable form 2017-09-29 22:47:03 +02:00
Martin Edenhofer
1f83f3b358 Moved to mock api call for geo_location (for stable tests). 2017-09-29 18:03:09 +02:00
Martin Edenhofer
d5033b99bd Added service protection. Just create a max. of recipients/users. 2017-09-29 17:22:47 +02:00
Martin Edenhofer
1c941ec317 Improved state detection for host down/up with new icinga email templates. 2017-09-29 16:59:10 +02:00
NeverMin
952e648fb9 fixed weibo oauth2 db 2017-09-29 22:26:43 +08:00
Simon
a32a0f0de6 Tell Internet Explorer to display content in the highest mode available. 2017-09-29 14:39:17 +02:00
NeverMin
bf744ff0f0 rename weibo db migrate filename 2017-09-28 22:47:17 +08:00
Martin Edenhofer
95f71f65df Added tests for new icinga mail templates. 2017-09-28 12:51:57 +02:00
Martin Edenhofer
977cb07dc9 Fixed issue #1482 - Tickets sent by agent via email into Zammad have state open (not new). 2017-09-27 20:12:21 +02:00
Martin Edenhofer
88feeb38ba Added migration to correct send_no_auto_response_reg_exp value. It's already changed in db/seeds/settings.rb 2017-09-27 10:40:39 +02:00
Martin Edenhofer
14d4b90f72 Separated browser tests into browser-core and browser-integration. 2017-09-27 10:38:59 +02:00
NeverMin
ac4f8b777f small fix, added protal name 2017-09-27 14:12:10 +08:00
NeverMin
336ac67898 Closes #1465 2017-09-26 22:41:55 +08:00
Martin Edenhofer
410e41e53c Do not execute callbacks whiling migration (do not send ne call events to clients). 2017-09-26 14:22:38 +02:00
Martin Edenhofer
46c85048fd Improved migration to work also with postgresql. 2017-09-26 14:00:34 +02:00
Martin Edenhofer
f91536ff39 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-09-26 11:08:51 +02:00
Martin Edenhofer
2075117635 Fixed issue #1478 - Allow cti log entries to check done (also if no hangup state is available). 2017-09-26 11:08:04 +02:00
Felix Niklas
17fdf715d3 Login: adjust login width decimal place
see #1475
2017-09-26 09:36:32 +02:00
Felix Niklas
17f48b5335 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-09-26 09:26:43 +02:00
Felix Niklas
a59c23e9f7 Login: align login buttons
fixes #1475
2017-09-26 09:26:40 +02:00
Felix Niklas
ebc478a3c0 Buttons: simplify .btn selectors 2017-09-26 09:25:42 +02:00
Martin Edenhofer
31b11546f4 Increased proxy timeout to prevent proxy timeout like issue #1473 - Can't add e-mail account in e-mail channel configuration. 2017-09-26 09:06:25 +02:00
Martin Edenhofer
7d034c321b Increased proxy timeout to prevent proxy timeout like issue #1473 - Can't add e-mail account in e-mail channel configuration. 2017-09-26 08:52:22 +02:00
Martin Edenhofer
31f315807d Updated pg gem. 2017-09-26 06:35:26 +02:00
Martin Edenhofer
1ba32b1a41 Fixed issue #1405 - Scheduler not running because of Bad file descriptor in PGConsumeInput(). 2017-09-26 00:23:29 +02:00
Martin Edenhofer
18edd73c75 Fixed issue #1439 - Icinga/Nagios Integration: No longer accepts regex in "Sender". 2017-09-25 23:49:49 +02:00
Martin Edenhofer
6573c93337 Fixed issue #1469 - Unable to manage i-doit objects as agent (only agent). 2017-09-25 22:45:21 +02:00
Martin Edenhofer
d5cb530b60 Added note for prioritize/escalate issues via support contract. 2017-09-25 11:30:12 +02:00
Martin Edenhofer
d2a0c6176e Cleanup. 2017-09-25 11:18:11 +02:00
Martin Edenhofer
51766d51a9 Fixed issue #1442 für autodiscover with urls like https://#{client.domain}/autodiscover/autodiscover.xml and self signed certs. 2017-09-25 10:47:26 +02:00
Martin Edenhofer
5b8715184e Fixed issue #1280 - Invalidate cache when switching users. 2017-09-24 23:51:55 +02:00
Martin Edenhofer
248bc015e1 Removed debugging. 2017-09-23 14:35:51 +02:00
Martin Edenhofer
09686e6bc3 Improved code layout. 2017-09-23 14:34:33 +02:00
Martin Edenhofer
7ab037320f Improved error handling. 2017-09-23 14:34:07 +02:00
Martin Edenhofer
e2a46078ea Verify only if user exists. 2017-09-23 14:31:48 +02:00
Martin Edenhofer
260099b510 Applied same http timeout for fetching locales and translations. 2017-09-23 14:31:16 +02:00
Martin Edenhofer
6d077f4ac5 Extended App.ControllerTable to just rerender parts of tables. Fixed issue #989 - Zammad UI is completely stuck after selecting overview "All tickets". 2017-09-23 13:25:39 +02:00
Martin Edenhofer
ff56f294f3 Rails 5.1 migration. 2017-09-23 08:25:55 +02:00
Felix Niklas
1cb4db2448 CSS improvements
- btn-group: merge buttons in button-groups
- nav-pills: support non-stacked nav-pills
- attributesBar--border: adds a border to the attributesBar
2017-09-22 17:29:40 +02:00
Felix Niklas
d68d867866 CSS improvements
- onDark button has a light background now and invisible borders
- form grid: allow form-groups to have the relative widths 1/2, 1/3, 2/3, 1/4, 2/4, 3/4, 1/5, 2/5, 3/5 and 4/5
- allow nav-pills to contain an icon
- main: support a large-padded version
- fix searchable Select shadow positioning
- add flex baseline alignment class
2017-09-22 17:12:03 +02:00
André Bauer
a3a31c6f24 moved systemd units to scripts folder 2017-09-21 22:19:25 +02:00
Felix Niklas
807a1d88ef Update Procfile.frontend because it was buggy 2017-09-21 11:12:03 +02:00
André Bauer
6854b2a87c build docker images only once per successful build 2017-09-19 18:51:09 +02:00
André Bauer
5747c49da8 changed branch for travis trigger 2017-09-19 17:45:24 +02:00
André Bauer
827b588608 fix repo info in travis trigger 2017-09-19 01:51:21 +02:00
André Bauer
e4d25fa8b6 fixed reponame in travis-ci trigger 2017-09-19 01:45:51 +02:00
Martin Edenhofer
276eee5955 Fixed selenium gem version to make ci tests working again. 2017-09-18 14:18:16 +02:00
Martin Edenhofer
c07c321afa Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-09-18 13:10:33 +02:00
Martin Edenhofer
6bf38353b2 Moved to support telegramAPI gem 1.4 and higher. 2017-09-18 13:10:22 +02:00
Thorsten Eckel
415282bf82 Added GitHub Pull Request template to clear things up and avoid repetition. 2017-09-18 11:49:10 +02:00
André Bauer
e6da999edc fixed restore 2017-09-17 13:34:23 +02:00
André Bauer
78c8fc4879 delete ruby 2.3.0 dir from packager.io packages to get smaler packages 2017-09-17 13:13:57 +02:00
André Bauer
70eace5581 added missing yes command to es plugin install 2017-09-17 09:49:34 +02:00
André Bauer
ad56a6c983 added trigger to build docker image on travis 2017-09-17 02:15:22 +02:00
André Bauer
fe6ffb4fc2 build elasticsearch searchindex without sleep 2017-09-17 01:51:17 +02:00
André Bauer
6fda64c7f6 added elasticsearch config to package install 2017-09-17 01:39:12 +02:00
André Bauer
ca3b34aec4 Rename install-zammad-systemd.sh to install-zammad-systemd-services.sh 2017-09-16 18:29:05 +02:00
André Bauer
99722abfc8 renamed systemd install script 2017-09-16 18:15:34 +02:00
André Bauer
7c24141cdf added systemd unti files 2017-09-16 17:48:42 +02:00
André Bauer
437758673e fix Gemfile.lock 2017-09-16 16:58:17 +02:00
Thorsten Eckel
4c40d16dfe Avoid unneeded memory consumption for Zendesk import. 2017-09-15 11:36:12 +02:00
Thorsten Eckel
ed0f5690bc Fixed issue #1424 - Method lookup in wrong class namespace. 2017-09-15 10:20:21 +02:00
Thorsten Eckel
5fd008c439 Added missing ActiveRecord::Migration version information. 2017-09-13 16:27:51 +02:00
Thorsten Eckel
bfc73568c9 Added functionality to trigger 'enter' event for searchable select input fields. 2017-09-13 16:17:01 +02:00
Thorsten Eckel
b981d0fccd Refactoring: Improved code layout. 2017-09-13 16:16:56 +02:00
Thorsten Eckel
7592843a5c Fixed bug: .focus() on searchable select won't focus visible input field. 2017-09-13 16:16:48 +02:00
Johannes Nickel
18d4074329 Updated ReadTheDocs badge link 2017-09-13 10:40:32 +02:00
Thorsten Eckel
2e4f50b777 Merge branch 'private-pull-request-1388' into develop 2017-09-13 10:23:29 +02:00
Martin Edenhofer
419593ec50 Fixed issue #1398 - Profile not clickable on browsers with touch events or on some Chrome for Windows. 2017-09-12 16:39:06 +02:00
Martin Edenhofer
578684ec89 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-09-12 16:38:40 +02:00
Martin Edenhofer
181dd55140 Improved params handling regarding RoR 5.0. 2017-09-12 16:38:32 +02:00
Thorsten Eckel
5d73e699fe Refactoring: Removed unneeded Network functionality structure. 2017-09-12 15:07:10 +02:00
Thorsten Eckel
cb3506da03 Fixed issue #1406 - Exchange integration wizard fails if server does not support autodiscovery. 2017-09-12 11:47:32 +02:00
NeverMin
7677431a66 fixed whitespaces 2017-09-12 16:13:16 +08:00
Thorsten Eckel
ef38800bae Refactoring: Prefer .update! over .update, .update_attributes and .update_attribute - see http://www.davidverhasselt.com/set-attributes-in-activerecord/ . 2017-09-11 13:16:08 +02:00
Thorsten Eckel
be682ccf1d Fixed wrong filename. 2017-09-11 09:26:54 +02:00
Martin Edenhofer
7d76805f98 Improved migration. 2017-09-11 08:32:04 +02:00
Martin Edenhofer
714cede3e2 Improved direct group assignment for agents. 2017-09-11 04:19:16 +02:00
Martin Edenhofer
003d60d6b1 Improved tests for out of office feature and related controllers. 2017-09-11 02:50:05 +02:00
Martin Edenhofer
d6bae448db Added tests for taskbar controller. 2017-09-10 19:32:02 +02:00
Martin Edenhofer
6273a7213e Fixed issue #1395 - Ticket chaos after updating to from Zammad 1.5 to 2.1 (develop branch) - Macros and Taskbar are damaged. 2017-09-10 13:52:07 +02:00
Martin Edenhofer
553dcef3db Improved error handling. Also let migration working if already valid records are already in database (then skip this records). 2017-09-08 17:39:57 +02:00
Martin Edenhofer
b96c57210a Followup improvement for issue#1394 - Reindex elastic search not possible because of <null>/Twitter::NullObject. 2017-09-08 17:36:42 +02:00
Martin Edenhofer
4094bd1d51 Fixed issue #1394 - Reindex elastic search not possible because of <null>/Twitter::NullObject. 2017-09-08 17:12:33 +02:00
Martin Edenhofer
a4a513edea Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-09-08 16:09:45 +02:00
Martin Edenhofer
8171e3f119 Improved regex for preventing auto responses. 2017-09-08 10:54:44 +02:00
Martin Edenhofer
3da31ee6e1 Improved regex for preventing auto responses. 2017-09-08 10:54:15 +02:00
Martin Edenhofer
4c3814b204 Improved user.isOutOfOffice() if begin is today. 2017-09-08 10:53:16 +02:00
Jens Pfeifer
533b44af8f Updated to rails 5.0. 2017-09-08 08:28:34 +00:00
Rolf Schmidt
c6e40ce818 Merge branch 'develop' into private-pull-request-1238
https://github.com/zammad/zammad/pull/1238
2017-09-08 09:44:53 +02:00
Rolf Schmidt
0ef0066c31 Merge branch 'private-pull-request-1118' into develop 2017-09-08 09:33:06 +02:00
Martin Edenhofer
80f669d8eb Fixed issue #1390 - Broken email with huge pdf inline (lead to huge article body with bigger then 7MB) is blocking rendering of web app. 2017-09-08 09:24:07 +02:00
Thorsten Eckel
be730c08d9 Moved listing of failed jobs to own method and added tests. 2017-09-07 18:07:48 +02:00
Rolf Schmidt
70ce1be8c9 Tidied. 2017-09-07 17:44:32 +02:00
Rolf Schmidt
68ba6b3087 Added basic controller test for restart_failed_jobs route. 2017-09-07 17:43:57 +02:00
Rolf Schmidt
60e7d990ea Moved .restart_failed_jobs to backend and added rspec test. 2017-09-07 17:34:32 +02:00
Jens Pfeifer
80199a61b5 Added tests for scheduler fields error_message and status. 2017-09-07 15:17:06 +00:00
Jens Pfeifer
63aa9142af Improved scheduler restart button handling in monitoring view. 2017-09-07 14:33:09 +00:00
Rolf Schmidt
7248be908f Improved migration and changed wording. 2017-09-07 15:50:46 +02:00
Rolf Schmidt
1ce2b12438 Added version to migration. 2017-09-07 15:06:51 +02:00
Rolf Schmidt
d3e4577fa5 Improved codestyle. 2017-09-07 15:00:12 +02:00
Rolf Schmidt
7b86174d26 Changed wording from dead to failed in pull request 1118. 2017-09-07 14:45:13 +02:00
Rolf Schmidt
6ab397ef44 Merge branch 'develop' into private-pull-request-1118 2017-09-07 14:33:51 +02:00
Thorsten Eckel
fae4809fc7 Applied QA to match Zammad code style. 2017-09-07 14:24:58 +02:00
Thorsten Eckel
3a2a34e064 Merge branch 'develop' into private-pull-request-1238 2017-09-07 14:07:40 +02:00
NeverMin
76c140a555 fixed #1387 2017-09-07 11:39:24 +08:00
Denny Bresch
fd077ef8c9 #1193 - quote name for special character. 2017-09-06 16:18:20 +02:00
Martin Edenhofer
9ef4d3090d Updated for release. 2017-09-06 15:37:00 +02:00
Rolf Schmidt
4fab8007e4 Fixed issue #777 - Wrong behaviour in tagging functionality. 2017-09-06 13:49:10 +02:00
Jens Pfeifer
e7eab89bce Fixed issue #1107 - Ticket bulk user assignment only assigns user to first ticket. 2017-09-06 10:30:20 +00:00
Martin Edenhofer
6da0181e2a Initial idoit integration. 2017-09-06 08:39:02 +02:00
Martin Edenhofer
83d11b122e Fixed issue #1253 - Duplicates in Caller Log (Sipgate). 2017-09-05 21:53:37 +02:00
Rolf Schmidt
16e79bbf88 Fixed issue #1315 - Time Accounting not showing all tickets, time is missing completly of specific ticket. 2017-09-05 21:24:43 +02:00
Rolf Schmidt
f102c61f95 Fixed issue #1315 - Time Accounting not showing all tickets, time is missing completly of specific ticket. 2017-09-05 17:50:01 +02:00
Thorsten Eckel
4011c88493 Fixed issue #1381: Exchange folder with unsupported entries fails configuration. Also improved error handling of empty folders or not selected folders. 2017-09-05 17:35:53 +02:00
Rolf Schmidt
4573308f66 Fixed issue #1318 - 'Access-Control-Allow-Origin' error when submitting web form. 2017-09-05 16:54:22 +02:00
Rolf Schmidt
ce2ed08e1b Fixed #1331 - Delete action for tickets not working. 2017-09-05 16:05:28 +02:00
Rolf Schmidt
ddd7c0d60d Fixed issue #1340 - Relative and absolute time bug. 2017-09-05 15:09:01 +02:00
Thorsten Eckel
20a8e40484 Added initial version of Out Of Office functionality. 2017-09-05 11:49:32 +02:00
Martin Edenhofer
8958a3ac63 Updated OTRS import URL. 2017-09-05 11:34:12 +02:00
Martin Edenhofer
cda166535f Introduced App.QueueManager to have easier serial working of ui re-rendering. 2017-08-31 10:20:22 +02:00
Martin Edenhofer
b46e872926 Followup for issue #1375 - added missing scheduler job for new setups. 2017-08-31 06:51:17 +02:00
Martin Edenhofer
fe409727c1 Fixed upgrade/migration (added missing user id information). 2017-08-30 16:53:24 +02:00
Martin Edenhofer
71c9e50381 Fixed test - compare new ticket attribute too. 2017-08-30 16:00:25 +02:00
Martin Edenhofer
fffca5b549 Fixed issue #1375 - assignment_timeout in group settings has no effect. 2017-08-30 15:50:48 +02:00
Felix Niklas
d4b5df81ed Wizard: fix margin when its a modal 2017-08-28 22:55:18 +02:00
Felix Niklas
a79301e469 Ticket template: fix button alignment when the sidebar is small 2017-08-28 22:54:45 +02:00
Martin Edenhofer
f65354f0b9 Updated banner to get help to work on Zammad. 2017-08-28 01:34:30 +02:00
Martin Edenhofer
c24e377b2d Fixed issue #1369 - Ticket Hook Position between RE: and the ticket subject. 2017-08-25 11:37:56 +02:00
Martin Edenhofer
6ea12c212f Improved test. 2017-08-25 06:09:38 +02:00
Martin Edenhofer
0cd9fd7fcd Fixed issue #1361 - Calendar: ICAL sources are not updated. Implemented issue #1362 - Calendar: ICAL ignores recurring appointments/events. 2017-08-24 18:59:53 +02:00
Thorsten Eckel
ec94c72a6b Fixed bug #1349: OTRS Import fails with "incompatible character encodings: ASCII-8BIT and UTF-8 (Encoding::CompatibilityError)". 2017-08-24 10:31:50 +02:00
Martin Edenhofer
78a98ab51e Append * on simple query like "somephrase23" or "attribute23: somephrase23" 2017-08-24 01:00:10 +02:00
Martin Edenhofer
e81d871b01 Append * on simple query like "somephrase23" or "attribute: somephrase23" 2017-08-24 00:53:36 +02:00
Martin Edenhofer
81c6aa0af0 Append * also for searches with umlaut or other utf8 chars. 2017-08-23 17:13:32 +02:00
Thorsten Eckel
d6bc129af4 Fixed bug #1175: DynamicFields imported from OTRS are mandatory and stop input forms from submitting. 2017-08-23 16:41:01 +02:00
Martin Edenhofer
f35645e051 Prevent database dead locks. 2017-08-22 19:36:48 +02:00
Martin Edenhofer
14711a6826 Fixed issue #1351 - handling of incoming mails seems strange / customer is not set correctly. 2017-08-22 14:55:36 +02:00
Thorsten Eckel
4bd8da957f Fixed issue #1347 - Group retrieval fails for objectClass 'organization'. 2017-08-22 09:23:45 +02:00
Martin Edenhofer
24696c00ee Initial Check_MK integration. 2017-08-22 01:13:19 +02:00
Thorsten Eckel
ab33cd491d Applied Zammad default behaviour if no title is given. 2017-08-21 16:51:03 +02:00
Lucas Romero
97431be8d6 fall back to description or hard-coded title "No title" if ticket has no subject in Zendesk (which is allowed) 2017-08-21 16:50:58 +02:00
Thorsten Eckel
bd8ba66721 Improved Zendesk invalid URL check. 2017-08-21 11:59:21 +02:00
Thorsten Eckel
7a142a5467 Working on issue #1161 - Count of Tickets in Zendesk import state overview is wrong due rate limit of 1000 tickets per batch. 2017-08-18 21:06:46 +02:00
Thorsten Eckel
c25d7507d5 Fixed bug: Zendesk additional fields ending with _id or _ids fail import due to ObjectManager attribute naming limitations. 2017-08-18 21:06:46 +02:00
Thorsten Eckel
4ddd3ec29b Fixed bug: Errors while adding Zendesk attachments to Zammad store fail import. 2017-08-18 21:06:46 +02:00
Thorsten Eckel
1985a6af52 Fixed bug: Cache invalidation race condition in concurrent threads cause access to newly added ObjectManager attributes to fail. 2017-08-18 21:06:45 +02:00
Thorsten Eckel
b26bdb7261 Improved code layout. 2017-08-18 21:06:45 +02:00
Thorsten Eckel
aa50feed73 Working on issue #1161 - Broken error handing for unaccessable comment attachments. 2017-08-18 21:06:45 +02:00
Thorsten Eckel
0170e977f6 Fixed issue #1161 - Zendesk import fails for deleted tickets. 2017-08-18 21:06:45 +02:00
Thorsten Eckel
92f227786f Fixed bug: Invalid new states should be handled by ActiveRecord and don't cause Ticket#reset_pending_time to fail. 2017-08-18 21:06:45 +02:00
Thorsten Eckel
b1f0bbe6e6 Applied RSpec styleguide: Instance methods should start with '#' class with '.'. 2017-08-18 21:06:45 +02:00
Martin Edenhofer
f7bd2dfceb Imporoved zendesk reload feature at import time. Improved url validation. 2017-08-17 13:49:48 +02:00
Thorsten Eckel
4a24bb8507 Applied currently available fix for ruby 'open-uri' bug described in pull request #1675. Using 'open' with a temp file causes an exception.
This is caused by the newly introduced Exchange integration dependencies 'viewpoint' and 'autodiscover' which depend on 'httpclient' which requires 'open-uri' somewhere. These cause the integration tests to fail - namely UserAgentTest#test_check_request.

Link: https://github.com/ruby/ruby/pull/1675
2017-08-16 15:12:24 +02:00
Thorsten Eckel
4937d742ea - Added Exchange integration.
- Added Sequencer.
- Prepared migration of LDAP integration to Sequencer.
- Added and improved RSpec support helpers.
2017-08-16 15:12:20 +02:00
Thorsten Eckel
2b4b1a58cc Updated pre-commit for compat reasons. 2017-08-16 15:12:08 +02:00
Thorsten Eckel
989b127453 Added log entries for starting and stopping the Scheduler process for reasoning purposes. 2017-08-16 15:12:08 +02:00
Martin Edenhofer
fbb7161e6b Improved logging message. 2017-08-15 21:33:57 +02:00
Martin Edenhofer
fde8d11b5f Improved error handling. 2017-08-15 21:32:53 +02:00
Martin Edenhofer
c6fec78bf9 Improved email parsing, skip sender if no @ is containing (try reply-to or return-path if existing). 2017-08-15 09:46:21 +02:00
Martin Edenhofer
279478025e Follow up fix for issue #1290 - Missing replacement of Config and Current User objects in text modules and signatures. 2017-08-14 17:27:33 +02:00
Martin Edenhofer
9026362d7a Fixed reply with full quote and text article.body. 2017-08-14 10:51:22 +02:00
Martin Edenhofer
ebd2b174df Removed ruby 2.4.1 warming "warning: regular expression has redundant nested repeat operator '*'". 2017-08-14 10:44:48 +02:00
Martin Edenhofer
5051c9bdc5 Upgrade to ruby 2.4.1. 2017-08-13 17:18:54 +02:00
Martin Edenhofer
8f049225b1 Prevent ActiveRecord::StatementInvalid: PG::InFailedSqlTransaction: ERROR: current transaction is aborted, commands ignored until end of transaction block issues (isolate Ticket.selector statements in own sub transaction). 2017-08-13 11:54:57 +02:00
Johannes Nickel
f1d0bed331 Added requirement text for jQuery for the forms area. This resolves #1338 2017-08-11 17:34:14 +02:00
Martin Edenhofer
335b1fad50 Prevent ActiveRecord::StatementInvalid: PG::InFailedSqlTransaction: ERROR: current transaction is aborted
, commands ignored until end of transaction block issues.
2017-08-11 11:18:58 +02:00
Martin Edenhofer
5a9138e4be Fixed issue #1310 - Default name of role customer in german language. 2017-08-10 14:45:44 +02:00
Thorsten Eckel
5f17ceb48a Fixed issue #1261 - Adding foreign keys for inconsistent PG tables breaks update. 2017-08-10 13:27:15 +02:00
Martin Edenhofer
577c8b7995 Updated gems (also to support current pg gem). 2017-08-10 00:34:28 +02:00
Martin Edenhofer
7ce18e86f6 Added support of new icinga 2.7 notification templates (82a5c5a624 (diff-5a9d2fc2eb1c21d6a011c9c06b37fb5b)). 2017-08-09 14:57:57 +02:00
Martin Edenhofer
b2ece28306 Improved error handling. 2017-08-07 00:28:08 +02:00
Martin Edenhofer
dd29b0692c Improved url error handling. 2017-08-02 08:11:03 +02:00
Martin Edenhofer
4eec956cbe Updated zendesk_api gem because of "You are setting a key that conflicts with a built-in method Hashie::Mash#class defined in Kernel" warnings. 2017-08-01 23:35:54 +02:00
Martin Edenhofer
52f36f4edc Added postmaster filter validation. Change behaviour of using regular expressions - use explizit regular expressions by prefixing with "regex:your_regexp". 2017-08-01 10:15:37 +02:00
Martin Edenhofer
d17906f333 Performance improvement for follow up detection. 2017-07-31 14:47:35 +02:00
Martin Edenhofer
86430e9e33 Improved error handling. 2017-07-30 09:37:36 +02:00
Martin Edenhofer
f7bdc42d16 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-07-28 20:40:19 +02:00
Martin Edenhofer
7c32cb87db Improved issue #1205 - push online notifications to the right side with rtl. 2017-07-28 20:39:12 +02:00
Felix Niklas
61c8550d5d RTL support: left and right borders
see #1205
2017-07-28 17:01:19 +02:00
Felix Niklas
1ce4c024ce RTL: fix text-align regression in IE and Edge
Sadly, text-align: start and text-align: end are not yet supported in IE and Edge. They would be self-aware of the reading direction. see #1205
2017-07-28 16:58:13 +02:00
Felix Niklas
68ec0756d9 RTL support
see #1205
2017-07-28 16:45:37 +02:00
Martin Edenhofer
61616d3f35 Follow up of issue #1267 - removed german default text of scrollHint. 2017-07-28 14:04:12 +02:00
Martin Edenhofer
9ec4be24f3 Fixed issue #991 - Tel Protocol Link for Telephone and Mobile. 2017-07-28 13:55:28 +02:00
Martin Edenhofer
d1b50e0ed2 For rtl support in js we need to know what direction it is. 2017-07-28 11:45:58 +02:00
Felix Niklas
a222a0878f Inline Labels: wrap them
see #1288
2017-07-28 10:15:30 +02:00
Martin Edenhofer
b937d05b06 Updated chat widget dependencies. 2017-07-27 19:35:08 +02:00
Martin Edenhofer
243f8586e7 Compiled es translation of issue #1267 - Chat widget error "chat notice || Translation 'es' needed!". 2017-07-27 16:22:50 +02:00
Martin Edenhofer
1ae062f144 Fixed issue #1292 - Don't use proxy on localhost addresses. 2017-07-27 12:05:54 +02:00
Martin Edenhofer
4ba2744689 Notify agent if mail delivery failed. Enhancement to issue #1198. 2017-07-26 20:46:31 +02:00
Martin Edenhofer
78a8e90cbb Improved error handling. 2017-07-26 11:16:12 +02:00
Martin Edenhofer
7cb6c34940 Upgrade to rails 4.2.9. 2017-07-25 16:10:43 +02:00
Martin Edenhofer
2e2aa91375 Added cleanup of searchindex in test file. 2017-07-25 16:00:43 +02:00
Martin Edenhofer
6004e48cbd Small improvement for issue #1216 (moved same ticket check into model, show error message in ui). 2017-07-25 13:53:01 +02:00
Martin Edenhofer
ab63ef2e0d Merge branch 'private-bugfix-1216-rs-develop' into develop 2017-07-25 13:21:07 +02:00
Martin Edenhofer
756ae55c54 Replace nil objects by nil to prevent index issue with elasticsearch. 2017-07-25 11:26:33 +02:00
Martin Edenhofer
dab9fe995a Fixed issue #1290 - Missing replacement of Config and Current User objects in text modules. 2017-07-24 15:25:37 +02:00
Martin Edenhofer
6130927566 Improved arrow+enter+esc handling if text module widget is open. 2017-07-24 14:30:11 +02:00
Martin Edenhofer
b7568b8ce2 Fixed issue #1291 - Block escape key when creating / editing text modules. 2017-07-24 13:37:04 +02:00
Martin Edenhofer
3babd8495e Implemented issue #443 - Using text modules also in chat. 2017-07-24 09:48:18 +02:00
Martin Edenhofer
0986e89335 Improved error handling. 2017-07-24 09:06:15 +02:00
Martin Edenhofer
4609829d68 Fixed migration name. 2017-07-24 08:58:04 +02:00
André Bauer
4aab808aff made curl request mor readable 2017-07-23 16:50:54 +02:00
André Bauer
718ae0e6b3 added missing token string 2017-07-23 16:41:40 +02:00
André Bauer
1a8858f73b fixed travis.yml 2017-07-23 13:28:07 +02:00
André Bauer
eb38beb7f2 added curl command to travis.yml to build zammad-docker-compose after…
… successfull zammad build
2017-07-23 11:11:00 +02:00
André Bauer
165a46450f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-07-23 11:09:51 +02:00
Felix Niklas
8342e12cfe Dropdown: hide behind notifications (popover) 2017-07-21 15:23:31 +02:00
Felix Niklas
6b3bc0701c Searchfield: fix that icon is visible 2017-07-21 15:23:18 +02:00
Felix Niklas
7253631f54 Inputs: readonly and disabled state
- inputs and textareas will get a dark background as an indicator when they’re set to readonly
- checkboxes and radios can’t be set to readonly (html limitation)
- added disabled support for the zammad-switch
2017-07-21 15:06:11 +02:00
Thorsten Eckel
3a9762faa2 Merge branch 'develop' of https://github.com/zammad/zammad into develop 2017-07-21 15:05:57 +02:00
Thorsten Eckel
1c46b61c4b Fixed failing TravisCI jobs caused by confusion about TravisCI ENV and job ENV. 2017-07-21 15:03:47 +02:00
Rolf Schmidt
c8fb10e1b5 Revert "Fixed issue #986 - Zammad sends reply to itself."
This reverts commit 084ef3f50d.
2017-07-21 15:02:16 +02:00
Felix Niklas
961a5ecfa5 Dropdown: prevent overlap with modal 2017-07-21 14:32:03 +02:00
Never
3df5cfa4ec fixed #1267 (#1275) 2017-07-21 14:30:13 +02:00
Felix Niklas
a9ef5ea8ff Wizard: make sure its scrollable on small screens 2017-07-21 14:05:17 +02:00
Felix Niklas
ad8de49768 Searchfield: fix clipped focus shadow on high-res screens
fixes #1210
2017-07-21 11:47:25 +02:00
Felix Niklas
7468b3ed36 Ticket Zoom: position Settings Button 2017-07-21 11:46:52 +02:00
Martin Edenhofer
d2d7c534eb Using text modules not working in IE 11 (only in IE 11). 2017-07-20 17:17:46 +02:00
Martin Edenhofer
4b6496c545 Do html cleanup directly on content fields too (not only on finished article). 2017-07-20 15:58:03 +02:00
Martin Edenhofer
d8ad2b1b2f Implemented issue #539 - Add email address without importing historical emails. 2017-07-20 14:01:14 +02:00
Rolf Schmidt
51d4162775 Fixed issue #1216 - Race condition if agents merge ticket at same time but in different directions. 2017-07-19 12:03:17 +02:00
Martin Edenhofer
efad1f9fb1 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-07-19 10:52:08 +02:00
Martin Edenhofer
04c97d1201 Show organization tab only for agents. 2017-07-19 10:37:29 +02:00
Michael R.|SchlaumeierTV
337d8f96d6 Translation Fix (#1258)
Generic OAUTH 2 is not gitlab
2017-07-19 07:57:27 +02:00
Martin Edenhofer
b10ee11c86 Strip null byte - postgresql will complain about it. 2017-07-19 07:29:52 +02:00
Martin Edenhofer
79a089f55b Merge branch 'private-issue1255' into develop 2017-07-18 21:06:46 +02:00
Martin Edenhofer
a313c485ac Implemented issue #1255 - Chat Widget should support richtext (same as agent chat). 2017-07-18 15:43:04 +02:00
Martin Edenhofer
a583cc330f Only show text in desktop notification. 2017-07-18 15:15:09 +02:00
Rolf Schmidt
084ef3f50d Fixed issue #986 - Zammad sends reply to itself. 2017-07-18 13:51:26 +02:00
Martin Edenhofer
a9a76ef0b7 Improved pretty date - absolute time format (only show no year if date is in same year + only show no weekday if date is less then 6 days). 2017-07-17 05:57:19 +02:00
Martin Edenhofer
866614122d Implemented issue #1251 - Config option to have uniq email addresses for users. 2017-07-15 00:35:44 +02:00
Martin Edenhofer
547f002f71 Implemented issue #1254 - Feature Request: clear caller log. 2017-07-14 17:38:48 +02:00
Martin Edenhofer
daaf1525cd Fixed key. 2017-07-14 16:27:58 +02:00
Martin Edenhofer
5bfaab8af9 Improved test. 2017-07-14 16:27:25 +02:00
Felix Niklas
f5e0d576f3 Chat: remove autogrow, style contenteditable div 2017-07-14 16:04:20 +02:00
Martin Edenhofer
10dca43432 Moved to contenteditable for chat widget. 2017-07-14 15:49:16 +02:00
Martin Edenhofer
7cb212832e Fixed issue #1151 - Problem with cyrillic letters in name of overviews. 2017-07-14 15:47:10 +02:00
Martin Edenhofer
e028e8c1a3 Fixed migration version. 2017-07-14 13:53:28 +02:00
Felix Niklas
a4ef55cec0 Implemented issue #1177 - OAuth2: Office365. 2017-07-14 12:14:51 +02:00
Martin Edenhofer
77d3f8bf67 Implemented issue #562 - Ticket creation - allow to create users without email, issue #181 - Allow customers without email addresses (was incoming phone call) and issue #247 telephone ticket without email. 2017-07-14 11:57:34 +02:00
Felix Niklas
e3ab40f618 Add Office365 Icon #1177 2017-07-14 11:47:45 +02:00
Martin Edenhofer
2f33755dda Implemented issue #1177 - OAuth2: Office365. 2017-07-14 08:15:14 +02:00
Martin Edenhofer
bd061fb5c1 Implemented issue #571 - Original e-mail inclusion at the bottom of sent e-mails. 2017-07-13 17:34:38 +02:00
Martin Edenhofer
b60b139e95 Implemented issue #1177 - OAuth2: Office365. 2017-07-13 17:08:53 +02:00
Martin Edenhofer
f723357f77 Applied rubocop. 2017-07-13 13:13:45 +02:00
Jens Pfeifer
c2234d7456 Fixed issue #1230, missing backslashes in body of sent emails. 2017-07-13 09:59:22 +00:00
Martin Edenhofer
9f6a4a99f5 Ensure that a user has always (at least) signup rules and not none roles. 2017-07-12 16:41:10 +02:00
Martin Edenhofer
eedfacbfa2 Set X-Forwarded-Proto to get https prefix in omniauth generated callback urls. Relateed to issue #1240. 2017-07-12 11:27:33 +02:00
Martin Edenhofer
899daa6530 Fixed issue #1240 - Unable to add Linked Gitlab account. 2017-07-12 11:20:17 +02:00
Jens Pfeifer
8a08a368fc Updated guard-symlink. 2017-07-12 07:39:37 +00:00
Jens Pfeifer
d1278d44c2 Fixed typos. 2017-07-10 15:00:51 +00:00
André Bauer
8cb2eb406f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-07-08 15:37:00 +02:00
Rolf Schmidt
672b1ab40c Fixed issue #884 - Firefox - Focus lost after using :: TextSnippts. 2017-07-07 16:47:15 +02:00
Anton Anders
3ff6aafcb2 add default value to webform input elements (primitive or function) 2017-07-07 09:20:33 +02:00
Rolf Schmidt
74ebb10d2c Fixed issue #1149 - Trigger: Wrong behaviour for condition "is not" "not set". 2017-07-06 15:58:10 +02:00
Rolf Schmidt
164aa47e57 Tidied. 2017-07-06 13:47:33 +02:00
Rolf Schmidt
714b88aa93 Fixed issue #1194 - Add date/time information to time accounting (xls export). 2017-07-06 11:05:28 +02:00
Martin Edenhofer
0065028ee6 Implemented issue#341 - optional subject for email, define if twitter initials are used and default internal state of new notes. 2017-07-05 07:18:19 +02:00
Martin Edenhofer
84ed6f6c22 Fixed issue #1220 - Zammad Chat widget not working with jquery 3. 2017-07-04 08:07:51 +02:00
Martin Edenhofer
86b12c43c6 Improved autocompletion attribute. 2017-06-30 08:17:54 +02:00
Thorsten Eckel
7fceb07b87 Fixed issue #1200 - OTRS import fails for attributes containing null bytes strings on PostgreSQL. 2017-06-29 13:38:13 +02:00
Martin Edenhofer
c734a52240 Implemented issue #1206 - Feedback Form Channel - Ability to set a target group for incoming tickets. 2017-06-28 19:19:19 +02:00
Martin Edenhofer
1d4ce42c67 Improved bot detection - issue #1207. Added ticket limits per hour and day. 2017-06-28 19:13:52 +02:00
Thorsten Eckel
4aa1ec84be Fixed issue #1184 - Ticket create state after OTRS import is wrong. 2017-06-28 15:00:48 +02:00
Thorsten Eckel
507439e12f Improved setup performance by using multiple bundle jobs to install dependencies. 2017-06-28 09:57:55 +02:00
Thorsten Eckel
d214106f98 Lock import resources on updates to prevent write collisions. 2017-06-27 16:49:00 +02:00
Thorsten Eckel
3c50f366f7 Working on issue #1211 - Improved output LDAP sync statistics for deactivated and skipped entries. 2017-06-27 15:46:41 +02:00
Thorsten Eckel
7ab4e7714b Fixed RSpec test behaviour to delte cache after each test to ensure clean base instead of once before all. 2017-06-27 15:44:45 +02:00
Thorsten Eckel
4ee181b5d6 Fixed issue #1211 - LDAP users that are lost don't get reflected into Zammad. 2017-06-27 11:30:27 +02:00
Thorsten Eckel
98c43f9090 Fixed issue #1179 - OpenLDAP group member lookup fails. 2017-06-27 11:23:23 +02:00
Thorsten Eckel
b04f56faed Working on issue #1179 - Added OpenLDAP Fusion Directory user filter for auto detection. 2017-06-27 11:23:08 +02:00
Martin Edenhofer
6a4e17a224 Fixed issue #1208 - Too many emails about new client access if user agent is "". 2017-06-27 08:07:43 +02:00
Martin Edenhofer
3e92e4f9f4 Added locale rtl support (e. g. for Persian or Hebrew). 2017-06-26 15:16:03 +02:00
Rolf Schmidt
afafa1d8b2 Fixed issue #1165 - User can not be removed from organization. 2017-06-26 11:32:37 +02:00
Martin Edenhofer
ea8a8ee07a Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-06-26 11:28:58 +02:00
André Bauer
45219464e1 added elasticsearch dependency to packages 2017-06-25 12:25:56 +02:00
André Bauer
b77ae760a0 added check for existing file 2017-06-24 11:51:16 +02:00
André Bauer
52baed55f8 fixed debian webserver conf 2017-06-24 10:43:01 +02:00
Martin Edenhofer
9b8810fa58 Improved loop detection (added more steps). 2017-06-24 00:09:51 +02:00
Martin Edenhofer
11c8fdbb1c Allow also width and style for tr tags. 2017-06-24 00:07:14 +02:00
Martin Edenhofer
306cd6c3db Improved postmaster database filter. 2017-06-24 00:06:08 +02:00
Martin Edenhofer
9e03183e9e Fixed issue #1183 - Repetitive json error on production log. 2017-06-23 16:39:40 +02:00
Martin Edenhofer
88e3d9e574 Improved error handling of emails with invalid byte sequence for utf8 encoding. 2017-06-23 13:57:24 +02:00
Martin Edenhofer
691b63d011 Improved twitter length calculation. If streaming api is used, fetch parent tweet via REST api. Added initials support as article feature. 2017-06-23 09:37:54 +02:00
Martin Edenhofer
62e5be1ed2 Implemented issue #707 - Edge looses text formatting on reply (may also on other browsers). 2017-06-21 17:49:35 +02:00
Martin Edenhofer
ef282e187b Improved tree select feature - allow also to select node/parent of childs. 2017-06-21 08:59:51 +02:00
Martin Edenhofer
97eca99501 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-06-20 17:14:41 +02:00
Thorsten Eckel
18a9eed038 Added general check for Group access based on agent.ticket permission. 2017-06-20 17:13:42 +02:00
Thorsten Eckel
b1884c82f6 Only active instances have access to Groups. 2017-06-20 17:11:42 +02:00
Martin Edenhofer
7b74185d05 Sometimes the wizard takes longer. 2017-06-20 17:09:24 +02:00
Martin Edenhofer
fb8130da18 Added tree selection attribute for object manager. 2017-06-20 17:08:59 +02:00
Martin Edenhofer
284dbb3de8 Replaced autocomplete value new-password with off to prevent browser autocomplete feature in certain fields (only use it for user password now). 2017-06-20 11:05:16 +02:00
Martin Edenhofer
a548009b86 Improved email sender parsing with multiple senders in from. 2017-06-19 22:24:22 +02:00
Denny Bresch
8b72ce5933 Added 'name' and 'requied' to searchabeSelect input to interact with this input via coffeescript. 2017-06-19 12:17:20 +02:00
Denny Bresch
d662546927 Fixed tag merge bug. 2017-06-19 12:16:09 +02:00
Martin Edenhofer
e76422952c Avoid "RuntimeError: can't modify frozen Time". 2017-06-19 11:42:02 +02:00
Martin Edenhofer
e3214e3ac2 Improved memory usage on verify storage contend based on checksums. 2017-06-19 08:23:07 +02:00
Martin Edenhofer
99c05d5176 Clear cache after model has changed (prevent issues on upgrade). 2017-06-19 08:21:07 +02:00
Martin Edenhofer
de925979b7 Updated to tails 4.2.8. 2017-06-19 08:03:14 +02:00
Martin Edenhofer
3d4e3edaed Improved test. 2017-06-18 23:28:41 +02:00
Thorsten Eckel
cc151fb4bb Removed debug line. 2017-06-17 20:03:59 +02:00
André Bauer
8235cd5959 set env vars 2017-06-17 11:30:01 +02:00
André Bauer
3f9e7c2088 set env vars 2017-06-17 11:25:47 +02:00
Martin Edenhofer
15a50ba0a3 Fixed test. 2017-06-17 01:02:34 +02:00
Martin Edenhofer
6f7632c8ea Improved code layout. 2017-06-17 01:02:13 +02:00
Martin Edenhofer
1f14ae5895 Fixed typo in pod. 2017-06-17 00:56:28 +02:00
Martin Edenhofer
6f349abcbe Improved memory usage on writing storage from/to fs/database. 2017-06-17 00:54:20 +02:00
Martin Edenhofer
d93d404902 Improved tests (do not break on before/after callbacks). 2017-06-17 00:53:20 +02:00
Thorsten Eckel
350c3ead51 Added enhanced Group access functionality. 2017-06-16 22:43:09 +02:00
Martin Edenhofer
873998ec5a Improved tests. 2017-06-15 08:38:38 +02:00
Martin Edenhofer
1a43d9bd5c Improved tests. 2017-06-14 17:25:45 +02:00
Martin Edenhofer
71980d6cf5 Fixed typo. 2017-06-13 02:01:49 +02:00
Martin Edenhofer
898e00ef37 Fixed typo. 2017-06-13 02:01:08 +02:00
Martin Edenhofer
c1aa57fd9b Updated nokogiri to 1.8.0 (see https://github.com/sparklemotion/nokogiri/issues/1634). 2017-06-13 01:49:28 +02:00
Martin Edenhofer
8ab56ef235 If user organization relation/featrue is used for different propose, do not touch references. 2017-06-12 15:24:10 +02:00
Thorsten Eckel
44e41dcf10 Fixed issue #1176 - Generation of weekly report fails with internal server error. 2017-06-09 18:19:40 +02:00
Martin Edenhofer
1eaf46f466 Improved Setting.get and Setting.set - reduced database access and moved from 2 minutes to 15 seconds ttl for reading. 2017-06-08 06:49:25 +02:00
Thorsten Eckel
6bf970b85d Added report columns: Owner, Organization, Create Channel, Sender and Tags. 2017-06-07 14:20:51 +02:00
Thorsten Eckel
08940fbb06 Fixed bug: Reports raise error if (history) attribute or type couldn't be found. 2017-06-07 14:20:45 +02:00
Martin Edenhofer
18c826c2a2 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-06-06 20:21:17 +02:00
Martin Edenhofer
e1611ee509 Improved error handling/parsing of invalid filenames for attachments. 2017-06-06 20:20:37 +02:00
Thorsten Eckel
cb919312b0 Introduced foreign keys to ensure consistent data state. 2017-06-06 17:49:49 +02:00
Martin Edenhofer
278e90fc63 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-06-06 14:11:58 +02:00
Martin Edenhofer
e3c90174ee Added save_to_file as helper to get attachments for testing assets. 2017-06-06 14:11:28 +02:00
Martin Edenhofer
f3a7b5415d Improved test. 2017-06-06 14:10:29 +02:00
Martin Edenhofer
805199880a Improved mem usage. 2017-06-06 14:09:50 +02:00
André Bauer
0c29a59640 set postgresql db user to fix rake db:drop 2017-06-03 16:32:15 +02:00
Martin Edenhofer
f4495dc126 Improved email parsing of invalid email filename headers. 2017-06-02 17:41:02 +02:00
Thorsten Eckel
6a98b5a41d Fixed issue #1153 - Using Zendesk basic priority feature breakes import. 2017-06-02 12:57:18 +02:00
Thorsten Eckel
017022eae9 Fixed issue #1114 - Configuration of LDAP with disabled anonymous bind fails. 2017-06-01 17:09:17 +02:00
Thorsten Eckel
118ed9d58b Fixed issue #1155 - Group and User filter detection for freeIPA LDAP fails. 2017-06-01 12:48:00 +02:00
Martin Edenhofer
8cef58b4da Improved streaming handling (fetch parent tweets via REST). Improved auto reconnect to stream if channel config has changed. Improved max import for streaming (already reached max import on initial config - took 15 min. to import first tweet). Changed fallback REST tweet search from 30 to 20 minutes. 2017-06-01 08:23:53 +02:00
Thorsten Eckel
d77e73bb12 Zendesk import: Improved exception text for ObjectManager Attribute errors and removed dependency of init_callback implementation. 2017-05-30 18:32:46 +02:00
Thorsten Eckel
2bbb2c9519 Fixed issue #1095 - Zendesk import: Error while importing ticket field with dash in name. 2017-05-30 18:32:28 +02:00
Martin Edenhofer
329ab853a2 Fixed error log of issue #948 - recipient attribute isn't a hash. 2017-05-30 16:06:17 +02:00
Martin Edenhofer
48e3da57ee Improved email loop protection. Remember permanent delivery failed on user to prevent email loops. 2017-05-30 08:55:51 +02:00
Martin Edenhofer
2fe0b19a3d Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-05-30 08:36:39 +02:00
Thorsten Eckel
0ebeb58a6c Fixed issue #1097 - Can't map LDAP group to multiple Zammad roles. 2017-05-30 08:26:45 +02:00
Martin Edenhofer
1bf7562229 Serialise Twitter::Place to prevent search indexing issues. 2017-05-30 01:45:04 +02:00
Rolf Schmidt
1a6c8ce0f3 Fixed issue #944 - Remove all Users from Overview does not work. 2017-05-29 13:49:17 +02:00
Martin Edenhofer
2893910aba Fixed filename. 2017-05-26 15:36:45 +02:00
Martin Edenhofer
79c398becb Implemented reply_to header as sender/customer feature. 2017-05-26 15:34:32 +02:00
Martin Edenhofer
e9efae4b83 Fixed elasticsearch index issue by replace Twitter::NullObject with nil. 2017-05-26 15:32:37 +02:00
Martin Edenhofer
0b54d60e4f Small code cleanup (added placeholder for overview error message) and improved filter description. 2017-05-26 09:54:00 +02:00
Martin Edenhofer
626c116679 Also take origin_by_id for article assets. 2017-05-24 15:58:22 +02:00
Martin Edenhofer
586d47a41f Fixed issue #1131 - Email loop if default trigger for follow up is active and customer email address is invalid. 2017-05-24 12:57:00 +02:00
Rolf Schmidt
a2a6309692 Fixed issue #1034 - Update of object attribute leads to CSRF token verification failure. 2017-05-23 11:27:07 +02:00
Martin Edenhofer
e00776ea64 Fixed issue #764 - Not showing TO: / CC: fields on IE11 when answering a ticket. 2017-05-23 10:53:19 +02:00
Martin Edenhofer
aa37dc02ca Added expire_in to gitlab config. 2017-05-23 08:02:59 +02:00
Martin Edenhofer
18a27f0d7a Fixed issue #990 - paste in not possible in contentediable fields. 2017-05-22 21:44:40 +02:00
André Bauer
d6a45cbb89 Merge remote-tracking branch 'github/develop' into develop 2017-05-21 10:58:51 +02:00
André Bauer
95d0b5bc7b changed readme 2017-05-21 10:58:41 +02:00
André Bauer
8836aa0819 Update README.md 2017-05-21 10:53:51 +02:00
Maarten Raaphorst
e40772f7b7 No longer raise exception when scheduler job fails to run after ten tries, but record the error instead. 2017-05-19 08:54:09 +02:00
Felix Niklas
8bf6c1098b Unleash New Ticket Width
see #1059
2017-05-18 10:46:31 +02:00
Martin Edenhofer
2e062693ea Fixed issue #1086 - Tag Bug - deleted without changes. 2017-05-16 23:19:28 +02:00
Thorsten Eckel
54d4a87ead Fixed bug #890 - Imported states from OTRS are not correctly mapped to Zammad states. 2017-05-16 18:11:43 +02:00
Thorsten Eckel
e4de5bb988 Make more models (re-)seedable. 2017-05-16 18:11:43 +02:00
Thorsten Eckel
1425be7335 Changed behaviour: Since we don't use sub directories for seeds files we replace the slashes with underscores. 2017-05-16 18:11:43 +02:00
Martin Edenhofer
690fcbd81d Improved sorting/grouping - follow up fix for issue #1093 - Overview group by Organisation split multiple times and issue #1064 - Overview - Groups shown twice. 2017-05-16 15:14:10 +02:00
Martin Edenhofer
defdb972a1 Fixed issue #811 - Unprocessable Email (without email address in from header) and issue #969 - Mail processing error (with broken mail headers). 2017-05-16 14:20:57 +02:00
Thorsten Eckel
c5d3052e39 Fixed bug #1088: Changed LDAP entry check to support Novell eDirectory. 2017-05-16 12:13:56 +02:00
Martin Edenhofer
79a4f2972a Update trigger recipient to use reply_to in default auto responders. 2017-05-16 00:38:59 +02:00
Martin Edenhofer
1b5dbdce6a Merge branch 'private-issue1090_es_default_operator' into develop 2017-05-15 20:19:46 +02:00
Martin Edenhofer
0d4e391ad9 Implemented issue #1090 - Switch elasticsearch standard operator from OR to AND. 2017-05-15 18:20:39 +02:00
Thorsten Eckel
adf8babab5 Fllow up: Fixed issue #893 - OTRS Importer problem with CAPITAL letters in email addresses. 2017-05-15 15:39:56 +02:00
Thorsten Eckel
46e6a6fda4 Fixed bug: Exception logging was broken since Logger::Formatter was used and ActiveSupport::TaggedLogging::Formatter broke it. 2017-05-15 15:37:40 +02:00
Martin Edenhofer
672159a2bf Merge branch 'private-issue1089_email_border' into develop 2017-05-15 15:09:37 +02:00
Martin Edenhofer
c07faa1f11 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-05-15 15:09:15 +02:00
Martin Edenhofer
9220ad1008 Small improvement for logging. 2017-05-15 15:09:02 +02:00
Martin Edenhofer
f9591e49ae Fixed issue#1089 - Border shown in Groupwise mail client on reply of Zammad emails. 2017-05-15 14:24:45 +02:00
Thorsten Eckel
4a12788e04 Follow up: Fixed issue #1080 - Scheduler won't start because of missing DB connection on PostgreSQL 9.2.18. 2017-05-15 13:02:19 +02:00
Thorsten Eckel
d5161405c0 Fixed bug: ObjectManager attributes are added twice when running all migrations and seeds. 2017-05-14 19:15:57 +02:00
Thorsten Eckel
3300381f41 Fllow up: Fixed issue #893 - OTRS Importer problem with CAPITAL letters in email addresses. 2017-05-14 18:55:56 +02:00
Thorsten Eckel
9934286a33 Fixed issue #1080 - Scheduler won't start because of missing DB connection on PostgreSQL 9.2.18. 2017-05-13 15:50:28 +02:00
Thorsten Eckel
22f87c8826 Fixed bug #1070: Existing resources get "save!"ed without changes. This triggers Rails model callbacks and executes unneeded actions.
This was caused by an error in the detection of changed associations. Unchanged associations were interpreted as a reset of the association. Therefore all associations without a new value won't get tracked anymore. This is the right behavior since they won't change the current value of the resource without a value.
2017-05-12 19:11:23 +02:00
Thorsten Eckel
199686dce1 Fixed issues #1008 - LDAP import stucks when Scheduler gets stopped or restarted. 2017-05-12 19:11:16 +02:00
Thorsten Eckel
ec6a4a199c Working on issue #981 - Added possibility to manually start LDAP import. 2017-05-12 19:11:07 +02:00
Thorsten Eckel
ea926d1095 Working on issue #981 - Error message about insufficient LDAP configuration is confusing and should be an information instead. 2017-05-12 19:11:01 +02:00
Martin Edenhofer
75fb615f3d Do only send X-Requested-With header via ajax. 2017-05-12 01:27:41 +02:00
Martin Edenhofer
862ec3706d Fixed issue #1053 - Bulk Action -> JS Error - Bug. 2017-05-11 23:52:57 +02:00
Thorsten Eckel
d12d386f00 Fixed failing tests - GoogleMaps result changed. 2017-05-10 10:30:26 +02:00
Thorsten Eckel
508f621377 Working on issue #981 - Improved LDAP sync performan by caching entry count result. 2017-05-10 09:53:03 +02:00
Thorsten Eckel
e3891ebeed Working on issue #1008 - Improved trace- and debugability for skipped LDAP User import entries. 2017-05-10 09:52:28 +02:00
Thorsten Eckel
bb230519be Working on issue #981 - Fixed bug: LDAP integration admin interface shows error if functionality is enabled but not configured yet. 2017-05-10 09:51:19 +02:00
Thorsten Eckel
6c2ae15c8d LDAP password should get filtered in the Zammad log. 2017-05-10 09:50:59 +02:00
Thorsten Eckel
65443b3768 Working on issue #981 - Make user filter and role assignments default behaviour configurable. 2017-05-10 09:50:48 +02:00
Thorsten Eckel
1414f3c7e4 Working on issue #981 - Allow customization of detected BaseDNs. 2017-05-10 09:45:16 +02:00
Thorsten Eckel
2a53d1f1d0 Added 'unknown' attribute to searchable select input to allow values not available in the list. 2017-05-10 09:45:05 +02:00
Thorsten Eckel
451f31f7cf Working on issue #981 - Fixed bug: Last result shows broken statistic if no import was performed. 2017-05-10 09:44:35 +02:00
Thorsten Eckel
f0e2a2e0bb Working on issue #981 - Improved UX: SSL selection should only be shown for LDAPS hostnames. Toggeling the enabled state confuses theuser. 2017-05-10 09:43:16 +02:00
Thorsten Eckel
b8a92582a1 Fixed bug: Legacy hashed passwords (like sha2) will get rehashed when set.
This happens when a user password should get set without transfering it in plain like e.g. the REST API, an import or the auto_wizard.json file. Therefore Zammad should accept legacy passwords when set but should convert them on first login to the internal format (as already implemented).

Additionally there should be no exclusion for the import mode when setting/ensuring a password since Zammand couldn't handle it later.
2017-05-08 17:08:09 +02:00
Martin Edenhofer
e46ff8adbd Merge branch 'private-me-imporve_scheduler_logging' into develop 2017-05-08 16:31:41 +02:00
Martin Edenhofer
bc3ecc1905 Improved renderScreen* to accept local el via params. 2017-05-08 16:30:39 +02:00
Martin Edenhofer
65b01371df Improved scheduler and websocket server logging. 2017-05-08 16:05:38 +02:00
Felix Niklas
b916929c29 articleNewEdit
- fix line wrapping bug introduced with last css commit, fixes #1054
2017-05-08 11:08:08 +02:00
André Bauer
acdbd4b83a some enhancements to backup & restore 2017-05-07 12:20:59 +02:00
Felix Niklas
4b670b0786 Richtext
- overwrite contenteditable hover and focus styles, fixes #1044
2017-05-05 23:30:17 +02:00
Martin Edenhofer
2dbfbce0a3 Corrected unit test. 2017-05-05 15:45:36 +02:00
Martin Edenhofer
6b56e53166 Improved allowed table css attributes for html sanitizer. 2017-05-05 15:22:11 +02:00
Martin Edenhofer
2e4ba95f56 Improved table group by with sort option. 2017-05-05 13:30:08 +02:00
Martin Edenhofer
decb38ed4b Fixed issue #1045 - Subject with "Subject: =?us-ascii?Q?ABC / 123 / Wetterau West / ABC?=" is not decoded. 2017-05-05 13:13:18 +02:00
Rolf Schmidt
0bd0693de9 Fixed issue #377 - Reply to merged ticket gets appended to the wrong ticket. 2017-05-05 11:17:34 +02:00
Rolf Schmidt
c82622913a Fixed issue #214 - Delete tickets. 2017-05-05 11:16:47 +02:00
Rolf Schmidt
7b1a379a2d Revert "Squashed commit of the following:"
This reverts commit 7d2409bddc.
2017-05-05 11:16:26 +02:00
Rolf Schmidt
7d2409bddc Squashed commit of the following:
commit fb089fd8a0ee2cfeb6882e993bbfe637847ddea5
Author: Rolf Schmidt <rolf.schmidt@znuny.com>
Date:   Wed May 3 17:12:24 2017 +0200

    Moved touch_reference_by_params to own function.

commit 13971570cba1bf0f437ff810792755c3bfbd8f1c
Author: Rolf Schmidt <rolf.schmidt@znuny.com>
Date:   Wed May 3 16:20:15 2017 +0200

    Added code to perform ticket deletions in frontend of zammad.

commit 88a079b6a5558cbfe5f4b76bfdc74cde98d79e6a
Author: Rolf Schmidt <rolf.schmidt@znuny.com>
Date:   Wed May 3 14:03:29 2017 +0200

    Fixed test.

commit c6e44a2027834f2f70b17f821232cbf8501a3f5c
Author: Rolf Schmidt <rolf.schmidt@znuny.com>
Date:   Wed May 3 13:57:31 2017 +0200

    Fixed pod.

commit f0ed06be7d6759cbfeabaac5e2653b84f9646967
Author: Rolf Schmidt <rolf.schmidt@znuny.com>
Date:   Wed May 3 13:55:34 2017 +0200

    Improved ticket object to kill all associations on destroy (#214).

commit 56d39992045f5bf8fb91721f3fe7497d5d49f880
Merge: cbbbc00 7647849
Author: Rolf Schmidt <rolf.schmidt@znuny.com>
Date:   Wed May 3 09:38:03 2017 +0200

    Merge branch 'develop' into private-bugfix-214-rs-develop

commit cbbbc0039e9ecdaab185e7bc2fdee046e636eb3a
Author: Rolf Schmidt <rolf.schmidt@znuny.com>
Date:   Tue May 2 16:53:21 2017 +0200

    Reworked file structure of concerns.

    - can (new methods)
    - checks (events, pre/post function checks)
    - has (model related functions and events)
2017-05-05 11:13:44 +02:00
Thorsten Eckel
057ecce102 - Fixed bug: An error message is shown when entering the LDAP integration admin interface for the first time.
Refactoring:
- Added documentation and tests to ImportJob.
- Added documentation and tests to Import::Ldap.
- Introduced Import::Base.
- Migrated existing Import::Test modules in tests to new class structure.
2017-05-05 10:58:05 +02:00
Thorsten Eckel
9c07cecff5 Fixed bug: Dry run imports for resources with has_many associations store the new association value.
- Reworked action and change detection since association changes are not possible to track via ActiveRecord API.

Tests:
- Added import base resource test to ensure associations won't get updated in dry runs.
- Added dry run tests to statistical import factory.
- Fixed broken tests due to switch from .save to .save!
2017-05-05 10:52:40 +02:00
Thorsten Eckel
97114142ed Fixed bug: Failed save actions for import resources should throw an exception instead of just returning false. 2017-05-05 10:49:14 +02:00
Thorsten Eckel
cbc5af2b5b Working on issue #981 - Improved performance to search only needed arguments of a LDAP entry. 2017-05-05 10:48:40 +02:00
Thorsten Eckel
d13bf09fa8 Working on issue #981 - Improved LDAP user sync performance by skipping the lookup for avatars via the webservice. 2017-05-05 10:48:13 +02:00
Thorsten Eckel
36acac38c3 Added custom ActiveSupport callback helper do disable the execution of a given callback for a yielded block. 2017-05-05 10:47:52 +02:00
Martin Edenhofer
32e2f822ab Introduced error screen if no overview is assigned to 2017-05-04 10:06:13 +02:00
Martin Edenhofer
764784908f Support mt6 style. 2017-05-02 22:58:56 +02:00
Martin Edenhofer
10b11cb726 Small improvement to Sessions.cleanup. 2017-05-02 19:41:35 +02:00
Martin Edenhofer
90047729d4 Improved session tests. 2017-05-02 19:16:46 +02:00
Rolf Schmidt
fa454abf3a Reworked file structure of concerns.
- can (new methods)
    - checks (events, pre/post function checks)
    - has (model related functions and events)
2017-05-02 17:21:13 +02:00
Rolf Schmidt
998a74b7f0 Fixed issue #1006 - Reply-To is not considered for automatic responses (triggers). 2017-05-02 15:20:30 +02:00
Martin Edenhofer
2a383afb47 Increased tolerance of test. 2017-05-02 14:22:48 +02:00
Martin Edenhofer
44d889b90c Improved error handling. 2017-05-02 14:11:59 +02:00
Martin Edenhofer
3c1c5d9835 Fixed issue #1014 - Creation of overview fails. 2017-05-02 14:05:17 +02:00
Rolf Schmidt
b1f65bf645 Fixed issue #186 - Related tickets are missing on ticket merge. 2017-05-02 13:37:20 +02:00
Rolf Schmidt
da69501531 Fixed issue #1006 - Reply-To is not considered for automatic responses (triggers). 2017-05-02 13:34:18 +02:00
Martin Edenhofer
9f990f8352 Fixed issue #1012 - Gui stuck / Error on random switching through overviews. 2017-05-02 05:24:05 +02:00
Martin Edenhofer
7a1df2e400 Improved error handling/logging for tweet import. 2017-05-01 10:48:43 +02:00
Martin Edenhofer
1fbd368f02 Fixed issue #1025 - “Update Database" plus restart does not work correctly. 2017-04-30 15:14:17 +02:00
Martin Edenhofer
060051b710 Improved html sanitizer for layout option / empty lines. 2017-04-29 11:44:35 +02:00
Martin Edenhofer
4d7f3c1e6a Fixed issue #681 - Keep modal open on call log event. 2017-04-28 17:15:28 +02:00
Nicolas Dietrich
f2d969a6e3 Allow to send email notifications from scheduled jobs (#784) 2017-04-28 15:54:45 +02:00
Felix Niklas
f19e788a9c Autocomplete
- fix layouting
2017-04-28 13:32:17 +02:00
Martin Edenhofer
7a08b9266b Implemented issue #930 - view support for html tables. 2017-04-28 12:16:15 +02:00
Martin Edenhofer
ee9046e3e9 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-28 12:13:12 +02:00
Felix Niklas
12d33c4d90 Popover
- fix position bug
2017-04-28 12:12:04 +02:00
Martin Edenhofer
95ba493873 Improved error detection (for endless loops in channel fetch). 2017-04-28 11:52:30 +02:00
Rolf Schmidt
dd3471de12 Revert "Fixed tag test."
This reverts commit 5b4364f811.
2017-04-28 10:44:47 +02:00
Thorsten Eckel
75666510f1 Merge Seeds refactoring and improvement branch into develop. 2017-04-28 10:11:27 +02:00
Thorsten Eckel
d49d257ffa Merge LDAP improvements branch into develop. 2017-04-28 10:10:05 +02:00
Thorsten Eckel
276b253e41 Merge OTRS bugfixing branch into develop. 2017-04-28 10:09:30 +02:00
Rolf Schmidt
0a2905aa44 Fixed tag test. 2017-04-28 10:06:15 +02:00
Rolf Schmidt
532e88d782 Fixed issue #874 - Misconfigured Trigger can cause silent failures/backtrace. 2017-04-28 10:06:15 +02:00
Felix Niklas
e7944b0627 Report
- nicer download button
2017-04-28 10:06:15 +02:00
Rolf Schmidt
5b4364f811 Fixed tag test. 2017-04-28 09:34:58 +02:00
Rolf Schmidt
f4272315ac Fixed issue #874 - Misconfigured Trigger can cause silent failures/backtrace. 2017-04-27 16:57:19 +02:00
Felix Niklas
5fafb15dfa Report
- nicer download button
2017-04-27 15:24:02 +02:00
Felix Niklas
a1c4c51985 Article View
- remeasure see-more when images got loaded, see #950
- add top-margin to attachments
2017-04-27 13:51:36 +02:00
Felix Niklas
5362642f78 Limited article width: settle for a max of 1080px
see #957
2017-04-27 13:51:36 +02:00
Felix Niklas
3ac29c8102 Adjust limited article width to a max of 1280px
see #957
2017-04-27 13:51:36 +02:00
Felix Niklas
a00580322d z-index
- condense z-index range: several smaller z-indexes were unused like zIndex-3,4,5,6
- push notifications to the top on z-index: 10 to prevent it from staying behind modal windows, see #655
2017-04-27 13:51:36 +02:00
Rolf Schmidt
6cd7cd3a86 Tidied. 2017-04-27 13:51:36 +02:00
Felix Niklas
883c3ae18b Ticket Zoom
- addon: also change background of the title on focus, see #954
2017-04-27 13:51:36 +02:00
Rolf Schmidt
35ac76a6f6 Removed open ticket from list of related tickets (#655). 2017-04-27 13:51:36 +02:00
Felix Niklas
3bb2f98ab4 Ticket Zoom
- give editable header a background on hover, see #954
- clean out outdated code, fix layout bug when in translate mode
2017-04-27 13:51:36 +02:00
Martin Edenhofer
bfb9e1b133 Improved alignment of lists. 2017-04-27 13:51:36 +02:00
Martin Edenhofer
ed78be7d50 Load default gems based on bundle config. 2017-04-27 13:51:36 +02:00
Felix Niklas
d7696f000b Article View
- remeasure see-more when images got loaded, see #950
- add top-margin to attachments
2017-04-27 13:42:55 +02:00
Felix Niklas
b1f0ed6239 Limited article width: settle for a max of 1080px
see #957
2017-04-27 13:42:55 +02:00
Felix Niklas
dcd08a174b Adjust limited article width to a max of 1280px
see #957
2017-04-27 13:42:55 +02:00
Felix Niklas
19cd386fdf z-index
- condense z-index range: several smaller z-indexes were unused like zIndex-3,4,5,6
- push notifications to the top on z-index: 10 to prevent it from staying behind modal windows, see #655
2017-04-27 13:42:55 +02:00
Rolf Schmidt
bb23bbf565 Tidied. 2017-04-27 13:42:55 +02:00
Felix Niklas
33bd083dee Ticket Zoom
- addon: also change background of the title on focus, see #954
2017-04-27 13:42:55 +02:00
Rolf Schmidt
38b13c2476 Removed open ticket from list of related tickets (#655). 2017-04-27 13:42:55 +02:00
Felix Niklas
7a8208cf1b Ticket Zoom
- give editable header a background on hover, see #954
- clean out outdated code, fix layout bug when in translate mode
2017-04-27 13:42:55 +02:00
Martin Edenhofer
979617bfad Improved alignment of lists. 2017-04-27 13:42:55 +02:00
Martin Edenhofer
8954271197 Load default gems based on bundle config. 2017-04-27 13:42:55 +02:00
Felix Niklas
526ec695f3 Article View
- remeasure see-more when images got loaded, see #950
- add top-margin to attachments
2017-04-27 13:38:08 +02:00
Felix Niklas
465a02cb95 Limited article width: settle for a max of 1080px
see #957
2017-04-27 13:38:08 +02:00
Felix Niklas
2d64f10f8d Adjust limited article width to a max of 1280px
see #957
2017-04-27 13:38:08 +02:00
Felix Niklas
d89786bf92 z-index
- condense z-index range: several smaller z-indexes were unused like zIndex-3,4,5,6
- push notifications to the top on z-index: 10 to prevent it from staying behind modal windows, see #655
2017-04-27 13:38:08 +02:00
Rolf Schmidt
7d74398372 Tidied. 2017-04-27 13:38:08 +02:00
Felix Niklas
1b63784c51 Ticket Zoom
- addon: also change background of the title on focus, see #954
2017-04-27 13:38:08 +02:00
Rolf Schmidt
31164354cb Removed open ticket from list of related tickets (#655). 2017-04-27 13:38:08 +02:00
Felix Niklas
96e1aca489 Ticket Zoom
- give editable header a background on hover, see #954
- clean out outdated code, fix layout bug when in translate mode
2017-04-27 13:38:08 +02:00
Martin Edenhofer
cc78d96d65 Improved alignment of lists. 2017-04-27 13:38:08 +02:00
Felix Niklas
bfdc3ab27f Test unlimited article width #957 2017-04-27 13:38:08 +02:00
Martin Edenhofer
4f0d66d0fc Load default gems based on bundle config. 2017-04-27 13:38:08 +02:00
Rolf Schmidt
dd3700418f Fixed column size of reply_to to 300 chars. 2017-04-27 13:38:08 +02:00
Rolf Schmidt
511448bab2 Fixed column size of reply_to to 500 chars. 2017-04-27 13:38:08 +02:00
Rolf Schmidt
055a4089a4 Fixed issue #203 - Mailprocessing: Reply-To header are ignored. 2017-04-27 13:38:08 +02:00
Rolf Schmidt
6871a50f57 Fixed issue #987 - Creating a custom overview using tags results in error 500. 2017-04-27 13:38:08 +02:00
Martin Edenhofer
8d4e9c3144 Improved email processing for attachments without <> in Content-ID header. 2017-04-27 13:38:08 +02:00
Martin Edenhofer
c807c6c753 Use bundle exec for build processes. 2017-04-27 13:38:08 +02:00
Martin Edenhofer
cb9e52f6fa Fixed html sanitizer loop with own generated link injection. Extended tests. 2017-04-27 13:38:08 +02:00
Martin Edenhofer
c0afd44e0b Fixed html sanitizer loop. Extended tests. 2017-04-27 13:38:08 +02:00
Martin Edenhofer
e122bd9935 Moved back to pg 0.18.4 (newer versions are not working correctly). 2017-04-27 13:38:08 +02:00
Martin Edenhofer
ee31cd1bdd Updated gems as in issue #805 suggested. 2017-04-27 13:38:08 +02:00
chrisdecker1201
fedd9fb087 hidden form on small screen/smartphone (#977) 2017-04-27 13:38:07 +02:00
Gilson
3ec2ce6038 Localization on templates (#993)
* Mailer resource translated for Portuguese Brazilian language

* Portuguese Brazilian email template localization
2017-04-27 13:38:07 +02:00
Rolf Schmidt
34293909dd Fixed issue #187 - Wrong article order after merging of tickets. 2017-04-27 13:38:07 +02:00
Rolf Schmidt
0a6cd3897e Fixed issue #655 - Ticket were shown twice. 2017-04-27 13:38:07 +02:00
Rolf Schmidt
87ec273b57 Fixed issue #206 - Wrong recipient on reply to Received call. 2017-04-27 13:38:07 +02:00
Rolf Schmidt
06c009255f Fixed issue #655 - Ticket were shown twice. 2017-04-27 13:38:07 +02:00
Felix Niklas
cf0c8e0a6a Article View
- remeasure see-more when images got loaded, see #950
- add top-margin to attachments
2017-04-27 12:26:27 +02:00
Felix Niklas
a08e33f0dc Limited article width: settle for a max of 1080px
see #957
2017-04-27 12:11:24 +02:00
Felix Niklas
438873fb31 Adjust limited article width to a max of 1280px
see #957
2017-04-27 12:00:22 +02:00
Felix Niklas
e99b7bfda9 z-index
- condense z-index range: several smaller z-indexes were unused like zIndex-3,4,5,6
- push notifications to the top on z-index: 10 to prevent it from staying behind modal windows, see #655
2017-04-27 11:53:50 +02:00
Rolf Schmidt
3bb2c45e63 Tidied. 2017-04-27 11:31:29 +02:00
Felix Niklas
8488ef5578 Ticket Zoom
- addon: also change background of the title on focus, see #954
2017-04-27 11:29:01 +02:00
Rolf Schmidt
1f4ee1d3be Removed open ticket from list of related tickets (#655). 2017-04-27 11:27:17 +02:00
Felix Niklas
e4ddd8b7f7 Ticket Zoom
- give editable header a background on hover, see #954
- clean out outdated code, fix layout bug when in translate mode
2017-04-27 11:27:00 +02:00
Felix Niklas
ecfd90d47d Test unlimited article width #957 2017-04-27 11:21:28 +02:00
Rolf Schmidt
81b7ca94c0 Fixed column size of reply_to to 300 chars. 2017-04-27 11:21:28 +02:00
Rolf Schmidt
2b413fa374 Fixed column size of reply_to to 500 chars. 2017-04-27 11:21:28 +02:00
Rolf Schmidt
64c13a7985 Fixed issue #203 - Mailprocessing: Reply-To header are ignored. 2017-04-27 11:21:28 +02:00
Rolf Schmidt
f1a7a08a6a Fixed issue #987 - Creating a custom overview using tags results in error 500. 2017-04-27 11:21:28 +02:00
Martin Edenhofer
3b40449a9d Improved email processing for attachments without <> in Content-ID header. 2017-04-27 11:21:28 +02:00
Martin Edenhofer
dc87be6b53 Use bundle exec for build processes. 2017-04-27 11:21:28 +02:00
Martin Edenhofer
0541732581 Fixed html sanitizer loop with own generated link injection. Extended tests. 2017-04-27 11:21:28 +02:00
Thorsten Eckel
d160a86e09 Added 'Seedable' concern to (re-)seed models based on their seed files in /db/seeds . 2017-04-27 11:20:57 +02:00
Martin Edenhofer
04b8aefcb0 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-27 11:07:41 +02:00
Martin Edenhofer
eb172b7385 Improved alignment of lists. 2017-04-27 11:07:31 +02:00
Thorsten Eckel
8ef2970234 Added method to perform a yielded action with an ensured UserInfo.current_user_id and added new and missing tests. 2017-04-27 10:53:32 +02:00
Thorsten Eckel
0fd75fa482 Moved seeds to own files and call them in a loop to restructure them and make separate executions (for resetting purposes) possible. 2017-04-27 10:53:32 +02:00
Thorsten Eckel
591881ccf6 Working on issue #350 - issuecomment-295252402 - Users lock theirselfs out if they provide no role mapping. 2017-04-27 10:49:50 +02:00
Thorsten Eckel
aa53c4e697 Improved association change tracking for broader use cases. 2017-04-27 10:49:50 +02:00
Felix Niklas
508415898f Test unlimited article width #957 2017-04-27 10:39:21 +02:00
Martin Edenhofer
093d679187 Load default gems based on bundle config. 2017-04-27 10:30:18 +02:00
Rolf Schmidt
2f2b4e0262 Fixed column size of reply_to to 300 chars. 2017-04-27 09:54:38 +02:00
Rolf Schmidt
61bcd99b5a Fixed column size of reply_to to 500 chars. 2017-04-27 09:52:14 +02:00
Rolf Schmidt
d3a3eed7a4 Fixed issue #203 - Mailprocessing: Reply-To header are ignored. 2017-04-26 16:50:57 +02:00
Rolf Schmidt
98cac39c80 Fixed issue #987 - Creating a custom overview using tags results in error 500. 2017-04-26 14:57:21 +02:00
Martin Edenhofer
5ee2c5b02a Improved email processing for attachments without <> in Content-ID header. 2017-04-26 14:41:30 +02:00
Martin Edenhofer
17f6444e75 Use bundle exec for build processes. 2017-04-26 13:59:37 +02:00
Martin Edenhofer
98a1ba8a62 Fixed html sanitizer loop with own generated link injection. Extended tests. 2017-04-26 11:05:58 +02:00
Martin Edenhofer
f9adb6c018 Fixed html sanitizer loop. Extended tests. 2017-04-26 09:40:00 +02:00
Martin Edenhofer
485536bcaf Moved back to pg 0.18.4 (newer versions are not working correctly). 2017-04-26 09:40:00 +02:00
Martin Edenhofer
27e0c83236 Updated gems as in issue #805 suggested. 2017-04-26 09:40:00 +02:00
chrisdecker1201
ba2524d5b4 hidden form on small screen/smartphone (#977) 2017-04-26 09:40:00 +02:00
Gilson
652470f660 Localization on templates (#993)
* Mailer resource translated for Portuguese Brazilian language

* Portuguese Brazilian email template localization
2017-04-26 09:40:00 +02:00
Rolf Schmidt
59937ce2a0 Fixed issue #187 - Wrong article order after merging of tickets. 2017-04-26 09:40:00 +02:00
Rolf Schmidt
299f6bd849 Fixed issue #655 - Ticket were shown twice. 2017-04-26 09:39:59 +02:00
Rolf Schmidt
96d9b2f62f Fixed issue #206 - Wrong recipient on reply to Received call. 2017-04-26 09:39:59 +02:00
Rolf Schmidt
9169e09047 Fixed issue #655 - Ticket were shown twice. 2017-04-26 09:39:59 +02:00
Martin Edenhofer
0308d8fe2d Fixed html sanitizer loop. Extended tests. 2017-04-26 08:38:46 +02:00
Martin Edenhofer
75458be086 Moved back to pg 0.18.4 (newer versions are not working correctly). 2017-04-26 01:43:05 +02:00
Martin Edenhofer
7fce4158b0 Updated gems as in issue #805 suggested. 2017-04-25 20:51:23 +02:00
chrisdecker1201
9049ea950b hidden form on small screen/smartphone (#977) 2017-04-25 20:45:35 +02:00
Gilson
77e5d4dec0 Localization on templates (#993)
* Mailer resource translated for Portuguese Brazilian language

* Portuguese Brazilian email template localization
2017-04-25 19:52:04 +02:00
Rolf Schmidt
c8e0465d10 Fixed issue #187 - Wrong article order after merging of tickets. 2017-04-25 16:19:07 +02:00
Rolf Schmidt
743cabc2fa Fixed issue #655 - Ticket were shown twice. 2017-04-25 16:10:38 +02:00
Rolf Schmidt
bcd8edc286 Fixed issue #206 - Wrong recipient on reply to Received call. 2017-04-25 16:06:23 +02:00
Rolf Schmidt
3cf0af10d9 Fixed issue #655 - Ticket were shown twice. 2017-04-25 16:04:59 +02:00
Martin Edenhofer
5e7062295b Removed state and priority refs in seeds.rb. 2017-04-25 11:04:41 +02:00
Thorsten Eckel
94debbfe4b In some environments the Model.reset_column_information is not reflected to threads. So an import error message appears. Reset needed model column information for each thread. 2017-04-25 09:53:13 +02:00
Thorsten Eckel
f7ba0a2865 In certain cases the http requests fails (== full import stops, need to start again):
- max database connections (unprocessable html content is delivered, Zammad expected json - full import stops because of not parseable JSON)
- tmp. network issues (e. g. https issue or connection reset - full import stops because of exception)

Try failing http request 3 times (with some sleep between) to ignore OTRS and network related issue.
2017-04-25 09:52:55 +02:00
Thorsten Eckel
ed6cca8021 Improved OTRS import role sync check to reduce SQL queries. 2017-04-25 09:52:33 +02:00
Thorsten Eckel
a6c3f55844 - Improved code layout.
- Added YARD doc for sustainability purposes.
2017-04-25 09:51:39 +02:00
Thorsten Eckel
68bab40c13 Fixed bug: OTRS import throws an exception if no Article From is present. 2017-04-25 09:50:44 +02:00
Thorsten Eckel
a306078ebb Fixed issue #896 - Passwords of imported users get changed. 2017-04-25 09:49:48 +02:00
Thorsten Eckel
4a1b4af6ae Fixed issue #893 - Capital letters in article from cause problems in OTRS import. 2017-04-25 09:40:47 +02:00
Thorsten Eckel
943d917139 Fixed issue #894 - Articles without a body fail import. 2017-04-25 09:40:36 +02:00
Thorsten Eckel
762f52d52a Revert "Refactoring: Use .pluck(:id) over .id for ActiveRecord lookups." - Don't use .pluck on find_by results.
This reverts commit e3a856c9ea.
2017-04-25 09:31:54 +02:00
Thorsten Eckel
e3a856c9ea Refactoring: Use .pluck(:id) over .id for ActiveRecord lookups. 2017-04-25 09:16:16 +02:00
Martin Edenhofer
c53194b606 Code cleanup. 2017-04-25 00:16:04 +02:00
Martin Edenhofer
82176fdcda Enable roles management. 2017-04-25 00:15:37 +02:00
Martin Edenhofer
aa4c34d53f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-24 15:16:54 +02:00
Thorsten Eckel
3d40aa022d Fixed issue #906 - Doorkeeper tokens should be refreshable but aren't. 2017-04-24 13:57:29 +02:00
Martin Edenhofer
11285e1dd1 Fixed issue #985 - SMTP / Sendmail Setup not possible due to broken CSS. 2017-04-24 13:24:23 +02:00
Rolf Schmidt
88b474e6e9 Fixed issue #975 - Exception in OTRS Import. 2017-04-24 11:55:27 +02:00
André Bauer
6b405ce87b added suse firewall info to final message 2017-04-23 12:37:54 +02:00
André Bauer
3d811427ee better explanation about changing servername in final message 2017-04-23 11:58:17 +02:00
André Bauer
80a516fc82 - added ports to pkgr.yml
- renamed bind var
- changed from puma to rails server command
2017-04-23 11:00:15 +02:00
André Bauer
365e691587 added which as package dependency for centos 2017-04-22 23:33:14 +02:00
André Bauer
943a9e6ac2 set default value for ip and ports in procfile.
rails and websocket servers will bind to 127.0.0.1 in deb & rpm packages now.
2017-04-22 11:17:36 +02:00
Martin Edenhofer
17830fea0c Updated for 1.6.x. 2017-04-21 14:10:25 +02:00
Thorsten Eckel
d93c1ba444 Fixed issue #912 - Long Twitter direct messages are shown as link after 140 chars. 2017-04-21 13:52:32 +02:00
Martin Edenhofer
131d360c75 Implemented issue #645 - Alternative pretty date format. 2017-04-21 11:25:28 +02:00
Martin Edenhofer
5239515096 Added possibility to download time accounting as excel format. 2017-04-21 08:47:28 +02:00
Rolf Schmidt
b81378219d Improved dashboard widget for waiting to also calculate tickets which are not open (#759). 2017-04-20 17:13:31 +02:00
Martin Edenhofer
d668cfc705 Merge branch 'private-issue880-chat_message_to_long' into develop 2017-04-20 14:30:53 +02:00
Martin Edenhofer
1c68fd9a84 Improved html. 2017-04-20 13:17:11 +02:00
Martin Edenhofer
48208e3bcb Improved object done counter. 2017-04-20 13:16:48 +02:00
Martin Edenhofer
e26aa1f599 Fixed issue #880 - No chat message over 5000 chars possible. E. g. if image is pasted. 2017-04-20 13:15:40 +02:00
Rolf Schmidt
de7fef8c18 Fixed issue #645 - Dashboard widget "Waiting time today" is not counting. 2017-04-20 12:04:20 +02:00
Martin Edenhofer
7c3e530233 Moved to mini test 6. 2017-04-20 00:11:39 +02:00
Martin Edenhofer
0554701430 Delete cache for invalidate overview caches. 2017-04-20 00:11:12 +02:00
Martin Edenhofer
f0f4f278c3 Overviews with multi role support. 2017-04-19 21:54:04 +02:00
Thorsten Eckel
8aed86bbf0 Fixed bug: Resources get updated (only updated_at) even if not needed. 2017-04-19 16:29:12 +02:00
Martin Edenhofer
7c531aa27a Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-19 15:34:19 +02:00
Thorsten Eckel
5a0372cc1f Updated github issue template to ask the issuer how Zammad was installed. 2017-04-19 15:16:45 +02:00
Martin Edenhofer
2d6e4eb9d2 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-19 15:06:43 +02:00
Martin Edenhofer
78b73eef43 Improved ldap settings. 2017-04-19 15:00:51 +02:00
Thorsten Eckel
e98b14b757 Fixed bug: Empty ImportJob payload store defaults to an empty Hash which will start the LDAP import without a config. 2017-04-19 14:59:48 +02:00
Martin Edenhofer
21206f2f62 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-19 14:41:27 +02:00
Martin Edenhofer
75bd61ce91 Improved ldap summary layout. 2017-04-19 14:41:16 +02:00
Thorsten Eckel
feef4211f7 Added methods to queue registered import backends as import jobs and start them easily via the scheduler. 2017-04-19 14:37:11 +02:00
Martin Edenhofer
dc8de34473 Improved quoting. 2017-04-19 12:31:33 +02:00
Martin Edenhofer
a5c2b9a578 Improved translations. 2017-04-19 12:30:04 +02:00
Thorsten Eckel
c9b2255e4f Initial version of LDAP user sync support. 2017-04-19 12:09:54 +02:00
Martin Edenhofer
51dfc921ea Set default state to supergood - issue #645. 2017-04-19 11:57:39 +02:00
Thorsten Eckel
7b6423e955 Follow up for issue #839 test - Added RSpec system init support file to create needed newly admin user. 2017-04-19 11:46:38 +02:00
Martin Edenhofer
c58cae13bb Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-19 09:55:35 +02:00
Martin Edenhofer
6859b22db6 Show last name if only lastname exsists in displayNameLong() and displayName(). 2017-04-19 09:55:20 +02:00
Rolf Schmidt
c2cb152114 Fixed issue #839 - Dont allow "none" admin user. 2017-04-19 09:37:43 +02:00
Martin Edenhofer
78ddb3b62e Set password field to autocomplete=“new-password”. 2017-04-19 01:12:06 +02:00
Martin Edenhofer
e9104157f8 Merge branch 'private-me-form-new-password' into develop 2017-04-19 01:09:57 +02:00
Martin Edenhofer
ccd83f5004 Re-enabled form of setting after submit. 2017-04-19 00:22:31 +02:00
Martin Edenhofer
8117cfb3aa Replaced autocomplete=“off” with autocomplete="new-password”. 2017-04-18 20:04:40 +02:00
Martin Edenhofer
043cacfc26 Implemented issue #205 - Cursor focus on any modal dialogs. 2017-04-18 19:52:00 +02:00
Martin Edenhofer
f3f2d1ef85 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-18 18:17:21 +02:00
Martin Edenhofer
5c1d232df5 Fixed issue #962 - AutoFill icon in Safari is shown in many fields, which makes editing fields not easy. 2017-04-18 18:16:51 +02:00
Rolf Schmidt
1786c0549b Prevent default of shortcut CTRL + SHIFT + T to skip browser functions which would open url of old closed tabs. 2017-04-18 18:01:08 +02:00
Rolf Schmidt
9c55b292f5 Fixed issue #197 - ctrl+alt+x does not work. 2017-04-18 17:54:59 +02:00
Rolf Schmidt
9f1a2e902c Fixed issue #839 - Dont allow "none" admin user. 2017-04-18 17:20:40 +02:00
Martin Edenhofer
7db9f5e3c0 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-04-18 11:37:25 +02:00
Martin Edenhofer
ab0e648560 Small code layout formatting. 2017-04-18 10:42:33 +02:00
Rolf Schmidt
c5c6876054 Fixed issue #645 - Dashboard widget "Waiting time today" is not counting. 2017-04-18 10:06:22 +02:00
Rolf Schmidt
64c86a758f Improved code to support admin user with different user login (#767). 2017-04-18 10:03:47 +02:00
Martin Edenhofer
87aedd8cc5 Added agent limit support. 2017-04-18 09:38:53 +02:00
Never
b80b1679b6 fixed ES URL ip to loop (#961) 2017-04-18 07:35:05 +02:00
Martin Edenhofer
449d1904fe Improvement for issue #952 - External links in html emails will be open in local context. 2017-04-18 01:20:47 +02:00
Martin Edenhofer
4b332b46cd Added groups to report download list. 2017-04-18 01:14:54 +02:00
Martin Edenhofer
e3065b1c51 Prevent error message link mentored in issue #948. 2017-04-17 13:03:16 +02:00
Martin Edenhofer
a9b9cdc01d Implemented issue #953 - More precise filesize. 2017-04-17 10:16:14 +02:00
Martin Edenhofer
b3ae159c2e Fixed issue #952 - External links in html emails will be open in local context. 2017-04-13 14:55:37 +02:00
Martin Edenhofer
5868fdd19f Fixed issue #951 - Auto detection of www urls fails. 2017-04-13 14:47:12 +02:00
Rolf Schmidt
fb1d20c5e4 Fixed issue #946 - Current date in date picker not highlighted. 2017-04-13 11:05:45 +02:00
Rolf Schmidt
8c8f24f077 Fixed issue #690 - API call /api/v1/online_notifications/{id} yields "no route". 2017-04-13 10:15:26 +02:00
Rolf Schmidt
a15f7abc00 Fixed issue #245 - No tag in conditions for new Overviews, Triggers, Schedulers and SLAs. 2017-04-12 16:28:12 +02:00
Rolf Schmidt
284d9e34b4 Fixed issue #245 - No tag in conditions for new Overviews, Triggers, Schedulers and SLAs. 2017-04-12 16:27:00 +02:00
Rolf Schmidt
ee96e5aa91 Fixed issue #245 - No tag in conditions for new Overviews, Triggers, Schedulers and SLAs. 2017-04-12 15:53:44 +02:00
Thorsten Eckel
021f6f03f8 Fixed bug: In some (test-)cases Taskbar items order is mixed up. 2017-04-12 15:52:27 +02:00
Rolf Schmidt
c3d91a8ce2 Fixed issue #256 - No tag in conditions for new Overviews, Triggers, Schedulers and SLAs. 2017-04-12 15:41:54 +02:00
Rolf Schmidt
91033177b3 Fixed issue #897 - Schedules - Disable Notification not changable. 2017-04-12 15:03:29 +02:00
Martin Edenhofer
7dfa5e546f Moved to taggable concern. 2017-04-12 09:34:49 +02:00
Martin Edenhofer
55a31084bc Fixed issue #904 - Merged Ticket escalated. 2017-04-11 13:11:44 +02:00
Martin Edenhofer
9cc1f8b564 Fixed issue #902 - Can't use PUT on Organizations REST API with token. 2017-04-11 08:33:08 +02:00
Martin Edenhofer
dbbcb5175e Added user_autocompletion as possible attribute. 2017-04-10 15:02:13 +02:00
Martin Edenhofer
c662df0d11 Fixed issue #903 - member_ids missing in organization list API endpoint. 2017-04-10 13:32:16 +02:00
Martin Edenhofer
b00dc74e8e Refactoring of object organization selector. 2017-04-10 13:17:37 +02:00
Martin Edenhofer
ddbee1ee8f Added missing templates. 2017-04-10 11:26:39 +02:00
Martin Edenhofer
873df9528a Refactoring of object organization selector. 2017-04-10 11:02:08 +02:00
Martin Edenhofer
058bd93fcb Refactoring ticket stats of user and org profile. 2017-04-10 10:06:11 +02:00
Martin Edenhofer
5c94682caf Remove meta params of form. 2017-04-10 10:00:38 +02:00
Martin Edenhofer
5fd5f4318a Fixed issue #656 - Shortcuts in different keyboard layout. 2017-04-10 08:08:18 +02:00
Martin Edenhofer
b8ed5151fb Fixed issue #931 - Template assigned to all new tickets tabs. 2017-04-08 01:23:09 +02:00
Martin Edenhofer
881fa18cbf Fixed issue #936 - After a while a 500er error message appears. 2017-04-08 00:50:37 +02:00
Rolf Schmidt
095792aa5b Fixed issue #926 - Accounted Time. 2017-04-07 16:44:34 +02:00
Martin Edenhofer
5cd5b7379a Updated clearbit realtime result. 2017-04-07 11:35:19 +02:00
Martin Edenhofer
652bc3b32c Raise if update/create was not possible. 2017-04-06 16:16:52 +02:00
Martin Edenhofer
eb734b74cc Removed default value. 2017-04-06 16:14:07 +02:00
Martin Edenhofer
eb326adebd Fixed issue #928 - Email attachment filename in certain cases are not encoded. 2017-04-04 23:17:55 +02:00
Martin Edenhofer
d394a5f1fe Allow accessing attachments of merged tickets by old ticket_id of merged ticket. 2017-04-04 18:15:29 +02:00
Martin Edenhofer
75981c9024 Merge branch 'develop' of github.com:zammad/zammad into develop 2017-04-03 23:42:37 +02:00
Martin Edenhofer
18711a28bd Fixed issue #920 - Unable to create users with admin.user permission. 2017-04-03 23:38:55 +02:00
Never
8ec9073d66 added Chinese templates for Slack (#916) 2017-04-02 14:54:57 +02:00
Martin Edenhofer
eb287c6b90 Merge branch 'private-issue907-link' into develop 2017-03-31 16:18:52 +02:00
Martin Edenhofer
49c3d4c2ec Merge branch 'private-seed_improve_state_ids_state_type' into develop 2017-03-31 16:17:13 +02:00
Martin Edenhofer
e944293757 Fixed issue #907 - “Add link”-screen is not really useful. 2017-03-31 15:29:10 +02:00
Martin Edenhofer
90fcff7bd9 Fixed issue #859 - Changing "Product Name" breaks "Admin" menu. 2017-03-31 13:59:58 +02:00
Martin Edenhofer
53cd59902e Improved lookups for field for state_id. 2017-03-31 13:56:42 +02:00
Martin Edenhofer
72c4de570e Fixed issue #883 - Placeholder in triggers with created_by & updated_by / > in article.body. 2017-03-31 08:54:05 +02:00
Martin Edenhofer
8c1846d7fb Improved wording. 2017-03-30 21:46:40 +02:00
Thorsten Eckel
57e7b9e987 Refactoring:
- Changed behavior to use symbol as parameter to reduce memory coast.
- Removed code duplication.
- Added tests.
2017-03-27 16:06:36 +02:00
Martin Edenhofer
f6c449327a Fixed issue #899 - Follow up detection is broken for Ticket::Number::Date ticket number generator. 2017-03-27 14:30:26 +02:00
Thorsten Eckel
dde92a85df Improved rspec folder structure for better scalability in the future. 2017-03-27 11:25:45 +02:00
Martin Edenhofer
55f17a226b Moved to database lookups for overview creation. 2017-03-27 06:07:46 +02:00
Martin Edenhofer
4d454289f9 Merge branch 'develop' into private-issue887-online-notification 2017-03-25 02:08:45 +01:00
Martin Edenhofer
07e966c7e2 Fixed issue #887 - Some notifications are marked as read initially. 2017-03-25 01:52:53 +01:00
Martin Edenhofer
ec6aaa64d5 Updated new test result. 2017-03-25 01:12:57 +01:00
Martin Edenhofer
30a804691b Fixed issue #851 - user "-" in notification in trigger changes. 2017-03-25 00:00:41 +01:00
Martin Edenhofer
090c6b6d98 Moved to new mini test 6 changes. 2017-03-24 19:42:28 +01:00
Martin Edenhofer
adbe490e54 Fixed issue #889 - Sending emails fails sometimes because of wrong used channel/sender email address. 2017-03-24 17:43:09 +01:00
Martin Edenhofer
56216a0dd4 Moved to new mini test 6 changes. 2017-03-24 11:02:13 +01:00
Martin Edenhofer
c6e96f6410 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-03-23 21:31:28 +01:00
Martin Edenhofer
4e77a877a5 Updated nokogiri to version 1.7.1. 2017-03-23 21:30:48 +01:00
Thorsten Eckel
52af4e4968 Added guard-symlink dependency for development purposes. 2017-03-22 09:49:40 +01:00
Martin Edenhofer
0fd5c971fc Fixed html sanitizer with non utf8 content in href attributes. 2017-03-22 07:55:33 +01:00
Martin Edenhofer
1a1e1a2d7b Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-03-22 03:37:32 +01:00
Martin Edenhofer
307f8cdb5a Prepared token support for form widget. 2017-03-22 03:37:19 +01:00
Never
1148b40433 Chinese for Form widget (#861) 2017-03-22 03:33:33 +01:00
Never
538ccce999 fixed README.md file link typo (#870) 2017-03-22 03:33:09 +01:00
Elias Probst
946aa1c9da Correct grammar (reseted → reset) (#869) 2017-03-22 03:32:36 +01:00
Martin Edenhofer
14c1407448 Sometimes spaces are removed which should be still there (e. g. in case of <div>some text <a>123</a>). 2017-03-21 15:21:01 +01:00
Martin Edenhofer
8f3fe2b399 Fixed endless loop in HtmlSanitizer.cleanup_structure in certain conditions. 2017-03-21 09:02:15 +01:00
Martin Edenhofer
7eebbc6f17 Fixed issue #858 - activity stream or online notifications are sometimes empty. 2017-03-19 00:40:45 +01:00
Martin Edenhofer
21d575dbfd Stilted table generation into separate eco files. Improved mem usage. 2017-03-18 22:13:04 +01:00
Martin Edenhofer
d2070f4407 Merge branch 'develop' of github.com:zammad/zammad into develop 2017-03-18 13:53:52 +01:00
Martin Edenhofer
7f16ad4fd3 Fixed issue #855 - VERSION file of 1.4 shows still 1.3. 2017-03-18 13:43:37 +01:00
Elias Probst
19a81bbdb1 Replace leftover German words (#857) 2017-03-18 11:43:05 +01:00
Martin Edenhofer
03b0a456e7 Improved signature detection. 2017-03-18 11:37:56 +01:00
Martin Edenhofer
7d4d82c1ec Prepared changelog. 2017-03-17 08:44:14 +01:00
Martin Edenhofer
5d891b6788 Updated change log. 2017-03-17 08:02:58 +01:00
Never
13eb4d2c86 Chinese email template localization (#852) 2017-03-17 07:14:25 +01:00
Martin Edenhofer
47b49222cb Fixed typo. 2017-03-17 06:30:44 +01:00
Martin Edenhofer
14507180a3 Improved external attachment support. 2017-03-17 06:27:50 +01:00
Thorsten Eckel
b09ecbe23e Fixed issue #842 - Special chars in article 'From' causing OTRS import to create user with wrong login. 2017-03-16 15:06:24 +01:00
Felix Niklas
af5a73f92a UI fixes
- calendar settings: clean checkbox label
- correct button layout in table
2017-03-16 15:03:20 +01:00
Martin Edenhofer
04eda17d3b Do not change attributes values to downcase (e. g. will break urls). 2017-03-16 14:54:45 +01:00
Martin Edenhofer
73a258b796 Fixed issue #763 - Customer names are sometimes wrapped with quotes. 2017-03-16 06:50:01 +01:00
Martin Edenhofer
2d48100792 Merge branch 'private-jn_843' into develop 2017-03-15 16:51:37 +01:00
Martin Edenhofer
96bd3ef7e0 Fixed issue #795 - Unprocessable emails. 2017-03-15 16:13:48 +01:00
Johannes Nickel
216f36fda7 Changed round value from 3 digits to 1 digit see issue#843 2017-03-15 14:49:55 +01:00
Martin Edenhofer
a8f92f6e3c Implemented issue #394 - email filter issues - unable to set additional ticket attributes. 2017-03-15 12:12:29 +01:00
Martin Edenhofer
22e8836cff Splited ticket sidebar into separate backend to make it pluggable. 2017-03-15 11:29:56 +01:00
Felix Niklas
6ce85513f9 Icons: add missing license information 2017-03-15 11:26:36 +01:00
Felix Niklas
bdb57262e3 Tab Icon: Printer 2017-03-15 11:24:47 +01:00
Felix Niklas
29531460f6 Procfile.frontend
Add procfile for frontend development. It adds guard livereload that reloads and recompiles the frontend files when a change occurs. It also adds gulp that watches for changes to the icon set and rebundles the icons into a svg store while stripping two colors from them that can then be replaced via css.

Run via `foreman start -f Procfile.frontend`
2017-03-15 11:24:27 +01:00
Martin Edenhofer
cb4c4c85e4 Fixed issue #438 - Introduced App.Utils.phoneify() for phone numbers. 2017-03-14 20:10:52 +01:00
Martin Edenhofer
4b4e157806 Removed not needed state. 2017-03-14 17:56:01 +01:00
Martin Edenhofer
e1e7f4a4a1 Fixed issue #833 - multiplication of the attachment-field in #channels/form. 2017-03-14 17:30:47 +01:00
Martin Edenhofer
b5f3d26371 Moved to db lookups. 2017-03-14 17:29:25 +01:00
Martin Edenhofer
4ec5993f89 Fixed issue #838 - Disabled macros are still shown in ticket screen. 2017-03-14 12:31:36 +01:00
Martin Edenhofer
2e130fb0c6 Improved html sanitizer with a tags without href attributes. 2017-03-14 12:10:40 +01:00
Martin Edenhofer
a67019ecb8 Improved email processing on invalid/not parseable headers. 2017-03-14 12:00:38 +01:00
Martin Edenhofer
6d808ff3eb Improved html sanitizer with a tags without href attributes. 2017-03-14 10:39:51 +01:00
Martin Edenhofer
cd729a987f Improved tests. 2017-03-14 06:51:19 +01:00
Martin Edenhofer
6773970378 Cleanup of content-id attribute for email attachments (<> will be added by ruby mail gem automatically). 2017-03-14 06:39:58 +01:00
Martin Edenhofer
7977ea86a6 Fixed migration name. 2017-03-14 06:32:12 +01:00
Martin Edenhofer
9c72ff18f9 Find article preferences with Twitter::NullObject and replace it with nill to prevent elasticsearch index issue. 2017-03-14 06:21:35 +01:00
Martin Edenhofer
ee0677e31c Improved http_type translation. 2017-03-14 06:12:10 +01:00
Martin Edenhofer
5025eb2def Merge branch 'develop' of github.com:zammad/zammad into develop 2017-03-13 19:40:35 +01:00
Martin Edenhofer
b2b835bcc5 Strip beginning and ending new lines. Improved layout of own quoted messages. 2017-03-13 19:38:29 +01:00
André Bauer
5d7cd7702d removed -r parameter from rm command 2017-03-13 08:49:57 +01:00
André Bauer
22aea64b70 Fix Old backup delete 2017-03-12 11:26:40 +01:00
Thorsten Eckel
c3a1ce393c Added *args to pass optional data to import resources that get passed to internal methods an can help with customizations. 2017-03-10 16:36:33 +01:00
Thorsten Eckel
4448f8e0ca Extended the resource import functionality to use ExternalSync for remote and local ID mapping and lookup instead of attribute based relation. 2017-03-10 16:04:24 +01:00
Martin Edenhofer
63b0e4fe31 Show incoming images if local content. External images or links with images are still removed. 2017-03-10 07:49:01 +01:00
Martin Edenhofer
1b3d787c27 Improved article attachment api (implemented easier attaching attachments via rest). 2017-03-10 06:34:51 +01:00
Thorsten Eckel
5eb49443dd Refactoring: Splitted ApplicationController functionality into separat modules and concerns. 2017-03-09 15:31:26 +01:00
Thorsten Eckel
b0e540032d Added webmock for all rspec tests but enable calls to zammad.com webservices. 2017-03-09 11:33:06 +01:00
Thorsten Eckel
fafe7f3421 Added generic resource import logic to provide base classes containing the generic core logic for importing single resources. Direct import from remote objects to local models is possible by using Import::ModelResource. 2017-03-09 11:33:00 +01:00
Thorsten Eckel
32fe702e56 - Minor refactoring of Package::Migration.
- Added Package::Migration.linked to execute migrations of linked addons.
- Added Package::Migration.linked to spec_helper to ensure that addon migrations are executed.
2017-03-09 11:32:50 +01:00
Thorsten Eckel
bd690f6039 - Refactored clearbit enrichment backend to use dedicated objects for syncing and extracted mapping logic to ExternalSync.
- Replaced String keys with Symbols to reduce memory load.
- Added tests 🚀
- Added basic Group factory. Groups simplicity is perfect for usage in tests which need a simple model.
2017-03-09 11:32:05 +01:00
Martin Edenhofer
aa6ba57cde Improved followup regex (quote ticket_hook). 2017-03-06 12:19:49 +01:00
Martin Edenhofer
199bf8773a Improved code layout. 2017-03-06 12:18:04 +01:00
Martin Edenhofer
187376a2c1 Improved account_duplicate? check (added folder for check). 2017-03-06 12:13:05 +01:00
Martin Edenhofer
3780d83cb6 Improved account_duplicate? check (added folder for check). 2017-03-06 11:27:17 +01:00
Martin Edenhofer
92fead6c09 Fixed issue #821 - Can't select object with type date as filter for overviews. 2017-03-03 10:53:15 +01:00
Martin Edenhofer
5a63106958 Fixed issue #779 - Simple triggers resulting in error condition. Fixed issue #395 - Auto-assign ticket owner on first reply. Fixed issue #389 - Trigger action "Owner" -> "not changed" needed. Fixed issue #298 - trigger "set to public" requested. 2017-03-03 09:28:45 +01:00
Martin Edenhofer
fbb3f3841f Directory traversal vulnerability in rubyzip (CVE-2017-5946). 2017-03-03 06:14:36 +01:00
Martin Edenhofer
9953a6b450 Fixed typos. 2017-03-03 06:12:02 +01:00
Martin Edenhofer
85abb738d8 Moved to webmock for telegram integration tests. 2017-03-01 16:10:15 +01:00
Martin Edenhofer
81464d663e Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-02-24 23:18:21 +01:00
Thorsten Eckel
d8d88968e9 Fixed issue #791 - User can't login after to many failed logins even if password gets resetted. 2017-02-24 18:27:27 +01:00
Martin Edenhofer
69e1f7e8c6 Fixed typo. 2017-02-24 15:02:58 +01:00
Martin Edenhofer
2bf34b9404 Skip csrf token check for error controller. 2017-02-24 15:02:30 +01:00
Johannes Nickel
0c97b9a401 changed function name from permission_grand to permission_grant in Role model 2017-02-24 14:47:55 +01:00
Martin Edenhofer
8d4fd8b614 Enhanced test with same subject but no Ticket# (reference headers check because of same subject). 2017-02-24 14:35:30 +01:00
Martin Edenhofer
939e268151 Enhanced tests with different ticket hooks. 2017-02-24 14:27:48 +01:00
Rolf Schmidt
9577d7aa05 Fixed issue#677 - admin interface -> time accounting setting will not be saved. 2017-02-24 09:22:38 +01:00
Felix Niklas
5e60a2d5f0 Merge branch 'pull-request-783' into develop 2017-02-23 13:49:11 +01:00
Johan von Forstner
9ec9d298a0 Some adjustments with regard to #698 2017-02-23 13:07:38 +01:00
Martin Edenhofer
93ba996de4 Fixed issue #774 - Open communication with only a picture. 2017-02-22 07:11:57 +01:00
Martin Edenhofer
60a4f0062b Applied coffeelint. 2017-02-22 04:23:30 +01:00
Martin Edenhofer
6649dcb457 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-02-22 04:22:09 +01:00
Felix Niklas
20236091de Batch Overlay
- center cancel area in empty space
2017-02-21 09:58:55 +01:00
Felix Niklas
925b6dab5a Batch Overlay
- use group avatar
2017-02-21 09:58:40 +01:00
Felix Niklas
d9aa5db55f Group Avatar
- add support for group avatars
- get different background colors - blue, green and yellow - based on the id
- use the team icon
2017-02-21 09:58:10 +01:00
Felix Niklas
b3481f197e Article View
- use greyed out color instead of opacity to tone down the text and icon color because opacity makes the text look ugly
2017-02-21 08:59:23 +01:00
Felix Niklas
27515c2a2e Radio Input indeterminate bugfix
- fixes #786
2017-02-20 09:01:00 +01:00
Martin Edenhofer
3eaa54cc01 Also do auth type detection for plain connection. 2017-02-17 15:50:23 +01:00
Thorsten Eckel
b8015d5ba1 Fixed issue #765 - 'track retweets' switch has no effect in streaming functionality. 2017-02-16 17:54:54 +01:00
Thorsten Eckel
ce8c54743d Improved test layout and stability. 2017-02-16 17:54:54 +01:00
Felix Niklas
478ddb6b6c Icons
- add telegram icon
- sharpen note icon
- make phone icon a bit smaller to fit better with the rest
- nudge mail fold down a bit so that it looks nicer
2017-02-16 11:31:02 +01:00
Martin Edenhofer
e58babb569 Removed id, not needed (lookup is done by name). 2017-02-15 17:24:24 +01:00
Martin Edenhofer
f317cf1240 Also support telegram users without username. 2017-02-15 13:31:06 +01:00
Martin Edenhofer
cd28e904ac Improved session validation and usage of cors headers. 2017-02-15 13:29:25 +01:00
Thorsten Eckel
fc13598f79 Added the possiblity to inherit attribute filter and overwrite/extend via child methods. 2017-02-15 13:20:42 +01:00
Martin Edenhofer
d0a62ecc39 Moved to new email channel urls. 2017-02-15 05:48:50 +01:00
Martin Edenhofer
3b4b6ea921 Cleanup - improved wording. Removed not needed file. 2017-02-15 04:07:17 +01:00
Martin Edenhofer
dd6974963c Applied rubocop. 2017-02-15 03:48:22 +01:00
Martin Edenhofer
f9590999c2 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-02-15 03:43:52 +01:00
Martin Edenhofer
55ce60298b Set recipient if I’m sender. 2017-02-15 03:43:18 +01:00
Martin Edenhofer
e497bd0105 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-02-15 03:37:52 +01:00
Martin Edenhofer
d34112a99f Telegram support and split of channel controllers into separate files. Thanks to @schurig 2017-02-15 03:35:22 +01:00
André Bauer
ed5da3dabe Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-02-14 18:47:15 +01:00
Thorsten Eckel
ef1da2a22e Working on issue #689 - Default states and priorites of OTRS won't get used. 2017-02-14 18:44:14 +01:00
André Bauer
87336810a8 fix postgresql backup dir permission error 2017-02-14 18:40:19 +01:00
Thorsten Eckel
37e98b1a81 Working on issue #689 - Ticket state_id and pending_time attributes won't get synced with new OTRS data. 2017-02-14 09:59:41 +01:00
Martin Edenhofer
e1059d4ece Followup for issue#719 - ensure that title is set even via email creation. 2017-02-13 15:05:28 +01:00
Martin Edenhofer
c1d663e4e4 Fixed issue #719 - Ticket without Subject is blocked - can't do anything with it ("Title needed”). 2017-02-13 10:21:31 +01:00
Martin Edenhofer
bc60edddf5 Fixed not assigned group at group -> user assignment. 2017-02-13 04:48:50 +01:00
Felix Niklas
dd75a20c6e Batch Overlay Firefox Bugfix
In some cases in Firefox the batch action didn’t work correctly. Mouse events got triggered but not in the overlay. Instead they happened in the ticket list below.

Further research showed that the bug only appeared when the drag started in a table cell. When it started in a child element of the table cell, for example a link or a text node, the bug didn’t appear.

This sounds like this Firefox bug from 2005: https://bugzilla.mozilla.org/show_bug.cgi?id=301255. The solution described in the comments of the bug is to disable the user-selection in the table cell via css. I’t already quite hard to select something in the ticket overviews because a text selection starting and ending in the same row will open that ticket. Because of that I choose to go for this fix for now.
2017-02-13 01:11:32 +01:00
André Bauer
c3db269b8f Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-02-12 18:56:11 +01:00
André Bauer
f5cd21a7a8 fix postgresql db restore 2017-02-12 18:55:16 +01:00
Martin Edenhofer
c8e9058866 Moved default and follow up state/priority from source code into model. Related to issue #689 - OTRS import breaks a lot of assumptions in Zammad. 2017-02-12 18:21:03 +01:00
André Bauer
55a475a46b fix typo 2017-02-12 15:56:05 +01:00
André Bauer
c6b84eec9f delete superflous command 2017-02-12 15:02:34 +01:00
André Bauer
0d60e156e2 use tar --overwrite instead of deleting zammad dir 2017-02-12 15:01:21 +01:00
André Bauer
3bcea0dfb9 zammad_restore.sh fixes 2017-02-12 14:56:39 +01:00
André Bauer
76ffb24671 removed -s parameter from read commands 2017-02-12 13:17:55 +01:00
André Bauer
6e5a277efc - some rework on packaer.io postinstall
- added backup restore script
2017-02-12 12:52:10 +01:00
André Bauer
2203830f22 fix mysqldump commands 2017-02-12 11:09:47 +01:00
André Bauer
22e37a941b added test if backup directory exists before old files are tried to be deleted 2017-02-12 10:57:40 +01:00
André Bauer
d4a47cd3dc move check for database.yml to functions file 2017-02-12 10:52:35 +01:00
Martin Edenhofer
3fe07dd28d Fixed issue #708 - Chat not working, web socket error in http/https mixed setup. Use protocol from script location of chat.js. 2017-02-10 16:29:44 +01:00
Martin Edenhofer
023db6dfbe Fixed test. 2017-02-10 16:16:18 +01:00
Martin Edenhofer
0b48c76cce Improved support for different version of translation cache files. Fixed test. 2017-02-10 16:00:58 +01:00
Martin Edenhofer
9b8298de28 Improved support for different version of translation cache files. 2017-02-10 15:06:15 +01:00
Martin Edenhofer
4d2e578edf Improved translations and added language change support in overview for batch feature. 2017-02-10 14:59:49 +01:00
Radomír Luža
e4193c640f Czech email template localisation (#752)
* Create cs.html.erb

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
2017-02-10 11:05:50 +01:00
Martin Edenhofer
46f5160211 Only show member count of currently active users in groups. 2017-02-10 11:05:01 +01:00
Martin Edenhofer
fb4dee7357 Improved error handling. Need to set “pointer-events: none” on .main for firefox (focus/select issue with user/groups and popovers in .main). 2017-02-10 02:19:20 +01:00
Felix Niklas
e7c0688dbd Batch action hover target
- don’t select when hovered over the name, only when hovered over the avatar
- fix hoveredBatchEntry bug
2017-02-10 01:11:18 +01:00
Felix Niklas
7ac8042b3f Batch action groups 2017-02-10 00:26:54 +01:00
Felix Niklas
8d8a462057 update mac developer start script timings
- delay the script calls to give the terminal more time to initialize
2017-02-08 20:59:32 +01:00
Martin Edenhofer
e5ba41892a Only show active macros, groups and users. 2017-02-08 01:53:38 +01:00
Martin Edenhofer
b1c6768114 Use real macros, users and groups in batch action. 2017-02-08 00:38:19 +01:00
Martin Edenhofer
d0da1af974 Only use batch feature for agents. Fixed browser tests. 2017-02-07 15:13:52 +01:00
Martin Edenhofer
1e5e6acfef Merge branch 'develop' of github.com:zammad/zammad into develop 2017-02-07 12:20:25 +01:00
Martin Edenhofer
38f33598d4 Split of d&d action into separate templates. Use real objects from now. 2017-02-07 12:14:31 +01:00
Felix Niklas
55939db0ea Batch actions wip
For martin to continue with the model bindings
2017-02-07 10:51:18 +01:00
skibson
a4d6203833 Create pl.html.erb new ticket email (#741) 2017-02-06 16:42:28 +01:00
skibson
a05762ff09 Create pl.html.erb ticket escalation email (#743) 2017-02-06 16:40:29 +01:00
skibson
3d267d3646 Create pl.html.erb ticket escalation warning. (#744) 2017-02-06 16:39:41 +01:00
Jens Pfeifer
cadca4cd08 Rubocop. 2017-02-06 14:20:59 +00:00
Jens Pfeifer
777dce4c87 Fixed issue #429, user.preferences['locale'] not initialized at user creation. 2017-02-06 14:07:25 +00:00
Martin Edenhofer
1c7278d8be Fixed issue #740 - Unable to process emails if "Additional follow-up detection" was checked and unchecked again. 2017-02-06 11:42:46 +01:00
Martin Edenhofer
cc2545ec4f Merge branch 'develop' of github.com:zammad/zammad into develop 2017-02-06 00:35:44 +01:00
Martin Edenhofer
b70b530e2a Fixed issue #705 - Time accounting works only with dot. Fixed issue #670 - Auto Focus on "Time Accounting" Popupbox. 2017-02-06 00:15:28 +01:00
skibson
19abfe6104 Create pl.html.erb for signup email (#724)
Polish version
2017-02-05 23:47:13 +01:00
skibson
34164bc4dc Create pl.html.erb for password changed email (#725)
Polish translation
2017-02-05 23:27:20 +01:00
skibson
d3f2f10ca6 Create pl.html.erb for password reset email (#726)
Polish translation
2017-02-05 23:26:51 +01:00
skibson
7a7644bc1a Create pl.html.erb for test email (#727) 2017-02-05 23:26:20 +01:00
Martin Edenhofer
7e947dc4bf Fixed issue #730 - "Close Tab" & "Next in Overview" don't work. 2017-02-05 19:24:48 +01:00
Martin Edenhofer
c944c9999a Fixed browser test (new wording) and code cleanup. 2017-02-04 09:40:34 +01:00
Martin Edenhofer
f0ff543bfb Fixed issue #731 - Do not import own notification emails in Zammad. 2017-02-03 17:42:57 +01:00
Martin Edenhofer
6e747db1d2 Fixed typo. 2017-02-03 17:02:25 +01:00
Martin Edenhofer
b86e18205b Fixed issue #731 - Do not import own notification emails in Zammad. 2017-02-03 16:44:55 +01:00
Jens Pfeifer
30c9caae00 Fixed some english texts. 2017-02-03 14:43:23 +00:00
Thorsten Eckel
5a6e824c3a Working on issue #689 - User root@localhost gets imported but should not. 2017-02-03 14:16:11 +01:00
Martin Edenhofer
7562cd2dff Implemented issue #722 - Do not log last_login in user history. 2017-02-03 08:56:40 +01:00
Martin Edenhofer
16594b8245 Implemented issue #718 - Change font and font size in emails (templates). 2017-02-03 08:29:40 +01:00
Martin Edenhofer
3fa12b73ae Moved to whitelist sanitizer. 2017-02-02 19:49:34 +01:00
Jens Pfeifer
dc166fbbc3 Added version number to i18n web service calls. 2017-02-02 14:37:49 +00:00
Martin Edenhofer
75a02d9d83 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-02-01 23:10:10 +01:00
Martin Edenhofer
28437c7392 Fixed issue #659 - Can't update translations via translation table in admin interface. 2017-02-01 23:09:48 +01:00
Thorsten Eckel
789183c7b2 Fixed issue #664 - Missing comma in 'manual button' causes syntax error. 2017-02-01 15:51:14 +01:00
Thorsten Eckel
8800a4a861 Added HTML Sanitzer concern for multi model usage. 2017-02-01 12:48:50 +01:00
Thorsten Eckel
ef6fbe8f2a Refactoring: Splitted ApplicationModel into multiple concerns. Notice: Includes object some method name changes. 2017-01-31 18:13:45 +01:00
Thorsten Eckel
f7e9b570ae Fixed issue #617 - Prevent attachment preview in browser attachment download. 2017-01-31 17:55:12 +01:00
Martin Edenhofer
4b85c1f662 Fixed issue #643 - Group follow up check for closed tickets does not work. 2017-01-31 09:56:59 +01:00
Thorsten Eckel
c3076ac53d Fixed issue#570 - Improve feature "show more" with "show less" option - thanks to @dennybresch and @mrflix . 2017-01-30 18:28:02 +01:00
Martin Edenhofer
1fab6d8acb Fixed issue #686 - Follow up detection not working if ticket_hook_position "none" is used. 2017-01-30 15:47:12 +01:00
Martin Edenhofer
5548ef1df8 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-30 14:54:27 +01:00
Martin Edenhofer
4e9f33954b Fixed issue #685 - Feedback form not working in Safari. 2017-01-30 14:48:33 +01:00
Felix Niklas
7d4abee77e Batch Actions
- fix don’t break checkbox uncheck
- don’t break selection of ticket text
2017-01-30 12:05:36 +01:00
Felix Niklas
8fedf5759f Remove scrollbar in detail popovers 2017-01-30 10:24:54 +01:00
Felix Niklas
988071519c Add indeterminate state to bulk select checkbox 2017-01-30 09:45:45 +01:00
André Bauer
72d771ba28 fixed typo 2017-01-29 11:31:17 +01:00
André Bauer
ddb738a22a added nginx example ssl configuration file with free letsencrypt.org certificates 2017-01-29 11:01:53 +01:00
Thorsten Eckel
26be1e2365 Removed foreman since it should not get added to the Gemfile (causes errors with mysql gem). 2017-01-27 18:04:06 +01:00
Thorsten Eckel
adb039c748 Added foreman for dev and test envs and removed RSpec version limiting. 2017-01-27 16:01:18 +01:00
Thorsten Eckel
0862bf7e6a Improved password security by using proper password hash module backed by Argon2 (official winner of the Password Hashing Competition) - thanks to @nomoketo and @benbe. 2017-01-27 09:17:03 +01:00
Jens Pfeifer
50a31f4c1f Fixed issue #264, provide version number within Zammad. 2017-01-26 10:02:06 +00:00
Jens Pfeifer
29ec431810 Fixed issue #219 - Changing notification sound did not show selected sound after re-rendering the page without complete reload. 2017-01-25 12:41:23 +00:00
Martin Edenhofer
c96f5b46a8 Improved streaming test. Exit and join threat for cleanup. 2017-01-23 16:22:41 +01:00
Rolf Schmidt
7cd9ccae75 Fixed issue #662 - Add setting to define internal/external notice default setting. 2017-01-23 14:54:44 +01:00
Martin Edenhofer
b935dd3f07 Enable article.internal for ticket selector ui. 2017-01-20 16:15:17 +01:00
Thorsten Eckel
f511995ba6 Application controller refactoring: Moving error methods to proper concern. 2017-01-20 10:45:19 +01:00
Thorsten Eckel
b82b183863 Added figaro ENV helper for easier testing. 2017-01-20 09:40:43 +01:00
Thorsten Eckel
31eac0c1fa Merged pull request #630 - add sync setting 'track_retweets' to twitter channel - Big thanks to @schurig. 2017-01-20 09:31:45 +01:00
Martin Edenhofer
417b84ca67 Fixed file name of migration. 2017-01-19 15:54:31 +01:00
Martin Edenhofer
91063252a0 Fixed issue #650 - Unable to process emails with email addresses longer then 140 signs. 2017-01-19 15:52:10 +01:00
Martin Edenhofer
24d8b79503 Fixed issue #648 - Sending emails via SMTPS (Port 465 and SSL) not possible. 2017-01-19 06:03:19 +01:00
Martin Edenhofer
9a8327c51a Followup fix for issue #638 and issue #639 (need to use self. for initialising). 2017-01-18 10:11:56 +01:00
olivergrahl
8925c6f518 Fix #639 and #638 (Error 500 opening a ticket view) (#640)
* Fix #639 and #638 (Error 500 opening a ticket view)

* Only initialize preferences if not already filled.
2017-01-18 09:45:20 +01:00
Martin Edenhofer
303db3e7c3 Fixed issue #636 - Customer get forced to save time for time accounting in customer interface - only allow it for agents. 2017-01-17 15:56:28 +01:00
Martin Edenhofer
d0b26eb55a Fixed issue #633 - Unable to activate time accounting in admin interface. 2017-01-17 12:38:12 +01:00
Martin Edenhofer
e0a71e6e93 Fixed typos in existing installations. 2017-01-17 08:35:04 +01:00
Elias Probst
9d0bfa1fae Fix typos (#622)
* Fix typo (`Colleges` → `Colleagues`)

* Fix typo (`Modues` → `Modules`)

* Fix typo (`Additionals` → `Additional`)

* Fix typo (`ckeck` → `check`)

* Fix typo (`seperator` → `separator`)

* Fix typo (`subjects` → `subject`)

* Fix typo (`need to` → `needs to`)
2017-01-16 15:12:06 +01:00
Martin Edenhofer
179d4867af Fixed test. 2017-01-16 14:54:23 +01:00
Martin Edenhofer
93919acfc9 Fixed migration. 2017-01-16 14:41:56 +01:00
Martin Edenhofer
7740e56204 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-16 14:35:11 +01:00
Martin Edenhofer
ad53128091 Implemented issue #373 - Feature "Time recording”. 2017-01-16 14:34:44 +01:00
Thorsten Eckel
2c3ffbc897 Follow up: Issue #582 - long content type shows warning and gets cut. 2017-01-16 10:01:20 +01:00
Martin Edenhofer
9cb57cdbe6 Prevent browser from pre-fill passwords. 2017-01-16 02:21:40 +01:00
Martin Edenhofer
1af073b4e8 Fixed issue #462 - Setup asks for FQDN, but doesn't write to DB. 2017-01-16 02:16:14 +01:00
Martin Edenhofer
62af5fb2ca Fixed test. 2017-01-16 01:43:44 +01:00
Martin Edenhofer
a1a56f49c0 Implemented issue #439 - proxy support. 2017-01-16 01:24:56 +01:00
Martin Edenhofer
e406c4bcee Improved translations. 2017-01-15 22:59:48 +01:00
Martin Edenhofer
8ac1ba9ea1 Improved translations. 2017-01-15 16:25:10 +01:00
Martin Edenhofer
3fa9a45b8c Added import check if features used in different approach. 2017-01-15 11:47:20 +01:00
Sébastien Santoro
7a3baa2574 Fix typo (#623) - modues -> modules. 2017-01-15 09:35:11 +01:00
Sébastien Santoro
f68f578579 Update the call for participation in JS console (#624)
Improved hello banner in developer mode.
2017-01-15 09:28:17 +01:00
Martin Edenhofer
0b78df6fff Added host DOWN/UP detection. 2017-01-14 14:23:11 +01:00
Martin Edenhofer
e1d7609948 Do not change last_contact timestamp if only “notify” has changed (somebody else has changed the tab and on your tab only the notify attribute has changed). 2017-01-14 07:53:26 +01:00
Martin Edenhofer
1481842b0b Small code cleanup. 2017-01-14 06:23:58 +01:00
Martin Edenhofer
b1e7c30178 Removed d&d for overviews. 2017-01-14 06:22:08 +01:00
Martin Edenhofer
1d3f5006ed Fixed browser test. 2017-01-14 05:48:05 +01:00
Martin Edenhofer
d4c4f797d6 Fixed save of task state. 2017-01-14 01:31:00 +01:00
Martin Edenhofer
fb64e186b5 Fixed issue #587 - Group restrictions not respected in slack notification. Thanks to @jepf 2017-01-13 20:37:14 +01:00
Martin Edenhofer
6cf0f5cc6c Fixed namespace. 2017-01-13 20:24:38 +01:00
Martin Edenhofer
d05b489be0 Fixed issue #530 - Keyboard shortcuts dialog breaks url bar navigation. 2017-01-13 20:19:51 +01:00
Martin Edenhofer
d6763a1086 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-13 19:55:33 +01:00
Martin Edenhofer
6f99e65361 Moved show additional ticket attributes to bottom to middle in create screens. 2017-01-13 19:55:12 +01:00
Thorsten Eckel
11ecd4c535 Working on issue #558 - Zendesk import - import ticket statistic value does not include archived tickets. 2017-01-13 11:46:31 +01:00
Thorsten Eckel
2f955f4087 Fixed issue #565 - Unsupported DynamicField type fields cause import to abort. 2017-01-13 10:59:14 +01:00
Thorsten Eckel
6fab80adee Fixed issue #582 - Long content type shows warning and gets cut. 2017-01-13 09:20:38 +01:00
Jens Pfeifer
e16a7e8f8a Fixed typo in file name. 2017-01-12 12:56:07 +00:00
André Bauer
4645f332c6 fixed issue template 2017-01-11 18:35:46 +01:00
Felix Niklas
a6e8bab3f6 Design oauth2 button #410 2017-01-11 16:13:29 +01:00
Jens Pfeifer
37bfbaff51 Fixed variable check. 2017-01-11 13:17:52 +00:00
André Bauer
09b05b220d added vagrant link 2017-01-11 13:30:06 +01:00
Felix Niklas
844f834fe6 Oauth: fix icons, add gitlab & github #410
- replaced the subtle gradient in the twitter and facebook icons with a solid white because the gradients don’t work in all browsers
- updated the google icon
- update license 3rd party info
2017-01-11 11:08:27 +01:00
Felix Niklas
b1d3d3d258 Update processes launch app (osx)
- add more delay between process launches because of terminal tab startup time
2017-01-11 11:04:46 +01:00
Martin Edenhofer
082f8621da Ignore storage fs files. 2017-01-10 22:19:21 +01:00
Martin Edenhofer
9e00143134 Fixed issue #596 - Gitlab Auth not working. 2017-01-10 22:14:02 +01:00
Martin Edenhofer
d36570aef0 Fixed issue #602 - Admin user login via Oauth. 2017-01-10 20:58:33 +01:00
André Bauer
8078d1b39f fixed multi container batch link 2017-01-10 14:49:44 +01:00
André Bauer
f5c28d3085 fixed license link, changed docker links added stable download button 2017-01-10 14:45:46 +01:00
Martin Edenhofer
41b7446204 Fixed issue #597 - If "new ticket created" popover is shown you can't click search box. 2017-01-10 11:51:49 +01:00
André Bauer
f4946ac142 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-10 02:33:34 +01:00
André Bauer
799142b7b6 added more badges 2017-01-10 02:31:21 +01:00
Martin Edenhofer
7595df8338 Fixed test. 2017-01-10 01:25:57 +01:00
André Bauer
626d8325ab fixed typo 2017-01-10 01:20:11 +01:00
Martin Edenhofer
9c50524f9c Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-10 01:09:34 +01:00
Martin Edenhofer
3e07697954 Improved email parsing. 2017-01-10 01:09:17 +01:00
André Bauer
ddcd5e0dd5 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-10 00:17:19 +01:00
André Bauer
323c4f0677 changed version badge description 2017-01-10 00:16:23 +01:00
Martin Edenhofer
2019fced1d Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-10 00:16:00 +01:00
Martin Edenhofer
13dd008803 Improved shown realname of email addresses. 2017-01-10 00:15:50 +01:00
Martin Edenhofer
d11a954450 Ignore node module of chat devel env. 2017-01-10 00:13:38 +01:00
André Bauer
1fafdf2fd7 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-10 00:09:50 +01:00
André Bauer
45ce117747 added version badge 2017-01-10 00:09:01 +01:00
Martin Edenhofer
cb2eea9d6b Merge branch 'develop' of github.com:martini/zammad into develop 2017-01-10 00:00:39 +01:00
Martin Edenhofer
e65fd786e8 Fixed page time update interval. 2017-01-09 23:59:32 +01:00
André Bauer
e942d02d24 clean cache after package build 2017-01-09 23:45:09 +01:00
Timo Göllner
f147bda633 improved call log workflow (#517)
Improved call log workflow, added new customer option to call log.
2017-01-09 16:09:46 +01:00
Martin Edenhofer
b19af65a46 Followup for issue #514 - Create ticket with customer (moved “New Ticket” to profile options pull down). 2017-01-09 15:58:58 +01:00
Timo Göllner
6b58d58f37 Create ticket with customer (#514)
Create new tickets from user profile.
2017-01-09 15:52:14 +01:00
Martin Edenhofer
6c88a24d9c Increased timeouts. 2017-01-09 15:47:47 +01:00
Martin Edenhofer
4caf022893 Followup for issue #586 - Small improvement for “enable form to include file attachments”. 2017-01-09 15:47:27 +01:00
Martin Edenhofer
6ef4ace299 Merge branch 'develop' of github.com:martini/zammad into develop 2017-01-09 15:17:33 +01:00
olivergrahl
7221cae487 Enable form to include file attachments (#586)
Enable form controller and widget to store file attachments.
2017-01-09 15:16:29 +01:00
Martin Edenhofer
963f4fc491 Fixed interval for idle check. 2017-01-09 15:09:22 +01:00
Martin Edenhofer
336bae8598 Fixed error message in link dialog. 2017-01-09 15:00:03 +01:00
Martin Edenhofer
4601993a15 Followup for issue #584 - Return ticket data on form submission - added T# to form widget. 2017-01-09 14:33:09 +01:00
Martin Edenhofer
b213ae689b Fixed coffeelint. 2017-01-09 14:18:11 +01:00
Martin Edenhofer
8ac21a8d9e Followup for issue #595 - fixed support of “xx-xx” locales. 2017-01-09 14:02:10 +01:00
Never
3706bf0c6c Chinese for the Chat widget (#595)
Chinese for the Chat widget.
2017-01-09 13:47:12 +01:00
olivergrahl
54f3e2064c Return ticket data on form submission (#584)
Form controller will return ticket id and number on success, so this data can
be displayed on the calling page.
2017-01-09 13:45:22 +01:00
Martin Edenhofer
72cef05b9e Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2017-01-09 13:22:47 +01:00
Martin Edenhofer
82cf2168f6 Improved collision detection. 2017-01-09 13:22:07 +01:00
André Bauer
a5f19b3efb fix broken var 2017-01-07 17:16:33 +01:00
André Bauer
4752384df0 fixing rubocop issues 2017-01-07 16:32:29 +01:00
André Bauer
04e2d8ccc7 added nulldb gem (rake assets:precompile without db for docker images) 2017-01-07 13:22:58 +01:00
André Bauer
8c29d9fb55 added unicorn support 2017-01-07 13:07:05 +01:00
Felix Niklas
3b8ce3bd6d Add bulk action drag UI 2017-01-06 18:05:08 +01:00
Martin Edenhofer
dda715be1b Added latest translation for issue #580. 2017-01-05 16:42:11 +01:00
Martin Edenhofer
6c27971d91 Merge branch 'develop' of github.com:martini/zammad into develop 2017-01-05 16:39:27 +01:00
Martin Edenhofer
11a6930c44 Fixed issue #588 - API Call crashes webinterface - or search? 2017-01-05 16:38:12 +01:00
GeraldElbaze-Medias-Cite
f08e5d3eb0 Versions françaises (#578)
French translation of some email templates. Thanks to @GeraldElbaze-Medias-Cite
2017-01-05 10:29:11 +01:00
Martin Edenhofer
cec2a051da Implemented issue #580 - French for Chat widget. Thanks to @GeraldElbaze-Medias-Cite 2017-01-05 10:20:29 +01:00
Martin Edenhofer
b9768edb54 Merge branch 'private-issue576' into develop 2017-01-04 15:42:33 +01:00
Martin Edenhofer
f9fdbe5934 Implemented issue #352 - Show other active agents in ticket detail view (collision prevention). 2017-01-04 15:40:19 +01:00
Martin Edenhofer
c6346ea210 Increased timeouts. 2017-01-04 13:36:52 +01:00
Martin Edenhofer
04aea92f8c Improved performance. 2017-01-04 12:13:23 +01:00
Martin Edenhofer
5779eb0855 Added UI principles. 2017-01-04 12:12:39 +01:00
Martin Edenhofer
f4c411db19 Do timestamp update of task on task shown. 2017-01-03 11:29:37 +01:00
Martin Edenhofer
048db16129 Fixed issue #576 - New ticket attributes are not shown for customer. 2017-01-03 10:57:05 +01:00
Martin Edenhofer
71bb80f95d Only allow to change maintenance messages in maintenance screen. 2016-12-27 14:16:35 +01:00
André Bauer
027457af82 fixed typo 2016-12-25 12:31:51 +01:00
André Bauer
8e98dc3799 added 'english please' to issue template 2016-12-25 12:28:18 +01:00
Martin Edenhofer
4b173d02a4 Fixed issue #568 - Imap sort errors with gmail in production.log (removed log notice - added comment to source code). 2016-12-24 12:40:08 +01:00
Martin Edenhofer
f6083195f0 Fixed issue #566 - Agent - Group assignment shows "<br>”. 2016-12-21 14:11:23 +01:00
André Bauer
b266b196bd some more issue template changes 2016-12-21 03:49:31 +01:00
André Bauer
0c6afe78d0 some issue template changes 2016-12-21 03:46:53 +01:00
Martin Edenhofer
59c944a945 Fixed issue #499 - Improved error handling. Fixed Ticket::Overviews.all - use permissions not, not longer role names to decide if user is agent or customer. 2016-12-21 01:00:25 +01:00
Martin Edenhofer
4cec7a5549 Added content validation to x-zammad mail headers and postmaster filters. 2016-12-21 00:07:47 +01:00
Thorsten Eckel
bce847d0f4 Test was not in sync with latest changes to prevent duplicate import. 2016-12-20 17:12:40 +01:00
Thorsten Eckel
0d20c9095f Working on issue #558 - Archived Zendesk tickets won't get imported. 2016-12-20 17:12:40 +01:00
Thorsten Eckel
d96d02c83f Fixed issue: Zendesk attachments might get imported multiple times for single article. 2016-12-20 17:12:40 +01:00
Thorsten Eckel
2b2ceeebab Added splat args to every method call in import factories. 2016-12-20 17:12:40 +01:00
André Bauer
81bfeac091 changed issue template 2016-12-20 15:59:10 +01:00
Thorsten Eckel
63fecf55ca Working on issue #556 - SLA description only available in german - thanks to @pradorocchi! 2016-12-19 15:59:10 +01:00
Thorsten Eckel
de24df9728 Working on issue #558 - Zendesk ticket owner won't get imported. 2016-12-19 14:45:12 +01:00
Thorsten Eckel
6fafb3f0bf Added first draft of issue template. 2016-12-19 11:49:19 +01:00
Thorsten Eckel
4d209b805b - Major refactoring of Zendesk import logic including introduction of RSpec tests.
- Fixed issue #487: No login possible after zendesk import.
2016-12-19 09:59:54 +01:00
André Bauer
eb60ce2123 added config/database.yml to gitignore 2016-12-17 01:04:48 +01:00
Martin Edenhofer
4283b4adfb Fixed issue #554 - Overview is not show it organization is used as row and first ticket has no organization (app is not responding anymore). 2016-12-16 15:34:03 +01:00
Martin Edenhofer
6b6a0a05e5 Improved result by using sql order. 2016-12-16 13:27:16 +01:00
Martin Edenhofer
a7cdb592b7 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-12-16 12:15:47 +01:00
Martin Edenhofer
f8c4ec3fbb Implemented issue #552 - Add organization to overview in manage users (admin interface). 2016-12-16 12:15:28 +01:00
Thorsten Eckel
47c880f445 Fixed issue #548 - Empty created_at of customer user record brakes import. 2016-12-16 11:12:15 +01:00
Martin Edenhofer
4ed6e67096 Fixed issue #169 - Allow users to delete "Notes”. 2016-12-15 17:05:54 +01:00
Martin Edenhofer
ab4a408d3e Fixed issue #547 - Layout broken if outbound channel has a error message. 2016-12-15 16:38:57 +01:00
Felix Niklas
eba38afe73 Fix css regression – space in tabs & menu 2016-12-15 11:44:00 +01:00
Martin Edenhofer
baffceda52 Fixed issue #546 - Do not show arrow down on ajax auto completion fields. 2016-12-15 11:30:12 +01:00
Martin Edenhofer
32532ae7c5 Fixed issue #545 - Error message at creation of new overview with not existing specific customer. 2016-12-15 11:06:46 +01:00
Martin Edenhofer
1962bb9b98 Improved merge dialog (increased width and prevent submit bubbling). 2016-12-15 08:38:57 +01:00
Martin Edenhofer
b19e54b3f4 Fixed issue #206 - Wrong recipient on reply to Received call. 2016-12-14 16:04:55 +01:00
Martin Edenhofer
f635a34a94 Fixed issue #249 - New users won't get initial user group. 2016-12-14 15:48:41 +01:00
Martin Edenhofer
1ffc19455a Improved join. 2016-12-14 03:27:08 +01:00
Timo Göllner
5a3f8c1bb6 bugfix: added missing join table (#541) 2016-12-14 03:13:30 +01:00
Martin Edenhofer
f9c1040930 Download locales and translations without framework. 2016-12-14 02:07:47 +01:00
Martin Edenhofer
a8d321a21e Fixed issue #433 - Object manager allows method names as attributes. 2016-12-14 01:08:29 +01:00
Martin Edenhofer
a1e19cc75d Fixed issue #418 - Max times for escalation 99 hours. 2016-12-14 00:16:03 +01:00
Martin Edenhofer
c3f338db02 Fixed issue #329 - Pending event time after 22:59 jumps back to 22:59. 2016-12-13 23:43:46 +01:00
Martin Edenhofer
f79f6634ee Moved to new articles mode (which contains order statement). 2016-12-13 15:54:01 +01:00
Martin Edenhofer
212077d81d Do not show “getting started” screen if session check failed. 2016-12-13 15:02:43 +01:00
Martin Edenhofer
a0caaa06e9 Cleanup, fixed typos and improved error handling. 2016-12-13 14:58:13 +01:00
Martin Edenhofer
d6ee7025ab Implemented issue#536 - Tooltip in forms is not shown / only on hover / not no click. 2016-12-13 14:55:10 +01:00
Martin Edenhofer
fa8bf6e65f Added channel quick enable/disable buttons. 2016-12-12 15:54:41 +01:00
Martin Edenhofer
81df51f274 Fixed issue#534 - recalculate ticket escalation time after updating calendar. 2016-12-12 15:50:46 +01:00
Martin Edenhofer
09b1e9ea9b Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-12-12 15:06:20 +01:00
Martin Edenhofer
0bd8b158e3 Added ability to define port for imap/pop3 and smtp (also for notification channel). 2016-12-12 15:06:01 +01:00
Thorsten Eckel
0e7a84facf Fixed issue #526 - Import throws error if run a second time. 2016-12-12 11:46:48 +01:00
Thorsten Eckel
51985bc67e Fixed issue #520 - OTRS import: Customer user is not overtaken from first article and into created_by_id. 2016-12-12 10:34:07 +01:00
André Bauer
5e6d32699d fixes on postinstall & backup script 2016-12-11 09:49:57 +01:00
André Bauer
5154afd918 disbale debvug mode in backup script 2016-12-10 14:51:05 +01:00
André Bauer
bba6c2ed79 added backup script 2016-12-10 14:49:47 +01:00
André Bauer
115ea3ad6f added backup script 2016-12-10 14:48:33 +01:00
André Bauer
e43ccb4475 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-12-09 16:33:11 +01:00
André Bauer
78fec327e4 fix postinstall debug mode 2016-12-09 16:27:32 +01:00
Thorsten Eckel
477fefc4e5 Made OTRS import statistic method public to access it for plausibility check. 2016-12-09 16:12:39 +01:00
Thorsten Eckel
c5f348ec82 Follow up: Fixed issue #519 - Import of articles without a content type fails. 2016-12-09 13:55:34 +01:00
Thorsten Eckel
26b8ed32d3 Follow up: Fixed issue #519 - Import of articles without a content type fails. 2016-12-09 13:54:50 +01:00
Thorsten Eckel
0646b9dc25 Fixed issue #519 - Mails get imported as text/html instead of text/plain. 2016-12-09 13:16:33 +01:00
Martin Edenhofer
9b9f9ed8c5 Rework, get unit tests up and running again. 2016-12-08 15:06:54 +01:00
Thorsten Eckel
c826625ce7 Merge branch 'develop' of https://github.com/zammad/zammad into develop 2016-12-07 16:11:33 +01:00
Thorsten Eckel
7be0ad9a61 Fixed issue #218 - Download of OTRS Migrator plugin doesn't start. 2016-12-07 16:08:01 +01:00
Thorsten Eckel
8f983df395 Re-added tmp/pids folder and added .gitignore exclusion because of zammad services not running correctly. 2016-12-07 16:08:01 +01:00
Thorsten Eckel
b2b68fd8b2 Removed debug code. 2016-12-07 16:08:01 +01:00
Julian K
224b894b3a Replace sleep by travel to accelerate the test suite (#483) 2016-12-07 08:15:56 +01:00
André Bauer
8bda5068ae added debug mode to postinstall.sh 2016-12-06 19:12:19 +01:00
André Bauer
f65b421042 remove "set -e" from postinstall.sh 2016-12-06 19:08:33 +01:00
Thorsten Eckel
27457f5c39 Fixed issue #504 - History: 'Object already exists!'. 2016-12-06 16:27:06 +01:00
André Bauer
2f2c4ef5ca Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-12-06 15:51:39 +01:00
André Bauer
1be5a72dfe fix docker 2016-12-06 15:51:33 +01:00
Thorsten Eckel
d34aae41f1 Follow up: Pull request #495 - refactoring broke level based lookup. 2016-12-06 15:27:14 +01:00
André Bauer
e524a82aeb replacing backticks with 2016-12-06 14:52:49 +01:00
Thorsten Eckel
3e5f80b0e3 Follow up: Pull request #497 - Added check for extract_numbers parameter. 2016-12-06 14:05:19 +01:00
Thorsten
1e23cac9a1 Merge pull request #495 from digineo/refactor_caller_id
Refactor Cti::CallerId
2016-12-06 13:36:08 +01:00
Thorsten
a8e725dd92 Merge pull request #493 from digineo/gitignore
Clean up .gitignore
2016-12-06 13:32:37 +01:00
Thorsten Eckel
f39f66fe96 Pull request #497 - fix and refactor Cti::CallerId.parse_text:
- It did not recognize mobile numbers like '0170 12345678'.
    - Support for numbers without country/area prefixes dropped.
    - `get_comment_preferences` has to normalize the number too.
    - Split parse_text and fix specs

Thanks to @corny!
2016-12-06 13:26:08 +01:00
Thorsten Eckel
f517efaf16 Fixed issue #506 - OTRS Migration fails for user <-> role import. 2016-12-06 13:20:22 +01:00
Martin Edenhofer
1ae3aaadb5 Fixed file location. 2016-12-06 12:26:15 +01:00
Martin Edenhofer
e1d8e76f60 Load also de-de for tests. 2016-12-06 12:11:37 +01:00
Martin Edenhofer
7ea7c1aa83 packager.io need to have a working ruby env to download zammad locales and translations. 2016-12-06 12:11:04 +01:00
Martin Edenhofer
a2f77017f5 Improved tests. 2016-12-06 12:07:17 +01:00
Martin Edenhofer
d675730cdb Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-12-06 11:46:45 +01:00
Martin Edenhofer
6dc1e9ae80 Moved translation tests to spec. 2016-12-06 11:46:26 +01:00
Thorsten Eckel
ba88e14001 Emails should not get checked in import mode to provide the most complete data state. 2016-12-06 10:09:57 +01:00
Martin Edenhofer
2327b911a1 Improved tests. 2016-12-06 08:32:51 +01:00
Martin Edenhofer
d15d9e3006 Improved syntax. 2016-12-06 08:01:55 +01:00
Martin Edenhofer
24e86fa50f Improved tests (added reset block). 2016-12-05 14:27:19 +01:00
Thorsten
fd1b0f9c18 maybe_add should always return the record 2016-12-05 13:30:55 +01:00
Martin Edenhofer
cebc0e89af Increase watch time. 2016-12-05 12:37:06 +01:00
Martin Edenhofer
0c2be657be Fixed issue#502 - "Get latest Translations" fails(?) without error. 2016-12-05 12:25:41 +01:00
Thorsten
ce436c6f01 Use guard clause 2016-12-05 10:19:18 +01:00
André Bauer
ccab0ea4fc fix coveralls 2016-12-04 13:44:55 +01:00
André Bauer
17983ad17c revert pkgr.yml changes 2016-12-04 13:01:55 +01:00
André Bauer
4df2325669 fix apache config & beautified travis.yml 2016-12-04 12:48:58 +01:00
André Bauer
bc54d0542d fix pkgr.yml 2016-12-04 11:38:06 +01:00
Martin Edenhofer
5856dd7c06 Moved to offline translation files (improve speed of Zammad installation and possibility to need no network connection). 2016-12-03 20:37:37 +01:00
André Bauer
de302fde09 added coverals to Gemfile.lock to fix packager.io 2016-12-03 18:38:47 +01:00
André Bauer
0a0683a5a6 changed coveralls position in gemfile 2016-12-03 18:14:41 +01:00
André Bauer
d0d5f25e63 added coveralls.io 2016-12-03 17:20:03 +01:00
Julian Kornberger
13be41c844 Refactor Cti::CallerId
- execute rebuild in a single transaction
- reduce queries
- DRY up code
- satisfy RuboCop
2016-12-02 19:38:24 +01:00
André Bauer
2bbd2b1d7e fixed travis.yml 2016-12-02 18:00:51 +01:00
Roy Kaldung
fc0ba2b0de fixed final message 2016-12-02 17:49:16 +01:00
André Bauer
137c782182 added a2enmod 2016-12-02 16:28:14 +01:00
André Bauer
1d8b3d9b83 refactored postinstall fixes 2016-12-02 12:28:58 +01:00
André Bauer
7a8559e678 refactored postinstall.sh 2016-12-02 12:24:00 +01:00
Martin Edenhofer
a7e44f4ae3 Revert "Use only certain zammad ui locales (for faster build)."
This reverts commit c656148cbd.
2016-12-02 11:41:25 +01:00
Martin Edenhofer
c656148cbd Use only certain zammad ui locales (for faster build). 2016-12-02 11:36:00 +01:00
Julian Kornberger
3102fb2b02 Clean up .gitignore 2016-12-02 09:05:53 +01:00
Thorsten Eckel
2ed9ed5897 Use deliver_method :test for in test environment - thanks to @corny. 2016-12-01 17:48:08 +01:00
Martin Edenhofer
b83998a1b2 Merge pull request #486 from digineo/calendar_mapping
Move calendar mapping to config directory.
2016-12-01 17:18:15 +01:00
Thorsten
e42042cc1c Merge pull request #485 from digineo/logical_refactoring
Small refactoring of logical expressions
2016-12-01 17:13:19 +01:00
Thorsten
56c5b89fd9 Merge pull request #492 from digineo/spelling_mistake
Fix spelling mistake
2016-12-01 17:11:00 +01:00
Julian Kornberger
2298184266 Fix spelling mistake
definde -> defined
2016-12-01 17:00:05 +01:00
Martin Edenhofer
7c23e334a8 Disable ssl on on ssl ports. 2016-12-01 16:59:34 +01:00
Thorsten Eckel
d548dc5613 Added new labels and remove no longer needed ones. 2016-12-01 15:07:58 +01:00
Martin Edenhofer
b2434c1a38 Improved browser form tests. 2016-12-01 00:30:45 +01:00
Martin Edenhofer
c706306d09 Fixed adding/changing notes. 2016-11-30 23:35:24 +01:00
Martin Edenhofer
8e8cc4555b Extended search result not shown after clicking “search details” on quick search. 2016-11-30 21:22:33 +01:00
Julian Kornberger
7388217510 Small refactoring of logical expressions 2016-11-30 19:48:32 +01:00
Julian Kornberger
c548502d84 Move calendar mapping to config directory 2016-11-30 19:36:53 +01:00
André Bauer
dfbe15cb0e added eslint & csslint config for codeclimate 2016-11-30 15:39:13 +01:00
André Bauer
dee35baaf5 Merge branch 'develop' of github.com:zammad/zammad into develop 2016-11-30 15:36:38 +01:00
André Bauer
5238a6b5b6 removed php & python tests 2016-11-30 15:36:28 +01:00
Martin Edenhofer
212dae4990 Merge branch 'develop' of github.com:martini/zammad into develop 2016-11-30 15:13:14 +01:00
Martin Edenhofer
f995ae2326 Fixed time travel (travel_back again). 2016-11-30 15:12:16 +01:00
André Bauer
e18079fce7 Merge branch 'develop' of github.com:zammad/zammad into develop 2016-11-30 14:47:45 +01:00
André Bauer
abd304faa0 added missing database.yml-test... for travis 2016-11-30 14:47:32 +01:00
Martin Edenhofer
9633d211ed Travis ci improvements (mysql + postgresql + more tests). 2016-11-30 14:34:15 +01:00
André Bauer
23c9316f11 docker badges links to https://hub.docker.com/r/zammad/zammad/ 2016-11-30 13:54:36 +01:00
André Bauer
7c43024aac added codeclimete & docker badges 2016-11-30 13:52:58 +01:00
André Bauer
abe5a9cc8b Update README.md 2016-11-30 13:52:23 +01:00
André Bauer
c32c9866d2 added build & doc badge to README.md 2016-11-30 13:31:00 +01:00
André Bauer
547277e675 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-30 11:35:32 +01:00
Martin Edenhofer
64b56c6d95 Merge branch 'develop' of github.com:martini/zammad into develop 2016-11-30 11:34:01 +01:00
Martin Edenhofer
1736ac9a70 Fixed travis race condition issue. 2016-11-30 11:33:38 +01:00
André Bauer
18602e1edf fix travis 2016-11-30 11:31:17 +01:00
Julian K
ceaf615282 Fix spelling mistake (#481)
destory -> destroy
2016-11-30 11:30:03 +01:00
André Bauer
7aa66f4965 fix travis 2016-11-30 11:26:36 +01:00
André Bauer
2bc25e322e Merge remote-tracking branch 'upstream/develop' into develop 2016-11-30 11:25:31 +01:00
Martin Edenhofer
3b3a193ef7 Applied rubocop. 2016-11-30 08:11:44 +01:00
Martin Edenhofer
c6b31f7e39 Increased timeout to normal use. 2016-11-30 08:11:20 +01:00
Martin Edenhofer
de30c4d3af Applied rubocop. 2016-11-30 08:10:30 +01:00
Martin Edenhofer
a4341626b9 Fixed test and applied rubocop. 2016-11-30 08:04:35 +01:00
Martin Edenhofer
c8e7ce9d63 Merge pull request #479 from digineo/cti
Clean up CTI controller
2016-11-29 22:05:31 +01:00
Martin Edenhofer
53440fbbdd Fixed issue#478 - Token without expiration timestamp expires "01/01/1970”. 2016-11-29 21:54:49 +01:00
Julian Kornberger
89e6dcf0b5 sipgate: Move logic from controller to models 2016-11-29 21:23:34 +01:00
Julian Kornberger
d0e3810a20 sipgate: DRY up the Controller 2016-11-29 21:00:53 +01:00
Thorsten Eckel
e0b70cb24f Follow up: Fixed race condtion while importing history types for the first time. 2016-11-29 12:56:24 +01:00
Thorsten Eckel
e72d6c3fd4 Fixed race condtion while importing history types for the first time. 2016-11-29 12:04:09 +01:00
Thorsten Eckel
0757228257 Removed import check for FQDN. 2016-11-29 11:30:50 +01:00
Thorsten Eckel
1436551bf6 Added static JSON file for OTRS ticket without a title. 2016-11-29 11:30:25 +01:00
Thorsten Eckel
8e094f592d Working on issue #368 - OTRS FQDN should not get imported. 2016-11-29 11:01:56 +01:00
Thorsten Eckel
083d7b6410 Working on issue #368 - OTRS tickets with empty title fail import. 2016-11-29 11:01:56 +01:00
Thorsten Eckel
a4f2737286 Fixed issue #218 - Wrong links to OTRS migrator plugin. 2016-11-29 11:01:55 +01:00
Thorsten Eckel
5faae257dc Fixed issue #218 - wrong links to OTRS migrator plugin. 2016-11-29 11:01:55 +01:00
Thorsten Eckel
b63e98714c Working on issue #368 - Working on wrong user data key fails correct sha2 password import. 2016-11-29 11:01:55 +01:00
Thorsten Eckel
1f0e48afad Removed old debug log code which is way to verbose. 2016-11-29 11:01:55 +01:00
Martin Edenhofer
3cdb3e3ca5 Merge pull request #470 from digineo/spelling-mistakes
Fix spelling mistakes. Thanks to @corny !
2016-11-29 10:57:42 +01:00
Julian Kornberger
776910cf13 Fix spelling mistakes 2016-11-29 10:24:56 +01:00
Martin Edenhofer
6742fd0348 Fixed issue#468 - ”Password has been changed" email contains unresolved placeholders. 2016-11-28 15:54:24 +01:00
Thorsten Eckel
617491b8e3 Working on issue #368 - Fixes for issues arised while using the import via the frontend. 2016-11-28 11:44:56 +01:00
Thorsten Eckel
42c1957bff Added RSpec tests to CI env. 2016-11-25 18:01:41 +01:00
Thorsten Eckel
b2308546c0 Fixed rubocop newline issue caused by merge. 2016-11-25 17:22:34 +01:00
Thorsten Eckel
e8e332e2e3 Working on issue #368 - big time refactoring, adding of rspec and additional tests. 2016-11-25 17:16:08 +01:00
Martin Edenhofer
9489dff71d Reset pk’s for postgresql after any importing of data with id’s. 2016-11-25 15:54:13 +01:00
Martin Edenhofer
550b963ad0 Fixed issue#466 - Search result is not shown if you search for "AAA", "BBB" and "AAA" again. 2016-11-25 13:44:59 +01:00
Martin Edenhofer
f2a2b9efe9 Fixed issue#402 - Missing quotation marks on sender address. 2016-11-25 13:43:28 +01:00
Martin Edenhofer
f43261d292 Merge branch 'private-issue453' into develop 2016-11-24 16:03:28 +01:00
Martin Edenhofer
8636ceddf3 Merge branch 'develop' of github.com:martini/zammad into develop 2016-11-23 15:29:13 +01:00
Martin Edenhofer
570e3c981a Improved detection of auto generated emails / prevent auto responder. 2016-11-23 15:28:12 +01:00
Martin Edenhofer
44a5b9861f Implemented issue#453 - Possibility to monitor Zammad via URL from external, like gitlab is offering it. 2016-11-23 15:25:44 +01:00
Felix Niklas
a0ac4eae7b Style updates
- only add space between buttons that are visible
- smaller left-padding of lists in boxes
- less vertical margin around horizontal layouted boxes
- add span-width, spacer, double-spacer and flex-spacer helpers

spacer creates a 10x10 pixel space
double-spacer a 20x20 pixel space
flex-spacer uses space variably
2016-11-23 14:58:31 +01:00
Felix Niklas
201ca9ac26 Disable rack-livereload’s swf fallback (development)
Prevents the flash of a flash <object> when loading the page.
2016-11-23 14:06:20 +01:00
Felix Niklas
9faf2227ae Translation info: add more spacing between text and button 2016-11-23 14:04:54 +01:00
Martin Edenhofer
0766ffc0f5 Added tableId to App.TicketList for sizeable table columns. 2016-11-23 13:26:49 +01:00
Felix Niklas
1b4fbd6b4c add more delay to toggle article meta-data
- so that double-click selections work better without toggling the meta-data
2016-11-23 11:23:23 +01:00
André Bauer
7cf7dee79b hook tests 2016-11-23 11:13:42 +01:00
André Bauer
bdd9435f6e hook tests 2016-11-23 11:13:35 +01:00
Felix Niklas
e57d2c6c56 Minor UI fixes
- article internal border overlap with folded-out details
- article type border-radius when there is only one article type selectable
2016-11-23 10:48:46 +01:00
Felix Niklas
c5af2f995a Fix chat textarea grow bug
- the chat input would make the bottom area jump when something get’s typed
- in Firefox the chat placeholder was not visible when the chat input was empty
2016-11-23 10:35:49 +01:00
André Bauer
bd735297a1 removed after from pkgr.yml 2016-11-22 11:11:57 +01:00
André Bauer
df586bc6e3 pkgr.ymk add build trigger for dockerhub 2016-11-22 11:01:37 +01:00
André Bauer
f4942d0c8b Merge remote-tracking branch 'upstream/develop' into develop 2016-11-22 11:00:12 +01:00
Martin Edenhofer
31b4138ab5 Fixed issue#448 - New overview with article conditions not working. 2016-11-21 15:59:31 +01:00
Martin Edenhofer
25eaae05e3 Merge branch 'private-issue437' into develop 2016-11-21 08:49:35 +01:00
Martin Edenhofer
026835a5e4 Improved check for precedence header to send no auto responder. 2016-11-19 16:51:46 +01:00
Martin Edenhofer
0afac1d28c Added traceback for easier error handling. 2016-11-19 16:41:41 +01:00
Martin Edenhofer
c12372dd47 Added ES 5 support (filtered query has been deprecated and removed in ES 5.0). 2016-11-18 15:42:06 +01:00
Martin Edenhofer
925df1ed1d Applied new coffeelint. 2016-11-18 13:16:19 +01:00
Martin Edenhofer
ddb7497625 Fixed issue#437 - Customer should not have the internal attribute to set in customer interface. 2016-11-18 08:40:58 +01:00
Martin Edenhofer
f601553f6d Fixed issue#441 - Unable to execute more then one trigger (e. g. adding 2 tags with 2 triggers) at one ticket at same update cycle. 2016-11-18 08:25:07 +01:00
Martin Edenhofer
dce8914d9d Improved links, removed not needed . 2016-11-18 07:50:50 +01:00
André Bauer
a9e539219e removed centos 6 from pkgr.yml - docker image uses ubuntu 16.04 now 2016-11-18 01:43:24 +01:00
André Bauer
76b4ab697e link powered by zammad on loginscreen to zammad.org 2016-11-17 18:56:59 +01:00
Martin Edenhofer
15975eaaf7 Fixed issue#428 - Switching storage provider for attachments in UI has no effect. 2016-11-17 15:06:31 +01:00
Martin Edenhofer
be3ee48a3c Added missing migration file for issue#427 - Improved ticket number generator settings (just show necessary settings based on generator selection). 2016-11-17 11:21:47 +01:00
Martin Edenhofer
cd986ee57c Fixed issue#432 - Unable to create job/scheduler if many time options are selected. 2016-11-17 09:56:43 +01:00
Martin Edenhofer
fbbf19800e Fixed ui postmaster element test. 2016-11-16 19:03:43 +01:00
Martin Edenhofer
e7abac490f Fixed issue#419 - Unable to set owner + customer in postmaster/email filter. 2016-11-16 15:35:41 +01:00
Martin Edenhofer
8004e44454 Fixed issue#224 - Send all mails via sendmail - allow SMTP connection with no user/password (without auth). 2016-11-16 15:08:17 +01:00
Martin Edenhofer
2111145fb1 Merge branch 'private-issue427' into develop 2016-11-16 14:23:15 +01:00
Martin Edenhofer
d797a952e6 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-11-16 14:22:51 +01:00
Martin Edenhofer
5fcc05d543 Added missing sipgate config params. 2016-11-16 14:17:21 +01:00
Martin Edenhofer
9cccb57cfc Implemented issue#427 - Improved ticket number generator settings (just show necessary settings based on generator selection). 2016-11-16 12:44:29 +01:00
Thorsten Eckel
8d745cbef9 Follow up: WIP issue #368 - OTRS tickets are created without an assigned customer user. 2016-11-16 12:07:51 +01:00
Thorsten Eckel
24da432aec WIP issue #368 - OTRS tickets are created without an assigned customer user. 2016-11-16 11:48:20 +01:00
Martin Edenhofer
7ddc6da7b8 Merge branch 'develop' of github.com:martini/zammad into develop 2016-11-16 11:13:07 +01:00
André Bauer
ca4a2e97dd fix apache config 2016-11-16 10:33:06 +01:00
Martin Edenhofer
9d5e5013dd Fixed issue#413 - Can't process email / Error creating ticket with changed Ticket Number Format. 2016-11-16 07:58:42 +01:00
André Bauer
1bc91c15b7 sles / opensuse support in postinstall.sh 2016-11-15 22:44:06 +01:00
André Bauer
6aaaaca211 postinstall.sh fixes 2016-11-15 22:40:24 +01:00
André Bauer
4f8b243034 postinstall.sh - suse support 2016-11-15 22:12:33 +01:00
André Bauer
096ea6d489 fix 415 - remove creation of Gemfile.local from pkgr.yml 2016-11-15 16:21:16 +01:00
André Bauer
e3733be613 added apache2 configuration to postinstall.sh 2016-11-15 11:10:57 +01:00
André Bauer
6500154a83 added apache2 proxy config 2016-11-15 10:29:31 +01:00
André Bauer
7c077673c3 supressing warnings of postinstall.sh in centos 2016-11-14 13:54:04 +01:00
Martin Edenhofer
d7565e0f55 Fixed issue#408 - "Ticket will escalate soon" in online notifications is not translated. 2016-11-14 12:03:26 +01:00
Martin Edenhofer
5d5b1766d5 Applied CentOS 7 issues. 2016-11-14 03:22:58 +01:00
Martin Edenhofer
6c11e54884 Removed archive deployment. 2016-11-14 01:30:24 +01:00
Martin Edenhofer
b9f8c79818 Enabled integrations. 2016-11-14 00:48:13 +01:00
Martin Edenhofer
e9d86680f0 Ignore Gemfile.local. 2016-11-14 00:46:23 +01:00
chrisdecker1201
b4a7e30f62 it's better to set the recommended path (#404) 2016-11-14 00:40:13 +01:00
Martin Edenhofer
80676678fc Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-11-14 00:29:14 +01:00
Martin Edenhofer
2fc039da28 Fixed zendesk import test. 2016-11-14 00:28:42 +01:00
Martin Edenhofer
972fb75dfb Merge branch 'private-doorkeeper' into develop
# Conflicts:
#	app/assets/javascripts/app/controllers/api.coffee
2016-11-14 00:12:55 +01:00
Martin Edenhofer
5157597465 Merge branch 'private-issue356' into develop 2016-11-14 00:09:45 +01:00
Martin Edenhofer
05b6bcc71e Merge branch 'private-issue301' into develop 2016-11-14 00:08:44 +01:00
Martin Edenhofer
bf3411daca Implemented issue#356 - Automatically join users to organizations based on the email address. 2016-11-13 23:59:39 +01:00
Martin Edenhofer
48e084df3d Improved oauth admin area. 2016-11-13 22:16:17 +01:00
Martin Edenhofer
eaa603e77b Merge branch 'develop' of github.com:martini/zammad into develop 2016-11-13 19:34:08 +01:00
Martin Edenhofer
aa29a75841 Fixed issue#301 - Using #{article.body} in trigger gives html. 2016-11-13 19:33:12 +01:00
Thorsten Eckel
ac94601515 Added new labels to whitelist. 2016-11-13 12:23:42 +01:00
André Bauer
ae8145253d changed docs domain to https://docs.zammad.org 2016-11-12 18:26:50 +01:00
Martin Edenhofer
fe47e5a8f2 Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	contrib/nginx/zammad.conf
2016-11-12 16:20:09 +01:00
Martin Edenhofer
511706b873 Improved / location with proxy_read_timeout from 60 sec. to 180 sec. Improved indentation. 2016-11-12 16:18:24 +01:00
Thorsten Eckel
b334423c46 Added whitelist of issue labels to include and skip the ones without a label. 2016-11-12 14:44:19 +01:00
André Bauer
cde79e0222 changed https to https 2016-11-12 12:41:41 +01:00
André Bauer
0f9aa86353 created nginx proxy conf for elasticsearch (#397)
* created nginx proxy conf for elasticsearch
* changed docu links to readthedoc.io in README.md
2016-11-12 12:40:24 +01:00
Martin Edenhofer
715e6587d8 Added more tests for NotificationFactory::Renderer and improved validation. 2016-11-12 11:19:15 +01:00
Martin Edenhofer
9b3d133c3e Will be generated automatically from now. 2016-11-12 09:17:45 +01:00
Thorsten Eckel
e0792c80dd Fixed issue #385 - Invalid (html) content in notification templates breaks application. 2016-11-11 16:57:44 +01:00
Martin Edenhofer
f4f1ca2b43 Fixed issue#392. Improved variable naming and enable table size feature for generic tables. 2016-11-11 15:41:53 +01:00
Martin Edenhofer
3e2711909a Added inline doc. 2016-11-11 11:17:53 +01:00
Martin Edenhofer
67381c07bd Added port attribute for imap/pop3 and smtp. See also issue#240. 2016-11-11 00:04:10 +01:00
Martin Edenhofer
c8eab7ca56 Fixed issue#383 - TicketSelector in Overview or SLA not working with filter for ticket customer or owner. 2016-11-10 16:30:36 +01:00
Martin Edenhofer
a787d66486 Improved calendar management. 2016-11-10 16:11:59 +01:00
Martin Edenhofer
fc8008b7e4 Fixed issue##388 - Added translation support for forms based on <html lang=“xx”> tag. 2016-11-09 23:04:49 +01:00
Martin Edenhofer
575f15273d Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-11-09 15:06:06 +01:00
Martin Edenhofer
cbcd1bc129 Fixed isse#384 - Click on "Reports" leads to Error 500. 2016-11-09 15:05:18 +01:00
Thorsten Eckel
6248561444 Fixed issue #379 - github_changelog_generator missing in Gemfile.lock . 2016-11-09 12:59:45 +01:00
Martin Edenhofer
9d47559cf6 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-11-08 18:42:14 +01:00
Martin Edenhofer
001485dda1 Improved escalation calculation. 2016-11-08 18:41:57 +01:00
Thorsten Eckel
d2cec32249 Fixed issue #270 - unkonwn article type fails import. 2016-11-08 16:21:30 +01:00
Martin Edenhofer
8f96496a47 Fixed issue#374. Delete cache in initial setup routine - script/scheduler.rb crashes after recreation of Zammad database. 2016-11-08 14:15:24 +01:00
Martin Edenhofer
4d42c54bf1 Fixed issue#345 - IMAP mail fetching stops working on spam mail and invalid email format. Scheduler will now keep running and store failed mail under tmp/unprocessable_mail/. 2016-11-07 23:20:58 +01:00
Thorsten Eckel
beb3e7c9bb Added gem for generating the change log file. 2016-11-07 17:53:13 +01:00
Thorsten Eckel
fed4777910 Renamed ruby API client repo - https://github.com/zammad/zammad-api-client-ruby/issues/1 . 2016-11-07 13:07:50 +01:00
Martin Edenhofer
e16b3c3e48 Small improvement, set domain for smtp if Zammad fqdn is not configured (e. g. in development environments). 2016-11-07 12:01:55 +01:00
Martin Edenhofer
15a23f3723 Improved code layout. 2016-11-06 16:46:36 +01:00
Martin Edenhofer
db2b329331 Fixed issue#240 - TLS/SSL for SMTP with exchange. Improved Net::SMTP.do_start to auto detect available auth types based on SMTP server capabilities. 2016-11-06 16:45:38 +01:00
Martin Edenhofer
f07013ac3c Improved inline documentation. 2016-11-06 16:39:05 +01:00
Thorsten Eckel
c584d96360 Fixed bug: Error while logging in to some IMAP services (e.g. Outlook365.) 2016-11-05 17:22:31 +01:00
Martin Edenhofer
45627716c9 Merge pull request #367 from m4r71n/patch-1
Date corrected in changes file.
2016-11-05 07:14:28 +01:00
Martin Lepadusch
9b504818ec date corrected 2016-11-04 21:24:13 +01:00
Martin Edenhofer
824e674c64 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-11-04 16:03:48 +01:00
Rolf Schmidt
909a01df07 Fixed issue #349 - ticket search cache issue. 2016-11-04 15:59:44 +01:00
André Bauer
e1ad7f9c5a postinstall.sh changes
reflect apache2 dependency in debian/ubuntu when showing zammad url
2016-11-04 11:13:11 +01:00
Martin Edenhofer
307b9dc744 Fixed issue#312 - In object manager, blank line in object deleted all values for selections. 2016-11-04 08:42:46 +01:00
Martin Edenhofer
b9b8f1df46 Fixed issue#286 - Answers from google mail shows complete quote. 2016-11-04 00:14:43 +01:00
Martin Edenhofer
c5c22a6b68 To not stream threads at once (module require issue). 2016-11-04 00:09:05 +01:00
Martin Edenhofer
0c5afe9bd8 Merge branch 'develop' of github.com:martini/zammad into develop 2016-11-03 23:19:18 +01:00
Martin Edenhofer
85872a6679 Fixed issue#348 - IMAP mail fetching stops because of broken spam email (invalid Content-Transfer-Encoding header). 2016-11-03 23:18:10 +01:00
André Bauer
e8dccb50e0 Added Apache2 to Debian / Ubuntu dependencies 2016-11-03 15:11:00 +01:00
André Bauer
c2aca71e6d Update .pkgr.yml 2016-11-03 11:09:22 +01:00
André Bauer
09b38b44d1 adding mysql / mariadb to postinstall.sh (#346)
* .pkgr.yml - add mysql/mariadb as dependenciy alternatvies / postinstall.sh - add mysql db creation

* postinstall.sh fixes

* pkgr.yml additions

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* [skip ci] postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes

* postinstall.sh fixes
2016-11-02 18:18:29 +01:00
Thorsten Eckel
faafe0cc60 Working on OAuth2 support with doorkeeper gem. 2016-11-01 17:16:04 +01:00
André Bauer
ab29cfec32 Update postinstall.sh 2016-10-31 16:32:53 +01:00
André Bauer
af6f10def5 fix missing echo and change login to md5 2016-10-31 16:18:13 +01:00
André Bauer
e4d3f4704b more packager.io fixe (#339)
- fix postgresql package name for sles12
- configure postgresql on centos to accept username/password logins
2016-10-31 15:46:37 +01:00
André Bauer
5db05f34b8 Merge pull request #337 from monotek/develop
packager.io centos fixes
2016-10-31 14:13:20 +01:00
André Bauer
65324e99e8 packager.io centos fixes 2016-10-31 14:12:35 +01:00
André Bauer
b898d2de60 Update preinstall.sh 2016-10-31 14:04:40 +01:00
André Bauer
f07982daf5 fix nginx install on centos (#336)
fix nginx install on centos (#336)
2016-10-31 13:40:00 +01:00
André Bauer
db9233d1e7 Merge pull request #335 from monotek/monotek
addded nginx to .pkgr.yml dependencies
    added contrib/packager.io/preinstall.sh (installs epel-release on centos to get nginx dependency work)
    moved contrib/pkgr-postinstall.sh to contrib/packager.io/postinstall.sh
    removed postgresql-devel, postgresql and httpd from .pkgr.yml centos dependencies
    added postgresql db init to pkgr-postinstall.sh & fixed some checks
    added codeclimate.yml
2016-10-31 13:04:23 +01:00
André Bauer
a797add550 packager additions 2016-10-31 13:00:59 +01:00
Martin Edenhofer
4e84b60445 Moved back to headline for topics. 2016-10-30 01:41:02 +02:00
Martin Edenhofer
3da7725d22 Improved design. 2016-10-30 01:18:48 +02:00
Martin Edenhofer
5c60a936fa Merge branch 'develop' of github.com:martini/zammad into develop 2016-10-30 01:10:13 +02:00
Martin Edenhofer
f3cc078cb3 Improved reply of twitter status, set cursor to end of input field. 2016-10-30 01:08:28 +02:00
Martin Edenhofer
7cbe4f9da1 Fixed recipient list (exclude now username) on twitter reply. 2016-10-30 00:17:35 +02:00
Martin Edenhofer
082e087797 Fixed group default selection in twitter/facebook admin screen. 2016-10-29 23:49:24 +02:00
Martin Edenhofer
97c516efcc Improved read. 2016-10-29 22:57:59 +02:00
Martin Edenhofer
da6352ad19 Fixed group default selection in twitter/facebook edit screen. 2016-10-29 22:54:55 +02:00
André Bauer
4ab13a9d68 Merge pull request #331 from monotek/develop
removed doc dir - content of files is migrated to zammad.org/document…
2016-10-29 21:54:22 +02:00
André Bauer
7fd77c4b14 removed doc dir - content of files is migrated to zammad.org/documentation 2016-10-29 21:53:34 +02:00
André Bauer
305afc0d72 cleanup 2016-10-29 21:28:03 +02:00
Martin Edenhofer
743700fe25 Fixed issue#326 - Create emails via fetchmail / procmail. 2016-10-29 20:27:30 +02:00
André Bauer
f910ff9424 Update README.md 2016-10-29 17:36:20 +02:00
André Bauer
ba624a1e09 Update README.md 2016-10-29 17:35:48 +02:00
André Bauer
825b1602bd Update README.md 2016-10-29 16:22:30 +02:00
André Bauer
5e412af562 Merge pull request #328 from monotek/monotek
remove install readmes and point to https://zammad.org/documentation …
2016-10-29 16:21:24 +02:00
André Bauer
663372d82a remove install readmes and point to https://zammad.org/documentation instead 2016-10-29 16:20:03 +02:00
Martin Edenhofer
9ef972d111 Removed console log for debugging. 2016-10-28 17:04:21 +02:00
Martin Edenhofer
f8a75f02b8 Fixed issue#317 - Display origin url from tweet/facebook post. 2016-10-28 16:59:15 +02:00
Martin Edenhofer
d74444fc30 Fixed issue#251 - Page posts from facebook and tweets from twitter as tickets.
- new tickets from own posts / tweets will be created as closed now
- on new connected accounts only 20 old messages are imported (to prevent to import really old -initial- stuff)
2016-10-28 15:06:00 +02:00
Martin Edenhofer
22e871a68f Merge branch 'develop' of github.com:martini/zammad into develop 2016-10-28 14:05:18 +02:00
Martin Edenhofer
f86bdcce88 Fixed issue#323 - Unable to create tickets if SLA with condition article.subject is set. 2016-10-28 14:04:08 +02:00
André Bauer
99d2956d1f fix "duplicate MIME type "text/html" in /etc/nginx/sites-enabled/zammad.conf" 2016-10-28 12:58:00 +02:00
André Bauer
178d32754c Merge pull request #321 from monotek/develop
pkgr-postinstall.sh fixes
2016-10-28 10:21:57 +02:00
André Bauer
417bc25477 Merge branch 'develop' of github.com:monotek/zammad into develop 2016-10-28 10:16:11 +02:00
André Bauer
765fa29879 pkgr-postinstall.sh fixes 2016-10-28 10:15:29 +02:00
André Bauer
a6e2cdd61c Merge remote-tracking branch 'upstream/develop' into develop 2016-10-28 10:06:33 +02:00
André Bauer
f14a5f987a pkgr-postinstall.sh - fix debian/ubuntu symlink path for nginx coonfig 2016-10-28 10:05:36 +02:00
André Bauer
1e339a8e92 Merge pull request #319 from monotek/develop
pkgr-postinstall.sh - create nginx config also for centos / sles
2016-10-28 09:50:06 +02:00
André Bauer
5b223d2ee4 postinstall.sh - create nginx config also for centos / sles 2016-10-28 09:44:11 +02:00
André Bauer
20268b8ccf Merge pull request #316 from monotek/develop
added sles 12 to pkgr.yml and check for used initservice in pkgr-postinstall.sh
2016-10-27 14:08:42 +02:00
André Bauer
159d1fc8ed add sles 12 to pkgr.yml and check for used initservioce in pkgr-postinstall.sh fixes 2016-10-27 13:50:18 +02:00
André Bauer
ff59c925e1 add sles 12 to pkgr.yml and check for used initservioce in pkgr-postinstall.sh 2016-10-27 12:15:51 +02:00
Martin Edenhofer
38250659b6 Fixed issue#268 - No space at comment on ticket bulk action. 2016-10-27 08:46:51 +02:00
Martin Edenhofer
306c4b7017 Only trigger if record_ids exists. 2016-10-27 08:43:39 +02:00
Martin Edenhofer
84ca669ee9 Fixed online notifications - no shown because in undefined refresh items. 2016-10-27 03:23:56 +02:00
Martin Edenhofer
0a83811479 Fixed issue#313 - Admin -> Channels -> Email -> Filters not shown / no name shown. 2016-10-27 01:09:10 +02:00
André Bauer
51683d9859 fixing db update in pkgr-postinstall.sh (#311)
fixing db update in pkgr-postinstall.sh
2016-10-26 16:28:59 +02:00
André Bauer
c2f8339fde Merge pull request #310 from monotek/postinstall
rearange postinall.sh and post some more informational output
2016-10-26 13:49:40 +02:00
André Bauer
af7fae9b00 rearange postinall.sh and post some more informational output 2016-10-26 13:45:14 +02:00
André Bauer
8bd06911fe updates to pkgr-postinstall.sh & README_Install_Debian_Ubuntu.md (#309)
updates to pkgr-postinstall.sh & README_Install_Debian_Ubuntu.md
2016-10-26 12:44:37 +02:00
Never
94ea44d519 fixed miss package gawk on Debian (#305)
* fixed miss package gawk on Debian

* fixed miss package gawk on Debian #305

* fixed typo
2016-10-26 12:27:39 +02:00
André Bauer
a26e39f230 Fixed Typo 2016-10-26 11:07:07 +02:00
André Bauer
099a951dfd changes to postinstall.sh (#308)
* remove contrib/packager.io dir / move cleanup.sh back top contrib / moved postinstall.sh to contrib/pkgr-postinstall.sh / fixed path in .pkgr.yml

* added localhost to nginx.conf servername to get a running version for local testers

* added message with browserlink of zamad to postinstall.sh

* reoved zammad.example.com fromk nginx config
2016-10-26 11:04:36 +02:00
Martin Edenhofer
5ffb3cd66d Merge branch 'develop' of github.com:martini/zammad into develop 2016-10-25 23:19:24 +02:00
Martin Edenhofer
fa8c8ae8ab Fixed reopen of tickets all time. Create new page posts as already closed ticket if post creator was own page account (issue#251). 2016-10-25 23:19:02 +02:00
André Bauer
ab6d2086d9 Merge pull request #302 from monotek/develop
postinstall.sh fixes
2016-10-25 19:30:24 +02:00
André Bauer
ea3f60e258 Merge remote-tracking branch 'upstream/develop' into develop 2016-10-25 19:25:03 +02:00
André Bauer
163f37e925 postinstall.sh fixes 2016-10-25 19:23:46 +02:00
André Bauer
19bf7d497a Merge pull request #300 from monotek/develop
postinstall.sh - check if nginx.conf already exists
2016-10-25 18:55:43 +02:00
André Bauer
5cb038a95e postinstall.sh - check if nginx.conf already exists 2016-10-25 18:55:02 +02:00
André Bauer
63b1568120 Merge pull request #299 from monotek/develop
.pkgr.yml changes - creates postgresql db / debian 8...
2016-10-25 18:34:06 +02:00
André Bauer
1ee250fc5b postinstall.sh check if symlink already exists 2016-10-25 18:27:30 +02:00
André Bauer
1f30f416c4 postinstall.sh - add nginx config 2016-10-25 18:07:10 +02:00
André Bauer
bafcd91a92 postinstall.sh db creation 2016-10-25 17:59:31 +02:00
André Bauer
3ec2ba3a43 pkgr changes 2016-10-25 15:51:46 +02:00
André Bauer
3610ed3bcc moved cleanup.sh to contrip/packager.io / added contrib/packager.io/postinstall.sh 2016-10-25 15:29:10 +02:00
André Bauer
6d89cf1661 pkgr changes 2016-10-25 15:16:52 +02:00
André Bauer
86df83ed33 pkgr changes 2016-10-25 15:14:58 +02:00
André Bauer
af5882b421 pkgr changes 2016-10-25 13:54:00 +02:00
André Bauer
a1599cf21e pkgr changes 2016-10-25 13:51:46 +02:00
André Bauer
d62c2bd034 pkgr changes 2016-10-25 13:02:01 +02:00
André Bauer
26d513f7ad pkgr changes 2016-10-25 12:57:47 +02:00
André Bauer
f273634cb3 pkgr changes 2016-10-25 12:56:52 +02:00
André Bauer
f99d8b10ee pkgr changes 2016-10-25 12:43:21 +02:00
André Bauer
d8ef3abb7c pkgr changes 2016-10-25 12:38:25 +02:00
André Bauer
2cb8f73e71 pkgr - implement nginx in ubuntu 2016-10-25 11:15:27 +02:00
André Bauer
798b46f770 pkgr - implement nginx in ubuntu 2016-10-25 11:14:01 +02:00
André Bauer
5884ea4550 pkgr - create init scripts afer install 2016-10-25 10:46:47 +02:00
André Bauer
9e3443365f remove useless contrib/nginx/nginx.conf 2016-10-25 10:30:45 +02:00
André Bauer
578657ecc7 add debian 7 to .pkgr.yml 2016-10-25 10:29:13 +02:00
Martin Edenhofer
da2a11cb8c Added users/me resource. Fixed issue#241. 2016-10-25 01:54:12 +02:00
Martin Edenhofer
1ddbb5d59e Applies rubocop for ruby 2.3.1. 2016-10-24 23:59:18 +02:00
Martin Edenhofer
35a486f32b Disabled rule. 2016-10-24 23:57:25 +02:00
Martin Edenhofer
8cfba7ea98 Merge pull request #288 from Libermentix/develop
Add ruby version  as recommended in the docs.
2016-10-24 23:26:48 +02:00
Felix Plitzko
ddb8885023 Add ruby version as recommended in the docs. 2016-10-24 21:48:08 +02:00
Martin Edenhofer
81d29db5e7 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop
# Conflicts:
#	.pkgr.yml
#	.travis.yml
#	config/initializers/db_preferences_mysql.rb
2016-10-24 19:39:34 +02:00
Martin Edenhofer
29d5136cea Fixed syntax/rubocop issue. 2016-10-24 19:36:25 +02:00
André Bauer
f4fdcba8fc Merge pull request #287 from monotek/develop
chnaged travis environment to develop / added unittest
2016-10-24 17:44:06 +02:00
André Bauer
b231555ef8 Merge remote-tracking branch 'upstream/develop' into develop 2016-10-24 17:40:56 +02:00
André Bauer
68cf621047 travis - disable mail notifications 2016-10-24 17:37:25 +02:00
André Bauer
680fa7610c travis - add postfix 2016-10-24 17:14:34 +02:00
André Bauer
c3c514fe68 travis - fix mysql priv 2016-10-24 16:49:34 +02:00
André Bauer
b7737158f7 travis - change bundle 2016-10-24 16:48:33 +02:00
André Bauer
2323b61443 travis - switch to dev environment 2016-10-24 16:45:39 +02:00
André Bauer
5932491a24 add unit tests to travis 2016-10-24 16:37:42 +02:00
André Bauer
fda7e0318f add unit tests to travis 2016-10-24 16:36:07 +02:00
André Bauer
ac163618dc Merge pull request #283 from monotek/develop
.pkgr.yml - fix ubuntu dependencies
2016-10-24 13:43:20 +02:00
André Bauer
660d264cf0 .pkgr.yml - fix ubuntu dependencies 2016-10-24 13:41:56 +02:00
André Bauer
917439316e .travis.yml changes 2016-10-24 13:21:48 +02:00
André Bauer
3985e9d7bf .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
2a5d3dd838 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
a8ad1b76e5 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
589c94a492 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
31570f7673 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
c790d4dd2e .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
830d7e7df4 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
dadaa0fe65 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
2ab1446232 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
aa13f58059 .travis.yml changes 2016-10-24 13:21:47 +02:00
André Bauer
d2bef928b1 .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
852bd92e01 .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
f8c7f6766a .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
25db4cc4a8 .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
461e17badd .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
db19e2f6c0 .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
fb41faec19 .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
3da64cad2b .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
b89fdb4879 .travis.yml changes 2016-10-24 13:21:46 +02:00
André Bauer
1a60b95236 .travis.yml changes 2016-10-24 13:21:45 +02:00
André Bauer
a84e169362 .travis.yml changes 2016-10-24 13:21:45 +02:00
André Bauer
564ade281f .travis.yml changes 2016-10-24 13:21:45 +02:00
André Bauer
9488f63a67 .travis.yml changes 2016-10-24 13:21:45 +02:00
Michiel Beijen
cbac19a5da Add https url for download links 2016-10-24 13:21:45 +02:00
André Bauer
7d5bb5ba8d changed .travis.yml 2016-10-24 13:21:45 +02:00
André Bauer
081bdaebc4 changed .travis.yml 2016-10-24 13:21:45 +02:00
André Bauer
72fe2be0a3 changed .travis.yml 2016-10-24 13:21:45 +02:00
André Bauer
8acf7c299a changed .travis.yml 2016-10-24 13:21:45 +02:00
André Bauer
20c93da0cf changed .travis.yml 2016-10-24 13:21:45 +02:00
André Bauer
dc5462e709 changed .travis.yml 2016-10-24 13:21:44 +02:00
André Bauer
283c483adf changed .travis.yml 2016-10-24 13:21:44 +02:00
André Bauer
f021b89b0d changed dependencies to .travis.yml 2016-10-24 13:21:44 +02:00
André Bauer
5494508552 added dependencies to .travis.yml 2016-10-24 13:21:44 +02:00
André Bauer
cf4478c646 added .travis.yml file 2016-10-24 13:21:44 +02:00
Thorsten
e0a9a42c7a Merge pull request #282 from monotek/develop
added .travis.yml / added Ubuntu 16.04 to .pkgr.yml / fixed db_preferences_mysql.rb
2016-10-24 13:21:06 +02:00
André Bauer
0abdaa3f9a .travis.yml changes 2016-10-24 12:50:35 +02:00
André Bauer
dc1559c7b8 .travis.yml changes 2016-10-24 12:42:07 +02:00
André Bauer
78059397d1 .travis.yml changes 2016-10-24 12:32:56 +02:00
André Bauer
1cedb7204a .travis.yml changes 2016-10-24 12:29:52 +02:00
André Bauer
9a0e995c6c .travis.yml changes 2016-10-24 12:28:01 +02:00
André Bauer
aeada62378 .travis.yml changes 2016-10-24 12:25:06 +02:00
André Bauer
d51b3d9a37 .travis.yml changes 2016-10-24 12:19:14 +02:00
André Bauer
701c61f7d1 .travis.yml changes 2016-10-24 12:06:22 +02:00
André Bauer
5d6ba9cd3b .travis.yml changes 2016-10-24 12:03:25 +02:00
André Bauer
4e2785b995 .travis.yml changes 2016-10-24 11:51:31 +02:00
André Bauer
5169f4ec68 .travis.yml changes 2016-10-24 11:45:50 +02:00
André Bauer
d07d9ee7b8 .travis.yml changes 2016-10-24 11:41:49 +02:00
André Bauer
30fa9ed95c .travis.yml changes 2016-10-24 11:38:06 +02:00
André Bauer
aad184493c .travis.yml changes 2016-10-24 11:24:38 +02:00
André Bauer
a8b516962b .travis.yml changes 2016-10-24 11:19:08 +02:00
André Bauer
d403ccc1a5 .travis.yml changes 2016-10-24 11:13:54 +02:00
André Bauer
3592cc8fb0 .travis.yml changes 2016-10-24 11:10:41 +02:00
André Bauer
55e25c35f5 .travis.yml changes 2016-10-24 11:08:39 +02:00
André Bauer
4cdd26b04e .travis.yml changes 2016-10-24 11:06:15 +02:00
André Bauer
881079f5a1 .travis.yml changes 2016-10-24 11:04:32 +02:00
André Bauer
4a5f1a32ac .travis.yml changes 2016-10-24 11:01:43 +02:00
André Bauer
cd0fc157b5 .travis.yml changes 2016-10-24 10:58:51 +02:00
André Bauer
7dbda87f41 .travis.yml changes 2016-10-24 10:51:53 +02:00
André Bauer
2aa3e836fe .travis.yml changes 2016-10-24 10:48:25 +02:00
André Bauer
e07a4a3e3d Merge remote-tracking branch 'upstream/develop' into travis 2016-10-24 10:38:25 +02:00
Martin Edenhofer
8ae652bd8e Merge pull request #279 from mbeijen/https-for-ftp-download
Add https url for download links
2016-10-24 08:33:15 +02:00
Michiel Beijen
c15dd07bc4 Add https url for download links 2016-10-24 07:51:40 +02:00
Martin Edenhofer
97238cc142 Fixed unit test. 2016-10-24 07:47:05 +02:00
Martin Edenhofer
4128df989b Moved to https urls. 2016-10-24 07:38:45 +02:00
Martin Edenhofer
d3b9b68aa0 Merge pull request #266 from mbeijen/https-where-possible
Use https in links were possible
2016-10-24 07:31:34 +02:00
Martin Edenhofer
c58a73f684 Fixed issue#277 - chat history wrong on app/page reload. 2016-10-23 20:40:55 +02:00
Martin Edenhofer
c6ab14817a Merge pull request #278 from chrisdecker1201/develop
Ordered list always started with 1
2016-10-23 18:41:33 +02:00
Christian Decker
857b9e7910 Ordered list always started with 1 2016-10-23 18:24:08 +02:00
André Bauer
6d7482dfd8 changed .travis.yml 2016-10-23 18:22:31 +02:00
André Bauer
62d41e54a0 changed .travis.yml 2016-10-23 18:17:48 +02:00
André Bauer
907d84e1e7 changed .travis.yml 2016-10-23 18:04:11 +02:00
André Bauer
6fd2645ae7 changed .travis.yml 2016-10-23 17:58:10 +02:00
André Bauer
c3eb98eb03 changed .travis.yml 2016-10-23 17:51:23 +02:00
André Bauer
462811016e changed .travis.yml 2016-10-23 17:50:25 +02:00
André Bauer
16ba5a5153 changed .travis.yml 2016-10-23 17:45:58 +02:00
André Bauer
1ca51c2324 changed dependencies to .travis.yml 2016-10-23 17:43:34 +02:00
André Bauer
f0638ffb57 added dependencies to .travis.yml 2016-10-23 17:41:52 +02:00
André Bauer
744312f82a added .travis.yml file 2016-10-23 17:20:25 +02:00
André Bauer
c1cf5dfde6 Merge pull request #276 from monotek/develop
added some missing Github accounts to credits file
2016-10-23 17:13:46 +02:00
André Bauer
8041685508 added some missing Github accounts to credits file 2016-10-23 17:13:14 +02:00
Michiel Beijen
6e44b5ae26 Use https in links were possible 2016-10-21 17:55:44 +02:00
André Bauer
246a3dd7ec Merge pull request #259 from monotek/develop
more ubuntu install updates
2016-10-21 15:46:47 +02:00
André Bauer
925d7b2bc4 more ubuntu install updates 2016-10-21 15:45:27 +02:00
André Bauer
4c8138540c Merge pull request #258 from monotek/develop
updated ubuntu install manual
2016-10-21 15:38:41 +02:00
André Bauer
c74ffb195b updated ubuntu install manual - hint to change mysql user, pass & host 2016-10-21 15:35:54 +02:00
André Bauer
a4bc26cc48 Merge branch 'develop' of github.com:monotek/zammad into develop 2016-10-21 15:34:45 +02:00
André Bauer
d13cb9f200 updated ubuntu install manual - hint to change vhost domain in nginx config 2016-10-21 15:34:20 +02:00
Martin Edenhofer
d7115a6be5 Fixed issue#237 - added database version check at app boot sequence - thanks to @zotto and @qpwr 2016-10-20 23:18:26 +02:00
André Bauer
a6893a34de Merge pull request #239 from monotek/develop
ubuntu manual - running zammad processes in backround & log to log/zammad.log
2016-10-20 13:21:31 +02:00
André Bauer
0b25c84ad4 ubuntu manual - fixing whitspace 2016-10-20 13:20:53 +02:00
André Bauer
333c455734 ubuntu manual - running zammad processes in backround & log to log/zammad.log 2016-10-20 13:19:22 +02:00
André Bauer
e08f340e72 Update README_Install_Ubuntu.md 2016-10-19 23:49:10 +02:00
André Bauer
927cb71a0c add nginx restart 2016-10-19 23:48:14 +02:00
André Bauer
6fec45168a Merge pull request #226 from monotek/develop
fix nginx vhost domain
2016-10-19 23:43:54 +02:00
André Bauer
97b360729c fix nginx vhiost domain 2016-10-19 23:42:23 +02:00
André Bauer
52a3498c0a Merge pull request #225 from monotek/develop
new nginx config & updated ubuntu install manual
2016-10-19 23:35:14 +02:00
André Bauer
65e0616a27 fix merge conflict 2016-10-19 23:34:32 +02:00
André Bauer
685d933fa8 new nginx config & updated ubuntu install manual 2016-10-19 22:53:54 +02:00
André Bauer
1db7ccc608 Update README_Install_Ubuntu.md 2016-10-19 22:49:03 +02:00
André Bauer
b66d6e7079 Update README_Install_Ubuntu.md 2016-10-19 22:46:13 +02:00
André Bauer
78b9597496 Update README_Install_Ubuntu.md 2016-10-19 21:47:31 +02:00
André Bauer
9adf438040 Update README_Install_Ubuntu.md 2016-10-19 21:25:41 +02:00
André Bauer
0592286eb1 Update README_Install_Ubuntu.md 2016-10-19 21:23:34 +02:00
Johannes Nickel
f326cd47a1 Merge pull request #212 from senk/patch-1
Fix wrong apt-get commands in Ubuntu Install doc. Thx @senk
2016-10-19 16:35:37 +02:00
Robin Naundorf
6a60a11c47 Fix wrong apt-get commands in Ubuntu Install doc
Delete duplicate 'apt-get install'
2016-10-19 13:39:06 +02:00
Thorsten Eckel
b0d22d4c53 Fixed bug: Zip archive doesn't contain sub folder content. 2016-10-19 08:26:08 +02:00
Thorsten Eckel
8040e093d9 Working on CI tag/branch pushing, syncing, deployment issue. 2016-10-19 07:31:46 +02:00
Thorsten Eckel
a53a6fccee Working on issue not syncing to github correctly. 2016-10-19 07:26:28 +02:00
Martin Edenhofer
551846a1a5 Issue with test ref server. 2016-10-19 07:05:09 +02:00
Martin Edenhofer
8ca8b8b0d3 Reenabled jobs. 2016-10-19 06:42:50 +02:00
Martin Edenhofer
1e719f9274 Merge branch 'pkg' into develop 2016-10-19 06:25:07 +02:00
Martin Edenhofer
54b20b6119 Declare importer as beta. 2016-10-19 06:06:34 +02:00
Martin Edenhofer
338154c525 Updated. 2016-10-19 05:54:18 +02:00
Martin Edenhofer
98f79dcec3 Package build. 2016-10-19 05:50:56 +02:00
Martin Edenhofer
3e44a2cb43 Merge branch 'private-permission-active2' into develop 2016-10-19 05:25:25 +02:00
Martin Edenhofer
ad85f98886 Cleanup of migrations. 2016-10-19 05:20:00 +02:00
Martin Edenhofer
d7a44c940f Updated new repo location. 2016-10-19 05:14:44 +02:00
Martin Edenhofer
c71b0d36d4 Updated copyright. 2016-10-19 05:11:36 +02:00
Martin Edenhofer
32a8823d4c Fixed zammad-api-php client. 2016-10-18 23:08:54 +02:00
Martin Edenhofer
d193d66ec2 Removed logo. 2016-10-18 22:26:58 +02:00
Martin Edenhofer
6e185a95f6 Moved to new git url for php client. 2016-10-18 22:25:43 +02:00
Martin Edenhofer
b2d2b047d9 Added cleanup. 2016-10-18 21:52:51 +02:00
Martin Edenhofer
330a38925c Merge branch 'private-permission-active' into private-permission-active2
# Conflicts:
#	app/assets/javascripts/app/models/user.coffee
2016-10-18 19:25:29 +02:00
Martin Edenhofer
b937ef9371 Improved error handling. 2016-10-18 18:28:38 +02:00
Martin Edenhofer
19d57cf21d Improved memory management, moved to findNative(). Use own event sub system. 2016-10-16 22:52:50 +02:00
Martin Edenhofer
c85ff7b775 Performance improvements. 2016-10-16 20:35:55 +02:00
Martin Edenhofer
a1dd76ffd6 Fixed overflow of event binding (because super was to late). 2016-10-15 21:29:45 +02:00
Martin Edenhofer
d092db4cd8 Improved memory management. 2016-10-15 21:21:44 +02:00
Martin Edenhofer
f5de9086b7 Since 2016-10-15 a redirect to a signup page has been implemented. 2016-10-15 04:31:15 +02:00
Martin Edenhofer
dfdfb15d43 Performance improvements (moved from interval to on demand). 2016-10-15 03:30:14 +02:00
Martin Edenhofer
19e65367c0 Disable "create ticket" for now. 2016-10-15 02:38:39 +02:00
Martin Edenhofer
d9041fa799 Fixed issue #207 - only match \Wword\W, add matching word in user location to confirm dialog (to make sure what word is matching). 2016-10-15 02:38:08 +02:00
Martin Edenhofer
baf54aaf8d Fixed twitter reply issue with multiple recipients. 2016-10-15 01:54:40 +02:00
Martin Edenhofer
214adfb450 Rerender on global rerender event. 2016-10-15 01:10:35 +02:00
Martin Edenhofer
33f92cc338 Improved welcome text. 2016-10-15 01:04:09 +02:00
Martin Edenhofer
1167a4575e Fixed issue with target.toggleClass('is-hovered') if in the meantime the navigation bar is re-rendered and .is-hovered git lost. 2016-10-15 01:02:20 +02:00
Felix Niklas
f64c13e13f Icons
- fix arrow up, arrow down and line-right-arrow
2016-10-11 14:01:47 +02:00
Felix Niklas
fc13eed733 Icons
- sketch update to version 40.2
2016-10-11 14:01:29 +02:00
Martin Edenhofer
9bf5bc4e66 Added form css prefix support. 2016-10-10 23:51:40 +02:00
Martin Edenhofer
57a7e25cf1 Added support for admin form preview also for admins if feature is disabled. 2016-10-06 21:01:48 +02:00
Martin Edenhofer
0c4bf9f5ca Fixed test, in case of web form, use also email in from to be able to reply. 2016-10-06 19:34:35 +02:00
Martin Edenhofer
36fd9d20b9 Merge branch 'develop' of github.com:martini/zammad into develop 2016-10-06 19:11:56 +02:00
Martin Edenhofer
1794b98362 In case of web form, use also email in from to be able to reply. 2016-10-06 19:01:28 +02:00
Martin Edenhofer
03fed96634 Do not log preferences changes in history. 2016-10-06 19:00:07 +02:00
Martin Edenhofer
c5302307c9 Fixed typo. 2016-10-06 18:59:40 +02:00
Martin Edenhofer
e4a3420463 Improved doc. 2016-10-06 18:59:23 +02:00
Martin Edenhofer
9a7fd2b1b3 Added is-hover to keyboard based navigation in tables. 2016-10-06 18:59:02 +02:00
Martin Edenhofer
17aa02ec7f Improved error handling. 2016-10-06 18:58:28 +02:00
Martin Edenhofer
ed1897de90 Also observer vip (to show/hide vip flag). 2016-10-06 18:57:54 +02:00
Martin Edenhofer
b1a90e03ba Code cleanup. 2016-10-06 18:57:26 +02:00
Martin Edenhofer
e7ca5cbbaf Updated doc. 2016-10-06 18:57:04 +02:00
Martin Edenhofer
941b4e5379 Added preview do admin interface for form config. 2016-10-06 18:56:10 +02:00
Felix Niklas
46ff5ae572 Icons
- rename mood-super-bad to mood-superbad for consistency
2016-10-04 10:51:50 +02:00
Felix Niklas
4e419a9dc9 Viewport: use base width of 1024 2016-09-30 16:44:25 +02:00
Martin Edenhofer
7ae82024ad Removed not used rss backend. 2016-09-29 21:15:13 +02:00
Martin Edenhofer
146bd7f9d4 Moved from User.update_default_preferences_by_role to User.update_default_preferences_by_permission (if somebody has renamed role names). 2016-09-29 13:35:42 +02:00
Martin Edenhofer
28fe4fa80b Update user with default preferences based on permissions. 2016-09-29 13:25:20 +02:00
Martin Edenhofer
8612c1a019 Only execute collection lookup via App.Model.subscribe min. callback exists. 2016-09-29 10:04:11 +02:00
Martin Edenhofer
f673c7028a Fixed not shown history. 2016-09-28 20:06:28 +02:00
Martin Edenhofer
08bacb77d9 Moved to naive sort order of ticket attributes. 2016-09-28 15:22:29 +02:00
Martin Edenhofer
da2ce8e1b4 Streamline of attribute selection for overviews. 2016-09-28 14:12:28 +02:00
Martin Edenhofer
a83d0bc819 Send assets and ticket list in one message. 2016-09-28 00:05:46 +02:00
Martin Edenhofer
5934207f82 Fixed syntax error. 2016-09-27 23:57:49 +02:00
Martin Edenhofer
0d377d40ab Improved memory usage. 2016-09-27 23:15:27 +02:00
Martin Edenhofer
6b81b791ed Detach not shown task to deduce dom nodes and increase speed. 2016-09-27 19:46:23 +02:00
Martin Edenhofer
41d551ed25 Added zammad_api_client_php test job. 2016-09-23 01:12:05 +02:00
Martin Edenhofer
dc7354223a Added permission.active attribute to disable features. 2016-09-22 21:05:29 +02:00
Martin Edenhofer
d8913eec6d Fixed random order of objects in index controller, added order_by id. 2016-09-21 19:42:47 +02:00
Martin Edenhofer
3280a2c5e1 Increased template size to 10mb to also store inline images in there. 2016-09-21 19:38:32 +02:00
Martin Edenhofer
63e543dfd4 Adde popover preview of linked tickets. 2016-09-19 07:36:22 +02:00
Martin Edenhofer
739d5bc640 Merge branch 'private-ticket-renaming' into develop 2016-09-15 01:34:28 +02:00
Martin Edenhofer
ba684348ef Improved user validation. 2016-09-15 00:56:04 +02:00
Martin Edenhofer
f5aedbf49b Lookup on both, email and login. 2016-09-15 00:52:04 +02:00
Martin Edenhofer
33b1696bd1 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-09-14 22:49:17 +02:00
Martin Edenhofer
e2f2830a19 Fixed quoting if @AddressLine eco helper. 2016-09-14 22:47:56 +02:00
Rolf Schmidt
b32a2da2ca Improved display of preview for ultra large monitors. 2016-09-14 15:06:38 +02:00
Martin Edenhofer
6df110112d Added integrations. 2016-09-14 14:15:50 +02:00
Martin Edenhofer
4f08d899cf Added per_page limit to 500 (excepting tickets with 100). Added page/per_page support for search actions. 2016-09-14 09:21:17 +02:00
Martin Edenhofer
a4874e0b86 Renamed certain ticket attributes with timestamps from _time to _at to have it more rails consistent. 2016-09-14 09:15:30 +02:00
Thorsten Eckel
5e36baf709 Merge branch 'private-otrs_import_df' into develop 2016-09-13 12:06:29 +02:00
Thorsten Eckel
4e81bcd90e Removed count check in favour of regular array diff. 2016-09-13 11:39:08 +02:00
Thorsten Eckel
b797fd6d30 Added import of OTRS DynamicFields into Zammads ObjectManager attributes. 2016-09-13 10:53:16 +02:00
Martin Edenhofer
80dff2e07e Updated gems. 2016-09-13 00:15:30 +02:00
Martin Edenhofer
6adae4ed6b Improved tag widget. 2016-09-13 00:14:10 +02:00
Martin Edenhofer
f0c4c2f68a Disable because of missing server event modules. 2016-09-13 00:11:20 +02:00
Martin Edenhofer
b198454b87 Compare timestamp for refreshing tickets. 2016-09-12 08:57:18 +02:00
Martin Edenhofer
6b38b6c4ec Add millisecond support for timestamp in mysql. 2016-09-12 08:56:14 +02:00
Martin Edenhofer
d467605763 Fixed ff issues. 2016-09-12 08:53:25 +02:00
Martin Edenhofer
a5b33a0e32 Improved order. 2016-09-12 08:52:01 +02:00
Martin Edenhofer
19cb76bb12 Prevent multiple rendering. 2016-09-11 16:02:15 +02:00
Martin Edenhofer
043c9731a5 Improved test. 2016-09-11 15:41:39 +02:00
Martin Edenhofer
50c1633124 Improved user/org search. 2016-09-11 15:24:10 +02:00
Martin Edenhofer
ef7a8a3277 Fixed race condition. 2016-09-11 10:47:44 +02:00
Martin Edenhofer
c28c8514c4 Improved ticket search. 2016-09-11 10:46:01 +02:00
Martin Edenhofer
2bb247f6e9 Moved to es 2.4. 2016-09-10 16:48:10 +02:00
Martin Edenhofer
9a2a4d5e6a Removed build badged. 2016-09-10 16:47:48 +02:00
Martin Edenhofer
5fc8e6c510 Added elasticsearch 2.4 support. 2016-09-09 23:10:27 +02:00
Martin Edenhofer
0fbb5f8ec6 Only use web socket channel if web socket connection is already established. 2016-09-09 13:32:03 +02:00
Martin Edenhofer
ec55c81302 Improved error codes on model validation. 2016-09-09 13:29:33 +02:00
Martin Edenhofer
eceb9889b1 Added database locking to prevent race conditions. 2016-09-08 21:18:26 +02:00
Martin Edenhofer
18cc4af6b8 Check admin role only once. 2016-09-08 08:45:57 +02:00
Martin Edenhofer
9b352f20e6 Only check email based avatar if email has changed. 2016-09-08 08:45:28 +02:00
Martin Edenhofer
80084c5518 More robust, even if it takes longer. 2016-09-08 08:44:40 +02:00
Martin Edenhofer
88487ca3d9 Fetch tickets after new ws connection has been established. 2016-09-08 08:41:04 +02:00
Martin Edenhofer
82188f5024 Minimisece race condition. 2016-09-08 08:39:04 +02:00
Martin Edenhofer
88b6312a22 Merge branch 'private-term-to-query' into develop 2016-09-07 19:51:34 +02:00
Thorsten Eckel
2ae3a726fc Added deployment of archives. 2016-09-07 15:30:57 +02:00
Martin Edenhofer
325e0b4ddd Renamed term to query for searches. 2016-09-07 10:39:06 +02:00
Martin Edenhofer
02e39e092d Fixed file name. 2016-09-07 08:58:13 +02:00
Martin Edenhofer
e890bc552d Added cleanup file. 2016-09-07 08:49:52 +02:00
Martin Edenhofer
62afe503e2 Removed not longer needed files. 2016-09-07 08:48:06 +02:00
Martin Edenhofer
e5999fe71d Added role management. 2016-09-07 08:47:31 +02:00
Martin Edenhofer
b61068a13a Filename cleanup. 2016-09-06 20:53:20 +02:00
Martin Edenhofer
022cceaf60 Improved web socket port detection (added support for window.location.port). 2016-09-06 15:56:36 +02:00
Martin Edenhofer
be67419379 Squashed commit of the following:
commit c8f7c2c2c489708c16e4eef584f45995576e2ce8
Author: Martin Edenhofer <me@edenhofer.de>
Date:   Mon Sep 5 23:23:21 2016 +0200

    Introduced Transaction.execute.
2016-09-06 07:51:12 +02:00
Martin Edenhofer
703ccd150f Renaming and split of test files. 2016-09-05 15:18:22 +02:00
Martin Edenhofer
c8a475f356 Do updated_at lookup in callback (minimise race condition time). 2016-09-05 12:03:17 +02:00
Martin Edenhofer
d539f03db3 Improved loadAssets, just execute if we have assets to load (ignore empty lists). 2016-09-05 12:00:35 +02:00
Martin Edenhofer
71a2a26ea8 Improved ticket update (take response and show changes without additional ajax request). 2016-09-04 23:24:19 +02:00
Martin Edenhofer
d5c8fa3348 Merge branch 'develop' of git.znuny.com:zammad/zammad into develop 2016-09-02 13:16:36 +02:00
Martin Edenhofer
068e445fb7 Introduced fetchMayBe to avoid race conditions. 2016-09-02 13:07:57 +02:00
Martin Edenhofer
2e1ebf0c6f Fixed new article creation on customer change. 2016-09-02 13:07:20 +02:00
Martin Edenhofer
3caaad2f7f Moved escalation calculation from after_create/after_update to before_create/before_update to have only one ticket save action. 2016-09-02 12:54:13 +02:00
Martin Edenhofer
f5beac8e08 Code cleanup. 2016-09-01 00:33:15 +02:00
Martin Edenhofer
af1aa0874d Added try/catch block to handle exceptions if widgets. 2016-08-31 23:18:34 +02:00
Martin Edenhofer
8fd97df19a Added try/catch block to handle exceptions. 2016-08-31 23:12:52 +02:00
Martin Edenhofer
ffac7a7489 Test 5. 2016-08-31 22:34:48 +02:00
Martin Edenhofer
63244c6c18 Test 4. 2016-08-31 20:44:51 +02:00
Martin Edenhofer
ad19a2e5e5 Test 3. 2016-08-31 20:12:34 +02:00
Martin Edenhofer
23f7fb2b1d Improved error handling (try/catch). 2016-08-31 19:06:32 +02:00
Martin Edenhofer
f9c941a186 Improved test. 2016-08-31 18:18:55 +02:00
Martin Edenhofer
73bded92f7 Fixed article.from of twitter articles. 2016-08-31 18:17:08 +02:00
Martin Edenhofer
c1a46b863c Revert "Test 1."
This reverts commit 2072ac7c9b.
2016-08-31 16:39:56 +02:00
Martin Edenhofer
894f3c4dd1 Test 2. 2016-08-31 14:24:36 +02:00
Martin Edenhofer
2072ac7c9b Test 1. 2016-08-31 13:46:56 +02:00
Martin Edenhofer
c8230207ef Improved memory usage by using pluck. 2016-08-31 09:10:25 +02:00
Thorsten Eckel
fa4e953423 Added token attributes last_used_at and expires_at. 2016-08-30 16:26:42 +02:00
Martin Edenhofer
105fca030d Return user only once. 2016-08-30 15:01:51 +02:00
Thorsten Eckel
ef3b018293 Make use of Gemfile groups to avoid changes to Gemfile.lock after 'bundle install'. 2016-08-30 12:00:04 +02:00
Martin Edenhofer
0e5724ca0b Just rerender ticket stats if user change was pushed from server. 2016-08-27 11:43:15 +02:00
Martin Edenhofer
89fd6f9e90 Fixed permission name. 2016-08-26 22:45:51 +02:00
Martin Edenhofer
ed99958d39 Improved keep_certain_attributes check. 2016-08-26 17:08:49 +02:00
Martin Edenhofer
944d9034d1 Improved tests. 2016-08-26 16:19:07 +02:00
Martin Edenhofer
53278e3744 Fixed tests. 2016-08-26 14:46:14 +02:00
Martin Edenhofer
6bd5ae6471 Added permission based/permission check setting api. 2016-08-26 12:06:27 +02:00
Martin Edenhofer
00f9c47839 Added test for automatically customer creation via guess:new_customer@example.com as customer_id. 2016-08-26 10:30:37 +02:00
Martin Edenhofer
7dad383c07 Removed not needed check. 2016-08-25 15:14:24 +02:00
Martin Edenhofer
7bec04cfbd Differ between server side change and delete (trigger local remove -not change- of object was deleted on server side). 2016-08-25 09:18:12 +02:00
Martin Edenhofer
dfd2b1893b Code cleanup. 2016-08-25 01:13:05 +02:00
Martin Edenhofer
e3f23d16eb Improved error handling. 2016-08-25 01:12:17 +02:00
Martin Edenhofer
aa8f0f5255 Make order of articles fix by using order(). 2016-08-24 20:58:00 +02:00
Martin Edenhofer
2f6eb168a2 Overwrite article from based on current user. 2016-08-24 20:29:56 +02:00
Martin Edenhofer
2078a079cd Improved validation messages of controllers. 2016-08-24 13:42:22 +02:00
Martin Edenhofer
828cdd0347 Extended Fixum class with empty? to have an easier content validation. 2016-08-23 21:45:39 +02:00
Martin Edenhofer
8f8bfb60b8 Added mysql error regex to get human error message. 2016-08-23 21:39:21 +02:00
Martin Edenhofer
2820639c42 Improved validation messages of controllers. 2016-08-23 20:46:04 +02:00
Martin Edenhofer
14e1b5a404 Fixed wrong variable use. 2016-08-23 12:54:29 +02:00
Martin Edenhofer
9edcf47edb Also detect gmail vacation emails based on "vacation" in subject. Fixes issue#193. 2016-08-23 11:50:36 +02:00
Martin Edenhofer
9797dbb1d4 Fixed issue#190 - differ between ticket customer and the user who sends the email. 2016-08-23 11:49:12 +02:00
Martin Edenhofer
4319023ad1 Referencing to issue #178, automatically add links to ticket on ticket split. 2016-08-23 09:47:06 +02:00
Martin Edenhofer
42b45e50c1 Reduced complexity (not needed code). 2016-08-23 08:35:23 +02:00
Martin Edenhofer
e4a731dcad Improved detection to auto responder. Just skip sender (but not other recipients) of trigger notification it auto responder was used. 2016-08-23 08:34:15 +02:00
Martin Edenhofer
5f03f54b20 Remove triggers (to have no side effects later). 2016-08-23 07:56:23 +02:00
Martin Edenhofer
37302ca438 Fixed correct argument order for pending_minutes(). 2016-08-22 12:22:10 +02:00
Rolf Schmidt
99801ee7b0 Tidied. 2016-08-22 11:52:59 +02:00
Rolf Schmidt
c552a21c6c Revert "Revert "Improved history get calls for performance (#192).""
This reverts commit 0d328e12e5.
2016-08-22 11:49:35 +02:00
Rolf Schmidt
0d328e12e5 Revert "Improved history get calls for performance (#192)."
This reverts commit 9e458956c7.
2016-08-22 11:47:18 +02:00
Rolf Schmidt
9e458956c7 Improved history get calls for performance (#192). 2016-08-22 11:22:36 +02:00
Martin Edenhofer
6655485649 Update sender name if not exists. 2016-08-22 10:51:08 +02:00
Martin Edenhofer
91ab4aef64 Fixed sender identification. 2016-08-22 10:06:33 +02:00
Martin Edenhofer
733ca5e005 Moved to extra script to sync github repo. 2016-08-21 21:33:09 +02:00
Martin Edenhofer
9cbd5de78c Improved github as mirror. 2016-08-21 17:17:08 +02:00
Martin Edenhofer
61b7451d1d Improved github as mirror. 2016-08-21 17:14:33 +02:00
Martin Edenhofer
4c041f5251 Improved github as mirror. 2016-08-21 17:12:34 +02:00
Martin Edenhofer
d4918c3b67 Added github as mirror. 2016-08-21 16:55:51 +02:00
Martin Edenhofer
774dc82bf6 Do not generat auto replys. 2016-08-21 02:17:26 +02:00
Martin Edenhofer
42fea8bc1f Fixed group default selection of existing users. 2016-08-21 01:35:33 +02:00
Martin Edenhofer
ea9c5a12b8 Improved token create dialog. 2016-08-21 01:34:05 +02:00
Martin Edenhofer
b3b060e561 Moved to app confirm dialog. 2016-08-21 00:27:39 +02:00
Martin Edenhofer
7d052439bb Improved tests for ticket creation by agent oder system email address via postmaster. 2016-08-20 23:50:33 +02:00
Martin Edenhofer
4628299d20 Introduced config.interface_handle to find out via which interface the source code got executed. 2016-08-20 21:29:22 +02:00
Martin Edenhofer
e2eef259b4 Added feature to create a ticket without existing customer, just enter email address in customer search field. 2016-08-19 13:57:13 +02:00
Martin Edenhofer
b7c0ddb90f Prevent user_ids lookup for role assets (not needed in frontend - Customer role will have almost any user id in it). 2016-08-19 13:02:34 +02:00
Martin Edenhofer
ba4567d813 Removed debugging. 2016-08-19 12:48:11 +02:00
Martin Edenhofer
19dc568355 Added check if sender is system address (show sender as agent in ticket zoom). 2016-08-19 11:15:19 +02:00
Martin Edenhofer
0b244d00cb Do follow up detection also with references header and comparing subject per default. 2016-08-19 11:14:15 +02:00
Martin Edenhofer
136713c45f Added check if sender is system address (show sender as agent in ticket zoom). 2016-08-19 11:07:53 +02:00
Martin Edenhofer
d3285340e8 Added cache to attributes_with_associations. 2016-08-18 23:43:07 +02:00
Martin Edenhofer
8a36fac9fd Improved style of assets backends. 2016-08-18 23:34:13 +02:00
Martin Edenhofer
08782ec52e Only mark device as current if device got touched within last 30 minutes. 2016-08-18 09:45:26 +02:00
Martin Edenhofer
eb8144b28b Fixed current user selection of user devices to disable it in web interface. 2016-08-18 07:26:07 +02:00
Martin Edenhofer
3ea96e6f84 Added permission config support for permanent tasks. 2016-08-18 07:24:58 +02:00
Martin Edenhofer
eeebb2709d Updated geo location ref. 2016-08-18 00:45:16 +02:00
Martin Edenhofer
69e8cb1769 Fixed migration. 2016-08-18 00:40:12 +02:00
Martin Edenhofer
bf8c670b8f Reduced amount of config settings for public interface calls. 2016-08-18 00:37:06 +02:00
Martin Edenhofer
af6e665ea7 Updated geo location ref. 2016-08-18 00:29:09 +02:00
Martin Edenhofer
3a6ebc253b Fixed ff - timing/event issue on unfocused windows. 2016-08-17 15:49:26 +02:00
Martin Edenhofer
902d9a0151 Removed debug. 2016-08-17 13:51:09 +02:00
Martin Edenhofer
077da33d79 Moved to new permission concept. 2016-08-17 13:48:11 +02:00
Martin Edenhofer
989d1bdda4 Applied rubocop. 2016-08-17 13:26:41 +02:00
Martin Edenhofer
c6eaa84487 Added multi permission check to Token.check. 2016-08-17 13:24:51 +02:00
Rolf Schmidt
cefaf34245 Fixed migration for mysql. 2016-08-17 09:59:35 +02:00
Thorsten Eckel
1654c678f1 Fixed 'Mysql2::Error: Specified key was too long; max key length is 767 bytes: CREATE INDEX ON ()'. 2016-08-17 09:38:04 +02:00
Martin Edenhofer
08ea4b2f3d Updated gems. 2016-08-17 09:15:00 +02:00
Martin Edenhofer
f30a53b042 Improved migrations. 2016-08-16 10:29:31 +02:00
Martin Edenhofer
ffdc782e18 Added api admin. 2016-08-16 10:19:06 +02:00
Martin Edenhofer
730c900ee5 Fixed personal token tests. 2016-08-16 10:17:40 +02:00
Martin Edenhofer
731c237d0c Improved permission check of personal tokens. 2016-08-16 10:00:44 +02:00
Martin Edenhofer
e7960ab03b Init version of permission management of personal tokens. 2016-08-16 09:09:09 +02:00
Martin Edenhofer
3bf32d51e4 Improved test. 2016-08-16 08:31:54 +02:00
Martin Edenhofer
a9fe4310c5 Fixed datatype. 2016-08-16 02:14:36 +02:00
Martin Edenhofer
e5af892abb Added integration browser tests. 2016-08-16 02:10:41 +02:00
Martin Edenhofer
8d1a90acde Streamline of wording. 2016-08-15 22:39:26 +02:00
Martin Edenhofer
d5012a296d Fixed password reset. 2016-08-15 22:15:11 +02:00
Martin Edenhofer
172fc00155 Added controller to product_logo setting. 2016-08-15 19:55:13 +02:00
Martin Edenhofer
19802f88a2 Improved external user auth config. Fixed browser tests. 2016-08-15 19:48:35 +02:00
Martin Edenhofer
f643acfa94 Fixed default customer permissions. 2016-08-13 01:01:29 +02:00
Martin Edenhofer
2f2121d794 Fixed store of task state. 2016-08-13 00:59:21 +02:00
Martin Edenhofer
46aeca2bdc Fixed user search. 2016-08-13 00:40:46 +02:00
Martin Edenhofer
5586abfbed Fixed getting started. 2016-08-13 00:00:37 +02:00
Martin Edenhofer
825df71df1 Fixed controller tests. 2016-08-12 19:58:02 +02:00
Martin Edenhofer
1a6a6b84a3 Moved from to new permission management. 2016-08-12 19:02:26 +02:00
Martin Edenhofer
6baa11b54a Fixed mysql text/blob issue. 2016-08-12 18:57:21 +02:00
Martin Edenhofer
cf8a032c77 Upgrade to rails 4.2.7.1 because of actionview, 4.2.7, Advisory: CVE-2016-6316. 2016-08-12 18:51:10 +02:00
Martin Edenhofer
81b48a2ef4 Moved from to new permission management. 2016-08-12 18:39:09 +02:00
Martin Edenhofer
1d8b44c9a6 Fixed print of boolean's. 2016-08-11 15:43:55 +02:00
Martin Edenhofer
cd92cdbca7 Do not apply column width changes on not table_id tables. 2016-08-11 15:35:49 +02:00
Martin Edenhofer
8a045651ce Fixed lost translation if translation mode got switched before blur. 2016-08-11 01:54:17 +02:00
Martin Edenhofer
648d815007 Updated gems. 2016-08-11 01:52:54 +02:00
Martin Edenhofer
a79cfaf081 Updated gems. 2016-08-03 21:25:00 +02:00
Martin Edenhofer
3215f64511 Fixed not shown modified marker before select box. 2016-08-03 01:25:16 +02:00
Martin Edenhofer
3ffdce39b4 Increase target/source limit from 255 to 500. 2016-08-02 17:23:20 +02:00
Rolf Schmidt
457cd68735 Revert "Fixed #189 - Increase data size of tanslation strings."
This reverts commit 33c60a553d.
2016-08-02 15:06:26 +02:00
Rolf Schmidt
33c60a553d Fixed #189 - Increase data size of tanslation strings. 2016-08-02 15:05:57 +02:00
Rolf Schmidt
49b660d84f Fixed #189 - Increase data size of tanslation strings. 2016-08-02 15:01:29 +02:00
Rolf Schmidt
f710c033c1 Fixed issue #188 - Escalation calculation wrong for reopened tickets. 2016-08-02 14:12:24 +02:00
Martin Edenhofer
75433beb6c Follow up fix for new disabled cookies with token auth. 2016-08-01 23:04:24 +02:00
Martin Edenhofer
5ad0d7a254 Cleanup. 2016-08-01 02:06:18 +02:00
Martin Edenhofer
3d81d6d600 Disabled session cookies for basic auth and token access. Added X-Failure header for failed login information. 2016-08-01 01:30:25 +02:00
Martin Edenhofer
f83c65bcb4 Increase refresh interval to 62 sec. 2016-07-29 00:12:03 +02:00
Martin Edenhofer
cdb0b7cc16 Disable valid permanent tokens if user is inactive. 2016-07-28 14:43:31 +02:00
Martin Edenhofer
b4e841f4fc Switch back to en at last to continue with testing. 2016-07-28 13:00:35 +02:00
Martin Edenhofer
e200378dd6 Added api setting to admin interface and tokens to user preferences. 2016-07-28 12:09:32 +02:00
Martin Edenhofer
42d0cd1f8f Updated gems. 2016-07-27 00:02:28 +02:00
Martin Edenhofer
345b988444 Improved job name. 2016-07-25 23:00:11 +02:00
Martin Edenhofer
dd1a9be0d6 Moved auto wizard tests to integration because of online service dependencies. 2016-07-25 22:57:37 +02:00
Martin Edenhofer
645e421daf Improved auto wizard test. 2016-07-25 22:29:10 +02:00
Martin Edenhofer
1b907f0d73 Added autoload of text modules. 2016-07-25 22:13:38 +02:00
Martin Edenhofer
e04f9ee74d Cleanup. 2016-07-25 22:09:21 +02:00
Martin Edenhofer
99b1977a11 Fixed color picker in chat admin. 2016-07-22 10:13:56 +02:00
Martin Edenhofer
8d28be378a Increased size for business_hours. 2016-07-19 22:15:49 +02:00
Martin Edenhofer
7e8581909e Fixed "PG::NotNullViolation: ERROR: null value in column "content_type" violates not-null constraint" for mails with non text/* alternative content. 2016-07-19 15:19:22 +02:00
Martin Edenhofer
2cb49f11bf Fixed typo. 2016-07-18 15:49:31 +02:00
Martin Edenhofer
b0273f74a7 Improved browser test. 2016-07-18 13:31:58 +02:00
Martin Edenhofer
da89815568 Merged migrations. 2016-07-18 13:31:22 +02:00
Martin Edenhofer
ed0f858566 Increased size channels.options column (fixed datatype). 2016-07-18 10:03:46 +02:00
Martin Edenhofer
dfb56eebaa Increased size channels.options column. 2016-07-18 09:59:56 +02:00
Martin Edenhofer
3b377bc04b Handle new page rate limit. 2016-07-18 09:37:43 +02:00
Martin Edenhofer
39479171a7 Moved to new syntax. 2016-07-18 01:25:16 +02:00
Martin Edenhofer
b6f7858dd5 Added ruby 2.3 support (RuntimeError: can't modify frozen String). 2016-07-18 01:24:53 +02:00
Martin Edenhofer
e074556d06 Moved to new syntax. 2016-07-18 01:05:40 +02:00
Martin Edenhofer
3317d72bc9 Upgrade to ruby 2.3.1 and rails 4.2.7. 2016-07-18 00:43:02 +02:00
Martin Edenhofer
5e28c50703 Updated gems. 2016-07-17 00:33:43 +02:00
Martin Edenhofer
5bbb249240 Added example trigger. Re-assigned ticket_subject_size and ticket_subject_re in admin interface. 2016-07-17 00:18:08 +02:00
Martin Edenhofer
e2bb6cce56 Added has changed filter to triggers. 2016-07-16 23:43:08 +02:00
Martin Edenhofer
0da7a322f9 Reduced count of latest karma changes. 2016-07-14 19:24:56 +02:00
Martin Edenhofer
f807b03e74 Added auto cleanup on untouched open tasks if more the 30 are open. 2016-07-14 19:24:13 +02:00
Martin Edenhofer
cd96a95b68 Closes #167 - reattach of same attachment was not possible because not change was triggered. 2016-07-14 10:32:02 +02:00
Martin Edenhofer
6ab787e7dc Fixed "task has changed without changes" for customers. 2016-07-13 16:39:12 +02:00
Martin Edenhofer
db22adfd3c Removed obsolet code. 2016-07-13 10:40:03 +02:00
Martin Edenhofer
eb9bb6b0fa Mark notes as internal per default (to clarify updates sent to customer). 2016-07-12 12:01:02 +02:00
Martin Edenhofer
8f5d9063a4 Ignore article created by system. 2016-07-12 11:00:32 +02:00
Martin Edenhofer
ede47d509d Revert "Fixed shutdown of failed jobs."
This reverts commit 9f8b8d3160.
2016-07-12 10:40:44 +02:00
Martin Edenhofer
2427677f83 Added some order to queries (for postgresql). 2016-07-12 10:19:28 +02:00
Martin Edenhofer
9f8b8d3160 Fixed shutdown of failed jobs. 2016-07-12 09:06:22 +02:00
Martin Edenhofer
407c020014 Improved tests. 2016-07-12 01:45:46 +02:00
Martin Edenhofer
ef06ae771e Improved tests. 2016-07-12 01:35:30 +02:00
Martin Edenhofer
acc71eeb23 Improved tests. 2016-07-12 01:32:20 +02:00
Martin Edenhofer
c0628a93ef Improved cleanup. 2016-07-12 01:30:44 +02:00
Martin Edenhofer
7efa4b0d29 Do not allow karma scores below 0. 2016-07-11 17:12:12 +02:00
Martin Edenhofer
61fd93ea78 Init version of zammad karma. 2016-07-11 00:48:46 +02:00
Martin Edenhofer
8db9723042 Init version of zammad karma. 2016-07-11 00:47:21 +02:00
Martin Edenhofer
05cf8c208a Improved shown search result of extended search. 2016-07-08 01:34:21 +02:00
Martin Edenhofer
80a9fd5dab Spliced searches to separate call to handle limit issue (only usable for one query/request). 2016-07-08 01:22:09 +02:00
Martin Edenhofer
96fd35d1dd Added tolerance for failed item.search_index_update_backend call. 2016-07-08 01:20:25 +02:00
Martin Edenhofer
776a3cd929 Removed debug info. 2016-07-07 19:13:18 +02:00
Martin Edenhofer
4e01b0c229 Reducred render() count on ui:rerender (e. g. language change). 2016-07-07 18:32:26 +02:00
Felix Niklas
2894764697 fix task modified icon position broken #185 2016-07-07 15:14:28 +02:00
Martin Edenhofer
7cfb800ab0 Gmail issues, disable temporally. 2016-07-07 12:30:52 +02:00
Martin Edenhofer
754a46db78 Improved tests. 2016-07-07 11:37:43 +02:00
Martin Edenhofer
13f06c64b6 Improved some small features for extended search. 2016-07-07 07:45:32 +02:00
Martin Edenhofer
0402ad4c74 Applied rubocop. 2016-07-07 07:16:13 +02:00
Martin Edenhofer
ccba88e775 Prevent scrolling in content if arrow up/down ist used to navigate online notifications. 2016-07-07 07:11:02 +02:00
Martin Edenhofer
552988f514 Fixed saving query on task state. 2016-07-07 07:09:48 +02:00
Martin Edenhofer
7f1ecaa67e Refactoring search index backend. 2016-07-06 08:13:44 +02:00
Martin Edenhofer
f6d0fb3596 Fixed browser test. 2016-07-05 22:38:39 +02:00
Martin Edenhofer
5ccde0c6f1 Improved some small features for extended search. 2016-07-05 22:05:29 +02:00
Felix Niklas
613cc7ef20 search: style search detail, add detail link 2016-07-05 17:06:00 +02:00
Felix Niklas
d002da8a64 customer chat: hide scroll-hint when scrolled to bottom 2016-07-05 13:01:25 +02:00
Felix Niklas
b7a2ba06f1 chat client: port scroll-hint from customer chat 2016-07-05 13:00:49 +02:00
Felix Niklas
21224200b4 chat: make writing bubbles smaller 2016-07-05 13:00:21 +02:00
Felix Niklas
806e7548a1 customer chat: add translation 2016-07-05 12:59:51 +02:00
Felix Niklas
08e410802d customer chat: compensate scroll on showScrollHint 2016-07-04 16:34:59 +02:00
Felix Niklas
b403a621a3 customer chat: only show hint on new message 2016-07-04 16:29:42 +02:00
Felix Niklas
74b9e60ad6 customer chat: add scroll snap tolerance 2016-07-04 16:20:59 +02:00
Felix Niklas
f62796ab9e customer chat: add scrollhint 2016-07-04 15:59:12 +02:00
Martin Edenhofer
30fe8aef36 Applied rubocop. 2016-06-30 22:04:48 +02:00
Martin Edenhofer
c52ee90747 Updated gems. 2016-06-30 21:55:27 +02:00
Martin Edenhofer
bb2443b616 Fixed shutdown of app server. 2016-06-30 19:05:57 +02:00
Martin Edenhofer
989825d1d5 Install bundle of api_client_ruby first. 2016-06-30 17:19:12 +02:00
Martin Edenhofer
85eaa59b61 Corrected stage for ruby api client job. 2016-06-30 16:58:44 +02:00
Martin Edenhofer
0d415ec989 Set correct job order. 2016-06-30 16:56:45 +02:00
Martin Edenhofer
4413808d93 Added zammad_api_client_ruby ci job. 2016-06-30 16:52:06 +02:00
Martin Edenhofer
fa051a2c75 Fixed line detection. 2016-06-30 13:37:13 +02:00
Martin Edenhofer
c8f329d9c0 Moved from 1000 per default per_page to 500 per default per_page for pagination. 2016-06-30 11:57:07 +02:00
Martin Edenhofer
8d71977e0f Improved api for signature detection of article. 2016-06-30 11:53:13 +02:00
Martin Edenhofer
0ee32d3104 Fixed shown "see more" if total height is higher the max height and maker is within max height. 2016-06-30 11:52:33 +02:00
Martin Edenhofer
9fe709f9b7 Improved error handling for json requests. 2016-06-30 10:24:03 +02:00
Martin Edenhofer
977c05204c Fixed signature insert. 2016-06-30 07:29:53 +02:00
Martin Edenhofer
ae7babcb81 Fixed signature insert. 2016-06-30 01:27:03 +02:00
Martin Edenhofer
df232e0024 Prevent spamming of div data-signature elements by surrounding element with an neutral element. 2016-06-29 16:38:07 +02:00
Martin Edenhofer
2fc1d569c3 Fixed not shown activity description on empty entries. 2016-06-29 16:11:28 +02:00
Martin Edenhofer
ad8eedfd15 Improved signature detection. Use only the first 10 lines of a detected signature. 2016-06-29 15:07:08 +02:00
Martin Edenhofer
5ed7359d60 Improved scrolling behaviour if article id is given in url. 2016-06-29 14:48:38 +02:00
Martin Edenhofer
bff5dbb370 Removed debug and only scroll to article on initial open. 2016-06-29 11:49:42 +02:00
Martin Edenhofer
5dd9f4916d Added article keyboard navigator. 2016-06-28 23:37:59 +02:00
Martin Edenhofer
2e6f908c91 Enabled signature detection for html emails. 2016-06-28 23:08:40 +02:00
Martin Edenhofer
49f328107f Fixed typo. 2016-06-28 22:51:58 +02:00
Martin Edenhofer
ca141bbb9b Enabled signature detection for html emails. 2016-06-28 22:49:38 +02:00
Martin Edenhofer
a88e6b03b3 Fixed#184 - prevent chat window from jumping whiling reading without new message, just with shown/hidden typing indicator. 2016-06-28 11:34:57 +02:00
Martin Edenhofer
47d63aa7b3 Disabled css rule because of chrome51 issue (copy to much in clipboard), see issue#183. 2016-06-28 10:34:02 +02:00
Martin Edenhofer
249fba71c0 Improved html2html_strict (allow hyperlinks but clean it before). 2016-06-28 01:32:17 +02:00
Martin Edenhofer
f170a8a870 Improved error handling of temp browser store. 2016-06-27 20:04:18 +02:00
Martin Edenhofer
b5a00eca14 Improved visualisation of delivery failed message. 2016-06-27 14:39:40 +02:00
Martin Edenhofer
24eae3104e Improved visualisation of delivery failed message. 2016-06-27 14:09:34 +02:00
Martin Edenhofer
8b9d917a1e Improved shown delivery failed message. 2016-06-27 13:24:48 +02:00
Martin Edenhofer
db6a3502b4 Workaround for ff bug with losing cursor pointer and losing past functionality. Issue #155 and https://bugzilla.mozilla.org/show_bug.cgi?id=1146881 2016-06-27 11:13:35 +02:00
Martin Edenhofer
e7f95a9e85 Init version of extended search. 2016-06-27 08:42:08 +02:00
Martin Edenhofer
682e019880 Fixed setting of tags via macros. 2016-06-26 02:37:27 +02:00
Martin Edenhofer
b3b2a477dc Move to App.CollectionController for activity stream. 2016-06-26 01:46:05 +02:00
Martin Edenhofer
1f548c01df Improved timings for test. 2016-06-26 01:42:59 +02:00
Martin Edenhofer
16ce2599ee Moved to background job for sending facebook messages. 2016-06-25 23:18:06 +02:00
Martin Edenhofer
d3c86e9109 Fixed test. 2016-06-25 23:01:07 +02:00
Martin Edenhofer
4baa1c9410 Moved to background job for sending twitter messages (do not log article changes). 2016-06-25 22:34:40 +02:00
Martin Edenhofer
081034a15a Moved to background job for sending twitter messages. 2016-06-25 22:30:22 +02:00
Martin Edenhofer
3b9f7b28df Added tests for email retry to deliver or add a note it delivery was not possible. 2016-06-25 08:54:25 +02:00
Martin Edenhofer
6a43eabeb4 Improved _checkTypeOf(). 2016-06-24 14:23:19 +02:00
Martin Edenhofer
4996f4a15f Improved _checkTypeOf(). 2016-06-24 14:09:09 +02:00
Martin Edenhofer
8f0b7c30a3 Improved html2text to remove multiple empty lines and replace it with one empty line. 2016-06-24 14:08:15 +02:00
Martin Edenhofer
1c1398d60c Improved html2text to remove html comments. 2016-06-22 16:39:20 +02:00
Martin Edenhofer
a881e21f10 Improved html2text. 2016-06-22 15:11:22 +02:00
Martin Edenhofer
490ec2f271 Another fix for https://github.com/martini/zammad/issues/176 and https://github.com/martini/zammad/issues/155 related issues. 2016-06-22 14:58:54 +02:00
Martin Edenhofer
e9eae11262 Improved html2text. 2016-06-22 14:55:23 +02:00
Martin Edenhofer
2824280a30 Revert "Do not server models on invalid sessions."
This reverts commit 6e84792871.
2016-06-22 07:15:26 +02:00
Martin Edenhofer
6e84792871 Do not server models on invalid sessions. 2016-06-21 23:00:28 +02:00
Martin Edenhofer
6f63af9495 Added /ticket_articles/by_ticket/1 to retrieve all article of a ticket. 2016-06-21 22:59:03 +02:00
Martin Edenhofer
6112f1de0f Set password config to frontend: false. 2016-06-21 22:47:50 +02:00
Martin Edenhofer
4cfede572e Improved stability of tests. 2016-06-21 20:42:55 +02:00
Martin Edenhofer
7a13889258 Fixed rails5 warning. 2016-06-21 17:14:49 +02:00
Martin Edenhofer
77214ffcc4 Because of current exchange/iso/text plain-issues, moved to own html2text converter by strip out all tags unless (b|i|ul|ol|li|u|h1|h2|h3|hr). 2016-06-21 17:14:15 +02:00
Martin Edenhofer
2f13a28c98 Added handling of contenteditable issues for ff. 2016-06-21 15:37:52 +02:00
Martin Edenhofer
13e2b55289 Workaround for ff contenteditable issue, inserts <br></br> inside of <li> - not content can be inserted. 2016-06-21 01:23:40 +02:00
Martin Edenhofer
abdbb97890 Improved tests. 2016-06-21 01:22:48 +02:00
Martin Edenhofer
41f7de82f3 Disabled console log for ff (not working right now). 2016-06-20 20:55:31 +02:00
Martin Edenhofer
7bf791637a Improved order of tests. 2016-06-20 14:55:47 +02:00
Martin Edenhofer
5b1627906c Added expanded 2016-06-20 14:13:00 +02:00
Martin Edenhofer
3c523b4f7d Moved to init prepare/setup method for tests. 2016-06-20 10:55:45 +02:00
Martin Edenhofer
1e2f1da0aa Added relation to group. 2016-06-19 18:58:41 +02:00
Martin Edenhofer
c5a6e00e81 Improved auto wizard test file and tests. 2016-06-19 18:44:08 +02:00
Martin Edenhofer
cbcb3bee47 Fixed filename typo. 2016-06-18 19:57:04 +02:00
Martin Edenhofer
ee600cb630 Moved to 6 browser slices and introduced wizard setups for certain slices to be faster. 2016-06-18 17:20:59 +02:00
Martin Edenhofer
5d13730515 Introduced create_if_not_exists_with_ref and create_or_update_with_ref for automatically lookup references by name/login. 2016-06-18 16:54:26 +02:00
Martin Edenhofer
b348d70f23 Added workaround for ff keyboard binding issue. 2016-06-17 12:57:54 +02:00
Martin Edenhofer
cc7b49ebbe Moved to new ci tags 2016-06-17 12:57:05 +02:00
Martin Edenhofer
dda7bbdeae Moved system_init_done check to construction. Whiling import or getting started it will change automatically which leads to errors. 2016-06-16 15:22:08 +02:00
Martin Edenhofer
1e1f32a5a1 Wait until all ajax calls are finished to get reconnect after session commit. 2016-06-16 00:28:54 +02:00
Martin Edenhofer
bc400a4759 Set state of ticket after UserInfo.current_user_id is set to have the action done as twitter user (not zammad admin). 2016-06-15 11:14:26 +02:00
Martin Edenhofer
f6a9144086 In certain cases, caches are deleted by other thread at same time, just log it. 2016-06-15 10:53:01 +02:00
Martin Edenhofer
d2573d0654 Improved error handling. 2016-06-15 10:52:38 +02:00
Martin Edenhofer
b8d1972936 Ignore ff css warnings. 2016-06-14 18:20:26 +02:00
Martin Edenhofer
8bb5eeb470 Fixed#177. @mrflix, pls qa. 2016-06-14 16:46:26 +02:00
Martin Edenhofer
51bab574d1 Avoid "Selenium::WebDriver::Error::UnknownError" sometime on accessing log. 2016-06-14 15:58:16 +02:00
Martin Edenhofer
5218119ce5 Output console log to STDERR for better debugging. 2016-06-14 15:25:01 +02:00
Martin Edenhofer
ff727b8413 Fixed log prefix. 2016-06-14 13:44:16 +02:00
Martin Edenhofer
7e3738aaa4 Improved error handling if object is already deleted. 2016-06-14 13:40:04 +02:00
Martin Edenhofer
13ff0054b6 Improved search/indexing to search also renamed tags. 2016-06-14 13:27:15 +02:00
Martin Edenhofer
78cceb4685 Code cleanup. 2016-06-14 12:35:01 +02:00
Martin Edenhofer
a21fa42762 Removed obsolet code. 2016-06-14 12:33:20 +02:00
Martin Edenhofer
bbfb6935b9 Set "normal" all default link option. 2016-06-14 11:27:18 +02:00
Martin Edenhofer
d5460c0366 Move to background jobs for user device logging. 2016-06-14 09:37:46 +02:00
Martin Edenhofer
dca608aa06 Added notify_close() to closed notify messages. 2016-06-13 10:19:44 +02:00
Martin Edenhofer
ec752decc7 Archive build assets if job failed. 2016-06-12 21:12:07 +02:00
Martin Edenhofer
1d16d3d4b5 Updated doc. 2016-06-10 13:05:22 +02:00
Martin Edenhofer
87c7ed9d0a Global replacement with modal_ready. 2016-06-10 09:21:47 +02:00
Martin Edenhofer
fe54a7b37e Added checks if has gone before new action is done. 2016-06-10 08:09:47 +02:00
Martin Edenhofer
a93fe5b807 Improved tests. 2016-06-10 00:25:13 +02:00
Martin Edenhofer
7bd6731a23 Just scroll to bottom if real content is higher then 100% of viewable area. 2016-06-09 23:48:33 +02:00
Martin Edenhofer
1f0a2b3e61 Make width and height of browser configurable. 2016-06-09 19:52:08 +02:00
Martin Edenhofer
626f90ae11 Refactoring of navigation. 2016-06-09 18:27:12 +02:00
Martin Edenhofer
7345fa29f9 Merge branch 'develop' of github.com:martini/zammad into develop 2016-06-09 15:26:43 +02:00
Martin Edenhofer
5577753be7 Fixed margin property for blockquote inline replacement (use same as in css). 2016-06-09 15:26:20 +02:00
Martin Edenhofer
6373c91743 Fixed margin property for blockquote inline replacement (use same as in css). 2016-06-09 15:00:11 +02:00
Martin Edenhofer
9169b6fb88 Improved tag and link widget. 2016-06-09 12:46:53 +02:00
Martin Edenhofer
e9bb0aafc0 Reduced rerendering of ticket zoom. Improved code layout in ticket create. 2016-06-08 21:18:40 +02:00
Martin Edenhofer
4c0c3165af Improved error handling. 2016-06-08 16:40:27 +02:00
Martin Edenhofer
cc52b7844d Fixed page header binding after ticket creation. 2016-06-08 16:06:55 +02:00
Martin Edenhofer
8051c1c741 Improved related ticket, if we do not have open related tickets, search for any tickets of the customer. 2016-06-08 15:25:39 +02:00
Martin Edenhofer
3306cf4e8a Do not block mousedown events (just use es as listener). 2016-06-08 15:11:39 +02:00
Martin Edenhofer
cebc8a04fc Moved to global search widget to use clickable tag search. 2016-06-08 15:01:32 +02:00
Martin Edenhofer
db20bb5fc9 Improved tag management + added admin tests. 2016-06-08 13:43:07 +02:00
Martin Edenhofer
d951f6e850 Fixed not shown pending time on pending state selection. 2016-06-08 10:17:49 +02:00
Martin Edenhofer
88e3d1fecb Added expand format for data rest api (deliver records with filled reverences for "group_id: 123" add automatically "group: 'some name'"). 2016-06-08 06:56:05 +02:00
Martin Edenhofer
09be713014 Fixed typo. 2016-06-08 00:21:22 +02:00
Martin Edenhofer
8aebe614ec Make a faster update of server side changes. 2016-06-08 00:12:03 +02:00
Martin Edenhofer
451a768f8e Fixed buffer/caching of own changes. 2016-06-08 00:11:03 +02:00
Martin Edenhofer
8f7452e34b Added browser tests to verify tag and link changes on second browser. 2016-06-07 23:38:29 +02:00
Martin Edenhofer
2d91d5b5d7 Fixed not shown "discard changes" button on reply. 2016-06-07 22:54:37 +02:00
Martin Edenhofer
faf4b0ed86 Applied new rubocop. 2016-06-07 22:19:48 +02:00
Martin Edenhofer
0acd538a4e Updated gems (regarding Name: nokogiri, Version: 1.6.7.2, Advisory: CVE-2015-8806m Criticality: Unknown). 2016-06-07 22:14:05 +02:00
Martin Edenhofer
f6f3504e80 Allow to fail if touch of reference fails. 2016-06-07 22:06:08 +02:00
Martin Edenhofer
3d878a5547 Refactoring of ticket zoom (less rerendering, just rerender particular area's instant of whole view). Added live broadcasting of tag and links. 2016-06-07 21:22:08 +02:00
Martin Edenhofer
65e06eb614 Improved timing. 2016-06-07 10:11:37 +02:00
Martin Edenhofer
5b43ba89e1 Do not set source=signup on initial admin user creation. 2016-06-07 10:11:17 +02:00
Martin Edenhofer
9b84a64a37 Removed workaround with invalid role_ids. Improved code layout. 2016-06-06 21:08:11 +02:00
Martin Edenhofer
ab83b577ba Removed workaround with invalid role_ids. Improved code layout. 2016-06-06 19:24:49 +02:00
Martin Edenhofer
54f6c456b7 Streamline of rest api for tickets, users and organisations. Added pagination for search and index. Added auto lookup for id values (e. g. use group: 'some name', backend will automatically replace "group: 'some name'" by "group_id: 123"). 2016-06-06 17:26:37 +02:00
Martin Edenhofer
65af185847 Streamline of rest api (added missing destroy backends). 2016-06-06 08:34:15 +02:00
Martin Edenhofer
19c3335d10 Fixed "Error parsing a meta element's content: ';' is not a valid key-value pair separator. Please use ',' instead.
application.js:9067 Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help, check https://xhr.spec.whatwg.org/.".
2016-06-05 09:12:52 +02:00
Martin Edenhofer
b0b4cfcade Reduced timings because of event based form saving. 2016-06-03 23:42:30 +02:00
Martin Edenhofer
c2e0279592 Merge branch 'develop' of github.com:martini/zammad into develop 2016-06-03 21:01:39 +02:00
Martin Edenhofer
afc1e1dc9b Fixed browser test. 2016-06-03 21:01:30 +02:00
Martin Edenhofer
356e169355 Improved autosave. 2016-06-03 21:00:52 +02:00
Felix Niklas
ea30b734ad Merge branch 'develop' of github.com:martini/zammad into develop 2016-06-03 17:39:09 +02:00
Martin Edenhofer
536cc11ba1 Improved doc. 2016-06-03 15:25:35 +02:00
Martin Edenhofer
3bb6267f39 Code cleanup. 2016-06-03 15:25:06 +02:00
Martin Edenhofer
718263afd1 Improved autosave. Also moved to event based auto save for ticket creation. 2016-06-03 15:24:42 +02:00
Felix Niklas
25ecd4dd83 prevent overflow on ipad in landscape mode 2016-06-03 15:06:47 +02:00
Felix Niklas
4c82eb8c8b prevent avatars from getting squashed 2016-06-03 14:54:10 +02:00
Martin Edenhofer
3f5a3da61a Moved to event based store of task state. Reduced rerendering of ticket sidebar. 2016-06-03 14:21:52 +02:00
Martin Edenhofer
ba611c377e Code cleanup. 2016-06-02 21:00:12 +02:00
Martin Edenhofer
556dbb7bb8 Fixed syntax error. 2016-06-02 20:59:15 +02:00
Martin Edenhofer
8900c2bb1f Allow to set created_at and updated_at via x-header. 2016-06-02 20:58:46 +02:00
Martin Edenhofer
116a7a5718 Improved References-Header follow up check. 2016-06-02 16:37:52 +02:00
Martin Edenhofer
52043bfdc5 Fetch older emails first (to keep possibility for references header follow up detection). 2016-06-02 16:00:45 +02:00
Martin Edenhofer
0ab918dadc Fixed removing tags. 2016-06-02 09:26:35 +02:00
Martin Edenhofer
7c0893ab36 Added tag autocompletion and tag management in admin interface. 2016-06-02 08:58:10 +02:00
Martin Edenhofer
5977b9e348 Updated to latest version. 2016-06-02 00:38:36 +02:00
Martin Edenhofer
26cd94acab Improved signup check. 2016-06-01 18:48:41 +02:00
Martin Edenhofer
9c8339e716 Fixed browser tests. 2016-06-01 17:14:21 +02:00
Martin Edenhofer
5adba8c9d0 Added email verify feature for self signup accounts. 2016-06-01 16:58:11 +02:00
Martin Edenhofer
2ac873886e Added Package.migration_execute to execute all pending package migrations at once. 2016-06-01 10:32:13 +02:00
Martin Edenhofer
2137250bae Fixed postgresql ERROR: date/time field value out of range: "2016-6-31" issue. 2016-06-01 08:21:50 +02:00
Martin Edenhofer
94148b37aa Improved format of duration. 2016-05-31 10:56:13 +02:00
Martin Edenhofer
c1d8269145 Fixed switch to user. 2016-05-31 08:30:45 +02:00
Martin Edenhofer
4cc68551d9 Improved logout (do redirect before rerender). 2016-05-31 01:15:01 +02:00
Martin Edenhofer
aabffa8ca4 Improved timing. 2016-05-30 12:34:23 +02:00
Martin Edenhofer
6ff8a0b920 Transform input tel|url in view to make it clickable. 2016-05-30 11:16:56 +02:00
Martin Edenhofer
8e9739ec63 Not longer needed. 2016-05-30 10:40:19 +02:00
Martin Edenhofer
2e01ec048c Improved error handling of unprocessable emails, store unprocessable email for bug reporting unter tmp/unprocessable_mail/. 2016-05-30 10:33:27 +02:00
Martin Edenhofer
32bb10bcf3 Fixed switching if confirm returns false. 2016-05-30 09:54:51 +02:00
Martin Edenhofer
64492fb4fb Removed not needed comment. 2016-05-30 09:24:26 +02:00
Martin Edenhofer
790835f362 Upgraded pkgr config. 2016-05-30 09:12:01 +02:00
Martin Edenhofer
f529def251 Improved fqdn detection with :port urls. 2016-05-30 09:09:07 +02:00
Martin Edenhofer
7a5f73c79a Added guess routine for not parseable (not RfC conform) email headers like "To: Max Kohl | [example.com] <kohl@example.com>". 2016-05-29 22:07:17 +02:00
Martin Edenhofer
9e52358d57 Fixed html5 input type attribute for phone, it's tel (not phone). 2016-05-29 20:03:00 +02:00
Martin Edenhofer
d3ec647189 Added browser reload support if only config changes have changed. Added support to undo config changes. 2016-05-29 19:48:28 +02:00
Martin Edenhofer
f08fcc5e55 Improved click helper with param text. 2016-05-29 02:51:58 +02:00
Martin Edenhofer
db224d5bc3 Improved bind/unbind of controllers. 2016-05-29 01:53:12 +02:00
Martin Edenhofer
c5ed8776ce Removed not needed comments. 2016-05-29 00:09:04 +02:00
Martin Edenhofer
8c67bc4876 Not longer needed. 2016-05-29 00:05:12 +02:00
Martin Edenhofer
eede1267b0 Added more tests for object manager. 2016-05-29 00:04:26 +02:00
Martin Edenhofer
da754d5d25 Improved App.ControllerForm.params(), store field types in .data() and not longer in name of field. Also use values of disabled fields. 2016-05-28 23:17:59 +02:00
Martin Edenhofer
c24b4031fc Do not send restart events to browser on import. 2016-05-27 16:25:25 +02:00
Martin Edenhofer
c2c71ca06d Improved pasting images on retina devices. 2016-05-27 15:30:36 +02:00
Martin Edenhofer
0a3bdffc93 Improved pasting images on retina devices. 2016-05-27 15:22:00 +02:00
Martin Edenhofer
3375163c9c Fixed browser test. 2016-05-27 14:33:25 +02:00
Martin Edenhofer
4103aaa08a Fixed #170 - wrap attributes of tags are not removed on "strg+alt+f". 2016-05-27 14:22:15 +02:00
Martin Edenhofer
4196863b1a Added no-reply@ addresses to notification_sender. 2016-05-27 14:11:36 +02:00
Martin Edenhofer
e71b4f92b1 Fixed blank screen on /#ticket/zoom/1 and not authenticated users. 2016-05-27 14:08:39 +02:00
Martin Edenhofer
1dd844aa6e Improved APP_RESTART_CMD. 2016-05-27 14:03:59 +02:00
Martin Edenhofer
c4167663fd Moved to system() for avoid broken pipe issues. 2016-05-27 11:45:48 +02:00
Martin Edenhofer
249caa122a Fixed build helper script. 2016-05-27 10:16:47 +02:00
Martin Edenhofer
17cbac8c39 Improved restarting zammad after object attribute changes. 2016-05-27 09:47:31 +02:00
Martin Edenhofer
06d6df9507 Improved shutdown down. 2016-05-27 00:40:27 +02:00
Martin Edenhofer
39feeccc88 Added auto restart of zammad after changing object attributes. 2016-05-26 23:40:10 +02:00
Martin Edenhofer
eae8ead41c Improved object manager browser tests. 2016-05-26 10:14:51 +02:00
Martin Edenhofer
bf0d4d7fa2 Added doc about possible types. 2016-05-25 11:10:33 +02:00
Martin Edenhofer
cb5fd0c2c0 Reworked admin maintenance area (needed for restarting screen). 2016-05-25 09:19:45 +02:00
Martin Edenhofer
5bacada8ca Fixed runtime error. 2016-05-24 10:16:55 +02:00
Martin Edenhofer
ed48d92a16 Improved object manager browser tests. 2016-05-24 09:47:53 +02:00
Martin Edenhofer
740e1dcfe8 Disabled email notifications if developer_mode is enabled. 2016-05-24 09:41:22 +02:00
Martin Edenhofer
3c3a6c7ff0 Count destroy attribute also as executed (no matter if database has changed). 2016-05-24 07:49:54 +02:00
Martin Edenhofer
3cc4a8f3a3 Init version of object manager browser tests. 2016-05-24 00:48:32 +02:00
Martin Edenhofer
37317f2a42 Change behaviour for rendering of selected but not active options. Show also not active options if selected. 2016-05-23 21:20:18 +02:00
Martin Edenhofer
f9ff436630 Improved copy of number current object shortcut. Replaced "ctrl+alt+y" (which was already used for removing format) with "ctrl+alt+,". 2016-05-23 21:17:25 +02:00
Martin Edenhofer
e890f3b342 Improved code layout. 2016-05-23 20:18:07 +02:00
Martin Edenhofer
6fcdb9c0ef Fixed email process tests. 2016-05-23 20:04:30 +02:00
Martin Edenhofer
0e150fccd0 Start using config ticket_subject_re for reply emails. 2016-05-23 19:56:39 +02:00
Martin Edenhofer
7cf884c7a4 In destination group is invalid, use the oldest valid group. Also notice in admin interface in email account config about invalid groups. 2016-05-23 19:23:06 +02:00
Martin Edenhofer
075db8873a Improved ctrl+alt+y shortcut (2 times + subject, 3 times + subject and url). 2016-05-23 15:23:18 +02:00
Martin Edenhofer
5e090a8976 Added support to copy T#xxx into clipboard by pressing "ctrl+alt+y" if ticket is open in ticket zoom view. 2016-05-23 07:55:52 +02:00
Martin Edenhofer
a6cdde345c Allow also to search in inactive groups. 2016-05-22 23:17:46 +02:00
Martin Edenhofer
10e0592140 Added oder of article, sometimes on postgresql it's different. 2016-05-22 11:37:44 +02:00
Martin Edenhofer
07148ea064 Fixed typo. 2016-05-21 20:11:08 +02:00
Martin Edenhofer
6a1beeb890 Improved timings. 2016-05-21 18:56:35 +02:00
Martin Edenhofer
34c4b7bd1b Improved timings. 2016-05-21 18:19:34 +02:00
Martin Edenhofer
927cc759d3 Applied rubocop. 2016-05-21 17:43:17 +02:00
Martin Edenhofer
22f9f59a9a Improved timings. 2016-05-21 17:40:40 +02:00
Martin Edenhofer
4c55ca4121 Improved recovery if browser start was failed, try it 5 times. 2016-05-21 17:40:08 +02:00
Martin Edenhofer
cbb751d0f3 Split core browser tests into 5 slices. 2016-05-21 12:02:38 +02:00
Martin Edenhofer
6ccf3986d7 Updated build icon url. 2016-05-21 11:14:28 +02:00
Martin Edenhofer
6685b585d3 Split core browser tests into 4 slices. 2016-05-21 11:13:58 +02:00
Martin Edenhofer
63a1a93507 Added missing sprockets-manifest to use precompiled assets. 2016-05-21 09:59:46 +02:00
Martin Edenhofer
113e1cc5cf Reenabled precompile again. 2016-05-20 19:55:26 +02:00
Martin Edenhofer
ecfb038b82 Removed extra build step. 2016-05-20 17:19:53 +02:00
Martin Edenhofer
bf302d87f2 Added build step to compile assets only once. 2016-05-20 17:17:53 +02:00
Martin Edenhofer
f5d5d6a6ce Do not send auto responses on norepy@ and norepy*@ addresses. 2016-05-20 14:22:57 +02:00
Martin Edenhofer
c6f09e8867 Added <p> test for html_mail_client_fixes(). 2016-05-20 14:16:36 +02:00
Martin Edenhofer
61a526e3bc Improved css for outlook 2013. 2016-05-20 13:44:02 +02:00
Martin Edenhofer
9796e5959a Removed not needed line. 2016-05-20 12:25:45 +02:00
Martin Edenhofer
f7ddb4c479 Merged migrations. 2016-05-20 12:21:55 +02:00
Martin Edenhofer
9bb73f3b43 Improved error handling. 2016-05-20 10:44:00 +02:00
Martin Edenhofer
e9dc5a3ea0 Added integer ui element. 2016-05-20 04:30:15 +02:00
Martin Edenhofer
20bce3118c Removed not longer needed attribute. 2016-05-20 04:28:27 +02:00
Martin Edenhofer
7add2b8905 Improved migrations. 2016-05-20 03:49:30 +02:00
Martin Edenhofer
e8b906c1cf Improved zendesk field migration, mapped checkbox to boolean. 2016-05-19 16:06:47 +02:00
Martin Edenhofer
5aa51f82a6 Added support for zendesk custom fields. 2016-05-19 15:01:02 +02:00
Martin Edenhofer
97911a4122 Init version of object manager. 2016-05-19 11:21:50 +02:00
Martin Edenhofer
1248f4080b Init version of object manager. 2016-05-19 10:20:38 +02:00
Martin Edenhofer
b00df72760 Do not compare functions and objects if observeNot is used. 2016-05-19 01:19:50 +02:00
Martin Edenhofer
02a973bad1 Added placeholder widget to signature edit. 2016-05-19 00:19:39 +02:00
Martin Edenhofer
4eda483fff Ignore cid in observeNot attributes. 2016-05-19 00:18:47 +02:00
Martin Edenhofer
cb7d10fb1f Fixed race condition if saving avatar image. Added image attribute in avatar observer controller. 2016-05-19 00:06:55 +02:00
Martin Edenhofer
054ad6ced3 Prevent import of own created tweets by streaming api. 2016-05-18 10:28:56 +02:00
Martin Edenhofer
b745bce6ac Added config options for logging clicks and ajax calls. 2016-05-18 08:44:46 +02:00
Martin Edenhofer
dc263fb92a Improved error handling. 2016-05-18 00:27:05 +02:00
Martin Edenhofer
dff4a03208 Added regex quoting of query. 2016-05-17 23:26:48 +02:00
Martin Edenhofer
182f97ce7d Wait until create screen is ready. 2016-05-17 21:23:47 +02:00
Martin Edenhofer
b0b394b091 Improved logging. 2016-05-17 21:21:12 +02:00
Martin Edenhofer
28b3ee1d65 Take error object of onerror() to get correct traceback. 2016-05-17 20:57:31 +02:00
Martin Edenhofer
73f6cc6389 Improved use of App.Utils.htmlRemoveRichtext. Fixed twitter browser tests. 2016-05-17 20:40:00 +02:00
Martin Edenhofer
7f39927506 Added traceback on remote error logging. 2016-05-17 19:02:40 +02:00
Martin Edenhofer
f9c20e582e Removed no acceptedInstances warnings. 2016-05-17 16:28:08 +02:00
Martin Edenhofer
30e40b62d1 Added shortcut "y" to remove formatting of whole text area. Streamline of common css behaviour for p and code in mail clients. 2016-05-17 13:51:20 +02:00
Martin Edenhofer
327a0bd50a Add filename to attachment parts. 2016-05-17 11:55:12 +02:00
Martin Edenhofer
d3a428cdca Removed not longer needed organization session collection tests. 2016-05-17 09:37:25 +02:00
Martin Edenhofer
73ba902501 Improved handling/parsing with invalid email addresses like "undisclosed-recipients: ;". 2016-05-17 07:44:17 +02:00
Martin Edenhofer
ea82574877 No collection push of organization needed anymore. 2016-05-17 07:42:46 +02:00
Martin Edenhofer
15a9145a21 Improved timing for postgresql.Improved comparing values (database result maybe unsorted). 2016-05-16 20:38:49 +02:00
Martin Edenhofer
8283194f02 Improved comparing values (database result maybe unsorted). 2016-05-16 20:08:58 +02:00
Martin Edenhofer
60b11db825 Just push related user organisation to clients (improved tests). 2016-05-16 19:49:06 +02:00
Martin Edenhofer
f513062d40 Updated live test. 2016-05-16 17:07:08 +02:00
Martin Edenhofer
7ed7bfb670 Just push related user organisation to clients. 2016-05-16 17:03:19 +02:00
Martin Edenhofer
8ebe752ee1 Added doc. 2016-05-16 17:02:15 +02:00
Martin Edenhofer
59b115669a Ignore auto reply. 2016-05-16 17:01:59 +02:00
Martin Edenhofer
1c7dee3e28 Improved markup of notification templates. 2016-05-13 15:53:16 +02:00
Martin Edenhofer
dd5d4ca48b Fixed db postmaster filter on follow ups. 2016-05-13 11:32:35 +02:00
Martin Edenhofer
927da9af8c Added autocomplete="off" attribute to prevent safari from autocomplete. 2016-05-12 18:50:13 +02:00
Martin Edenhofer
28ef42826d Changed max. image size of original image. 2016-05-12 17:42:39 +02:00
Martin Edenhofer
85a8d5fe02 Merge branch 'develop' of github.com:martini/zammad into develop 2016-05-12 16:54:43 +02:00
Martin Edenhofer
7d35186ab7 Resize huge uploaded images to 1600x1600 before starting image cropper. Fixed @stream.stop() is not a function error message on chrome 50. Disabled save buttons after submit. 2016-05-12 16:53:46 +02:00
Felix Niklas
db8b944e68 add richtext-content style to emails 2016-05-12 15:25:47 +02:00
Martin Edenhofer
bee011d030 On cleanup remove also id and data- attributes. 2016-05-12 15:22:34 +02:00
Felix Niklas
561d8163ef richtext-content: add style for blockquote 2016-05-12 15:20:48 +02:00
Felix Niklas
b82e08bfae fix widths of boxes in the new chat-ticket 2016-05-12 11:50:10 +02:00
Felix Niklas
8bd3af788f richtext-content: fix spacing of nested p, table and pre 2016-05-12 11:32:51 +02:00
Martin Edenhofer
5e7468e8a8 Improved code style. 2016-05-12 11:26:11 +02:00
Martin Edenhofer
c093d9fd8a Merge branch 'develop' of github.com:martini/zammad into develop 2016-05-12 11:25:15 +02:00
Martin Edenhofer
dc7c57575a Allow h1-h6 and hr for past in. 2016-05-12 11:24:52 +02:00
Felix Niklas
4d64816a23 richtext-content: style table, p and code 2016-05-12 11:13:10 +02:00
Martin Edenhofer
33cbbed774 Prevent pasting images from word/excel/numbers which is normally text or html. Just past images if first item is really an image. 2016-05-12 11:05:40 +02:00
Martin Edenhofer
863e43e107 Merge branch 'develop' of github.com:martini/zammad into develop 2016-05-12 10:49:19 +02:00
Felix Niklas
a082e6ca14 add richtext-content class for richtext formating
and style <pre>
2016-05-12 10:48:28 +02:00
Felix Niklas
640e8cbbe8 fix attachment close x position 2016-05-12 10:35:43 +02:00
Martin Edenhofer
c49bd234fd Improved code layout. 2016-05-11 00:09:10 +02:00
Martin Edenhofer
944b9bf498 Do not show passwords on user create or update. 2016-05-10 16:07:39 +02:00
Martin Edenhofer
2bdb148bce Added ie support and drag&drop image support. 2016-05-10 16:06:21 +02:00
Martin Edenhofer
549978d731 Send inline images with cid (load images via http/https in src). 2016-05-10 15:06:51 +02:00
Martin Edenhofer
530c844f68 Fixed chrome 49 + flex issue, not shown article. 2016-05-10 14:47:27 +02:00
Martin Edenhofer
c8ed4a83c3 Allow inline images via c&p. 2016-05-09 16:55:31 +02:00
Martin Edenhofer
179582852f Fixed missing initial article "internal" border. Removed not needed z-index classes. 2016-05-06 14:27:11 +02:00
Martin Edenhofer
97aac2cb0f Fixed typo. 2016-05-06 14:17:02 +02:00
Martin Edenhofer
6161c9f0f2 Set Cc attribute in agent ticket create via outbound email at runtime (to not show ticket.cc in placeholder and ticket selectors widgets). 2016-05-06 12:37:23 +02:00
Martin Edenhofer
41f97d6f50 Improved App.Utils.replaceTags() - undefined and null values. 2016-05-06 12:34:04 +02:00
Martin Edenhofer
dc8d8b9786 Added #{config.*} options to placeholder widget. 2016-05-06 10:19:24 +02:00
Martin Edenhofer
0a27ec38dd Use config option to prevent sender based auto responses. 2016-05-06 09:57:04 +02:00
Martin Edenhofer
6fb9371302 Added placeholder support for notification tags (just use :: in notifications or text modules). 2016-05-06 09:53:24 +02:00
Martin Edenhofer
65c0d5e0e1 Cleanup. 2016-05-06 09:41:50 +02:00
Martin Edenhofer
adaf019162 Fixed log level. 2016-05-05 21:04:51 +02:00
Martin Edenhofer
aba3664263 Fixed tests, applied new auto reply. 2016-05-05 17:09:35 +02:00
Martin Edenhofer
27584484c4 Improved test, scroll click point into viewpoint. 2016-05-05 13:38:33 +02:00
Martin Edenhofer
385bc17cb4 Added test controller. 2016-05-05 11:35:39 +02:00
Martin Edenhofer
2e9c6e78ed Fixed logout. 2016-05-04 22:50:30 +02:00
Martin Edenhofer
08c5ca3e62 Reduced rerendering of object (introduction of App.ObserverController). 2016-05-04 18:12:53 +02:00
Martin Edenhofer
dfc5900234 Ignore system article in notifications. 2016-05-04 11:45:05 +02:00
Martin Edenhofer
43bb991f27 Improved auto reply templates. 2016-05-04 11:30:27 +02:00
Martin Edenhofer
397983094e Improved trigger. 2016-05-03 15:54:21 +02:00
Martin Edenhofer
09757ef1e4 Improved trigger. 2016-05-03 15:51:07 +02:00
Martin Edenhofer
a4a9433d2b Improved caller log view. 2016-05-03 13:41:04 +02:00
Martin Edenhofer
5385d5da89 Merge branch 'develop' of github.com:martini/zammad into develop 2016-05-03 13:03:22 +02:00
Martin Edenhofer
9301d03b37 Only send notifications if not bulk mail has initiated. 2016-05-03 13:03:10 +02:00
Felix Niklas
227c3e8d80 checkbox and radio replacement: add disabled state
usage:
 - is-disabled class on label
 - disabled attribute on the input
2016-05-03 12:31:06 +02:00
Felix Niklas
d4d73ed598 fix border in caller log, remove pulsing 2016-05-03 12:30:25 +02:00
Felix Niklas
31e7a054ec style caller log 2016-05-03 12:06:40 +02:00
Felix Niklas
cb2913a401 style placeholder for empty http_log table 2016-05-03 10:51:46 +02:00
Felix Niklas
5c81268cc7 contrib autostart script changes 2016-05-03 10:42:31 +02:00
Felix Niklas
657f190e7f beautify CTI not configured screen 2016-05-03 10:42:10 +02:00
Martin Edenhofer
f0ac8d47f4 Fixed sla overview. 2016-05-03 08:19:44 +02:00
Martin Edenhofer
778c1cdfc1 Fixed initial setup. 2016-05-03 02:44:52 +02:00
Martin Edenhofer
0487fa1d12 Init version of triggers. 2016-05-03 02:36:44 +02:00
Martin Edenhofer
ea4b7c4bd9 Tests for navigation and title. 2016-05-01 11:25:53 +02:00
Martin Edenhofer
508c101fbc Fixed ticket_create(). 2016-05-01 02:24:31 +02:00
Martin Edenhofer
fb4c2c90b3 Improved ticket_create() - wait until screen exists. 2016-05-01 01:58:15 +02:00
Martin Edenhofer
dc6b121091 Fixed enable/disable of chat. 2016-05-01 00:33:13 +02:00
Martin Edenhofer
1a506cd150 Improved chat tests. 2016-04-30 16:38:24 +02:00
Martin Edenhofer
b4d34bed5b Improved tests (check also tab text on name change of shown object). 2016-04-30 10:23:53 +02:00
Martin Edenhofer
0d5801528a Do not show notify on feature enable/disable. Fixed not shown clue. 2016-04-30 08:40:05 +02:00
Martin Edenhofer
81e27f8901 Improved permanent task highlighting in nav bar. 2016-04-30 00:21:39 +02:00
Martin Edenhofer
e6540720a3 Improved SQL for postgresql. 2016-04-29 19:52:45 +02:00
Martin Edenhofer
f19bc39ddf Improved caller id loop. 2016-04-29 19:38:07 +02:00
Martin Edenhofer
59975b5371 Improved checkAttachmentReference(). 2016-04-29 14:27:20 +02:00
Martin Edenhofer
4847fa1e42 Merged migrations. 2016-04-29 14:26:48 +02:00
Martin Edenhofer
882beff8fa Improved shown caller log. 2016-04-29 10:23:12 +02:00
Martin Edenhofer
bd06f59fbf Improved checkAttachmentReference(). 2016-04-28 16:20:23 +02:00
Martin Edenhofer
4366d60270 Added caller id lookup to cti feature. 2016-04-28 15:15:50 +02:00
Martin Edenhofer
c7e510f416 Fixed typo. 2016-04-27 14:51:03 +02:00
Martin Edenhofer
49d0910009 Added i18n support. 2016-04-27 14:46:21 +02:00
Martin Edenhofer
d0fded9875 Improved cti caller list layout (more for humans). 2016-04-27 14:35:36 +02:00
Martin Edenhofer
c747c0c1f1 Improved CTI features. 2016-04-27 13:37:13 +02:00
Martin Edenhofer
a746f559cd Improved tests. Added missing current_user to slack transaction backend. 2016-04-27 11:21:07 +02:00
Martin Edenhofer
8cfc048cdb Applied new live call result. 2016-04-27 09:35:42 +02:00
Martin Edenhofer
1c1077e115 Remember user_id in transaction backends (updated_by_id can already be changed at execution time). 2016-04-27 09:31:11 +02:00
Martin Edenhofer
acb3a23681 Add tags on blur. 2016-04-26 23:32:40 +02:00
Martin Edenhofer
61f443dc89 Do not log device changes if geo ip service is out of order. 2016-04-26 16:55:52 +02:00
Martin Edenhofer
e1140ebce6 Fixed not shown ticket templates. 2016-04-26 15:36:25 +02:00
Martin Edenhofer
6c3dc608ab Code cleanup. 2016-04-26 14:42:55 +02:00
Martin Edenhofer
b7597123fd Fixed typo. 2016-04-26 13:05:09 +02:00
Martin Edenhofer
0bd097c06d Improved setup. 2016-04-26 12:59:50 +02:00
Martin Edenhofer
4eace918d3 Improved code layout. 2016-04-26 12:49:36 +02:00
Martin Edenhofer
75104e3c46 Load also test/fixtures/seeds.rb. 2016-04-26 12:35:31 +02:00
Martin Edenhofer
0d77d69146 Load also test/fixtures/seeds.rb. 2016-04-26 11:57:29 +02:00
Martin Edenhofer
fe68d9d988 Improved setup. 2016-04-26 11:48:59 +02:00
Martin Edenhofer
ee4b12f48a Improved setup. 2016-04-26 11:43:27 +02:00
Martin Edenhofer
b9c24748a9 Added reset of UserInfo.current_user_id for background jobs and transactions. 2016-04-26 11:30:46 +02:00
Martin Edenhofer
c3743682ec Enhanced tests. 2016-04-26 08:48:44 +02:00
Martin Edenhofer
671f513461 Improved datatime format. 2016-04-26 08:02:32 +02:00
Martin Edenhofer
af3087abea Reset current_user_id before execute backends. 2016-04-26 08:02:10 +02:00
Martin Edenhofer
54a41212df Improved datatime format. 2016-04-26 07:45:15 +02:00
Martin Edenhofer
2cb31d20a7 Added order for User.of_role(). 2016-04-26 01:41:38 +02:00
Martin Edenhofer
d31daac4ef Improved error handling. 2016-04-26 01:38:37 +02:00
Martin Edenhofer
7565018702 Improved error handling. 2016-04-26 01:25:53 +02:00
Martin Edenhofer
5812515fe5 Fixed: Index name 'index_external_syncs_on_source_and_source_id_and_object_and_o_id' on table 'external_syncs' is too long; the limit is 63 characters. 2016-04-26 01:14:37 +02:00
Martin Edenhofer
05fe899cdd Applied rubocop. 2016-04-26 01:07:08 +02:00
Martin Edenhofer
e06f4ee7fe Added init version of clearbit integration. 2016-04-26 01:04:59 +02:00
Martin Edenhofer
62d35d2a0e Fixed search result, used _.debounce in correct way. 2016-04-25 23:06:39 +02:00
Martin Edenhofer
0e5e8d0573 Cleanup for new multiple attribute of user org selector. 2016-04-25 17:46:48 +02:00
Felix Niklas
190924cf4f userOrgSelector: fix initial value and add email with single select 2016-04-25 16:13:40 +02:00
Felix Niklas
5cb02e5961 userOrgSelector: initially render tokens/name 2016-04-25 15:59:38 +02:00
Felix Niklas
e0324b7e35 add multiple option to userOrgSelector 2016-04-25 15:14:22 +02:00
Felix Niklas
39bde93d3f developer terminal autostarter: increase delays 2016-04-25 15:03:41 +02:00
Felix Niklas
6ef77f627d Merge branch 'develop' of github.com:martini/zammad into develop 2016-04-25 09:48:33 +02:00
Martin Edenhofer
2d9ceaf220 Applied new role count (added CTI role). 2016-04-23 11:31:08 +02:00
Martin Edenhofer
9602597e1c Fixed migration for initial setup. 2016-04-23 11:20:40 +02:00
Martin Edenhofer
4646aca840 Added cti call log ui. 2016-04-23 11:04:33 +02:00
Martin Edenhofer
30acbec315 Moved to ne generic params. 2016-04-22 09:58:28 +02:00
Martin Edenhofer
e56ed8eeca Moved signature detection to transaction module. 2016-04-22 08:55:10 +02:00
Martin Edenhofer
2d93b435ba Reset filters to empty for postmaster filter. 2016-04-21 20:49:30 +02:00
Martin Edenhofer
3cf3bc919f Updated gems. 2016-04-21 17:11:55 +02:00
Martin Edenhofer
3a9f3ba5f9 Take also . in url for http log facility. 2016-04-21 17:11:10 +02:00
Martin Edenhofer
30b05bd991 Improved error handling. 2016-04-21 15:43:13 +02:00
Martin Edenhofer
fcdf62cd13 Added sipgate integration. 2016-04-21 09:36:25 +02:00
Martin Edenhofer
588b4701a7 Fixed not shown online notifications in safari. 2016-04-20 00:18:34 +02:00
Felix Niklas
c06d952d16 fix tokenfield spacing 2016-04-18 14:53:28 +02:00
Martin Edenhofer
0e6f2278df Fixed colouring of escalated tickets. 2016-04-18 10:33:14 +02:00
Martin Edenhofer
9851f4e142 Remember already sent messaged based on ticket + webhook (not only webhook). 2016-04-18 10:28:21 +02:00
Martin Edenhofer
f242f2e125 Improved naming of variables. 2016-04-18 10:01:20 +02:00
Martin Edenhofer
9eb7fd02df Improved sending slack messages (pending reminder & escalations only once a day). 2016-04-18 09:48:21 +02:00
Martin Edenhofer
9b22b3679b Added option for own image_url (app logo image is not possible to use, looks bad in slack). 2016-04-18 08:38:19 +02:00
Martin Edenhofer
94d348d90e Fixed slack integration. 2016-04-18 02:08:11 +02:00
Martin Edenhofer
e42e373de4 Added http log support. 2016-04-18 02:02:31 +02:00
Martin Edenhofer
5b8be81ef5 Fixed disable_notification attribute to prevent sending notifications. 2016-04-16 11:13:12 +02:00
Martin Edenhofer
88ef31d639 Added new slack integration test. 2016-04-16 01:12:24 +02:00
Martin Edenhofer
eb4a6db332 Added slack integration. 2016-04-16 00:40:04 +02:00
Martin Edenhofer
a102057506 Added slack integration. 2016-04-15 23:56:10 +02:00
Felix Niklas
74d47deeea icon-status: add .inactive state 2016-04-15 15:14:28 +02:00
Felix Niklas
a929241724 notifications: fix hide/show 2016-04-15 11:34:50 +02:00
Felix Niklas
fa68eaf5de notifications popover: fix height issues - switch to css 2016-04-15 11:22:38 +02:00
Martin Edenhofer
8015303032 Fixed ticket selector if user ist not set. 2016-04-14 11:39:54 +02:00
Martin Edenhofer
9469409cde Applied new pre_condition. 2016-04-14 10:08:08 +02:00
Martin Edenhofer
4731cfb16d Fixed typo. 2016-04-14 09:27:16 +02:00
Martin Edenhofer
6d02578d61 Moved to global Observer::Transaction.commit which executes model based transitions. 2016-04-14 09:17:13 +02:00
Martin Edenhofer
ef64d1e1d7 Moved to new event buffer api. 2016-04-14 01:50:22 +02:00
Martin Edenhofer
ed5b058d6e Refactoring of NotificationFactory. 2016-04-14 01:40:37 +02:00
Martin Edenhofer
a71a87be60 Hide login_failed changes from activity stream. 2016-04-13 09:34:45 +02:00
Martin Edenhofer
6db0e5fd87 Reset UserInfo.current_user_id to 1 if no user is authenticated. 2016-04-13 09:32:49 +02:00
Martin Edenhofer
79bfd021f9 Improved activity stream duplicate/delay check. 2016-04-13 09:30:44 +02:00
Martin Edenhofer
bb1907415b Reset UserInfo.current_user_id bevor processing of postmaster filters. 2016-04-12 17:21:48 +02:00
Martin Edenhofer
fb25016c8e Save changes set by x-zammad-ticket-followup-* headers. 2016-04-12 17:08:26 +02:00
Martin Edenhofer
ea9e323df3 Fixed inherent issue with class variable. 2016-04-12 16:09:38 +02:00
Martin Edenhofer
5ac1bd108a Added nagios integration. 2016-04-12 15:32:45 +02:00
Martin Edenhofer
7c75fd35bd Fixed typo. 2016-04-12 14:56:41 +02:00
Martin Edenhofer
aadcfd8668 Split manage into separate files. 2016-04-12 14:33:37 +02:00
Martin Edenhofer
3cb70e3a45 Aded doc references. 2016-04-12 13:51:28 +02:00
Martin Edenhofer
f48e742d23 Added icinga integration. 2016-04-12 13:44:28 +02:00
Martin Edenhofer
1fd36cfc6a Moved postmaster filter options to config. 2016-04-12 09:25:20 +02:00
Martin Edenhofer
6f56399af2 Fixed column_select with integer values. 2016-04-12 00:47:27 +02:00
Martin Edenhofer
065605fe3c Added support for inline translation mode. 2016-04-11 15:31:08 +02:00
Martin Edenhofer
4fc0967ea1 Improved device detection for user agent and different countries. 2016-04-11 15:29:07 +02:00
Martin Edenhofer
6bdb6a5e4a Improved device detection for user agent and different countries. 2016-04-11 15:18:18 +02:00
Martin Edenhofer
2a2538a7a9 Improved device detection for user agent and different countries. 2016-04-11 15:15:27 +02:00
Martin Edenhofer
2a295e78ab Improved user device management. 2016-04-11 09:35:27 +02:00
Martin Edenhofer
6b219b724b Improved timing. 2016-04-08 09:15:24 +02:00
Martin Edenhofer
c28dc561c0 Trigger title change for electron integration. 2016-04-08 06:54:24 +02:00
Martin Edenhofer
bfbf8cd164 Trigger title change for electron integration. 2016-04-08 06:52:12 +02:00
Martin Edenhofer
36cdf561d9 Removed not needed console.log entries. 2016-04-06 17:07:11 +02:00
Martin Edenhofer
6ea21048cf Gem update. 2016-04-06 16:50:20 +02:00
Martin Edenhofer
d6610ae906 Removed not longer needed zIndex (from old click catcher). 2016-04-06 16:20:20 +02:00
Martin Edenhofer
db267ec8fd Merge branch 'develop' of github.com:martini/zammad into develop 2016-04-06 16:08:46 +02:00
Martin Edenhofer
e5c0c7f109 Fixed shortcuts. 2016-04-06 16:06:26 +02:00
Felix Niklas
fa012f55f8 fix ticket-zoom sidebar organisation userList 2016-04-06 10:28:29 +02:00
Felix Niklas
3883dd0e68 checkbox form-group: fix spacing 2016-04-06 10:28:09 +02:00
Martin Edenhofer
691f2006b2 Added shortcuts to electron events. 2016-04-05 23:49:45 +02:00
Martin Edenhofer
da3ce257d0 Added context menu, set badge via remote. 2016-04-05 13:01:06 +02:00
Martin Edenhofer
567025bd0a Improved error handling. 2016-04-05 01:02:47 +02:00
Martin Edenhofer
3d594e11b3 Improved App.CollectionController controller. 2016-04-05 00:04:48 +02:00
Martin Edenhofer
15cfe935ea ftp://root.cern.ch is down, take ftp://ftp.gwdg.de for ftp downloads. 2016-04-04 16:17:06 +02:00
Martin Edenhofer
0af243514b Moved to generic App.CollectionController for Tasks and OnlineNotifications controller. 2016-04-04 15:54:37 +02:00
Martin Edenhofer
ada5538e1b Re-render task on renderScreenError(), renderScreenNotFound() and renderScreenUnauthorized() automatically. 2016-04-01 08:20:52 +02:00
Martin Edenhofer
1836522695 Show loading... tab right after tab creation. 2016-04-01 00:35:55 +02:00
Martin Edenhofer
d31e75218f Improved timing. 2016-04-01 00:23:09 +02:00
Martin Edenhofer
2da5759c69 Just update nav if param is given. 2016-04-01 00:21:57 +02:00
Martin Edenhofer
ec2d450ede Speedup initial tab loading. 2016-03-31 23:49:56 +02:00
Martin Edenhofer
79978a823c Moved to queue processing of new executed tasks and queue processing for re-render of task bar to prevent race conditions. 2016-03-31 22:54:45 +02:00
Martin Edenhofer
8195e0f262 Refectory task rendering (just updated certain elements if needed). 2016-03-31 15:41:34 +02:00
Martin Edenhofer
618d583587 Improved electron detection. 2016-03-30 20:44:28 +02:00
Martin Edenhofer
41eb9901d7 Send new location notification after device is saved. 2016-03-30 20:43:38 +02:00
Martin Edenhofer
64296b645d Added electron support as external page. 2016-03-30 16:06:16 +02:00
Martin Edenhofer
fd58ac0a29 Added extra notification for new country signin. 2016-03-30 10:00:21 +02:00
Martin Edenhofer
cba04e153d Small adjustment to browser params. 2016-03-30 08:15:19 +02:00
Martin Edenhofer
bb0dc13cb1 Speed improvements for certain browsers. 2016-03-29 18:57:43 +02:00
Martin Edenhofer
16ee920cf9 Reduced rerendering of attribute bar in ticket zoom 2016-03-29 14:57:49 +02:00
Martin Edenhofer
e0e4fa249c Reuse token field mirror (prevent multiple unclean fields in dom). 2016-03-29 11:10:35 +02:00
Martin Edenhofer
6c7d9bcb4d Improved navigation by keyboard. 2016-03-29 03:10:24 +02:00
Martin Edenhofer
a70377558f Fixed form validation based with different timezones. 2016-03-28 18:05:27 +02:00
Martin Edenhofer
e2f824e301 Prevent reopen tab on closing tabs. 2016-03-28 10:55:15 +02:00
Martin Edenhofer
77c7a421f5 Removed height to have a better support if browser zoom in / zoom out is used. 2016-03-25 16:19:36 +01:00
Martin Edenhofer
595d43d096 Empty old message on connection established. 2016-03-25 16:15:37 +01:00
Martin Edenhofer
ae3c1da114 Only notify new chats if chat is active. 2016-03-25 14:40:43 +01:00
Martin Edenhofer
1b3190ba6c Also log GET/OPTIONS/HEAD requests as device activities. 2016-03-25 14:28:45 +01:00
Martin Edenhofer
e10d530d61 Do not update notify if already notified. 2016-03-25 13:11:24 +01:00
Martin Edenhofer
b75724450b Force update, also if no other attribute has changed. 2016-03-25 13:10:31 +01:00
Martin Edenhofer
8861541f44 Rerender tasks if controller is executed again. 2016-03-25 11:35:50 +01:00
Martin Edenhofer
478f8912af Added chat-notice-message style for client url infos in agent chat client. 2016-03-25 10:29:07 +01:00
Martin Edenhofer
ac60b151ea Code cleanup. 2016-03-25 10:27:52 +01:00
Martin Edenhofer
1030eb1840 Added current url support of clients for agents. 2016-03-25 08:45:21 +01:00
Martin Edenhofer
81acdbb06a Changed default sort order. 2016-03-25 08:19:59 +01:00
Martin Edenhofer
3d76ab5cd2 Inline translations for attributes. 2016-03-25 08:02:04 +01:00
Martin Edenhofer
ed89aa5da8 Improved error handling. 2016-03-24 16:22:23 +01:00
Martin Edenhofer
698f69d1b0 Added chat window details popover. 2016-03-24 15:34:49 +01:00
Martin Edenhofer
3b47640d01 Update page title my task manager after task got shown. 2016-03-24 15:21:00 +01:00
Martin Edenhofer
1db7d46569 Added device info. 2016-03-24 14:39:47 +01:00
Felix Niklas
b9e0317332 chat client: fix autogrow 2016-03-24 12:33:23 +01:00
Felix Niklas
43cbe66559 fix chat designer chat preview 2016-03-24 12:31:10 +01:00
Felix Niklas
ea68cfe3c7 chat.js: make chat fixed position more robust 2016-03-24 11:03:20 +01:00
Martin Edenhofer
e3ea9a8ce2 Check if task title need to be updated. 2016-03-24 10:29:17 +01:00
Martin Edenhofer
eceb1d3894 Reduced amount of re-render tasks (set is-active class at runtime without re-rendering complete task list). 2016-03-24 09:33:50 +01:00
Felix Niklas
2c03e4a8e6 add info-badge to chat-window 2016-03-23 16:25:25 +01:00
Felix Niklas
6bd85db5f0 fix that waitingCustomer popover would animate 2016-03-23 16:24:59 +01:00
Felix Niklas
bd95378ebe let info-badge inherit text-color 2016-03-23 16:24:33 +01:00
Felix Niklas
99f1c38d05 remove default padding from unorderd lists 2016-03-23 16:23:43 +01:00
Felix Niklas
89078feca4 QA chat info popovers 2016-03-23 15:16:19 +01:00
Felix Niklas
8b09d2f97b fix popover bottom spacing 2016-03-23 15:16:04 +01:00
Felix Niklas
436dab6a1a refactor userList 2016-03-23 15:15:38 +01:00
Felix Niklas
77eccea2c9 avatar: add size 30, fix unique scaled avatar background 2016-03-23 15:14:42 +01:00
Felix Niklas
fa223d560f use info icon in customer chat 2016-03-23 14:26:53 +01:00
Felix Niklas
d0b820fcad fix php errors in license editor 2016-03-23 14:26:35 +01:00
Felix Niklas
1e8d5dd04d add info icon, remove website and zammad icon 2016-03-23 14:26:22 +01:00
Martin Edenhofer
6a0c008a03 Fixed modal_ready(). Fixed new selector for facebook login page. 2016-03-23 08:40:05 +01:00
Martin Edenhofer
984bb9c4f5 Code layout improvements. 2016-03-23 08:24:25 +01:00
Martin Edenhofer
4d837d7bd4 With until open animation is finished. 2016-03-23 06:55:34 +01:00
Martin Edenhofer
55116a4a75 Improved tests. 2016-03-23 00:12:50 +01:00
Martin Edenhofer
77bab373c9 Updated tests regarding new puma behaviour with no specified content type on request. 2016-03-22 21:02:23 +01:00
Martin Edenhofer
3277ab23d5 Wait until modal is shown. 2016-03-22 17:40:44 +01:00
Felix Niklas
cf60bc3fa4 make customer chat layout_ref work again 2016-03-22 17:39:01 +01:00
Felix Niklas
bb5e71e321 ticket zoom: align controls 2016-03-22 17:38:21 +01:00
Felix Niklas
0ed733b9c9 customer chat: remove unnecessary @extend Spine.Events 2016-03-22 16:15:19 +01:00
Felix Niklas
b318777201 customer chat: fix conflict 2016-03-22 16:13:51 +01:00
Felix Niklas
f0ebc5ac54 Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-22 16:07:15 +01:00
Felix Niklas
e8605c7659 adjust .btn color to input color 2016-03-22 16:06:56 +01:00
Felix Niklas
08bbc822f3 customer chat: add element bindings for better performance 2016-03-22 16:06:40 +01:00
Roy Kaldung
169386a941 changed content of en mails 2016-03-22 14:54:31 +01:00
Roy Kaldung
427f4fd1cd fixed typo 2016-03-22 14:38:08 +01:00
Martin Edenhofer
5907f51808 Improved timing. 2016-03-22 13:58:48 +01:00
Martin Edenhofer
fe9174da9c Prevent multiple online notification objects and replace ctrl+alt+y with ctrl+alt+a (because of issues in browsers). 2016-03-22 11:50:12 +01:00
Martin Edenhofer
e6ea12c75c Do not remove permanent .popover--notifications widget. 2016-03-22 09:50:35 +01:00
Felix Niklas
b0c14b81d5 Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-22 08:33:49 +01:00
Felix Niklas
b49b1fd00b Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	app/assets/javascripts/app/controllers/widget/online_notification.coffee
2016-03-22 08:33:39 +01:00
Martin Edenhofer
dc4c8b0e99 Just enable keyboard bindings if widget is shown. 2016-03-22 08:26:04 +01:00
Felix Niklas
a12eee918c online_notification: optimize height calculation 2016-03-22 07:57:35 +01:00
Martin Edenhofer
715ed8e6da Fixed group_create helper. 2016-03-21 21:51:05 +01:00
Martin Edenhofer
205ab421bb Fixed ticket creation. 2016-03-21 20:10:01 +01:00
Martin Edenhofer
121bf3c271 Fixed keyboard navigation and min. height with empty online notification. 2016-03-21 16:48:43 +01:00
Martin Edenhofer
cc12b91961 Upgrade to latest gems. 2016-03-21 16:15:06 +01:00
Martin Edenhofer
fd93057d45 Removed not longer needed @container, added js-notificationsContainer for browser testing. 2016-03-21 16:11:49 +01:00
Martin Edenhofer
21817abab6 Fixed ff click on js-textarea issue on ticket update. 2016-03-21 14:39:18 +01:00
Martin Edenhofer
5e11344fb9 Improved helper (use internal select and set). 2016-03-21 13:51:55 +01:00
Martin Edenhofer
abb049ecec Reduced amount of refresh (-> rerender) events. 2016-03-21 08:49:36 +01:00
Martin Edenhofer
6953ae52af Fixed not removable items. Automatically shown online notification popover on new messages. Defined missing @header element. 2016-03-20 21:41:19 +01:00
Martin Edenhofer
cc2a8ce0c1 Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	app/assets/javascripts/app/controllers/navigation.coffee
#	app/assets/javascripts/app/controllers/widget/online_notification.coffee
2016-03-20 21:10:04 +01:00
Martin Edenhofer
d4ec678238 Moved to assets for sla, overview and jobs. 2016-03-20 21:04:58 +01:00
Martin Edenhofer
30e28e71f6 Added asset support for jobs, overviews and slas. 2016-03-20 20:09:52 +01:00
Felix Niklas
8685bdb42a Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-18 17:34:33 +01:00
Felix Niklas
2f2e7a6fbd fix notifications height bug and remove popover dependencies 2016-03-18 17:34:24 +01:00
Martin Edenhofer
96fbc9034e Added next_run_at attribute to jobs. 2016-03-18 15:29:03 +01:00
Martin Edenhofer
563f4d9e1d Allow to fail twitter and facebook integration tests. 2016-03-18 08:14:39 +01:00
Martin Edenhofer
e3dbb6f401 Fixed test. 2016-03-18 07:14:59 +01:00
Martin Edenhofer
1950f82322 Added ticket job feature. 2016-03-18 03:04:49 +01:00
Martin Edenhofer
cf2b451d8c Added timer widget. 2016-03-17 21:48:48 +01:00
Martin Edenhofer
93743ec281 Do not start in cluster mode per default. 2016-03-17 13:31:36 +01:00
Martin Edenhofer
f96e63bd88 Improved code layout. 2016-03-17 13:30:49 +01:00
Martin Edenhofer
32fcd432f2 Improved reply all detection. 2016-03-17 13:30:29 +01:00
Martin Edenhofer
3fcc206306 Upgrade to puma 3.1. 2016-03-17 11:58:42 +01:00
Martin Edenhofer
a2b0fe69b9 Cleanup. 2016-03-17 10:32:37 +01:00
Martin Edenhofer
af4e744e73 Fixed array concat. 2016-03-17 08:34:18 +01:00
Martin Edenhofer
98d9596084 Fixed not always shown "reply all" feature. 2016-03-17 08:32:06 +01:00
Martin Edenhofer
d38d062d1d Fixed not always shown "reply all" feature. 2016-03-17 08:27:57 +01:00
Martin Edenhofer
44a0eed6d8 In certain cases puma does not set application root. Moved to set cache_store via config/application.rb. 2016-03-16 11:11:00 +01:00
Martin Edenhofer
292a31b6ef Improved error handling. 2016-03-16 10:53:41 +01:00
Martin Edenhofer
c0eae369d6 Improved ticket follow up detection if more T#'s in subject. 2016-03-16 10:36:51 +01:00
Martin Edenhofer
4a77b273e5 Changed timestamps to make test more robust. 2016-03-16 09:58:49 +01:00
Martin Edenhofer
dd03d2d256 Fixed @ => issue. 2016-03-16 08:50:41 +01:00
Martin Edenhofer
bb939c9a0e Reduced logging. 2016-03-16 08:19:34 +01:00
Martin Edenhofer
293468a6f1 Ignore empty relations. 2016-03-16 08:05:03 +01:00
Martin Edenhofer
e5647be022 Improved error handling. 2016-03-16 08:04:36 +01:00
Martin Edenhofer
7b8eea8fd9 Gem updates. 2016-03-15 17:10:11 +01:00
Martin Edenhofer
24390fe4f3 Fixed full screen for auto wizard. 2016-03-15 17:09:38 +01:00
Felix Niklas
f2a54bdddc Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-15 16:44:05 +01:00
Felix Niklas
fe3c8d698d optimize table render performance by precalculating widths 2016-03-15 16:43:49 +01:00
Martin Edenhofer
d8d6081bcc Improved timing. 2016-03-15 16:01:28 +01:00
Martin Edenhofer
7d475b1ac4 Improved error handling. 2016-03-15 12:47:26 +01:00
Felix Niklas
af2488f4d7 Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-15 11:31:19 +01:00
Martin Edenhofer
360dc08c03 Fixed ff issue with selenium - element is not currently visible on empty search. 2016-03-15 11:24:42 +01:00
Felix Niklas
3e491be445 fix channel/chat preview 2016-03-15 10:48:46 +01:00
Felix Niklas
f41577b7c7 icons: rename zammad->web; website->form 2016-03-15 10:22:31 +01:00
Felix Niklas
1cb04adb95 fix table width when sortable is active 2016-03-15 10:15:00 +01:00
Martin Edenhofer
bfefdb8470 Click in icon to empty search (ff issue with selenium - element is not currently visible). 2016-03-15 09:21:33 +01:00
Martin Edenhofer
72d22ad56b Add * automatically to normal queries. 2016-03-14 23:29:39 +01:00
Martin Edenhofer
9717296f7d Improved timing. 2016-03-14 23:19:11 +01:00
Martin Edenhofer
ecdca2f202 Fixed delete if sortable is active. 2016-03-14 23:18:53 +01:00
Martin Edenhofer
cceb87bc53 Show error message if user add failed. 2016-03-14 23:07:56 +01:00
Martin Edenhofer
b5a263ab90 Fixed undefined variable syntax error. 2016-03-14 21:53:50 +01:00
Martin Edenhofer
03901a6dab Drop test and production env. 2016-03-14 21:53:03 +01:00
Martin Edenhofer
e7bd393b4e Fixed check()/uncheck() helper to work with checkbox-replacement. 2016-03-14 21:03:51 +01:00
Martin Edenhofer
895d443d96 Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-14 19:08:59 +01:00
Felix Niklas
b8bf9da248 coffelint fix 2016-03-14 16:53:59 +01:00
Felix Niklas
087e83940f fix notification remove overflow bug 2016-03-14 16:46:43 +01:00
Felix Niklas
b0ac1ddc1e load application.css for all media 2016-03-14 16:44:28 +01:00
Martin Edenhofer
568671401e Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-14 16:05:59 +01:00
Martin Edenhofer
d8bb951032 Added overview user relation to set overviews for multiple users. Moved to new column_select widget. 2016-03-14 16:05:52 +01:00
Felix Niklas
661c83d574 fix coffee lint 2016-03-14 16:01:04 +01:00
Felix Niklas
aa533af77c Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-14 15:57:47 +01:00
Felix Niklas
41e11d9d3f give sortable tables visual affordance that they're draggable 2016-03-14 15:57:27 +01:00
Felix Niklas
5a71589655 add icon draggable and icon zammad 2016-03-14 15:56:56 +01:00
Felix Niklas
0f02b440d4 table drag and drop: keep row width 2016-03-14 15:35:40 +01:00
Felix Niklas
7fcb2699b8 checkbox list: switch to our checkboxes + label style 2016-03-14 15:11:23 +01:00
Martin Edenhofer
de56206045 Deliver objects with associations in index list (like it is on show). 2016-03-14 14:34:35 +01:00
Martin Edenhofer
c27aee75eb Added ' for css selector to activate last used tab. 2016-03-14 10:46:37 +01:00
Martin Edenhofer
845b87ceb0 Use full width of config setting. 2016-03-14 10:29:22 +01:00
Martin Edenhofer
d2ba6d1f22 QA, removed not needed #app. 2016-03-14 10:28:50 +01:00
Felix Niklas
4b71a8caac Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-14 10:10:08 +01:00
Felix Niklas
4a7c0c68f7 improve table spacing 2016-03-14 10:07:34 +01:00
Martin Edenhofer
489544995c Added print styles for overviews and dashboard. 2016-03-14 09:15:24 +01:00
Martin Edenhofer
4bf9be2332 Fixed overview_update helper. 2016-03-14 08:24:28 +01:00
Martin Edenhofer
d3535a6a53 Added TicketState records to validate test. 2016-03-14 08:11:47 +01:00
Martin Edenhofer
7b2a8b507d Fixed runtime error with fixums. 2016-03-14 06:52:57 +01:00
Martin Edenhofer
4324db9b9f Improved ticket selector. Added browser tests. 2016-03-14 00:25:05 +01:00
Martin Edenhofer
df1420d5db Added set to current user for macros. 2016-03-13 23:58:46 +01:00
Martin Edenhofer
4299f3ea4c Fixed not shown overview count. 2016-03-13 23:56:06 +01:00
Martin Edenhofer
ee25ccbd32 Removed not longer needed prio param (already filled in backend). 2016-03-12 18:07:55 +01:00
Martin Edenhofer
6b778c27ee Fixed not recognised overview sort by prio. Ignore auto generated link on create if already present. 2016-03-12 17:23:51 +01:00
Martin Edenhofer
00abecbd98 Added table dnd support for sort prio in overviews. 2016-03-12 01:49:51 +01:00
Martin Edenhofer
34473a6d87 Added jquery ui autocomplete. 2016-03-12 01:40:38 +01:00
Martin Edenhofer
d3b423dcaf Upgrade to jquery ui 1.11.4 (removed not longer needed css). 2016-03-12 01:00:05 +01:00
Felix Niklas
d4c572fe08 add print style for ticket zoom 2016-03-11 15:34:43 +01:00
Felix Niklas
c2c9949f25 add shadow to channel selector 2016-03-11 15:07:01 +01:00
Felix Niklas
35dc4f3b9a smaller tab close click area 2016-03-11 15:04:07 +01:00
Felix Niklas
232b0807ca add website icon for channel: website form 2016-03-11 14:57:40 +01:00
Martin Edenhofer
4b37e4da2b Improved browser test. 2016-03-11 06:58:27 +01:00
Martin Edenhofer
2c50fcfa39 Improved imap folder support in admin interface. 2016-03-10 16:47:42 +01:00
Martin Edenhofer
ec1c9a548e Added IMAP folder support. 2016-03-10 14:41:42 +01:00
Martin Edenhofer
ee991e1423 Browser tests enhanced. 2016-03-10 08:39:41 +01:00
Martin Edenhofer
dc8d9b2461 Fixed SQL error. 2016-03-09 08:17:49 +01:00
Martin Edenhofer
dbb4807149 Added created_at and updated_at to overview order by attributes. 2016-03-09 08:17:23 +01:00
Martin Edenhofer
a17a1d3d41 Do not close dropdown and enter with empty selection. 2016-03-09 08:14:28 +01:00
Martin Edenhofer
aa999012fd Moved to App.Utils.replaceTags() and fixed quoting issues. 2016-03-09 08:10:32 +01:00
Martin Edenhofer
f6deecacd4 Moved to App.Utils.replaceTags() and fixed quoting issues. 2016-03-09 08:09:56 +01:00
Martin Edenhofer
18e407693a Add current user to process text modules. 2016-03-09 08:05:34 +01:00
Martin Edenhofer
26bdc0c665 Improved wording. 2016-03-09 08:04:56 +01:00
Martin Edenhofer
5e397f84a7 Add current user to process text modules. 2016-03-09 08:04:06 +01:00
Martin Edenhofer
70bd720caf Improved creation of test tickets check. 2016-03-09 08:03:34 +01:00
Martin Edenhofer
ea4fa03561 Fixed Model.search_index_reload, support ignore_ids. 2016-03-08 07:43:36 +01:00
Martin Edenhofer
483ecff67b Code cleanup. 2016-03-08 07:41:09 +01:00
Martin Edenhofer
1721d92020 Fixed keys. 2016-03-08 07:33:25 +01:00
Martin Edenhofer
33777c2bab Code cleanup. 2016-03-08 07:32:58 +01:00
Martin Edenhofer
00bc40e4cb Fixed redirect after ticket creation. 2016-03-07 22:24:47 +01:00
Martin Edenhofer
71f807af0f Added only_shown_if_selectable support for form elements. 2016-03-07 07:46:11 +01:00
Martin Edenhofer
8eb2c44304 Improved translations, fixed test. 2016-03-07 04:24:08 +01:00
Martin Edenhofer
ba2d92a15d Split of App.Wizard into App.WizardModal and App.WizardFullScreen. 2016-03-07 03:37:54 +01:00
Martin Edenhofer
988b5848c6 Added new presort items. 2016-03-07 03:36:47 +01:00
Martin Edenhofer
eb2c447e41 Improved translations. 2016-03-07 02:25:52 +01:00
Martin Edenhofer
12a803b638 Improved timing. 2016-03-04 16:37:11 +01:00
Felix Niklas
e814452886 fix btn--text in buttonDropdown 2016-03-04 15:40:07 +01:00
Felix Niklas
101c6fb98a fix btn--text on see-more 2016-03-04 15:34:24 +01:00
Felix Niklas
55a3e88ad8 add scheduler to developer server start script 2016-03-04 15:27:06 +01:00
Felix Niklas
5864658923 fix space-left with btn--text 2016-03-04 15:21:33 +01:00
Felix Niklas
1eb6588db1 increase btn--text clickarea 2016-03-04 15:05:07 +01:00
Martin Edenhofer
76006a5159 Removed initial delay (not longer needed because of fixed rendering issue). 2016-03-04 13:32:27 +01:00
Martin Edenhofer
176b377326 Disabled overviews (it's an expert setting). 2016-03-04 12:01:26 +01:00
Martin Edenhofer
98e384d266 Changed position of overviews. 2016-03-04 11:58:19 +01:00
Martin Edenhofer
00e06396ab Fixed rerender issue with missing content. 2016-03-04 11:43:55 +01:00
Martin Edenhofer
68278ca828 Increased click area on clues (to support clicks with i18n "ctrl+alt+t" feature). 2016-03-04 11:07:04 +01:00
Martin Edenhofer
fbd125f80a Fixed typos and added support to use i18n "ctrl+alt+t" feature. 2016-03-04 11:05:56 +01:00
Martin Edenhofer
2825da2ca0 Code cleanup. Removed not need clone2(). 2016-03-04 09:28:16 +01:00
Martin Edenhofer
d9cfcbbd34 Do not cancel ajax call if widget is removed/closed. 2016-03-03 17:42:19 +01:00
Martin Edenhofer
7e99983d2d Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-03 15:13:24 +01:00
Martin Edenhofer
31c3904848 Wait until overview is created. 2016-03-03 15:13:06 +01:00
Felix Niklas
0972180e57 Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-03 15:12:56 +01:00
Felix Niklas
589a45565f chat client: fix auto-open chat on slow connections 2016-03-03 15:12:53 +01:00
Martin Edenhofer
a9baf7acdc Added Cc support for email tickets. 2016-03-03 14:39:10 +01:00
Felix Niklas
66800ba455 checkbox-replacement: remove visual focus on click 2016-03-03 12:16:19 +01:00
Felix Niklas
e253b4cd23 icons: add second changeable color
a purple #BD0FE1 that can be set via color (uses currentColor)
2016-03-03 11:41:31 +01:00
Felix Niklas
132419b276 Merge branch 'develop' of github.com:martini/zammad into develop 2016-03-03 11:39:55 +01:00
Felix Niklas
2b47677fea make checkboxes and radios focusable 2016-03-03 11:39:22 +01:00
Martin Edenhofer
8cafff4070 Added z-index to default form css. 2016-03-03 11:30:43 +01:00
Martin Edenhofer
9d4c865979 Push objects just once to client. 2016-03-03 09:56:13 +01:00
Martin Edenhofer
8cce6a6e40 Bind to list updates directly after boot. 2016-03-03 03:26:45 +01:00
Martin Edenhofer
fb1a8987aa Rewrite of overview index and list backend. 2016-03-03 02:51:24 +01:00
Martin Edenhofer
8ba009168e Improved test. 2016-03-02 17:26:19 +01:00
Martin Edenhofer
965ec293eb Moved back to pumactl for puma 2.16. 2016-03-02 16:41:12 +01:00
Martin Edenhofer
b43854a9aa To many puma issues. Moved back to 2.16. 2016-03-02 14:13:21 +01:00
Martin Edenhofer
42b5e37c9c Improved file location detection. 2016-03-02 11:43:57 +01:00
Martin Edenhofer
f4f99306b9 It seems to be a bug in puma 3.0.2, not able to use own --pid param. 2016-03-02 10:43:51 +01:00
Martin Edenhofer
7dcd98a5e8 Moved to puma 3 start command via rails s. 2016-03-02 09:10:55 +01:00
Martin Edenhofer
86a35b8ada Wait till services are ready. 2016-03-01 22:58:05 +01:00
Martin Edenhofer
4efc0c37e6 New API for gem browser 2, use ua instand of "Generic Browser". 2016-03-01 17:04:15 +01:00
Martin Edenhofer
ca9651d974 New API for gem browser 2, use ua instand of "Generic Browser". 2016-03-01 16:53:25 +01:00
Martin Edenhofer
286e1591c6 New API for gem browser 2. 2016-03-01 15:45:33 +01:00
Martin Edenhofer
ba3f868638 Upgrade to new rubocop. 2016-03-01 15:26:46 +01:00
Martin Edenhofer
8df44fd72b Gem update. 2016-03-01 15:19:59 +01:00
Martin Edenhofer
0a51c96324 Added first steps browser tests. 2016-03-01 15:12:27 +01:00
Martin Edenhofer
886618dfec Fixed not shown initial ticket customer avatar. 2016-03-01 15:10:47 +01:00
Martin Edenhofer
02f760a627 Fixed not shown initial ticket customer avatar. 2016-03-01 12:02:32 +01:00
Martin Edenhofer
6ea24bf8a0 Fixed file permission. 2016-03-01 12:01:24 +01:00
Martin Edenhofer
581328361b Fixed role assignment. 2016-03-01 00:55:40 +01:00
Martin Edenhofer
6f5c0d6004 Added first steps test ticket feature. 2016-03-01 00:52:51 +01:00
Martin Edenhofer
77d4f00957 Fixed losing article text in tab close (was ignored on changes check). 2016-02-29 16:00:11 +01:00
Martin Edenhofer
f4c78b9502 Improved file backend and delete empty directories if file got removed. 2016-02-29 13:42:37 +01:00
Martin Edenhofer
3713014079 Play online sound only once at time. 2016-02-29 13:42:18 +01:00
Martin Edenhofer
84581e372d Added config option for deliver alarm for events or not (because of Lightning Calendar and not closable alarm windows). 2016-02-29 13:05:21 +01:00
Martin Edenhofer
077eae7ced Improved file backend and delete empty directories if file got removed. 2016-02-29 12:58:21 +01:00
Martin Edenhofer
77a351faaf Reduced count of directories (to make backups faster). 2016-02-29 08:25:52 +01:00
Martin Edenhofer
778cddda37 Improved websocket reconnection after wakeup. 2016-02-29 08:24:42 +01:00
Martin Edenhofer
8c6d46bc3c Update to jquery 2.2.1. 2016-02-28 02:19:35 +01:00
Martin Edenhofer
6b9e5f75f2 Only show overview edit options as admin. 2016-02-28 01:14:09 +01:00
Martin Edenhofer
58b2acb184 Updated to new default views. 2016-02-27 22:32:32 +01:00
Martin Edenhofer
6df9dad5b4 Do only local auth checks (do ldap tests via integration tests). 2016-02-27 17:00:04 +01:00
Martin Edenhofer
4426e83643 Added tests to check if user want to get notifications based on own notification settings. 2016-02-27 12:48:44 +01:00
Martin Edenhofer
77e61c3631 Add silent option to web notifications (not supported in firefox right now - hopefully soon). 2016-02-26 20:37:38 +01:00
Martin Edenhofer
09a49b0a48 Added auto support for online notifications. 2016-02-26 20:20:36 +01:00
Martin Edenhofer
f1e66c3973 Removed not longer needed info. 2016-02-26 20:18:22 +01:00
Martin Edenhofer
2575abf380 Improved tests. 2016-02-26 13:56:36 +01:00
Martin Edenhofer
9084c99d4b Added calendar subscription tests. 2016-02-26 13:19:57 +01:00
Martin Edenhofer
d4def003ba Removed logging. 2016-02-26 11:51:55 +01:00
Martin Edenhofer
a4197a68f0 Replaced not working shortcut on win, alt+ctrl+t with alt+ctrl+v. 2016-02-26 00:39:28 +01:00
Martin Edenhofer
3f0685a450 Improved permission check in fronted. 2016-02-26 00:33:42 +01:00
Martin Edenhofer
fb5927eeaf Improved scrolling with keyboard shortcuts. 2016-02-25 22:53:14 +01:00
Martin Edenhofer
1ff11fe3a4 Added check for reply via email if email address is set for group. 2016-02-25 22:04:51 +01:00
Martin Edenhofer
532d562845 Added keyboard support to online notifications. Added browser tests. Improved search keyboard support. 2016-02-25 21:42:33 +01:00
Martin Edenhofer
105b36c641 Removed obsolet css. 2016-02-25 19:53:59 +01:00
Martin Edenhofer
af29df04c0 Fixed timezone issue and added alarm support. 2016-02-25 16:30:33 +01:00
Martin Edenhofer
ac1c17fb2a Small testing improvements. 2016-02-25 15:20:22 +01:00
Martin Edenhofer
38317bbe8b Keyboard shortcut improvements and browser tests. 2016-02-25 13:45:46 +01:00
Martin Edenhofer
17b171496c Recover of needed code, dropped by mistake. 2016-02-25 08:07:02 +01:00
Martin Edenhofer
b4ebef16a9 Close keyboard shortcuts modal on alt+ctrl+h again. 2016-02-25 08:01:15 +01:00
Martin Edenhofer
ffe011553d Added keyboard shortcut support. 2016-02-25 06:44:17 +01:00
Martin Edenhofer
3d372543b2 Fixed test (just self seen time has changed). 2016-02-24 08:05:03 +01:00
Martin Edenhofer
44bff0055a Reduced time from 35 min to 10 minutes until own read notifications are deleted (get long online notifications faster clean). 2016-02-24 06:27:47 +01:00
Martin Edenhofer
1aae6eacb5 Small code layout improvement to prevent not necessary translations. 2016-02-24 06:26:14 +01:00
Martin Edenhofer
84894944a7 Added html2text convert for desktop notifications. 2016-02-23 15:46:48 +01:00
Martin Edenhofer
320fdc1679 Fixed test, applied new translations. 2016-02-23 13:01:39 +01:00
Martin Edenhofer
c769d00943 Fixed migration. 2016-02-23 11:59:57 +01:00
Martin Edenhofer
34e92456f7 Fixed form initialisation with empty model/attributes. 2016-02-23 11:54:35 +01:00
Martin Edenhofer
cca9740465 Do escalation recalculations with user_id 1. 2016-02-23 10:19:06 +01:00
Martin Edenhofer
62b5b92a2d Added license of word_filter.js. 2016-02-23 01:33:16 +01:00
Martin Edenhofer
91dc89c32b Added escalation notification. 2016-02-23 00:28:13 +01:00
Martin Edenhofer
fa653b3743 Remove content if no session exists. 2016-02-22 21:48:51 +01:00
Martin Edenhofer
10f13cb618 Improved activity stream messages. 2016-02-22 20:58:23 +01:00
Martin Edenhofer
2c6a1c542a Added missing template for user invite. 2016-02-22 16:29:32 +01:00
Martin Edenhofer
71bed32311 Fixed doc. 2016-02-22 16:15:22 +01:00
Martin Edenhofer
2d4b7dab56 Fixed reminder notifications. 2016-02-22 13:54:28 +01:00
Martin Edenhofer
50971e4425 Mute task on click in .main. 2016-02-22 11:59:08 +01:00
Martin Edenhofer
1ce6bd18e1 Just send notification once a day (not in 24 hours turns). 2016-02-22 11:05:33 +01:00
Martin Edenhofer
0dd0288cb0 Set Rails.configuration.webserver_is_active in test block. 2016-02-22 09:51:56 +01:00
Martin Edenhofer
6411a34a0f Added .sort for array comparing. 2016-02-22 09:51:32 +01:00
Martin Edenhofer
57b1f3409e Improved auto seen feature for online notifications. 2016-02-22 08:58:33 +01:00
Martin Edenhofer
c43274e518 Added cleanup after test. 2016-02-21 12:54:27 +01:00
Martin Edenhofer
ccc61277f8 Improved OnlineNotification.cleanup, just delete notification after 35 min. if user read it by him self. If auto seen is set (by some other user), just delete the online notification after 8 hours. 2016-02-21 12:43:16 +01:00
Martin Edenhofer
08bd5186b7 So not set pending reminder online notifications to seen. 2016-02-20 14:09:56 +01:00
Martin Edenhofer
77fedbe108 Only set online notifications to seen for non ticket owners. 2016-02-20 13:36:59 +01:00
Martin Edenhofer
7c46db4be4 Added support of pending reminder notifications. 2016-02-20 11:12:15 +01:00
Martin Edenhofer
8f1dd9cccd Improved test. 2016-02-20 09:08:35 +01:00
Martin Edenhofer
497b659500 Fixed text/html article quoting in notifications. 2016-02-20 08:43:44 +01:00
Martin Edenhofer
742e117b0b Added ticket.get_references, added also reverences header to notification emails. 2016-02-20 08:14:51 +01:00
Martin Edenhofer
504fa4e6c9 Improved markup. 2016-02-20 08:12:04 +01:00
Martin Edenhofer
e0ec2fbd12 Extended NilClass with empty? method. 2016-02-19 23:34:57 +01:00
Martin Edenhofer
d54bb4fa05 Moved to new notification factory. Added notification templates to app/views/mailer/*. 2016-02-19 22:05:36 +01:00
Felix Niklas
159ff5f21a add form--flexibleWidth modifier for natural width controls 2016-02-18 16:09:01 +01:00
Felix Niklas
af13eb83f4 css: undo flexible sized controls 2016-02-18 15:44:48 +01:00
Martin Edenhofer
f9298d1174 Fixed permission check. 2016-02-18 15:27:05 +01:00
Martin Edenhofer
19a15dd804 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-17 19:37:23 +01:00
Martin Edenhofer
c0fece6f0d Added user (agent & customer) invite feature in first steps. 2016-02-17 19:36:33 +01:00
Felix Niklas
9e40e36bd8 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-17 18:12:43 +01:00
Felix Niklas
0f21655439 stretch out some controls to 100% width 2016-02-17 18:12:39 +01:00
Felix Niklas
ef83cfdeab profile/notification: add sound picker and mute checkbox 2016-02-17 17:46:36 +01:00
Felix Niklas
7bdfa45963 allow margin on last form-group element 2016-02-17 15:31:43 +01:00
Felix Niklas
ea2ae57460 forms test: make form-controls only as long as necessary 2016-02-17 15:30:52 +01:00
Felix Niklas
ade9ad62e3 settings-list-controls, a new class promoting bigger click areas for controls in settings list 2016-02-17 15:30:05 +01:00
Martin Edenhofer
58396da9ae Added mysql error message. 2016-02-17 15:15:26 +01:00
Felix Niklas
5437db72e6 css: refactor controls-select to controls--select (modifier) 2016-02-17 15:00:29 +01:00
Felix Niklas
04e748995a profile/devices tbody fix closing tag 2016-02-17 14:59:45 +01:00
Felix Niklas
ef621269f9 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-17 09:22:11 +01:00
Martin Edenhofer
2d88c25b36 Added preferences permission check. 2016-02-16 20:34:37 +01:00
Martin Edenhofer
a20c6e438a Added support to show error message of object was not able to create. 2016-02-16 20:00:27 +01:00
Martin Edenhofer
3bd759e23f Fixed test. 2016-02-16 19:58:41 +01:00
Felix Niklas
c84207280f clear up icon licensing, replace unlicensed icons 2016-02-16 16:49:29 +01:00
Martin Edenhofer
0c221925a8 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-16 16:41:51 +01:00
Martin Edenhofer
d9e9469f4d Added support to show error message of object was not able to create. 2016-02-16 16:41:33 +01:00
Felix Niklas
62003f7691 update icons license workflow, add authors 2016-02-16 11:49:12 +01:00
Felix Niklas
fa8fd5698f Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-16 09:30:36 +01:00
Felix Niklas
9d18e56365 chat channel: add eyedropper and remove iframe 2016-02-16 09:29:11 +01:00
Felix Niklas
9c01acee9b css: refactor controls--emailSwitch to generic --button 2016-02-16 09:28:56 +01:00
Martin Edenhofer
b338e10610 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-15 17:50:53 +01:00
Martin Edenhofer
675eeeee9e Moved to quit 1.21 and fixed ui test. 2016-02-15 17:50:35 +01:00
Felix Niklas
e3fd680c46 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-15 16:43:14 +01:00
Felix Niklas
6e287ac0a1 column select: disable double click 2016-02-15 16:43:07 +01:00
Felix Niklas
479cf9df03 chat settings: adjust controls 2016-02-15 16:36:34 +01:00
Martin Edenhofer
ae37e6ba46 Fixed App.ControllerForm.findForm(), added browser tess. 2016-02-15 13:00:54 +01:00
Felix Niklas
386a752669 column select: prevent enter from bubbling 2016-02-15 12:48:52 +01:00
Martin Edenhofer
6afe4d6b08 Added new feature to notify user about new app version to force to reload the web app. 2016-02-12 15:07:15 +01:00
Martin Edenhofer
d101717668 Fixed safari issue with .position().top == 0 and "see more" feature. 2016-02-12 11:18:39 +01:00
Martin Edenhofer
42ac0ea2bf Improved input validation of steam method. 2016-02-12 08:48:33 +01:00
Martin Edenhofer
2814546627 Small adjustment, moved back to 10 lines (not 8) until the signature marker is searched. 2016-02-12 08:18:12 +01:00
Martin Edenhofer
0201d44c69 Improved App.Utils.signatureIdentify(), if an agent message is checked, just different detection priority. 2016-02-11 20:17:39 +01:00
Martin Edenhofer
af746d8f21 Improved internal signature detection. 2016-02-11 17:15:46 +01:00
Martin Edenhofer
e1f85d571f Improved App.Utils.signatureIdentify() again, ignore messages with less then 8 lines and less then 300 chars. 2016-02-11 17:09:06 +01:00
Martin Edenhofer
ed811af795 Improved App.Utils.signatureIdentify(), take messages with more then 300 chars. 2016-02-11 16:57:54 +01:00
Martin Edenhofer
1f063db808 Improved App.Utils.signatureIdentify(), take messages with more then 8 lines (not 10 lines). 2016-02-11 16:31:49 +01:00
Martin Edenhofer
394ca2ff95 Applied style/markup from twitter account edit. 2016-02-11 09:43:17 +01:00
Martin Edenhofer
bf08039a1c Fixed not shown activity stream. 2016-02-11 08:36:14 +01:00
Martin Edenhofer
525edc4ab4 Fixed browser test. 2016-02-11 03:31:18 +01:00
Martin Edenhofer
78226efcbc Init version of first steps. Improved clues (disable navbar highlighting until clues are gone). 2016-02-11 02:57:27 +01:00
Martin Edenhofer
100cca46d0 Improved error handling. 2016-02-11 02:10:23 +01:00
Martin Edenhofer
f1d78ade51 Fixed coffelint check. 2016-02-11 01:36:23 +01:00
Martin Edenhofer
7d039ae1c5 Moved to richtext for text modules and signatures. 2016-02-11 01:26:23 +01:00
Martin Edenhofer
5c50ec5972 Streamline of placeholder format. 2016-02-11 01:24:24 +01:00
Martin Edenhofer
a526c47b8a Moved to richtext for text modules and signatures. 2016-02-11 00:53:48 +01:00
Martin Edenhofer
4438cef46a Fixed #165, missing style on html emails with blockquote in outlook. 2016-02-11 00:09:27 +01:00
Felix Niklas
8965826a3f ticker separator for settings-list 2016-02-10 18:27:29 +01:00
Felix Niklas
697ace1673 columnSelect: darken value pool 2016-02-10 17:32:46 +01:00
Martin Edenhofer
7cd515f6f2 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-10 14:54:21 +01:00
Martin Edenhofer
63485cd861 Added browser tests for searchable_select and column_select. Streamline of test files. 2016-02-10 14:54:07 +01:00
Felix Niklas
ab0f41c043 columnSelect: fix overflow in FF in modals 2016-02-10 12:03:55 +01:00
Felix Niklas
efea3648fc columnSelect: trigger change on the select on change 2016-02-10 11:42:35 +01:00
Felix Niklas
2c5bfea046 columnSelect: render initial selected state 2016-02-10 10:51:43 +01:00
Felix Niklas
2ad3aea16c fix import wizard overflow 2016-02-10 10:13:29 +01:00
Martin Edenhofer
66ec83c323 Fixed language selection (new widget). 2016-02-09 21:02:57 +01:00
Martin Edenhofer
6ede7e5365 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-09 21:01:14 +01:00
Felix Niklas
d6c78469ad searchableSelect: fix autocomp. pos and 2016-02-09 18:31:57 +01:00
Felix Niklas
07925e665c columnSelect: cut off long names 2016-02-09 18:09:50 +01:00
Martin Edenhofer
fe4e656af6 Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	app/assets/javascripts/app/views/profile/notification.jst.eco
2016-02-09 16:46:26 +01:00
Martin Edenhofer
c1595297d3 Improved wording. 2016-02-09 16:36:38 +01:00
Felix Niklas
a224110448 fix btn--secondary 2016-02-09 16:28:39 +01:00
Felix Niklas
5a324c595c Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-09 16:23:22 +01:00
Felix Niklas
bc8315e3fe fix dropdown-header style 2016-02-09 16:22:08 +01:00
Thorsten Eckel
93e3d38b1a Use searchable_select instead of normal select. 2016-02-09 16:18:44 +01:00
Felix Niklas
901759ae16 personal settings: same width notification columns 2016-02-09 16:17:00 +01:00
Felix Niklas
ba17911941 userNotifications layoutRef 2016-02-09 16:08:48 +01:00
Felix Niklas
3979d8f66a columnSelect: change placeholder wording 2016-02-09 16:06:20 +01:00
Felix Niklas
0f6384fd56 columnSelect: disable fixed height 2016-02-09 16:05:42 +01:00
Felix Niklas
0f542c6980 columnSelect: add hover 2016-02-09 15:59:36 +01:00
Felix Niklas
9d5e0f8cd3 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-09 15:50:12 +01:00
Martin Edenhofer
dad59d36c0 Fixed typos. 2016-02-09 15:40:55 +01:00
Felix Niklas
4c6120910f columnSelect widget 2016-02-09 14:30:36 +01:00
Martin Edenhofer
443a3d5de8 Extended with:
1) breake <blockquote> after enter on empty line
2) added cross browser rich text hotkeys
    + metaKey + ctrlKey + u -> Toggles the current selection between underlined and not underlined
    + metaKey + ctrlKey + b -> Toggles the current selection between bold and non-bold
    + metaKey + ctrlKey + i -> Toggles the current selection between italic and non-italic
    + metaKey + ctrlKey + r -> Removes the formatting tags from the current selection
    + metaKey + ctrlKey + h -> Inserts a Horizontal Rule
    + metaKey + ctrlKey + l -> Toggles the text selection between an unordered list and a normal block
    + metaKey + ctrlKey + k -> Toggles the text selection between an ordered list and a normal block
    + metaKey + ctrlKey + o -> Draws a line through the middle of the current selection
    + metaKey + ctrlKey + r -> Removes any hyperlink from the current selection
2016-02-09 13:28:19 +01:00
Martin Edenhofer
352ffd7aa8 Removed not necessary thread and code cleanup. 2016-02-09 01:32:55 +01:00
Martin Edenhofer
363943b196 Removed not necessary hread. 2016-02-09 00:04:08 +01:00
Martin Edenhofer
059be41457 Generate statistic before starting import. 2016-02-08 23:07:14 +01:00
Martin Edenhofer
a5452a4cbd Improved error handling. 2016-02-08 23:06:21 +01:00
Martin Edenhofer
c91a497650 Improved error handling. 2016-02-08 23:05:59 +01:00
Martin Edenhofer
254e3be807 Mainstream of wording. 2016-02-08 22:51:58 +01:00
Martin Edenhofer
07613bbd17 Added color for blockquote to be shown on outlook (T#1116997) 2016-02-08 22:46:05 +01:00
Martin Edenhofer
6d43806e86 Reworked function of profile notification settings. 2016-02-08 22:38:52 +01:00
Martin Edenhofer
1835bd3233 Send chat_session_init with 1 sec. delay to prevent unnecessary bot actions. 2016-02-08 21:49:00 +01:00
Martin Edenhofer
4fc7c9e576 Fixed browser tests. 2016-02-08 21:47:09 +01:00
Felix Niklas
e4b50527c1 enlarge holiday selector checkbox click area 2016-02-08 17:27:04 +01:00
Felix Niklas
772746a710 style notification settings 2016-02-08 17:24:48 +01:00
Felix Niklas
c737813c7d pre-commit: only rubocop and coffeelint 2016-02-08 16:50:14 +01:00
Felix Niklas
2542aa9b78 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-08 16:07:01 +01:00
Felix Niklas
69baae7370 chat client mobile fixes
- increase close button click area (new toggle method)
- increase font-size on mobile to 16px to prevent zoom
- switch to percentage height on mobile instead of vh
- smooth scrolling in the chat body
- disable background scroll
- make modal windows fullscreen (overlap input field)
2016-02-08 16:06:56 +01:00
Martin Edenhofer
9193e836cd Fixed online/email channel selection on notification. 2016-02-08 12:01:32 +01:00
Martin Edenhofer
f7652d7f6c Fixed channel selection. 2016-02-08 08:30:38 +01:00
Martin Edenhofer
52dc82bff9 Added order bei login for ticket.agent_of_group. 2016-02-08 08:27:02 +01:00
Martin Edenhofer
e2ba5ac576 Updated preferences_default_by_role. 2016-02-08 08:25:27 +01:00
Martin Edenhofer
c13dcac0f1 Added migration to update default preferences. 2016-02-08 08:12:04 +01:00
Martin Edenhofer
6569aed259 Moved large screen breakpoint from 1280 to 1260 px. 2016-02-08 06:59:10 +01:00
Martin Edenhofer
f7bfad14eb Fixed identifier condition. 2016-02-08 06:58:28 +01:00
Martin Edenhofer
405be36647 Improved shown information. 2016-02-08 06:57:54 +01:00
Martin Edenhofer
cbbf34c271 Improved inline markup. 2016-02-07 21:53:47 +01:00
Martin Edenhofer
06e9a6abbe Improved search description. 2016-02-07 21:42:48 +01:00
Martin Edenhofer
73f27f48ae Improved error handling. 2016-02-07 18:46:44 +01:00
Martin Edenhofer
21dcfda82c Fixed oder after migration got merged. 2016-02-07 17:18:40 +01:00
Martin Edenhofer
4f7474ac7a Replaced IO.read with IO.binread. 2016-02-07 17:18:07 +01:00
Martin Edenhofer
1aee8eef09 Improved stored user identifier. 2016-02-07 17:17:27 +01:00
Martin Edenhofer
a304744b3f Split each notification recipient into one record. 2016-02-07 16:53:21 +01:00
Martin Edenhofer
372e185dc0 Added check if binary was written correctly. 2016-02-07 16:36:10 +01:00
Martin Edenhofer
ea640474a3 Merged migrations. 2016-02-07 16:17:45 +01:00
Martin Edenhofer
cbac73f1ef Save record after new role assignment. 2016-02-07 14:13:37 +01:00
Martin Edenhofer
c34a407651 Added support of default preferences and implemented agent notifications based on preferences settings. 2016-02-07 14:00:29 +01:00
Felix Niklas
898471c96b chat client: re-add livereload 2016-02-05 13:49:16 +01:00
Felix Niklas
eae435731b icons: fix small-dot renaming 2016-02-05 13:09:56 +01:00
Felix Niklas
4996fb712b chat widget demo: robust host detection 2016-02-05 13:01:47 +01:00
Felix Niklas
34f8604a25 todo: use inline icons 2016-02-05 12:29:26 +01:00
Felix Niklas
10a61558f7 rename icon status-modifier-inner-circle to small-dot 2016-02-05 12:27:02 +01:00
Felix Niklas
1024b4889c Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-04 18:20:52 +01:00
Felix Niklas
7dd6b65275 style first steps
- new box--paper style (lined paper with 31px line-height)
- TODO: icon color replace
2016-02-04 18:20:41 +01:00
Martin Edenhofer
44ed80f240 Improved migration. 2016-02-04 16:08:23 +01:00
Martin Edenhofer
3cf87471b7 Improved twitter tests (now use env for all params). 2016-02-04 16:07:15 +01:00
Thorsten Eckel
234407e7d0 Fixed typo. 2016-02-04 15:58:52 +01:00
Felix Niklas
673716f2e5 coffeelint cleanup 2016-02-04 14:54:55 +01:00
Felix Niklas
1597278a43 Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-04 14:29:05 +01:00
Felix Niklas
41c26ea736 channels/twitter style search terms 2016-02-04 14:28:27 +01:00
Martin Edenhofer
23dc2d9522 Improved web server detection. 2016-02-04 13:26:04 +01:00
Martin Edenhofer
438bd42b8d Set config after env ins running to use an existing config namespace. 2016-02-04 12:49:10 +01:00
Martin Edenhofer
be2a050890 Fixed web server detection (skip self notifications). 2016-02-04 12:39:05 +01:00
Thorsten Eckel
23b9b8867c Fixed indentation. 2016-02-04 12:04:58 +01:00
Martin Edenhofer
f94c2e14b7 Improved order of tests checks. 2016-02-04 09:16:09 +01:00
Martin Edenhofer
a080d62611 Updated test result check. Added postgresql support. Do not import articles a second time on reimport (use message_id for identifier). 2016-02-04 00:35:49 +01:00
Martin Edenhofer
b1a706bd6c Adapted new results since using tickets.id as reference. 2016-02-03 22:49:21 +01:00
Martin Edenhofer
2500c772eb Fixed clue access (only show if dashboard is shown). 2016-02-03 21:44:47 +01:00
Thorsten Eckel
edd9b42fdf - Use undocumented but valid .count method to prevent more than one API request for gathering the count ob objects.
- Use .all! instead of .all to get possible errors raised insted of silently capturing them.
2016-02-03 18:14:07 +01:00
Martin Edenhofer
de2f2bf20b Improved html2text method by using HTMLEntities gem (fixed test). 2016-02-03 16:02:10 +01:00
Martin Edenhofer
27f9b9df1b Improved html2text method by using HTMLEntities gem (missing artefact). 2016-02-03 15:32:13 +01:00
Martin Edenhofer
51e8fc0ef2 So only show dashboard clues if dashboard is visible. 2016-02-03 15:21:59 +01:00
Martin Edenhofer
29ff4e6fd3 Improved html2text method by using HTMLEntities gem. 2016-02-03 14:33:03 +01:00
Martin Edenhofer
8d1f2c2598 Execute twitter tests only on one concurrent node (to prevent rate limits). 2016-02-03 12:51:47 +01:00
Martin Edenhofer
d38c02e48b Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-03 12:50:41 +01:00
Martin Edenhofer
89c24149a3 Start clues on initial login for every agent. 2016-02-03 12:50:30 +01:00
Thorsten Eckel
22d9cebae3 Reworked to the functionality to import objects in the fetch loop instead of fetching all in the first place. Issue is caused by the Zendesk API or Gem. For more information see: https://github.com/zendesk/zendesk_api_client_rb/issues/290 . 2016-02-03 11:23:38 +01:00
Thorsten Eckel
3202f8a51a Fixed bug: Results have to get compared in the browser since the backend runs in the test mode and the frontend in production. 2016-02-03 11:23:38 +01:00
Thorsten Eckel
0acedd39c2 Code improvements. 2016-02-03 11:23:38 +01:00
Martin Edenhofer
37d787fc42 Do not open/close widget on render result. 2016-02-03 10:54:52 +01:00
Martin Edenhofer
fb99b5cb08 Do no self notification if changes are done via we. If I create a new ticket via email, do self notification. 2016-02-03 08:58:51 +01:00
Martin Edenhofer
c5ba4f39cb Improved closing dialog for selenium. 2016-02-02 20:18:25 +01:00
Martin Edenhofer
c0e5c4885c Cleanup. 2016-02-02 20:17:40 +01:00
Martin Edenhofer
70ef23d99a Allow search terms with spaces. Fixed browser tests. 2016-02-02 19:46:55 +01:00
Felix Niklas
4f16f1b58a textmodule: up/down autoscroll 2016-02-02 17:58:34 +01:00
Felix Niklas
e23a80f4cd textmodule: style keyboard shortcut 2016-02-02 16:59:58 +01:00
Felix Niklas
3752e06d9b Merge branch 'develop' of github.com:martini/zammad into develop 2016-02-02 16:43:43 +01:00
Felix Niklas
d7441fd6f9 textmodule: remove cursor highlight on mouseover 2016-02-02 16:43:37 +01:00
Felix Niklas
ec18fe62bf textmodule: make scrollable 2016-02-02 16:42:21 +01:00
Felix Niklas
fe40ac6020 textmodule: simplify template, reverse order, auto-scroll to bottom 2016-02-02 16:42:11 +01:00
Felix Niklas
031f60d3aa textmodule: remove open and close delay 2016-02-02 16:18:20 +01:00
Felix Niklas
62549a2d2d textmodule: convert green highlight to blue highlight 2016-02-02 16:18:15 +01:00
Thorsten Eckel
5c160ba726 Added final count check to browser tests, too. 2016-02-02 15:49:24 +01:00
Thorsten Eckel
2a29312164 Changed behaviour to load all Zendesk objects first instead of working with them in the fetch loop. 2016-02-02 15:49:24 +01:00
Felix Niklas
78548697eb textmodule: keep widget in input area width, auto-highlight first 2016-02-02 15:41:29 +01:00
Martin Edenhofer
a0b3559522 Removed old code. Fixed store lookup on failure. 2016-02-02 14:08:27 +01:00
Martin Edenhofer
c1e4171222 Improved logging. 2016-02-02 13:50:49 +01:00
Martin Edenhofer
fb17c49c8c Improved hash generation. 2016-02-02 13:49:19 +01:00
Martin Edenhofer
d530152509 Improved tests. 2016-02-02 13:11:44 +01:00
Felix Niklas
cf0f65ff7a fix BUG: Circle in merge dialog not 100% visible 2016-02-02 11:50:09 +01:00
Felix Niklas
66529a749f fix active style in menu dropdown 2016-02-02 11:46:10 +01:00
Martin Edenhofer
15a3430ee8 Improved debugging. Removed hard coded url "http://localhost:3000". 2016-02-02 07:59:13 +01:00
Martin Edenhofer
94eabedabb Take browser_url for fqdn. 2016-02-01 23:21:47 +01:00
Martin Edenhofer
184d47ffce Do not take options from Setting (settings are used from test env). Take it from ENV. 2016-02-01 20:51:36 +01:00
Martin Edenhofer
9808b0873f Set correct host url. 2016-02-01 12:43:22 +01:00
Martin Edenhofer
f534544136 Improved validation (ignore 450, graylistings). 2016-02-01 11:28:44 +01:00
Martin Edenhofer
6b305dd1de Added form browser tests and form email validation. 2016-02-01 10:23:55 +01:00
Martin Edenhofer
d239db634e Fixed loading package in reinstall. 2016-02-01 01:42:30 +01:00
Martin Edenhofer
5e87eb438b Fixed File.chmod call (wrong number of arguments (1 for 0)). 2016-02-01 00:54:54 +01:00
Martin Edenhofer
99de6f801f Do not backup files in install if the same is already in fs. 2016-02-01 00:48:43 +01:00
Martin Edenhofer
c4206539d1 Improved do, added package verify (check if package is deployed correctly) method. 2016-02-01 00:20:14 +01:00
Martin Edenhofer
4503ba4d16 Log as debug. 2016-02-01 00:18:23 +01:00
Thorsten
b0ea603dae Merge pull request #162 from martini/json_package
New JSON package structure.
2016-01-31 19:27:32 +01:00
Thorsten Eckel
977cc3d981 - Replaced package XML structure by JSON.
- Removed Package.build() in favor of the 'zammad-szpm' gem.
2016-01-31 18:25:31 +01:00
Martin Edenhofer
f52cf41a35 As fallback use first element in selection. 2016-01-30 20:31:20 +01:00
Martin Edenhofer
db85fb5a1a As fallback use hovered element to select on enter. 2016-01-29 13:18:42 +01:00
Martin Edenhofer
5d8b109a7e Added bundle-audit job. 2016-01-28 20:17:08 +01:00
Martin Edenhofer
7f86245a4f Improved error handling. 2016-01-28 20:08:13 +01:00
Martin Edenhofer
5a8ba8b1c2 Updated gems, prepared for bundle-audit. 2016-01-28 19:55:15 +01:00
Martin Edenhofer
9e31bffd16 Only show popovers on arrows. 2016-01-28 14:30:06 +01:00
Martin Edenhofer
a5a1f41423 Do not show chat in navbar until chat is enabled. 2016-01-28 13:33:56 +01:00
Martin Edenhofer
9d2bd0051c Fixed typo. 2016-01-28 12:47:29 +01:00
Martin Edenhofer
f09a4f1064 Small cleanup. 2016-01-28 11:20:36 +01:00
Martin Edenhofer
44e379a3d0 Reduced total timeout. 2016-01-28 10:34:41 +01:00
Martin Edenhofer
2831e81985 Added facebook agent tests. 2016-01-28 09:50:05 +01:00
Martin Edenhofer
ad56c494f5 Do ticket core browser tests dedicated with database. 2016-01-28 00:52:51 +01:00
Martin Edenhofer
6bf8ff28e8 improved doc. 2016-01-28 00:35:29 +01:00
Martin Edenhofer
ca6f43baca Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-27 22:25:22 +01:00
Martin Edenhofer
7d45be9a8e Added tests for tagging and linking tickets. 2016-01-27 22:24:54 +01:00
Thorsten Eckel
3d238f7974 Fixed typo. 2016-01-27 19:26:10 +01:00
Martin Edenhofer
c1c1930bdc Fixed support of ES_INDEX_RAND. 2016-01-26 17:03:32 +01:00
Martin Edenhofer
b2bfeff55a Added support of ES_INDEX_RAND. 2016-01-26 16:56:09 +01:00
Martin Edenhofer
adc801c6d1 Undo of teardown. 2016-01-26 16:48:31 +01:00
Martin Edenhofer
6c541b3548 Undo of setup method. 2016-01-26 16:43:36 +01:00
Martin Edenhofer
68f32ab223 Improved es test, introduced setup and teardown. 2016-01-26 16:36:40 +01:00
Martin Edenhofer
a52b2472a8 Added dedicated db jobs for imports. 2016-01-26 16:20:26 +01:00
Martin Edenhofer
da1534d0f9 Added dedicated db jobs for es. 2016-01-26 16:13:02 +01:00
Martin Edenhofer
5ed4a73d12 Improved doc and code layout. 2016-01-26 15:25:32 +01:00
Martin Edenhofer
a28f29ae3d Updated build status url. 2016-01-26 13:59:04 +01:00
Martin Edenhofer
46c8da3fe8 bundle install right after configuring database. 2016-01-26 13:56:05 +01:00
Martin Edenhofer
5a85dbe3d8 Added infos to every build. 2016-01-26 13:12:06 +01:00
Martin Edenhofer
60c2d4dc95 Do not trigger rerender on client disconnect. 2016-01-26 10:53:15 +01:00
Martin Edenhofer
e964c120af e.stopPropagation in user switch (prevent execution of other ajax callbacks). 2016-01-26 08:47:25 +01:00
Martin Edenhofer
ee466d278f Improved test. 2016-01-26 08:46:35 +01:00
Martin Edenhofer
883f1bcfa7 Avoid http redirects, they will be cached on some browsers. 2016-01-26 07:56:51 +01:00
Martin Edenhofer
301688a3cf Avoid http redirects, they will be cached on some browsers. 2016-01-26 07:00:25 +01:00
Martin Edenhofer
7d6ab22cae Avoid http redirects, they will be cached on some browsers. 2016-01-26 00:52:29 +01:00
Martin Edenhofer
13d23f96cd Improved logout session, abort all open ajax connections then. 2016-01-25 14:11:19 +01:00
Martin Edenhofer
eac4ccefde Wait 1,2 sec. until open ajax called are closed. 2016-01-25 13:17:50 +01:00
Martin Edenhofer
87c1fd04b0 Improved timing. 2016-01-25 09:17:49 +01:00
Martin Edenhofer
442aff0545 Improved wording. 2016-01-25 08:37:40 +01:00
Martin Edenhofer
ab63cfec4d Port to support postgresql. 2016-01-24 19:27:36 +01:00
Martin Edenhofer
70f5f21558 Fixed missing downcase for login of agents and customers. 2016-01-24 16:58:02 +01:00
Martin Edenhofer
87e1a92e39 Improved code layout. 2016-01-24 12:50:29 +01:00
Martin Edenhofer
aa4fffad32 Improved code layout. 2016-01-24 01:14:14 +01:00
Martin Edenhofer
06a32ad071 Prevent multiple form submits. 2016-01-23 11:07:52 +01:00
Martin Edenhofer
81971899a0 Load database gems based on config/database.yml settings. 2016-01-22 11:56:32 +01:00
Martin Edenhofer
b4dd569cda Improved timings. 2016-01-22 09:33:28 +01:00
Martin Edenhofer
3587051827 Improved max show imported count. 2016-01-21 23:41:25 +01:00
Martin Edenhofer
6d6779caf7 Code cleanup. 2016-01-21 23:25:05 +01:00
Martin Edenhofer
5e518f5037 Added total timeout of whole http request. 2016-01-21 02:07:50 +01:00
Martin Edenhofer
ead406c220 Improved doc. 2016-01-20 23:03:10 +01:00
Martin Edenhofer
a386f23555 Recompile of chat widget. 2016-01-20 20:38:38 +01:00
Thorsten Eckel
fe67f33e42 Fixed typo and removed trailing spaces. 2016-01-20 19:09:53 +01:00
Martin Edenhofer
c775463fd8 Added postgresql support. 2016-01-20 02:48:54 +01:00
Martin Edenhofer
a2b68280b9 Added postgresql support. 2016-01-20 02:00:02 +01:00
Martin Edenhofer
9b7b5f0069 Read files recursively. 2016-01-20 01:47:38 +01:00
Martin Edenhofer
fc47f04ba8 Improved generation of db name. 2016-01-20 01:11:57 +01:00
Martin Edenhofer
b48ed93e9d Added postgresql support. 2016-01-20 01:06:00 +01:00
Martin Edenhofer
a00be78195 Added postgresql support. 2016-01-19 23:30:23 +01:00
Felix Niklas
7b8fef1991 channel twitter: add description text, style description 2016-01-19 09:58:37 +01:00
Felix Niklas
3c4241b05f fix that scrollbars work with modals 2016-01-19 08:01:30 +01:00
Martin Edenhofer
afe46d3570 Prepared for postgresql. 2016-01-19 07:58:58 +01:00
Martin Edenhofer
46cbfb8b28 Added stage, tags and script options. 2016-01-18 21:28:22 +01:00
Thorsten Eckel
34d198991e Applied coffeelint. 2016-01-18 20:36:54 +01:00
Thorsten Eckel
64d722d14c Added zendesk import browser tests. 2016-01-18 20:36:53 +01:00
Martin Edenhofer
d45f634e05 Reorganised. 2016-01-18 03:18:33 +01:00
Martin Edenhofer
7ee379c0ad Moved IP and PORTs to server config. 2016-01-18 02:35:48 +01:00
Martin Edenhofer
d7f3f4a7ff Improved tests. 2016-01-18 02:35:07 +01:00
Martin Edenhofer
fedae1587a Improved timing. 2016-01-16 16:52:53 +01:00
Martin Edenhofer
6a3fe7f12f Just load de-de for unit tests to increase speed. 2016-01-16 12:30:50 +01:00
Thorsten Eckel
00cffad79e Added some syntactic suguar (used in rubocop cops). 2016-01-16 11:05:04 +01:00
Martin Edenhofer
b229d024f5 Small cleanup. 2016-01-16 02:30:28 +01:00
Martin Edenhofer
13704a7b5e Moved to runner side variables. 2016-01-16 02:30:09 +01:00
Martin Edenhofer
a397132931 Fixed some Facebook issues. Improved tests. 2016-01-16 01:16:31 +01:00
Thorsten Eckel
ec69425f2c Added missing newline. 2016-01-15 22:18:46 +01:00
Thorsten Eckel
3a401247f5 Fixed broken .casecmp rubocop replacements and disabled cop. 2016-01-15 22:17:05 +01:00
Thorsten Eckel
e9753e2d33 Fixed typo. 2016-01-15 21:21:05 +01:00
Martin Edenhofer
40f6314177 Fixed unit tests. 2016-01-15 20:40:29 +01:00
Martin Edenhofer
815666a994 Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-15 20:09:25 +01:00
Martin Edenhofer
f87adf8d5b Improved clode layout. 2016-01-15 20:09:16 +01:00
Martin Edenhofer
c848ddbc31 Improved clode layout. 2016-01-15 20:08:51 +01:00
Martin Edenhofer
771a56f618 Improved clode layout. 2016-01-15 20:08:17 +01:00
Thorsten Eckel
d7995bc6d3 Updated dependencies and applied new rubocop rules. 2016-01-15 18:23:35 +01:00
Martin Edenhofer
7ae3fbbc11 Removed not longer needed sso backend. 2016-01-15 15:10:56 +01:00
Felix Niklas
29b41125d2 customer chat: add status dropdown arrows 2016-01-15 14:51:27 +01:00
Thorsten Eckel
319002d378 Removed unnecessary OTRS tag. 2016-01-15 13:52:29 +01:00
Thorsten Eckel
766b29eed6 Added CI OTRS import browser test. 2016-01-15 13:45:38 +01:00
Felix Niklas
121d96a3b9 chat ticket: boxFade: auto adjust height 2016-01-15 10:37:10 +01:00
Felix Niklas
d780b05f09 chat ticket: add box-fade 2016-01-15 10:32:07 +01:00
Felix Niklas
5e667eb264 chat to ticket layout ref: style attachment 2016-01-14 22:40:53 +01:00
Felix Niklas
1d5a539abd Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-14 12:13:35 +01:00
Felix Niklas
52d31b6fc0 create chat_to_ticket layoutRef 2016-01-14 12:13:31 +01:00
Martin Edenhofer
9415ad3a92 Just show related article types for reply. 2016-01-14 11:19:54 +01:00
Martin Edenhofer
92c0cb9da8 Fixed error if no geo location backend is selected. 2016-01-14 10:39:52 +01:00
Martin Edenhofer
b0af4f85ee Improved error handling of streaming channels. 2016-01-14 08:54:06 +01:00
Martin Edenhofer
a95408fe90 Improved identifier of tweets. 2016-01-14 00:42:41 +01:00
Martin Edenhofer
9e95305ace Changed order to do not twitter/facebook tests at same time. 2016-01-14 00:41:24 +01:00
Martin Edenhofer
922c9cd928 Added tweet reply test. 2016-01-14 00:33:34 +01:00
Martin Edenhofer
c6ee93d2d5 Fixed tests. 2016-01-13 23:27:34 +01:00
Martin Edenhofer
5b1a481cf1 Fixed rubocop. 2016-01-13 22:42:08 +01:00
Martin Edenhofer
736c782bf3 Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 22:40:33 +01:00
Martin Edenhofer
61615adc00 Fixed coffee lint. 2016-01-13 22:40:14 +01:00
Martin Edenhofer
0d940d6460 Removed not longer needed otrs runtime auth backend. 2016-01-13 22:38:08 +01:00
Martin Edenhofer
ed5e0ff4d4 Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 22:24:11 +01:00
Martin Edenhofer
388fcc6527 Improved import workflow. 2016-01-13 22:21:34 +01:00
Martin Edenhofer
eec2801c2f Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 20:46:09 +01:00
Martin Edenhofer
f2d0eca3da Improved background job for import. 2016-01-13 20:45:51 +01:00
Felix Niklas
84a08c4a69 Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 18:50:36 +01:00
Felix Niklas
159aa3f41f customer chat: add create ticket button 2016-01-13 18:38:31 +01:00
Thorsten Eckel
896f33b4ce Added browser test for invalid API key. 2016-01-13 18:00:43 +01:00
Martin Edenhofer
edf565bd4d Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 17:33:54 +01:00
Martin Edenhofer
e779f459b4 Improved finish of import. 2016-01-13 17:33:08 +01:00
Thorsten Eckel
437023ac79 Fixed bug: Invalid API keys are validated as correct. 2016-01-13 17:14:28 +01:00
Thorsten Eckel
ea10d24c38 Current state of browser test. 2016-01-13 16:59:26 +01:00
Martin Edenhofer
6b688e2c78 Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 15:49:34 +01:00
Felix Niklas
4addd7b063 Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 15:45:25 +01:00
Felix Niklas
9f745e6c1c customer chat: split closing a chat into a disconnect and close step.
and shorten some status messages to make the translation easier.
2016-01-13 15:42:34 +01:00
Martin Edenhofer
e6ac1bef1d Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 14:15:08 +01:00
Martin Edenhofer
df306b5e2c Fixed import wizard. Improved performance initial calendar load (only do it one per ip). 2016-01-13 14:12:05 +01:00
Martin Edenhofer
728cebe3b0 Merge branch 'develop' of github.com:martini/zammad into develop 2016-01-13 13:13:57 +01:00
Thorsten Eckel
db9076809e Current state of OTRS import browser test. 2016-01-13 13:07:23 +01:00
Martin Edenhofer
f4b624a967 Improved limitation of tweet title. 2016-01-13 11:16:54 +01:00
Martin Edenhofer
7434971416 Improved html2text. 2016-01-13 11:03:34 +01:00
Martin Edenhofer
6bb8c7b6eb Added initial otrs browser import test. 2016-01-13 10:29:41 +01:00
Martin Edenhofer
63fbc51fb6 Just valid if article body exists. 2016-01-13 08:15:16 +01:00
Martin Edenhofer
7f27fefdb6 Added twitter length count support in new article. 2016-01-13 00:55:17 +01:00
Felix Niklas
c91b782f16 channel/twitter adjust label names to twitters 2016-01-12 17:30:22 +01:00
Felix Niklas
a4e49a178e chat client: fix line-height in input field 2016-01-12 16:44:21 +01:00
Felix Niklas
1f64705762 customer chat: fix FF bug that empty multiline contenteditable has height 0 2016-01-12 16:22:38 +01:00
Felix Niklas
1cc85105dd chat client: fix that several status messages don't go into new lines 2016-01-12 11:57:38 +01:00
Felix Niklas
d0c986a55c fix page-header-center 2016-01-12 11:31:52 +01:00
Martin Edenhofer
329d412035 Improved user attributes sync. 2016-01-12 09:55:00 +01:00
Martin Edenhofer
b93b4b5579 Added tweet and dm reply feature. 2016-01-11 13:37:27 +01:00
Martin Edenhofer
5492c3889e Improved error handling. 2016-01-10 14:36:51 +01:00
Martin Edenhofer
40afe824f3 Improved channel fetchable function. 2016-01-10 14:24:54 +01:00
Martin Edenhofer
a5ecee76c6 Do not change login on user update. 2016-01-10 08:50:18 +01:00
Martin Edenhofer
edb6c66b6b Added channel streaming feature. 2016-01-09 13:23:11 +01:00
Martin Edenhofer
c60ceb66ba Fixed typo. 2016-01-08 15:32:12 +01:00
Martin Edenhofer
94560f6ca2 Prepared tweet class for twitter streaming. 2016-01-08 15:31:47 +01:00
Martin Edenhofer
34016ddf29 Changed position of reset button. 2016-01-06 23:12:36 +01:00
Martin Edenhofer
a406f962ea Improved chat state update. 2016-01-06 14:25:53 +01:00
Martin Edenhofer
f5fa05bf96 Added set of auto offline if agent is not answering chats for 120 seconds. 2016-01-06 01:45:03 +01:00
Martin Edenhofer
4803fa9383 Added popover infos to chat header/badges about all chats and available agents. 2016-01-05 22:15:19 +01:00
Martin Edenhofer
a6e0ba301c Added gzip, added X-Forwarded-For header, small improvements. 2016-01-05 17:29:08 +01:00
Martin Edenhofer
325a100a46 Improved chat performance. Also show geo data in title. 2016-01-05 14:47:41 +01:00
Martin Edenhofer
037b4ffbd3 Fixed typos. 2016-01-05 13:46:43 +01:00
Martin Edenhofer
20c73960a7 Update maxChatWindows at runtime. 2016-01-05 13:14:44 +01:00
Martin Edenhofer
7ba6f6a54d Enable default chat in preferences automatically if only one exists. 2016-01-05 10:38:43 +01:00
Martin Edenhofer
ed88660938 Added geo_ip lookup. 2016-01-05 09:49:11 +01:00
Martin Edenhofer
d8507d0b57 Improved code layout. 2016-01-05 09:48:26 +01:00
Martin Edenhofer
e461fa9ceb Set/gt remote ip of client connection. 2016-01-05 09:29:15 +01:00
Martin Edenhofer
f5359357c1 Updated bundle. 2016-01-04 13:42:24 +01:00
Martin Edenhofer
d25cd7da59 Improved error handling. 2016-01-02 17:10:12 +01:00
Martin Edenhofer
7360985c21 Close modal before count accounts. 2015-12-31 16:34:24 +01:00
Martin Edenhofer
ba5fa1f488 Improved test. 2015-12-31 14:25:19 +01:00
Martin Edenhofer
20a52b0d7b Use tags for to prevent parallel testing on twitter and facebook. 2015-12-31 13:03:26 +01:00
Martin Edenhofer
715fbcbfb9 Fixed chrome issue. 2015-12-31 11:45:27 +01:00
Martin Edenhofer
ede241007f Added twitter and facebook tests for chrome. 2015-12-31 10:12:59 +01:00
Martin Edenhofer
be1cde6eff Set fqdn for each env. 2015-12-31 09:51:06 +01:00
Martin Edenhofer
c238b145dd Improved auto wizard login. 2015-12-31 02:29:49 +01:00
Martin Edenhofer
224f2e8391 Added auto wizard login support for browser tests. 2015-12-31 02:04:45 +01:00
Martin Edenhofer
82fb4c4c73 Fixed syntax error. 2015-12-30 14:26:28 +01:00
Martin Edenhofer
49172439a7 Init version of twitter and facebook channel connector. 2015-12-30 14:24:13 +01:00
Martin Edenhofer
3878c40e70 Improved max length on article text (richtext). 2015-12-29 20:41:08 +01:00
Martin Edenhofer
fdeca0b7b2 Removed not needed log entry. 2015-12-29 16:48:16 +01:00
Martin Edenhofer
e42a4a750a Fixed length check, check length after pasted content is cleaned. 2015-12-29 15:25:10 +01:00
Martin Edenhofer
a2527423af Also log console.debug 2015-12-29 14:57:04 +01:00
Martin Edenhofer
6960e42f9d Improved logging. 2015-12-29 14:21:04 +01:00
Martin Edenhofer
187e8f10d9 Updated. Removed not needed excanvas. 2015-12-28 23:13:23 +01:00
Martin Edenhofer
711cbd9819 Updated with js-libs. 2015-12-28 16:53:23 +01:00
Martin Edenhofer
1f3f5f6849 Not longer needed. 2015-12-28 13:55:54 +01:00
Martin Edenhofer
cb13aeadda Improved timing. 2015-12-28 13:54:03 +01:00
Martin Edenhofer
348ebe20ba Update to v2.0.1. 2015-12-28 13:29:34 +01:00
Martin Edenhofer
8e58838a84 Fixed typo. 2015-12-28 08:42:56 +01:00
Martin Edenhofer
cc224ac80d Improved wording. 2015-12-28 00:53:45 +01:00
Martin Edenhofer
8b10b2accf Improved App.Utils class. 2015-12-27 23:29:04 +01:00
Martin Edenhofer
caa3e77997 Fix for https://github.com/spine/spine/issues/597. 2015-12-22 16:42:41 +01:00
Martin Edenhofer
4df414f785 For auto response emails without T# in subject, find follow up by references header. 2015-12-22 15:09:36 +01:00
Martin Edenhofer
994c363484 Update to spinejs 1.6.1. 2015-12-21 22:06:07 +01:00
Martin Edenhofer
b990fa6daf Init version of twitter admin. 2015-12-21 01:48:49 +01:00
Martin Edenhofer
272a569b10 Renamed class App.ControllerModalNice to App.ControllerModal. 2015-12-18 23:29:41 +01:00
Martin Edenhofer
a826b12704 Improved blur. 2015-12-18 22:00:23 +01:00
Martin Edenhofer
ce6e414362 Improved timings for chrome. 2015-12-18 20:32:00 +01:00
Martin Edenhofer
477fb1d3da Added browser tests for translations and inline translations. 2015-12-18 17:18:09 +01:00
Martin Edenhofer
7a1bbfa4a0 Merge branch 'develop' of github.com:martini/zammad into develop 2015-12-18 11:49:35 +01:00
Martin Edenhofer
b066064ec9 Fixed file upload on remote browsers. 2015-12-18 11:48:22 +01:00
Thorsten Eckel
ccb25b169b Fixed typos. 2015-12-18 11:47:05 +01:00
Thorsten Eckel
5d4876a5e5 Fixed bug: module_function causes error when calling private methods. 2015-12-18 10:44:03 +01:00
Thorsten Eckel
083882af6e Added GitLab CI config for Zendesk import test. 2015-12-18 10:34:04 +01:00
Thorsten Eckel
9d38d12c16 QA results. 2015-12-18 10:22:08 +01:00
Thorsten Eckel
5fa7ef0ba8 Updated Gemfile.lock. 2015-12-18 09:57:53 +01:00
Martin Edenhofer
2a9b47671f Allow file uploading from remote. 2015-12-18 00:02:31 +01:00
Martin Edenhofer
b3e4243660 Merge branch 'develop' of github.com:martini/zammad into develop 2015-12-17 20:33:52 +01:00
Martin Edenhofer
5c7ea8d904 Improved upload helper. 2015-12-17 19:38:42 +01:00
Thorsten Eckel
e9ba7c14fe Undo unwanted commit of Gemfile.lock. 2015-12-17 19:17:56 +01:00
Thorsten Eckel
e5245c612f First draft of Zendesk import and integration tests. 2015-12-17 19:15:50 +01:00
Martin Edenhofer
23bb04566d Init backend of generic external credentials. 2015-12-17 12:49:40 +01:00
Martin Edenhofer
9a702b528c Code cleanup, improved String.to_filename. 2015-12-16 22:47:10 +01:00
Martin Edenhofer
644ecc6ef8 Removed obsolete code. 2015-12-16 09:37:54 +01:00
Martin Edenhofer
015b0dcd9a Removed not needed function. 2015-12-16 09:05:12 +01:00
Martin Edenhofer
a480bf0e73 Updated gem file. 2015-12-15 12:50:46 +01:00
Martin Edenhofer
cf39840772 Merge branch 'develop' of github.com:martini/zammad into develop 2015-12-15 12:49:42 +01:00
Thorsten Eckel
e6d992b1cd Added 'twitter_oauth' gem dependency. 2015-12-15 11:26:08 +01:00
Martin Edenhofer
54f90b171d Merge branch 'develop' of github.com:martini/zammad into develop 2015-12-15 11:15:46 +01:00
Thorsten Eckel
2ccf0892b9 Added first draft of Twitter admin controller. 2015-12-15 11:15:27 +01:00
Martin Edenhofer
2bec7a93a3 Removed obsolete code. 2015-12-15 11:01:17 +01:00
Martin Edenhofer
601ef5eeac Added upload tests. 2015-12-15 08:46:01 +01:00
Martin Edenhofer
8b7c787c42 Added new switch to header. 2015-12-15 01:29:05 +01:00
Martin Edenhofer
18597b7e2a Next try to avoid "Cannot read property 'get_Current' of undefined" issues. 2015-12-15 00:52:26 +01:00
Martin Edenhofer
fbc27469bb Removed avoid "Cannot read property 'get_Current' of undefined" issues. 2015-12-15 00:14:20 +01:00
Martin Edenhofer
6e926250a5 Some twitter to/from fixes. 2015-12-14 23:46:02 +01:00
Martin Edenhofer
7a56b48d42 Avoid "Cannot read property 'get_Current' of undefined" issues. 2015-12-14 17:12:55 +01:00
Martin Edenhofer
d0a2f64607 Merge branch 'develop' of github.com:martini/zammad into develop 2015-12-14 17:10:40 +01:00
Martin Edenhofer
0a20a1f906 Added basic tweet reply function. 2015-12-14 17:09:09 +01:00
Felix Niklas
e5da43f170 fix checkboxes when zoomed out in browser 2015-12-14 17:03:02 +01:00
Felix Niklas
8826b8c371 ticket zoom: full click area for textarea 2015-12-14 16:25:06 +01:00
Felix Niklas
5ae7f06225 chat channel: inline on/off button 2015-12-14 16:15:54 +01:00
Felix Niklas
d11f05881a page-header-meta: shrink - firefox fix 2015-12-14 16:12:33 +01:00
Felix Niklas
51dff37024 page-header-meta: keep inline, shrink buttons 2015-12-14 16:08:08 +01:00
Felix Niklas
fdf465938f update dev autostart script 2015-12-14 16:07:48 +01:00
Martin Edenhofer
79a32230fd Improved timing. 2015-12-14 11:04:44 +01:00
Martin Edenhofer
a7a0339f8d Avoid "Cannot read property 'get_Current' of undefined" issues. 2015-12-14 11:02:49 +01:00
Martin Edenhofer
1d4e1310d1 Moved to current channel api. 2015-12-14 10:23:14 +01:00
Martin Edenhofer
5852dc6d8c Code cleanup. Reworked for current twitter result structure. Improved timing. 2015-12-13 13:08:58 +01:00
Martin Edenhofer
4adf2e3750 Fixed long poling without session user. 2015-12-13 09:40:39 +01:00
Martin Edenhofer
9cd3542d72 Improved timing. 2015-12-12 23:32:46 +01:00
Martin Edenhofer
2e295ce004 Merged migrations. 2015-12-12 23:32:25 +01:00
Martin Edenhofer
ee87075b23 Improved test. 2015-12-12 23:28:34 +01:00
Martin Edenhofer
e7f93ce103 Moved to background job for escalation recalculation work. 2015-12-11 17:00:04 +01:00
Martin Edenhofer
13d15b1f7d Just push state updated if chat is enabled. 2015-12-11 16:28:31 +01:00
Martin Edenhofer
6ad0245db6 Added support of references header in outgoing emails. 2015-12-11 15:11:34 +01:00
Martin Edenhofer
921d247dec Updated gems. 2015-12-11 13:06:36 +01:00
Martin Edenhofer
d882c77546 Fixed twitter tests. 2015-12-11 11:55:22 +01:00
Martin Edenhofer
be6c374cdc Added inline translation feature hint. 2015-12-10 16:37:38 +01:00
Martin Edenhofer
c29995702e Fixed test. 2015-12-10 16:34:42 +01:00
Martin Edenhofer
bb1163e0aa Fixed test. 2015-12-10 15:50:30 +01:00
Martin Edenhofer
040d781f6d Fixed important icon in activity stream to show entries related to me. 2015-12-10 11:57:37 +01:00
Martin Edenhofer
eb51b51ea4 Distinct between leave and close status. 2015-12-10 11:56:59 +01:00
Martin Edenhofer
a85c1f5e24 Fixed file name. 2015-12-10 11:40:39 +01:00
Martin Edenhofer
4663697884 Added target to open email in same browser window (if exists). 2015-12-10 11:39:12 +01:00
Martin Edenhofer
ee850f7d2b Fixed rubocop. 2015-12-10 11:37:02 +01:00
Martin Edenhofer
9c28ca285d Added cleanups for chats. 2015-12-10 11:35:00 +01:00
Martin Edenhofer
0ec02aaace Show date after 7 days, not 14 days. 2015-12-10 10:32:52 +01:00
Martin Edenhofer
0e0ce4b6b1 Updated test to work with modal alert. 2015-12-09 16:55:19 +01:00
Martin Edenhofer
3a2b3f4393 Removed not needed option. 2015-12-09 16:54:39 +01:00
Martin Edenhofer
4e6e03a494 Fixed #159 - attachment lost with no text. Introduced small modals for alerts. 2015-12-09 16:14:43 +01:00
Martin Edenhofer
dcc6f60b26 Added web socket ping to keep http connections open (prevent timeouts). 2015-12-09 15:11:29 +01:00
Martin Edenhofer
5f74e50433 Rewrite of web socket event backend. 2015-12-09 14:09:37 +01:00
Martin Edenhofer
08c2a59569 Only broadcast to authenticated clients. 2015-12-08 14:22:13 +01:00
Martin Edenhofer
3b47de0014 Improved re-execute of controller if already active on click. 2015-12-08 13:41:32 +01:00
Martin Edenhofer
f06348e843 Fixed timing issues, improved tests. 2015-12-08 12:32:19 +01:00
Martin Edenhofer
465ab3e6be Added chat client reload test. 2015-12-08 01:52:26 +01:00
Martin Edenhofer
84d30e4ee0 Added desktop notifications. 2015-12-08 00:51:33 +01:00
Martin Edenhofer
a28dc17b32 Improved tests. 2015-12-07 16:22:37 +01:00
Martin Edenhofer
c58546285a Explicit conversion to seconds. 2015-12-07 16:20:56 +01:00
Martin Edenhofer
2b364f71c1 Updated status link. 2015-12-07 16:19:44 +01:00
Martin Edenhofer
14f1ec7a01 Removed not longer needed files. 2015-12-07 11:42:13 +01:00
Martin Edenhofer
af944eea2f Added multiple greetings. Improved tests. 2015-12-07 11:41:12 +01:00
Martin Edenhofer
fab440e219 Improved test. 2015-12-07 10:40:21 +01:00
Martin Edenhofer
fb31c8aaf6 Improved timing. 2015-12-07 00:55:09 +01:00
Martin Edenhofer
4b1e6f05fd Added logs for websocket server. 2015-12-07 00:15:53 +01:00
Martin Edenhofer
a5f9d6106f Removed not longer needed code. 2015-12-06 16:40:47 +01:00
Martin Edenhofer
6b7d4cee65 Improved test. 2015-12-06 15:28:19 +01:00
Martin Edenhofer
7ab7b3aa26 Improved test. 2015-12-06 15:24:09 +01:00
Martin Edenhofer
3accd37aa0 Added default chat. 2015-12-06 15:17:05 +01:00
Martin Edenhofer
2c91f8801b Set ZAMMAD_SETTING_TTL to 15 seconds for browser testing. 2015-12-06 10:32:34 +01:00
Martin Edenhofer
1424b6e23d Improved ws port detection for browser tests. 2015-12-06 09:49:35 +01:00
Martin Edenhofer
0698324595 Add init user also to chat role. 2015-12-06 08:14:30 +01:00
Martin Edenhofer
36ed006f29 Added browser tests for customer chat. 2015-12-05 20:55:34 +01:00
Martin Edenhofer
5940bc8975 Not longer needed. 2015-12-05 20:46:48 +01:00
Martin Edenhofer
4ced746122 Fixed reload issue. 2015-12-05 20:45:44 +01:00
Martin Edenhofer
b62b67293e Improved set of contenteditable fields. 2015-12-05 20:44:43 +01:00
Martin Edenhofer
7831f1c1f8 Added browser tests for customer chat. 2015-12-05 20:41:14 +01:00
Martin Edenhofer
0cb6e34870 Click on element before enter text (to improved work with contenteditable). 2015-12-05 15:20:14 +01:00
Martin Edenhofer
b0b61191aa Fixed coffeelint. 2015-12-05 14:40:45 +01:00
Martin Edenhofer
4f07fb09e6 Improved error handling. 2015-12-05 14:38:24 +01:00
Felix Niklas
bb80811745 fix unnecessary fat error (coffeelint) 2015-12-04 14:18:28 +01:00
Felix Niklas
cc179cf6ce remove clickCatcher: layout_ref and controller itself 2015-12-04 14:16:13 +01:00
Felix Niklas
20b41596b6 remove clickCatcher: user_organization_autocomplete 2015-12-04 14:12:02 +01:00
Felix Niklas
7d5d1350b2 refactor ticketZoom: remove inherited stopPropagation
since its already inherited
2015-12-04 13:08:55 +01:00
Felix Niklas
abbbe2f216 remove clickCatcher: online_notification
Known bug: clicks into .navigation get lost
2015-12-04 13:07:47 +01:00
Felix Niklas
8df25b9cc2 notifications template: improve naming 2015-12-04 11:50:51 +01:00
Felix Niklas
d3e0642d8a article_new: remove more recipient-list legacy code 2015-12-04 11:50:28 +01:00
Felix Niklas
ad080b6831 article_new: remove old recipient list 2015-12-04 11:23:57 +01:00
Felix Niklas
83a7163b7c fix nav-tabs height (big again) 2015-12-04 10:22:39 +01:00
Felix Niklas
b0e9ce18a0 improve nav-tabs padding 2015-12-04 10:07:17 +01:00
Martin Edenhofer
d0964b7960 Revert "test failure reason"
This reverts commit 254cb5d11d.
2015-12-03 23:16:04 +01:00
Roy Kaldung
0086a29c62 next try 2015-12-03 16:39:52 +01:00
Roy Kaldung
254cb5d11d test failure reason 2015-12-03 16:32:02 +01:00
Roy Kaldung
4c87a8e328 test failure reason 2015-12-03 16:29:29 +01:00
Roy Kaldung
1834bfe730 added dependency 2015-12-03 16:23:47 +01:00
Roy Kaldung
c0685a83f0 next try 2015-12-03 16:17:25 +01:00
Roy Kaldung
24c00e4581 show env 2015-12-03 16:03:16 +01:00
Roy Kaldung
c75d716a9a help 2015-12-03 15:53:42 +01:00
Roy Kaldung
7652f198a7 changed pkgr config 2015-12-03 15:49:22 +01:00
Roy Kaldung
add45e0b64 changed order of before/after 2015-12-03 15:47:06 +01:00
Roy Kaldung
29020fc18a workaround db connection 2015-12-03 15:43:18 +01:00
Roy Kaldung
cfe8e0bcc8 Merge branch 'develop' of github.com:martini/zammad into develop 2015-12-03 15:37:17 +01:00
Roy Kaldung
1f767ea7f8 switched RAILS_ENV 2015-12-03 15:34:40 +01:00
Martin Edenhofer
ff11856a73 Applied rubocop rule. 2015-12-03 14:42:02 +01:00
Roy Kaldung
db8d29df33 switched to development 2015-12-03 14:24:17 +01:00
Roy Kaldung
d81355f9e8 exec migrations after package update 2015-12-03 14:16:55 +01:00
Roy Kaldung
6f6b12b5aa changed config 2015-12-03 13:56:30 +01:00
Roy Kaldung
5cec1d0100 ruby 2.2.3 2015-12-03 11:36:41 +01:00
Roy Kaldung
3015302b57 defined ruby version 2015-12-03 11:09:18 +01:00
Roy Kaldung
3bc81a76a9 fixed package name 2015-12-03 10:27:58 +01:00
Roy Kaldung
78056c6c76 changed to CentOS 6 2015-12-03 10:24:22 +01:00
Roy Kaldung
e13de3c0ca packager.io config 2015-12-03 10:03:08 +01:00
Martin Edenhofer
b102e75aaa Reduced dom operations at loading time. 2015-12-02 10:18:02 +01:00
Martin Edenhofer
1439588581 Improved init task rendering, reduced dom operations. 2015-12-02 08:45:58 +01:00
Martin Edenhofer
6b3d1612a8 Reduced dom operations at loading time. 2015-12-02 02:24:23 +01:00
Martin Edenhofer
c4a74d0e3d Reduced dom operations. 2015-12-02 00:40:39 +01:00
Martin Edenhofer
f0b37a4fa9 Reduced dom operations. 2015-12-02 00:33:29 +01:00
Martin Edenhofer
f17b69bc9e Set also es url. 2015-12-01 23:46:44 +01:00
Martin Edenhofer
d16f8c3078 Improved initial rendering. 2015-12-01 22:02:54 +01:00
Martin Edenhofer
8c86d87f24 Removed not longer used sed, use ENV now. 2015-12-01 20:55:52 +01:00
Martin Edenhofer
abe6b5fb30 Improved namespace for es to support paralel runners. 2015-12-01 20:02:21 +01:00
Martin Edenhofer
a8ab2bd787 Fixed string concat. 2015-12-01 19:55:08 +01:00
Martin Edenhofer
ac9159d95d Use new tags. 2015-12-01 19:48:58 +01:00
Martin Edenhofer
e06e0c8827 Improved timing. 2015-12-01 19:46:31 +01:00
Martin Edenhofer
5f43cff95a Merge branch 'develop' of github.com:martini/zammad into develop 2015-12-01 19:44:45 +01:00
Martin Edenhofer
2d57994a16 Improved logging. 2015-12-01 19:44:31 +01:00
Martin Edenhofer
e751f975b3 Improved creation of config/database.yml 2015-12-01 19:43:54 +01:00
Felix Niklas
7230e5e970 chat client: set explizit width on chat icon svg (microsoft edge bug) 2015-12-01 16:48:48 +01:00
Martin Edenhofer
ecf2484a7c Added checks for https://github.com/jish/pre-commit 2015-11-30 15:18:46 +01:00
Martin Edenhofer
1834f77ee6 Applied new rubocop. 2015-11-30 14:29:23 +01:00
Martin Edenhofer
a4e21a274b Upgrade to rails 4.2.5. Added development dependencies pre-commit and coffeelint. 2015-11-30 14:06:12 +01:00
Martin Edenhofer
dd704194bc Improved timings in tests. 2015-11-30 13:13:27 +01:00
Martin Edenhofer
7710c1232e Fixed race condition in asset generation of session "/show". 2015-11-30 11:50:02 +01:00
Martin Edenhofer
435517071b Added coffee lint and auto wizard for chrome. 2015-11-30 00:24:48 +01:00
Martin Edenhofer
6d9acb2160 Added chrome browser tests. 2015-11-29 23:34:19 +01:00
Martin Edenhofer
88cb4c3ad2 Fixed customer selection in ticket update. 2015-11-29 20:44:53 +01:00
Martin Edenhofer
f5c47c1e13 Fixed customer selection. 2015-11-29 19:38:48 +01:00
Martin Edenhofer
586728fcef Fixed firefox js issues. 2015-11-29 16:39:56 +01:00
Martin Edenhofer
893272e886 Fixed browser test. 2015-11-27 20:58:27 +01:00
Martin Edenhofer
73fdb77178 Fixed browser test. 2015-11-27 15:47:56 +01:00
Martin Edenhofer
8115226bcf Added slice 3 of browser tests. 2015-11-27 13:40:17 +01:00
Martin Edenhofer
b84cc3acd2 Use runner tags now for all. 2015-11-27 12:55:54 +01:00
Martin Edenhofer
c08ed4a0df Moved to multiple runners. 2015-11-27 12:13:34 +01:00
Martin Edenhofer
7b3a8dae68 Unset in external script will not work. 2015-11-27 11:13:17 +01:00
Martin Edenhofer
0361a2e6d2 Sliced browser tests to speed up. 2015-11-27 10:50:37 +01:00
Martin Edenhofer
12e38ea4d1 Fixed typo. 2015-11-27 09:28:14 +01:00
Martin Edenhofer
3c0e20bc06 To process browser tests with normal password. 2015-11-27 08:39:43 +01:00
Martin Edenhofer
5ec65952c2 Removed not needed line. 2015-11-27 02:42:27 +01:00
Martin Edenhofer
7a08c923f6 Added new browser tests. 2015-11-27 02:20:33 +01:00
Martin Edenhofer
31e195807e Fixed auto wizard config. 2015-11-27 01:51:08 +01:00
Martin Edenhofer
62753dc63b Show correct today if task is longer open then 24 hours. 2015-11-27 00:02:07 +01:00
Martin Edenhofer
e19ee6b928 Added support of form-control--small for date and datetime. 2015-11-26 15:11:29 +01:00
Martin Edenhofer
82d7edf58b Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-26 13:07:40 +01:00
Martin Edenhofer
47b38e1dfb Revert "Removed not longer needed checks."
This reverts commit 76a130ac96.
2015-11-26 11:12:01 +01:00
Felix Niklas
2eece331fa add highlight.pack.js licence 2015-11-26 11:04:20 +01:00
Felix Niklas
c2a5b70c4c client: adjust button height 2015-11-26 10:59:56 +01:00
Felix Niklas
ae1b39cac7 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-26 10:52:22 +01:00
Felix Niklas
4a9230f2ea chat client: add unread state 2015-11-26 10:52:10 +01:00
Martin Edenhofer
83baddb8b0 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-26 10:51:45 +01:00
Martin Edenhofer
0314a67ee9 Use content editable widget to prevent not wanted html injections. 2015-11-26 10:51:25 +01:00
Martin Edenhofer
76a130ac96 Removed not longer needed checks. 2015-11-26 10:50:23 +01:00
Martin Edenhofer
bcde9a3695 Also remove svg in htmlCleanup(), htmlRemoveTags() and htmlRemoveRichtext(). 2015-11-26 10:44:28 +01:00
Felix Niklas
faea9d3936 chat client: autoGrow - add scroll after maxHeight 2015-11-26 10:38:15 +01:00
Felix Niklas
f4efdf931b chat client: clean up css 2015-11-26 10:37:49 +01:00
Felix Niklas
20abe7ff87 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-26 10:29:33 +01:00
Felix Niklas
75efb45ea2 chat client: css optimization 2015-11-26 10:29:29 +01:00
Martin Edenhofer
b3aa055c0e Check if in text/plain is content - if not, use text/html. 2015-11-26 09:29:58 +01:00
Martin Edenhofer
8a770cff94 A little bit more robust. 2015-11-26 01:25:53 +01:00
Martin Edenhofer
2728074f41 A little bit more robust. 2015-11-26 01:09:46 +01:00
Martin Edenhofer
0de7b74ae6 Removed use of session store to prevent store overflow. 2015-11-26 00:55:56 +01:00
Martin Edenhofer
d71090df6e Added idle and inactive timeouts. 2015-11-26 00:40:52 +01:00
Martin Edenhofer
6ce3116c33 Small ui improvements. 2015-11-25 23:24:08 +01:00
Martin Edenhofer
069063b2c7 Use domain of users email address for preview. Added css auto load and css Url support. Added possibility to translation chat widget. 2015-11-25 17:36:06 +01:00
Martin Edenhofer
7a231a0121 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-25 16:16:32 +01:00
Martin Edenhofer
ece1546238 Fixed typing issues. 2015-11-25 16:15:59 +01:00
Felix Niklas
599699e225 chat designer: remove unnecessary class 2015-11-25 15:58:48 +01:00
Felix Niklas
77057bc013 chat designer: disable scroll on iframe 2015-11-25 15:51:47 +01:00
Felix Niklas
e54fe496f2 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-25 15:48:58 +01:00
Felix Niklas
75d22c9d1d chat designer: fix chat height when changing fontSize 2015-11-25 15:48:54 +01:00
Martin Edenhofer
4955a8434d Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-25 15:09:36 +01:00
Felix Niklas
d1d16f1706 chat designer: add load button to preview 2015-11-25 15:09:03 +01:00
Martin Edenhofer
6dbb5cb078 Fixed typing issues. 2015-11-25 15:08:55 +01:00
Felix Niklas
3000d06a2b make color-swatch click area bigger 2015-11-25 15:08:11 +01:00
Felix Niklas
a2f9861fca chat client: fix open/close icon 2015-11-25 14:47:02 +01:00
Felix Niklas
50cf1fa018 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-25 13:59:12 +01:00
Felix Niklas
7b0cc0e97f chat designer: make preview readjust on resize 2015-11-25 13:59:08 +01:00
Martin Edenhofer
526a1eed81 Fixed unit test. 2015-11-25 13:34:20 +01:00
Martin Edenhofer
c4ea70a31a Small chat bugfixes. 2015-11-25 13:24:17 +01:00
Martin Edenhofer
3c8a5777bd Small chat bugfixes. 2015-11-25 13:18:56 +01:00
Martin Edenhofer
8ea3f6b132 Create @options at first in constructor to have it accessible in @log if used before. 2015-11-25 12:55:02 +01:00
Martin Edenhofer
8df0a19cff Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-25 12:46:05 +01:00
Martin Edenhofer
f41ef67dab Fixed naming and /ws location for web sockets. 2015-11-25 12:44:26 +01:00
Felix Niklas
f2da497901 overview: fix fix auto tab width in FF 2015-11-25 12:22:17 +01:00
Martin Edenhofer
66d56ff9e2 Chat updated. 2015-11-25 11:06:26 +01:00
Martin Edenhofer
caf97b8e3b Fixed closing of new modal api. 2015-11-25 10:42:12 +01:00
Martin Edenhofer
6c42e43bd7 Reduced log level. 2015-11-25 10:41:53 +01:00
Martin Edenhofer
85f371b0f4 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-25 10:36:36 +01:00
Martin Edenhofer
2a85b39493 Added support of chat identifier. 2015-11-25 10:35:57 +01:00
Martin Edenhofer
39b37e048b Added chat settings. Improved chat event backends. 2015-11-25 10:33:39 +01:00
Felix Niklas
81ec203ef7 overviews: fix auto tab width in FF 2015-11-25 10:25:42 +01:00
Felix Niklas
033ab869fe chat designer: fix open/close on different widths 2015-11-24 18:12:59 +01:00
Felix Niklas
33179c632e chat designer: disable pointer-events on chat demo 2015-11-24 15:24:05 +01:00
Felix Niklas
8fb4e393b0 chat designer: allow to toggle the chat and change title 2015-11-24 15:21:05 +01:00
Felix Niklas
1bbf80c80a chat client: rename is-open to is-visible 2015-11-24 15:20:38 +01:00
Felix Niklas
48f9d4fc10 chat designer: remove debugging toggle
since we have the API documentation, its not necessary any more. and all the inputs currently visible change something visibly
2015-11-24 14:10:35 +01:00
Felix Niklas
94edba662b chat designer: demo: fix border radius on fullscreen 2015-11-24 14:08:53 +01:00
Felix Niklas
838b91792c Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-24 14:05:17 +01:00
Felix Niklas
cde67e113b chat designer: fix loader, add new api 2015-11-24 14:05:13 +01:00
Martin Edenhofer
c190abf342 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-24 13:38:08 +01:00
Martin Edenhofer
f27598d389 Merge branch 'develop' of http://ci.lab.zammad.com/core/zammad into develop
Conflicts:
	script/local_browser_tests.sh
2015-11-24 13:37:49 +01:00
Martin Edenhofer
c67f6b2573 Added support of RAILS_SERVE_STATIC_FILES. 2015-11-24 13:36:13 +01:00
Felix Niklas
d3605697df rewrite zammad-swatch to fit in line with other inputs 2015-11-24 13:07:39 +01:00
Felix Niklas
a7fb55b43d chat designer: prepare for new api 2015-11-24 13:07:24 +01:00
Felix Niklas
eb8ff4200b chat designer: add flat design api description 2015-11-24 13:07:07 +01:00
Felix Niklas
778fe5b538 chat designer: add flat design switch 2015-11-24 13:06:33 +01:00
Felix Niklas
f4c4dcf9b3 chat designer: add loader to browser input 2015-11-24 13:06:02 +01:00
Felix Niklas
4a6f99b928 add 3rd party license file and tinycolor 2015-11-24 13:04:46 +01:00
Felix Niklas
9075365d0b chat client: add flat to defaults 2015-11-24 13:04:31 +01:00
Martin Edenhofer
c0d1948358 Cleanup. 2015-11-24 03:33:40 +01:00
Martin Edenhofer
62d4ead6a4 Set first color automatically. Fetch more colors, just up to 8 colors in fronted. 2015-11-24 02:52:41 +01:00
Martin Edenhofer
c0720b041b Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-23 17:12:27 +01:00
Felix Niklas
331083317d chat designer: connect color-swatches api 2015-11-23 17:05:10 +01:00
Felix Niklas
c7a6d5f62f chat designer: add disclaimer to preview 2015-11-23 15:58:43 +01:00
Felix Niklas
bf4301cb98 chat designer: fix demo browser transition from iphone to macbook 2015-11-23 15:23:28 +01:00
Martin Edenhofer
53b301c7fa Updated selenium server. 2015-11-23 14:56:11 +01:00
Felix Niklas
59761d1e2f chat designer: more explicit + add channel label 2015-11-23 14:42:00 +01:00
Felix Niklas
62bdc30d57 adjust datepicker to work in settings-list (holidays) 2015-11-23 14:34:47 +01:00
Felix Niklas
809e28c69d fix datepicker ui when in settings-list 2015-11-23 14:34:29 +01:00
Martin Edenhofer
8cefc82d8a Applied coffee lint. 2015-11-23 14:13:15 +01:00
Felix Niklas
6f49895d31 chat designer: rename fit width to 1:1 2015-11-23 14:09:58 +01:00
Felix Niklas
ddf809abbd remove :readonly style cause it clashes with calendar subscriptions 2015-11-23 14:09:28 +01:00
Martin Edenhofer
df90a8f9d6 Added auto wizard. 2015-11-23 14:04:25 +01:00
Martin Edenhofer
516a994594 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-23 13:05:38 +01:00
Felix Niklas
9bd7bd4380 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-23 11:25:21 +01:00
Martin Edenhofer
2fc1c9831c Moved to external scripts to start/stop test env. 2015-11-23 11:23:05 +01:00
Martin Edenhofer
fd7d2acb15 Added auto wizard. 2015-11-23 11:06:49 +01:00
Martin Edenhofer
173f6e4e08 Added other OTRS jobs. 2015-11-22 20:29:00 +01:00
Martin Edenhofer
bc846b4df5 Removed unknown variables params. 2015-11-22 17:09:31 +01:00
Martin Edenhofer
11f7c8bef9 Added OTRS 5 job. 2015-11-22 16:55:59 +01:00
Martin Edenhofer
d17cfeebc0 Added es job. 2015-11-22 16:32:18 +01:00
Martin Edenhofer
0265fb0a2b Added more jobs. 2015-11-22 16:11:49 +01:00
Martin Edenhofer
28a4095fb6 Fixed config file name. 2015-11-22 16:00:23 +01:00
Martin Edenhofer
5b69f66739 Test with gitlab ci runner. 2015-11-22 15:58:06 +01:00
Martin Edenhofer
8c819cee3f Little helper for builds. 2015-11-22 03:01:41 +01:00
Martin Edenhofer
8c3ad8d8f4 Removed globale mouse on over before click. 2015-11-22 01:03:21 +01:00
Martin Edenhofer
9fb77318ff Stay over element until click it. 2015-11-21 07:50:53 +01:00
Martin Edenhofer
d115fe8993 Update taskbar after object is loaded/changed. 2015-11-20 17:17:59 +01:00
Martin Edenhofer
4f2cb55a56 Fixed update() of App.UpdateTastbar class. 2015-11-20 17:11:06 +01:00
Martin Edenhofer
01a37e9657 Reduced count of not needed task bar rendering again. 2015-11-20 16:26:05 +01:00
Felix Niklas
4b45d8b24c Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-20 15:43:27 +01:00
Felix Niklas
b60b0a8b5c chat designer: remove tabs, add documentation 2015-11-20 15:43:23 +01:00
Martin Edenhofer
cbca4fa849 Removed not needed render events. 2015-11-20 15:10:50 +01:00
Martin Edenhofer
7315e87b08 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-20 12:07:14 +01:00
Martin Edenhofer
442da38eae Fixed all users in ticket owner selection in zoom and bulk. 2015-11-20 12:06:50 +01:00
Felix Niklas
f530720435 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-20 12:03:30 +01:00
Felix Niklas
34e517262c twitter config mockup 2015-11-20 12:03:25 +01:00
Felix Niklas
7ac0a5c280 tone down menu-item hover state switch background 2015-11-20 11:52:31 +01:00
Martin Edenhofer
28dcee225d Fixed inline translations with &, < and > issues. 2015-11-20 10:53:56 +01:00
Martin Edenhofer
da047e6286 Added inline translation support. 2015-11-20 10:49:22 +01:00
Martin Edenhofer
9447a08e6e Improved performance of large object tables. 2015-11-20 10:47:41 +01:00
Martin Edenhofer
8800b6b61a Replaced App.ControllerModal by App.ControllerModalNice to support also translation inline feature (ctrl+alt+t) for modal dialog screens. 2015-11-20 02:59:35 +01:00
Martin Edenhofer
3a649527bc Moved toggle for translation inline to widget. Just listen to events if feature is active. 2015-11-19 18:13:22 +01:00
Felix Niklas
db0b434eb6 translation: stopPropagation on clicks inline on element 2015-11-19 16:19:02 +01:00
Martin Edenhofer
2c93b1c57d Some html and markup improvements for inline translation feature. 2015-11-19 15:48:48 +01:00
Martin Edenhofer
d8f5046400 Improved wording. 2015-11-19 14:26:18 +01:00
Martin Edenhofer
8cce0ef88c Improved toggle of action buttons. 2015-11-19 14:25:39 +01:00
Martin Edenhofer
579a15677a Small cleanup. 2015-11-19 13:16:56 +01:00
Felix Niklas
b6277759dd Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-19 10:32:50 +01:00
Felix Niklas
b031baee10 wip twitter channel 2015-11-19 10:32:31 +01:00
Martin Edenhofer
ea6112a9bc To increase tests, added possibility to set used locales via env vars. 2015-11-19 09:06:12 +01:00
Martin Edenhofer
eb4ecc5aa7 Improved handling of certain cases. 2015-11-19 09:03:18 +01:00
Martin Edenhofer
8ecc01401c Fixed typo. 2015-11-19 09:02:20 +01:00
Martin Edenhofer
b31cae00fe Small refactoring. 2015-11-19 09:01:58 +01:00
Martin Edenhofer
77a1fedd58 Added missing translation. 2015-11-19 09:01:01 +01:00
Martin Edenhofer
5127b99ad5 Do not show vertical navigation if only one tab exists. 2015-11-18 16:33:19 +01:00
Felix Niklas
9a7413503b Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-18 16:12:53 +01:00
Felix Niklas
be7582aaeb tabs: correct border-radius for when there is only one child 2015-11-18 16:12:43 +01:00
Martin Edenhofer
6fd81a8dc5 Fixed renamed controller name. 2015-11-18 14:29:13 +01:00
Martin Edenhofer
dbc4d0ae57 Improved rerendering on translation changes. 2015-11-18 14:27:46 +01:00
Martin Edenhofer
c1ae11139f Removed not needed controller. Improved App.ControllerTabs and App.ControllerNavSidbar. 2015-11-18 14:25:54 +01:00
Felix Niklas
341088625b Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-18 09:20:05 +01:00
Felix Niklas
494a2a355d back to default nav-bar design 2015-11-18 09:19:51 +01:00
Martin Edenhofer
47714f7042 Speedup of syncing translations. 2015-11-18 08:37:18 +01:00
Felix Niklas
f0615800a2 nav tabs and tab-content: boxes 2015-11-18 01:24:52 +01:00
Felix Niklas
042365b533 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-18 01:08:04 +01:00
Felix Niklas
271fa16bef refactor nav-tabs (remove bootstrap, back to old design) 2015-11-18 01:07:59 +01:00
Martin Edenhofer
d8069b8e61 Another chrome selenium fix. 2015-11-18 00:53:19 +01:00
Martin Edenhofer
59b9a39423 Show add button just for agents. 2015-11-17 22:51:06 +01:00
Martin Edenhofer
38eb9e194e Removed general scroll_to at any click, do it now dedicated where it is needed for chrome. 2015-11-17 19:57:15 +01:00
Felix Niklas
f314bdfe1c nav-tabs: welcome to the gradient 2015-11-17 17:35:55 +01:00
Felix Niklas
2dfe95793a make nav-tabs lighter 2015-11-17 17:14:21 +01:00
Felix Niklas
9242326bf5 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-17 17:01:58 +01:00
Felix Niklas
c294fba2e3 rework nav-tab design 2015-11-17 17:01:52 +01:00
Martin Edenhofer
d94399ec7f Added chat tabs based on database. Added chat.preferences store. 2015-11-17 16:39:46 +01:00
Felix Niklas
a1f3f08ff0 remove console.log 2015-11-17 16:30:44 +01:00
Felix Niklas
fe572ae54b Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-17 15:52:54 +01:00
Felix Niklas
4fe30e4918 style pre, start with chat widget tabs 2015-11-17 15:52:50 +01:00
Martin Edenhofer
8f2eb904ae Improved scroll_to behaviour. 2015-11-17 15:28:00 +01:00
Martin Edenhofer
a609b13825 Refactoring, improved handling of from meta params on changes. 2015-11-17 15:04:36 +01:00
Felix Niklas
8ef89eb6bc ControllerModelLoading: make backdrop visible
but still not clickable
2015-11-17 13:59:27 +01:00
Felix Niklas
4298c3e71c Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-17 13:46:16 +01:00
Felix Niklas
8ebf1bcfe3 ticketZoom: remove clickCatcher, improve ux 2015-11-17 13:46:12 +01:00
Martin Edenhofer
ef5c4af340 Fixed test, changed check box behaviour. 2015-11-17 13:13:36 +01:00
Felix Niklas
0840b521fa Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-17 12:10:09 +01:00
Felix Niklas
1d3c849187 admin pages: add page-content and style containing labels 2015-11-17 12:10:04 +01:00
Martin Edenhofer
541cf8dfa9 Improved browser tests. 2015-11-17 11:12:43 +01:00
Felix Niklas
b6c1973e0e inputs layout_ref: add progress 2015-11-17 11:12:32 +01:00
Felix Niklas
6c2284321f chat designer: add translations 2015-11-17 11:12:22 +01:00
Felix Niklas
db89970123 chat designer: outsource preview width 2015-11-17 10:48:36 +01:00
Martin Edenhofer
5c085b128c Improved browser helper click() - scroll to element before click (needed for chrome behaves). 2015-11-17 10:03:51 +01:00
Felix Niklas
787553ea42 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-17 01:43:40 +01:00
Felix Niklas
96d24ff4d7 chat designer: responsive preview 2015-11-17 01:43:36 +01:00
Martin Edenhofer
85310c4683 Fixed test. 2015-11-16 22:39:55 +01:00
Martin Edenhofer
01e1943591 Added helper to remove click catcher. 2015-11-16 21:54:07 +01:00
Martin Edenhofer
db231a8f07 Fixed bulk action (selector for checked tickets was wrong). 2015-11-16 20:24:58 +01:00
Martin Edenhofer
1ae8bc568a Increased size of value_* col. 2015-11-16 19:40:45 +01:00
Martin Edenhofer
22313ab80d Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-16 17:15:21 +01:00
Martin Edenhofer
ecadd6e777 Apply new signature in ticket zoom on group change. 2015-11-16 17:14:33 +01:00
Felix Niklas
95d9b3c5f6 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-16 17:10:27 +01:00
Felix Niklas
5973de7983 chat designer 2015-11-16 17:10:22 +01:00
Martin Edenhofer
0cb2cb0c4f Removed not existing model. 2015-11-16 15:43:50 +01:00
Martin Edenhofer
84a59f0330 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-16 15:05:26 +01:00
Felix Niklas
1249c7734f chat client: fix chat css 2015-11-16 14:58:36 +01:00
Felix Niklas
57b73e6026 chat client: prevent multiple autoGrow initialisations 2015-11-16 14:54:11 +01:00
Felix Niklas
b7f0eb2c3f chat client: fix css 2015-11-16 14:53:53 +01:00
Felix Niklas
cad8efe84e chat client: remove unit from fontSize 2015-11-16 14:39:39 +01:00
Martin Edenhofer
06bd1d733d Removed not existing model. 2015-11-16 14:39:35 +01:00
Felix Niklas
54d4fda959 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-16 14:10:45 +01:00
Felix Niklas
2e47c4e6c0 refactor Admin Email 2015-11-16 14:10:40 +01:00
Martin Edenhofer
c33cafa424 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-16 13:52:34 +01:00
Martin Edenhofer
350d8890f0 Removed interval reload. 2015-11-16 13:52:11 +01:00
Martin Edenhofer
0a291f9e4c Rough reworked. 2015-11-16 13:47:19 +01:00
Felix Niklas
21f717c619 chat client: disable chat button until websocket connected 2015-11-16 13:08:32 +01:00
Martin Edenhofer
5933dd8b49 Removed debugging. 2015-11-16 12:06:51 +01:00
Martin Edenhofer
d301fddf88 Added fontsize option. 2015-11-16 12:06:09 +01:00
Martin Edenhofer
18e01c5fd4 Revert "chat client: backwards compatible css (remove flex)"
This reverts commit f79820963c.
2015-11-16 11:53:04 +01:00
Felix Niklas
d970c08306 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-16 11:46:53 +01:00
Felix Niklas
6de78fddf7 chat client: add fontSize option 2015-11-16 11:46:42 +01:00
Felix Niklas
f79820963c chat client: backwards compatible css (remove flex) 2015-11-16 11:46:18 +01:00
Martin Edenhofer
1f2420f817 Initial admin interface for chat. 2015-11-16 11:44:13 +01:00
Martin Edenhofer
a1ed58f6e6 Do not play sounds on initial load. 2015-11-16 11:32:26 +01:00
Martin Edenhofer
404c82f427 Improved show error screens. 2015-11-15 11:01:48 +01:00
Martin Edenhofer
4df599b28a Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-13 17:04:20 +01:00
Martin Edenhofer
646c11406c Update queue position also if customer closed chat. Get new chat state from server after client closed chat. Added more indexes. 2015-11-13 17:03:58 +01:00
Felix Niklas
3b4854cfff chat: make statusMessage realname fat 2015-11-13 16:20:44 +01:00
Felix Niklas
9ba4dcfc41 chat: fatter new chat font-weight 2015-11-13 16:20:25 +01:00
Felix Niklas
189c4e2e99 chat: default name Anonymous instead of anonymous 2015-11-13 16:20:07 +01:00
Felix Niklas
543c27a0bc chat client: fix reconnect ui, simpler theming 2015-11-13 15:58:44 +01:00
Martin Edenhofer
0d692cb7ed Show chat per default. 2015-11-13 15:15:44 +01:00
Felix Niklas
6c0e4ba9f3 chat client: detect host, init chat in index.html 2015-11-13 13:59:15 +01:00
Felix Niklas
ecb1f94c02 chat client: apply log arguments 2015-11-13 11:13:02 +01:00
Felix Niklas
0912e0e42a chat client: fix send button, fix initial position 2015-11-13 11:06:47 +01:00
Felix Niklas
57941a83a6 chat client: make host part of the config options
I think that this its a better idea to populate the host field on the server instead of guessing it on the client because guessing it on the client is quite fragile: it only works when the webmaster includes our script the way we tell them to. If that doesn't fit into their workflow (e.g. they want to concatinate all javascript files, they want to load it asynchronously) our functionality will break.
2015-11-13 10:45:40 +01:00
Martin Edenhofer
59c6fce8df Reset sessionId if reconnect with sessionStorage sessionId was not successful. 2015-11-13 00:00:13 +01:00
Martin Edenhofer
7f3ff9a4c9 Broadcast agent state update after closing or adding a chat session. 2015-11-12 23:58:35 +01:00
Martin Edenhofer
87712a5b34 Broadcast agent state update after closing or adding a chat session. 2015-11-12 23:56:56 +01:00
Felix Niklas
e2d7821e1f Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	public/assets/chat/chat.coffee
2015-11-12 17:32:11 +01:00
Felix Niklas
0bd1c2a3cc chat client: add timeout screen (@showTimeout) 2015-11-12 17:31:20 +01:00
Martin Edenhofer
7dec6fa9dd Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-12 17:16:30 +01:00
Martin Edenhofer
6b4c6ab12a In reopenSesssion, scroll to bottom. Remove sessionID on close. 2015-11-12 17:15:58 +01:00
Martin Edenhofer
61cb35c193 Update ws client ids in reconnect. 2015-11-12 16:58:47 +01:00
Felix Niklas
a16781daa0 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-12 16:19:53 +01:00
Felix Niklas
8c52d703d2 chat client: split up status in timestamp and status 2015-11-12 16:19:47 +01:00
Martin Edenhofer
f7edea8ce8 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-12 16:16:29 +01:00
Martin Edenhofer
dfd3bb4adf Added agent info on reconnect. 2015-11-12 16:16:01 +01:00
Felix Niklas
6016adbdd9 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-12 15:54:40 +01:00
Felix Niklas
e73d8e76db chat interface: autofocus on first new chat input 2015-11-12 15:54:30 +01:00
Martin Edenhofer
fc433fd649 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-12 15:31:22 +01:00
Felix Niklas
2b8bd3a87c chat client: fix new session initiation 2015-11-12 15:30:44 +01:00
Felix Niklas
240d552339 chat client: fix open call 2015-11-12 15:24:19 +01:00
Martin Edenhofer
c71e052548 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-12 15:21:59 +01:00
Felix Niklas
45adb0a43d chat: fix merge #2 2015-11-12 15:21:04 +01:00
Felix Niklas
377910ce20 chat: fix merge problem 2015-11-12 15:20:07 +01:00
Martin Edenhofer
5749e841f8 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-12 15:16:07 +01:00
Martin Edenhofer
d35f221017 Do not highlight waiting chats if all chat seeds are full. 2015-11-12 15:15:15 +01:00
Felix Niklas
77aeb271f8 chat client: fix merge 2015-11-12 15:05:43 +01:00
Felix Niklas
27ebc6a0a6 Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	public/assets/chat/chat.coffee
2015-11-12 15:00:44 +01:00
Felix Niklas
330c07e34c customer chat client: open unfinished session 2015-11-12 14:56:47 +01:00
Martin Edenhofer
275ab9a931 Fixed position in view. 2015-11-12 14:42:35 +01:00
Martin Edenhofer
9066ef64b8 Now use own templates (not from layout ref). 2015-11-12 14:39:46 +01:00
Martin Edenhofer
02470aa78a Now use own templates (not from layout ref). 2015-11-12 14:35:19 +01:00
Martin Edenhofer
b654c4d34b Added "connection" placeholder screen for 10 sec. Fixed updating wait list counter in backend. 2015-11-12 14:19:41 +01:00
Felix Niklas
9b78afe982 customer chat interface animation fix 2015-11-12 13:10:13 +01:00
Felix Niklas
789cb15640 chat qa 2015-11-12 11:44:37 +01:00
Martin Edenhofer
3602f4f0ea Also allow db connections for pre & post. 2015-11-12 11:28:06 +01:00
Martin Edenhofer
d9a6c835b0 Added customer reconnect possibility on server side. 2015-11-12 10:39:14 +01:00
Martin Edenhofer
edbbce1f50 Serve avatar images without session. 2015-11-12 10:37:24 +01:00
Martin Edenhofer
8838c8e6f6 Just remove registration to disable it. 2015-11-12 10:36:05 +01:00
Martin Edenhofer
c2aea9ecc6 Only start if user is in group chat. 2015-11-12 10:35:21 +01:00
Martin Edenhofer
a0169db600 Added reconnecting of chat app. Improved logging of chat app. 2015-11-12 08:51:52 +01:00
Martin Edenhofer
ba68349789 Added reconnecting of chat app. Improved logging of chat app. 2015-11-11 21:44:54 +01:00
Martin Edenhofer
74de560844 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	public/assets/chat/chat.min.js
2015-11-11 14:11:13 +01:00
Martin Edenhofer
1979376d21 Fixed new message counter, fixed active/not active state of agent and refactoring of web socket event backends. 2015-11-11 14:10:26 +01:00
Felix Niklas
733f62feb7 add active state for user-menu 2015-11-11 11:57:34 +01:00
Felix Niklas
f93407b36f chat close icon 2015-11-11 11:44:10 +01:00
Martin Edenhofer
600649d51a Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-11 11:25:12 +01:00
Martin Edenhofer
3ba85dcb98 Moved to other config name. 2015-11-11 11:25:03 +01:00
Martin Edenhofer
bca84d7968 Small code cleanup. 2015-11-11 11:24:19 +01:00
Felix Niklas
50795a7445 fix livereload port 2015-11-11 11:17:01 +01:00
Felix Niklas
c971d4c0d9 hide layout_ref chat 2015-11-11 11:09:34 +01:00
Martin Edenhofer
1c1dd25832 Fixed attachment upload. 2015-11-11 10:57:25 +01:00
Felix Niklas
a3cdaeda3a chat: fix autoGrow 2015-11-11 10:48:54 +01:00
Felix Niklas
debd5308e0 remove livereload script 2015-11-11 10:48:44 +01:00
Felix Niklas
2185de4681 chat: don't display avatar if there is none 2015-11-11 10:37:34 +01:00
Felix Niklas
ba6686ab52 rename chat css from style.scss to chat.scss 2015-11-11 10:37:07 +01:00
Felix Niklas
405679ad6c bigger line-height for chat messages 2015-11-11 10:24:05 +01:00
Felix Niklas
7d29d62981 fix line wrap in chat messages 2015-11-11 10:22:19 +01:00
Felix Niklas
ec2f65cd0e datepicker: fix style when rendered inside table 2015-11-10 16:43:19 +01:00
Felix Niklas
e8094488f8 bulk actions: refactor, make space for scrollbar and rows 2015-11-10 16:06:21 +01:00
Felix Niklas
5b7d9fa528 fix status spacing 2015-11-10 15:17:20 +01:00
Martin Edenhofer
3ea2a1aa2e Applied rubocop. 2015-11-10 15:05:29 +01:00
Martin Edenhofer
58de72cfc1 Fixed initial setup. 2015-11-10 15:05:11 +01:00
Martin Edenhofer
791c0f934c First version of customer chat. 2015-11-10 15:01:04 +01:00
Felix Niklas
92264a55e2 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-10 14:19:59 +01:00
Felix Niklas
16456b3043 table resize: fix internal temp storage, store calculated width in displayWidth 2015-11-10 14:19:54 +01:00
Martin Edenhofer
5faef94131 Improved behaviour at first shown time (scroll to bottom). 2015-11-10 09:27:36 +01:00
Felix Niklas
d4bd04e7ea rename "state-color supergood-state" to "supergood-color" etc 2015-11-09 17:52:15 +01:00
Martin Edenhofer
095a16db32 Seems to be user friendlier to keep tab open per default. 2015-11-06 08:56:15 +01:00
Martin Edenhofer
d95ac81744 Improved wording. 2015-11-06 02:45:10 +01:00
Martin Edenhofer
8e3128a4fc Fixed test. 2015-11-06 02:43:26 +01:00
Martin Edenhofer
4639b0c5eb Improved wording. 2015-11-06 02:18:42 +01:00
Martin Edenhofer
3c8cce0c3d Close task per default. 2015-11-06 02:08:06 +01:00
Martin Edenhofer
48dde6e313 Improved timing. 2015-11-06 01:29:51 +01:00
Martin Edenhofer
b3faf6b3e2 Removed double quoting. 2015-11-06 01:28:25 +01:00
Martin Edenhofer
92f1c97034 Close tabs per default. 2015-11-06 01:27:53 +01:00
Martin Edenhofer
f4cc1efc17 Fixed test. 2015-11-05 17:18:12 +01:00
Martin Edenhofer
1909463c02 Implement destroy via @bindCol param. 2015-11-05 17:06:47 +01:00
Felix Niklas
746f825c8f Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-05 16:26:05 +01:00
Felix Niklas
350fa9170c fix deletable rows 2015-11-05 16:25:52 +01:00
Martin Edenhofer
fcb08d9dff Renamed "Overviews" to "Tickets". 2015-11-05 16:25:20 +01:00
Felix Niklas
bad17f7cd5 undo overview name trim 2015-11-05 15:06:37 +01:00
Felix Niklas
60c675262d fix empty table ui 2015-11-05 14:45:13 +01:00
Felix Niklas
9abf21af6b Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-05 14:38:27 +01:00
Felix Niklas
c501c07694 rephrase empty table 2015-11-05 14:38:23 +01:00
Martin Edenhofer
31613b09d2 Fixed browser tests. 2015-11-05 13:34:22 +01:00
Felix Niklas
d4dfab1c9a empty table placeholder 2015-11-05 13:24:24 +01:00
Felix Niklas
b06b90d820 slightly increase h1 size for a better contrast to h2 2015-11-05 12:17:59 +01:00
Felix Niklas
7822163a2b fix tab-content spacing after nav-tabs 2015-11-05 12:16:47 +01:00
Felix Niklas
6d7e4dd5cd Channels > Form adjust checkboxes and labels in table 2015-11-05 12:15:26 +01:00
Felix Niklas
df79cf734d fix calendar table width 2015-11-05 12:09:51 +01:00
Felix Niklas
0208186967 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-05 12:05:54 +01:00
Felix Niklas
d12a130315 overviews title: h1 to h2 2015-11-05 12:05:50 +01:00
Felix Niklas
86c615ef47 add new ticket plus to overviews 2015-11-05 12:04:29 +01:00
Martin Edenhofer
0b679bef9f Added task actions to ticket zoom. 2015-11-05 11:58:05 +01:00
Felix Niklas
e921f7dc04 fix overview autoTabWidth 2015-11-05 10:13:05 +01:00
Martin Edenhofer
c3ce7f1d60 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-04 17:04:35 +01:00
Martin Edenhofer
812d953c1c Split of model/collections and controller. 2015-11-04 17:04:17 +01:00
Felix Niklas
7716061fe7 increase text color contrast 2015-11-04 16:39:12 +01:00
Felix Niklas
cf00f552c4 refactor wide-tabs 2015-11-04 16:39:03 +01:00
Felix Niklas
4e39e22512 increate table text contrast, add dropdown menu badge spacing 2015-11-04 16:22:39 +01:00
Martin Edenhofer
c2459ed72d Split of model and controller. 2015-11-04 14:24:45 +01:00
Felix Niklas
7b9e7ea0bc fix dashboard tabs 2015-11-04 12:57:34 +01:00
Felix Niklas
6afd5d5432 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-04 12:47:21 +01:00
Martin Edenhofer
7115103b5e Mark ticket as changed if only one attachment is uploaded. Delete uploaded attachments on form rest. 2015-11-04 12:42:57 +01:00
Felix Niklas
8e6807b0eb Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-04 12:32:04 +01:00
Felix Niklas
fbe42ca6b5 overviews: add vertical navbar
@navBarControllerVertical in ticket_overviews.coffe:12 somehow doesn't get rendered yet. if you change the order (@navBarControll after ..Vertical) it will get rendered but the sidebar navBar won't get rendered
2015-11-04 12:30:46 +01:00
Martin Edenhofer
58b90fd489 Fixed multiple attachment on d&d bug in zoom. 2015-11-04 10:30:30 +01:00
Martin Edenhofer
21de1e8bd8 Moved store to session store. 2015-11-04 10:25:55 +01:00
Martin Edenhofer
01678787f3 Added support for personal local storage (to not share settings over different users on same browser). 2015-11-04 10:23:56 +01:00
Martin Edenhofer
e1c87d8cfa Added counter and switch support to nabber menu items. Take info and use callback for counter and switch from related permanent controller (if exists). 2015-11-04 08:26:49 +01:00
Martin Edenhofer
a65c1ac592 Improved cache of activity stream. 2015-11-04 07:44:47 +01:00
Martin Edenhofer
ced0a83579 Removed storage options from collection helper. 2015-11-03 20:48:41 +01:00
Martin Edenhofer
97ae448933 Moved to own App.LocalStorage and App.SessionStorage layer to abstract JSON.stringify and JSON.parse. 2015-11-03 20:05:16 +01:00
Martin Edenhofer
4a9c2c55b2 Removed storage options from collection helper. 2015-11-03 19:36:24 +01:00
Martin Edenhofer
0143eae963 Moved to own App.LocalStorage and App.SessionStorage layer to abstract JSON.stringify and JSON.parse. 2015-11-03 18:24:45 +01:00
Felix Niklas
2cf47e24a9 remove legacy chat css 2015-11-03 16:09:53 +01:00
Felix Niklas
5756fb0a05 prefix websocket actions with chat_ 2015-11-03 15:20:31 +01:00
Felix Niklas
8a075294c6 add blicking and clickable status-field classes 2015-11-03 15:20:03 +01:00
Felix Niklas
8bd1ce4748 Merge branch 'develop' of github.com:martini/zammad into develop 2015-11-02 16:48:20 +01:00
Felix Niklas
806ffb70c7 chat: add waiting screen, outsource agent view, add basic socket communication 2015-11-02 16:48:16 +01:00
Martin Edenhofer
c8bb1d1d73 Fixed naming issues with spine controller. 2015-11-02 16:39:56 +01:00
Martin Edenhofer
45413b56b2 Added missing super in constructor. 2015-11-02 14:53:34 +01:00
Felix Niklas
d67bae2005 resize table: rename destroy to release (method) 2015-11-02 14:18:25 +01:00
Martin Edenhofer
9f56d141cd Set also runtime @headerWidth after @onColResizeMouseup(), to used current @headerWidth e. g. on change sort order. 2015-11-02 14:01:59 +01:00
Martin Edenhofer
230c948f75 Improved behaviours of re-rendering. 2015-11-02 13:40:42 +01:00
Felix Niklas
efbd9ca740 fix table resize jaggy behaviour and add resize
TODO: the destroy method has to get wired up to when the table gets removed/is out of view to unbind the resize event.
2015-11-02 10:50:34 +01:00
Martin Edenhofer
0bd582ecdb Increased interval for autosave. 2015-11-01 16:27:06 +01:00
Martin Edenhofer
09b421ab6e Take history create time from record updated_at time. 2015-11-01 13:05:11 +01:00
Martin Edenhofer
e4a560917c Just remove _formDiffNormalizerCheckConstructor() - improve performance. 2015-11-01 03:32:00 +01:00
Martin Edenhofer
9b6514d4a4 Try to not used _formDiffNormalizer() - improve performance. 2015-11-01 03:11:36 +01:00
Martin Edenhofer
bcce460cf7 Removed not needed arg. 2015-11-01 03:10:52 +01:00
Martin Edenhofer
a42f5be004 Fixed svg polyfill. 2015-11-01 01:48:02 +01:00
Martin Edenhofer
519033174d Improved reset of last_contact/last_contact_customer (only reset on first customer follow up - needed for update time escalation). 2015-10-30 11:05:51 +01:00
Martin Edenhofer
1fb3ac5133 Improved escalation update time calculation. 2015-10-30 10:14:34 +01:00
Martin Edenhofer
e0293f08e5 Added limit to preview. 2015-10-29 19:20:22 +01:00
Martin Edenhofer
e727a548ed Fixed variable missmatch. 2015-10-29 18:55:59 +01:00
Martin Edenhofer
26c1a03e77 Small improvements. 2015-10-29 16:19:31 +01:00
Martin Edenhofer
289e2da392 Applied role based permissions. 2015-10-29 13:08:06 +01:00
Martin Edenhofer
16330e7c4d Fixed result order. 2015-10-29 11:12:17 +01:00
Martin Edenhofer
4bb3ab8a46 Remove group by attribute from header. 2015-10-29 10:49:59 +01:00
Martin Edenhofer
4aa4c84477 Deliver more results on selector search. 2015-10-29 10:45:29 +01:00
Martin Edenhofer
6f1d783c8b Fixed result order. 2015-10-29 10:32:48 +01:00
Martin Edenhofer
bb630708c4 Fixed file upload (missing form_id). 2015-10-29 10:29:07 +01:00
Martin Edenhofer
cff7cd57bd Fixed table content group by. 2015-10-29 10:20:43 +01:00
Martin Edenhofer
4d7f07c400 Fixed naming of xaxis. 2015-10-29 10:14:53 +01:00
Martin Edenhofer
e192c7e213 Fixed syntax error. 2015-10-29 10:08:01 +01:00
Martin Edenhofer
d40a37ac92 Added new backends. 2015-10-29 10:07:45 +01:00
Martin Edenhofer
5e4f474bfd Removed debugging. 2015-10-29 10:03:09 +01:00
Martin Edenhofer
c1357aa3e5 Improved test. 2015-10-29 07:22:08 +01:00
Martin Edenhofer
5bff18e7f7 Small adjustments to default col. sizes. 2015-10-29 03:34:14 +01:00
Martin Edenhofer
b9a5de081e Next features for mini reporting. 2015-10-29 03:33:36 +01:00
Felix Niklas
eaa266ec50 use own template for datepicker for Icons 2015-10-28 14:33:25 +01:00
Felix Niklas
93705710d4 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-28 14:01:25 +01:00
Felix Niklas
73d0b84779 allow to hide modal on ESC 2015-10-28 14:01:21 +01:00
Martin Edenhofer
f0431d584a Increased speed of Translation.load, just update if needed. 2015-10-28 13:26:41 +01:00
Martin Edenhofer
0707bfa512 Increased speed of Translation.load, just update if needed. 2015-10-28 13:24:52 +01:00
Martin Edenhofer
b84047b74f Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/assets/javascripts/app/controllers/_application_controller_table.coffee
2015-10-28 11:38:22 +01:00
Felix Niklas
46805b7469 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-28 11:33:33 +01:00
Felix Niklas
3b463670ce table resize: fix that some tables have width zero while calculating
- fall back minTableWidth
2015-10-28 11:33:29 +01:00
Martin Edenhofer
57959900bc Small code layout improvement. 2015-10-28 10:58:12 +01:00
Martin Edenhofer
d29fde31e5 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-28 10:42:25 +01:00
Martin Edenhofer
b0aa731b92 Show recent created users after adding one. 2015-10-28 10:42:06 +01:00
Felix Niklas
5062b4022c fix table resize method getHeaderWidth 2015-10-28 10:41:35 +01:00
Martin Edenhofer
de26307458 Changed for utc browser tests. 2015-10-27 17:04:17 +01:00
Felix Niklas
aabfef0b2b fix resize, add align setting 2015-10-27 10:57:23 +01:00
Felix Niklas
c233776905 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-27 10:35:06 +01:00
Felix Niklas
3ff6bb17db table resize: stay inside 100% table width
- edge case: can excede 100% width because columns have a minimum width
2015-10-27 10:35:02 +01:00
Martin Edenhofer
1160e758fc Store more ticket attributes in search backend, needed for es queries for stats. 2015-10-27 08:41:55 +01:00
Martin Edenhofer
cc2a436dd6 Small improvements. 2015-10-27 08:34:55 +01:00
Martin Edenhofer
2e84756b0e Keep *_id attributes for search backend (needed to ticket selector on search backend). 2015-10-24 14:07:59 +02:00
Martin Edenhofer
79be90c700 Renamed sessionStorage to localStorage. 2015-10-24 14:07:17 +02:00
Martin Edenhofer
d59dc41862 Fixed table col. width issue / use own width for each @table_id. 2015-10-24 14:04:05 +02:00
Felix Niklas
0ace20fb4b Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-23 16:29:52 +02:00
Felix Niklas
962ccebe4e add twitter conversation view layout ref 2015-10-23 16:29:48 +02:00
Felix Niklas
c5e23bb635 refactor ticket:openTextarea 2015-10-23 16:29:39 +02:00
Felix Niklas
bd364bcb93 add note with @Icon() reverse regex
useful when copy pasting Zammad html for a layout-reference to covert <svg>'s back to @Icons
2015-10-23 16:28:59 +02:00
Martin Edenhofer
82da8d8052 Permanent user based store of col. width and sort attributes. 2015-10-23 15:41:33 +02:00
Martin Edenhofer
453e201912 Prevent submitting attachments without article body. 2015-10-23 13:45:20 +02:00
Martin Edenhofer
ce937627d8 Added new test case. 2015-10-23 13:02:11 +02:00
Felix Niklas
1c6a32c8ce prevent table sortIcon shrinkage 2015-10-22 13:52:52 +02:00
Felix Niklas
2ffe0d2efa add sortByColumn method 2015-10-22 13:39:33 +02:00
Felix Niklas
ad0394e73e Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-22 13:24:52 +02:00
Felix Niklas
ef714d589b table resize: add @minColWidth 2015-10-22 13:24:47 +02:00
Martin Edenhofer
237fe9ed0b Added col name to <th>, need to store col width. 2015-10-22 13:19:39 +02:00
Felix Niklas
a3fdfdeb68 table column resize
TODO:
- store resized width with the user settings
- read in stored widths from user settings
- add functionality to disable resizing on certain columns
2015-10-22 11:25:44 +02:00
Felix Niklas
5223e08291 report: better select state 2015-10-21 11:10:18 +02:00
Felix Niklas
a871113525 Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	app/assets/javascripts/app/views/report/time_picker.jst.eco
2015-10-20 17:22:48 +02:00
Felix Niklas
1a4b120696 style reporting 2015-10-20 17:16:29 +02:00
Felix Niklas
c9db9202fb refactor tabs
remove horizontal
2015-10-20 16:59:30 +02:00
Martin Edenhofer
563789135f Implemented download list 2015-10-20 14:58:04 +02:00
Martin Edenhofer
78fc282051 Fixed realtime range check. 2015-10-20 13:55:49 +02:00
Martin Edenhofer
ce6f868ba5 Replaced active with is-active class. 2015-10-20 13:55:23 +02:00
Martin Edenhofer
f585031717 Fixed initial setups. 2015-10-20 13:54:29 +02:00
Martin Edenhofer
228d6dd001 Small improvements. 2015-10-20 13:11:30 +02:00
Felix Niklas
6ba881a327 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-20 12:52:51 +02:00
Felix Niklas
ca3c0431df fix article type icon 2015-10-20 12:52:47 +02:00
Martin Edenhofer
6af54e9d35 Fixed initial setups. 2015-10-20 11:44:26 +02:00
Martin Edenhofer
12e3bcaa80 Fixed timing issues. 2015-10-20 11:31:08 +02:00
Martin Edenhofer
76637f55a2 Init version. 2015-10-20 10:48:43 +02:00
Roy Kaldung
5327445d44 fixed now the correct section of the spec 2015-10-20 10:05:07 +02:00
Roy Kaldung
0f6591e54f added group 2015-10-20 09:37:43 +02:00
Roy Kaldung
786aac380f added missing group 2015-10-20 09:06:48 +02:00
Martin Edenhofer
45c8a75f00 Fixed typo. 2015-10-20 02:55:31 +02:00
Martin Edenhofer
46a7227959 Fixed javascript exception. 2015-10-19 23:04:37 +02:00
Martin Edenhofer
defa71b371 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 23:02:36 +02:00
Roy Kaldung
bbb9eb6c10 fixed naming 2015-10-19 20:36:50 +02:00
Roy Kaldung
12164f4a68 add user w/ rpm installation 2015-10-19 19:05:42 +02:00
Martin Edenhofer
02bcdcd14b Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 17:16:08 +02:00
Felix Niklas
3b3e216d83 direct link icons.svg spritemap
with fallback for legacy browsers
2015-10-19 17:15:06 +02:00
Felix Niklas
20e6283bb2 refactor icons
fully switch to the @Icon method
2015-10-19 16:38:13 +02:00
Martin Edenhofer
62367ce256 Added small comments. 2015-10-19 16:15:16 +02:00
Martin Edenhofer
9ea7219463 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 16:07:44 +02:00
Felix Niklas
2e51c25b1a refactor avatars 2015-10-19 16:05:33 +02:00
Martin Edenhofer
5c3dd4bd2d Removed not needed item. 2015-10-19 15:28:21 +02:00
Felix Niklas
fb8666b0e4 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 15:23:23 +02:00
Felix Niklas
a1b9633f47 add secondaryAction layoutRef in ticketZoom 2015-10-19 15:22:54 +02:00
Felix Niklas
fcc6999425 rewrite dropdown-selected 2015-10-19 15:22:32 +02:00
Martin Edenhofer
c0e34c8b8b Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 14:21:53 +02:00
Martin Edenhofer
578c4f9d39 Replaced data-tooltip with native title attribute. 2015-10-19 14:12:09 +02:00
Felix Niklas
53e3a1f379 style bulkAction 2015-10-19 14:10:36 +02:00
Martin Edenhofer
c78b77b763 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 14:10:08 +02:00
Martin Edenhofer
03cd05478e Added loading screen in admin interface. After all features are implemented, a more generic controller call will do the job. 2015-10-19 14:06:12 +02:00
Felix Niklas
ecac461490 fix bulk action selects 2015-10-19 13:27:33 +02:00
Felix Niklas
579a1f9f77 fix #147 - loading icon above search results 2015-10-19 11:57:15 +02:00
Felix Niklas
adca7db4fe update page-loading layoutRef 2015-10-19 11:52:29 +02:00
Felix Niklas
beb767a168 remove our tooltips, back to native ones 2015-10-19 11:44:46 +02:00
Felix Niklas
dfc3c97825 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 11:24:05 +02:00
Felix Niklas
c9d2d31cb2 fix ticket-zoom sidebar fold transition 2015-10-19 11:23:53 +02:00
Martin Edenhofer
1d39bb0ea3 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-19 11:16:10 +02:00
Felix Niklas
35cdb8a358 fix avatar crown icons 2015-10-19 11:15:43 +02:00
Felix Niklas
c1fc41635d fix activity placeholder position 2015-10-19 11:12:31 +02:00
Felix Niklas
332f3fb6a2 fix scrollbar in ticketZoom: add gap for scrollbar 2015-10-19 11:09:52 +02:00
Martin Edenhofer
0d7074c410 Resize on item remove. 2015-10-19 10:21:23 +02:00
Martin Edenhofer
fadba4e196 Added new helper method to generate icon's. Show zammad log for system actions. 2015-10-19 09:40:32 +02:00
Martin Edenhofer
043dd6c11e Made online notifications "removable" by user (x). 2015-10-19 08:55:21 +02:00
Martin Edenhofer
d88ac684b1 Fixed 'is-inactive' state for online notifications. 2015-10-19 08:46:38 +02:00
Martin Edenhofer
2028c00bde Workaround for selenium chrome driver issue. 2015-10-19 00:30:38 +02:00
Martin Edenhofer
dfc517a97b Workaround for selenium chrome driver issue. 2015-10-19 00:15:58 +02:00
Martin Edenhofer
18c857a686 Fixed index key. 2015-10-18 23:58:27 +02:00
Martin Edenhofer
3b9b801c99 Workaround for selenium chrome driver issue. 2015-10-18 23:55:40 +02:00
Martin Edenhofer
1230db1fbd More realistic click times. 2015-10-18 21:33:44 +02:00
Martin Edenhofer
c82afde66b Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-18 20:43:31 +02:00
Martin Edenhofer
6341c81629 Remove clickCatcher on release. 2015-10-18 20:43:11 +02:00
Martin Edenhofer
8aacd14e0c Enable form later. 2015-10-18 20:42:40 +02:00
Martin Edenhofer
632d879e2c Streamline of index attributes. 2015-10-18 17:20:09 +02:00
Felix Niklas
6d7d4c4e17 scroll fix: move down scrollbar with scrollHeader 2015-10-16 18:47:05 +02:00
Felix Niklas
702a8005d4 create admin loading placeholder layoutRef 2015-10-16 18:15:52 +02:00
Felix Niklas
eac1ae6985 fix #151 input[type=url] min-width in Safari 2015-10-16 18:01:12 +02:00
Felix Niklas
b0c4354a01 add report icon 2015-10-16 17:51:54 +02:00
Martin Edenhofer
a6826a9166 Fixed typo in class name. 2015-10-15 23:27:22 +02:00
Martin Edenhofer
6ff61092c1 Added icon option for personal menu. 2015-10-15 23:26:02 +02:00
Martin Edenhofer
5042194cfc Fixed class name. 2015-10-15 22:50:26 +02:00
Martin Edenhofer
f47c43b190 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-15 22:45:16 +02:00
Martin Edenhofer
849cb66a37 Fixed initial setup. 2015-10-15 22:40:23 +02:00
Felix Niklas
cd71441956 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-15 17:08:59 +02:00
Felix Niklas
791a7a3577 chat: add viewport 2015-10-15 17:08:41 +02:00
Martin Edenhofer
7478cbef98 Init ws connection. 2015-10-15 17:07:18 +02:00
Felix Niklas
a092e4b3dd avatar logo-icon style 2015-10-15 16:13:27 +02:00
Felix Niklas
ad57764057 hide chat by default 2015-10-15 16:06:24 +02:00
Felix Niklas
9c27582068 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-15 15:28:43 +02:00
Felix Niklas
eb1d74b8e2 chat: add testing webiste 2015-10-15 15:28:39 +02:00
Felix Niklas
843e1e5a9c fix close bug 2015-10-15 15:28:30 +02:00
Martin Edenhofer
730747c534 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-15 15:23:52 +02:00
Martin Edenhofer
2d8c1809a0 Implemented macros. 2015-10-15 15:23:41 +02:00
Felix Niklas
7e4c374cdc fix IE11 user-profile rendering bug 2015-10-15 15:13:37 +02:00
Felix Niklas
a364222199 add notification remove icon (sans functionality)
.js-remove is seeking a job in the click-binding business.
2015-10-15 13:52:36 +02:00
Martin Edenhofer
88d1edfd8d Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-15 13:27:06 +02:00
Martin Edenhofer
cd69cba3f0 Improved pretty date (just now). 2015-10-15 13:26:52 +02:00
Felix Niklas
9f2f9060c3 adjust notification popover min-height 2015-10-15 11:49:09 +02:00
Felix Niklas
ba949ab31b remove white-space wrapping in dropdown li's 2015-10-15 11:46:40 +02:00
Felix Niklas
b4e2548150 fix chat templates 2015-10-15 11:26:56 +02:00
Felix Niklas
50db43318e Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-15 11:14:24 +02:00
Felix Niklas
67886a6af7 customer chat built + sources 2015-10-15 11:14:19 +02:00
Felix Niklas
deded86b63 fix spacing between btn and buttonDropdown 2015-10-15 11:07:58 +02:00
Martin Edenhofer
31e436ec02 Fixed new selector. 2015-10-15 09:16:47 +02:00
Martin Edenhofer
8d5f1092f8 Improved ticket selector again. Added precondition attribute for user/org selection. 2015-10-14 16:33:26 +02:00
Roy Kaldung
51250e786d inital systemd file 2015-10-14 15:20:22 +02:00
Felix Niklas
1baf6b175c adjust controls-label in ticket filter 2015-10-13 15:22:09 +02:00
Martin Edenhofer
03100a42ad Added in-reply-to support. 2015-10-13 13:41:13 +02:00
Martin Edenhofer
d3cf99380d Added in-reply-to support. 2015-10-13 10:42:14 +02:00
Martin Edenhofer
6cbe332a36 Improved input validation. 2015-10-12 23:58:59 +02:00
Martin Edenhofer
3270ea7c7e Fixed tests. 2015-10-12 23:31:33 +02:00
Martin Edenhofer
e5ac9519e7 New overview seeds. 2015-10-12 23:12:44 +02:00
Martin Edenhofer
d7cd5b57cc Ignore created ticket in state closed. 2015-10-12 16:07:21 +02:00
Martin Edenhofer
55059b987f Improved ticket selector. 2015-10-12 15:44:34 +02:00
Martin Edenhofer
712a013c44 Improved "see more" feature. 2015-10-12 10:24:44 +02:00
Martin Edenhofer
5a8ff3939c Removed Package.reload_classes, is not working on inheritance. 2015-10-10 15:45:10 +02:00
Martin Edenhofer
16232826cf Improved signatureIdentify(). 2015-10-10 10:38:54 +02:00
Martin Edenhofer
6584090bad Improved error handling. 2015-10-09 22:31:26 +02:00
Martin Edenhofer
439b6cea8a Improved test helper. 2015-10-09 00:08:54 +02:00
Martin Edenhofer
eb75b79c69 Improved ticket_update. Remove clickCatcher on do_not_submit. 2015-10-08 17:25:19 +02:00
Martin Edenhofer
e10f672649 Code layout improved. 2015-10-08 17:24:21 +02:00
Martin Edenhofer
b7f5c4f705 Improved error handling. 2015-10-08 17:13:41 +02:00
Martin Edenhofer
6583d3beca Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/assets/javascripts/app/views/generic/datetime.jst.eco
2015-10-08 16:09:58 +02:00
Martin Edenhofer
b8e8935e54 Improved performance of rebuild methods. 2015-10-08 16:06:20 +02:00
Martin Edenhofer
5a462602b8 Start calendar on monday. 2015-10-08 16:04:32 +02:00
Martin Edenhofer
74077024df Added u-positionOrigin class. 2015-10-08 16:03:37 +02:00
Felix Niklas
2749fec09d fix modified icon in tabs 2015-10-08 15:30:49 +02:00
Felix Niklas
8af48d557e Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-08 14:18:11 +02:00
Felix Niklas
a5e39d4799 refactor datetime, fix ff flex bug 2015-10-08 14:10:54 +02:00
Felix Niklas
c9bcf4fe00 icon: update logotype 2015-10-08 13:51:33 +02:00
Martin Edenhofer
06ef7cd785 Added full cycle test. 2015-10-08 13:25:45 +02:00
Martin Edenhofer
2d6515a59f Fixed renamed file name. 2015-10-08 12:31:52 +02:00
Martin Edenhofer
97131f51c3 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-08 12:28:39 +02:00
Martin Edenhofer
2127249903 Execute background job anyway. 2015-10-08 12:28:27 +02:00
Martin Edenhofer
98db7a1899 Fixed keep body on reply again. 2015-10-08 12:26:35 +02:00
Rolf Schmidt
79d695f26c Renamed observer file for signature detection. 2015-10-08 11:41:21 +02:00
Martin Edenhofer
02548e8051 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-08 11:38:59 +02:00
Martin Edenhofer
68736055ff Require signature_detection manually. 2015-10-08 11:38:47 +02:00
Rolf Schmidt
30e30108e2 Fixed typo. 2015-10-08 11:10:18 +02:00
Rolf Schmidt
da983a6e43 Added background job to rebuild signature for user on new article. 2015-10-08 11:05:39 +02:00
Rolf Schmidt
f807d10dd3 Fixed function name. 2015-10-08 10:46:28 +02:00
Rolf Schmidt
e33beacdea Added function to rebuild article signature detection for all articles. 2015-10-08 10:42:24 +02:00
Felix Niklas
7315190bfe better contrast for today 2015-10-08 10:40:39 +02:00
Felix Niklas
42cca078cb fix badge in overview list 2015-10-08 10:12:59 +02:00
Felix Niklas
86c5479bd2 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-08 10:01:12 +02:00
Felix Niklas
5aeb748323 fix datepicker and datetime
- orientation works
- datetime: label and time input won't shrink
2015-10-08 10:01:08 +02:00
Martin Edenhofer
4029987caa Detect signature for users. Added signature lookup for new customer articles. 2015-10-08 08:33:01 +02:00
Rolf Schmidt
7a7d9471c9 Added proving backend to detect signatures by diff module 'diffy' to reduce redundancy in article views. 2015-10-07 20:42:40 +02:00
Martin Edenhofer
52e7ab2e1c Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-07 14:41:14 +02:00
Martin Edenhofer
7aa7bcacde Fixed browser tests. 2015-10-07 14:40:03 +02:00
Felix Niklas
12892862e9 fix menu dropdown 2015-10-07 14:18:32 +02:00
Felix Niklas
3addfd1c10 chat: remove new window sound (temporarely) 2015-10-07 14:18:18 +02:00
Felix Niklas
113d4c6c20 fix logotype icon 2015-10-07 13:34:14 +02:00
Felix Niklas
9873b1ed94 refactor main-navigation to menu 2015-10-07 13:33:57 +02:00
Felix Niklas
9c66abb195 adjust chat-close style 2015-10-07 09:56:19 +02:00
Felix Niklas
0f568e49eb style zammad-switch on chat 2015-10-07 09:53:30 +02:00
Felix Niklas
20dbbfdf28 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-07 09:49:11 +02:00
Felix Niklas
d5da0dab51 make status-field style more generic 2015-10-07 09:49:03 +02:00
Martin Edenhofer
6f261af6e5 Fixed unit test. 2015-10-07 08:10:10 +02:00
Martin Edenhofer
7746e01734 Hide "more" per default. 2015-10-07 07:40:17 +02:00
Martin Edenhofer
e9da83bf4d Improved code layout. 2015-10-07 07:39:58 +02:00
Martin Edenhofer
f78b32639f Only use rw attributes for setting values. 2015-10-07 07:38:55 +02:00
Martin Edenhofer
4a6d05e342 Removed overhead. 2015-10-07 07:38:26 +02:00
Martin Edenhofer
0bec67ec73 Only use rw attributes for setting values. 2015-10-07 07:37:53 +02:00
Martin Edenhofer
f510b1441f Disabled test menu entries per default. 2015-10-07 07:35:56 +02:00
Martin Edenhofer
3b4a9ad3db Moved to new date picker. 2015-10-07 07:35:30 +02:00
Martin Edenhofer
783b347260 Improve rerender of articles. 2015-10-07 07:32:28 +02:00
Martin Edenhofer
303b3c9769 Fixed permanent task. 2015-10-06 23:55:50 +02:00
Martin Edenhofer
bbed5ad855 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-06 23:32:39 +02:00
Martin Edenhofer
db69830ffe Use i18n meta infos. 2015-10-06 23:32:26 +02:00
Felix Niklas
112e64de9f rewrite formGroup--bundle to controls--bundle 2015-10-06 23:02:42 +02:00
Felix Niklas
718b5ce736 Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-06 22:51:20 +02:00
Martin Edenhofer
2b0f786649 Start autosave after successful ticket update. 2015-10-06 21:55:19 +02:00
Felix Niklas
c97f4ef8f8 customer chat 2015-10-06 21:51:28 +02:00
Martin Edenhofer
827ea481fb Initial signature detection test cases. 2015-10-06 21:49:48 +02:00
Martin Edenhofer
6a2cce12a8 Keep last level 2 selection (e. g. admin interface) for 10 minutes (maybe need to be changed later). 2015-10-06 12:21:12 +02:00
Martin Edenhofer
c66c61404b Fixed file uploading in new ticket. 2015-10-06 11:39:44 +02:00
Martin Edenhofer
35235b7653 Added date and date time picker. 2015-10-06 09:02:49 +02:00
Felix Niklas
ed1de38ce7 adjust nav-item-name text-position 2015-10-05 23:07:49 +02:00
Felix Niklas
825c71cf31 formGroup-bundle: adjust architecture 2015-10-05 23:06:18 +02:00
Felix Niklas
070adb47c3 font: switch from book to regular as base 2015-10-05 23:06:18 +02:00
Martin Edenhofer
f06fd84a36 Fixed test selectors. 2015-10-05 17:03:29 +02:00
Felix Niklas
de4cc84523 fix splash hide 2015-10-05 15:41:30 +02:00
Felix Niklas
0b7a41d32e fix ticket_zoom:submit test selectors 2015-10-05 15:04:45 +02:00
Felix Niklas
5fdbe2fd54 ignore selenium test screenshot 2015-10-05 15:04:18 +02:00
Felix Niklas
c29a5a2a6d adjust splash style 2015-10-05 14:54:53 +02:00
Felix Niklas
0636963338 style splash screen 2015-10-05 14:10:45 +02:00
Felix Niklas
3e4ad0e8d4 buttonDropdown: dropdown design, hover highlight 2015-10-05 10:13:39 +02:00
Martin Edenhofer
54ea23a330 Improved decimal tests. 2015-10-03 09:25:40 +02:00
Martin Edenhofer
3aea8321b4 Improved logging, remover App.Model.retrieve(). Fetch also items with same updated_at timestamp. 2015-10-03 09:24:44 +02:00
Martin Edenhofer
c49ce33cae Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-02 23:42:13 +02:00
Martin Edenhofer
700ec9347b Moved to App.Utils methods. 2015-10-02 23:41:41 +02:00
Felix Niklas
8d043a27ef layoutRef: ticket macros 2015-10-02 23:36:15 +02:00
Martin Edenhofer
74de283afa Fixed icons with task modify flag. 2015-10-02 22:20:32 +02:00
Felix Niklas
8b9cd329ef fix action button icon spacing 2015-10-02 18:03:42 +02:00
Felix Niklas
04794fd905 highlighter: dont select when selection started outside of article 2015-10-02 18:01:05 +02:00
Felix Niklas
87d353a795 el capitan script change 2015-10-02 18:01:05 +02:00
Martin Edenhofer
a71776ba1b Improved performance of tab highlighting. 2015-10-02 15:30:18 +02:00
Martin Edenhofer
798b4d279f Rerender on language change. 2015-10-02 08:17:17 +02:00
Martin Edenhofer
736feb62b6 Just set highlighter if element is visible. 2015-10-02 00:21:19 +02:00
Martin Edenhofer
19a2e5f8de Fixed setting of highlighter. 2015-10-02 00:07:28 +02:00
Martin Edenhofer
e1594f07ba Improved source formating. 2015-10-01 16:05:26 +02:00
Martin Edenhofer
9e2255b643 Reduced rerender calls. 2015-10-01 16:04:30 +02:00
Martin Edenhofer
d48ea6e710 More tolerance for css selectors. 2015-10-01 13:56:55 +02:00
Martin Edenhofer
40e9ba2948 Disappear notify after certain time. 2015-10-01 00:31:45 +02:00
Martin Edenhofer
3e2562e02d Merge branch 'develop' of github.com:martini/zammad into develop 2015-10-01 00:25:38 +02:00
Felix Niklas
6a3c17a722 fix notify style
- transparent black background (neutral style)
- icons for success and error
2015-09-30 17:52:30 +02:00
Felix Niklas
4af42c094b tidy up css 2015-09-30 17:07:23 +02:00
Martin Edenhofer
134f6be033 Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-30 17:02:47 +02:00
Felix Niklas
27fb0f064f ticket zoom: move sidebar tabs from scrollbar 2015-09-30 17:01:47 +02:00
Felix Niklas
282e76d8e8 truncate business hours day name 2015-09-30 16:39:07 +02:00
Felix Niklas
4b2641863d fix settings-table spacing 2015-09-30 16:35:31 +02:00
Felix Niklas
fa938cb503 font: use full fira sans fonts 2015-09-30 16:18:33 +02:00
Felix Niklas
5530160492 fix table spacing 2015-09-30 16:18:01 +02:00
Martin Edenhofer
a67c2c1be5 Improved spacing of overviews. 2015-09-30 16:07:10 +02:00
Martin Edenhofer
b6dd55b8bf Added loader icon. 2015-09-30 15:55:26 +02:00
Felix Niklas
acacee59e2 style escalation labels 2015-09-30 15:28:26 +02:00
Felix Niklas
197b8a2b93 Sla: move calendar into new row 2015-09-30 15:12:45 +02:00
Felix Niklas
d59cc46dda icons: radio icon bigger inner circle 2015-09-30 15:04:07 +02:00
Felix Niklas
0290c58ff8 holiday selector: broader description row 2015-09-30 15:03:02 +02:00
Felix Niklas
47ca541a3e actions list headers: fix spacing 2015-09-30 15:03:02 +02:00
Martin Edenhofer
87f24a86fb Fixed headline, added calendar to sla overview. 2015-09-30 14:55:16 +02:00
Martin Edenhofer
3abed5f2cf Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-30 14:34:34 +02:00
Felix Niklas
ccfceaff33 SLA: add advance warning time 2015-09-30 14:33:54 +02:00
Felix Niklas
fbd8a0c8f4 ticket selector: add preview loading icon 2015-09-30 14:33:54 +02:00
Felix Niklas
7f37511ba6 add tiny loading icon 2015-09-30 14:33:54 +02:00
Felix Niklas
25724cad24 timepicker: disable mousewheel by default 2015-09-30 14:33:54 +02:00
Martin Edenhofer
28f33bfe41 Fixed typo. 2015-09-30 14:30:12 +02:00
Martin Edenhofer
fc3c8ef808 Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-30 14:05:51 +02:00
Martin Edenhofer
3622ca0cfb Fixed loading highlighter at loading tasks with highlighter on app boot. 2015-09-30 14:05:38 +02:00
Felix Niklas
afb836dbe4 change notify and alert styles
- bolder colors
- no shadow on alert
- spacing
2015-09-30 13:58:55 +02:00
Martin Edenhofer
19d4cb4559 Show icon / state title on every ticket and task overview. Also added meta info about "escalated" or "reminder reached" to icon title. 2015-09-30 11:47:06 +02:00
Martin Edenhofer
6fef8de600 Sort test order. 2015-09-30 08:50:28 +02:00
Martin Edenhofer
ac7d3f9cba More tolerance for css selectors. 2015-09-30 08:36:15 +02:00
Martin Edenhofer
78bc16895e Startup tasks faster. 2015-09-29 23:41:30 +02:00
Martin Edenhofer
b751d25c19 Bind click to li, to prevent click on row but outside of a tag. 2015-09-29 23:37:52 +02:00
Martin Edenhofer
b28663d331 Add order direction to table overview. 2015-09-29 23:22:52 +02:00
Martin Edenhofer
e38ca9c2b8 Improved background job. 2015-09-29 23:21:12 +02:00
Martin Edenhofer
f2d1882238 Use task--standalone style for ticket list. 2015-09-29 23:19:30 +02:00
Martin Edenhofer
6f4bfc12e9 Fixed shown icons in ticket list for merge. 2015-09-29 23:18:50 +02:00
Martin Edenhofer
31832897a3 Added missing () and translations. 2015-09-29 22:58:25 +02:00
Martin Edenhofer
24ef928c96 Add order direction to table overview. 2015-09-29 22:07:50 +02:00
Martin Edenhofer
e570e110c5 Ignore preferences in history and activity stream. 2015-09-29 21:32:05 +02:00
Martin Edenhofer
e853629440 Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-29 19:01:24 +02:00
Felix Niklas
41f8eec259 change notify style 2015-09-29 17:12:59 +02:00
Felix Niklas
1ad13c2b59 date + time layoutRef 2015-09-29 15:54:14 +02:00
Martin Edenhofer
6e2a507353 Applied rubocop. 2015-09-29 15:23:32 +02:00
Felix Niklas
51963fe859 add table sort arrow 2015-09-29 15:15:56 +02:00
Martin Edenhofer
713ebaa680 If ticket is escalated, overwrite task state. 2015-09-29 15:14:15 +02:00
Martin Edenhofer
63c187dd41 Applied rubocop. 2015-09-29 15:00:30 +02:00
Martin Edenhofer
db01723eed Make livereload working again. 2015-09-29 14:51:07 +02:00
Martin Edenhofer
10e7c2cda3 Watch also coffee script files. 2015-09-29 14:50:18 +02:00
Felix Niklas
edcd7d925e rename priority to task-state and add new colors 2015-09-29 14:22:13 +02:00
Felix Niklas
e647c1eb94 make checkboxes bigger 2015-09-29 14:07:25 +02:00
Felix Niklas
1dce17f27b WIP priority icon to task-state renaming 2015-09-29 13:52:06 +02:00
Felix Niklas
08a372cb75 update livereload settings 2015-09-29 13:51:52 +02:00
Martin Edenhofer
9b8aa6c50d Improved test. 2015-09-29 10:51:15 +02:00
Martin Edenhofer
513e695894 Fixed time zone naming. Also set default calendars on init setup based on browsers location. Ignore private ip ranges of browsers. 2015-09-29 10:23:13 +02:00
Martin Edenhofer
4944bfa809 Fixed browser test. 2015-09-29 08:24:51 +02:00
Martin Edenhofer
e190f278fc Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-29 07:55:11 +02:00
Martin Edenhofer
72919122cb First steps of new features. 2015-09-29 07:54:58 +02:00
Martin Edenhofer
7df285d9df Filename cleanup (.js.coffee to .coffee). 2015-09-28 19:52:27 +02:00
Martin Edenhofer
db89f942c6 Improved error handling. 2015-09-28 19:33:11 +02:00
Martin Edenhofer
6970999d92 Fixed ticket selector. 2015-09-28 14:02:12 +02:00
Martin Edenhofer
1c9105b3f1 Fixed order of ticket attributes after overview update. 2015-09-28 14:01:40 +02:00
Martin Edenhofer
a8706c02ee Fixed removing tags. 2015-09-28 13:46:10 +02:00
Martin Edenhofer
518d4c2632 Added support for ip based calendar setup. 2015-09-28 02:11:44 +02:00
Martin Edenhofer
455c23799d Prepared for rails 5. 2015-09-27 23:34:21 +02:00
Martin Edenhofer
0ecf07ff74 Prepared for rails 5. 2015-09-27 23:01:45 +02:00
Martin Edenhofer
53ff4fc0db Removed not longer needed option. 2015-09-27 22:08:17 +02:00
Martin Edenhofer
a50f2d5508 Merged migrations. 2015-09-27 14:06:04 +02:00
Martin Edenhofer
752de67278 Merged migrations. 2015-09-27 13:18:04 +02:00
Martin Edenhofer
498becc074 Applied rubocop. 2015-09-27 13:12:52 +02:00
Martin Edenhofer
83220eafc1 Merged migrations. 2015-09-26 18:51:04 +02:00
Martin Edenhofer
f1ad842aee Fixed initial setup. 2015-09-26 17:59:58 +02:00
Martin Edenhofer
949f414442 Merged migrations. 2015-09-26 17:41:21 +02:00
Martin Edenhofer
2314f318ff Merged migrations. 2015-09-26 17:31:53 +02:00
Martin Edenhofer
04c8a6bcf8 Merged migrations. 2015-09-26 17:14:42 +02:00
Martin Edenhofer
c6f160f14d Merged migrations. 2015-09-26 15:56:55 +02:00
Martin Edenhofer
14c95ce964 Merged migrations. 2015-09-26 15:40:05 +02:00
Martin Edenhofer
aaaf79120d Merged migrations. 2015-09-26 13:32:33 +02:00
Martin Edenhofer
7aaceda8bd Merged migrations. 2015-09-26 09:07:30 +02:00
Martin Edenhofer
bef4c843c8 Applied rubocop. 2015-09-26 08:59:05 +02:00
Martin Edenhofer
9522047482 Upgrade to rails 4.2.4 2015-09-26 08:57:07 +02:00
Martin Edenhofer
dcf78780da Improved error handling. 2015-09-26 01:01:35 +02:00
Martin Edenhofer
17e3ecde92 Fixed test. 2015-09-26 00:38:59 +02:00
Martin Edenhofer
01680a8ad3 Fixed change of value / value_current. 2015-09-25 23:35:17 +02:00
Martin Edenhofer
4946c40679 Fixed change of value / value_current. 2015-09-25 20:35:36 +02:00
Felix Niklas
918cbd178a add datepicker
- remove jquery.ui.datepicker
- modify and style bootstrap.datepicker
- todayBtn option is styled
- Zammad Calendar: option daysOfWeekDisabled and datesDisabled

online demo with options here: http://eternicode.github.io/bootstrap-datepicker
2015-09-25 17:16:05 +02:00
Felix Niklas
0434aab466 fix logo spacing on login 2015-09-25 17:16:04 +02:00
Martin Edenhofer
52718a41c0 Work for short time with :state_current and :state support. 2015-09-25 17:15:41 +02:00
Martin Edenhofer
ad1b9b18bf Upgrade to rails 4.2.4. 2015-09-25 16:37:55 +02:00
Martin Edenhofer
dabc93a99e Fixed remember_me selector. 2015-09-25 15:27:00 +02:00
Felix Niklas
49b1a000e5 fix login labels 2015-09-25 14:02:27 +02:00
Felix Niklas
3f9f3c0035 fix url input width in wizard 2015-09-25 13:37:55 +02:00
Felix Niklas
420cbd9e58 fix text color in login 2015-09-25 13:37:37 +02:00
Felix Niklas
0e47034e4c fix cut of crown in sidebar 2015-09-25 13:30:20 +02:00
Felix Niklas
01f5669604 fix action-label spacing 2015-09-25 13:21:11 +02:00
Martin Edenhofer
0c7be7c346 Fixed possibility to set ical feed to none. 2015-09-25 11:48:14 +02:00
Martin Edenhofer
8719c4350e Moved placeholder into separate template file. 2015-09-25 11:47:06 +02:00
Martin Edenhofer
d996c1cadf Fixed creating new calendars. 2015-09-25 11:08:34 +02:00
Felix Niklas
9ac6f852a0 trying to fix FF icon bug 2015-09-25 10:47:33 +02:00
Martin Edenhofer
fc601e1fce Implemented holiday selector for calendars. 2015-09-25 10:35:14 +02:00
Martin Edenhofer
fdea787b2f Implemented holiday selector for calendars. 2015-09-25 09:21:55 +02:00
Martin Edenhofer
b44dbe371f Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-25 02:15:23 +02:00
Roy Kaldung
96085b9183 create zammad user and added requirements 2015-09-24 23:18:45 +02:00
Roy Kaldung
91d24aa1cd new spec 2015-09-24 23:15:26 +02:00
Martin Edenhofer
2dbe64dc15 Improved trim with multiple form fields. 2015-09-24 20:33:31 +02:00
Martin Edenhofer
b8d65a01fe .trim() all form params from now. 2015-09-24 16:01:30 +02:00
Martin Edenhofer
df61622e3e Next coffeelint level. 2015-09-24 15:04:45 +02:00
Martin Edenhofer
76bf001564 Improved input validation. 2015-09-24 08:55:14 +02:00
Martin Edenhofer
e73a5762b7 Coffeelint next level. 2015-09-24 08:54:23 +02:00
Martin Edenhofer
a5cbe9148a Easier selector for chrome. 2015-09-23 20:26:49 +02:00
Martin Edenhofer
875d9b7ed3 Moved to ajax searchable select for organization selection. 2015-09-23 20:01:04 +02:00
Martin Edenhofer
a6b5b43994 Moved to ajax searchable select for organization selection. 2015-09-23 17:22:31 +02:00
Martin Edenhofer
2311d1c393 Fixed ticket list in user and org profile. 2015-09-23 16:25:06 +02:00
Martin Edenhofer
e260261bda Trim input. Added logging. 2015-09-23 13:24:46 +02:00
Martin Edenhofer
ac1dcecff3 Fixed searchable select. 2015-09-23 13:23:51 +02:00
Martin Edenhofer
11400f4dd8 Set time to now if + or - is used and no time is available. 2015-09-23 11:08:19 +02:00
Martin Edenhofer
60e259021a Fixed bindCol for tables. 2015-09-23 10:50:00 +02:00
Martin Edenhofer
d546611432 Fixed positionPageHeaderStart at show controller. 2015-09-23 10:13:04 +02:00
Martin Edenhofer
a3daad2917 Improved visualisation of errors. 2015-09-23 09:10:07 +02:00
Martin Edenhofer
8ff2318539 Improved test. 2015-09-23 02:42:14 +02:00
Martin Edenhofer
451fc88e48 Fixed escalation calculation for closed tickets. 2015-09-23 02:29:13 +02:00
Martin Edenhofer
8c9daded0e Fixed migration. 2015-09-23 02:14:42 +02:00
Martin Edenhofer
e3277a3b8a Fixed first response detection. 2015-09-23 01:50:38 +02:00
Martin Edenhofer
9d6b313601 Extended ignored attributes for activity stream. 2015-09-23 01:49:27 +02:00
Martin Edenhofer
eb2ad42371 Fixed rubocop. 2015-09-23 01:27:30 +02:00
Martin Edenhofer
f8fa4c54fa Fixed escalation calculation. 2015-09-23 01:22:45 +02:00
Martin Edenhofer
d8a1d73cf8 Fixed test. 2015-09-23 01:21:46 +02:00
Martin Edenhofer
0d36437e58 Removed not needed calendars. 2015-09-22 23:58:08 +02:00
Martin Edenhofer
d311909565 Fixed test. 2015-09-22 23:39:34 +02:00
Martin Edenhofer
b753ba5396 Added out of office detection support for icloud. 2015-09-22 22:30:38 +02:00
Martin Edenhofer
8a2dd87861 Extended ical feed list. 2015-09-22 22:29:37 +02:00
Martin Edenhofer
904e407e96 Improved overview. 2015-09-22 22:28:31 +02:00
Martin Edenhofer
dd444f63e0 Added out of office detection for zimbra. 2015-09-22 19:39:17 +02:00
Felix Niklas
afb956ae00 fix searchableSelect bugs
- bug with spaces suggestions
- pressing left and right key while typing complets the suggestion
2015-09-22 17:59:25 +02:00
Felix Niklas
b2437ead50 add .action-label
in the calendar case it needs a <div class="action-flow action-flow--noWrap"> as parent element
2015-09-22 17:16:50 +02:00
Martin Edenhofer
56288aba42 Added geo calendar support. 2015-09-22 16:49:57 +02:00
Martin Edenhofer
de7039b2b5 Added geo calendar support. 2015-09-22 16:48:43 +02:00
Martin Edenhofer
d692690da5 Added set default and delete actions to overview. 2015-09-22 16:40:40 +02:00
Felix Niklas
19a6347ac9 icon-sprite unsaved changes 2015-09-22 15:33:12 +02:00
Felix Niklas
ca3e4b3d06 smaller letter-spacing 2015-09-22 15:19:05 +02:00
Felix Niklas
45d9fdfffd fix rendering ticket selector controls
- small crisp plus and minus icon
- box-shadow instead of border for crisper border
2015-09-22 13:27:53 +02:00
Felix Niklas
de42859fe6 add bottom margin to .action widgets 2015-09-22 13:27:16 +02:00
Felix Niklas
be8f5bc8e5 fix spacing of checkbox labels 2015-09-22 13:26:48 +02:00
Felix Niklas
2ad67ca401 icon sketch file: add minus-small 2015-09-22 13:26:27 +02:00
Felix Niklas
b2657a44d9 layoutRef: ticket_zoom from highlight ref 2015-09-22 11:16:06 +02:00
Martin Edenhofer
85515e61be Applied coffeelint. 2015-09-21 23:24:19 +02:00
Martin Edenhofer
e11a4f59f9 Improved tests. 2015-09-21 22:51:10 +02:00
Martin Edenhofer
e90ac1e336 Applied coffeelint. 2015-09-21 19:47:48 +02:00
Martin Edenhofer
e94a03ca43 Fixed browser test. 2015-09-21 19:05:30 +02:00
Martin Edenhofer
b8fa696857 Applied coffeelint. 2015-09-21 19:04:18 +02:00
Martin Edenhofer
03965aa2b6 Link attribute is now auto generated. 2015-09-21 16:37:25 +02:00
Martin Edenhofer
bd83982505 Reduced time to fixed browser test. 2015-09-21 15:27:56 +02:00
Martin Edenhofer
a7b0a23d05 Improved translations. 2015-09-21 15:26:48 +02:00
Martin Edenhofer
9b12c6cc7b Some improvements to admin translation. 2015-09-21 14:20:36 +02:00
Martin Edenhofer
24064de220 Reduced time to fixed browser test. 2015-09-21 11:22:09 +02:00
Martin Edenhofer
1819ab5b4f Fixed browser test. 2015-09-21 10:44:29 +02:00
Martin Edenhofer
dc4c7d84d1 Fixed test. 2015-09-21 10:34:17 +02:00
Martin Edenhofer
9cf188ca6e Improved wording. 2015-09-21 09:59:00 +02:00
Martin Edenhofer
a77b3f77fe Moved to new business_hours format. 2015-09-21 01:13:06 +02:00
Martin Edenhofer
50546fa2d4 Added business hours tests. 2015-09-21 00:19:45 +02:00
Martin Edenhofer
dcc542ab1b Fixed test for improved table structure (removed not needed span's). 2015-09-20 10:36:41 +02:00
Martin Edenhofer
71eaa1e833 Fixed unit test. 2015-09-20 03:55:01 +02:00
Martin Edenhofer
4258bf88b2 Fixed initial setup. 2015-09-20 02:54:34 +02:00
Martin Edenhofer
3b0a2ba87a Removed not needed attribute. 2015-09-20 02:28:56 +02:00
Martin Edenhofer
77ca0542f9 Added missing quoting. 2015-09-20 02:27:04 +02:00
Martin Edenhofer
89acbb933b Moved to new postmaster filter ui with contains and contains not feature. 2015-09-20 02:26:33 +02:00
Martin Edenhofer
5d871673be Added out of office detection and auto responder detection. 2015-09-20 02:16:22 +02:00
Martin Edenhofer
edab5b9197 Moved to new datetime and date ui element. 2015-09-19 23:24:11 +02:00
Martin Edenhofer
a30e31bc80 Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-19 23:21:37 +02:00
Felix Niklas
9aba32eab0 business hours: add validation
- red border visualisation for debugging
2015-09-18 17:52:12 +02:00
Felix Niklas
f22819aaf6 timepicker: add hh:mm output to change event, fix 24 hour normalization 2015-09-18 17:51:38 +02:00
Felix Niklas
074da3b01e form-control baseline improvements 2015-09-18 16:43:20 +02:00
Felix Niklas
d7aaa1e90f update Fira font 2015-09-18 16:42:59 +02:00
Felix Niklas
009bc92193 set form input min-widths (url, user-select) 2015-09-18 15:07:15 +02:00
Martin Edenhofer
5a5419c2c1 Improved human text. 2015-09-18 13:35:56 +02:00
Martin Edenhofer
5b8adc206a Moved to new style. 2015-09-18 12:13:48 +02:00
Martin Edenhofer
d825cc288b Moved to new query condition syntax to support is, is not, contains, contains not, ... 2015-09-17 20:39:51 +02:00
Felix Niklas
3d47199ec5 Holidays WIP
- naming: public holidays are gesetzliche feiertage. when you add your own holidays its just feiertage. so in general we should call it holidays
- controls: happy with it
- layout: not happy with it yet
2015-09-17 17:01:35 +02:00
Felix Niklas
2d3d6a0cf6 adjust timer style to current controls style 2015-09-17 15:00:49 +02:00
Felix Niklas
32af7c6cd6 filter selector: fix multi-select layout 2015-09-17 14:50:36 +02:00
Felix Niklas
70252e6e8c sla times adjust styles 2015-09-17 14:50:10 +02:00
Felix Niklas
25b5b1f33c calendar: adjust list for long calendar names 2015-09-17 14:24:47 +02:00
Felix Niklas
fbcbfd4a55 style calendar list 2015-09-17 14:19:30 +02:00
Felix Niklas
f08e6341c6 business times: write changes to @options.hours 2015-09-17 12:21:45 +02:00
Felix Niklas
8c4bcf60e7 timepicker: remove tillMidnight, add 24-hour output 2015-09-17 12:21:03 +02:00
Martin Edenhofer
3fc3ad5e5a Added preview for ticket selector. 2015-09-17 03:04:16 +02:00
Martin Edenhofer
f4b642726e Fixed typo. 2015-09-17 00:03:06 +02:00
Martin Edenhofer
e947d4262f Use new widget for small ticket lists. Reduced tags in tables. 2015-09-17 00:02:11 +02:00
Martin Edenhofer
915fa99e0b Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-16 20:37:55 +02:00
Felix Niklas
e26c4761bd add business hours interaction 2015-09-16 16:46:24 +02:00
Felix Niklas
7ff1e3e2d8 timepicker: add attribute 'tillMidnight'
to allow for 00:00-24:00 timeframes (24:01 will set to 00:01) needed in business hours
2015-09-16 16:46:09 +02:00
Martin Edenhofer
8fdd3d26a9 Added .timepicker() in sla_times ui element. 2015-09-16 15:25:28 +02:00
Martin Edenhofer
c7ec0d9c5a Init version of editable calendar. 2015-09-16 10:40:18 +02:00
Martin Edenhofer
a6e34ddcd8 Improved sla time selection. 2015-09-15 23:42:08 +02:00
Martin Edenhofer
064f81b9cd Fixed naming issue. 2015-09-15 22:38:31 +02:00
Martin Edenhofer
333e8fb415 Disabled user popover for avatar in footer of navbar. Removed vip icon for avatar in footer of navbar. 2015-09-15 22:36:52 +02:00
Martin Edenhofer
e8f1f9b3db Fixed avatar file upload and updated cropper. 2015-09-15 22:33:14 +02:00
Felix Niklas
9d3e868ce2 create BusinessHours class 2015-09-15 17:45:54 +02:00
Felix Niklas
8cbef184f3 timepicker: auto-add am/pm class when its set 2015-09-15 17:45:54 +02:00
Felix Niklas
e758eba1dd add minus-small icon 2015-09-15 17:45:53 +02:00
Martin Edenhofer
b1d32daa91 Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-15 16:29:04 +02:00
Martin Edenhofer
53b6187ddd Fixed @el issue. 2015-09-15 16:28:38 +02:00
Felix Niklas
fb9bc3033c adjust crown size (make small smaller) 2015-09-15 15:57:24 +02:00
Martin Edenhofer
1fe519142b Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-15 15:44:31 +02:00
Felix Niklas
3cd3f994e7 even crown #2 2015-09-15 15:43:10 +02:00
Felix Niklas
4c92348bf8 even crown 2015-09-15 15:43:10 +02:00
Martin Edenhofer
13a4b92a6a Added more ticket selector attributes to get a better styling. 2015-09-15 15:17:57 +02:00
Martin Edenhofer
fbc4d96a7e Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-15 15:13:31 +02:00
Martin Edenhofer
c21f1ce93f Init sla management feature. 2015-09-15 15:11:00 +02:00
Felix Niklas
80c16aa310 bigger vip crown 2015-09-15 14:59:02 +02:00
Felix Niklas
c32ff5707b add vip crown
todo for martin:
- seperate avatar html into template
- don't add the crown if the user is the logged-in user?
2015-09-15 12:42:13 +02:00
Felix Niklas
53d6869c25 style public hollidays settings-list 2015-09-15 11:49:38 +02:00
Felix Niklas
3eb72d1e92 make user-merge modal large 2015-09-15 11:42:05 +02:00
Felix Niklas
641a9ef59e add custom checkbox to calendar subscriptions 2015-09-15 11:28:56 +02:00
Felix Niklas
724cf36007 split up input-replacement into checkbox-replacement and radio-replacement
for easier understanding
2015-09-15 11:28:44 +02:00
Felix Niklas
0794cef040 add plus-small icon 2015-09-15 11:27:47 +02:00
Martin Edenhofer
6aac51b633 Fixed typos. 2015-09-15 01:27:14 +02:00
Martin Edenhofer
0fca16a62d Cleanup. 2015-09-15 01:26:02 +02:00
Martin Edenhofer
cf20e4f4a5 Improved styling performance for IE. 2015-09-14 20:18:21 +02:00
Martin Edenhofer
1062907dca Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-14 19:14:07 +02:00
Martin Edenhofer
bbe0ef0a59 Small cleanup. 2015-09-14 19:13:02 +02:00
Martin Edenhofer
90068a6ba8 Stop autosave if task is not active. 2015-09-14 19:12:40 +02:00
Martin Edenhofer
dcde584833 Fixed typo. 2015-09-14 19:12:05 +02:00
Martin Edenhofer
5e3679519a Improved frontendTimeUpdateItem(), reduced dom updates. 2015-09-14 19:11:13 +02:00
Felix Niklas
b418bc43b0 fix settings-table spacing 2015-09-14 19:00:45 +02:00
Felix Niklas
d3db084630 calendars: style business hours 2015-09-14 18:48:46 +02:00
Felix Niklas
4550d976aa add close icon to primary email layout ref 2015-09-14 18:48:07 +02:00
Felix Niklas
10ab45e4fd modal: add large mode
set attribute large to true when creating a modal.
It's 740px wide (default width is 660px). 740px because the minimum supported width is 1024px (1280px recommended). The sidebar is 260px wide, leaving 764px for a local modal. 740px results in a minimum padding of 12px around the modal window inside the content window.
2015-09-14 18:47:42 +02:00
Felix Niklas
1489a01071 shrink label letter-spacing 2015-09-14 18:44:36 +02:00
Martin Edenhofer
29936d2acd Small code cleanup. 2015-09-13 20:14:07 +02:00
Martin Edenhofer
be2d2fe4cf Improved set of escalation time. 2015-09-13 20:01:18 +02:00
Martin Edenhofer
37c77165ad Not longer needed. 2015-09-13 20:00:26 +02:00
Martin Edenhofer
d5e3c5ab48 Moved location of index file. 2015-09-13 20:00:00 +02:00
Martin Edenhofer
971321b369 Split of _application_controller_form.js.coffee into single files for each ui element. 2015-09-13 19:59:15 +02:00
Martin Edenhofer
79666ba324 Support for markdown in settings description of model description attributes. 2015-09-13 01:04:31 +02:00
Martin Edenhofer
5be3eb29b9 Improved doc. 2015-09-11 19:20:15 +02:00
Martin Edenhofer
a77361869a Improved unit tests. 2015-09-11 19:19:13 +02:00
Martin Edenhofer
33b0cc5163 Added group change of email channels. 2015-09-11 17:22:58 +02:00
Martin Edenhofer
51c450cc0c Do not create a default email address. Will be done by wizard automatically. 2015-09-11 15:47:37 +02:00
Martin Edenhofer
3ca0b26fc1 Allow to delete email addresses. 2015-09-11 15:44:05 +02:00
Martin Edenhofer
ceff2cc36c Applied rubocop. 2015-09-11 10:46:53 +02:00
Martin Edenhofer
f0ed6718e8 Improved tests and set of default calendar. 2015-09-11 10:34:18 +02:00
Martin Edenhofer
49bea5cd0a Improved role?(). 2015-09-11 10:22:15 +02:00
Martin Edenhofer
99b64347e2 Fixed screech setup. 2015-09-10 22:06:57 +02:00
Martin Edenhofer
a9e65611fe Moved to biz for working time calculations. Moved to new sla model. 2015-09-10 21:09:50 +02:00
Martin Edenhofer
049833fc02 Removed old releases. 2015-09-10 14:28:25 +02:00
Felix Niklas
4f0c4de386 primary email layout ref 2015-09-09 21:39:25 +02:00
Martin Edenhofer
4e94fd5790 Applied new rubocop version. 2015-09-09 20:16:20 +02:00
Martin Edenhofer
0a18954064 Gems update. 2015-09-09 16:14:51 +02:00
Martin Edenhofer
de3e9049b3 Improved error handling. 2015-09-09 14:31:31 +02:00
Martin Edenhofer
659993a14c Added calendar new demo screen. 2015-09-09 11:58:38 +02:00
Martin Edenhofer
5509f61549 Init version of calendar management. 2015-09-09 08:52:05 +02:00
Martin Edenhofer
b170312d8e Added reopen dashboard stats. 2015-09-09 08:49:08 +02:00
Martin Edenhofer
b921b8782a Cleanup. 2015-09-09 08:47:58 +02:00
Martin Edenhofer
458d700db3 Use all open tickets. 2015-09-09 08:08:28 +02:00
Martin Edenhofer
09253a3c0e Call template without params. 2015-09-08 17:02:11 +02:00
Martin Edenhofer
76b59249af Improved doc. 2015-09-08 17:01:26 +02:00
Martin Edenhofer
14b5eade24 Improved code layout. 2015-09-08 16:03:11 +02:00
Martin Edenhofer
55f702e42b Improvements average calculation. 2015-09-08 15:46:44 +02:00
Martin Edenhofer
a2de4beeab Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-08 15:14:54 +02:00
Martin Edenhofer
0dee1e64f7 Improved show average, is now related to total based on user permissions. 2015-09-08 15:10:29 +02:00
Felix Niklas
b14a48b12f gemfile.lock 2015-09-08 15:07:08 +02:00
Felix Niklas
6786fd323e adjust table ticket number row to have a base of 60px
instead of 8% because with the variable width the row gets to small in modal windows (ticket merge)
2015-09-08 15:07:07 +02:00
Martin Edenhofer
0ea767707f Fixed average calculation. 2015-09-08 14:55:13 +02:00
Martin Edenhofer
93559feecf Fixed calculation of average state. 2015-09-08 14:12:14 +02:00
Martin Edenhofer
9c4ca4b7d6 Cleanup unused stats store. 2015-09-08 14:11:03 +02:00
Martin Edenhofer
692a9346fa Cleanup. 2015-09-08 13:42:33 +02:00
Martin Edenhofer
f67b7d2f73 Rerender dashboard stats if new is available. 2015-09-08 13:42:03 +02:00
Felix Niklas
cc50022773 fix zIndex problem with scrollPageHeader 2015-09-08 13:23:56 +02:00
Martin Edenhofer
49ba2e83ed Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-08 13:00:02 +02:00
Martin Edenhofer
e7d9bf53f8 Some dashboard calculation improvements. 2015-09-08 12:59:46 +02:00
Felix Niklas
ef7d8ecc0e remove user-select on stat-graphic 2015-09-08 10:36:00 +02:00
Felix Niklas
8452012af0 add .table-fluid class
to break the table-layout: fixed in some cases
2015-09-08 10:21:59 +02:00
Martin Edenhofer
0db8519cab Applied rubocop. 2015-09-08 09:57:14 +02:00
Martin Edenhofer
c2297ff210 Removed not used sessions with 60 days. 2015-09-08 09:55:47 +02:00
Martin Edenhofer
625b7961ab Added new category. 2015-09-08 09:49:15 +02:00
Martin Edenhofer
27472e3877 Also count closed and pending action tickets. 2015-09-08 09:45:56 +02:00
Martin Edenhofer
3561c3769d Some dashboard calculation improvements. 2015-09-08 08:55:09 +02:00
Martin Edenhofer
7560efbe4c Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-08 07:56:30 +02:00
Felix Niklas
2a0ea6c149 add status icon and email .list 2015-09-08 00:05:54 +02:00
Felix Niklas
d2383fe447 convert .sidebar-list to generic .list 2015-09-08 00:05:39 +02:00
Felix Niklas
1dc208ce58 add status colors 2015-09-08 00:05:15 +02:00
Felix Niklas
3871fc2572 add status icon 2015-09-08 00:04:53 +02:00
Martin Edenhofer
a3cacdbe20 Merge branch 'develop' of github.com:martini/zammad into develop 2015-09-07 14:07:30 +02:00
Felix Niklas
9193520d51 remove unnecessary icon modifier class 2015-09-07 12:09:52 +02:00
Felix Niklas
b3c45017b3 add font-rendering bugfix for safari while animating 2015-09-07 12:09:16 +02:00
Martin Edenhofer
1ea1ae4005 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/assets/javascripts/app/views/dashboard/stats.jst.eco
2015-09-07 10:52:27 +02:00
Martin Edenhofer
e36a791853 Updated wording. 2015-09-07 10:49:04 +02:00
Felix Niklas
9f7ae2a585 fix h3 style 2015-09-07 10:43:28 +02:00
Martin Edenhofer
367bd7644c Small improvements. 2015-09-07 02:19:32 +02:00
Martin Edenhofer
9ba17cbeb4 Small improvements. 2015-09-07 02:08:15 +02:00
Martin Edenhofer
4fea5e12d7 Added two new categories. 2015-09-07 01:54:47 +02:00
Martin Edenhofer
18893526d9 Small improvements. 2015-09-07 01:52:54 +02:00
Martin Edenhofer
9997a2b119 Fixed rubocop issue. 2015-09-07 01:20:30 +02:00
Martin Edenhofer
ab4d98aacb Small bugfixes. 2015-09-07 01:17:54 +02:00
Martin Edenhofer
3e6b8beb00 Init version of dashboard stats. 2015-09-07 01:02:15 +02:00
Martin Edenhofer
c4a2996da0 Init version of dashboard stats. 2015-09-07 00:44:56 +02:00
Martin Edenhofer
aee48e22c2 Init version of dashboard stats. 2015-09-07 00:42:11 +02:00
Martin Edenhofer
f527a058c6 Fixed typo. 2015-09-06 13:41:51 +02:00
Martin Edenhofer
50a4b7155f Fixed updating of settings. Fixed showing of ranges in settings widget. 2015-09-06 13:41:31 +02:00
Martin Edenhofer
a8d644af28 Show also notice on account overview if account is ok. 2015-09-06 13:39:16 +02:00
Martin Edenhofer
eb0aac89ba Improved email channel wizard, show info if there are already emails in the mailbox. 2015-09-06 09:50:51 +02:00
Martin Edenhofer
5ece50c39a Set online notifications always to seen on controller show(). 2015-09-05 11:01:38 +02:00
Martin Edenhofer
d1485c6c22 Updated result sets to GeoIP2 results. 2015-09-05 10:41:18 +02:00
Martin Edenhofer
4355c4156a Improved @Icon helper - @Icon('name', 'other classes') for .eco files. 2015-09-04 16:03:03 +02:00
Martin Edenhofer
7aa121341e Moved to new @Icon('icon-name', 'icon-size') helper for .eco files. 2015-09-04 14:59:31 +02:00
Martin Edenhofer
0100b38386 Prevent not needed use if database connections. 2015-09-04 02:22:20 +02:00
Martin Edenhofer
810f34a648 Fixed record of history. 2015-09-03 12:22:09 +02:00
Martin Edenhofer
727aeb9a19 Fixed rubocop issues. 2015-09-03 11:29:33 +02:00
Martin Edenhofer
c4037be94c Reduce lifetime of online notfications. 2015-09-03 11:16:07 +02:00
Martin Edenhofer
e2dff052a5 Improved online notification. Just leave unseen if I'm owner and somebody else sets pending_reminder. 2015-09-03 11:14:09 +02:00
Martin Edenhofer
4be5e8493d Reduced times till seen online notifications are removed. 2015-09-03 08:47:58 +02:00
Martin Edenhofer
10c49976d3 Use history on redirect to init view to support browser back. 2015-09-02 20:18:12 +02:00
Martin Edenhofer
aebff8577b Fixed rubocop issues. 2015-09-02 20:07:32 +02:00
Martin Edenhofer
37f1a765e4 Remember history to support browser back with @navigate used in redirects. 2015-09-02 20:05:48 +02:00
Martin Edenhofer
f9d027d180 Removed not needed waypoints lib. 2015-09-02 17:18:29 +02:00
Martin Edenhofer
24dafd6c7e Execute controller again if already active. To scroll down on already open ticket if online notification is clocked. 2015-09-02 17:17:55 +02:00
Martin Edenhofer
b9dee57576 Streamline of config. 2015-09-02 11:39:50 +02:00
Martin Edenhofer
c26d3a1601 Added debug info. 2015-09-02 11:38:42 +02:00
Martin Edenhofer
64ac09b1ae Fixed rubocop issues. 2015-09-02 09:26:40 +02:00
Martin Edenhofer
e8c32728bb Improved signature detection. 2015-09-02 09:16:31 +02:00
Martin Edenhofer
37288861e4 Improved generated js code. 2015-09-02 09:15:19 +02:00
Martin Edenhofer
d9574d312c Improved String.html2text method (cut out html style content). 2015-09-02 09:14:48 +02:00
Martin Edenhofer
2563f15238 Improved generated js code. 2015-09-02 08:29:18 +02:00
Felix Niklas
d87d781db5 strenghen dropdown arrow selektor
more explicit class for the dropdown arrow: 'dropdown-arrow' instead of '.form-control + icon-arrow-down'

e.g. icon-arrow-down had to be the direct next neighbour of a form control - now they are independet with the dropdown-arrow class.
2015-09-01 14:35:29 +02:00
Martin Edenhofer
05e68e04de Fixed losing focus/curser position on paste in. 2015-09-01 02:16:50 +02:00
Martin Edenhofer
e530383cf2 Used possible channels from backend. 2015-09-01 01:12:51 +02:00
Martin Edenhofer
bcc72a9793 Improved observer for better testing. 2015-09-01 01:07:07 +02:00
Martin Edenhofer
1c8b9dabdc Moved to rails 4.1.13. 2015-08-31 20:00:37 +02:00
Martin Edenhofer
a177be617f Revert, moved back to App.ControllerContent to render of new wizard screen. 2015-08-31 16:56:03 +02:00
Martin Edenhofer
293a7495d5 Refactoring. 2015-08-31 15:01:08 +02:00
Martin Edenhofer
848adb944a Fixed state_check(). 2015-08-31 14:48:33 +02:00
Martin Edenhofer
ab0a02c09d Added multi process support (share updated settings over multiple processes). 2015-08-31 14:36:57 +02:00
Martin Edenhofer
427b8e9fbd Fixed typo. 2015-08-31 14:34:17 +02:00
Martin Edenhofer
4fe43fd321 Improved timing for tests. 2015-08-31 11:27:42 +02:00
Martin Edenhofer
271c6f933b Fixed rubocop. 2015-08-31 11:27:12 +02:00
Martin Edenhofer
616237d5c7 Set all to seen if new state is pending reminder state. 2015-08-31 11:13:40 +02:00
Martin Edenhofer
4e35d9b3cc Remove description in content exists. 2015-08-31 11:06:42 +02:00
Martin Edenhofer
afa974a5da Pull current online message after new web socket connection has been established. 2015-08-31 10:56:00 +02:00
Martin Edenhofer
31ab7a195f Improved migration. 2015-08-31 00:55:44 +02:00
Martin Edenhofer
2394a89e46 Fixed rubocops. 2015-08-31 00:19:09 +02:00
Martin Edenhofer
780fac2bbb Improved tests. 2015-08-31 00:10:46 +02:00
Martin Edenhofer
ae0e90ba20 Added feature to search for followups in body, attachments and references. 2015-08-30 23:49:42 +02:00
Martin Edenhofer
4bd1f8ebf1 Fixed creation of article.message_id_md5 right after generating message_id. 2015-08-30 22:15:23 +02:00
Martin Edenhofer
618a1cb0db Improved error handling. 2015-08-30 20:28:36 +02:00
Martin Edenhofer
42be5dba4f Improved error handling. 2015-08-30 20:27:34 +02:00
Martin Edenhofer
78b35ab79c Added comments. 2015-08-30 20:17:23 +02:00
Martin Edenhofer
775c4f7d06 Added bounce follow up feature (postmaster bounce emails will now issue an followup of origin ticket). 2015-08-30 20:16:29 +02:00
Martin Edenhofer
98cba4239c Fixed rubocops. 2015-08-30 14:04:48 +02:00
Martin Edenhofer
27081708b1 Added email channel backend validation. 2015-08-30 13:58:05 +02:00
Martin Edenhofer
8c8788b0cc Fixed some small email channel config bugs. Improved wording. 2015-08-30 09:15:51 +02:00
Martin Edenhofer
a0c0760e04 Removed not needed debugging. 2015-08-30 08:25:20 +02:00
Martin Edenhofer
8c65d7c54a Improved shown not linked email addresses. 2015-08-30 02:14:51 +02:00
Martin Edenhofer
92fdbe8878 Improved error handling. 2015-08-30 01:35:48 +02:00
Martin Edenhofer
a009cb0935 Some small improvements to email channel management. 2015-08-30 01:31:11 +02:00
Martin Edenhofer
ad732e298c Prevent chrome to ask for password save. 2015-08-30 00:59:49 +02:00
Martin Edenhofer
e99cbf84e7 Fixed rubocop. 2015-08-30 00:58:21 +02:00
Martin Edenhofer
5c9e3d8928 Improved error handling. 2015-08-30 00:56:27 +02:00
Martin Edenhofer
cd799f0d74 Added App.Wizard controller to reduce lines of code. 2015-08-30 00:01:38 +02:00
Martin Edenhofer
71c774cb99 Some small improvements to email channel management. 2015-08-29 13:46:48 +02:00
Martin Edenhofer
64da02366c Some small improvements to email channel management. 2015-08-28 16:50:40 +02:00
Martin Edenhofer
6904c89668 Added model email validation. 2015-08-28 10:46:09 +02:00
Martin Edenhofer
7e8b3adc3b Some small improvements to email channel management. 2015-08-28 10:19:27 +02:00
Martin Edenhofer
c60ee02a4e Fixed link if sendmail is used. 2015-08-28 08:53:44 +02:00
Martin Edenhofer
39b3a212ad Fixed typo. 2015-08-28 08:47:41 +02:00
Martin Edenhofer
e6ad8fd038 Added link between email address and channel. 2015-08-28 03:44:19 +02:00
Martin Edenhofer
cd855f5c4c Rewrite of channel api. 2015-08-28 03:39:14 +02:00
Martin Edenhofer
e600598fa5 Fixed unit test. 2015-08-28 03:08:55 +02:00
Martin Edenhofer
0f2b0fc7bb fixed rubocop issues. 2015-08-28 03:02:21 +02:00
Martin Edenhofer
6a733396f9 Rewrite of channel api. 2015-08-28 02:53:14 +02:00
Martin Edenhofer
89546a09a2 Fixed @_fillUp(), improved protection for endless loops. 2015-08-27 23:00:38 +02:00
Martin Edenhofer
ba44cb18b8 Improved @_fillUp(), added protection for endless loops. 2015-08-27 21:12:50 +02:00
Martin Edenhofer
aae37c735b Added token cleanup job. 2015-08-24 12:09:04 +02:00
Martin Edenhofer
4d842718e9 Moved to integration test because of external dependencies. 2015-08-24 12:05:30 +02:00
Martin Edenhofer
b8c2c851eb Removed debugging. 2015-08-24 10:13:34 +02:00
Martin Edenhofer
147a6723c0 If we have to many failed logins, we need to handle another error message. 2015-08-24 09:37:50 +02:00
Martin Edenhofer
720a950d7f If we have to many failed logins, we need to handle another error message. 2015-08-24 09:24:32 +02:00
Martin Edenhofer
17bd764005 Improved match result of not routable networks. 2015-08-24 00:48:06 +02:00
Martin Edenhofer
b73d1b3610 Improved match result of not routable networks. 2015-08-24 00:28:08 +02:00
Martin Edenhofer
8f9a67c966 Fixed routing issues. 2015-08-23 23:46:27 +02:00
Martin Edenhofer
ab0388df15 Fixed rubocops. 2015-08-23 23:25:31 +02:00
Martin Edenhofer
c67b66ecde Fixed syntax error. 2015-08-23 23:17:37 +02:00
Martin Edenhofer
0be6838909 Small improvements. 2015-08-23 23:06:21 +02:00
Martin Edenhofer
f1a42dfee9 Fixed rubocops. 2015-08-23 22:26:03 +02:00
Martin Edenhofer
7070b1748c Refactoring of email detection (added also tests now). 2015-08-23 22:21:04 +02:00
Martin Edenhofer
882d1cd5aa Improved comments. 2015-08-23 22:15:10 +02:00
Martin Edenhofer
492a38ad35 Fixed use of delete!() 2015-08-22 01:55:59 +02:00
Martin Edenhofer
11c84c0fe0 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-22 00:47:01 +02:00
Martin Edenhofer
508029f194 Added test. 2015-08-22 00:46:33 +02:00
Martin Edenhofer
b00107e8f9 Fixed rubocop checks. 2015-08-22 00:40:40 +02:00
Martin Edenhofer
e1aae93269 Fixed rubocop checks. 2015-08-22 00:40:32 +02:00
Martin Edenhofer
21aa91969b Disabled Style/ExtraSpacing. 2015-08-21 23:59:18 +02:00
Martin Edenhofer
0b55cd8147 Fixed rubocop checks. 2015-08-21 23:53:53 +02:00
Martin Edenhofer
1e7e53d852 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-21 16:56:11 +02:00
Martin Edenhofer
32920c55b1 Use also mysql on test. 2015-08-21 16:55:42 +02:00
Martin Edenhofer
36509d45cf Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-21 15:33:17 +02:00
Martin Edenhofer
0de556e1f6 Added little documentation. 2015-08-21 15:33:06 +02:00
Felix Niklas
89fb464915 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-21 11:14:52 +03:00
Felix Niklas
e3b77af2f4 Simplify serachable select layout 2015-08-21 11:14:31 +03:00
Martin Edenhofer
c3be77edd4 Improved device detection. 2015-08-19 02:46:14 +02:00
Martin Edenhofer
1112af9e52 Do not stop rendering page. 2015-08-19 02:16:57 +02:00
Martin Edenhofer
f416e58ac0 Do not device logging in user switch mode. 2015-08-19 02:13:38 +02:00
Martin Edenhofer
9985390c93 Small improvement for displaying city. 2015-08-19 01:05:59 +02:00
Martin Edenhofer
c3eea0b8af Merged migrations. 2015-08-19 01:03:28 +02:00
Martin Edenhofer
ee5e084b63 Improved error handling. 2015-08-19 01:02:41 +02:00
Martin Edenhofer
e2b510313a Added sending user device notification. 2015-08-19 01:00:07 +02:00
Martin Edenhofer
72bb0eb067 Improved device logging. 2015-08-19 00:36:58 +02:00
Martin Edenhofer
2760137eef Removed not used logon_session feature. Added web socket authentication. Prepared browser finger print. 2015-08-18 10:50:12 +02:00
Martin Edenhofer
f2ef65d67d Improved device logging, do not delete current used device. Delete also sessions of device. 2015-08-17 18:14:44 +02:00
Martin Edenhofer
6fe9276ba7 Allow also disable of <a> tags. 2015-08-17 18:13:27 +02:00
Martin Edenhofer
b27e813ddc Prevent clickable <use xlink:href="#icon-abc"></use> tags. 2015-08-17 17:51:42 +02:00
Martin Edenhofer
d5421e38ee Improved error handling. 2015-08-17 17:36:52 +02:00
Martin Edenhofer
06f02b2298 Fixed updateding device logging. 2015-08-17 17:26:13 +02:00
Martin Edenhofer
4b43ac7338 Improved device logging. 2015-08-17 17:17:21 +02:00
Martin Edenhofer
6d7124a169 Improved device logging. 2015-08-17 17:16:17 +02:00
Martin Edenhofer
0917cec855 Init version of device logging. 2015-08-17 16:12:40 +02:00
Martin Edenhofer
7d17849214 Init version of device logging. 2015-08-17 15:25:41 +02:00
Martin Edenhofer
94c4906264 Fixed time zone issue. 2015-08-17 11:00:33 +02:00
Martin Edenhofer
6366629205 Improved humanTime helper method. 2015-08-17 08:39:23 +02:00
Martin Edenhofer
7adc2ea919 Improved humanTime helper method. 2015-08-16 17:46:57 +02:00
Martin Edenhofer
df3addd915 Reduced dom changes, improved performance. 2015-08-16 13:57:27 +02:00
Martin Edenhofer
592b014508 Disabled ajax tracking. 2015-08-16 13:00:14 +02:00
Martin Edenhofer
7dfb3bd642 Added more output info of reload. 2015-08-16 11:33:16 +02:00
Martin Edenhofer
eb84b39c32 Get objects to reindex from Models.searchable. 2015-08-16 11:30:31 +02:00
Martin Edenhofer
ecb0ace02d Check if models_config exists to support migrations of existing systems. 2015-08-16 11:24:15 +02:00
Martin Edenhofer
dac3a506ec Added support for themeless searchable models. 2015-08-16 11:14:24 +02:00
Martin Edenhofer
b2aa52c22a Fixed searchable models as customer user. Added model.search_preferences to get searchable models by config. 2015-08-16 02:53:27 +02:00
Martin Edenhofer
a6df782fef Small improvement. 2015-08-16 01:27:45 +02:00
Martin Edenhofer
4655039cd1 Merged /api/v1/search and /api/v1/search/object controller methods. Added controller tests for permission handling. 2015-08-16 01:27:11 +02:00
Martin Edenhofer
67c708daa5 Upgrade to new rails 4 behaviour. 2015-08-15 11:21:53 +02:00
Martin Edenhofer
e21966aede Fixed typo. 2015-08-15 10:11:02 +02:00
Martin Edenhofer
4e8ee5159e Moved to separate controller tests. 2015-08-15 09:49:15 +02:00
Martin Edenhofer
9e38203af1 Reduce locales for test env. 2015-08-15 09:48:08 +02:00
Martin Edenhofer
84502312e4 Added custom error messages. 2015-08-14 03:58:00 +02:00
Martin Edenhofer
b5189dfebb Small improvements. 2015-08-10 14:08:06 +02:00
Martin Edenhofer
353e2dce5c Added rows attribute to texture. 2015-08-10 11:42:53 +02:00
Martin Edenhofer
5442eb5762 Improved wording. 2015-08-10 11:11:27 +02:00
Martin Edenhofer
6cfaabfc40 Second version of forms. 2015-08-10 10:56:55 +02:00
Martin Edenhofer
c4097e0fc7 Removed not needed params. 2015-08-10 02:14:19 +02:00
Martin Edenhofer
23001f9921 Init form feature. 2015-08-10 02:10:41 +02:00
Martin Edenhofer
852411e569 Improved logging. 2015-08-07 11:30:24 +02:00
Martin Edenhofer
e1dc0b1707 Added doc, improved performance through ActiveRecord::Base.transaction. 2015-08-07 11:24:47 +02:00
Felix Niklas
506e2f1e04 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-06 18:19:35 +02:00
Felix Niklas
b8b2a6b762 user merge layout ref alpha
has:
  - multiple email support (on both sides)
  - merge controls

misses:
  - user select
2015-08-06 18:19:31 +02:00
Martin Edenhofer
d5cae2d3d6 Fixed non search index based ticket search. 2015-08-05 16:59:14 +02:00
Martin Edenhofer
e84a91da5d Moved search result attributes to model. 2015-08-05 16:40:04 +02:00
Martin Edenhofer
3f6cb885b2 Added permission related search for tickets. 2015-08-05 13:58:53 +02:00
Martin Edenhofer
f57e8a5ca7 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-05 12:42:46 +02:00
Martin Edenhofer
13b0758c2a Close recipientlist on tab. 2015-08-05 12:42:35 +02:00
Thorsten Eckel
a24f45ce6f Rubocop improvement. 2015-08-05 11:48:32 +02:00
Thorsten Eckel
804e9ddcfe - Added SearchableAjaxSelect.
- Refactored search_controller.
2015-08-05 11:48:32 +02:00
Thorsten Eckel
f2b1dd2f26 Added function to underscore convert strings. 2015-08-05 11:48:32 +02:00
Thorsten Eckel
89e83717f0 Removed console.log. 2015-08-05 11:48:32 +02:00
Thorsten Eckel
405589a293 Added check if there are any options to display (e.g. options = null). 2015-08-05 11:48:32 +02:00
Martin Edenhofer
9643e2f214 Improved performance of html utils (do replacement in a copy of sting, replace it later once), added word markup removal. 2015-08-05 11:40:50 +02:00
Martin Edenhofer
1741bc1bd1 Fixed namespace. 2015-08-04 21:42:49 +02:00
Martin Edenhofer
847fa907c3 Fixed org logo detection in wizard. 2015-08-04 20:57:11 +02:00
Martin Edenhofer
3abc97df25 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-04 20:55:16 +02:00
Felix Niklas
e7f4f189e0 searchableSelect: add autocomplete 2015-08-04 17:43:06 +02:00
Felix Niklas
2cea7d804b Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-04 16:56:42 +02:00
Felix Niklas
da9309709b searchable select: add loader icon 2015-08-04 16:56:10 +02:00
Martin Edenhofer
9080ed0911 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-04 14:30:54 +02:00
Martin Edenhofer
ce9c5a0f46 Use downcast to search for email or login (in case of case sensitive db's). 2015-08-04 14:30:35 +02:00
Thorsten Eckel
2b444656a2 Fixed bug: Element loses focus when accessed via tab. 2015-08-04 14:27:13 +02:00
Thorsten Eckel
f1950bf66d Removed useless variables. 2015-08-04 14:27:13 +02:00
Thorsten Eckel
c954abcc37 Added missing exception. 2015-08-04 14:27:13 +02:00
Felix Niklas
7b15f669d4 Merge branch 'develop' of github.com:martini/zammad into develop 2015-08-04 12:43:25 +02:00
Felix Niklas
056ee9906e searchable select: add ajax class
- refactor searchable select
- add partial rerendering
2015-08-04 12:43:13 +02:00
Martin Edenhofer
3491dcf043 Import translations by each locale, not at once (document size issue). 2015-08-04 12:41:36 +02:00
Martin Edenhofer
01298449cc Find organization image suggestion and store it as app logo, sync it to assets folder. 2015-08-03 11:30:45 +02:00
Thorsten Eckel
074e90d471 Fixed bug: Options of searchable_-/multi-/select field get sorted even if disabled via configuration. 2015-07-31 11:05:19 +02:00
Martin Edenhofer
a3df7a5aad Remove html comments also. 2015-07-30 12:15:13 +02:00
Martin Edenhofer
9ca8459d19 Added tests for create_if_not_exists and create_or_update. 2015-07-28 15:19:54 +02:00
Martin Edenhofer
ed59645cd8 Revert "Improved code layout."
This reverts commit a286b9e17e.
2015-07-27 20:42:52 +02:00
Thorsten Eckel
71c7b9d45f Fixed bug: Attachment import RecordNotUnique exception handling fails sometimes. 2015-07-27 17:47:13 +02:00
Thorsten Eckel
a286b9e17e Improved code layout. 2015-07-27 17:47:13 +02:00
Thorsten Eckel
6e6b7fe5a6 Improved logging. 2015-07-27 17:47:13 +02:00
Thorsten Eckel
6887e72ac9 Fixed bugs: Refactored method calls didn't work as expected. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
2fc1e1c313 Removed unneded code. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
738069dfba Made article creation thread safe. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
72d830c408 Refactored ticket creation and made it thread safe. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
ef9dbde59d Made article attachment creation thread safe. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
befab460a5 Made article customer user creation thread safe. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
29235acd90 Refactored history creation and made it thread safe. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
899d56434a Each article should get added in an own transaction. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
2d67ac6b5e Improved code layout. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
6ddfd595d6 Removed locks workaround. 2015-07-27 17:47:12 +02:00
Thorsten Eckel
12cf0122ca Fixed bug: Race conditions may occur because of duplicate offset processing. 2015-07-27 17:47:11 +02:00
Martin Edenhofer
117f761348 Fixed lookup. 2015-07-26 23:56:50 +02:00
Martin Edenhofer
7279536d8f Applied rubocop. 2015-07-26 23:35:56 +02:00
Martin Edenhofer
97961e7020 Improved doc. 2015-07-26 23:21:51 +02:00
Martin Edenhofer
eb03d82fdf Set notifications also to seen after pending close. 2015-07-26 23:21:16 +02:00
Martin Edenhofer
6581bb5873 Removed one not needed div level. 2015-07-26 22:08:24 +02:00
Martin Edenhofer
8b0e6c8cee Fixed multiple %s replacements. 2015-07-26 21:28:49 +02:00
Martin Edenhofer
b6b9def375 Moved from Ticket::ScreenOptions.agents to generic User.of_role('Agent'). 2015-07-25 16:36:16 +02:00
Thorsten Eckel
9c28c50e4b Revert "Fixed bug: Race condition in thread object creation."
This reverts commit c6ccb7cf84.
2015-07-24 09:04:09 +02:00
Thorsten Eckel
c6ccb7cf84 Fixed bug: Race condition in thread object creation. 2015-07-23 17:42:58 +02:00
Felix Niklas
d3ef72fcf7 add apple touch icon 2015-07-23 16:44:43 +02:00
Felix Niklas
9f511273b1 Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-23 15:41:09 +02:00
Felix Niklas
19467ce962 add setting-controls for right aligned controls in admin areas 2015-07-23 15:41:03 +02:00
Thorsten Eckel
f395b997e9 Follow up: Changed attachment preference keys according to models/channel/email_parser.rb. 2015-07-22 10:33:29 +02:00
Thorsten Eckel
280f1402cd Changed attachment preference keys according to models/channel/email_parser.rb. 2015-07-21 22:04:57 +02:00
Thorsten Eckel
70e5d349bd Added article attachments initegration tests. 2015-07-21 19:21:21 +02:00
Thorsten Eckel
8de0f7a061 Added functionality to import article attachments as well. 2015-07-21 15:46:01 +02:00
Thorsten Eckel
4f3abbdf0e Proper lookup. 2015-07-21 13:15:56 +02:00
Thorsten Eckel
0f95d68cb5 Proper infinite loop. 2015-07-21 13:14:44 +02:00
Thorsten Eckel
f5bc738170 Added functionality to import nested comments. 2015-07-21 11:53:31 +02:00
Felix Niklas
db863f7b1b Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-20 12:57:18 +02:00
Felix Niklas
c447cd5f1f add multiselect and switch to input layoutref 2015-07-20 12:57:03 +02:00
Felix Niklas
92caa6402e make modal work with a fixed backdrop 2015-07-20 12:56:50 +02:00
Martin Edenhofer
b351169bdd Moved to lib for browser detection. 2015-07-18 03:21:38 +02:00
Martin Edenhofer
bf26b19e98 Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-18 01:27:40 +02:00
Thorsten Eckel
76c22f0991 Fixed bug: On init setups, seeds.rb isn't started. 2015-07-17 17:03:42 +02:00
Thorsten Eckel
21ce374446 Added tests and fixed errors. 2015-07-17 16:57:10 +02:00
Thorsten Eckel
10c3676679 Updated facebook article types. 2015-07-17 16:55:00 +02:00
Martin Edenhofer
aab6a5439e Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-17 14:29:18 +02:00
Thorsten Eckel
4eef31faeb Fixed bug: Fetching twitter article may take some time. 2015-07-17 09:39:34 +02:00
Martin Edenhofer
55fb0fedfe Improved error handling. 2015-07-17 09:12:23 +02:00
Martin Edenhofer
2edeef76e1 Removed not needed code. 2015-07-16 21:57:45 +02:00
Martin Edenhofer
1f0ee62fbf Improved output for starting/stopping. 2015-07-16 21:56:54 +02:00
Martin Edenhofer
a8505ed5dd Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-16 20:10:45 +02:00
Martin Edenhofer
c65e3a02c3 Applied rubocop. 2015-07-16 20:10:20 +02:00
Thorsten Eckel
7274fbdd4f Applied rubocop. 2015-07-16 17:19:46 +02:00
Thorsten Eckel
32ea56c9d9 Added workaround to avoid 2 sec issue with discard changes. 2015-07-16 17:15:55 +02:00
Martin Edenhofer
06d970efb6 Applied rubocop. 2015-07-16 16:41:28 +02:00
Martin Edenhofer
b08e6e568f Only execute migration on existing installations and keep old settings. 2015-07-16 16:40:12 +02:00
Martin Edenhofer
ee2046cc8d Removed not needed reassignment. 2015-07-16 15:47:22 +02:00
Martin Edenhofer
ba7eda1ff5 Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-16 15:42:48 +02:00
Martin Edenhofer
940373f171 Added preferences attribute to disable update of setting via rest if system is a online system. 2015-07-16 15:36:59 +02:00
Thorsten Eckel
f7a84ef0e6 Fixed broken test: Position of table columns has changed. 2015-07-16 15:14:47 +02:00
Thorsten Eckel
82190dba82 Added basic browser profiles to make sure english is used as the browser locale. 2015-07-16 15:14:06 +02:00
Thorsten Eckel
24a4965bf1 Added test environment env and rake calls. 2015-07-16 15:13:24 +02:00
Thorsten Eckel
a7a4bfd892 Added additional check. 2015-07-16 15:12:33 +02:00
Martin Edenhofer
73e9ccb7b4 Wording update for settings. 2015-07-16 12:14:31 +02:00
Martin Edenhofer
70de454d48 Applied rubocop. 2015-07-16 08:27:17 +02:00
Martin Edenhofer
8de67262d3 Updated url to get images. 2015-07-16 08:16:16 +02:00
Martin Edenhofer
e8cc035c22 Sync also locales on translation sync. 2015-07-15 21:47:03 +02:00
Martin Edenhofer
a09fdbd142 Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-15 21:46:03 +02:00
Martin Edenhofer
ae4f48a954 Moved to new wording to access external services. 2015-07-15 21:45:40 +02:00
Felix Niklas
ba6cf2d242 modal controls: bigger spacing 2015-07-15 17:15:39 +02:00
Thorsten Eckel
e710d47af7 Fixed bug: Direct message ticket creation/selection is broken. 2015-07-15 16:51:01 +02:00
Thorsten Eckel
6fc6a26150 Fixed bug: Twitter articles are created without type, state and priortiy. 2015-07-15 16:51:01 +02:00
Felix Niklas
f8393abcf9 refactor auth-providers
- add logos to sprite
- fix button color
- add max button size 33%
2015-07-15 16:41:26 +02:00
Martin Edenhofer
326e007481 Applied rubocop. 2015-07-14 19:12:47 +02:00
Martin Edenhofer
70d9de90bd Added file extension to logo in start page to show logo also in IE 11. 2015-07-13 21:40:33 +02:00
Martin Edenhofer
68b618359e Fixed migration on fresh setups. 2015-07-12 07:32:50 +02:00
Martin Edenhofer
89e00230f5 Improved logo upload. 2015-07-12 07:32:22 +02:00
Martin Edenhofer
3bd59292e7 Improved tab behaviour. 2015-07-12 04:41:27 +02:00
Martin Edenhofer
4f1821daf2 Split into 2 separate migrations. 2015-07-12 04:40:11 +02:00
Martin Edenhofer
67a8ee52d3 Improved migration. 2015-07-12 04:16:14 +02:00
Martin Edenhofer
61c04e50c5 Improved order. 2015-07-12 04:13:59 +02:00
Martin Edenhofer
0e95df4fe1 Added setting preferences options. 2015-07-12 04:12:27 +02:00
Martin Edenhofer
9c0a535d28 Fixed migration on fresh setups. 2015-07-12 03:37:28 +02:00
Martin Edenhofer
ac43efc60f Added branding feature. 2015-07-12 03:32:40 +02:00
Martin Edenhofer
ca42df1ef6 Improved error handling. 2015-07-12 00:37:31 +02:00
Martin Edenhofer
47f73d91e3 Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-12 00:35:45 +02:00
Thorsten Eckel
be80213888 Initial version of facebook channel connector. 2015-07-09 16:56:01 +02:00
Thorsten Eckel
51bf6eb0f1 Removed unneeded line. 2015-07-09 16:19:33 +02:00
Thorsten Eckel
a03627debf Fixed bug: Article type is not interpolated. 2015-07-09 16:00:22 +02:00
Thorsten Eckel
01df55e6de Fixed bug: Closed direct-message tickets get reopened instead of not-closed reused. 2015-07-09 14:58:19 +02:00
Thorsten Eckel
4df77067cc Fixed bug: Missing 'in_reply_to' attribute in case of status replies. 2015-07-09 13:37:42 +02:00
Thorsten Eckel
f9a13f2160 Fixed indentation. 2015-07-09 13:37:41 +02:00
Thorsten Eckel
fa3dc11e98 Fixed wrong attribute name. 2015-07-09 13:37:41 +02:00
Thorsten Eckel
7aff2a4b08 Fixed syntax. 2015-07-09 13:37:41 +02:00
Martin Edenhofer
8f7a5b938b Disconnect only needed once, already done in fetch(). 2015-07-07 11:35:43 +02:00
Martin Edenhofer
8cfd10e690 Fixed log message. 2015-07-07 08:52:22 +02:00
Martin Edenhofer
3a30bffbc0 Added big data classes to do centralised lookups. 2015-07-07 07:56:31 +02:00
Martin Edenhofer
f956948299 Code cleanup, use UserInfo.current_user_id now. 2015-07-06 23:19:00 +02:00
Martin Edenhofer
47400286b3 Improved self.create_from_hash!. 2015-07-06 20:33:37 +02:00
Martin Edenhofer
060381e0db Cleanup of avatar use from third party systems. 2015-07-06 15:50:13 +02:00
Martin Edenhofer
9fd61820c7 Fixed syntax error. 2015-07-06 13:48:07 +02:00
Martin Edenhofer
397a289e97 Small improvements. 2015-07-06 13:44:48 +02:00
Martin Edenhofer
8f3d57c0ae Added ActiveRecord::Base.transaction to speed up. 2015-07-06 08:22:17 +02:00
Martin Edenhofer
9adc5d618f Improved logging. 2015-07-06 03:12:36 +02:00
Martin Edenhofer
54f11be47b Improved model helpers. 2015-07-06 02:33:43 +02:00
Martin Edenhofer
359f276c87 Moved to bigdata service to get person based images. 2015-07-06 00:13:59 +02:00
Martin Edenhofer
2a101fc9de Set temp. current attributes to assets pool to prevent lookup loops. 2015-07-05 10:08:03 +02:00
Martin Edenhofer
73fe87b622 Fixed header. 2015-07-05 10:06:57 +02:00
Martin Edenhofer
e6191411d5 Applied rubocop. 2015-07-05 09:03:09 +02:00
Martin Edenhofer
56d3c66c9e Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-04 13:54:05 +02:00
Martin Edenhofer
b9027cf92c Added new test case. 2015-07-04 13:53:15 +02:00
Martin Edenhofer
a2656bf1d1 Moved to execute job all 12 hours. 2015-07-04 01:08:25 +02:00
Thorsten Eckel
bd9d231de8 Applied rubocop cop 'Lint/DefEndAlignment'. 2015-07-03 19:48:30 +02:00
Thorsten Eckel
c59f616708 Applied rubocop cop 'Lint/UnneededDisable'. 2015-07-03 19:47:23 +02:00
Thorsten Eckel
0c0ebe76d4 Applied rubocop cop 'Style/Next' and 'Style/UselessAssignment'. 2015-07-03 19:44:57 +02:00
Thorsten Eckel
efbeef41e1 Applied rubocop cop 'Style/Next'. 2015-07-03 19:43:38 +02:00
Thorsten Eckel
70e126a95c Applied rubocop cop 'Style/Next' and 'Style/UselessAssignment'. 2015-07-03 19:42:22 +02:00
Thorsten Eckel
81e14dd961 Applied rubocop cop 'Style/Next' and 'Style/UselessAssignment' and 'Style/BlockNesting'. 2015-07-03 19:40:58 +02:00
Thorsten Eckel
aaf19fa52b Applied rubocop cop 'Style/CommentIndentation'. 2015-07-03 19:37:24 +02:00
Thorsten Eckel
b92e5c7532 Applied rubocop cop 'Style/Next' and 'Lint/UnneededDisable'. 2015-07-03 19:36:13 +02:00
Thorsten Eckel
08de22d863 Applied rubocop cop 'Style/AlignHash'. 2015-07-03 19:21:30 +02:00
Thorsten Eckel
37a9801d73 Added 'Metrics/ModuleLength' to V2 Rubocops. 2015-07-03 19:13:30 +02:00
Thorsten Eckel
e1a5a2f94b Applied rubocop cop 'Lint/UnreachableCode'. 2015-07-03 19:03:48 +02:00
Thorsten Eckel
cd800495d8 Applied rubocop cop 'Lint/UnusedBlockArgument'. 2015-07-03 18:58:15 +02:00
Thorsten Eckel
0acd0b1861 Applied rubocop cop 'Style/RegexpLiteral'. 2015-07-03 18:56:27 +02:00
Thorsten Eckel
7a02236f63 Applied rubocop cop 'Style/Next'. 2015-07-03 18:51:22 +02:00
Thorsten Eckel
a43b603f84 Applied rubocop cop 'Style/SpaceAroundOperators'. 2015-07-03 17:40:07 +02:00
Thorsten Eckel
2327e2506e Applied rubocop cop 'Style/TrailingBlankLines'. 2015-07-03 17:38:50 +02:00
Thorsten Eckel
d52167f417 Applied rubocop cop 'Style/IndentationWidth'. 2015-07-03 17:37:27 +02:00
Thorsten Eckel
b9b39014ae Applied rubocop cop 'Style/WordArray'. 2015-07-03 17:35:28 +02:00
Thorsten Eckel
1806193619 Applied rubocop cop 'Style/RedundantReturn'. 2015-07-03 17:34:12 +02:00
Thorsten Eckel
f18afea600 Applied rubocop cop 'Style/NumericLiterals'. 2015-07-03 17:32:48 +02:00
Thorsten Eckel
deb4dfdb9c Applied rubocop cop 'Style/HashSyntax'. 2015-07-03 17:31:27 +02:00
Thorsten Eckel
bc6a8ca169 Applied rubocop cop 'Style/RedundantBegin'. 2015-07-03 17:30:05 +02:00
Thorsten Eckel
4c0fa5111d Applied rubocop cop 'Style/IndentHash'. 2015-07-03 17:27:55 +02:00
Thorsten Eckel
ddd2162ec1 Applied rubocop cop 'Style/SpaceBeforeBlockBraces'. 2015-07-03 17:26:30 +02:00
Thorsten Eckel
9c3c2de3be Applied rubocop cop 'Style/GuardClause'. 2015-07-03 17:25:02 +02:00
Thorsten Eckel
78aacafe54 Applied rubocop cop 'Style/EmptyLines'. 2015-07-03 17:22:17 +02:00
Thorsten Eckel
9b6bf4e762 Applied rubocop cop 'Style/EmptyLines'. 2015-07-03 17:20:41 +02:00
Thorsten Eckel
54fd62487c Applied rubocop cop 'Style/SpaceInsideStringInterpolation'. 2015-07-03 17:18:01 +02:00
Thorsten Eckel
f259dd3459 Replaced group attribute with group_id since names can change. 2015-07-03 11:42:54 +02:00
Thorsten Eckel
5a28d2a47a Fixed typos. 2015-07-03 10:26:37 +02:00
Thorsten Eckel
0703c53732 Added exception for unkonwn twitter article type. 2015-07-03 10:22:36 +02:00
Martin Edenhofer
44593cd800 Little improvement. 2015-07-03 08:55:59 +02:00
Martin Edenhofer
fc361b827f Return result. Needed for tests. 2015-07-03 08:55:00 +02:00
Martin Edenhofer
6e19457811 Fixed syntax error. 2015-07-03 08:30:50 +02:00
Thorsten Eckel
dc7d821728 Refactored twitter channel backend. 2015-07-02 17:13:04 +02:00
Thorsten Eckel
d80ddecc44 Fixed bug: Logger is not present. 2015-07-02 17:10:35 +02:00
Thorsten Eckel
7d9eed3dfb Refactored channel backend call and replaced eval with Object.const_get. 2015-07-02 16:55:15 +02:00
Martin Edenhofer
e174d7e01a Merged some migrations. 2015-07-01 13:53:21 +02:00
Felix Niklas
58644ae84d Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-01 13:47:48 +02:00
Felix Niklas
a8d76ae26c introduce input layout_ref 2015-07-01 13:47:44 +02:00
Felix Niklas
dec7411f30 timepicker: automatically activate am/pm when the element contains class time--12 2015-07-01 13:47:23 +02:00
Martin Edenhofer
45a79e2120 Merged some migrations. 2015-07-01 10:50:42 +02:00
Felix Niklas
a872f78e24 Merge branch 'develop' of github.com:martini/zammad into develop 2015-07-01 10:18:50 +02:00
Martin Edenhofer
9babb669b4 Merged some migrations. 2015-07-01 03:08:01 +02:00
Martin Edenhofer
ab53bbc3a7 Merged some migrations. 2015-07-01 02:05:13 +02:00
Martin Edenhofer
d8001f3c17 Added cleanup job. 2015-07-01 01:38:16 +02:00
Martin Edenhofer
18a21170a2 Improved cleanup again, reduced time to remove of old messages. 2015-07-01 01:31:21 +02:00
Martin Edenhofer
a4323a7f99 Improved cleanup again, reduced time to remove of old seen messages. 2015-07-01 00:45:15 +02:00
Martin Edenhofer
ec46aca820 Improved cleanup. 2015-07-01 00:33:45 +02:00
Martin Edenhofer
e2c66124fc Improved doc. 2015-07-01 00:26:24 +02:00
Martin Edenhofer
d685c8f264 Small improvements. 2015-07-01 00:26:02 +02:00
Martin Edenhofer
d73784e7fd Added cleanup jobs. 2015-07-01 00:25:05 +02:00
Martin Edenhofer
a9aa324fd0 Improved logging. 2015-07-01 00:23:18 +02:00
Martin Edenhofer
94b4217756 Added Models class as helper to find references for prepare user merge feature. 2015-06-30 17:10:22 +02:00
Martin Edenhofer
ebea6e3941 Added to_classname() to string class. 2015-06-30 16:45:03 +02:00
Martin Edenhofer
c54dace898 Merged files. 2015-06-30 16:44:23 +02:00
Martin Edenhofer
7bc55193ce Updated doc. 2015-06-30 15:36:04 +02:00
Martin Edenhofer
901addff6f Not longer needed. 2015-06-30 15:35:16 +02:00
Felix Niklas
0236ed7396 timepicker: fluid typing, fluid stepping 2015-06-30 13:52:33 +02:00
Felix Niklas
c186041348 fix header margin in notification sidebar 2015-06-30 13:51:51 +02:00
Felix Niklas
8c694d1c48 pixel schubsen 2015-06-30 11:00:28 +02:00
Felix Niklas
66b48c6a7e Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-30 10:23:37 +02:00
Felix Niklas
a5a359cce0 fix popover title mark as read
use new standard btn classes, fix spacing
2015-06-30 10:23:33 +02:00
Felix Niklas
216040dc36 fix aligning in action-control on big screens 2015-06-30 10:22:47 +02:00
Felix Niklas
ac8ad3be6c default btn--text to align-left and remove letter-spacing from subtle 2015-06-30 10:22:30 +02:00
Martin Edenhofer
3f076eb2c5 Removed not needed class and attribute. 2015-06-30 10:22:22 +02:00
Martin Edenhofer
73c6533d08 Fixed btn[disabled] selector in css. 2015-06-30 09:44:45 +02:00
Martin Edenhofer
2e53965782 Added doc for App.Model.search() and use order param in real world. 2015-06-29 21:45:43 +02:00
Thorsten Eckel
96fa5b94c7 Added attribute to order App.ControllerGenericIndex 'DESC'. 2015-06-29 17:58:36 +02:00
Thorsten Eckel
ad1626b405 Added option to order (searchable_)select options 'DESC'. 2015-06-29 17:58:36 +02:00
Felix Niklas
f1c8e3da96 sla: add timezone select 2015-06-29 17:30:16 +02:00
Felix Niklas
09329c5fc9 add btn--dropdown that turns the button into a dropdown
has to contain a select element for that. its for inline text buttons, so no arrow for now
2015-06-29 17:30:08 +02:00
Felix Niklas
f28ab344f5 Merge branch 'develop' of github.com:martini/zammad into develop
# Conflicts:
#	app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
2015-06-29 17:07:03 +02:00
Felix Niklas
e9cdc88e72 add and adapt bootstrap-timepicker for times and timeframes
times: 0-12 am/pm or 0-24 hours with minutes
- $('input').timepicker({ showMeridian: true })
- showMeridian activates am/pm

timeframe: 00:00 - 99:99 hour:minutes
- $('input').timepicker({ maxHours: 99 })
2015-06-29 17:04:09 +02:00
Felix Niklas
568c0575d3 add onComplete parameter to ControllerModal
gets called on @onShown
2015-06-29 17:01:22 +02:00
Felix Niklas
2a4da78906 remove old .horizontal 2015-06-29 14:55:31 +02:00
Felix Niklas
866bf9d160 fix vertical alignment of cancel & close in modals 2015-06-29 14:54:52 +02:00
Felix Niklas
3965f9ea61 layout_ref: fix calendar subscriptions preview text 2015-06-29 13:23:41 +02:00
Felix Niklas
12307e0015 fix calendar_subscriptions link 2015-06-29 13:18:49 +02:00
Felix Niklas
2f780129ea make .output-input vertical 2015-06-29 13:18:30 +02:00
Felix Niklas
81245019d8 fix time width in tables 2015-06-29 13:18:03 +02:00
Felix Niklas
28b15109e6 re-add [disabled] styling to btn 2015-06-29 13:17:43 +02:00
Felix Niklas
32f4b5e1cd timezone change button: switch to btn--text btn--secondary 2015-06-29 13:15:20 +02:00
Thorsten Eckel
b7c3403e0e Added shorter/ical routes and made them defaults. 2015-06-29 10:59:25 +02:00
Thorsten Eckel
88b7e877e6 Added translation of calendar event titles. 2015-06-29 10:54:51 +02:00
Martin Edenhofer
349cae6429 Added disabled button with disabled attribute. 2015-06-29 10:04:19 +02:00
Martin Edenhofer
40a7aea976 Removed not longer needed gems. 2015-06-29 02:00:12 +02:00
Martin Edenhofer
b264386b1c Improved check when to show up- 2015-06-28 11:15:54 +02:00
Martin Edenhofer
d0571c58d6 Only show if system is already up and running. 2015-06-28 10:40:55 +02:00
Martin Edenhofer
2723f72ff8 Fixed creation of tickets. 2015-06-28 04:18:34 +02:00
Martin Edenhofer
9570aeeeff Show actions right now after updating first item. 2015-06-28 03:58:53 +02:00
Martin Edenhofer
96d6d94778 Added change of page title. 2015-06-28 03:45:53 +02:00
Martin Edenhofer
46f18b7ecf Delete non persistent sessions even faster. 2015-06-28 03:40:23 +02:00
Martin Edenhofer
bc3e1e52b6 Small improvement, use api now. 2015-06-28 03:39:16 +02:00
Martin Edenhofer
4c03a338bb Do not show todo translations if not todo translation exists. 2015-06-28 03:38:30 +02:00
Martin Edenhofer
aad5855aa3 Added onSubmitCallback for modal controller. 2015-06-28 03:37:48 +02:00
Martin Edenhofer
4e15d2dfa2 Added widget which shows if there is something to translate. 2015-06-28 03:10:17 +02:00
Martin Edenhofer
af780f6920 Fixed comment. 2015-06-28 02:24:42 +02:00
Martin Edenhofer
fcf4a2d30f Small layout improvement. 2015-06-28 02:24:21 +02:00
Martin Edenhofer
fcee6e7f99 Small bugfixes. 2015-06-28 02:23:35 +02:00
Martin Edenhofer
436ddad323 Improved admin translation interface. 2015-06-28 02:16:47 +02:00
Martin Edenhofer
423c7428a7 Small changes / qa. 2015-06-27 18:13:47 +02:00
Thorsten Eckel
9ad68cd8ae Added missing migrations file. 2015-06-26 14:30:57 +02:00
Thorsten Eckel
07ef7c69ee Fixed naming error. 2015-06-26 14:29:30 +02:00
Thorsten Eckel
01adfa4dea Reworked iCal functionality and integration tests, now CalendarSubscriptions. 2015-06-26 14:00:18 +02:00
Felix Niklas
a8672c502a fix subtle text button in layoutRef 2015-06-26 11:54:18 +02:00
Felix Niklas
65db49831d create button layout ref and split subtle button into "btn--text btn--secondary" (darker) and "btn--text btn--subtle" (lighter) 2015-06-26 11:47:28 +02:00
Felix Niklas
05048921de new user preference: calendar subscriptions 2015-06-26 10:47:27 +02:00
Thorsten Eckel
8c775463c5 Removed api version prefix for iCal routes. 2015-06-26 10:24:18 +02:00
Thorsten Eckel
aba5be2fb8 Reworked iCal functionality and integration tests. 2015-06-25 16:18:06 +02:00
Felix Niklas
a98c02d582 add a missing calendar style 2015-06-25 16:15:13 +02:00
Felix Niklas
86ca545af2 fix button borders 2015-06-25 16:11:38 +02:00
Felix Niklas
a7e001db63 add calendar subscriptions layout_ref 2015-06-25 16:10:22 +02:00
Felix Niklas
d119cc5eac make profile nav and headlines uniform to admin nav and headlines 2015-06-25 12:33:25 +02:00
Felix Niklas
6a77365208 adjust search-field size 2015-06-25 12:31:55 +02:00
Felix Niklas
b854568ed8 fix that searchable select input doesn't overflow the arrow 2015-06-25 10:46:57 +02:00
Thorsten Eckel
7d950558e4 Fixed unescaped printing of searchable_select list entries. 2015-06-24 19:50:07 +02:00
Thorsten Eckel
45eb2e251d Reworked iCal functionality and integration tests. 2015-06-24 19:49:06 +02:00
Felix Niklas
a4c6299179 fix highlighter: add checkmark to active color 2015-06-24 17:53:01 +02:00
Felix Niklas
ebedae537c fix Hover / see more by removing/incorporating bootstrap .btn css that forced us to make too strong css rules 2015-06-24 17:40:38 +02:00
Felix Niklas
e0e8bc4da6 change select-box to be black n white 2015-06-24 16:47:06 +02:00
Felix Niklas
5366ae4dae generalise sla list, add scheduler list 2015-06-24 15:33:23 +02:00
Felix Niklas
369de95fb4 sla list: inline controls, make filters and times stay in line on smaller screens, let business hours slip into the same line as filters on big screens 2015-06-24 15:16:13 +02:00
Felix Niklas
bd26aa9ebb Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-24 14:29:35 +02:00
Felix Niklas
9d5e4c0d12 sla list: simplify, make deactivated state more obvious 2015-06-24 14:29:29 +02:00
Martin Edenhofer
5f59773e55 Fixed rendering of activity stream. 2015-06-24 13:37:02 +02:00
Martin Edenhofer
afe4181247 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/assets/javascripts/app/controllers/layout_ref.js.coffee
2015-06-24 13:36:17 +02:00
Martin Edenhofer
8b831a808c Added an example entry with &. 2015-06-24 13:34:08 +02:00
Martin Edenhofer
396cc08c5a Increased default expire of cache from 1 day to 7 days. 2015-06-24 13:33:07 +02:00
Felix Niklas
defcd7b820 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-24 12:45:13 +02:00
Felix Niklas
122952a7c6 WIP sla list 2015-06-24 12:45:08 +02:00
Thorsten Eckel
81539e11f6 Skip tickets with missing pending or escalation time. 2015-06-24 11:54:15 +02:00
Thorsten Eckel
e91553d164 - Refactored authentication_check_only.
- Replaced session[:request_type] with session[:persistent].
2015-06-24 10:49:50 +02:00
Thorsten Eckel
c49792513e Improved comment. 2015-06-24 10:49:49 +02:00
Martin Edenhofer
7b87bf23af Fixed dashboard test. 2015-06-23 19:50:11 +02:00
Martin Edenhofer
2aad09dab2 Improved timing. 2015-06-23 15:47:18 +02:00
Martin Edenhofer
dffadb8452 Improved timing. 2015-06-23 14:48:15 +02:00
Martin Edenhofer
5840225332 Prepared for request_type replacement. 2015-06-23 14:17:04 +02:00
Martin Edenhofer
bea2a732e8 Improved api, removed not needed attribute. 2015-06-22 21:32:29 +02:00
Martin Edenhofer
79ba2dd4be Force to use sql backend for search. 2015-06-22 21:08:47 +02:00
Martin Edenhofer
5d4c4db4d3 Removed not needed debug logging. 2015-06-22 20:41:35 +02:00
Thorsten Eckel
d2306dc7fb Added integration tests for iCal feature. 2015-06-22 19:45:16 +02:00
Thorsten Eckel
f868847826 Moved iCal methods to own modules in lib. 2015-06-22 17:15:16 +02:00
Thorsten Eckel
f345f9f47c Added change event trigger. 2015-06-22 16:30:27 +02:00
Thorsten Eckel
b38b70b440 Removed wrong documentation. 2015-06-22 14:17:09 +02:00
Thorsten Eckel
e06dfe0415 - Fixed wrong code doc.
- Improved code layout.
2015-06-22 14:13:56 +02:00
Thorsten Eckel
8549f3e9b4 Reworked token auth - now using the Rails framework implementation. 2015-06-22 13:20:13 +02:00
Thorsten Eckel
4c94c8518a - Removed URL based token auth for iCal feature.
- Enabled http basic auth fallback auth.
2015-06-22 13:20:13 +02:00
Thorsten Eckel
e183dc4fa9 Added parameter to enable http_basic auth promt fallback. 2015-06-22 13:20:13 +02:00
Felix Niklas
794075e440 hide logo-preview border in setup wizard before image was picked 2015-06-22 11:46:59 +02:00
Thorsten Eckel
b38b98d915 Changed search behavior. @mrflix would be cool to combine those somehow and prioritize better matching ones? 2015-06-22 10:50:06 +02:00
Martin Edenhofer
57ef3f34d7 Added clues templates. 2015-06-21 20:01:29 +02:00
Martin Edenhofer
59a4050838 Only show "mark all as read" if min. one notification is available. 2015-06-21 19:46:44 +02:00
Martin Edenhofer
52d1edea9f Small adjustments in first steps clues. 2015-06-21 19:45:10 +02:00
Martin Edenhofer
d534d43ad0 Show placeholder if no activity stream is shown. 2015-06-21 01:31:41 +02:00
Martin Edenhofer
aaf57357cc Dashboard rewrite part 1. 2015-06-21 00:56:36 +02:00
Martin Edenhofer
5ace610bc9 Try to catch race condition of opening tasks twice. 2015-06-19 20:35:52 +02:00
Thorsten Eckel
1612da3f03 Disabled HTML escaping of option text. 2015-06-19 17:33:10 +02:00
Thorsten Eckel
4303b4112d Added possiblilty to disable sorting via passing 'null' ass sortBy parameter value. 2015-06-19 17:32:19 +02:00
Thorsten Eckel
69ebe8e348 - prevent submit when selecting value with enter key
- prevent tabbing in next element if select options are shown
2015-06-19 17:31:37 +02:00
Felix Niklas
5ee2c4e3cf fix long word handling in dropdowns and add multi line capabilities to searchable select 2015-06-19 16:41:10 +02:00
Felix Niklas
2a04bde305 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-19 16:31:59 +02:00
Felix Niklas
36a096af05 create App.SearchableSelect
together with @thorsteneckel:

✔️ dropdown stays open when the input is focused
✔️ click on item puts the name into the text-field
✔️ first item gets highlighted on dropdown-open
✔️ greedy regex filter while typing /a*.b*./i
✔️ first item gets highlighted while filtering
✔️ key up and down lets you navigate
✔️ enter applies the currently highlighted value
✔️ dropdown hides on ESC
✔️ dropdown can be opend via enter or key down when focused
✔️ returns the selected options value, not the name via a hidden input
✔️ preselect a value via selected: true on attribute.options
2015-06-19 16:31:54 +02:00
Thorsten Eckel
63cc9c0c0d - Fixed option indetation.
- Removed arrow svg for multiple select elements.
2015-06-19 13:11:28 +02:00
Felix Niklas
4772752c51 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-19 08:54:32 +02:00
Felix Niklas
72ad294a5f turn sla and scheduler layout refs into modals 2015-06-19 08:54:26 +02:00
Martin Edenhofer
69990cc419 Fixed tests. 2015-06-19 00:46:12 +02:00
Martin Edenhofer
0b512c59ec Improved speed of user and organization assets. 2015-06-19 00:39:34 +02:00
Martin Edenhofer
9e8fc2c058 Improved tests. 2015-06-18 23:26:58 +02:00
Martin Edenhofer
f7c57d4a3b Fixed logic error. 2015-06-18 16:31:50 +02:00
Martin Edenhofer
dba01295c8 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-18 16:31:30 +02:00
Martin Edenhofer
f4a58f8272 Small code cleanup. 2015-06-18 16:23:03 +02:00
Felix Niklas
517ca061ea Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-18 14:42:39 +02:00
Felix Niklas
1b2a91c9cf add Timer logic 2015-06-18 14:42:32 +02:00
Martin Edenhofer
1ce9f91408 Removed not needed full cache. 2015-06-18 14:32:06 +02:00
Felix Niklas
4cd538b641 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-18 10:04:24 +02:00
Felix Niklas
44d40bb4ac add schedulers layout_ref 2015-06-18 10:04:16 +02:00
Martin Edenhofer
f4d2785425 Improved logging of clone() in case of acceptedInstances. 2015-06-17 20:07:51 +02:00
Felix Niklas
75838e5d8e Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-17 13:56:15 +02:00
Felix Niklas
720ba926fa format business hour table and create response times table style 2015-06-17 13:53:09 +02:00
Martin Edenhofer
168d6878d4 Removed logging. 2015-06-17 00:53:37 +02:00
Martin Edenhofer
58e5defe91 Added indexes. 2015-06-17 00:52:51 +02:00
Felix Niklas
876109258f Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-16 13:18:02 +02:00
Felix Niklas
aee2bb7969 SLA layout_ref WIP 2015-06-16 13:17:55 +02:00
Martin Edenhofer
4b110cc751 Fixed validation. 2015-06-15 08:55:52 +02:00
Martin Edenhofer
14f1b8f186 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-15 08:24:33 +02:00
Martin Edenhofer
7513205c9f Fixed selector for toggle. 2015-06-15 08:24:19 +02:00
Felix Niklas
61986606f9 fix attachment overflow (FF)
I started to discuss this problem here https://github.com/philipwalton/flexbugs/issues/39#issuecomment-111211260 and in a Firefox bug https://bugzilla.mozilla.org/show_bug.cgi?id=1136818 but people defend this behaviour intended..
2015-06-12 15:41:34 +02:00
Felix Niklas
0526970b6c fix attachment clickability 2015-06-12 11:49:23 +02:00
Felix Niklas
151d91f303 dont limit global p width 2015-06-12 11:46:07 +02:00
Martin Edenhofer
d0d4ae6c44 Improved check if highlighter is enabled. 2015-06-12 09:44:06 +02:00
Martin Edenhofer
c7dc7add0b Only enable highlighter for agents. 2015-06-12 09:32:00 +02:00
Martin Edenhofer
ee4085fd07 Improved wording. 2015-06-12 08:30:11 +02:00
Martin Edenhofer
d790947617 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-12 07:59:20 +02:00
Martin Edenhofer
ff41b81713 Improved wording. 2015-06-12 07:59:06 +02:00
Felix Niklas
57aa8c517a fix FF bug in standalone tasks list 2015-06-11 16:06:02 +02:00
Martin Edenhofer
b3bbcc0b60 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-11 16:00:09 +02:00
Felix Niklas
1a1112fbc9 fix popover z-index vs navigation 2015-06-11 15:53:45 +02:00
Martin Edenhofer
605606a2be Improved position of counter. 2015-06-11 15:16:15 +02:00
Felix Niklas
3c80cfdce0 fix tasks overflow bug 2015-06-11 14:48:38 +02:00
Felix Niklas
04639404ef fix scrollTicketHeader issue by switching from fixed to absolute positioning 2015-06-11 14:16:20 +02:00
Felix Niklas
86c844e700 fix zIndex overlay of notification over modal 2015-06-11 13:17:10 +02:00
Felix Niklas
175c178f77 fix notification overflow bug in FF 2015-06-11 13:12:08 +02:00
Felix Niklas
a0ce969a1a update notification's classes and add fix for FF flex bug 2015-06-11 12:35:38 +02:00
Martin Edenhofer
61bacb8d32 Delete organization attribute anyway. 2015-06-11 10:04:24 +02:00
Felix Niklas
e117747ee8 fix switchView button overflow in table 2015-06-10 13:24:19 +02:00
Felix Niklas
07be70bca4 replace word-break with word-wrap 2015-06-10 12:58:21 +02:00
Felix Niklas
a7669bb5ff fix scrollPageHeader width when folding the sidebar 2015-06-10 12:54:44 +02:00
Felix Niklas
a86dd6ddf1 fix task error icon 2015-06-10 12:49:57 +02:00
Felix Niklas
d4155a9771 remove unused css 2015-06-10 12:37:54 +02:00
Felix Niklas
89f37809b6 fix notification popover height calculation
- get scrollHeight via .prop()
- get header height including margins by passing a true with .outerHeight()
- add 2 pixels to the popoverspacer of 2x10 for the top and bottom border of the container
2015-06-10 12:37:54 +02:00
Felix Niklas
0a3198deed require latest version of autoprefixer
to fix the FF bug with the duplicate dropdown arrows on <selects>
2015-06-10 12:37:54 +02:00
Felix Niklas
7d8a58324e fix flex bug in FF 2015-06-10 12:37:54 +02:00
Felix Niklas
770f1756f5 fix wording of switchView button 2015-06-10 12:37:53 +02:00
Martin Edenhofer
9fd45fb858 Fixed formatting of qunit test result. 2015-06-10 11:24:08 +02:00
Martin Edenhofer
47902212cf Small adjustment. 2015-06-10 02:37:59 +02:00
Martin Edenhofer
2b030f436f Fixed test. 2015-06-10 02:28:21 +02:00
Martin Edenhofer
7d1a3dcb6b Small bugfixes. 2015-06-10 02:18:37 +02:00
Martin Edenhofer
7258122455 Added recent created users per default. 2015-06-10 01:57:22 +02:00
Martin Edenhofer
73242cd4b8 Moved to new search style and implemented switch to user button. 2015-06-10 01:33:25 +02:00
Martin Edenhofer
238cc7edd4 Improved (took to much space) width of notification popover. 2015-06-10 00:47:22 +02:00
Martin Edenhofer
62ad616f75 Added support of permanent and on demand widgets. 2015-06-10 00:22:56 +02:00
Felix Niklas
228b37f372 fix tables 2015-06-09 21:20:55 +02:00
Felix Niklas
78af957ba3 create searchfield 2015-06-09 19:51:43 +02:00
Felix Niklas
1d43d27f6b hotfix clues 2015-06-09 18:33:07 +02:00
Felix Niklas
e208573f44 disable pointer events on shown UI element when showing clues 2015-06-09 17:48:22 +02:00
Felix Niklas
d1bb610924 hide user-list switch by default 2015-06-09 17:47:44 +02:00
Felix Niklas
951936f778 fix notification popover 2015-06-09 16:49:49 +02:00
Felix Niklas
7184bf18b4 add user-list layout_ref 2015-06-09 16:48:58 +02:00
Felix Niklas
7679024a5d add clue animation 2015-06-09 16:17:56 +02:00
Felix Niklas
d92b6e292d adjust table style 2015-06-09 11:17:54 +02:00
Felix Niklas
1c1bf347bb switch to user css changes 2015-06-09 10:47:30 +02:00
Martin Edenhofer
82349b4ac1 Update to new translation. 2015-06-08 22:35:51 +02:00
Martin Edenhofer
10580c1007 Improve switch back selector. 2015-06-08 20:01:31 +02:00
Martin Edenhofer
4ef5eacd83 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-08 18:58:43 +02:00
Felix Niklas
c80e112489 fix tasks--standalone name color 2015-06-08 15:25:12 +02:00
Felix Niklas
5f9f408915 admin placeholder: inline tutorials v1 2015-06-08 15:21:47 +02:00
Martin Edenhofer
b46715d0bb Made x to empty search box clickable on focus out. 2015-06-08 13:14:41 +02:00
Felix Niklas
9f841d2d47 Linked Ticket - move to generic ticket list with icons like user profile 2015-06-08 13:02:01 +02:00
Felix Niklas
b21ae7c91a small css fix 2015-06-08 12:36:18 +02:00
Felix Niklas
12ea7db7d0 activate highlighter on pickColor 2015-06-08 12:36:11 +02:00
Felix Niklas
10a87d72a1 fix switch to user
ideally the .switchBackToUser should lie above the #app in the dom, and not inside. then I wouldn't have to write so hacky css
2015-06-08 12:21:37 +02:00
Felix Niklas
818b01f422 Get Started: add dashboard and overview links 2015-06-08 12:12:35 +02:00
Felix Niklas
ebdf2dd2e9 add click cursor to empty-search cross 2015-06-08 11:41:01 +02:00
Martin Edenhofer
f9e46fdae5 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-08 11:32:16 +02:00
Felix Niklas
a31d0de96a fix search input overflow over clear x 2015-06-08 11:27:17 +02:00
Felix Niklas
b2085e48e0 QA Removed small slot between search box and search result. 2015-06-08 11:20:29 +02:00
Felix Niklas
60e4308f5c get started v1.1 2015-06-08 11:16:20 +02:00
Martin Edenhofer
14f267fa82 Fixed switch to user feature and added browser tests. 2015-06-08 10:59:23 +02:00
Martin Edenhofer
f09195787b Moved delete icon to svg. 2015-06-08 10:57:32 +02:00
Martin Edenhofer
9da504152a Removed small slot between search box and search result. 2015-06-07 09:22:13 +02:00
Martin Edenhofer
f7ab36b5b7 Changed selector to force blur on content editable of note attributes. 2015-06-06 20:26:04 +02:00
Martin Edenhofer
96487a8cbc Changed selector to force blur on content editable of note attributes. 2015-06-06 19:08:47 +02:00
Martin Edenhofer
6c4cd19467 Improved selector for *_open_by_search() helper. 2015-06-06 17:43:18 +02:00
Martin Edenhofer
6a8df05445 Updated new selector class. 2015-06-06 13:09:52 +02:00
Martin Edenhofer
278d67326d Fixed select ticket from overview (svg selectors). 2015-06-06 11:45:43 +02:00
Martin Edenhofer
c41d956ae5 Improved timing for reset check. 2015-06-06 09:22:14 +02:00
Martin Edenhofer
01b1ce2ff0 Improved timing for reset check. 2015-06-06 07:38:40 +02:00
Martin Edenhofer
5531f70f46 Fixed ftp ref urls. 2015-06-05 16:51:41 +02:00
Martin Edenhofer
b6161c8f0c Start scheduler only once. 2015-06-05 16:23:03 +02:00
Martin Edenhofer
bce9152836 Slow down of task startup of prevent same tasks opened at same time. 2015-06-05 16:22:06 +02:00
Martin Edenhofer
2360506c7b Improved code layout. 2015-06-05 16:20:19 +02:00
Martin Edenhofer
6570ead1d3 Init version of highlighter. 2015-06-05 16:19:36 +02:00
Martin Edenhofer
8576909975 Also disable textarea's on form disable. 2015-06-04 10:55:26 +02:00
Martin Edenhofer
48bd07ad7d Improved vip marker. 2015-06-04 10:54:31 +02:00
Martin Edenhofer
82c04c1800 Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-03 15:59:38 +02:00
Felix Niklas
0b726a41d4 add: unperform clue action 2015-06-03 14:03:15 +02:00
Felix Niklas
890cf7839b fix userprofile long ticketname 2015-06-03 14:03:06 +02:00
Martin Edenhofer
e1b09ff4ce Merge branch 'develop' of github.com:martini/zammad into develop 2015-06-03 13:58:51 +02:00
Martin Edenhofer
baf7b1ab3b - Style for read only form items (after submit is pressed).
- Fixed firefox issue lower 35 with drop down elements.
2015-06-03 13:58:43 +02:00
Felix Niklas
f8d7301677 clues v1 2015-06-03 13:56:15 +02:00
Felix Niklas
c6a051af43 fix profile ticket-list layout 2015-06-03 10:26:51 +02:00
Felix Niklas
9a18b99d18 fix user profile layout_ref 2015-06-03 10:17:57 +02:00
Martin Edenhofer
82bbab1581 Improved notification counter style. 2015-06-03 09:49:09 +02:00
Martin Edenhofer
6c6f3fba7b Set also input and select fields to read only on form disable. 2015-06-03 09:20:00 +02:00
Martin Edenhofer
5f2b39af57 Added css console support for safari. Fixed log prefix on non css console log supporting browsers. 2015-06-03 08:00:15 +02:00
Martin Edenhofer
9ac998edea clone() is now IE comparable. 2015-06-03 07:53:28 +02:00
Martin Edenhofer
51da02c96b Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/assets/javascripts/app/views/task_widget_tasks.jst.eco
	app/assets/stylesheets/zammad.css.scss
2015-06-03 07:52:30 +02:00
Martin Edenhofer
9d44c8a545 Added is-modified to task as class. 2015-06-02 20:23:53 +02:00
Martin Edenhofer
e590248307 Init version of highlighter. 2015-06-02 20:23:02 +02:00
Felix Niklas
f3db99d62c update highlight layoutref 2015-06-02 18:21:14 +02:00
Felix Niklas
70a912abbd hotfix avatar cropper 2015-06-02 16:52:13 +02:00
Felix Niklas
a0d27bdd61 update cropper.js and fix avatar slicing 2015-06-02 16:15:26 +02:00
Felix Niklas
652e3aca49 center search input position 2015-06-02 15:44:55 +02:00
Felix Niklas
93042905af add clipboard and reload icon 2015-06-02 15:40:02 +02:00
Felix Niklas
eb710f009c add reload icon 2015-06-02 14:28:38 +02:00
Felix Niklas
f59b67c4b2 get rid of single svgs, add logo and logotype to icon set 2015-06-02 14:05:35 +02:00
Felix Niklas
e65e41d984 fix performance of modified icon 2015-06-02 13:35:45 +02:00
Felix Niklas
e05a8b0a53 add priority icon to profile/organization 2015-06-02 12:28:48 +02:00
Felix Niklas
b62df436c0 make tools icon smaller 2015-06-02 11:38:14 +02:00
Felix Niklas
17d6c11434 make color in profiles/organisation views dark 2015-06-02 11:37:58 +02:00
Felix Niklas
3ac337f9b2 publish icon sprite sketch file
- exports to public/assets/images/icons/
- run with `gulp` to create public/assets/images/icons.svg
2015-06-02 11:29:21 +02:00
Felix Niklas
f0c8700b49 remove old prototype 2015-06-02 11:25:17 +02:00
Felix Niklas
f78f917d70 fix action dropdown hover state bug 2015-06-02 11:11:48 +02:00
Felix Niklas
1f8ae96706 add minus author 2015-06-02 10:42:09 +02:00
Felix Niklas
ef0d569d33 fix activity counter
- counter now has a .js-counter class
- counter doesn't get removed from the dom, the counter gets hidden via css when its content is empty
- the logo is in a .logo div again
2015-06-01 17:39:36 +02:00
Felix Niklas
f592796abd add minus icon 2015-06-01 17:15:29 +02:00
Felix Niklas
731338edc7 fix scrollpageheader, make min-, sidebar- and navigation-width into variables 2015-06-01 17:08:38 +02:00
Martin Edenhofer
8c651959a8 Added close on open new tab. 2015-06-01 16:39:27 +02:00
Martin Edenhofer
190d86d4f1 Fixed task modified selector. 2015-06-01 12:38:10 +02:00
Martin Edenhofer
3c7e7684f8 Fixed active task selector. 2015-06-01 10:29:54 +02:00
Martin Edenhofer
77bf1bd677 Fixed correct ticket status icon. 2015-06-01 09:33:25 +02:00
Martin Edenhofer
49d24b939f Do not send stats if developer_mode is enabled. 2015-06-01 01:12:02 +02:00
Martin Edenhofer
aaf47a28d3 Fixed arrow down icon. 2015-06-01 00:52:38 +02:00
Martin Edenhofer
2ee53395af Fixed route. 2015-06-01 00:51:04 +02:00
Martin Edenhofer
169fe22fdf Fixed arrow down selector. 2015-06-01 00:47:53 +02:00
Martin Edenhofer
b02d9f5302 Fixed task selector. 2015-05-31 23:52:51 +02:00
Martin Edenhofer
bb333aa654 Fixed destroy selector. 2015-05-31 21:47:01 +02:00
Martin Edenhofer
bc73a974c7 Fixed close selector. 2015-05-31 20:32:19 +02:00
Martin Edenhofer
cdd80c8570 Improved set/get log config. 2015-05-31 18:49:09 +02:00
Martin Edenhofer
091a64a86b Small adjustment. 2015-05-31 18:48:22 +02:00
Martin Edenhofer
a206644a85 Split of ticket zoom controller into separate files. 2015-05-31 18:48:02 +02:00
Martin Edenhofer
c360fabbb3 Removed example sub nav items, 2015-05-31 18:46:59 +02:00
Felix Niklas
9385ac3749 fix new ticket dropup color 2015-05-28 17:25:07 +02:00
Felix Niklas
31760fac91 fix delete icon (attachments) 2015-05-28 16:26:49 +02:00
Felix Niklas
407231f5d7 style ticket links 2015-05-28 16:21:31 +02:00
Felix Niklas
7f297a977c fix ticket tags 2015-05-28 15:27:44 +02:00
Felix Niklas
91c14382a4 fix tools dropdown, add tools icon, fix overview icon, add tools icon author 2015-05-28 14:47:00 +02:00
Felix Niklas
ca0d66bc10 make add ticket links a local modal 2015-05-28 13:49:59 +02:00
Martin Edenhofer
81003e0807 Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-28 13:48:01 +02:00
Martin Edenhofer
5451302656 Added examples for tools. 2015-05-28 13:47:42 +02:00
Felix Niklas
085e4056f3 style add ticket link 2015-05-28 13:40:21 +02:00
Felix Niklas
15b5fd7800 fix layout ref 2015-05-28 13:33:54 +02:00
Felix Niklas
48ca4ef92a style dropdown header 2015-05-28 12:00:03 +02:00
Martin Edenhofer
9498faaa1e Removed not needed logging. 2015-05-28 10:59:56 +02:00
Martin Edenhofer
bb3ef8910f Check if it is working outside of group :assets in production. 2015-05-28 10:39:15 +02:00
Martin Edenhofer
c47ddcfb83 Removed Glyphicons Halflings, thanks to mrsvg, alias mrflix. 2015-05-28 00:40:33 +02:00
Martin Edenhofer
995ff66205 Fixed icons. 2015-05-27 22:20:47 +02:00
Martin Edenhofer
c40945f7cd Fixed title and translation issues. 2015-05-27 22:19:02 +02:00
Martin Edenhofer
495868dff8 Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-27 18:43:35 +02:00
Felix Niklas
3fc2588668 missing table/priority fix 2015-05-27 17:00:55 +02:00
Felix Niklas
e7cde54890 fix priority icons and text color 2015-05-27 16:55:08 +02:00
Martin Edenhofer
c7c8e91c49 Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-27 16:30:49 +02:00
Felix Niklas
5f015f6249 fix delete task in FF 2015-05-27 14:32:27 +02:00
Martin Edenhofer
ee5ba4fa78 Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-27 14:32:04 +02:00
Martin Edenhofer
11082ab8fb Improved log backend. 2015-05-27 14:31:49 +02:00
Felix Niklas
ec2b4ea215 redesign admin objects 2015-05-27 14:21:56 +02:00
Martin Edenhofer
f933523c8d Removed clone. Just do stringily in try/catch. 2015-05-27 11:47:00 +02:00
Felix Niklas
23b15acf52 hide border while dragging tickets 2015-05-27 11:30:58 +02:00
Felix Niklas
fa77d5a04a improve priority animation performance 2015-05-27 10:58:23 +02:00
Felix Niklas
0b29920a0c make sidebar header clickarea even bigger 2015-05-27 10:49:45 +02:00
Felix Niklas
1b7d17b897 enlarge sidebar header actions click area 2015-05-27 10:21:13 +02:00
Felix Niklas
7cde9d54ef auto adjust the background of light icons 2015-05-27 09:54:27 +02:00
Felix Niklas
609495ee77 fix total tickets svg 2015-05-27 09:53:56 +02:00
Felix Niklas
f01124f626 fix tokenfield 2015-05-27 09:23:25 +02:00
Martin Edenhofer
e54457c7c7 Improved nav-tab text postion. 2015-05-27 01:24:03 +02:00
Martin Edenhofer
92f596e7f4 Added esc support of search box. 2015-05-27 01:22:59 +02:00
Martin Edenhofer
a2798b17c2 Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-26 23:53:25 +02:00
Martin Edenhofer
ca5137572f Improved. 2015-05-26 23:53:16 +02:00
Felix Niklas
4c436ee3e3 add icon_authors editor 2015-05-26 21:42:17 +02:00
Felix Niklas
2158807fd0 replace icon-close by icon-diagonal-cross 2015-05-26 21:42:08 +02:00
Felix Niklas
99d6ab383f fix trash icon 2015-05-26 20:03:52 +02:00
Felix Niklas
e4d24abd8e fix org icon 2015-05-26 18:48:35 +02:00
Felix Niklas
f63dddb89c fix search 2015-05-26 18:41:50 +02:00
Felix Niklas
c1b73de746 fix arrows and add delete button to avatar picker 2015-05-26 18:29:04 +02:00
Felix Niklas
648f46e398 give the app a min-width of 1024px
no more squashed dashboard!
2015-05-26 11:45:14 +02:00
Felix Niklas
08c98201bc add an explanation to admin controls as placeholders 2015-05-26 11:36:30 +02:00
Felix Niklas
b0b3012302 text module widget > focus/selected style fixen 2015-05-26 10:46:26 +02:00
Felix Niklas
2986fc42ae fix bubble arrow nose 2015-05-26 10:22:36 +02:00
Felix Niklas
102bd2b39e Merge remote-tracking branch 'origin/develop' into develop 2015-05-26 10:16:17 +02:00
Felix Niklas
0593ee29ef clean up icons 2015-05-26 10:10:29 +02:00
Felix Niklas
cd23ba82c2 remove old icon logic 2015-05-26 09:56:23 +02:00
Felix Niklas
c58fb89887 add help icon 2015-05-26 09:47:18 +02:00
Felix Niklas
32eb025645 add checkboxes and radios 2015-05-26 09:41:20 +02:00
Felix Niklas
e7ebb87e37 update paperclip icon 2015-05-26 09:13:09 +02:00
Martin Edenhofer
ca2cadad1d Removed not implemented view switch. 2015-05-25 10:48:07 +02:00
Martin Edenhofer
d2b1e69326 Improved error handling. 2015-05-25 10:42:58 +02:00
Martin Edenhofer
7f7312129c Upgrade to spinejs 1.5.0. 2015-05-25 01:44:15 +02:00
Martin Edenhofer
696f2174de Improved auto wizard. 2015-05-25 00:12:23 +02:00
Martin Edenhofer
b239021546 Improved auto wizard. 2015-05-24 23:59:11 +02:00
Martin Edenhofer
695d7a9ecc Added signature support to auto wizard. 2015-05-23 03:53:43 +02:00
Martin Edenhofer
26c1a6e211 Change ticket_define_email_from to more human version. 2015-05-23 03:24:26 +02:00
Martin Edenhofer
96fb303b7e Added also channel support, remove auto_wizard file after auto wizard has been done. 2015-05-23 02:41:29 +02:00
Martin Edenhofer
6f017e348c Improved error handling. 2015-05-23 01:57:27 +02:00
Martin Edenhofer
47d2aa5a34 Added support to add initial org to initial user. 2015-05-23 01:54:33 +02:00
Martin Edenhofer
82dc983f49 Added support for organization on auto wizard. 2015-05-23 01:30:21 +02:00
Martin Edenhofer
cbe5a2b419 Streamline of user assets lookup. 2015-05-22 20:52:34 +02:00
Felix Niklas
d6ef8ac6e1 adjust tab loading icon 2015-05-22 12:36:12 +02:00
Felix Niklas
c1bcf5285c create .icon-error (version of icon-diagonal-cross but with color) 2015-05-22 09:59:35 +02:00
Felix Niklas
703ee373ce add fullscreenMessage error icon 2015-05-22 09:31:42 +02:00
Felix Niklas
2c6ba2ca91 re-add glyphicons - remove them later 2015-05-22 09:31:25 +02:00
Martin Edenhofer
158f6ab07d Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-22 08:58:45 +02:00
Martin Edenhofer
e48bdc1968 We do not have an destructor at this point, so we need to execute ticket events manually. 2015-05-22 08:58:32 +02:00
Thorsten Eckel
12e6341a34 Removed unneded requires. 2015-05-21 17:23:37 +02:00
Felix Niklas
2cbb2aa373 re-apply Martins css changes (chrome flex bugfix) 2015-05-21 17:12:04 +02:00
Felix Niklas
ff026835bf Merge commit '180d3c31c40297c93ba8d82f7c0c3fece62473ab' into develop
# Conflicts:
#	app/assets/javascripts/app/views/agent_ticket_create.jst.eco
#	app/assets/javascripts/app/views/dashboard.jst.eco
#	app/assets/javascripts/app/views/generic/actions.jst.eco
#	app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco
#	app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
#	app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
#	app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
#	app/assets/javascripts/app/views/navigation.jst.eco
#	app/assets/javascripts/app/views/navigation/personal.jst.eco
#	app/assets/javascripts/app/views/task_widget_tasks.jst.eco
#	app/assets/stylesheets/svg-dimensions.css
#	app/assets/stylesheets/zammad.css.scss
#	gulpfile.js
#	package.json
#	public/assets/images/icons.svg
#	public/assets/images/icons/arrow-right.svg
#	public/assets/images/icons/clock.svg
#	public/assets/images/icons/close.svg
#	public/assets/images/icons/cloud.svg
#	public/assets/images/icons/cog.svg
#	public/assets/images/icons/dashboard.svg
#	public/assets/images/icons/facebook.svg
#	public/assets/images/icons/group.svg
#	public/assets/images/icons/important.svg
#	public/assets/images/icons/in-process.svg
#	public/assets/images/icons/list.svg
#	public/assets/images/icons/logo.svg
#	public/assets/images/icons/magnifier.svg
#	public/assets/images/icons/message.svg
#	public/assets/images/icons/mood-bad.svg
#	public/assets/images/icons/mood-ok.svg
#	public/assets/images/icons/mood-super-bad.svg
#	public/assets/images/icons/note.svg
#	public/assets/images/icons/one-ticket.svg
#	public/assets/images/icons/organization.svg
#	public/assets/images/icons/outbound-calls.svg
#	public/assets/images/icons/overviews.svg
#	public/assets/images/icons/package.svg
#	public/assets/images/icons/pen.svg
#	public/assets/images/icons/person.svg
#	public/assets/images/icons/phone.svg
#	public/assets/images/icons/plus.svg
#	public/assets/images/icons/priority-modified-inner-circle.svg
#	public/assets/images/icons/priority-modified-outer-circle.svg
#	public/assets/images/icons/priority.svg
#	public/assets/images/icons/received-calls.svg
#	public/assets/images/icons/reopening.svg
#	public/assets/images/icons/signout.svg
#	public/assets/images/icons/stopwatch.svg
#	public/assets/images/icons/switchView.svg
#	public/assets/images/icons/team.svg
#	public/assets/images/icons/templates.svg
#	public/assets/images/icons/tools.svg
#	public/assets/images/icons/total-tickets.svg
#	public/assets/images/icons/twitter.svg
#	public/assets/images/icons/user.svg
2015-05-21 17:10:03 +02:00
Thorsten Eckel
651fa7951a Applied rubocop. 2015-05-21 16:53:44 +02:00
Thorsten Eckel
6511a70ff8 Follow up: Implemented Ticket.process_pending. Fixed UnitTests for setting up new system. 2015-05-21 16:50:28 +02:00
Felix Niklas
1fd9068722 add generated svg dimensions css file
contains dimensions for every svg symbol in the syntax of .icon-filename
2015-05-21 16:50:18 +02:00
Felix Niklas
78a8020fac update fira sans
- change normal to book (nicer)
- old fira sans had a weird line-height
- get rid of svg fonts
2015-05-21 16:49:07 +02:00
Felix Niklas
851d1b4175 add autoprefixer, remove manual prefixes 2015-05-21 16:49:07 +02:00
Felix Niklas
7c7fa63d08 add more delay to developer script loader 2015-05-21 16:47:35 +02:00
Felix Niklas
300d1ccb19 create mac developer script starter 2015-05-21 16:47:34 +02:00
Felix Niklas
97acf37086 adjust modal close icon 2015-05-21 16:47:34 +02:00
Felix Niklas
e8a5d5326f adjust search icons, generalise nav tasks to tabs 2015-05-21 16:47:34 +02:00
Felix Niklas
24c2bca708 convert dashboard icons 2015-05-21 16:47:34 +02:00
Felix Niklas
79c9196a24 convert channel icons, right arrow and priority
+ priority modified animation
2015-05-21 16:47:33 +02:00
Felix Niklas
4dbd7c8c21 add new icon technique 2015-05-21 16:47:33 +02:00
Felix Niklas
d827993084 fix notifications language problem 2015-05-21 16:47:33 +02:00
Felix Niklas
180d3c31c4 update more icons, also ticket zoom edit controls 2015-05-21 16:45:41 +02:00
Thorsten Eckel
bf86afb056 Implemented Ticket.process_pending. 2015-05-21 16:40:18 +02:00
Martin Edenhofer
36d090d7fa Fixed chrome 43 flex display issue. 2015-05-21 11:33:15 +02:00
Martin Edenhofer
a27e65014b Added translation. 2015-05-21 11:32:41 +02:00
Martin Edenhofer
708c8cf55c Improved logging. 2015-05-21 08:37:21 +02:00
Martin Edenhofer
d206ef49ed Improved performance, move to threads. 2015-05-21 01:07:13 +02:00
Felix Niklas
b4f2d7f861 update fira sans
- change normal to book (nicer)
- old fira sans had a weird line-height
- get rid of svg fonts
2015-05-19 12:36:28 +02:00
Felix Niklas
930a3c8fe7 add autoprefixer, remove manual prefixes 2015-05-19 12:36:28 +02:00
Felix Niklas
5d7258b6ab add more delay to developer script loader 2015-05-19 12:36:28 +02:00
Felix Niklas
00376606e4 create mac developer script starter 2015-05-19 12:36:28 +02:00
Felix Niklas
78db8baa77 adjust modal close icon 2015-05-19 12:36:28 +02:00
Felix Niklas
37b7b27525 adjust search icons, generalise nav tasks to tabs 2015-05-19 12:36:27 +02:00
Felix Niklas
6448b428ef convert dashboard icons 2015-05-19 12:36:27 +02:00
Felix Niklas
f1777004b3 convert channel icons, right arrow and priority
+ priority modified animation
2015-05-19 12:36:27 +02:00
Felix Niklas
16eaa0af25 add new icon technique 2015-05-19 12:36:27 +02:00
Felix Niklas
283e4de201 fix notifications language problem 2015-05-19 12:36:27 +02:00
Martin Edenhofer
13da832a64 Updated banner. 2015-05-17 23:11:08 +02:00
Martin Edenhofer
c5ae5e767c Do not serve static assets in production per default. 2015-05-15 09:45:32 +02:00
Martin Edenhofer
6ab9209c2e Upgrade to jquery 2.1.4. 2015-05-15 00:15:16 +02:00
Martin Edenhofer
1fda190b73 Work with current env. 2015-05-14 23:36:02 +02:00
Martin Edenhofer
dc743dfea4 Small improvement. 2015-05-14 23:21:24 +02:00
Martin Edenhofer
3720aeeea4 Improved timing. 2015-05-14 22:17:23 +02:00
Martin Edenhofer
0c2f705362 Sometimes open of user org selection fails with selenium, add open class via ja. 2015-05-14 17:33:12 +02:00
Martin Edenhofer
7155f185dc Sometimes open of user org selection fails with selenium, add open class via ja. 2015-05-14 16:59:35 +02:00
Martin Edenhofer
7d6b6d02a4 Reduced window height for win environments. 2015-05-13 20:48:06 +02:00
Martin Edenhofer
517d01d982 Improved click timing. 2015-05-13 16:11:47 +02:00
Martin Edenhofer
efd1f5dd15 Avoid rails and non rails context (script/websocket-server.rb is without rails). 2015-05-13 15:27:25 +02:00
Martin Edenhofer
5cd3ca79bd Improved api for sending messages. 2015-05-12 13:31:32 +02:00
Martin Edenhofer
0192318219 Revert "Removed not longer needed bindings."
This reverts commit eb9d32e2b7.
2015-05-12 13:04:16 +02:00
Martin Edenhofer
c9608cdc00 Improved logging. 2015-05-12 10:46:07 +02:00
Martin Edenhofer
b7ecd9a1eb Fixed use of last_ping. 2015-05-10 22:53:15 +02:00
Martin Edenhofer
94a3797f53 Moved web socket connection after login check to access config settings for web socket server port. 2015-05-10 22:30:48 +02:00
Martin Edenhofer
eb9d32e2b7 Removed not longer needed bindings. 2015-05-10 22:29:51 +02:00
Martin Edenhofer
9e3a68762d Removed extended logging. 2015-05-10 21:54:57 +02:00
Martin Edenhofer
c8ae1d38e1 Use utc timestamps for all. 2015-05-10 21:47:17 +02:00
Martin Edenhofer
08a42e5396 Fixed string quoting. 2015-05-10 21:46:36 +02:00
Martin Edenhofer
6fb8ad4b14 Improved websocket logging. 2015-05-10 21:19:45 +02:00
Martin Edenhofer
4de56f007f Added logging to find race condition. 2015-05-10 17:43:38 +02:00
Martin Edenhofer
06047e249b Added logging to find race condition. 2015-05-10 17:24:10 +02:00
Martin Edenhofer
fbd99e89f3 Added logging to find race condition. 2015-05-10 09:22:31 +02:00
Martin Edenhofer
17d499cbe3 Improved logging. 2015-05-10 09:21:42 +02:00
Thorsten Eckel
bb2bce6763 Removed unneded TODO, all relevant files are excluded now. 2015-05-08 16:13:32 +02:00
Thorsten Eckel
b6c2b6750a Corrected with rubocop cop 'Lint/RescueException'. 2015-05-08 16:09:24 +02:00
Thorsten Eckel
6decb755f5 Moved rubocop cop 'Style/FileName' exclusion back to .rubocop.yml, since it will be ignored as comment in websocket-server.rb. 2015-05-08 15:58:28 +02:00
Thorsten Eckel
bf857eeb76 Corrected with rubocop cop 'Style/GlobalVars'. 2015-05-08 15:49:28 +02:00
Thorsten Eckel
8b822a7ddc Corrected with rubocop cop 'Style/ClassVars'. 2015-05-08 15:47:27 +02:00
Thorsten Eckel
a4ebf8ab9b Removed 'Style/CommentIndentation' from rubocop config, corrected with 43a924f554. 2015-05-08 15:12:00 +02:00
Thorsten Eckel
c1c35ce39e Corrected with rubocop cop 'Style/GlobalVars'. 2015-05-08 12:47:25 +02:00
Thorsten Eckel
cad3bf8842 - Moved websocket-server.rb 'Style/FileName' rubocop cop exclusion from .rubocop.yml to websocket-server.rb.
- Excluded websocket-server.rb from rubocop cop 'Rails/TimeZone'.
2015-05-08 12:43:54 +02:00
Thorsten Eckel
18eaebd9b9 Corrected with rubocop cop 'Lint/ShadowingOuterLocalVariable'. 2015-05-08 12:33:08 +02:00
Thorsten Eckel
409ae23e78 Corrected with rubocop cop 'Rails/TimeZone'. 2015-05-08 12:20:43 +02:00
Thorsten Eckel
f3a9fdb8b3 - Renamed Sessions::Backend::Collections method roles_add to add_if_role.
- Renamed Sessions::Backend::Collections method not_roles_add to add_if_not_role.
2015-05-08 12:20:43 +02:00
Thorsten Eckel
5b352c93e8 Added enabled rubocop cop 'Style/FileName' to Zammad StyleGuide with 'websocket-server.rb' exclusion. 2015-05-08 12:20:42 +02:00
Martin Edenhofer
9387acd22e Fixed not reloading ticket on merge with open tabs. 2015-05-08 11:17:36 +02:00
Thorsten Eckel
7f67e6f00a - Corrected with rubocop cop 'Style/PredicateName'.
- Removed application_module method 'is_not_role', was never used.
- Renamed Sessions::Backend::Collections methods is_role_set to roles_add.
- Renamed Sessions::Backend::Collections methods is_not_role_set to not_roles_add.
2015-05-08 10:22:12 +02:00
Thorsten Eckel
06b5a8df9e Corrected with rubocop cop 'Style/SpaceBeforeComment'. 2015-05-08 10:22:12 +02:00
Thorsten Eckel
ef093f6806 Corrected with rubocop cop 'Style/SpaceBeforeComment'. 2015-05-08 10:22:12 +02:00
Thorsten Eckel
2954485f93 Corrected with rubocop cop 'Lint/UnreachableCode'. 2015-05-08 10:22:12 +02:00
Martin Edenhofer
43a924f554 Applied rubocop Style/CommentIndentation. 2015-05-07 22:49:15 +02:00
Martin Edenhofer
dd9a9ad19f Added level banner. 2015-05-07 16:41:22 +02:00
Thorsten Eckel
4e807587be Corrected with rubocop cop 'Style/ModuleFunction'. 2015-05-07 14:47:13 +02:00
Thorsten Eckel
afcb6bd728 Added Metrics/BlockNesting as log term target. 2015-05-07 14:39:19 +02:00
Thorsten Eckel
95f2b04564 Removed unneeded space. 2015-05-07 14:34:25 +02:00
Thorsten Eckel
3641a41af1 Corrected with rubocop cop 'Lint/Eval'. 2015-05-07 14:33:04 +02:00
Thorsten Eckel
67c4215554 Corrected with rubocop cop 'Style/RedundantSelf'. 2015-05-07 14:10:38 +02:00
Thorsten Eckel
12c0ae1150 Replaced old Import::OTRS with new Import::OTRS2. 2015-05-07 13:57:19 +02:00
Thorsten Eckel
60cd77b653 Added correct default value for disabling cop 'Metrics/CyclomaticComplexity'. 2015-05-07 13:46:49 +02:00
Thorsten Eckel
be2ebf438d Fixed bug: Wrong next statement since rubocop cop 'Style/Next' correction. 2015-05-07 13:45:06 +02:00
Thorsten Eckel
a87e98a50e Added Metrics/CyclomaticComplexity as log term target. 2015-05-07 13:36:09 +02:00
Thorsten Eckel
b6d9c2f566 Added Metrics/PerceivedComplexity and Metrics/AbcSize as log term targets. 2015-05-07 13:32:40 +02:00
Thorsten Eckel
c2af4fdd30 Corrected with rubocop cop 'Style/SignalException'. 2015-05-07 13:27:07 +02:00
Thorsten Eckel
1e4f47acde Corrected with rubocop cop 'Rails/ActionFilter'. 2015-05-07 13:24:04 +02:00
Martin Edenhofer
3eaac7009a Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-07 13:13:26 +02:00
Martin Edenhofer
3a0928d7dc Added new "address" field to geo location feature and added integration tests. 2015-05-07 13:12:40 +02:00
Thorsten Eckel
a5a215b774 Corrected with rubocop cop 'Style/EmptyLineBetweenDefs'. 2015-05-07 12:27:12 +02:00
Thorsten Eckel
fc5e3696a2 Corrected with rubocop cop 'Style/SymbolProc'. 2015-05-07 12:25:16 +02:00
Thorsten Eckel
a87482c8dd Corrected with rubocop cop 'Style/RedundantBegin'. 2015-05-07 12:20:52 +02:00
Thorsten Eckel
6a41d0ee18 Corrected with rubocop cop 'Rails/FindBy'. 2015-05-07 12:15:40 +02:00
Thorsten Eckel
8f54cf18f5 Corrected with rubocop cop 'Style/NilComparison'. 2015-05-07 12:11:45 +02:00
Thorsten Eckel
d8190dc5b4 Corrected with rubocop cop 'Style/Next'. 2015-05-07 11:59:10 +02:00
Thorsten Eckel
c282fd2b37 Corrected with rubocop cop 'Lint/UnusedBlockArgument'. 2015-05-07 11:49:46 +02:00
Thorsten Eckel
1ac1cf4184 Corrected with rubocop cop 'Style/Next'. 2015-05-07 11:04:40 +02:00
Thorsten Eckel
7efe34e53b Corrected with rubocop cop 'Lint/UnusedMethodArgument'. 2015-05-07 10:01:35 +02:00
Thorsten Eckel
b3b76acc89 Corrected with rubocop cop 'Style/WordArray'. 2015-05-07 09:23:24 +02:00
Thorsten Eckel
f982288eb4 Fixed wrong indentation. 2015-05-07 09:23:24 +02:00
Martin Edenhofer
99ac8c82cf Added own config for websocket port. 2015-05-07 07:18:26 +02:00
Martin Edenhofer
408bade61b Small code layout improvement. 2015-05-06 15:06:50 +02:00
Thorsten Eckel
a960793e72 Added rubocop cop 'Style/ClassAndModuleChildren' to the Zammad StyleGuide. 2015-05-06 15:00:11 +02:00
Thorsten Eckel
89d1768f87 Corrected with rubocop cop 'Lint/UselessAccessModifier'. 2015-05-06 14:56:12 +02:00
Thorsten Eckel
650e17be7c Corrected with rubocop cop 'Lint/StringConversionInInterpolation'. 2015-05-06 11:30:39 +02:00
Thorsten Eckel
0fc920df18 Added rubocop cop 'Metrics/PerceivedComplexity' to the Zammad StyleGuide. 2015-05-06 11:23:51 +02:00
Thorsten Eckel
123f88aa34 Corrected with rubocop cop 'Style/FileName', excluded 'websocket-server.rb'. 2015-05-06 11:16:29 +02:00
Martin Edenhofer
0933df82a4 Streamline of access checks. 2015-05-06 10:52:30 +02:00
Thorsten Eckel
ddbab392ef Corrected with rubocop cop 'Rails/Date'. 2015-05-05 16:58:15 +02:00
Thorsten Eckel
bfa6f11221 Corrected with rubocop cop 'Style/EachWithObject'. 2015-05-05 16:56:12 +02:00
Thorsten Eckel
492c07cd95 Removed cop 'Lint/LiteralInCondition', no changes needed. 2015-05-05 16:44:41 +02:00
Thorsten Eckel
8ff3ef106b Removed cop 'Style/PredicateName', no changes needed. 2015-05-05 16:42:48 +02:00
Thorsten Eckel
ba2d2e8296 Corrected with rubocop cop 'Lint/NonLocalExitFromIterator'. 2015-05-05 16:36:05 +02:00
Thorsten Eckel
b08a817e3d Corrected with rubocop cop 'Style/ColonMethodCall'. 2015-05-05 16:25:28 +02:00
Thorsten Eckel
50806a4b5e Corrected with rubocop cop 'Style/VariableName'. 2015-05-05 16:14:18 +02:00
Thorsten Eckel
d63b9d2f9b Corrected with rubocop cop 'Style/InfiniteLoop'. 2015-05-05 16:10:06 +02:00
Thorsten Eckel
c3122f6234 Removed unneeded file. 2015-05-05 15:56:30 +02:00
Thorsten Eckel
07db8b35d9 Corrected with rubocop cop 'Lint/AmbiguousRegexpLiteral'. 2015-05-05 15:43:00 +02:00
Thorsten Eckel
9cd4bb748a Corrected with rubocop cop 'Rails/Validation'. 2015-05-05 15:33:39 +02:00
Thorsten Eckel
3cefc118c9 Corrected with rubocop cop 'Style/MultilineOperationIndentation'. 2015-05-05 15:23:45 +02:00
Thorsten Eckel
ffb2836ed7 Removed cop 'Style/OneLineConditional', no changes needed. 2015-05-05 15:06:43 +02:00
Thorsten Eckel
a14e3fa608 Corrected with rubocop cop 'Style/ClassMethods'. 2015-05-05 13:01:23 +02:00
Thorsten Eckel
07d3baee2b Follow up: Added 'Rails/HasAndBelongsToMany' to the StyleGuide. 2015-05-05 13:01:23 +02:00
Thorsten Eckel
d365fd51d7 Follow up: Added 'Rails/HasAndBelongsToMany' to the StyleGuide. 2015-05-05 13:01:23 +02:00
Thorsten Eckel
8f701f5ef6 Added 'Rails/HasAndBelongsToMany' to the StyleGuide. 2015-05-05 13:01:23 +02:00
Martin Edenhofer
453280d199 Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-05 12:56:41 +02:00
Martin Edenhofer
3cc1fc4182 Populate current attributes of item in filter(). 2015-05-05 12:56:22 +02:00
Thorsten Eckel
abe329591e Corrected with rubocop cop 'Style/MethodName'. 2015-05-05 12:51:19 +02:00
Martin Edenhofer
3d20f51c56 Improved logging. 2015-05-05 12:50:31 +02:00
Martin Edenhofer
1b16d71e66 Added tests for Model.search(). 2015-05-05 12:50:15 +02:00
Thorsten Eckel
b1d8fb1434 Corrected with rubocop cop 'Style/AccessModifierIndentation'. 2015-05-05 12:34:31 +02:00
Thorsten Eckel
f1e2a425ff Corrected with rubocop cop 'Lint/Loop'. 2015-05-05 12:32:25 +02:00
Thorsten Eckel
6a9aafac84 Corrected with rubocop cop 'Style/For'. 2015-05-05 12:17:52 +02:00
Thorsten Eckel
7717f7fec7 Corrected with rubocop cop 'Style/WhileUntilDo'. 2015-05-05 12:09:00 +02:00
Thorsten Eckel
dd130cb704 Removed redundant cop. 2015-05-05 11:57:14 +02:00
Martin Edenhofer
96ee1d665f Removed not needed log. 2015-05-05 10:46:10 +02:00
Martin Edenhofer
89b19caa1d Improved logging. 2015-05-05 10:26:53 +02:00
Martin Edenhofer
cf3e6274d0 Improved logging. 2015-05-05 10:11:31 +02:00
Martin Edenhofer
08f2c924ef Fixed NoMethodError. 2015-05-05 08:06:29 +02:00
Martin Edenhofer
a5b8f28e8e Improved logging. 2015-05-05 07:55:06 +02:00
Martin Edenhofer
3046a07948 Improved logging. 2015-05-04 22:02:00 +02:00
Martin Edenhofer
5df60dd057 Improved logging. 2015-05-04 21:45:48 +02:00
Martin Edenhofer
9ce362cabe Fixed logger namespace. 2015-05-04 21:34:04 +02:00
Martin Edenhofer
e0c7e91fd6 Fixed logger namespace. 2015-05-04 21:19:45 +02:00
Martin Edenhofer
a969242ada Applied some rubocops. 2015-05-04 21:11:20 +02:00
Martin Edenhofer
700616f5e2 Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-04 20:58:42 +02:00
Martin Edenhofer
4365039f49 Moved to rails logger. 2015-05-04 20:58:28 +02:00
Thorsten Eckel
4e7037f820 - Changed rubocop file layout.
- Added ToDo cops.
2015-05-04 16:59:38 +02:00
Thorsten Eckel
4f6b7c1860 Corrected with rubocop cop 'Style/TrailingWhitespace'. 2015-05-04 16:42:00 +02:00
Thorsten Eckel
487a506423 Corrected with rubocop cop 'Style/FormatString'. 2015-05-04 16:37:53 +02:00
Thorsten Eckel
bae19fd9d7 Corrected with rubocop cop 'Style/AccessorMethodName'. 2015-05-04 16:28:42 +02:00
Thorsten Eckel
4b4c7386a2 Corrected with rubocop cop 'Style/StringLiteralsInInterpolation'. 2015-05-04 16:23:33 +02:00
Thorsten Eckel
459a45e46c Corrected with rubocop cop 'Lint/DefEndAlignment'. 2015-05-04 16:21:13 +02:00
Thorsten Eckel
09c3d244f0 Corrected with rubocop cop 'Style/GuardClause'. 2015-05-04 16:19:35 +02:00
Thorsten Eckel
cfd863a07f Corrected with rubocop cop 'Style/SpaceInsideHashLiteralBraces'. 2015-05-04 16:17:36 +02:00
Thorsten Eckel
240a991fd9 Added global excludes. 2015-05-04 16:09:43 +02:00
Thorsten Eckel
77a6b7419d Corrected with rubocop cop 'Style/AlignParameters'. 2015-05-04 16:07:32 +02:00
Thorsten Eckel
e98d98e5ff Corrected with rubocop cop 'Style/HashSyntax'. 2015-05-04 15:59:52 +02:00
Martin Edenhofer
7863118515 Added screenshot support. 2015-05-04 08:13:14 +02:00
Martin Edenhofer
7ecb82c324 Improved wording. 2015-05-04 06:45:33 +02:00
Martin Edenhofer
1c4f09d419 Fixed locale detection, added tests. 2015-05-04 00:21:02 +02:00
Martin Edenhofer
b3aabfe379 Fixed locale detection. 2015-05-03 22:56:21 +02:00
Martin Edenhofer
e7550ce169 Reduced time to reload ticket. 2015-05-03 22:40:31 +02:00
Martin Edenhofer
ea431683f5 Added support of locale auto detection based on browser offered language. 2015-05-03 22:04:33 +02:00
Martin Edenhofer
d5252f599a Only do creation of article within ActiveRecord::Base.transaction block. 2015-05-03 21:23:02 +02:00
Martin Edenhofer
65dbd8799b Wait a little bit longer till ticket is created. 2015-05-03 21:13:01 +02:00
Martin Edenhofer
b88996d8f4 Removed not needed line. 2015-05-03 21:05:43 +02:00
Martin Edenhofer
950ffd56d4 Fixed return value. Side effect of rubocop changes. 2015-05-03 19:49:20 +02:00
Martin Edenhofer
74c86cf815 Only set location of second window in non ci env. 2015-05-03 18:00:18 +02:00
Martin Edenhofer
ccf4566850 Only set location of second window in non ci env. 2015-05-03 15:44:58 +02:00
Martin Edenhofer
e8d7dc2954 Fixed recreate of session. 2015-05-03 14:11:47 +02:00
Martin Edenhofer
386012a4a6 Create own test agent. 2015-05-03 13:38:13 +02:00
Martin Edenhofer
6d5a02fd80 Fixed race condition in Sessions.create(). 2015-05-03 11:22:48 +02:00
Martin Edenhofer
d8d506ea44 Try to prevent "Errno::ENOENT: No such file or directory @ rb_sysopen". 2015-05-03 10:40:10 +02:00
Martin Edenhofer
6642017f23 Added debug messages to get more details about issue on ci env. 2015-05-02 14:23:04 +02:00
Martin Edenhofer
752ed6d73f Added debug messages to get more details about issue on ci env. 2015-05-02 13:57:20 +02:00
Martin Edenhofer
4b7026ab4d Added new translation. 2015-05-02 11:11:40 +02:00
Martin Edenhofer
f15c32569f Improved timing (if ci is under load and tests take more time). 2015-05-02 11:07:22 +02:00
Martin Edenhofer
82b18b5dea Improved wording. 2015-05-02 10:54:18 +02:00
Martin Edenhofer
dc63771df7 Improved timing (if ci is under load and tests take more time). 2015-05-02 10:36:39 +02:00
Martin Edenhofer
2230477018 Improved wording. 2015-05-02 09:46:39 +02:00
Martin Edenhofer
c65786b7df Improved error handling. 2015-05-02 09:10:54 +02:00
Martin Edenhofer
b566a36797 Drop not needed bg job after test file has finished. 2015-05-02 00:58:43 +02:00
Martin Edenhofer
e8667a1a2d Increase test tolerance. 2015-05-01 18:23:22 +02:00
Martin Edenhofer
9965a7587a Merged article changes on ticket into one observer to do ticket.save only once. 2015-05-01 17:24:17 +02:00
Martin Edenhofer
ac9a5b1164 Fixed reset of online notifications. 2015-05-01 17:06:19 +02:00
Martin Edenhofer
e4896fbb7e Moved to background jobs. 2015-05-01 16:40:50 +02:00
Martin Edenhofer
cf2ce642ef Moved to before filter. 2015-05-01 16:26:28 +02:00
Martin Edenhofer
0e6fde30d0 Improved code layout for rubocop. 2015-05-01 15:54:53 +02:00
Martin Edenhofer
a63e1bc1f9 Reworked regex r%{} 2015-05-01 15:17:17 +02:00
Martin Edenhofer
d071d595ae Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-01 15:08:56 +02:00
Martin Edenhofer
70f3bb5dd4 Moved back to compact module/class declaration. 2015-05-01 15:08:43 +02:00
Thorsten Eckel
e35d68f73b Corrected with rubocop cop 'Style/AsciiIdentifiers'. 2015-05-01 14:40:30 +02:00
Thorsten Eckel
33d447cb76 Corrected with rubocop cop 'Style/SpaceInsideRangeLiteral'. 2015-05-01 14:40:30 +02:00
Thorsten Eckel
68a6b850a5 Corrected with rubocop cop 'Style/SpaceAfterNot'. 2015-05-01 14:40:30 +02:00
Thorsten Eckel
71700779df Corrected with rubocop cop 'Style/EmptyLinesAroundAccessModifier'. 2015-05-01 14:40:30 +02:00
Thorsten Eckel
3d18a7eaec Corrected with rubocop cop 'Style/AccessModifierIndentation'. 2015-05-01 14:40:30 +02:00
Thorsten Eckel
39578cea49 Corrected with rubocop cop 'Style/MultilineOperationIndentation'. 2015-05-01 14:40:30 +02:00
Thorsten Eckel
834ad2d64a Corrected with rubocop cop 'Style/RegexpLiteral'. 2015-05-01 14:37:18 +02:00
Thorsten Eckel
7929477838 Corrected with rubocop cop 'Style/AlignHash'. 2015-05-01 14:37:18 +02:00
Thorsten Eckel
92ca9f1bcd Corrected with rubocop cop 'Style/HashSyntax'. 2015-05-01 14:37:18 +02:00
Thorsten Eckel
b235aa2a79 Corrected with rubocop cop 'Style/IndentationConsistency'. 2015-05-01 14:37:18 +02:00
Martin Edenhofer
19d2b9750c Improved article creation, moved customer creation to own def. 2015-05-01 14:31:56 +02:00
Martin Edenhofer
41d2c6c881 Improved import of articles. 2015-05-01 14:20:46 +02:00
Martin Edenhofer
8850bf299b Moved ActiveRecord::Base.transaction to lower scope. 2015-05-01 13:57:49 +02:00
Martin Edenhofer
cc641407ea Removed memory options. 2015-05-01 10:55:24 +02:00
Martin Edenhofer
53a8abf71a Fixed return value of Auth.check. 2015-05-01 09:48:10 +02:00
Martin Edenhofer
607911179b Merge branch 'develop' of github.com:martini/zammad into develop 2015-05-01 09:44:46 +02:00
Martin Edenhofer
1a72bfd98a Some performance improvements. 2015-05-01 09:44:31 +02:00
Thorsten Eckel
504f8b6019 Corrected with rubocop cop 'Style/MultilineIfThen'. 2015-04-30 20:16:25 +02:00
Thorsten Eckel
34fdfc7072 Corrected with rubocop cop 'Style/SpaceAroundBlockParameters'. 2015-04-30 20:13:25 +02:00
Thorsten Eckel
62b23c963e Corrected with rubocop cop 'Style/SpaceBeforeBlockBraces'. 2015-04-30 20:08:37 +02:00
Thorsten Eckel
dd4b2b88d1 Corrected with rubocop cop 'Style/TrivialAccessors'. 2015-04-30 20:02:52 +02:00
Thorsten Eckel
21a7a87098 Corrected with rubocop cop 'Style/Semicolon'. 2015-04-30 19:54:08 +02:00
Thorsten Eckel
b2fd3ba9f0 Corrected with rubocop cop 'Style/DotPosition'. 2015-04-30 19:51:31 +02:00
Thorsten Eckel
329efa8566 Corrected with rubocop cop 'Style/NonNilCheck'. 2015-04-30 19:47:49 +02:00
Thorsten Eckel
4ca036ecc9 Corrected with rubocop cop 'Style/TrailingWhitespace'. 2015-04-30 19:46:06 +02:00
Thorsten Eckel
44adaf000e Corrected with rubocop cop 'Style/DeprecatedHashMethods'. 2015-04-30 19:34:33 +02:00
Thorsten Eckel
4b4f45ddd1 Corrected with rubocop cop 'Lint/DeprecatedClassMethods'. 2015-04-30 19:26:00 +02:00
Thorsten Eckel
88344da11c Corrected with rubocop cop 'Style/EmptyElse'. 2015-04-30 19:22:28 +02:00
Thorsten Eckel
69a16ee2c5 Corrected with rubocop cop 'Style/RedundantReturn'. 2015-04-30 19:20:27 +02:00
Thorsten Eckel
19feb32c7b Corrected with rubocop cop 'Style/IndentationWidth'. 2015-04-30 19:14:51 +02:00
Martin Edenhofer
8c2ea52b3c Little code layout improvement. 2015-04-30 18:02:44 +02:00
Martin Edenhofer
a95185fcb8 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/controllers/tickets_controller.rb
2015-04-30 17:54:27 +02:00
Martin Edenhofer
d580fec5b0 Applied some rubocops. 2015-04-30 17:53:03 +02:00
Thorsten Eckel
99369e30bb Scripts are replaced by rubocop. 2015-04-30 17:27:22 +02:00
Thorsten Eckel
2a036be4af Corrected with rubocop cop 'Style/GuardClause'. 2015-04-30 17:25:14 +02:00
Martin Edenhofer
b47ffdd925 Added fr support for App.Utils.signatureIdentify(). 2015-04-30 09:23:01 +02:00
Martin Edenhofer
049b760440 Improved speed of .load 2015-04-28 23:08:39 +02:00
Martin Edenhofer
0e7f1bfb69 Applied rubocop tips. 2015-04-28 23:08:11 +02:00
Martin Edenhofer
ea5f6d3606 Added rescue to exception to ignore expection. 2015-04-28 22:44:31 +02:00
Martin Edenhofer
ea21efab56 Moved to new locales. 2015-04-28 18:37:52 +02:00
Martin Edenhofer
8c4b546caa Moved to new locales. 2015-04-28 17:30:53 +02:00
Martin Edenhofer
ba1d7abf91 Moved back to compact module/class definition to prevent "superclass mismatch for class Ticket (TypeError)". 2015-04-28 01:19:26 +02:00
Martin Edenhofer
95e27b0994 Moved back to compact class naming to use File.exitst? 2015-04-28 00:21:30 +02:00
Martin Edenhofer
135dcceafd Fixed class/module declaration. 2015-04-28 00:02:11 +02:00
Martin Edenhofer
bd29c71687 Some new rubocop checks. 2015-04-27 23:44:41 +02:00
Martin Edenhofer
a2d49cefc5 Some new rubocop checks. 2015-04-27 23:27:51 +02:00
Martin Edenhofer
5b98be93e1 Revert changes. 2015-04-27 23:01:04 +02:00
Martin Edenhofer
d5ab29474f Some new rubocop checks. 2015-04-27 22:55:17 +02:00
Martin Edenhofer
60121a25fb Some new rubocop checks. 2015-04-27 22:49:17 +02:00
Martin Edenhofer
c694f2f37e Some new rubocop checks. 2015-04-27 22:12:50 +02:00
Martin Edenhofer
6909430eac Some new rubocop checks. 2015-04-27 21:56:07 +02:00
Martin Edenhofer
1e6dcbee1f Improved regular expressions. 2015-04-27 21:35:27 +02:00
Martin Edenhofer
03b47edd43 Some new rubocop checks. 2015-04-27 21:24:14 +02:00
Martin Edenhofer
7ff5568b37 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	test/unit/ticket_sla_test.rb
2015-04-27 19:44:35 +02:00
Martin Edenhofer
91027a8309 Some rubocop successions. 2015-04-27 19:42:59 +02:00
Martin Edenhofer
158bf737ae Applied rubocop Style/IndentHash. 2015-04-27 17:21:17 +02:00
Martin Edenhofer
c79c73d009 Applied rubocop Style/IndentArray. 2015-04-27 17:11:04 +02:00
Martin Edenhofer
dfc39cc95c Applied rubocop IndentationConsistency. 2015-04-27 16:56:32 +02:00
Martin Edenhofer
16ddef38e9 Applied rubocop Style/SpaceAfterComma. 2015-04-27 16:53:29 +02:00
Martin Edenhofer
081d71ffa3 Applied rubocop Style/SpaceInsideHashLiteralBraces. 2015-04-27 16:47:58 +02:00
Martin Edenhofer
6461bed0dd Applied rubocop Style/SpaceBeforeComma. 2015-04-27 16:42:53 +02:00
Martin Edenhofer
c34a33da99 Applied rubocop Style/SpaceAroundOperators. 2015-04-27 16:41:03 +02:00
Martin Edenhofer
ca0d651262 Merge branch 'develop' of github.com:martini/zammad into develop 2015-04-27 16:31:18 +02:00
Martin Edenhofer
8ce5478622 Removed empty lines. 2015-04-27 16:31:07 +02:00
Martin Edenhofer
e474ac197a Applied rubocop Style/EmptyLines. 2015-04-27 16:29:28 +02:00
Martin Edenhofer
bd1db72b9b Applied rubocop Style/TrailingBlankLines. 2015-04-27 16:15:29 +02:00
Martin Edenhofer
70e48aab13 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	config/environments/development.rb
	db/migrate/20120101000020_create_network.rb
	db/migrate/20140831000001_create_object_manager.rb
	lib/fill_db.rb
	test/unit/session_basic_test.rb
	test/unit/session_basic_ticket_test.rb
	test/unit/session_collections_test.rb
	test/unit/session_enhanced_test.rb
	test/unit/working_time_test.rb
2015-04-27 16:02:07 +02:00
Martin Edenhofer
a299f79598 Moved to rubocop Style/NumericLiterals. 2015-04-27 15:43:34 +02:00
Thorsten Eckel
ce58d465c0 Corrected with rubocop cop 'Style/HashSyntax'. 2015-04-27 15:42:53 +02:00
Martin Edenhofer
4f41d596c5 Merge branch 'develop' of github.com:martini/zammad into develop 2015-04-27 15:34:39 +02:00
Thorsten Eckel
540c99fcaf Added rubocop. 2015-04-27 15:34:28 +02:00
Martin Edenhofer
399a119da9 Merge branch 'develop' of github.com:martini/zammad into develop 2015-04-27 15:29:41 +02:00
Martin Edenhofer
94cae01973 Implemented notify_clients_after_touch for later. 2015-04-27 15:29:32 +02:00
Thorsten Eckel
a70b3cfc89 Corrected with rubocop cop 'Style/StringLiterals'. 2015-04-27 15:20:16 +02:00
Martin Edenhofer
4a669df039 Merge branch 'develop' of github.com:martini/zammad into develop 2015-04-27 15:06:51 +02:00
Martin Edenhofer
13e219f06e Moved to new locales for tests. 2015-04-27 15:06:37 +02:00
Thorsten Eckel
58ea373054 Corrected test/ folder with rubocop cop 'Style/StringLiterals'. 2015-04-27 14:51:43 +02:00
Martin Edenhofer
16a12dc923 Example for Thorsten! :) 2015-04-27 14:19:57 +02:00
Martin Edenhofer
73ce455a74 Added missing translation template. 2015-04-27 14:06:42 +02:00
Martin Edenhofer
640a90d4fe Improved error handling. 2015-04-27 13:57:36 +02:00
Martin Edenhofer
25cbaf1111 Added locales table. 2015-04-27 13:51:02 +02:00
Martin Edenhofer
46557532aa Improved i18n and sync with new translations. 2015-04-27 13:47:48 +02:00
Martin Edenhofer
ed891818ed Improved translation feature. 2015-04-27 08:20:52 +02:00
Martin Edenhofer
703a64d8ae Revert "Try new sprockets 3.0.1."
This reverts commit fb8698e7cb.
2015-04-16 22:15:49 +02:00
Martin Edenhofer
fb8698e7cb Try new sprockets 3.0.1. 2015-04-16 21:06:37 +02:00
Martin Edenhofer
11fac2c004 Upgrade to rails 4.1.10. 2015-04-16 20:09:12 +02:00
Martin Edenhofer
466bde7feb Improved admin interface for translations. 2015-04-16 08:49:31 +02:00
Martin Edenhofer
c1d700c82e Only do cleanup on match() in certain cases. 2015-04-14 23:49:46 +02:00
Martin Edenhofer
be67a3f58a Wait until notify is gone after ticket create. 2015-04-14 22:25:16 +02:00
Martin Edenhofer
0c02c41c85 So string cleanups, needed for richtext tests (some browsers will remove \n at the end, some browsers not). 2015-04-14 16:29:26 +02:00
Martin Edenhofer
73f265859d Improved date and datetime validation. 2015-04-14 07:33:47 +02:00
Martin Edenhofer
763964ded1 Improved date and datetime validation. 2015-04-13 22:39:59 +02:00
Martin Edenhofer
f4ea97ac26 Use dedicated version of sprockets, 3.0.0 is broken. 2015-04-13 18:56:52 +02:00
Martin Edenhofer
12298a89e0 Fixed issue in router model and coffeescript 1.9.1 - 195aec753e (diff-c882cf52806a3789e4220147dd29c62c) 2015-04-13 18:38:10 +02:00
Martin Edenhofer
f4fe571d37 coffee-script-source is also working with spinejs 1.4 2015-04-13 16:33:10 +02:00
Martin Edenhofer
f8d5a6bc50 Small improvement. 2015-04-13 16:30:55 +02:00
Martin Edenhofer
42845204ff Small improvement. 2015-04-13 15:39:35 +02:00
Martin Edenhofer
ce38efc412 Do not trigger change on refresh, compat. to spine 1.3.x and lower. 2015-04-13 15:03:45 +02:00
Martin Edenhofer
acc6f606f8 Upgrade to spinejs 1.4.1. 2015-04-13 15:02:44 +02:00
Martin Edenhofer
04480db9aa Upgrade to underscore 1.8.3. 2015-04-13 14:44:36 +02:00
Martin Edenhofer
e2221304a6 Use dedicated version of sprockets, 3.0.0 is broken. 2015-04-13 11:52:32 +02:00
Martin Edenhofer
2bc7de690e Renamed template file. 2015-04-13 07:58:34 +02:00
Martin Edenhofer
ef14bed4f6 Improved translation overview. 2015-04-12 22:47:56 +02:00
Martin Edenhofer
936f2f3648 Fixed wrong use if @T() helped. 2015-04-12 19:16:16 +02:00
Martin Edenhofer
4981b5af05 Use inline translation helper for inline text. 2015-04-12 11:12:48 +02:00
Martin Edenhofer
ec12481273 Added init admin interface for translations. 2015-04-12 10:41:59 +02:00
Martin Edenhofer
c4c12e34e2 Added /ws, :port/ and ajax long poling auto detection. 2015-04-12 03:52:53 +02:00
Martin Edenhofer
63e8405a99 Moved back to 8 threads. 2015-04-11 17:26:54 +02:00
Martin Edenhofer
bf6a213651 Removed not needed space. 2015-04-11 17:26:21 +02:00
Martin Edenhofer
a7a24e5f9c Fixed outfit issue. 2015-04-11 17:25:42 +02:00
Martin Edenhofer
e3a4fe9f8a Improved logging, moved from get to post. 2015-04-11 16:55:38 +02:00
Martin Edenhofer
a96d288d48 Added article count test. 2015-04-10 21:37:36 +02:00
Martin Edenhofer
b4eb49ab57 OTRS 3.1 approved. 2015-04-10 21:22:04 +02:00
Martin Edenhofer
e383dcb97a Improved system_id check. 2015-04-10 16:42:28 +02:00
Martin Edenhofer
e6b1935873 Moved to ENV variables for config. 2015-04-10 16:27:03 +02:00
Martin Edenhofer
d92992c670 Integration test for auto wizard. 2015-04-09 01:39:27 +02:00
Martin Edenhofer
68ea235192 Improved order of tests. 2015-04-09 01:06:17 +02:00
Martin Edenhofer
1fd02cb5f6 Removed duplicate keys. 2015-04-09 00:14:51 +02:00
Thorsten Eckel
6f65519803 Fixed typo. 2015-04-08 16:12:19 +02:00
Thorsten Eckel
1e7acd0cda Fixed typos. 2015-04-08 16:07:51 +02:00
Thorsten Eckel
01ad11215e Fixed typo and replaced example email to prevent duplicate index error. 2015-04-08 16:05:53 +02:00
Thorsten Eckel
f3511ed502 Fixed typo and replaced example email to prevent duplicate index error. 2015-04-08 16:05:21 +02:00
Martin Edenhofer
af20b86d84 Added auto wizard to frontend. 2015-04-08 15:55:53 +02:00
Thorsten Eckel
9fc50fa4b9 Changed behavior to return the User instead of just only its id. 2015-04-08 15:32:20 +02:00
Thorsten Eckel
afdee69e39 Changed functionality to return the id of the User that was created first and cread all following objects with this id. 2015-04-08 15:26:54 +02:00
Thorsten Eckel
1e5a512587 Added EmailAddresses creation. 2015-04-08 15:14:28 +02:00
Thorsten Eckel
3e66af6ef4 Removed unneeded breakets. 2015-04-08 15:08:21 +02:00
Thorsten Eckel
ecb7d65de9 Removed duplicate gem. 2015-04-08 14:52:09 +02:00
Thorsten Eckel
667c13c11c Observers were removed from Rails 4.0. 2015-04-08 14:49:50 +02:00
Thorsten Eckel
8eafa6fabb Added description. 2015-04-08 14:15:09 +02:00
Thorsten Eckel
37c173ed99 Added first draft of AutoWizzard. 2015-04-08 12:49:09 +02:00
Thorsten Eckel
46cdb812f5 Updated example structure. 2015-04-08 12:48:08 +02:00
Thorsten Eckel
3f5033f354 Renamed example file. 2015-04-08 11:18:37 +02:00
Thorsten Eckel
6d9110eaeb Added AutoWizzard example file. 2015-04-08 11:15:46 +02:00
Martin Edenhofer
9a0dc39955 Fixed reseting form/task after page reload. 2015-04-07 15:59:47 +02:00
Martin Edenhofer
cfc3e846b6 Improved attachment test. 2015-04-07 01:56:53 +02:00
Martin Edenhofer
acbe704c3b Added attachment size check. 2015-04-07 01:34:47 +02:00
Martin Edenhofer
1298f15b62 Improved attachment search. 2015-04-07 01:33:22 +02:00
Martin Edenhofer
88aa2e7e4d Updated mapping. 2015-04-06 23:36:13 +02:00
Martin Edenhofer
458c6beb1d Improved attachment upload. 2015-04-06 22:11:45 +02:00
Martin Edenhofer
a4593c160f Improved attachment search. 2015-04-06 22:04:03 +02:00
Martin Edenhofer
0406243988 Added missing ":created_by_id => 1,". 2015-04-06 21:11:07 +02:00
Martin Edenhofer
4bf00e7c17 Added missing ignore file extensions. 2015-04-06 21:08:05 +02:00
Martin Edenhofer
de7d403d16 Added attachment tests. 2015-04-06 21:00:16 +02:00
Martin Edenhofer
eac41c1ab7 Fixed reset of new article on reset form. 2015-04-06 08:46:52 +02:00
Martin Edenhofer
0dc05ce65e Moved to background job execution. 2015-04-06 08:13:05 +02:00
Martin Edenhofer
ef2aa2ac7a Improved tests. 2015-04-06 01:46:05 +02:00
Martin Edenhofer
8a445fc8ef Improved tests. 2015-04-06 01:43:19 +02:00
Martin Edenhofer
698c1a34ea Fixed condition. 2015-04-06 01:35:07 +02:00
Martin Edenhofer
604e0575dd Improved es behaviours. 2015-04-06 01:28:52 +02:00
Martin Edenhofer
16ace88400 Improved es tests. 2015-04-06 01:05:33 +02:00
Martin Edenhofer
7aa4d16236 Improved click(). 2015-04-06 00:39:01 +02:00
Martin Edenhofer
d34d293f8f Improved wording. 2015-04-06 00:36:21 +02:00
Martin Edenhofer
92014a7ded Moved to own ticket sidebar to cover use cases. 2015-04-05 22:55:44 +02:00
Martin Edenhofer
1f08615675 Moved to jquery 2.1.3. 2015-04-05 22:28:45 +02:00
Martin Edenhofer
efb163b384 Reassign organization of ticket if customers organization has changed. 2015-04-05 22:27:40 +02:00
Martin Edenhofer
454935f92a Fixed syntax error. 2015-04-05 13:38:54 +02:00
Martin Edenhofer
979d3bbf12 Improved exception handling. 2015-04-05 13:36:11 +02:00
Martin Edenhofer
5346e2c400 Improved signature identifier. 2015-04-05 13:05:59 +02:00
Martin Edenhofer
a13217e18b Improved signature identifier. 2015-04-05 00:43:01 +02:00
Martin Edenhofer
48c6b963fa Merge branch 'develop' of github.com:martini/zammad into develop 2015-04-05 00:23:24 +02:00
Martin Edenhofer
5b139076ad Improved signature identifier. 2015-04-05 00:20:47 +02:00
Roy Kaldung
b58eb3b8b2 fixed build status image 2015-04-04 13:32:57 +02:00
Martin Edenhofer
06341d543b Improved signatureIdentify(). 2015-04-03 03:49:40 +02:00
Martin Edenhofer
132e3c0362 Improved signatureIdentify() and html2text(). 2015-04-03 03:11:21 +02:00
Martin Edenhofer
c15f204b87 Improved signatureIdentify(). 2015-04-03 02:01:21 +02:00
Martin Edenhofer
dd56429adc Reset "see more" on show/hide task. 2015-04-03 00:49:36 +02:00
Martin Edenhofer
af89daae67 Added signature detection. 2015-04-03 00:29:32 +02:00
Martin Edenhofer
a644b300bc Increased init notifications to 30. 2015-04-01 22:14:25 +02:00
Martin Edenhofer
565beb0580 Fixed online notifications if longer then screen height. 2015-04-01 22:00:22 +02:00
Martin Edenhofer
f7b0473daa Added event module to set online notifications of merged and close tickets to seen. 2015-04-01 16:33:24 +02:00
Martin Edenhofer
e43f9a81e4 Set all notifications of merged ticket to seen. 2015-04-01 13:47:10 +02:00
Martin Edenhofer
045cf492c2 Activated. 2015-04-01 13:42:03 +02:00
Martin Edenhofer
1a677777b6 Merge branch 'develop' of github.com:martini/zammad into develop 2015-04-01 13:15:39 +02:00
Martin Edenhofer
11edfc8780 Check if online notifications are deleted after ticket destroy. 2015-04-01 13:14:46 +02:00
Felix Niklas
eddc9e0061 hide unused chat 2015-03-26 11:35:04 +01:00
Felix Niklas
d39d960a13 fix popover out of visible area 2015-03-25 18:00:00 +01:00
Felix Niklas
d36b0fa64d remove old css 2015-03-25 17:12:01 +01:00
Martin Edenhofer
95ad1ff355 Removed not needed lines. 2015-03-24 13:22:40 +01:00
Martin Edenhofer
9167670b23 Disable parsing on non json content. 2015-03-23 03:52:29 +01:00
Martin Edenhofer
4cdeef2e54 Added Net::HTTPCreated support. 2015-03-23 01:50:03 +01:00
Martin Edenhofer
15577498b0 Added json support to UserAgent, replaced faraday with UserAgent. 2015-03-23 01:31:30 +01:00
Martin Edenhofer
8abe250de7 Added local test address. 2015-03-23 00:29:09 +01:00
Martin Edenhofer
7d7104564b Updated test server address. 2015-03-23 00:09:06 +01:00
Martin Edenhofer
295e2285ee Moved to new user agent api. 2015-03-22 23:35:07 +01:00
Martin Edenhofer
c8fce29d25 Moved to new user agent api. 2015-03-22 23:13:39 +01:00
Martin Edenhofer
3676cc98f4 Make test more stable. 2015-03-22 14:24:44 +01:00
Martin Edenhofer
9e6a994381 Moved to new log server. 2015-03-22 14:13:01 +01:00
Martin Edenhofer
3aa29b6560 Moved to https connection. 2015-03-22 14:08:18 +01:00
Martin Edenhofer
bdeb053c14 Added geoip tests. 2015-03-22 13:23:05 +01:00
Martin Edenhofer
963bbb5396 Improved session overview. 2015-03-22 12:59:39 +01:00
Martin Edenhofer
810391d8b7 Moved to own geo ip service per default. 2015-03-22 11:46:05 +01:00
Martin Edenhofer
54b08ad334 Improved test. 2015-03-21 15:55:50 +01:00
Martin Edenhofer
b0fe4f0446 Disabled debug log. 2015-03-20 10:11:21 +01:00
Martin Edenhofer
573256bf64 Added state and owner to team overviews. 2015-03-19 11:04:57 +01:00
Martin Edenhofer
87b2d0f83d Only start avatar widget on existing session. 2015-03-19 11:03:43 +01:00
Martin Edenhofer
9f035fb7af Improved error handling of spam emails (also for html parts). 2015-03-19 08:43:03 +01:00
Martin Edenhofer
f3b9e612b0 Fixed FF issue with image resize. 2015-03-18 11:38:05 +01:00
Martin Edenhofer
ca7bf185b1 Merge branch 'develop' of github.com:martini/zammad into develop 2015-03-17 08:01:16 +01:00
Martin Edenhofer
5e5a896ceb Improved error handling of spam emails. 2015-03-17 07:59:33 +01:00
Martin Edenhofer
96c84e8351 Check if ticket has beed updated only every 30 min. 2015-03-16 16:07:18 +01:00
Martin Edenhofer
28a024554e Removed debug log. 2015-03-16 14:56:56 +01:00
Felix Niklas
fb230b7c76 remove scrollbars in dropdown in FF 2015-03-13 14:41:46 +01:00
Felix Niklas
5066887f88 fix distance between options button and pagination 2015-03-13 14:35:38 +01:00
Felix Niklas
cef8fcf09e add custom radio buttons 2015-03-13 14:34:35 +01:00
Felix Niklas
58438d32e7 fix Bug: FF und lange attachment names 2015-03-13 14:03:43 +01:00
Felix Niklas
115fe897bb fix modal center controls to align center 2015-03-13 12:38:42 +01:00
Felix Niklas
9a96d6bf66 fix camera bug in FF 2015-03-13 12:38:16 +01:00
Felix Niklas
867933b1de highlight v0.2 2015-03-12 11:26:40 +01:00
Felix Niklas
f1ad78e961 add id's to ticket messages 2015-03-12 11:26:40 +01:00
Felix Niklas
7039e601fe highlight v0.1 2015-03-12 11:26:40 +01:00
Martin Edenhofer
8def4fd80e Touch article on merge to push new version to client (to show new url's for attachments). 2015-03-09 02:31:09 +01:00
Martin Edenhofer
c128c2f742 Added @humanFileSize() helper for template files. 2015-03-09 02:06:10 +01:00
Martin Edenhofer
bdfd51fc26 Moved to separate controllers for avatar and article actions. 2015-03-09 01:51:58 +01:00
Martin Edenhofer
30560ad5b1 Moved to own controller for showing avatars. 2015-03-09 01:24:02 +01:00
Martin Edenhofer
6b6d0b89c4 Fiex typos. 2015-03-09 01:03:31 +01:00
Martin Edenhofer
679b90aaec Do not touch ticket on user or organization change. 2015-03-08 22:46:30 +01:00
Martin Edenhofer
258130d824 Improved tests. 2015-03-08 22:34:14 +01:00
Martin Edenhofer
6db57a6509 Added new ref touch and tests. 2015-03-08 22:33:17 +01:00
Martin Edenhofer
cbfbc225fa To prevent loops, do not trigger touch on touch (just on real change). 2015-03-08 21:33:01 +01:00
Martin Edenhofer
969cadc6a4 Fixed verify_task and added log()/debug method. 2015-03-08 02:06:57 +01:00
Martin Edenhofer
87be963296 Added task modified tests. Added attachment reference tests. 2015-03-08 02:06:04 +01:00
Martin Edenhofer
cf16efcc17 Improved timing. 2015-03-05 11:40:36 +01:00
Martin Edenhofer
1551400230 Removed some debug infos. 2015-03-03 14:44:19 +01:00
Martin Edenhofer
43948e7bcc Do not remember #login and #logout as requested url. 2015-03-03 10:14:57 +01:00
Martin Edenhofer
9a1e2ca0f8 Moved to rails 4.1.9. 2015-03-02 15:56:13 +01:00
Martin Edenhofer
10b1fe0690 Improved controller rerender after language change. 2015-03-02 14:39:27 +01:00
Martin Edenhofer
2269ef8e4e Fixed changing shown columns. 2015-03-02 08:16:34 +01:00
Martin Edenhofer
309369090b Improved speed of tests. 2015-03-02 00:16:36 +01:00
Martin Edenhofer
7bf4f3e91c Improved permanent task handling (check if controller need authentication first). 2015-03-01 19:30:14 +01:00
Martin Edenhofer
08bc3bda3e Improved tests with task and title check. 2015-03-01 10:11:13 +01:00
Martin Edenhofer
18838cb7c5 Improved speed of tests. 2015-02-28 19:51:40 +01:00
Martin Edenhofer
8cc386a10c Improved code layout. 2015-02-28 13:24:30 +01:00
Martin Edenhofer
ee8b309d7e Some stability improvements. 2015-02-28 11:40:23 +01:00
Martin Edenhofer
3d0f76cea0 Improved error handling of content editable fields. 2015-02-26 13:41:09 +01:00
Martin Edenhofer
1c9d00f5c4 Fixed bulk aktion. 2015-02-26 13:37:39 +01:00
Martin Edenhofer
c1d2eca4a5 Extended test. 2015-02-26 01:12:12 +01:00
Martin Edenhofer
3681c8d7f0 New es integration test. 2015-02-26 00:44:29 +01:00
Martin Edenhofer
c38b44562b Improved timings. 2015-02-26 00:29:48 +01:00
Martin Edenhofer
ed89ed2af0 Improved test. 2015-02-26 00:20:09 +01:00
Martin Edenhofer
76ddeed184 Fixed test. 2015-02-26 00:18:39 +01:00
Martin Edenhofer
6f980cd066 Added debug info. 2015-02-26 00:10:36 +01:00
Martin Edenhofer
2e99da075b Use uniq client ids. 2015-02-25 23:56:06 +01:00
Martin Edenhofer
4ff52510ee Improved timings. 2015-02-25 23:43:23 +01:00
Martin Edenhofer
d003cb0253 Even more speed improvements. 2015-02-25 23:35:00 +01:00
Martin Edenhofer
d81a3722e4 Improved speed of test by switching from min to sec for idle param. 2015-02-25 23:17:34 +01:00
Martin Edenhofer
5d2db33534 Improved speed of tests by own ttl method parameter. 2015-02-25 23:07:53 +01:00
Martin Edenhofer
b625a6563a Small testing improvements. 2015-02-25 22:35:37 +01:00
Martin Edenhofer
52c8410f50 Moved back to 30 sek. 2015-02-25 22:08:36 +01:00
Martin Edenhofer
c053a49391 Added also richtext tests. 2015-02-25 22:08:15 +01:00
Martin Edenhofer
be31823d89 Improved cache backend. Heavy reduce of sql queries. 2015-02-25 21:52:14 +01:00
Martin Edenhofer
751ea0b98b Fixed namespace issue. 2015-02-24 21:35:48 +01:00
Martin Edenhofer
b4145be452 Added additional browser tests for overviews (bulk and change overview settings). 2015-02-24 21:22:45 +01:00
Martin Edenhofer
294c131438 Removed obsolet code. Fixed edit overview. 2015-02-24 17:30:44 +01:00
Martin Edenhofer
aa57b72fba Improved error handling. 2015-02-24 02:42:47 +01:00
Martin Edenhofer
747e18a200 Improved speed of tests. 2015-02-24 02:31:17 +01:00
Martin Edenhofer
a5bbd8891b Improved error handling. 2015-02-24 01:11:10 +01:00
Martin Edenhofer
20523a7bd8 Some timing improvements. 2015-02-23 23:58:05 +01:00
Martin Edenhofer
1a3affa659 Improved speed of tests. 2015-02-23 23:37:00 +01:00
Martin Edenhofer
6b4436d17e Improved speed of tests. 2015-02-23 16:35:48 +01:00
Martin Edenhofer
809246aab5 Improved speed of tests. 2015-02-23 14:49:40 +01:00
Martin Edenhofer
6baf72a3c9 Fixed typos. 2015-02-23 14:28:36 +01:00
Martin Edenhofer
553b13fb66 Fixed typo. 2015-02-23 14:16:52 +01:00
Martin Edenhofer
1e6989f6d1 Improved speed of tests. 2015-02-23 14:02:46 +01:00
Martin Edenhofer
4a5fa073f8 Also show "pending close" ticket in My assigned Tickets. 2015-02-23 11:56:57 +01:00
Martin Edenhofer
d3eba504a3 Improved tests. 2015-02-23 10:21:39 +01:00
Martin Edenhofer
7a686b5c0e Improved tests. 2015-02-23 07:56:45 +01:00
Martin Edenhofer
2a19983638 Some adjustments. 2015-02-23 01:02:38 +01:00
Martin Edenhofer
dfb9a38095 Added classes for browser tests. 2015-02-22 23:56:01 +01:00
Martin Edenhofer
7f3dcc5fa8 Improved speed of tests. 2015-02-22 23:51:44 +01:00
Martin Edenhofer
f52c1b9862 Merge branch 'develop' of github.com:martini/zammad into develop 2015-02-22 23:22:05 +01:00
Martin Edenhofer
f71c142829 Improved speed of tests. 2015-02-22 23:20:05 +01:00
Thorsten
2a65379a19 Fixed wrong HTTP code
500 should be 401
2015-02-22 20:15:26 +01:00
Thorsten
77b9ee9937 Code cleanup
Little fixes.
2015-02-22 19:53:03 +01:00
Thorsten
6b88429eb0 Merge pull request #142 from martini/ical_tickets
iCal export and persistent tokens
2015-02-22 19:25:49 +01:00
Thorsten Eckel
4997ed4770 Added ical ticket export feature. 2015-02-22 19:12:09 +01:00
Thorsten Eckel
e19ed671ab - Added Token unit tests.
- Added Token attribute 'persisten'.
- Added auth function 'authentication_check_action_token'.
2015-02-22 19:10:54 +01:00
Martin Edenhofer
5f266bdbce Allow agents to set vip attribute. 2015-02-22 17:18:59 +01:00
Martin Edenhofer
aaf7e69322 Improved speed of tests. 2015-02-22 17:07:38 +01:00
Martin Edenhofer
43ff43f5cf Improved speed of tests. 2015-02-22 13:28:34 +01:00
Martin Edenhofer
3a82045f96 Added more tests. 2015-02-21 00:30:42 +01:00
Martin Edenhofer
4a70ba3e3b Added browser tests for overview. 2015-02-21 00:17:49 +01:00
Roy Kaldung
53f56d4087 Merge pull request #141 from martini/refactoring
Refactoring
2015-02-20 16:59:51 +01:00
Martin Edenhofer
a56b1d31c6 Added overview navigation in ticket zoom. Added overview browser tests. 2015-02-20 14:40:51 +01:00
Martin Edenhofer
d411eae4ae Improved code layout. 2015-02-20 13:29:04 +01:00
Martin Edenhofer
389b1e7bb4 Improved code layout. 2015-02-20 09:56:30 +01:00
Martin Edenhofer
d492142a8f Removed not needed line. 2015-02-20 09:46:34 +01:00
Martin Edenhofer
9285c1b79b Code layout improvement. Removed console.log. 2015-02-20 09:44:11 +01:00
Martin Edenhofer
d5039729d1 Renamed template. 2015-02-19 21:02:21 +01:00
Martin Edenhofer
def1aacb20 Moved to new task manager api (now also with browser tests). 2015-02-19 20:32:37 +01:00
Martin Edenhofer
dfe7d33bd1 Moved to this.log(). 2015-02-17 16:25:22 +01:00
Martin Edenhofer
aacb930094 Close database connection for thread after thread is finished. 2015-02-16 13:41:46 +01:00
Martin Edenhofer
049a35b94c Improved error handling. Set timeout for http calls. 2015-02-16 13:40:10 +01:00
Martin Edenhofer
e5c7fa4c6c Improved z-index of fit screen. 2015-02-16 09:26:10 +01:00
Martin Edenhofer
f9bb6d1ec5 Improved view. 2015-02-15 23:49:09 +01:00
Martin Edenhofer
f253f82e48 Set z-index of getting started, reset password, signup and login. 2015-02-15 23:36:55 +01:00
Martin Edenhofer
eaf537017e If system_init_done is not finished, allow inserts with id for any objects. 2015-02-15 13:54:28 +01:00
rkaldung
db1ee4b54d more refactoring 2015-02-15 11:01:12 +01:00
rkaldung
7cb0818b99 added todos, replaced literals 2015-02-15 11:00:40 +01:00
rkaldung
28d48790b1 less literals, less typos 2015-02-15 10:23:55 +01:00
rkaldung
42780b7ef9 replaced literal w/ constant 2015-02-15 10:12:27 +01:00
rkaldung
775be1ff98 removed not needed files 2015-02-15 09:46:38 +01:00
rkaldung
4954557ccd replaced literal w/ constant 2015-02-15 09:43:40 +01:00
Martin Edenhofer
8f3fc50ce6 Fixed typo. 2015-02-15 09:37:03 +01:00
rkaldung
8ccb441395 fixed typo in column name w/ migration 2015-02-15 09:36:18 +01:00
rkaldung
aa18abf08e added directory to ignore 2015-02-15 09:10:59 +01:00
Martin Edenhofer
b6c360f456 Fixed typo. 2015-02-15 08:52:10 +01:00
Martin Edenhofer
65b7a2a02c Merge branch 'develop' of github.com:martini/zammad into develop 2015-02-15 08:47:59 +01:00
Martin Edenhofer
01fcde5397 Added missing id's for mariadb cluster support. 2015-02-15 08:47:32 +01:00
rkaldung
f17d2f17b5 switched back 2015-02-13 12:54:43 +01:00
rkaldung
a4e388e840 updated mail due to Outlook ContentID prob 2015-02-13 11:41:24 +01:00
rkaldung
a5b94f5498 added more constants for roles 2015-02-12 20:32:54 +01:00
rkaldung
ac43a0a104 using constants instead of literals 2015-02-12 20:26:30 +01:00
rkaldung
591c537325 Merge branch 'develop' of github.com:martini/zammad into develop 2015-02-12 20:22:16 +01:00
Martin Edenhofer
edea39d431 Improved error handling. 2015-02-12 00:04:46 +01:00
Martin Edenhofer
4cc37fe336 Improved error handling. 2015-02-12 00:04:13 +01:00
Martin Edenhofer
a72b777520 Added reset of pending_time on non pending states. 2015-02-11 23:05:31 +01:00
Martin Edenhofer
6fa1d6d2bd Improved handling/replacement of sym/strings as key. 2015-02-10 23:48:14 +01:00
Martin Edenhofer
65a0626cfc Improved tests. 2015-02-10 23:32:56 +01:00
Martin Edenhofer
4a8a167300 Improved notification i18n() replacements. 2015-02-10 15:59:21 +01:00
Martin Edenhofer
675a6d1d0c Do not send notifications of article update / only on article create. 2015-02-10 13:37:47 +01:00
Martin Edenhofer
6cffb8c576 Fixed broken markup in popover for users tickets. 2015-02-10 13:27:52 +01:00
Martin Edenhofer
4e3d2b5306 Added missing integer conversion. 2015-02-09 13:19:52 +01:00
Martin Edenhofer
fa3dd90ac6 Redo of fullLocal() in fullLocal() of other object to prevent loops. Added instance methode imageUrl() to user object. 2015-02-08 15:13:39 +01:00
Martin Edenhofer
7a1749065c Improved showing time after ticket popover is shown. 2015-02-08 15:10:48 +01:00
Martin Edenhofer
9a80a313ac Streamline of layout and markup for user/organization in sidebar/widget and user/orzanization/ticket in popovers. 2015-02-08 14:22:03 +01:00
Martin Edenhofer
0cb3055441 Improved generation of avatar (removed double classes). 2015-02-08 14:18:13 +01:00
Martin Edenhofer
7ade40308d Fixed not shown avatar in organization profile. 2015-02-08 14:14:36 +01:00
Martin Edenhofer
46c8cd7afd Fixed wrapping of long words in modal dialog. 2015-02-08 10:14:34 +01:00
Martin Edenhofer
e66ef04332 Moved to own active element in forms. 2015-02-08 09:49:05 +01:00
Martin Edenhofer
13685030d1 Migration from users.street, users.zip, users.city to user.address. 2015-02-08 09:16:01 +01:00
Martin Edenhofer
519028f491 Added missing test file. 2015-02-08 00:10:27 +01:00
Martin Edenhofer
b518c5d2b8 Improved @P(), small bugfixes. 2015-02-07 23:54:54 +01:00
Martin Edenhofer
64794c3767 Introduced new @P() to print values in templates based on attribute definition. 2015-02-07 23:43:27 +01:00
Martin Edenhofer
0d216b3bc6 Moved to local modals. 2015-02-07 09:15:50 +01:00
Martin Edenhofer
fb2269addf Set VIP to optional. 2015-02-07 00:00:23 +01:00
Martin Edenhofer
98c1ba4fab Improved code layout. 2015-02-06 23:44:01 +01:00
Martin Edenhofer
06f2e77992 Moved to local modals. 2015-02-06 23:11:51 +01:00
Martin Edenhofer
76982a8976 Extended clone to also copy functions by using clone( some_data, true). 2015-02-06 22:51:52 +01:00
Martin Edenhofer
4c2d3e50c3 Prevent given external id at object creation. 2015-02-06 17:13:13 +01:00
Martin Edenhofer
8a3038c7b6 Removed broken avatar background until @mrflix has time to fix it. 2015-02-06 16:24:40 +01:00
Martin Edenhofer
c030efc5c3 Added vip feature. 2015-02-06 16:24:11 +01:00
Martin Edenhofer
afc1d6571d Removed broken avatar background until @mrflix has time to fix it. 2015-02-06 16:23:22 +01:00
Martin Edenhofer
ec43a02588 Added vip feature. 2015-02-06 16:19:07 +01:00
Martin Edenhofer
fa7926eee1 Show inline editing always. 2015-02-06 13:44:55 +01:00
Martin Edenhofer
01e9ad534f Improvd tests. 2015-02-06 10:22:46 +01:00
Martin Edenhofer
db294351e9 Improved code layout. 2015-02-06 10:21:21 +01:00
Martin Edenhofer
412f868d42 Improved rendering of profile pages. Added touch to customer and organization if ticket has changed. 2015-02-06 09:59:08 +01:00
Martin Edenhofer
d46196b69e Moved back to FF31, current ESR version. 2015-02-05 14:02:21 +01:00
Martin Edenhofer
4928732bba Added new useless with very long non default breakable filename. 2015-02-05 10:40:25 +01:00
Martin Edenhofer
0843ea52be Fixed now() selector (was with - timezone). 2015-02-05 00:34:32 +01:00
Martin Edenhofer
d5102c87b1 Updated doc. 2015-02-04 08:54:32 +01:00
Martin Edenhofer
84f433f87c Moved to ff 32. 2015-02-04 08:54:03 +01:00
Martin Edenhofer
e2d2890c6d Improved network error handling if ticket is already open. 2015-02-04 08:53:47 +01:00
Martin Edenhofer
53d13b20f3 Added unit tests for "id in seeds.rb failed" issue. 2015-02-02 14:44:37 +01:00
Martin Edenhofer
3066e49eb1 Fix for using id in loading seeds.rb - unit tests will follow asap. 2015-02-02 14:01:19 +01:00
rkaldung
d14583d112 fixed typo 2015-02-02 13:25:17 +01:00
Martin Edenhofer
6eb460ac8a Improved object cache. Use self.changes to cover same feature. Reduced number of sql statements. 2015-02-01 13:36:22 +01:00
Martin Edenhofer
7810ead783 Fixed ticket reload on server change. Moved to extra notify_clients_support method on models. 2015-02-01 13:08:11 +01:00
Martin Edenhofer
392dd59dc4 Fixed ticket reload on server change. 2015-02-01 12:43:59 +01:00
Martin Edenhofer
0f8c093bec Broadcast change of new ticket (open tasks will be refreshed in web app). 2015-01-31 14:33:05 +01:00
Martin Edenhofer
2774204aba Fixed test (added support of different browser time zones). 2015-01-31 07:52:46 -05:00
Martin Edenhofer
2eb1e35071 Use dedicated version of coffee-script-source, 1.9.0 is broken. 2015-01-30 09:46:12 +01:00
Martin Edenhofer
09063dd611 Fixed time zone issues with date. 2015-01-30 08:08:53 +01:00
Felix Niklas
a4e91f94e2 fix delete file with long filenames 2015-01-29 17:05:26 +01:00
Martin Edenhofer
c6c5877655 Fixed example upload again. 2015-01-29 16:38:35 +01:00
Martin Edenhofer
c53da0ea89 Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-29 16:37:52 +01:00
Martin Edenhofer
7e220a365b Improved rendering of longwords in activity steam. 2015-01-29 16:31:08 +01:00
Felix Niklas
d9c9d2941a fix text overflow on attachment filesize 2015-01-29 16:24:35 +01:00
Martin Edenhofer
a61fdc552c Temporary change till styled element exists. 2015-01-29 14:21:12 +01:00
Martin Edenhofer
644cd811e7 Improved clone() - only clone data, no objects. 2015-01-29 14:19:11 +01:00
Martin Edenhofer
fd022ee01c Moved to short form for file size. 2015-01-29 09:51:32 +01:00
Martin Edenhofer
13537ebd1f Improved attachment rendering with very long names. 2015-01-29 09:51:13 +01:00
Martin Edenhofer
3d7aeea978 Improved handling with form changes. 2015-01-28 23:55:20 +01:00
Martin Edenhofer
369aa7e52d Added browser test for merge with two open tabs. 2015-01-28 23:47:05 +01:00
Martin Edenhofer
a7a41d201d Added central formDiff() method. Fixed clone() and added tests. 2015-01-28 23:12:16 +01:00
Martin Edenhofer
7f1a68c024 Added even more date/datetime tests. Added support for hidden date fields. 2015-01-28 10:32:22 +01:00
Martin Edenhofer
213ed288be Improved view mode (keep order of attributes). 2015-01-27 23:07:06 +01:00
Martin Edenhofer
82bd74d73d Fixed not moving header in ticket zoom. 2015-01-27 22:34:04 +01:00
Martin Edenhofer
a2255352c8 Wrap very long words in popovers after width limit has reached. 2015-01-27 16:34:25 +01:00
Martin Edenhofer
1e8aaa37a8 Fixed BS .label class. 2015-01-27 16:33:22 +01:00
Martin Edenhofer
f89f6fc47d Fixed html escaping of richtext elements. Move to one column layout. two column was not practical. 2015-01-27 16:13:28 +01:00
Martin Edenhofer
153d325e84 Improved regex. 2015-01-27 09:14:25 +01:00
Martin Edenhofer
5e0ae554f9 Improved input validation. 2015-01-27 08:50:40 +01:00
Martin Edenhofer
47f94c54d6 Improved input validation. 2015-01-27 08:38:17 +01:00
Martin Edenhofer
bc979bbf4a Fixed typo. 2015-01-27 08:13:25 +01:00
Martin Edenhofer
54550e5bf2 Added date widget. 2015-01-26 22:55:23 +01:00
Martin Edenhofer
47a822583a Init version of datetime field. 2015-01-26 11:01:57 +01:00
Martin Edenhofer
538609a9ae Init version of datetime field. 2015-01-26 08:19:10 +01:00
Martin Edenhofer
6823cdf3ee Init version of datetime field. 2015-01-26 07:59:04 +01:00
Martin Edenhofer
eaf2c8334a Init version of datetime field. 2015-01-26 07:55:14 +01:00
rkaldung
e6002ee228 fixed build status link 2015-01-24 22:00:22 +01:00
rkaldung
4b1cfafc01 Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-24 21:25:41 +01:00
Felix Niklas
d09a15e50b new modernizr build without css classes 2015-01-24 16:00:36 +01:00
Martin Edenhofer
7533bdeea5 For firefox lower 35 we need to set a class to hide own dropdown images whole file can be removed after dropping firefox 34 and lower support. 2015-01-24 14:08:54 +01:00
Martin Edenhofer
c873789385 Fixed check if init owner selection of new ticket screen is empty. 2015-01-24 13:51:04 +01:00
Martin Edenhofer
afc241e72a Add email address if not existing to address line. 2015-01-24 11:23:00 +01:00
Martin Edenhofer
84c2452f81 Added check if init owner selection of new ticket screen is empty. 2015-01-24 11:15:52 +01:00
Martin Edenhofer
07824ab633 Improved error handling. 2015-01-24 10:05:02 +01:00
Martin Edenhofer
a18157ba4d Added browser tests for signature. 2015-01-23 23:24:03 +01:00
Felix Niklas
30042e451d hide custom select arrow only in firefox < 35
with the help of some javascript code martin will write :)
2015-01-23 14:37:00 +01:00
Martin Edenhofer
fbba548e0b Removed wrong test. 2015-01-23 11:44:12 +01:00
Martin Edenhofer
b49d087817 Fixed browser test (syntax error in selector). 2015-01-23 11:39:16 +01:00
Martin Edenhofer
37f63cbac3 Centralised ticket form changes observer. 2015-01-23 10:46:17 +01:00
Martin Edenhofer
5132248142 Added layout ref for error. 2015-01-23 10:23:04 +01:00
Felix Niklas
f90915a93a attempt to make the error message look nicer
if this doesn't work because of too long detail texts I'd first try to make them more compat. otherwise we could have toggle-able details like chrome http://cl.ly/image/1u1e1g1f1L2o/Screen%20Shot%202015-01-22%20at%2019.12.58.png
2015-01-22 19:13:38 +01:00
Felix Niklas
ec20859ba0 add cloud, package and list task-icons
and clean up
2015-01-22 15:50:41 +01:00
Martin Edenhofer
218c247478 Fixed form handler with noFieldset param. Browser tests on next commit. 2015-01-22 11:47:11 +01:00
Martin Edenhofer
0e03e6d216 Fixed not needed html encoding in subject of html emails. 2015-01-22 08:17:06 +01:00
Martin Edenhofer
aa51a9a5dc Fixed user who initiate the notification. 2015-01-21 21:45:22 +01:00
Martin Edenhofer
d25591dd48 Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-21 17:20:54 +01:00
Martin Edenhofer
0404fe31ae Improved positioning of notification popover (way done in controller and css with unmodified BS popover.js). 2015-01-21 17:20:34 +01:00
Felix Niklas
8a2d2c9f03 promote modified dot into own rendering plane 2015-01-21 17:18:53 +01:00
Felix Niklas
0d12baf36f fix options button height in Safari 2015-01-21 16:54:09 +01:00
Felix Niklas
36d65462b0 make modified priority animation slightly better 2015-01-21 16:52:16 +01:00
Felix Niklas
72fb2907f3 fix local modal dismiss on click into empty space 2015-01-21 16:41:01 +01:00
Felix Niklas
47910a4ef5 fix justify error 2015-01-21 14:31:50 +01:00
Martin Edenhofer
f55b6c76c7 Syntax error. Workaround for missing class .justify. 2015-01-21 13:35:42 +01:00
Martin Edenhofer
2cd5c4c437 Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-21 13:16:01 +01:00
Martin Edenhofer
aee4c7bf92 Fixed issue to have logo clickable on focused search box. Click on "x" == clock on logo also (because of opacity=0) and will start notification popover. We do not want this. moved logo to layer behind. 2015-01-21 13:15:05 +01:00
Martin Edenhofer
5cb22714db Improved way to set notification popover height. Added immediately set counter to 0 on client side after "mark all as read" click. 2015-01-21 13:12:52 +01:00
Martin Edenhofer
1fd691b9d9 Added search result cache feature. 2015-01-21 13:11:18 +01:00
rkaldung
ee3719ab25 Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-21 11:38:02 +01:00
Felix Niklas
28797b8c8c replace glyphicon edit icon with action button
and make the overview options a local modal
2015-01-21 04:17:33 +01:00
Felix Niklas
77020390ce fix edit customer dropdown in agent new ticket 2015-01-21 00:45:19 +01:00
Martin Edenhofer
8ee9002c33 Improved online notification. Widget should stay open on updates and close after click to an object. 2015-01-21 00:30:19 +01:00
Martin Edenhofer
55fb234e5b Moved back to standard, changes not longer needed because of new online notification controller. 2015-01-21 00:27:50 +01:00
Felix Niklas
f734ed334d fix task loader animation performance
and add new class for round loaders: .loading.dot.icon
2015-01-20 16:44:28 +01:00
Felix Niklas
03e615bcc9 add a shadow on overflowing notifications popover
and fix the title in chrome vs FF
2015-01-20 14:31:05 +01:00
Felix Niklas
3b2ff7103a improve task loading icon performance 2015-01-20 14:16:37 +01:00
Felix Niklas
b3e04d2361 fix loading icons active style in tabs 2015-01-20 13:06:09 +01:00
Felix Niklas
5f502ed27e fix popovers 2015-01-20 12:40:26 +01:00
Martin Edenhofer
5b9cccf3ea Improved test results. 2015-01-20 08:44:53 +01:00
Martin Edenhofer
156b7f905d Improved shown information in popovers. 2015-01-20 08:43:11 +01:00
Martin Edenhofer
ed81a4f7e2 Improved task icon/loading behaviour. 2015-01-20 08:40:58 +01:00
Martin Edenhofer
0740ffdb5d Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-20 08:36:24 +01:00
Martin Edenhofer
043e14e82e min-height & min-width for contenteditable to show placeholder/editable area also on empty content. 2015-01-20 07:45:17 +01:00
Felix Niklas
41662ff369 fix readMore gradient in FF 2015-01-20 02:57:08 +01:00
Felix Niklas
c8a98d37b0 reduce disco 2015-01-20 02:51:52 +01:00
Felix Niklas
cd7b5dd111 restrict popover height 2015-01-20 02:44:40 +01:00
Felix Niklas
6d6631ae2f style notification header 2015-01-20 02:44:40 +01:00
Felix Niklas
749a5c073b document popover enhance.js 2015-01-20 02:44:40 +01:00
Martin Edenhofer
aebb5ad4b4 Added html escaping. 2015-01-20 01:33:49 +01:00
Martin Edenhofer
0879e4e296 Added tests. 2015-01-20 01:33:26 +01:00
Martin Edenhofer
20c5bfd22c Improved text modules. 2015-01-19 23:24:20 +01:00
Martin Edenhofer
bb1c476db1 Improved/fixed use of text modules. 2015-01-19 22:55:38 +01:00
Martin Edenhofer
f672a93001 Improved contentediable. Just rework content on past, not on every key press. 2015-01-18 23:43:16 +01:00
Martin Edenhofer
4d1f55ee6b Implemented "see more" feature. 2015-01-17 16:30:49 +01:00
Martin Edenhofer
c92e4c0f9a Improved style of error messages. 2015-01-17 13:07:51 +01:00
Martin Edenhofer
a400ae3262 Improved split of tickets. 2015-01-17 12:56:24 +01:00
Martin Edenhofer
a25e977edc Show long values in multiple lines. 2015-01-16 17:37:43 +01:00
Martin Edenhofer
ec891bf0cd Show long values in multiple lines. 2015-01-16 17:33:42 +01:00
Felix Niklas
2d37a7421e fix main navigation hover and active state 2015-01-16 13:45:44 +01:00
Felix Niklas
c0c108dba6 fix heigh in reset password in FF
and fix navigation glitch when going back from reset or signup to #login (before that back links went to #/, leading to the sidebar blinking up because of the redirect delay – hardwired them to go back to #login [if there is a nother case to go back to it should be set via js]).
2015-01-16 12:59:33 +01:00
Felix Niklas
749dcdba30 fix FF bug in Ticket Zoom Header
and clean up a bit
2015-01-16 12:41:52 +01:00
Felix Niklas
c593ecf01e add padding to fullscreenMessage
to don't stick to the sides of the content container when the text is long or the container small
2015-01-16 12:40:15 +01:00
Felix Niklas
d4cb8a6b57 adjust error icon size in sidebar tabs 2015-01-15 12:01:17 +01:00
Felix Niklas
592b418473 simplyfy modal.js changes 2015-01-15 12:01:04 +01:00
Felix Niklas
3b85bda73d insufficient rights warning layout reference
hint: use the error class for the icon in the tabs list
2015-01-15 11:19:51 +01:00
Felix Niklas
4e65b331a3 loading ticket screen layout reference 2015-01-15 11:12:02 +01:00
Felix Niklas
0b84217682 add loading icon to loading tabs 2015-01-15 10:58:20 +01:00
Felix Niklas
fe42d16383 add local modal
Usage:

new option "container" [jquery element] (default: body)
if the modal should be local the container should be the content element.

Demo:

Merge Ticket in Ticket Zoom
=> new App.TicketMerge in ticket_zoom.js.coffee:332
2015-01-15 10:07:06 +01:00
Felix Niklas
4efebb9b1d simplyfy Read More 2015-01-15 01:26:19 +01:00
Felix Niklas
df1fd1f646 add article Read More prototype 2015-01-15 01:13:08 +01:00
Felix Niklas
5c14424437 update animation library "velocity" 2015-01-15 01:12:52 +01:00
Felix Niklas
d5419fcf22 add .btn-text style
for pure text buttons (example: "Read More" on articles)
2015-01-15 01:12:26 +01:00
Felix Niklas
a60e8975a0 fix attachment style on blue customer background
- make attachment icon translucend
- make top border translucend
2015-01-15 01:11:47 +01:00
Felix Niklas
7580bc98c2 camelCased textBubble 2015-01-15 01:04:07 +01:00
Martin Edenhofer
14a57f7a12 Added iconTextClass to improve ticket popover. 2015-01-14 23:52:23 +01:00
Felix Niklas
1b1771afd5 format popovers 2015-01-14 23:45:25 +01:00
Felix Niklas
62de61f508 add button active states 2015-01-14 23:45:25 +01:00
Felix Niklas
f9f0da8c27 fix helper-message height 2015-01-14 23:45:25 +01:00
Martin Edenhofer
3247fc32c5 Small visibility improvements. 2015-01-14 23:12:05 +01:00
Martin Edenhofer
7513fd4f8a Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-14 23:08:29 +01:00
Martin Edenhofer
4f31a9a120 Added new ticket state where pending time need to be shown. 2015-01-14 23:07:29 +01:00
Felix Niklas
b4ccb3531d rename organisation -> organization
because we settled on american english
2015-01-14 23:00:51 +01:00
Felix Niklas
1a67de73cf enhance popover behaviour
faster show/hide, no hide when hovering over the popover
2015-01-14 22:59:56 +01:00
Felix Niklas
a3d2f3a768 remove popover priority spacing 2015-01-14 22:23:30 +01:00
Felix Niklas
45d7d58221 rename popover company to organisation 2015-01-14 22:20:40 +01:00
Felix Niklas
2f58fa9b7f make popover titles h3 2015-01-14 22:15:50 +01:00
Felix Niklas
dd048bc02e add button type btn--action 2015-01-14 22:00:43 +01:00
Martin Edenhofer
884616088b Update current task title after ticket loading failed. 2015-01-14 08:49:47 +01:00
Martin Edenhofer
8a885f22ab Improved error handling of 404 or 401 tickets. 2015-01-13 23:06:13 +01:00
Martin Edenhofer
34232f6117 Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-13 22:56:38 +01:00
Martin Edenhofer
0e299ccf5b Improved error handling of 404 or 401 tickets. 2015-01-13 22:55:20 +01:00
Johannes Nickel
b16edda8d4 Merge branch 'develop' of https://github.com/martini/zammad into develop 2015-01-13 22:12:18 +01:00
Johannes Nickel
a06faaebfb updated json response 2015-01-13 22:10:57 +01:00
Martin Edenhofer
c5622e5432 Removed not needed rule. 2015-01-13 17:04:54 +01:00
Martin Edenhofer
f38149e823 Improved comments. 2015-01-13 17:03:58 +01:00
Martin Edenhofer
71d8af7a52 Moved from Marshal to JSON session files. 2015-01-13 15:53:15 +01:00
Martin Edenhofer
4a9a2d8d10 Improved replacing signature. 2015-01-13 08:26:45 +01:00
Felix Niklas
8237c57eff round big smiley icon edges 2015-01-13 02:20:52 +01:00
Felix Niklas
83b4360c36 add a delay to article meta toggle
to allow double click select
its 150ms - maybe we need more. plz test.
but the fewer delay we need the better cause it'll feel snappier.
2015-01-13 02:20:52 +01:00
Martin Edenhofer
e2762d63b3 Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-12 23:17:46 +01:00
Martin Edenhofer
1fdc985816 Added signature support to new and zoom ticket. 2015-01-12 23:15:39 +01:00
Johannes Nickel
20084057cf moved mark as seen to ruby function 2015-01-12 23:13:50 +01:00
Felix Niklas
c67048131c add favicon 2015-01-12 16:38:08 +01:00
Felix Niklas
8d3da7c77d fix extend typo 2015-01-12 16:25:39 +01:00
Felix Niklas
cb13722b7d fix deformed avatar bug in FF 2015-01-12 15:34:28 +01:00
Felix Niklas
ee6e89e3e9 fix light phone cutoff 2015-01-12 15:34:09 +01:00
Felix Niklas
7b62f6cce1 fix article actions order
order after meta-data (test: click on article)
2015-01-12 15:05:17 +01:00
Felix Niklas
b08fe50888 fix inconsistent colours 2015-01-12 14:32:24 +01:00
rkaldung
1c7a23a60b minor fixes 2015-01-12 12:51:27 +01:00
Martin Edenhofer
f4341f5c4b Added dropped test. 2015-01-12 12:06:07 +01:00
Martin Edenhofer
09dca3b50a Improved email parsing, added tests. 2015-01-12 11:55:13 +01:00
Martin Edenhofer
716e428f07 Added prevent default to markAllSeen click. 2015-01-12 09:13:24 +01:00
Martin Edenhofer
02f5cf76df Added :id support to create_or_update method. 2015-01-12 08:31:30 +01:00
Martin Edenhofer
d2170259e5 Improved layout format. 2015-01-12 08:30:43 +01:00
Martin Edenhofer
d65fcc87fe Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-12 08:29:02 +01:00
Martin Edenhofer
8ebd1976f6 Task color is now based on ticket state type, not ticket state. 2015-01-12 01:26:43 +01:00
Johannes Nickel
acbc844600 updated mark all as seen to work properly 2015-01-11 19:18:58 +01:00
Martin Edenhofer
2dc51de404 Remove not needed popovers. 2015-01-11 00:50:59 +01:00
Martin Edenhofer
64bd2ec59d Check if @attributes already exists, just set it if not exists. 2015-01-11 00:44:40 +01:00
Martin Edenhofer
07e5c41092 No z-Index-class for modal is needed in BS 3.3, removed it. 2015-01-10 23:52:42 +01:00
Martin Edenhofer
22bf99da69 Font adjustment (changes from BS 3.3.1). 2015-01-10 22:28:30 +01:00
Martin Edenhofer
21a2cedf83 Upgrade to BS 3.3.1 because of .js issues in 3.2.0. 2015-01-10 21:56:45 +01:00
Martin Edenhofer
b43f9f9164 Cleanup of use of popovers. 2015-01-10 21:39:25 +01:00
Martin Edenhofer
649cf8af10 Reload new files (only if we are in uninstall modus - not on install/upgrade). 2015-01-10 11:13:20 +01:00
Martin Edenhofer
43ec6fd79e Improved constructor. Added default values. 2015-01-10 10:51:22 +01:00
Martin Edenhofer
a36a325fd7 Improved text expression. 2015-01-10 09:49:12 +01:00
Martin Edenhofer
3e2648314d Added more unit tests. 2015-01-09 20:44:04 +01:00
Martin Edenhofer
78dc93c580 Fixed file name. 2015-01-09 14:20:49 +01:00
Martin Edenhofer
39e724ca07 Fixed manipulation of string in html2text. Added unit tests. 2015-01-09 14:17:34 +01:00
Martin Edenhofer
5367c34540 Improved css for html emails. 2015-01-09 12:53:44 +01:00
Martin Edenhofer
61d9f65cf9 Added type cite to blockquote of new tickets. 2015-01-09 02:38:59 +01:00
Martin Edenhofer
128c977db1 Added more examples. 2015-01-09 00:25:54 +01:00
Martin Edenhofer
834fbbb36a Improved html rework. 2015-01-09 00:25:25 +01:00
Martin Edenhofer
6bb1522e29 Improved creating html emails. 2015-01-09 00:01:41 +01:00
Martin Edenhofer
192f4e27df Fixed string reference issue. 2015-01-08 15:55:52 +01:00
Martin Edenhofer
8425316a88 Improved tests. 2015-01-08 15:40:44 +01:00
Martin Edenhofer
a9836b5586 Improved unit tests, merged html2ascii to html2text. 2015-01-08 15:27:44 +01:00
Martin Edenhofer
62fedc8fbd Added unit tests. 2015-01-08 09:26:40 +01:00
Martin Edenhofer
2921ca663f Merge branch 'develop' of github.com:martini/zammad into develop 2015-01-07 22:29:33 +01:00
Martin Edenhofer
b08d495020 Prevent having \n, \r or \t in title or subject. 2015-01-07 22:28:15 +01:00
Johannes Nickel
dc44f9ef5c - add "mark all notifications as seen" to the notification box.
- added translation
- added Info "No Notifications" to the notification box
2015-01-07 21:58:05 +01:00
Martin Edenhofer
beb137a6b8 Improved tests. 2015-01-07 21:42:12 +01:00
Johannes Nickel
c291b70ec2 Changed Migration: InnoDB can't store Indexes over 767 bytes. UTF-8 on MySQL uses 3 byte per char so the max would be: 255 Chars.
The index is not really needed, so I removed it.
2015-01-07 19:23:14 +01:00
Martin Edenhofer
80877854af Improved richtext behaviours in FF. 2015-01-07 15:30:13 +01:00
Martin Edenhofer
b864dd2c45 Fixed non html notifications. 2015-01-07 13:11:30 +01:00
Martin Edenhofer
4d9ff76cff Improve reply behaviour. 2015-01-07 11:05:12 +01:00
Martin Edenhofer
a938618228 Improved handling of autosave. 2015-01-07 08:39:37 +01:00
Martin Edenhofer
12d1da4b65 Fixed inserting of text modules. 2015-01-07 01:25:27 +01:00
Martin Edenhofer
9861978d92 Set text box in ticket create to rich text. 2015-01-07 01:05:41 +01:00
Martin Edenhofer
9da8aeb054 Fixed insert of text modules. 2015-01-07 01:03:18 +01:00
Martin Edenhofer
f88e05e1bb Hide "discard" button right after click. 2015-01-07 00:21:20 +01:00
Martin Edenhofer
64e938b701 Added new test. 2015-01-06 23:52:01 +01:00
Martin Edenhofer
9f9964a938 Added some more tests. 2015-01-06 23:42:49 +01:00
Martin Edenhofer
6b75735c20 Moved to <blockquote> and html emails in notifications. No "> " more needed. 2015-01-06 15:30:00 +01:00
Martin Edenhofer
642b110329 Init version of native contenteditable of browsers for testing. 2015-01-06 15:00:38 +01:00
Martin Edenhofer
7e1e6c6b6e Moved back to quote text on reply. <blockquote> is not working with medium.js. 2015-01-05 23:21:08 +01:00
Martin Edenhofer
c8cf4b6bf8 Use blockquote for cite on messages. 2015-01-05 01:12:52 +01:00
Martin Edenhofer
e780d0d0af Added notification management. 2015-01-05 00:55:48 +01:00
Martin Edenhofer
8a9ddb6d5d Removed empty lines. 2015-01-05 00:54:06 +01:00
Martin Edenhofer
c3b35f406c Improved html templates. 2015-01-04 22:28:58 +01:00
Martin Edenhofer
b531b74bf7 Fixed language change. 2015-01-04 22:17:16 +01:00
Martin Edenhofer
c36993fd18 Fixed wrong test. 2015-01-04 21:31:45 +01:00
Martin Edenhofer
1005219a0b Fixed expected results. 2015-01-04 17:03:43 +01:00
Martin Edenhofer
e5a9dc8b78 Improved notification tests. 2015-01-04 16:39:57 +01:00
Martin Edenhofer
de92c4a816 Improved notification generation (add changed attributes based on object manager settings). 2015-01-04 13:52:14 +01:00
Martin Edenhofer
bf32f09208 Improved code layout. 2015-01-04 13:49:04 +01:00
Martin Edenhofer
c03d1580f0 Moved to html notifications. 2015-01-03 23:53:07 +01:00
Martin Edenhofer
1e69c8f91f Improved notification tests. 2015-01-03 00:46:11 +01:00
Martin Edenhofer
b181f3aa96 Improved update message. 2015-01-02 23:56:32 +01:00
Martin Edenhofer
f4dbcb8d81 Improved code layout. 2015-01-02 23:55:37 +01:00
Martin Edenhofer
39fff0070e Split into separate files. 2015-01-02 23:55:10 +01:00
Martin Edenhofer
506a8575af Improved replacement of notification tags (removed eval), added more tests. 2015-01-02 23:34:37 +01:00
Martin Edenhofer
34f9ec6a66 Small enhancements. 2015-01-02 16:53:59 +01:00
Martin Edenhofer
464673594c Init version of improved notifications. 2015-01-02 16:50:31 +01:00
Martin Edenhofer
ca6f3a806b Improved code layout. 2015-01-02 16:48:28 +01:00
Martin Edenhofer
84b9429c5a Added richtext elements to form tests. 2015-01-02 13:48:13 +01:00
Martin Edenhofer
3a44804c96 Added html quoting, text2html and linkify. 2015-01-02 11:31:52 +01:00
Martin Edenhofer
69420df8a5 Moved from class to module for sending emails. 2015-01-01 01:26:17 +01:00
Martin Edenhofer
465d18141e Fixed typo. 2015-01-01 00:40:17 +01:00
Martin Edenhofer
f91bf9d304 Fixed "empty" global search box on "x". 2015-01-01 00:38:56 +01:00
Martin Edenhofer
47e637b839 Header update on start, needed for safari. 2014-12-31 15:59:46 +01:00
Martin Edenhofer
81fc3969f3 Improved code layout. 2014-12-31 15:07:56 +01:00
Martin Edenhofer
39ec771676 Added existing and permission check for recent viewed. 2014-12-31 14:56:37 +01:00
Martin Edenhofer
4561849bc1 Removed old/not longer needed code. 2014-12-31 13:24:04 +01:00
Martin Edenhofer
22d4da61dd Harmonised urls. 2014-12-31 10:35:38 +01:00
Martin Edenhofer
761fd162bf Do not allow reset password with valid sessions. 2014-12-31 10:27:25 +01:00
Martin Edenhofer
0d9adc0d64 Added browser tests for password reset. 2014-12-31 10:04:14 +01:00
Martin Edenhofer
67b32a0bca Added browser tests for password change. 2014-12-31 00:51:19 +01:00
Martin Edenhofer
35da82aa16 Added even more tests. 2014-12-30 15:08:20 +01:00
Martin Edenhofer
ac3b76fe30 Fixed translation issue. 2014-12-30 13:36:05 +01:00
Martin Edenhofer
af3c8db859 Removed not needed debug info. 2014-12-30 00:33:41 +01:00
Martin Edenhofer
201116bbe0 Removed not needed sign. 2014-12-30 00:31:57 +01:00
Martin Edenhofer
2880ff3baf Added some new tests for html handling. 2014-12-30 00:25:57 +01:00
Martin Edenhofer
8bf6a28781 Improved tests. 2014-12-29 18:21:41 +01:00
Martin Edenhofer
6de94974a5 Added initial email build tests. 2014-12-29 16:39:59 +01:00
Martin Edenhofer
4f98f39211 Introduced App.Utils class. 2014-12-29 13:59:16 +01:00
Martin Edenhofer
52de425e0c Streamline of naming for html messages/attachments. 2014-12-29 11:27:59 +01:00
Martin Edenhofer
e6ab57f97c Moved to ruby 2.1.5. 2014-12-29 09:53:21 +01:00
Martin Edenhofer
9000c3b00e Moved to ruby 2.1.5. 2014-12-29 09:31:44 +01:00
Martin Edenhofer
e4de2f8dee Do not show text alternative attachments (already shown in view). Add html alternative attachments only one. 2014-12-29 00:11:37 +01:00
Martin Edenhofer
80ed5a3331 Added new test case. 2014-12-28 23:27:53 +01:00
Martin Edenhofer
aa357f3531 Break words in overflow of text bubbles. 2014-12-28 20:07:33 +01:00
Martin Edenhofer
c7c565425a Improved formatting of text messages. 2014-12-28 20:06:47 +01:00
Martin Edenhofer
76adce246a Medium-placeholder fix + set margin of .text-bubble p to 0. 2014-12-28 19:55:10 +01:00
Martin Edenhofer
4d61369476 Show whole recipient list. 2014-12-28 19:54:16 +01:00
Martin Edenhofer
6de7d6dcad Improved format of contenteditable. 2014-12-28 19:35:20 +01:00
Martin Edenhofer
9f97c3af34 Moved to new attachment view. 2014-12-28 16:28:52 +01:00
Martin Edenhofer
8247cdbf51 Add richtext feature to popovers. 2014-12-28 14:57:37 +01:00
Martin Edenhofer
24b80de0ea Change position of discard button. 2014-12-28 14:07:27 +01:00
Martin Edenhofer
cb7b79eb2d Improved notification lib. 2014-12-28 14:02:23 +01:00
Martin Edenhofer
912ce3fa7b Improved code layout. 2014-12-28 00:00:59 +01:00
Martin Edenhofer
e9915e5bc8 Added new generic view. 2014-12-27 23:51:57 +01:00
Martin Edenhofer
b1792c3742 Added jobs controller. 2014-12-27 22:01:09 +01:00
Martin Edenhofer
0d15371e53 Fixed timeout params. 2014-12-27 21:38:13 +01:00
Martin Edenhofer
a3456f7e9c Moved location of fonts to static assets. 2014-12-27 20:29:11 +01:00
Martin Edenhofer
d574a5164b Moved ticket_hook_position per default to left (be more human). 2014-12-27 17:35:00 +01:00
Martin Edenhofer
80307158b6 Improved sending emails. 2014-12-27 16:25:58 +01:00
Martin Edenhofer
b582794ea7 Added support of html emails. 2014-12-27 15:07:49 +01:00
Martin Edenhofer
cfc06fe1a8 Added content_type to ticket_articles. 2014-12-27 14:10:09 +01:00
Martin Edenhofer
f8340b3b3b Added content_type to ticket_articles. 2014-12-27 00:21:28 +01:00
Martin Edenhofer
4c370451d8 Init version of scheduler. 2014-12-26 00:44:25 +01:00
Martin Edenhofer
7870d501f7 Improved error handling. 2014-12-26 00:42:59 +01:00
Martin Edenhofer
c033edcc6e Improved code layout. 2014-12-26 00:42:20 +01:00
Martin Edenhofer
51d485670e Init version of scheduler. 2014-12-26 00:41:00 +01:00
Martin Edenhofer
32d404def9 Changed default live reload port (to be able to have several live reload instances working at same time). 2014-12-22 13:37:34 +01:00
Thorsten Eckel
28f1baa051 Improved wording. 2014-12-18 16:24:09 +01:00
Thorsten Eckel
74a179b3c4 Added Swagger YARD doc for user history get. 2014-12-18 16:12:36 +01:00
Thorsten Eckel
cdaed6d045 Improved wording. 2014-12-18 16:03:55 +01:00
Thorsten Eckel
441108def8 Fixed doc format. 2014-12-18 16:03:19 +01:00
Thorsten Eckel
565058f1b1 Added example Swagger YARD doc to User controller. 2014-12-18 15:59:45 +01:00
Thorsten Eckel
ba02cb90dc Added example YARD doc to User model. 2014-12-18 15:58:47 +01:00
Felix Niklas
61a791e837 fix layout issues at login page
new stucture:
  .fullscreen > .fullscreen-center > .fullscreen-content
2014-12-18 12:25:56 +01:00
Martin Edenhofer
d7dd63ae4a Added timeout options for Faraday. 2014-12-18 08:40:38 +01:00
Martin Edenhofer
d6ebe079e6 Improved ticket title behaviour. 2014-12-17 23:02:09 +01:00
Martin Edenhofer
da06ddaa63 Merged several migrations. 2014-12-17 22:59:03 +01:00
Martin Edenhofer
37f421a4e5 Merged several migrations. 2014-12-17 21:39:28 +01:00
Martin Edenhofer
761cd4253a Merged several migrations. 2014-12-17 21:19:47 +01:00
Martin Edenhofer
5500219c68 Removed duplicate tables. 2014-12-17 16:42:52 +01:00
Martin Edenhofer
6e37f4a2a6 Merged several migrations. 2014-12-17 16:40:59 +01:00
Martin Edenhofer
2e8b0469f0 Merged several migrations. 2014-12-17 16:19:18 +01:00
Martin Edenhofer
646e4172a1 Show richtext also if not filled. 2014-12-17 14:25:34 +01:00
Martin Edenhofer
f89c91dcaf Show richtext also if not filled. 2014-12-17 14:15:23 +01:00
Martin Edenhofer
bc42f7fbb1 Reworked object manager migrations. 2014-12-17 14:00:25 +01:00
Martin Edenhofer
7e3e4f7799 Fixed zindex. 2014-12-17 13:58:46 +01:00
Martin Edenhofer
303cc0f9fe Removed autofocus on placeholders. 2014-12-17 13:58:23 +01:00
Martin Edenhofer
406eae642d Improved contenteditabe for user and org attributes. 2014-12-17 13:57:55 +01:00
Martin Edenhofer
449f0a69c4 Merge branch 'develop' of github.com:martini/zammad into develop 2014-12-16 19:46:39 +01:00
Martin Edenhofer
1eb1a7e8f8 Fixed show actions in sidebar. 2014-12-16 19:45:11 +01:00
Felix Niklas
20caa7164d fix alignment bug in user and org profile 2014-12-16 16:54:13 +01:00
Felix Niklas
123e628c19 make scrollHeader fully dissapear
by using scroll offset of the scroll parent (previously the headers bottom border was still visible because it only scrolled up 62px instead its full height of 64px)
2014-12-16 15:35:49 +01:00
Felix Niklas
3793c85a0e fix Syle of dropdown element in FF29 an later
- remove custom dropdown arrow in firefox because it's too complicated to hide the native one (in other browsers its one line of css)
- make the dropdown arrow click-through so that one can click it to show the dropdown
2014-12-16 15:20:06 +01:00
Felix Niklas
7c135d690e QA improvement of tabs with small width 2014-12-16 15:11:49 +01:00
Felix Niklas
fd34985344 fix tabsSidebar height & padding 2014-12-16 15:07:50 +01:00
Martin Edenhofer
fda6fa30f1 Updated zindex for scroll page header. 2014-12-15 23:26:25 +01:00
Martin Edenhofer
3ccff4401e Added current value to selection. 2014-12-15 23:11:48 +01:00
Martin Edenhofer
9997513671 Fixed zindex. 2014-12-15 23:10:38 +01:00
Martin Edenhofer
6491d18f34 Moved to easier page header show/hide implementation of long pages. 2014-12-15 21:02:53 +01:00
Martin Edenhofer
6ce75e975e Added scroll to plugin to scroll to given selector. 2014-12-15 20:58:59 +01:00
Martin Edenhofer
90757d0128 Small improvements. 2014-12-14 20:18:54 +01:00
Martin Edenhofer
575a29dee5 Next step of email reply. 2014-12-14 20:18:00 +01:00
Martin Edenhofer
1d520f3b47 Improved handling of closing browser windows. 2014-12-14 14:13:46 +01:00
Martin Edenhofer
a00410758a Added hotmail/outlook support for probing. 2014-12-11 11:44:23 +01:00
Martin Edenhofer
acafc33800 Reenabled temp. recipient options in edit. 2014-12-09 22:24:59 +01:00
Martin Edenhofer
93ac78e8e9 Remove debug. 2014-12-09 22:22:31 +01:00
Martin Edenhofer
5852bcb142 Improved memory management on many objects. 2014-12-09 20:11:25 +01:00
Martin Edenhofer
a83c4e99a9 Improved tests. 2014-12-09 20:10:38 +01:00
Martin Edenhofer
89781db7c6 Merge branch 'develop' of github.com:martini/zammad into develop 2014-12-09 12:42:55 +01:00
Martin Edenhofer
fc5fb2163d Removed not needed debug info. 2014-12-09 11:42:04 +01:00
Martin Edenhofer
78df419d8a Removed version of v8. 2014-12-09 11:41:34 +01:00
Martin Edenhofer
746e508cdd Added missing translations. 2014-12-09 11:41:16 +01:00
Martin Edenhofer
ff26230c76 Added es config. 2014-12-09 11:32:10 +01:00
Martin Edenhofer
f57383436f Improved error handling. 2014-12-09 11:31:50 +01:00
Martin Edenhofer
9d53f977e5 Removed not needed css. 2014-12-09 11:31:15 +01:00
Felix Niklas
78b05a3bed remove pointer events on the invisible tabsSidebar
so that it doesn't block the scrollbar
2014-12-09 11:26:16 +01:00
Felix Niklas
74e8cb5eae fix scrollPageHeader zIndex to be behind modals 2014-12-09 11:25:45 +01:00
Felix Niklas
36d3c32d24 fix firefox flex bug in ticket zoom 2014-12-09 11:12:51 +01:00
Martin Edenhofer
252e987e72 Removed ascii2html(). 2014-12-08 12:36:34 +01:00
Martin Edenhofer
c5bb0f4393 Moved to jquery 1.11.2, moved to medium.js improved browser tests. 2014-12-08 10:39:05 +01:00
Martin Edenhofer
0fcfca12e9 Removed not needed proxies. 2014-12-06 09:20:17 +01:00
Martin Edenhofer
6fe045924d Catch input directly, open pulldown later. 2014-12-04 21:40:12 +01:00
Martin Edenhofer
7460980545 Small adjustments. 2014-12-04 20:40:57 +01:00
Martin Edenhofer
0852e62786 Upgrade to rails 4.1.8. 2014-12-04 20:39:34 +01:00
Martin Edenhofer
4847d68687 Improved selectors. 2014-12-03 21:29:33 +01:00
Martin Edenhofer
0165ec8f72 Performance enhancement on input fields (only by single command). 2014-12-03 19:53:42 +01:00
Martin Edenhofer
72e2a73f63 Improved error handling. 2014-12-03 13:45:59 +01:00
Martin Edenhofer
776e60f3a2 Timing enhancements. 2014-12-03 11:01:04 +01:00
Martin Edenhofer
1d162c5da3 Small improvements. 2014-12-03 08:13:35 +01:00
Martin Edenhofer
c403a5e82c Improved text module selection. 2014-12-03 00:55:51 +01:00
Martin Edenhofer
04a6900bbe Improved selectors. 2014-12-02 23:20:53 +01:00
Martin Edenhofer
d71d47255b Improved customer selection. 2014-12-02 22:34:46 +01:00
Martin Edenhofer
403913f404 Improved error handling. 2014-12-02 14:07:35 +01:00
Martin Edenhofer
ec1b1522a0 Improved user selection. 2014-12-02 13:23:22 +01:00
Martin Edenhofer
81fbb8a89f Improved style of tabs in tiny width. 2014-12-02 10:51:15 +01:00
Martin Edenhofer
f81ac8fc74 Improved timings. 2014-12-02 08:41:22 +01:00
Martin Edenhofer
865f70ecda Support new ui selectors. 2014-12-02 08:22:26 +01:00
Martin Edenhofer
26c9115875 Removed not needed checks. 2014-12-01 22:57:55 +01:00
Martin Edenhofer
1d929159ba Let browser tests dance again. 2014-12-01 21:04:37 +01:00
Martin Edenhofer
df6c2d1132 Fixed not loaded ticket stats on object reload. 2014-12-01 19:18:15 +01:00
Martin Edenhofer
e11f82f7d2 Fixed test helper. 2014-12-01 13:18:08 +01:00
Martin Edenhofer
19bb9415ed Do not lookup avatars on import. 2014-12-01 13:06:47 +01:00
Martin Edenhofer
e991dd067b Moved twitter to integration tests. 2014-12-01 13:06:15 +01:00
Martin Edenhofer
b316e24660 Removed not needed code. 2014-12-01 12:45:56 +01:00
Martin Edenhofer
cceafe906f Fixed twitter integration. 2014-12-01 11:24:07 +01:00
Martin Edenhofer
0f5b98221a Fixed pushing of objects with associations (did not push associations). 2014-12-01 11:03:26 +01:00
Martin Edenhofer
aed7e70179 Added multi avatar support. 2014-12-01 08:32:35 +01:00
Martin Edenhofer
2c25123824 Improved error handling. 2014-11-25 07:51:45 +01:00
Martin Edenhofer
697db3839f Improved otrs import. 2014-11-25 00:31:16 +01:00
Martin Edenhofer
6d49496446 Added system settings to import. 2014-11-23 14:01:08 +01:00
Martin Edenhofer
e10552c361 Make static assets working on production env. Do not use asset pipeline for static assets. 2014-11-23 09:44:24 +01:00
Martin Edenhofer
8883c74a8f Improve performance of import mode. 2014-11-21 19:31:28 +01:00
Martin Edenhofer
8a5de1463a Improved importer. 2014-11-21 00:58:37 +01:00
Martin Edenhofer
971e32d0e6 Updated new image md5 sums. 2014-11-20 23:04:48 +01:00
Martin Edenhofer
ec7a68f71b Updated new image md5 sums. 2014-11-20 22:46:32 +01:00
Martin Edenhofer
d401f652c7 Updated to new css. 2014-11-20 22:25:11 +01:00
Martin Edenhofer
ff47b7f707 Added setting for system_online_service to check if it's used in hosted mode. 2014-11-20 17:04:31 +01:00
Felix Niklas
46b6d0de08 slightly adjust login font color 2014-11-20 10:39:20 +01:00
Felix Niklas
caf054bd8f fatter logotype for the login footer 2014-11-20 10:37:30 +01:00
Martin Edenhofer
f22386484a Improved logo upload. 2014-11-20 08:44:50 +01:00
Martin Edenhofer
9a40983bb1 Improved now logo selection. 2014-11-19 23:45:37 +01:00
Martin Edenhofer
8c62c7cb32 Needed to use png for logo because of transparency. 2014-11-19 23:27:47 +01:00
Martin Edenhofer
8636466f87 Improved logo upload. Also show logo at login page. 2014-11-19 23:22:13 +01:00
Martin Edenhofer
4f74a73017 Increased gravatar image size to 160 px. 2014-11-19 20:41:56 +01:00
Martin Edenhofer
7e9f246ee7 Some small setup improvements. 2014-11-18 22:09:01 +01:00
Martin Edenhofer
006e28d95b Added some comments. 2014-11-18 15:52:19 +01:00
Martin Edenhofer
fe4e5354fc Improved "watch_for" with timeout option. 2014-11-18 15:51:44 +01:00
Martin Edenhofer
48156373a9 Fixed used variables for basic_auth. 2014-11-18 15:50:44 +01:00
Martin Edenhofer
c3c5e91e81 Improved mailbox setup/auto detection. 2014-11-18 12:51:35 +01:00
Felix Niklas
965d4538ab fix wizard-controls placement (sibling of wizbody) 2014-11-17 16:08:42 +01:00
Felix Niklas
d08061a05c fix getstarted window padding 2014-11-17 16:08:24 +01:00
Martin Edenhofer
709a5666cd Remove login notify. 2014-11-17 12:00:52 +01:00
Martin Edenhofer
b726e6a255 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/assets/javascripts/app/views/login.jst.eco
2014-11-17 11:49:25 +01:00
Martin Edenhofer
0415a8a298 First version of showing uploaded logo. Need to be improved. 2014-11-17 11:39:35 +01:00
Martin Edenhofer
0dd1ed5d6e Fixed typo. 2014-11-17 11:37:48 +01:00
Martin Edenhofer
851f0ef912 Fixed several small bugs. 2014-11-17 11:35:36 +01:00
Felix Niklas
5c88907e56 ticket zoom: make title into dropdown-toggle 2014-11-17 11:13:44 +01:00
Felix Niklas
09b0ef24db add powered by Zammad 2014-11-17 10:54:40 +01:00
Felix Niklas
92fe67278c make logo on dark full white 2014-11-17 10:54:10 +01:00
Felix Niklas
a2906fef89 adjust company logo to fit into 200x100 px 2014-11-17 10:30:03 +01:00
Felix Niklas
a737b2454a fix logo preview cross browser 2014-11-17 10:29:50 +01:00
Martin Edenhofer
4557979d6f Improved selector. 2014-11-17 00:49:01 +01:00
Martin Edenhofer
876c4e2bb7 Reenabled tests. 2014-11-17 00:46:39 +01:00
Martin Edenhofer
000d9f8500 Merge branch 'develop' of github.com:martini/zammad into develop 2014-11-16 23:47:54 +01:00
Martin Edenhofer
be8280c1b1 New version of setup wizard. 2014-11-16 23:45:57 +01:00
Felix Niklas
18cd0a0c93 add bookmark button
filled: .filled.bookmark.icon
empty: .bookmark.icon

We need to store the bookmark settings per user.
2014-11-16 22:01:55 +01:00
Felix Niklas
7242581723 render ticket list <ol> only if list is not empty 2014-11-15 17:19:40 +01:00
Felix Niklas
f4c97de9e7 pixel pushing in the profile > member section 2014-11-15 17:15:39 +01:00
Felix Niklas
177dc4464b format sidebar info, style orga member section
create .sidebar-block for generic sidebar blocks
2014-11-15 17:05:03 +01:00
Felix Niklas
00a3536740 add logo placeholder 2014-11-15 15:55:35 +01:00
Felix Niklas
aeebeda2e3 improve logo upload 2014-11-15 14:28:52 +01:00
Martin Edenhofer
8f6abe0cf8 Fixed variables. 2014-11-15 14:00:37 +01:00
Martin Edenhofer
bd74a67425 Merge branch 'develop' of github.com:martini/zammad into develop 2014-11-15 14:00:00 +01:00
Martin Edenhofer
8b61ac1403 Try to improved logo upload. 2014-11-15 13:59:05 +01:00
Felix Niklas
9a5ee2be25 fix form-control border 2014-11-15 13:44:13 +01:00
Martin Edenhofer
f116ac34bc Applied labels to org side bar. 2014-11-15 08:30:03 +01:00
Martin Edenhofer
bf028a16f0 Label can be translated normally. 2014-11-15 08:29:26 +01:00
Martin Edenhofer
3867374c98 Applied new layout options. 2014-11-15 08:28:21 +01:00
Felix Niklas
62d92ef630 ticketZoom attributeBar animation 2014-11-14 16:44:59 +01:00
Felix Niklas
3b0c5696a1 make sidebar form changed state visible
and prepare for the save button at the bottom of the page
2014-11-14 15:37:14 +01:00
Felix Niklas
c14a7a07d9 format sidebar actions 2014-11-14 14:26:02 +01:00
Felix Niklas
21b198c8e5 adjust organization profile to new changes 2014-11-14 13:55:24 +01:00
Felix Niklas
9365dd95e5 add new Zammad logo 2014-11-14 12:55:43 +01:00
Felix Niklas
b59faacd49 sharpen label font 2014-11-14 11:18:19 +01:00
Felix Niklas
2c395afcb6 add setup wizard layout reference 2014-11-14 11:15:08 +01:00
Felix Niklas
b101c03eb6 add alert styles and layout_ref content demo 2014-11-14 11:15:07 +01:00
Felix Niklas
54fe28d6b6 add zammad logo for dark backgrounds 2014-11-14 11:15:07 +01:00
Felix Niklas
e07b61c2c8 combine auth provider icons and add mail 2014-11-14 11:15:07 +01:00
Martin Edenhofer
6f4511967f Init version of integration tests. 2014-11-14 07:42:39 +01:00
Martin Edenhofer
27885a097e Improved code layout. 2014-11-14 02:48:30 +01:00
Martin Edenhofer
be5e0b1a5c Improved required version. 2014-11-14 00:48:29 +01:00
Martin Edenhofer
f2d32ed52c Moved back to mail 2.5 because of errors on mail 2.6. 2014-11-14 00:02:25 +01:00
Martin Edenhofer
2eb413dfd0 Import also organisations and group permissions of agents. 2014-11-13 22:22:08 +01:00
Martin Edenhofer
9fd93852c2 Do not use git version. 2014-11-13 21:03:29 +01:00
Martin Edenhofer
506c04477d Moved to rails 4.1.7. 2014-11-13 17:52:45 +01:00
Martin Edenhofer
8bcdfdef65 Improved tab wording. 2014-11-12 13:53:36 +01:00
Martin Edenhofer
201638724a Added tab actions to tab header. 2014-11-12 13:49:39 +01:00
Martin Edenhofer
71dd5bb406 Added avatar to member list. 2014-11-12 13:48:41 +01:00
Martin Edenhofer
b09de6aec9 Added Tiki if no open but closed tickets exist. 2014-11-11 23:34:51 +01:00
Martin Edenhofer
2c1d018faf Improved demo. 2014-11-11 23:33:27 +01:00
Felix Niklas
027b25ae0d organization profile & no ticket placeholder 2014-11-11 08:53:47 +01:00
Martin Edenhofer
25516c19f6 Improved App.Collection.loadAssets() 2014-11-11 01:07:01 +01:00
Martin Edenhofer
79470e8ca5 Fixed unit tests. 2014-11-10 21:34:15 +01:00
Martin Edenhofer
4cbdbc79c0 Improved load() and reset() assets/collections. Just refresh newer objects, ignore older or same objects. 2014-11-10 20:44:38 +01:00
Martin Edenhofer
6bc7dd9b2e Fixed unit tests. 2014-11-10 20:14:48 +01:00
Martin Edenhofer
f175f5aaea Moved to generic actions. 2014-11-10 19:49:45 +01:00
Martin Edenhofer
80ea7e5337 Fixed unit tests. 2014-11-10 19:47:04 +01:00
Martin Edenhofer
7af8ec2679 Merge branch 'develop' of github.com:martini/zammad into develop
Conflicts:
	app/assets/javascripts/app/views/widget/ticket_stats.jst.eco
2014-11-10 13:57:12 +01:00
Martin Edenhofer
fbbffbbb7b Improved show/hide behaviour. 2014-11-10 13:53:01 +01:00
Martin Edenhofer
3a4d4f9375 Improved show/hide behaviour. 2014-11-10 13:52:21 +01:00
Felix Niklas
a000655ea4 rename zoom to profile for users and organizations 2014-11-10 12:09:01 +01:00
Martin Edenhofer
88ef274c63 Added total count of user/org tickets to tabs. 2014-11-10 08:39:52 +01:00
Martin Edenhofer
7b4015179f New user and org zoom. 2014-11-10 08:34:20 +01:00
Martin Edenhofer
c3025f87c3 Init version of user zoom. 2014-11-10 00:42:17 +01:00
Thorsten Eckel
acd7d5c52c Increased performance on POP3 verify. 2014-11-09 21:18:13 +01:00
Thorsten Eckel
5dbe603a5a Fixed bug: Added missing 'verify_string' parameter. 2014-11-09 21:17:14 +01:00
Thorsten Eckel
fb8f2799ff Increased performance on IMAP verify. 2014-11-09 21:10:23 +01:00
Felix Niklas
3698bb24c5 userZoom layout reference 2014-11-07 14:37:02 +01:00
Martin Edenhofer
cfd5b52fb9 Small improvements. 2014-11-07 01:08:04 +01:00
Martin Edenhofer
1167f7a457 Fixed ticket create screens. 2014-11-07 00:37:05 +01:00
Martin Edenhofer
9112850983 Removed unused attributes. 2014-11-07 00:30:36 +01:00
Martin Edenhofer
47babce2f7 Small improvements. 2014-11-06 23:56:01 +01:00
Martin Edenhofer
caaad57691 Only use activity log after system init is done. 2014-11-06 23:54:34 +01:00
Martin Edenhofer
0b76a38fe3 Removed not needed reset of assets. 2014-11-06 22:46:41 +01:00
Martin Edenhofer
8fd321e6b8 Moved location of font css file to get path working correctly in prod env. 2014-11-06 22:44:44 +01:00
4180 changed files with 525615 additions and 120574 deletions

44
.codeclimate.yml Normal file
View File

@@ -0,0 +1,44 @@
---
engines:
brakeman:
enabled: true
bundler-audit:
enabled: true
csslint:
enabled: true
coffeelint:
enabled: true
duplication:
enabled: true
config:
languages:
- ruby
- javascript
eslint:
enabled: true
fixme:
enabled: true
phpmd:
enabled: false
rubocop:
enabled: true
ratings:
paths:
- Gemfile.lock
- "**.erb"
- "**.haml"
- "**.rb"
- "**.rhtml"
- "**.slim"
- "**.css"
- "**.coffee"
- "**.inc"
- "**.js"
- "**.jsx"
- "**.module"
exclude_paths:
- config/
- db/
- script/
- test/
- vendor/

2
.csslintrc Normal file
View File

@@ -0,0 +1,2 @@
--exclude-exts=.min.css
--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes

12
.editorconfig Normal file
View File

@@ -0,0 +1,12 @@
# http://editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false

1
.eslintignore Normal file
View File

@@ -0,0 +1 @@
**/*{.,-}min.js

212
.eslintrc Normal file
View File

@@ -0,0 +1,212 @@
ecmaFeatures:
modules: true
jsx: true
env:
amd: true
browser: true
es6: true
jquery: true
node: true
# http://eslint.org/docs/rules/
rules:
# Possible Errors
comma-dangle: [2, never]
no-cond-assign: 2
no-console: 0
no-constant-condition: 2
no-control-regex: 2
no-debugger: 2
no-dupe-args: 2
no-dupe-keys: 2
no-duplicate-case: 2
no-empty: 2
no-empty-character-class: 2
no-ex-assign: 2
no-extra-boolean-cast: 2
no-extra-parens: 0
no-extra-semi: 2
no-func-assign: 2
no-inner-declarations: [2, functions]
no-invalid-regexp: 2
no-irregular-whitespace: 2
no-negated-in-lhs: 2
no-obj-calls: 2
no-regex-spaces: 2
no-sparse-arrays: 2
no-unexpected-multiline: 2
no-unreachable: 2
use-isnan: 2
valid-jsdoc: 0
valid-typeof: 2
# Best Practices
accessor-pairs: 2
block-scoped-var: 0
complexity: [2, 6]
consistent-return: 0
curly: 0
default-case: 0
dot-location: 0
dot-notation: 0
eqeqeq: 2
guard-for-in: 2
no-alert: 2
no-caller: 2
no-case-declarations: 2
no-div-regex: 2
no-else-return: 0
no-labels: 2
no-empty-pattern: 2
no-eq-null: 2
no-eval: 2
no-extend-native: 2
no-extra-bind: 2
no-fallthrough: 2
no-floating-decimal: 0
no-implicit-coercion: 0
no-implied-eval: 2
no-invalid-this: 0
no-iterator: 2
no-lone-blocks: 2
no-loop-func: 2
no-magic-number: 0
no-multi-spaces: 0
no-multi-str: 0
no-native-reassign: 2
no-new-func: 2
no-new-wrappers: 2
no-new: 2
no-octal-escape: 2
no-octal: 2
no-proto: 2
no-redeclare: 2
no-return-assign: 2
no-script-url: 2
no-self-compare: 2
no-sequences: 0
no-throw-literal: 0
no-unused-expressions: 2
no-useless-call: 2
no-useless-concat: 2
no-void: 2
no-warning-comments: 0
no-with: 2
radix: 2
vars-on-top: 0
wrap-iife: 2
yoda: 0
# Strict
strict: 0
# Variables
init-declarations: 0
no-catch-shadow: 2
no-delete-var: 2
no-label-var: 2
no-shadow-restricted-names: 2
no-shadow: 0
no-undef-init: 2
no-undef: 0
no-undefined: 0
no-unused-vars: 0
no-use-before-define: 0
# Node.js and CommonJS
callback-return: 2
global-require: 2
handle-callback-err: 2
no-mixed-requires: 0
no-new-require: 0
no-path-concat: 2
no-process-exit: 2
no-restricted-modules: 0
no-sync: 0
# Stylistic Issues
array-bracket-spacing: 0
block-spacing: 0
brace-style: 0
camelcase: 0
comma-spacing: 0
comma-style: 0
computed-property-spacing: 0
consistent-this: 0
eol-last: 0
func-names: 0
func-style: 0
id-length: 0
id-match: 0
indent: 0
jsx-quotes: 0
key-spacing: 0
linebreak-style: 0
lines-around-comment: 0
max-depth: 0
max-len: 0
max-nested-callbacks: 0
max-params: 0
max-statements: [2, 30]
new-cap: 0
new-parens: 0
newline-after-var: 0
no-array-constructor: 0
no-bitwise: 0
no-continue: 0
no-inline-comments: 0
no-lonely-if: 0
no-mixed-spaces-and-tabs: 0
no-multiple-empty-lines: 0
no-negated-condition: 0
no-nested-ternary: 0
no-new-object: 0
no-plusplus: 0
no-restricted-syntax: 0
no-spaced-func: 0
no-ternary: 0
no-trailing-spaces: 0
no-underscore-dangle: 0
no-unneeded-ternary: 0
object-curly-spacing: 0
one-var: 0
operator-assignment: 0
operator-linebreak: 0
padded-blocks: 0
quote-props: 0
quotes: 0
require-jsdoc: 0
semi-spacing: 0
semi: 0
sort-vars: 0
space-after-keywords: 0
space-before-blocks: 0
space-before-function-paren: 0
space-before-keywords: 0
space-in-parens: 0
space-infix-ops: 0
space-return-throw-case: 0
space-unary-ops: 0
spaced-comment: 0
wrap-regex: 0
# ECMAScript 6
arrow-body-style: 0
arrow-parens: 0
arrow-spacing: 0
constructor-super: 0
generator-star-spacing: 0
no-arrow-condition: 0
no-class-assign: 0
no-const-assign: 0
no-dupe-class-members: 0
no-this-before-super: 0
no-var: 0
object-shorthand: 0
prefer-arrow-callback: 0
prefer-const: 0
prefer-reflect: 0
prefer-spread: 0
prefer-template: 0
require-yield: 0

52
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,52 @@
<!--
Hi there - thanks for filing an issue. Please ensure the following things before creating an issue - thank you! 🤓
Since november 15th we handle all requests, except real bugs, at our community board.
Full explanation: https://community.zammad.org/t/major-change-regarding-github-issues-community-board/21
Please post:
- Feature requests
- Development questions
- Technical questions
on the board -> https://community.zammad.org !
If you think you hit a bug, please continue:
- Search existing issues and the CHANGELOG.md for your issue - there might be a solution already
- Make sure to use the latest version of Zammad if possible
- Add the `log/production.log` file from your system. Attention: Make sure no confidential data is in it!
- Please write the issue in english
- Don't remove the template - otherwise we will close the issue without further comments
- Ask questions about Zammad configuration and usage at our mailinglist. See: https://zammad.org/participate
Note: We always do our best. Unfortunately, sometimes there are too many requests and we can't handle everything at once. If you want to prioritize/escalate your issue, you can do so by means of a support contract (see https://zammad.com/pricing#selfhosted).
* The upper textblock will be removed automatically when you submit your issue *
-->
### Infos:
* Used Zammad version:
* Installation method (source, package, ..):
* Operating system:
* Database + version:
* Elasticsearch version:
* Browser + version:
### Expected behavior:
*
### Actual behavior:
*
### Steps to reproduce the behavior:
*
Yes I'm sure this is a bug and no feature request or a general question.

11
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,11 @@
<!--
Hi there - a lot of love for starting a Pull Request 😍. Please ensure the following things before creation - thank you!
- Create your Pull Request against the develop branch. We don't accept changes to stable branches.
- Add a reference to the issue you are trying to fix. Just add a # and the number.
- Don't run `bundle update`. It's a honorable thought of you but some dependency versions (e.g. pg) are broken 😢 Just use `bundle install` if you introduce new dependencies instead.
- Run `rubocop` and `coffeelint` on your changes to respect the code style guide.
- Add tests for your changes. Feel free to ask for support. We are happy to help you.
* The upper textblock will be removed automatically when you submit your Pull Request *
-->

43
.github/ci.sh vendored Executable file
View File

@@ -0,0 +1,43 @@
#!/usr/bin/env bash
#
# install & unit test zammad
#
set -o errexit
set -o pipefail
# install build dependencies
sudo apt-get update
sudo apt-get install -y --no-install-recommends autoconf automake autotools-dev bison build-essential curl git-core libffi-dev libgdbm-dev libgmp-dev libmariadbclient-dev-compat libncurses5-dev libreadline-dev libsqlite3-dev libssl-dev libtool libxml2-dev libxslt1-dev libyaml-0-2 libyaml-dev patch pkg-config postfix sqlite3 zlib1g-dev libimlib2 libimlib2-dev
# create db config
DB_CONFIG="test:\n adapter: postgresql\n database: zammad_test\n host: 127.0.0.1\n port: DB_PORT\n pool: 50\n timeout: 5000\n encoding: utf8\n username: DB_USERNAME\n password: DB_PASSWORD"
if [ "${ZAMMAD_DBS}" == "mysql" ]; then
DB_ADAPTER="mysql2"
DB_USERNAME="root"
DB_PASSWORD="password"
DB_PORT="13306"
INSTALL_OPTION="postgres"
elif [ "${ZAMMAD_DBS}" == "postgresql" ]; then
DB_ADAPTER="postgresql"
DB_USERNAME="postgres"
DB_PASSWORD="postgres"
DB_PORT="5432"
INSTALL_OPTION="mysql"
fi
echo -e "${DB_CONFIG}" | sed -e "s/adapter: postgresql/adapter: ${DB_ADAPTER}/g" -e "s/DB_USERNAME/${DB_USERNAME}/g" -e "s/DB_PASSWORD/${DB_PASSWORD}/g" -e "s/DB_PORT/${DB_PORT}/g" > config/database.yml
# install zammad
gem install bundler:1.7.3
bundle install --without "${INSTALL_OPTION}"
# unit tests
bundle exec rubocop
bundle exec rake zammad:db:init
bundle exec rspec -t ~type:system -t ~searchindex
bundle exec rake zammad:db:reset
bundle exec rake test:units
ruby -I test/ test/integration/object_manager_test.rb
ruby -I test/ test/integration/package_test.rb

39
.github/docker-image-build.sh vendored Executable file
View File

@@ -0,0 +1,39 @@
#!/usr/bin/env bash
#
# build zammads docker & docker-compose images
set -o errexit
set -o pipefail
DOCKER_REGISTRY="index.docker.io"
REPO_ROOT="$(git rev-parse --show-toplevel)"
ZAMMAD_VERSION="$(git describe --tags | sed -e 's/-[a-z0-9]\{8,\}.*//g')"
# dockerhub auth
echo "${DOCKER_PASSWORD}" | docker login --username="${DOCKER_USERNAME}" --password-stdin
# clone docker repo
DOCKER_REPOSITORY_CLONE_URL="https://github.com/${REPO_USER}/${DOCKER_GITHUB_REPOSITORY}"
echo "Cloning ${DOCKER_REPOSITORY_CLONE_URL}"
git clone "${DOCKER_REPOSITORY_CLONE_URL}"
# enter dockerfile dir
cd "${REPO_ROOT}/${DOCKER_GITHUB_REPOSITORY}"
# shellcheck disable=SC2153
for DOCKER_IMAGE in ${DOCKER_IMAGES}; do
echo "Build Zammad Docker image ${DOCKER_IMAGE} with version ${ZAMMAD_VERSION} for DockerHubs ${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY} repo"
if [ "${DOCKER_REPOSITORY}" == "zammad-docker-compose" ]; then
docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}" -t "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-latest" -t "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-${ZAMMAD_VERSION}" -f "containers/${DOCKER_IMAGE}/Dockerfile" .
docker push "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}"
docker push "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-latest"
docker push "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-${ZAMMAD_VERSION}"
else
docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:latest" -t "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${ZAMMAD_VERSION}" .
docker push "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:latest"
docker push "${DOCKER_REGISTRY}/${REPO_USER}/${DOCKER_REPOSITORY}:${ZAMMAD_VERSION}"
fi
done

18
.github/lint-scripts.sh vendored Executable file
View File

@@ -0,0 +1,18 @@
#!/bin/sh
#
# lint bash scripts
#
set -o errexit
CONFIG_DIR=".github"
TMP_FILE="$(mktemp)"
find "${CONFIG_DIR}" -type f -name "*.sh" > "${TMP_FILE}"
while read -r FILE; do
echo lint "${FILE}"
shellcheck -x "${FILE}"
done < "${TMP_FILE}"

View File

@@ -0,0 +1,24 @@
name: build-docker-compose-images
on:
push:
branches: [stable**]
jobs:
build-docker-compose-images:
runs-on: ubuntu-latest
env:
DOCKER_GITHUB_REPOSITORY: "zammad-docker-compose"
DOCKER_IMAGES: "zammad zammad-elasticsearch zammad-postgresql"
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_REPOSITORY: "zammad-docker-compose"
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
steps:
- name: Extract REPO_USER from GITHUB_REPOSITORY ENV
run: echo "::set-env name=REPO_USER::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $1}')"
- name: Checkout code
uses: actions/checkout@master
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
- name: Build docker image
run: .github/docker-image-build.sh

View File

@@ -0,0 +1,24 @@
name: build-docker-image
on:
push:
branches: [develop]
jobs:
build-docker-image:
runs-on: ubuntu-latest
env:
DOCKER_GITHUB_REPOSITORY: "zammad-docker"
DOCKER_IMAGES: "zammad"
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_REPOSITORY: "zammad"
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
steps:
- name: Extract REPO_USER from GITHUB_REPOSITORY ENV
run: echo "::set-env name=REPO_USER::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $1}')"
- name: Checkout code
uses: actions/checkout@master
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
- name: Build docker image
run: .github/docker-image-build.sh

56
.github/workflows/ci.yaml vendored Normal file
View File

@@ -0,0 +1,56 @@
name: ci
on:
pull_request
jobs:
lint-bash-scripts:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Lint Bash scripts
uses: docker://koalaman/shellcheck-alpine:v0.7.0
with:
args: .github/lint-scripts.sh
ci:
runs-on: ubuntu-latest
needs: lint-bash-scripts
services:
mysql:
image: mysql:5
env:
MYSQL_ROOT_PASSWORD: password
ports:
- 13306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
postgres:
image: postgres:11
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
ports:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
strategy:
matrix:
dbs:
- mysql
- postgresql
env:
RAILS_ENV: test
ZAMMAD_DBS: ${{ matrix.dbs }}
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.6
- name: Increase MySQL max_allowed_packet to 1GB (workaround for unknown/missing service option)
run: |
sudo apt-get install -y mysql-client
mysql --host 127.0.0.1 --port 13306 -uroot -ppassword -e "SET GLOBAL max_allowed_packet=1073741824;"
- name: CI
run: .github/ci.sh

View File

@@ -0,0 +1,10 @@
user=zammad
project=zammad
output=CHANGELOG.md
since-tag=1.0.0
bug-labels=bug,minor bug,security
enhancement-labels=enhancement,feature,feature backlog
issues-wo-labels=false
include-labels=security,trigger,UX/UI,admin area,API,browser,bug,channel,chat,email filter,enhancement,feature,feature backlog,import,minor bug,notification,email filter,ticket templates,
issue-line-labels=enhancement,feature,feature backlog,bug,minor bug,notification,reporting,security,ticket templates,translation,trigger,UX/UI
exclude-tags=9.0.1,0.9.1,v0.1.8,v0.1.7,unittests_passed

98
.gitignore vendored
View File

@@ -4,38 +4,86 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global
# Ignore bundler config
/.bundle
# Configuration ================================================================
# These files will differ from one user to another;
# committing them may cause Zammad to behave unexpectedly on other machines
# Ignore the default SQLite database.
/db/*.sqlite3
# Zammad -----------------------------------------------------------------------
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp/websocket/*
/tmp/cache/*
/tmp/pids/*
/public/assets/*.*
/public/assets/app/*
/public/assets/custom/*
# Ignore .project files
/.project
# Ignore local database settings
# database (copy from config/database/database.yml, or use `rails bs:init`)
/config/database.yml
Gemfile.lock
# Third-Party ------------------------------------------------------------------
# The config files / dev tools listed below are optional
# and may not be present on most users' machines
# Ignore mac stuff
# Bundler
/.bundle
/Gemfile.local
# Clutter ======================================================================
# These files are automatically generated;
# in most cases, committing them won't do anything other than bloat the repo
# Zammad -----------------------------------------------------------------------
# database files
/db/*.sqlite3
/db/schema.rb
# translation cache files
/config/locales*.yml
/config/translations/*.yml
# NPM / Yarn
/node_modules
# logfiles and tempfiles
/log
/public/assets/*.*
/public/assets/app
/public/assets/custom
/public/assets/chat/node_modules
/tmp/*
!/tmp/pids
/tmp/pids/*
!/tmp/pids/.keep
/storage/fs
# doorkeeper (OAuth 2)
/public/assets/doorkeeper
# images
/public/assets/images/*
!/public/assets/images/icons/
!/public/assets/images/avatar-bg.png
!/public/assets/images/chat-demo-avatar.png
!/public/assets/images/eyedropper.gif
!/public/assets/images/icons.svg
!/public/assets/images/logo.svg
# Third-Party ------------------------------------------------------------------
# macOS
.DS_Store
# Ignore .swp files
.*.swp
# vim
.*.sw[pon]
# Ignore coverage stuff
/coverage/*
# RubyMine
/.idea
# Ignore local changes to schema.rb (e. g. through extentions)
db/schema.rb
# Eclipse
/.project
# Byebug
/.byebug_history
# SimpleCov
/coverage
# RDoc / YARD
/doc
# Backup files
*~

50
.gitlab-ci.yml Normal file
View File

@@ -0,0 +1,50 @@
default:
image: registry.znuny.com/docker/zammad-ruby:2.6.6
include:
- local: '/.gitlab/ci/base.yml'
- local: '/.gitlab/ci/pre.yml'
- local: '/.gitlab/ci/integration.yml'
- local: '/.gitlab/ci/rspec.yml'
- local: '/.gitlab/ci/unit.yml'
- local: '/.gitlab/ci/browser-core.yml'
- local: '/.gitlab/ci/browser-integration.yml'
# Stages
stages:
- pre
- test
- browser-core
- browser-integration
# Global variables added to the ENV of each job
variables:
# for faster translation loading
Z_LOCALES: "en-us:de-de"
# Browser tests and variables
RAILS_SERVE_STATIC_FILES: "true"
REMOTE_URL: "http://selenium:24444/wd/hub"
TZ: "Europe/London"
# docker elgalu/selenium variables for parallel browser instance creation
MAX_INSTANCES: "50"
MAX_SESSIONS: "50"
# docker-imap-devel variables required for browser tests
MAILNAME: "mail.test.dc.zammad.com"
MAILBOX_INIT: "zammad@mail.test.dc.zammad.com:zammad"
MAIL_ADDRESS: "zammad@mail.test.dc.zammad.com"
MAIL_PASS: "zammad"
# Cache gems in between jobs and pipelines
# ATTENTION: We use a combination of the Ruby major and minor version number
# as a key for the cache to avoid cache growth and incompatibilities between
# the gems. Search hook: 2.6.6 (change it when updating the Ruby version too)
cache:
key: "ruby266"
paths:
- vendor/ruby
# Initialize application env
before_script:
- bundle install -j $(nproc) --path vendor
- bundle exec ruby script/build/database_config.rb

116
.gitlab/ci/base.yml Normal file
View File

@@ -0,0 +1,116 @@
# Artifacts are stored for failed jobs for 2 days
.artifacts_error: &artifacts_error
artifacts:
expire_in: 2 days
when: on_failure
paths:
- tmp/screenshot*
- tmp/screenshots/*
- log/*.log
.variables_es: &variables_es
variables:
ES_INDEX_RAND: "true"
ES_URL: "http://elasticsearch:9200"
.variables_app_restart_cmd: &variables_app_restart_cmd
variables:
APP_RESTART_CMD: "bundle exec rake environment zammad:ci:app:restart"
.rules_singletest: &rules_singletest
rules:
- if: $CI_MERGE_REQUEST_ID
when: never
- if: '$SINGLETESTNAME && $SINGLETESTNAME == $CI_JOB_NAME'
when: always
- if: '$SINGLETESTNAME && $SINGLETESTNAME != $CI_JOB_NAME'
when: never
- if: '$CI_JOB_NAME'
when: on_success
# Workaround to enable usage of mixed SSH and Docker GitLab CI runners
.tags_docker: &tags_docker
tags:
- docker
# Workaround for blocked port 25 access on cloud provider infrastructure
.tags_mail: &tags_mail
tags:
- mail
.env_base: &env_base
<<: *tags_docker
<<: *artifacts_error
<<: *rules_singletest
# DB Docker
.docker_mysql: &docker_mysql
name: registry.znuny.com/docker/zammad-mysql:latest
alias: mysql
.docker_postgresql: &docker_postgresql
name: registry.znuny.com/docker/zammad-postgresql:latest
alias: postgresql
# elasticsearch docker
.docker_elasticsearch: &docker_elasticsearch
name: registry.znuny.com/docker/zammad-elasticsearch:$ELASTICSEARCH_TAG
alias: elasticsearch
# selenium docker
.docker_selenium: &docker_selenium
name: docker.io/elgalu/selenium:3.141.59-p32
alias: selenium
# selenium docker
.docker_imap: &docker_imap
name: registry.znuny.com/docker/docker-imap-devel:latest
alias: mail
# service templates
.services_mysql: &services_mysql
services:
- <<: *docker_mysql
.services_postgresql: &services_postgresql
services:
- <<: *docker_postgresql
.services_mysql_postgresql: &services_mysql_postgresql
services:
- <<: *docker_mysql
- <<: *docker_postgresql
.services_postgresql_selenium: &services_postgresql_selenium
services:
- <<: *docker_postgresql
- <<: *docker_selenium
.services_mysql_postgresql_elasticsearch: &services_mysql_postgresql_elasticsearch
variables:
ELASTICSEARCH_TAG: 'stable'
services:
- <<: *docker_mysql
- <<: *docker_postgresql
- <<: *docker_elasticsearch
.services_mysql_postgresql_elasticsearch_selenium_imap: &services_mysql_postgresql_elasticsearch_selenium_imap
variables:
ELASTICSEARCH_TAG: 'stable'
services:
- <<: *docker_mysql
- <<: *docker_postgresql
- <<: *docker_elasticsearch
- <<: *docker_selenium
- <<: *docker_imap
# we need at least one job to store and include this template
# but we skip this via 'only' -> 'variables' -> '$IGNORE'
# $IGNORE is not defined
ignore:
stage: test
only:
variables:
- $IGNORE
script:
- ''

View File

@@ -0,0 +1,83 @@
include:
# browser-core
- local: '/.gitlab/ci/browser-core/build.yml'
- local: '/.gitlab/ci/browser-core/autowizard_chrome.yml'
- local: '/.gitlab/ci/browser-core/autowizard_ff.yml'
- local: '/.gitlab/ci/browser-core/api_client_php.yml'
- local: '/.gitlab/ci/browser-core/api_client_ruby.yml'
- local: '/.gitlab/ci/browser-core/capybara_chrome.yml'
- local: '/.gitlab/ci/browser-core/capybara_ff.yml'
- local: '/.gitlab/ci/browser-core/chrome.yml'
- local: '/.gitlab/ci/browser-core/firefox.yml'
.template_browser-core: &template_browser-core
stage: browser-core
dependencies:
- browser:build
extends:
- .env_base
- .variables_es
- .variables_app_restart_cmd
- .services_mysql_postgresql_elasticsearch_selenium_imap
variables:
RAILS_ENV: "production"
script:
- env
- script/build/test_slice_tests.sh $TEST_SLICE
- RAILS_ENV=test bundle exec rake db:create
- bundle exec rake zammad:ci:test:start[with_elasticsearch]
- time bundle exec rails test --fail-fast test/browser
.template_browser-core_autowizard: &template_browser-core_autowizard
stage: browser-core
dependencies:
- browser:build
extends:
- .env_base
- .variables_app_restart_cmd
- .services_postgresql_selenium
variables:
RAILS_ENV: "production"
AUTO_WIZARD_FILE: "contrib/auto_wizard_example.json"
TEST_FILE: "test/integration/auto_wizard_browser_test.rb"
script:
- RAILS_ENV=test bundle exec rake db:create
- cp $AUTO_WIZARD_FILE auto_wizard.json
- bundle exec rake zammad:ci:test:start
- bundle exec rails test $TEST_FILE
.template_browser-core_api_client: &template_browser-core_api_client
stage: browser-core
dependencies:
- browser:build
extends:
- .env_base
- .variables_app_restart_cmd
- .services_mysql_postgresql
variables:
RAILS_ENV: "production"
.template_browser-core_capybara: &template_browser-core_capybara
stage: browser-core
dependencies:
- browser:build
extends:
- .env_base
- .variables_es
- .services_mysql_postgresql_elasticsearch_selenium_imap
variables:
RAILS_ENV: "test"
script:
- bundle exec rake zammad:ci:test:prepare[with_elasticsearch]
- bundle exec rspec --fail-fast -t type:system
# we need at least one job to store and include this template
# $IGNORE is not defined
ignore:
stage: test
only:
variables:
- $IGNORE
script:
- ''

View File

@@ -0,0 +1,17 @@
api_client_php:
extends:
- .template_browser-core_api_client
variables:
ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_URL: "http://localhost:3000"
ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_USERNAME: "master@example.com"
ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_PASSWORD: "test"
script:
- RAILS_ENV=test bundle exec rake db:create
- RAILS_ENV=test bundle exec rake zammad:ci:test:start zammad:setup:auto_wizard
- git clone https://github.com/zammad/zammad-api-client-php.git
- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
- php composer-setup.php --install-dir=/usr/local/bin
- ln -s /usr/local/bin/composer.phar /usr/local/bin/composer
- cd zammad-api-client-php
- composer install
- vendor/bin/phpunit

View File

@@ -0,0 +1,12 @@
api_client_ruby:
extends:
- .template_browser-core_api_client
script:
- RAILS_ENV=test bundle exec rake db:create
- cp contrib/auto_wizard_test.json auto_wizard.json
- bundle exec rake zammad:ci:test:start
- git clone https://github.com/zammad/zammad-api-client-ruby.git
- cd zammad-api-client-ruby
- bundle install -j $(nproc)
- bundle exec rspec

View File

@@ -0,0 +1,5 @@
autowizard_chrome:
extends:
- .template_browser-core_autowizard
variables:
BROWSER: "chrome"

View File

@@ -0,0 +1,5 @@
autowizard_ff:
extends:
- .template_browser-core_autowizard
variables:
BROWSER: "firefox"

View File

@@ -0,0 +1,17 @@
browser:build:
stage: test
extends:
- .tags_docker
- .services_postgresql
artifacts:
expire_in: 1 week
paths:
- public/assets/.sprockets-manifest*
- public/assets/application-*
- public/assets/knowledge_base*
- public/assets/print-*
variables:
RAILS_ENV: "production"
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rake assets:precompile

View File

@@ -0,0 +1,5 @@
capybara_chrome:
extends:
- .template_browser-core_capybara
variables:
BROWSER: "chrome"

View File

@@ -0,0 +1,5 @@
capybara_ff:
extends:
- .template_browser-core_capybara
variables:
BROWSER: "firefox"

View File

@@ -0,0 +1,41 @@
1_chrome:
extends:
- .template_browser-core
variables:
BROWSER: "chrome"
TEST_SLICE: "1"
2_chrome:
extends:
- .template_browser-core
variables:
BROWSER: "chrome"
TEST_SLICE: "2"
3_chrome:
extends:
- .template_browser-core
variables:
BROWSER: "chrome"
TEST_SLICE: "3"
4_chrome:
extends:
- .template_browser-core
variables:
BROWSER: "chrome"
TEST_SLICE: "4"
5_chrome:
extends:
- .template_browser-core
variables:
BROWSER: "chrome"
TEST_SLICE: "5"
6_chrome:
extends:
- .template_browser-core
variables:
BROWSER: "chrome"
TEST_SLICE: "6"

View File

@@ -0,0 +1,42 @@
1_firefox:
extends:
- .template_browser-core
variables:
BROWSER: "firefox"
TEST_SLICE: "1"
2_firefox:
extends:
- .template_browser-core
variables:
BROWSER: "firefox"
TEST_SLICE: "2"
3_firefox:
extends:
- .template_browser-core
- .tags_mail
variables:
BROWSER: "firefox"
TEST_SLICE: "3"
4_firefox:
extends:
- .template_browser-core
variables:
BROWSER: "firefox"
TEST_SLICE: "4"
5_firefox:
extends:
- .template_browser-core
variables:
BROWSER: "firefox"
TEST_SLICE: "5"
6_firefox:
extends:
- .template_browser-core
variables:
BROWSER: "firefox"
TEST_SLICE: "6"

View File

@@ -0,0 +1,51 @@
include:
# browser-integration
- local: '/.gitlab/ci/browser-integration/facebook_chrome.yml'
- local: '/.gitlab/ci/browser-integration/facebook_ff.yml'
- local: '/.gitlab/ci/browser-integration/idoit_chrome.yml'
- local: '/.gitlab/ci/browser-integration/otrs_chrome.yml'
- local: '/.gitlab/ci/browser-integration/zendesk_chrome.yml'
.template_browser-integration: &template_browser-integration
stage: browser-integration
dependencies:
- browser:build
extends:
- .env_base
- .variables_app_restart_cmd
- .services_postgresql_selenium
variables:
RAILS_ENV: "production"
AUTO_WIZARD_FILE: "contrib/auto_wizard_test.json"
script:
- RAILS_ENV=test bundle exec rake db:create
- cp $AUTO_WIZARD_FILE auto_wizard.json
- bundle exec rake zammad:ci:test:start
- bundle exec rails test $TEST_FILE
.template_browser-integration_import: &template_browser-integration_import
stage: browser-integration
dependencies:
- browser:build
extends:
- .env_base
- .services_postgresql_selenium
variables:
RAILS_ENV: "production"
BROWSER: "chrome"
RAILS_SERVE_STATIC_FILES: "true"
script:
- RAILS_ENV=test bundle exec rake db:create
- bundle exec rake zammad:ci:test:start
- bundle exec rails test $TEST_FILE
# we need at least one job to store and include this template
# $IGNORE is not defined
ignore:
stage: test
only:
variables:
- $IGNORE
script:
- ''

View File

@@ -0,0 +1,6 @@
facebook_chrome:
extends:
- .template_browser-integration
variables:
BROWSER: "chrome"
TEST_FILE: "test/integration/facebook_browser_test.rb"

View File

@@ -0,0 +1,6 @@
facebook_ff:
extends:
- .template_browser-integration
variables:
BROWSER: "firefox"
TEST_FILE: "test/integration/facebook_browser_test.rb"

View File

@@ -0,0 +1,6 @@
idoit_chrome:
extends:
- .template_browser-integration
variables:
BROWSER: "chrome"
TEST_FILE: "test/integration/idoit_browser_test.rb"

View File

@@ -0,0 +1,5 @@
otrs_chrome:
extends:
- .template_browser-integration_import
variables:
TEST_FILE: "test/integration/otrs_import_browser_test.rb"

View File

@@ -0,0 +1,5 @@
zendesk_chrome:
extends:
- .template_browser-integration_import
variables:
TEST_FILE: "test/integration/zendesk_import_browser_test.rb"

View File

@@ -0,0 +1,30 @@
include:
- local: '/.gitlab/ci/integration/clearbit.yml'
- local: '/.gitlab/ci/integration/email_helper_deliver.yml'
- local: '/.gitlab/ci/integration/es.yml'
- local: '/.gitlab/ci/integration/facebook.yml'
- local: '/.gitlab/ci/integration/geo.yml'
- local: '/.gitlab/ci/integration/otrs.yml'
- local: '/.gitlab/ci/integration/slack.yml'
- local: '/.gitlab/ci/integration/user_agent.yml'
- local: '/.gitlab/ci/integration/zendesk.yml'
.template_integration: &template_integration
extends:
- .env_base
- .services_mysql_postgresql
tags:
- integration
stage: test
variables:
RAILS_ENV: "test"
# we need at least one job to store and include this template
# $IGNORE is not defined
ignore:
stage: test
only:
variables:
- $IGNORE
script:
- ''

View File

@@ -0,0 +1,7 @@
clearbit:
extends:
- .template_integration
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rails test test/integration/clearbit_test.rb
allow_failure: true

View File

@@ -0,0 +1,10 @@
email_helper_deliver:
extends:
- .template_integration
- .tags_mail
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rails test test/integration/email_helper_test.rb
- bundle exec rails test test/integration/email_deliver_test.rb
- bundle exec rails test test/integration/email_keep_on_server_test.rb
- bundle exec rails test test/integration/email_postmaster_to_sender.rb

View File

@@ -0,0 +1,32 @@
.template_integration_es: &template_integration_es
extends:
- .env_base
- .services_mysql_postgresql_elasticsearch
- .variables_es
stage: test
tags:
- integration
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rails test test/integration/elasticsearch_active_test.rb
- bundle exec rails test test/integration/elasticsearch_test.rb
- bundle exec rspec --tag searchindex --tag ~type:system
- bundle exec rails test test/integration/report_test.rb
es:5.6:
<<: *template_integration_es
variables:
ELASTICSEARCH_TAG: '5.6'
RAILS_ENV: "test"
es:6:
<<: *template_integration_es
variables:
ELASTICSEARCH_TAG: '6'
RAILS_ENV: "test"
es:7:
<<: *template_integration_es
variables:
ELASTICSEARCH_TAG: '7'
RAILS_ENV: "test"

View File

@@ -0,0 +1,7 @@
facebook:
extends:
- .template_integration
script:
- bundle exec rake zammad:db:init
- bundle exec rails test test/integration/facebook_test.rb
allow_failure: true

View File

@@ -0,0 +1,8 @@
geo:
extends:
- .template_integration
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rails test test/integration/geo_calendar_test.rb
- bundle exec rails test test/integration/geo_location_test.rb
- bundle exec rails test test/integration/geo_ip_test.rb

View File

@@ -0,0 +1,36 @@
.template_integration_otrs: &template_integration_otrs
extends:
- .template_integration
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rails test test/integration/otrs_import_test.rb
otrs:6:
<<: *template_integration_otrs
variables:
IMPORT_OTRS_ENDPOINT: "https://vz1185.test.znuny.com/otrs/public.pl?Action=ZammadMigrator"
otrs:5:
<<: *template_integration_otrs
variables:
IMPORT_OTRS_ENDPOINT: "http://vz1109.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
otrs:4:
<<: *template_integration_otrs
variables:
IMPORT_OTRS_ENDPOINT: "http://vz383.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
otrs:33:
<<: *template_integration_otrs
variables:
IMPORT_OTRS_ENDPOINT: "http://vz305.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
otrs:32:
<<: *template_integration_otrs
variables:
IMPORT_OTRS_ENDPOINT: "http://vz382.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"
otrs:31:
<<: *template_integration_otrs
variables:
IMPORT_OTRS_ENDPOINT: "http://vz381.demo.znuny.com/otrs/public.pl?Action=ZammadMigrator"

View File

@@ -0,0 +1,8 @@
slack:
extends:
- .template_integration
script:
- bundle exec rake zammad:db:unseeded
- echo "gem 'slack-api'" >> Gemfile.local
- bundle install -j $(nproc)
- bundle exec rails test test/integration/slack_test.rb

View File

@@ -0,0 +1,8 @@
user_agent:
extends:
- .template_integration
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rails test test/integration/user_agent_test.rb
- export ZAMMAD_PROXY_TEST=true
- bundle exec rails test test/integration/user_agent_test.rb

View File

@@ -0,0 +1,6 @@
zendesk:
extends:
- .template_integration
script:
- bundle exec rake zammad:db:unseeded
- bundle exec rails test test/integration/zendesk_import_test.rb

33
.gitlab/ci/pre.yml Normal file
View File

@@ -0,0 +1,33 @@
# Workaround to enable usage of mixed SSH and Docker GitLab CI runners
.template_pre: &template_pre
stage: pre
extends:
- .tags_docker
- .rules_singletest
before_script:
- '' # disable before_script for pre "non-application" env
rubocop:
<<: *template_pre
script:
- bundle install -j $(nproc) --path vendor
- bundle exec rubocop
coffeelint:
<<: *template_pre
script:
- coffeelint app/
bundle-audit:
<<: *template_pre
script:
- gem install bundler-audit
- bundle-audit update
- bundle-audit --ignore CVE-2015-9284
github:
<<: *template_pre
tags:
- deploy
script:
- script/build/sync_repo.sh git@github.com:zammad/zammad.git

22
.gitlab/ci/rspec.yml Normal file
View File

@@ -0,0 +1,22 @@
include:
- local: '/.gitlab/ci/rspec/mysql.yml'
- local: '/.gitlab/ci/rspec/postgresql.yml'
.template_rspec: &template_rspec
extends:
- .env_base
variables:
RAILS_ENV: "test"
script:
- bundle exec rake zammad:db:init
- bundle exec rspec -t ~type:system -t ~searchindex
# we need at least one job to store and include this template
# $IGNORE is not defined
ignore:
stage: test
only:
variables:
- $IGNORE
script:
- ''

View File

@@ -0,0 +1,5 @@
rspec:mysql:
stage: test
extends:
- .services_mysql
- .template_rspec

View File

@@ -0,0 +1,5 @@
rspec:postgresql:
stage: test
extends:
- .services_postgresql
- .template_rspec

24
.gitlab/ci/unit.yml Normal file
View File

@@ -0,0 +1,24 @@
include:
- local: '/.gitlab/ci/unit/mysql.yml'
- local: '/.gitlab/ci/unit/postgresql.yml'
.template_unit: &template_unit
extends:
- .env_base
variables:
RAILS_ENV: "test"
script:
- bundle exec rake zammad:db:init
- bundle exec rake test:units
- bundle exec rails test test/integration/object_manager_test.rb
- bundle exec rails test test/integration/package_test.rb
# we need at least one job to store and include this template
# $IGNORE is not defined
ignore:
stage: test
only:
variables:
- $IGNORE
script:
- ''

View File

@@ -0,0 +1,5 @@
unit:mysql:
stage: test
extends:
- .services_mysql
- .template_unit

View File

@@ -0,0 +1,5 @@
unit:postgresql:
stage: test
extends:
- .services_postgresql
- .template_unit

View File

@@ -0,0 +1,66 @@
## What does this MR do?
<!-- Is there a lot to say? Consider creating an issue. -->
## Screenshots <!-- Optional -->
### Before
![alt text](https://example.com/before.png)
### After
![alt text](https://example.com/after.png)
## Notes
* This MR
**does** <!-- KEEP ONLY ONE -->
does not <!-- OF THESE LINES -->
change more than 3 files / 100 lines of code.
<!-- If so, what’s the connection? Or, could you split it into multiple MRs? -->
* This MR
**does** <!-- KEEP ONLY ONE -->
does not <!-- OF THESE LINES -->
introduce new methods.
<!-- If so, are they tested? -->
* This MR
**does** <!-- KEEP ONLY ONE -->
does not <!-- OF THESE LINES -->
modify or remove existing methods.
<!-- If so, did you modify/remove their tests, as well? -->
* This MR
**does** <!-- KEEP ONLY ONE -->
does not <!-- OF THESE LINES -->
add to, modify, or remove existing test cases.
<!-- If so, explain. -->
### Performance Impact <!-- Optional -->
<!--
Does your MR optimize (or degrade) performance?
If so, apply the label and explain here.
Consider that some of OTRS’s customers had
HUNDREDS of agents, overviews, and groups,
over 2,000 tickets a day,
and over 20,000,000 (!) tickets in all.
How do your performance changes scale on a system of this size?
(Remember, these are not edge cases we can ignore;
they are really big customers, and we want to keep their business!)
-->
### Follow-up Required <!-- Optional -->
<!--
Does your MR require coordination with the documentation/support teams?
If so, apply the label and explain here.
-->

124
.pkgr.yml Normal file
View File

@@ -0,0 +1,124 @@
name: zammad
description: Zammad is a web based open source helpdesk/customer support system
homepage: https://zammad.org
notifications: false
targets:
centos-7:
dependencies:
- curl
- elasticsearch
- nginx
- postgresql-server
- which
- epel-release
- imlib2
- imlib2-devel
build_dependencies:
- http://download.fedoraproject.org/pub/epel/7/x86_64/Packages/i/imlib2-1.4.5-9.el7.x86_64.rpm
- http://download.fedoraproject.org/pub/epel/7/x86_64/Packages/i/imlib2-devel-1.4.5-9.el7.x86_64.rpm
centos-8:
dependencies:
- curl
- elasticsearch
- nginx
- postgresql-server
- which
- epel-release
- imlib2
- imlib2-devel
build_dependencies:
- http://download.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/i/imlib2-1.4.9-8.el8.x86_64.rpm
- http://download.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/i/imlib2-devel-1.4.9-8.el8.x86_64.rpm
debian-8:
dependencies:
- curl
- elasticsearch
- nginx|apache2
- postgresql|mysql-server|mariadb-server|sqlite
- libimlib2
- libimlib2-dev
build_dependencies:
- libimlib2
- libimlib2-dev
debian-9:
dependencies:
- curl
- elasticsearch
- nginx|apache2
- postgresql|mariadb-server|sqlite
- libimlib2
- libimlib2-dev
build_dependencies:
- libimlib2
- libimlib2-dev
debian-10:
dependencies:
- curl
- elasticsearch
- nginx|apache2
- postgresql|mariadb-server|sqlite
- libimlib2
- libimlib2-dev
build_dependencies:
- libimlib2
- libimlib2-dev
ubuntu-16.04:
dependencies:
- curl
- elasticsearch
- nginx|apache2
- postgresql|mysql-server|mariadb-server|sqlite
- libimlib2
- libimlib2-dev
build_dependencies:
- libimlib2
- libimlib2-dev
ubuntu-18.04:
dependencies:
- curl
- elasticsearch
- nginx|apache2
- postgresql|mysql-server|mariadb-server|sqlite
- libimlib2
- libimlib2-dev
build_dependencies:
- libimlib2
- libimlib2-dev
ubuntu-20.04:
dependencies:
- curl
- elasticsearch
- nginx|apache2
- postgresql|mysql-server|mariadb-server|sqlite
- libimlib2
- libimlib2-dev
build_dependencies:
- libimlib2
- libimlib2-dev
sles-12:
dependencies:
- curl
- elasticsearch
- nginx
- postgresql-server
- imlib2
- libImlib2-1
- imlib2
- imlib2-devel
build_dependencies:
- https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/12.3/repo/oss/suse/x86_64/imlib2-1.4.5-12.1.1.x86_64.rpm
- https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/12.3/repo/oss/suse/x86_64/imlib2-devel-1.4.5-12.1.1.x86_64.rpm
- https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/12.3/repo/oss/suse/x86_64/imlib2-filters-1.4.5-12.1.1.x86_64.rpm
- https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/12.3/repo/oss/suse/x86_64/libImlib2-1-1.4.5-12.1.1.x86_64.rpm
before:
- contrib/packager.io/before.sh
after:
- contrib/packager.io/after.sh
env:
- RAILS_ENV=production
- ZAMMAD_BIND_IP=127.0.0.1
- ZAMMAD_RAILS_PORT=3000
- ZAMMAD_WEBSOCKET_PORT=6042
services:
- postgres
after_install: contrib/packager.io/postinstall.sh

3
.rspec Normal file
View File

@@ -0,0 +1,3 @@
--format documentation
--color
--require spec_helper

282
.rubocop.yml Normal file
View File

@@ -0,0 +1,282 @@
# Default enabled cops
# https://github.com/rubocop-hq/rubocop/blob/master/config/default.yml
require:
- rubocop-performance
- rubocop-rails
- rubocop-rspec
inherit_from:
- .rubocop_todo.yml
- .rubocop_todo.rspec.yml
AllCops:
NewCops: enable
DisplayCopNames: true
Exclude:
- 'bin/rails'
- 'bin/rake'
- 'bin/spring'
- 'db/schema.rb'
- 'vendor/**/*'
- 'node_modules/**/*'
- 'public/assets/**/*'
- 'public/packs/**/*'
RSpec:
Patterns:
- '_spec.rb$'
- '_examples.rb$'
Rails:
Enabled: true
# Zammad StyleGuide
Style/FrozenStringLiteralComment:
Enabled: false
Layout/LineLength:
Description: 'Limit lines to 80 characters.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
Enabled: false
Style/NegatedIf:
Description: >-
Favor unless over if for negative conditions
(or control flow or).
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#unless-for-negatives'
Enabled: false
Style/IfUnlessModifier:
Description: >-
Favor modifier if/unless usage when you have a
single-line body.
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier'
Enabled: false
Style/TrailingCommaInArrayLiteral:
Description: 'Checks for trailing comma in array literals.'
StyleGuide: '#no-trailing-array-commas'
Enabled: false
Style/TrailingCommaInHashLiteral:
Description: 'Checks for trailing comma in hash literals.'
Enabled: false
Style/TrailingCommaInArguments:
Description: 'Checks for trailing comma in argument lists.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
Enabled: false
Layout/SpaceInsideParens:
Description: 'No spaces after ( or before ).'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces'
Enabled: false
Layout/SpaceAfterMethodName:
Description: >-
Do not put a space between a method name and the opening
parenthesis in a method definition.
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
Enabled: false
Layout/LeadingCommentSpace:
Description: 'Comments should start with a space.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-space'
Enabled: false
Style/MethodCallWithoutArgsParentheses:
Description: 'Do not use parentheses for method calls with no arguments.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
Enabled: false
Layout/SpaceInsideReferenceBrackets:
Description: 'Checks the spacing inside referential brackets.'
Enabled: false
Layout/SpaceInsideArrayLiteralBrackets:
Description: 'Checks the spacing inside array literal brackets.'
Enabled: false
Style/DefWithParentheses:
Description: 'Use def with parentheses when there are arguments.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
Enabled: false
Style/MethodDefParentheses:
Description: >-
Checks if the method definitions have or don't have
parentheses.
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
Enabled: false
Layout/HashAlignment:
Description: >-
Align the elements of a hash literal if they span more than
one line.
Enabled: true
EnforcedHashRocketStyle: table
EnforcedColonStyle: table
EnforcedLastArgumentHashStyle: always_inspect
Layout/EmptyLinesAroundClassBody:
Description: "Keeps track of empty lines around class bodies."
Enabled: false
Layout/EmptyLinesAroundMethodBody:
Description: "Keeps track of empty lines around method bodies."
Enabled: false
Layout/EmptyLinesAroundBlockBody:
Description: "Keeps track of empty lines around block bodies."
Enabled: false
Layout/EmptyLinesAroundModuleBody:
Description: "Keeps track of empty lines around module bodies."
Enabled: false
Style/MultilineBlockChain:
Description: 'Avoid multi-line chains of blocks.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
Enabled: false
Metrics/ClassLength:
Description: 'Avoid classes longer than 100 lines of code.'
Enabled: false
Metrics/MethodLength:
Description: 'Avoid methods longer than 10 lines of code.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#short-methods'
Enabled: false
Style/BlockComments:
Description: 'Do not use block comments.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-block-comments'
Enabled: false
Style/PerlBackrefs:
Description: 'Avoid Perl-style regex back references.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
Enabled: false
Style/HashEachMethods:
Enabled: true
Style/HashTransformKeys:
Enabled: true
Style/HashTransformValues:
Enabled: true
Style/SelfAssignment:
Description: >-
Checks for places where self-assignment shorthand should have
been used.
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#self-assignment'
Enabled: false
Rails/ApplicationRecord:
Exclude:
- 'app/models/application_model.rb'
- 'app/models/active_job_lock.rb'
Rails/BulkChangeTable:
Description: 'Check whether alter queries are combinable.'
Enabled: false
Rails/FindEach:
Description: 'Prefer all.find_each over all.find.'
Enabled: false
Rails/HasAndBelongsToMany:
Description: 'Prefer has_many :through to has_and_belongs_to_many.'
# StyleGuide: 'https://github.com/bbatsov/rails-style-guide#has-many-through'
Enabled: false
Rails/SkipsModelValidations:
Description: >-
Use methods that skips model validations with caution.
See reference for more information.
Reference: 'http://guides.rubyonrails.org/active_record_validations.html#skipping-validations'
Enabled: true
Exclude:
- test/**/*
- "**/*_spec.rb"
- "**/*_examples.rb"
Style/ClassAndModuleChildren:
Description: 'Checks style of children classes and modules.'
Enabled: false
Naming/FileName:
Description: 'Use snake_case for source file names.'
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-files'
Enabled: true
Exclude:
- 'script/websocket-server.rb'
Naming/VariableNumber:
Description: 'Use the configured style when numbering variables.'
Enabled: false
Naming/MethodParameterName:
Description: >-
Checks for method parameter names that contain capital letters,
end in numbers, or do not meet a minimal length.
Enabled: true
AllowedNames: e, id, _, ip, to
Lint/BooleanSymbol:
Description: 'Check for `:true` and `:false` symbols.'
Enabled: true
Exclude:
- "db/seeds/object_manager_attributes.rb"
- "spec/requests/integration/object_manager_attributes_spec.rb"
- "test/integration/object_manager_test.rb"
Lint/InterpolationCheck:
Description: 'Raise warning for interpolation in single q strs'
Enabled: true
Exclude:
- "test/unit/email_process_auto_response_test.rb"
- "test/unit/email_process_bounce_delivery_permanent_failed_test.rb"
- "test/unit/email_process_bounce_follow_test.rb"
- "test/unit/notification_factory_renderer_test.rb"
- "test/unit/notification_factory_template_test.rb"
- "test/unit/ticket_trigger_test.rb"
- "test/unit/ticket_trigger_recursive_disabled_test.rb"
# RSpec tests
Style/NumericPredicate:
Description: >-
Checks for the use of predicate- or comparison methods for
numeric comparisons.
StyleGuide: '#predicate-methods'
# This will change to a new method call which isn't guaranteed to be on the
# object. Switching these methods has to be done with knowledge of the types
# of the variables which rubocop doesn't have.
AutoCorrect: false
Enabled: true
Exclude:
- "**/*_spec.rb"
Lint/AmbiguousBlockAssociation:
Description: >-
Checks for ambiguous block association with method when param
passed without parentheses.
StyleGuide: '#syntax'
Enabled: true
Exclude:
- "spec/support/*.rb"
- "**/*_spec.rb"
- "**/*_examples.rb"
Layout/MultilineMethodCallIndentation:
Description: >-
Checks the indentation of the method name part in method calls
that span more than one line.
EnforcedStyle: indented
Include:
- "**/*_spec.rb"
Lint/UnusedMethodArgument:
AllowUnusedKeywordArguments: true

186
.rubocop_todo.rspec.yml Normal file
View File

@@ -0,0 +1,186 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2019-04-12 17:16:30 +0800 using RuboCop version 0.67.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# # Offense count: 17 (Competes with same override in .rubocop_todo.yml)
# Metrics/AbcSize:
# Max: 24
# Offense count: 664
# Configuration parameters: CountComments, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
Max: 1653
Exclude:
- 'spec/requests/ticket_spec.rb'
# Offense count: 16
RSpec/AnyInstance:
Exclude:
- 'spec/lib/import/otrs/article_spec.rb'
- 'spec/lib/import/otrs/customer_spec.rb'
- 'spec/lib/import/otrs/customer_user_spec.rb'
- 'spec/lib/import/otrs/priority_spec.rb'
- 'spec/lib/import/otrs/queue_spec.rb'
- 'spec/lib/import/otrs/state_spec.rb'
- 'spec/lib/import/otrs/ticket_spec.rb'
- 'spec/lib/import/otrs/user_spec.rb'
- 'spec/models/import_job_spec.rb'
# Offense count: 3
RSpec/BeforeAfterAll:
Exclude:
- 'spec/spec_helper.rb'
- 'spec/rails_helper.rb'
- 'spec/support/**/*.rb'
- 'spec/lib/sequencer/unit/import/zendesk/ticket/comment/attachment/request_spec.rb'
- 'spec/lib/sequencer/unit/import/zendesk/ticket/comment/source_based_spec.rb'
- 'spec/models/translation_spec.rb'
# Offense count: 523
# Configuration parameters: Prefixes.
# Prefixes: when, with, without
RSpec/ContextWording:
Enabled: false
# Offense count: 540
# Configuration parameters: Max.
RSpec/ExampleLength:
Enabled: false
# Offense count: 36
RSpec/ExpectActual:
Exclude:
- 'spec/routing/**/*'
- 'spec/requests/integration/monitoring_spec.rb'
- 'spec/requests/integration/object_manager_attributes_spec.rb'
- 'spec/requests/integration/twilio_sms_spec.rb'
- 'spec/requests/integration/user_device_spec.rb'
- 'spec/requests/organization_spec.rb'
- 'spec/requests/ticket/article_attachments_spec.rb'
- 'spec/requests/user/organization_spec.rb'
- 'spec/requests/user_spec.rb'
# Offense count: 3
RSpec/ExpectInHook:
Exclude:
- 'spec/models/calendar_spec.rb'
- 'spec/models/concerns/has_search_index_backend_examples.rb'
- 'spec/models/ticket/article_spec.rb'
# Offense count: 12
# Configuration parameters: CustomTransform, IgnoreMethods.
RSpec/FilePath:
Exclude:
- 'spec/db/migrate/20171023000001_fixed_store_upgrade_ror_45_spec.rb'
- 'spec/db/migrate/issue_1219_zhtw_locale_typo_spec.rb'
- 'spec/db/migrate/issue_1660_fix_tree_select_configurations_spec.rb'
- 'spec/db/migrate/issue_1905_exchange_login_from_remote_id_spec.rb'
- 'spec/db/migrate/issue_1977_remove_invalid_user_foreign_keys_spec.rb'
- 'spec/db/migrate/issue_2019_fix_double_domain_links_in_trigger_emails_spec.rb'
- 'spec/db/migrate/issue_2140_reset_ldap_config_spec.rb'
- 'spec/db/migrate/issue_2333_object_country_already_exists_spec.rb'
- 'spec/db/migrate/issue_2345_es_attachment_max_size_in_mb_setting_lower_default_spec.rb'
- 'spec/db/migrate/issue_2368_add_indices_to_histories_and_tickets_spec.rb'
- 'spec/db/migrate/issue_2541_fix_notification_email_without_body_spec.rb'
- 'spec/db/migrate/issue_2608_missing_trigger_permission_spec.rb'
- 'spec/db/migrate/issue_2460_fix_corrupted_twitter_ids_spec.rb'
- 'spec/db/migrate/issue_2715_fix_broken_twitter_urls_spec.rb'
- 'spec/jobs/issue_2715_fix_broken_twitter_urls_job_spec.rb'
- 'spec/db/migrate/issue_2867_footer_header_public_link_spec.rb'
- 'spec/lib/import/base_factory_spec.rb'
# Offense count: 60
# Configuration parameters: AssignmentOnly.
RSpec/InstanceVariable:
Exclude:
- 'spec/lib/notification_factory/renderer_spec.rb'
- 'spec/models/import_job_spec.rb'
- 'spec/models/scheduler_spec.rb'
- 'spec/requests/api_auth_on_behalf_of_spec.rb'
- 'spec/requests/integration/monitoring_spec.rb'
- 'spec/requests/integration/sipgate_spec.rb'
- 'spec/requests/organization_spec.rb'
- 'spec/requests/report_spec.rb'
- 'spec/requests/text_module_spec.rb'
- 'spec/requests/ticket/article_attachments_spec.rb'
- 'spec/requests/user_spec.rb'
# Offense count: 34
RSpec/LetSetup:
Enabled: false
# Offense count: 242
# Configuration parameters: EnforcedStyle.
# SupportedStyles: have_received, receive
RSpec/MessageSpies:
Enabled: false
# Offense count: 478
# Configuration parameters: AggregateFailuresByDefault.
RSpec/MultipleExpectations:
Max: 266
# Offense count: 83
# Configuration parameters: IgnoreSharedExamples.
RSpec/NamedSubject:
Exclude:
- 'spec/db/migrate/issue_2019_fix_double_domain_links_in_trigger_emails_spec.rb'
- 'spec/db/migrate/issue_2541_fix_notification_email_without_body_spec.rb'
- 'spec/lib/core_ext/string_spec.rb'
- 'spec/lib/import/exchange/folder_spec.rb'
- 'spec/lib/ldap/user_spec.rb'
- 'spec/lib/sequencer/unit/import/ldap/user/attributes/role_ids/unassigned_spec.rb'
- 'spec/lib/sessions/backend/activity_stream_spec.rb'
- 'spec/lib/upload_cache_spec.rb'
- 'spec/models/channel/filter/match/email_regex_spec.rb'
- 'spec/models/http_log_spec.rb'
- 'spec/models/object_manager/attribute/validation/backend_spec.rb'
- 'spec/models/object_manager/attribute/validation/future_past_spec.rb'
- 'spec/models/object_manager/attribute/validation/required_spec.rb'
- 'spec/models/object_manager/attribute/validation_spec.rb'
- 'spec/models/object_manager/attribute_spec.rb'
# Offense count: 545
RSpec/NestedGroups:
Max: 8
# Offense count: 12
RSpec/RepeatedDescription:
Exclude:
- 'spec/models/translation_spec.rb'
- 'spec/requests/form_spec.rb'
- 'spec/requests/ticket_spec.rb'
# Offense count: 3
RSpec/ScatteredLet:
Exclude:
- 'spec/models/job_spec.rb'
- 'spec/models/ticket_spec.rb'
- 'spec/requests/integration/twitter_webhook_spec.rb'
# Offense count: 11
RSpec/ScatteredSetup:
Exclude:
- 'spec/models/ticket_spec.rb'
- 'spec/models/user_spec.rb'
- 'spec/requests/upload_cache_spec.rb'
# Offense count: 8
RSpec/SubjectStub:
Exclude:
- 'spec/lib/import/exchange/folder_spec.rb'
- 'spec/models/concerns/has_groups_examples.rb'
- 'spec/models/concerns/has_roles_examples.rb'
- 'spec/models/job_spec.rb'
- 'spec/models/object_manager/attribute/validation/future_past_spec.rb'
- 'spec/models/object_manager/attribute/validation/required_spec.rb'
# Offense count: 25
# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
RSpec/VerifiedDoubles:
Enabled: false

91
.rubocop_todo.yml Normal file
View File

@@ -0,0 +1,91 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2019-09-02 13:20:31 +0200 using RuboCop version 0.74.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# Offense count: 163
# Cop supports --auto-correct.
# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
Layout/ExtraSpacing:
Enabled: false
# Offense count: 8
# Configuration parameters: MaximumRangeSize.
Lint/MissingCopEnableDirective:
Exclude:
- 'lib/import/factory.rb'
- 'lib/import/helper.rb'
- 'lib/import/otrs/async.rb'
- 'lib/import/otrs/history.rb'
- 'lib/import/otrs/priority_factory.rb'
- 'lib/import/otrs/state_factory.rb'
- 'lib/import/otrs/user_factory.rb'
- 'lib/import/transaction_factory.rb'
# ATTENTION: Don't use the value auto generated by Rubocop.
# db/migrate/20120101000001_create_base.rb is the largest and will continue to grow.
Metrics/AbcSize:
Enabled: false
# Offense count: 29
# Configuration parameters: CountBlocks.
Metrics/BlockNesting:
Max: 5
# Offense count: 340
Metrics/CyclomaticComplexity:
Max: 107
# Offense count: 27
# Configuration parameters: CountComments.
Metrics/ModuleLength:
Max: 578
# Offense count: 274
Metrics/PerceivedComplexity:
Max: 125
# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: Include.
# Include: **/test/**/*
Rails/AssertNot:
Exclude:
- 'test/browser/admin_permissions_granular_vs_full_test.rb'
# Offense count: 13
# Configuration parameters: Include.
# Include: db/migrate/*.rb
Rails/CreateTableWithTimestamps:
Exclude:
- 'db/migrate/20120101000001_create_base.rb'
- 'db/migrate/20120101000010_create_ticket.rb'
- 'db/migrate/20170419000002_overview_role_ids.rb'
- 'db/migrate/20170608151442_enhanced_permissions.rb'
# Offense count: 8
# Configuration parameters: Include.
# Include: app/models/**/*.rb
Rails/HasManyOrHasOneDependent:
Exclude:
- 'app/models/chat/session.rb'
- 'app/models/concerns/has_groups.rb'
- 'app/models/email_address.rb'
- 'app/models/organization.rb'
- 'app/models/signature.rb'
- 'app/models/ticket/state_type.rb'
- 'app/models/user.rb'
# Offense count: 808
Style/Documentation:
Enabled: false
# Offense count: 172
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: implicit, explicit
Style/RescueStandardError:
Enabled: false

1
.ruby-version Normal file
View File

@@ -0,0 +1 @@
2.6.6

72
CHANGELOG.md Normal file
View File

@@ -0,0 +1,72 @@
# Change Log
## [3.4.1](https://github.com/zammad/zammad/tree/3.4.1) (2020-09-22)
[Full Changelog](https://github.com/zammad/zammad/compare/3.4.0...3.4.1)
**Implemented enhancements:**
- Implement generic SSO button on login page [3128](https://github.com/zammad/zammad/issues/3128) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
- Attribute changes remove Owner of closed Ticket [3136](https://github.com/zammad/zammad/issues/3136) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
- Enhance/rework message header of forwarded mails [3091](https://github.com/zammad/zammad/issues/3091) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
- Allow uploaded S/MIME certificates to download in admin interface (like in other certificate managers) [3108](https://github.com/zammad/zammad/issues/3108) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
**Fixed bugs:**
- Endpoint api/v1/ticket_articles/by_ticket ignores X-On-Behalf-Of [3186](https://github.com/zammad/zammad/issues/3186) [[API](https://github.com/zammad/zammad/labels/API)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
- Active Google channels cause Email channels to loose email address every 86400s [3167](https://github.com/zammad/zammad/issues/3167) [[bug](https://github.com/zammad/zammad/labels/bug)] [[channel](https://github.com/zammad/zammad/labels/channel)]
- Adding a note during bulk operation only works for one ticket [2985](https://github.com/zammad/zammad/issues/2985) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[bulk](https://github.com/zammad/zammad/labels/bulk)] [[overviews](https://github.com/zammad/zammad/labels/overviews)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
- Article body gets updated/re-sanitized when updating other Article attribute [3138](https://github.com/zammad/zammad/issues/3138) [[bug](https://github.com/zammad/zammad/labels/bug)] [[trigger](https://github.com/zammad/zammad/labels/trigger)]
- Merging Tickets/Users/... does not update ExternalSync references [3123](https://github.com/zammad/zammad/issues/3123) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
- Deletion of communication article works for admins [3086](https://github.com/zammad/zammad/issues/3086) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
- Plus characters are stripped from email addresses and urls in ticket body [2494](https://github.com/zammad/zammad/issues/2494) [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
- Not all attributes if chats are indexed by elasticsearch (chat.name and tags are missing) [3095](https://github.com/zammad/zammad/issues/3095) [[bug](https://github.com/zammad/zammad/labels/bug)]
- ServiceNow mails from other service providers are not detected [3110](https://github.com/zammad/zammad/issues/3110) [[bug](https://github.com/zammad/zammad/labels/bug)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
- Search taskbars cause DeadLocks [3087](https://github.com/zammad/zammad/issues/3087) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[performance](https://github.com/zammad/zammad/labels/performance)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
- Failed to run import backend 'Import::Exchange'. Cause: Missing implementation of 'mapping' method for 'Sequencer::Unit::Import::Exchange::FolderContact::Mapping::Login' [3090](https://github.com/zammad/zammad/issues/3090) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)] [[regression](https://github.com/zammad/zammad/labels/regression)]
- Required Doorkeeper scope is missing and fails authentication [3085](https://github.com/zammad/zammad/issues/3085) [[API](https://github.com/zammad/zammad/labels/API)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[prioritised by payment](https://github.com/zammad/zammad/labels/prioritised by payment)]
## [3.4.0](https://github.com/zammad/zammad/tree/3.4.0) (2020-06-15)
[Full Changelog](https://github.com/zammad/zammad/compare/3.3.0...3.4.0)
**Implemented enhancements:**
- G Suite accounts will only allow access to apps using OAuth. Password-based access will no longer be supported. [2866](https://github.com/zammad/zammad/issues/2866) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
- Fullquote Header for forwarded mails [3014](https://github.com/zammad/zammad/pull/3014) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
- KB Links should be able to be displayed in the header and footer of the public KB [2867](https://github.com/zammad/zammad/issues/2867) [[admin area](https://github.com/zammad/zammad/labels/admin area)] [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)] [[theming / skinning](https://github.com/zammad/zammad/labels/theming / skinning)]
- Ensure email channel authentication to be ASCII-8Bit [2964](https://github.com/zammad/zammad/issues/2964) [[channel](https://github.com/zammad/zammad/labels/channel)] [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
- Custom ordering of Macros impossible (ordered by time added) [2698](https://github.com/zammad/zammad/issues/2698) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[macros](https://github.com/zammad/zammad/labels/macros)] [[overviews](https://github.com/zammad/zammad/labels/overviews)]
- RTL writing system support in Public KB [2598](https://github.com/zammad/zammad/issues/2598) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
- Detect ServiceNow follow-ups [3022](https://github.com/zammad/zammad/issues/3022) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[integration](https://github.com/zammad/zammad/labels/integration)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)]
- Enhance Check_MK integration to set ticket attributes (e. g. for SLAs) and improve code snippeds for integration. [3004](https://github.com/zammad/zammad/issues/3004) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
- Customer chat widget translation in Norwegian (no & nb) is missing [2999](https://github.com/zammad/zammad/issues/2999) [[chat](https://github.com/zammad/zammad/labels/chat)] [[enhancement](https://github.com/zammad/zammad/labels/enhancement)]
- Send Trigger and Scheduler Notification Email/SMS to single user [535](https://github.com/zammad/zammad/issues/535) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[feature backlog](https://github.com/zammad/zammad/labels/feature backlog)] [[trigger](https://github.com/zammad/zammad/labels/trigger)]
- Knowledge Base does't support animated GIFs and embedded Video (Youtube/Vimeo) content. [2713](https://github.com/zammad/zammad/issues/2713) [[enhancement](https://github.com/zammad/zammad/labels/enhancement)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
**Fixed bugs:**
- Password strength settings are ignored when creating new customer accounts [2907](https://github.com/zammad/zammad/issues/2907) [[bug](https://github.com/zammad/zammad/labels/bug)]
- S/MIME encryption [1961](https://github.com/zammad/zammad/issues/1961) [[feature backlog](https://github.com/zammad/zammad/labels/feature backlog)]
- add translation portuguese Brazil: pt-br [3073](https://github.com/zammad/zammad/pull/3073)
- Japanese encoding 7-bit iso-2022-jp is processed incorrectly [2498](https://github.com/zammad/zammad/issues/2498) [[bug](https://github.com/zammad/zammad/labels/bug)] [[mail processing](https://github.com/zammad/zammad/labels/mail processing)] [[third party issue](https://github.com/zammad/zammad/labels/third party issue)]
- Loading KB-Answers doesn't work for contained images [3060](https://github.com/zammad/zammad/issues/3060) [[bug](https://github.com/zammad/zammad/labels/bug)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
- Develop: Updating KB answers throws error 500 for agents without edit rights [3065](https://github.com/zammad/zammad/issues/3065) [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)]
- Develop: Access to calendar (ical) no longer works if being unauthenticated (Error 500) [3064](https://github.com/zammad/zammad/issues/3064) [[blocker](https://github.com/zammad/zammad/labels/blocker)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[personal settings/menu](https://github.com/zammad/zammad/labels/personal settings/menu)]
- SLA GUI - inconsistency when no checkmark is set [2282](https://github.com/zammad/zammad/issues/2282) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[admin area](https://github.com/zammad/zammad/labels/admin area)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[escalation logic](https://github.com/zammad/zammad/labels/escalation logic)]
- Backward compatibility of deleting own notes [2990](https://github.com/zammad/zammad/issues/2990) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[regression](https://github.com/zammad/zammad/labels/regression)]
- Deletion of notes impossible if internal and communication = true [2853](https://github.com/zammad/zammad/issues/2853) [[bug](https://github.com/zammad/zammad/labels/bug)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
- Hungarian translation to chat [3055](https://github.com/zammad/zammad/pull/3055) [[chat](https://github.com/zammad/zammad/labels/chat)] [[translation](https://github.com/zammad/zammad/labels/translation)]
- "Get latest translations" update all but latest locales [3054](https://github.com/zammad/zammad/issues/3054) [[bug](https://github.com/zammad/zammad/labels/bug)]
- Zammads resets attribute position if custom object is being updated [3044](https://github.com/zammad/zammad/issues/3044) [[bug](https://github.com/zammad/zammad/labels/bug)] [[object manager attribute](https://github.com/zammad/zammad/labels/object manager attribute)]
- Do not sort tables by (click on) header names if sortable by dnd is enabled (e. g. Admin -> Overview). [2548](https://github.com/zammad/zammad/issues/2548) [[bug](https://github.com/zammad/zammad/labels/bug)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)] [[overviews](https://github.com/zammad/zammad/labels/overviews)]
- Sorting overviews sometimes causes columns to jump [2995](https://github.com/zammad/zammad/issues/2995) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[bug](https://github.com/zammad/zammad/labels/bug)]
- Reply Article box closes when replying multiple times and placeholder covers input [3040](https://github.com/zammad/zammad/issues/3040) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
- miss package gawk on Debian [304](https://github.com/zammad/zammad/issues/304)
- Including KB Answers into Ticket Articles doesn't attach Attachments [2644](https://github.com/zammad/zammad/issues/2644) [[bug](https://github.com/zammad/zammad/labels/bug)] [[knowledge base](https://github.com/zammad/zammad/labels/knowledge base)] [[ticket](https://github.com/zammad/zammad/labels/ticket)]
- Zendesk import error [2941](https://github.com/zammad/zammad/issues/2941) [[bug](https://github.com/zammad/zammad/labels/bug)]
- Fix issue with table column resize in RTL (right to left) languages [2979](https://github.com/zammad/zammad/pull/2979)
- Chat add hebrew lang [2965](https://github.com/zammad/zammad/pull/2965)
- OTRS migration priority color wrong for 3 normal. [2981](https://github.com/zammad/zammad/issues/2981) [[bug](https://github.com/zammad/zammad/labels/bug)] [[import](https://github.com/zammad/zammad/labels/import)]
- Signup view broken after logout [2640](https://github.com/zammad/zammad/issues/2640) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[bug](https://github.com/zammad/zammad/labels/bug)]
- Zammad should not inform himself [2923](https://github.com/zammad/zammad/issues/2923) [[bug](https://github.com/zammad/zammad/labels/bug)] [[trigger](https://github.com/zammad/zammad/labels/trigger)]
- Triggers with current_user.id precondition are not executed [2982](https://github.com/zammad/zammad/issues/2982) [[bug](https://github.com/zammad/zammad/labels/bug)]
- Mails with voicemails attached not being added (#<ActiveRecord::ValueTooLong: PG::StringDataRightTruncation: ERROR: value too long for type character varying(2500) (RuntimeError)) [2971](https://github.com/zammad/zammad/issues/2971) [[bug](https://github.com/zammad/zammad/labels/bug)]
- Not possible to copy inline images text from article to article (copy text and image image - via clipboard ctrl+c/ctrl+v) [2976](https://github.com/zammad/zammad/issues/2976) [[bug](https://github.com/zammad/zammad/labels/bug)] [[frontend / JS app](https://github.com/zammad/zammad/labels/frontend / JS app)]
- Roles and Users selection in Overview administration UI ambiguous [2714](https://github.com/zammad/zammad/issues/2714) [[UX/UI](https://github.com/zammad/zammad/labels/UX/UI)] [[bug](https://github.com/zammad/zammad/labels/bug)] [[overviews](https://github.com/zammad/zammad/labels/overviews)]
- Fix typo for IntegrationClearBit [2940](https://github.com/zammad/zammad/pull/2940)

View File

@@ -23,6 +23,7 @@ W: https://github.com/tisar
--
N: Georg Klimm
D: Spezification & Organisation
W: https://github.com/gklimm
--
N: Johannes Nickel
D: Development & Project Organisation
@@ -30,13 +31,14 @@ W: https://github.com/hanneshal
--
N: Lorenzo Marschall
D: Project Organisation
W: https://github.com/lorenzomarschall
--
N: Martin Edenhofer
D: Development
W: https://github.com/martini
--
N: Roy Kaldung
D: Operations & QA Hero
D: DevOps & QA Hero
W: https://github.com/rkaldung
--
N: Felix Niklas

260
Gemfile
View File

@@ -1,103 +1,215 @@
source 'http://rubygems.org'
source 'https://rubygems.org'
gem 'rails', '4.1.5'
gem 'rails-observers'
# core - base
ruby '2.6.6'
gem 'rails', '5.2.4.4'
# core - rails additions
gem 'activerecord-import'
gem 'activerecord-session_store'
gem 'bootsnap', require: false
gem 'composite_primary_keys'
gem 'json'
gem 'rails-observers'
# core - application servers
gem 'puma', '~>3.12', group: :puma
gem 'unicorn', group: :unicorn
# core - supported ORMs
gem 'activerecord-nulldb-adapter', group: :nulldb
gem 'mysql2', '0.4.10', group: :mysql
gem 'pg', '0.21.0', group: :postgres
# core - asynchrous task execution
gem 'daemons'
gem 'delayed_job_active_record'
# core - websocket
gem 'em-websocket'
gem 'eventmachine'
# core - password security
gem 'argon2'
# core - state machine
gem 'aasm'
# core - authorization
gem 'pundit'
# core - image processing
gem 'rszr', '0.5.2'
# performance - Memcached
gem 'dalli'
# asset handling - coffee-script
gem 'coffee-rails'
gem 'coffee-script-source'
# asset handling - frontend templating
gem 'eco'
# Bundle edge Rails instead:
#gem 'rails', :git => 'git://github.com/rails/rails.git'
# asset handling - SASS
gem 'sassc-rails'
gem 'json'
# asset handling - pipeline
gem 'sprockets', '~> 3.7.2'
gem 'uglifier'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', github: 'rails/sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end
gem 'autoprefixer-rails'
gem 'omniauth'
gem 'omniauth-twitter'
gem 'omniauth-facebook'
gem 'omniauth-linkedin'
gem 'omniauth-google-oauth2'
gem 'twitter', '~> 5.8'
gem 'koala'
gem 'mail'
gem 'mime-types'
gem 'delayed_job_active_record'
gem 'daemons'
gem 'simple-rss'
# e. g. on linux we need a javascript execution
gem 'libv8', '~> 3.11.8'
# asset handling - javascript execution for e.g. linux
gem 'execjs'
gem 'therubyracer'
gem 'libv8'
gem 'mini_racer'
# e. g. for mysql you need to load mysql
gem 'mysql2'
#gem 'sqlite3'
# authentication - provider
gem 'doorkeeper'
gem 'oauth2'
#platforms :jruby do
# gem 'jruby-openssl'
# gem 'activerecord-jdbcmysql-adapter'
#end
# authentication - third party
gem 'omniauth-rails_csrf_protection'
gem 'net-ldap'
# authentication - third party providers
gem 'omniauth-facebook'
gem 'omniauth-github'
gem 'omniauth-gitlab'
gem 'omniauth-google-oauth2'
gem 'omniauth-linkedin-oauth2'
gem 'omniauth-microsoft-office365'
gem 'omniauth-oauth2'
gem 'omniauth-saml'
gem 'omniauth-twitter'
gem 'omniauth-weibo-oauth2'
# channels
gem 'gmail_xoauth'
gem 'koala'
gem 'telegramAPI'
gem 'twitter', git: 'https://github.com/sferik/twitter.git'
# channels - email additions
gem 'htmlentities'
gem 'mail', git: 'https://github.com/zammad-deps/mail', branch: '2-7-stable'
gem 'mime-types'
gem 'rchardet', '>= 1.8.0'
gem 'valid_email2'
# feature - business hours
gem 'biz'
# feature - signature diffing
gem 'diffy'
# feature - excel output
gem 'writeexcel'
# Use unicorn as the web server
# gem 'unicorn'
# feature - device logging
gem 'browser'
# Deploy with Capistrano
# gem 'capistrano'
# feature - iCal export
gem 'icalendar'
gem 'icalendar-recurrence'
# To use debugger
# gem 'ruby-debug'
# feature - phone number formatting
gem 'telephone_number'
# event machine
gem 'eventmachine'
gem 'em-websocket'
# feature - SMS
gem 'twilio-ruby'
# Gems used only for develo//test and not required
# feature - ordering
gem 'acts_as_list'
# integrations
gem 'clearbit'
gem 'net-ldap'
gem 'slack-notifier'
gem 'zendesk_api'
# integrations - exchange
gem 'autodiscover', git: 'https://github.com/zammad-deps/autodiscover'
gem 'rubyntlm', git: 'https://github.com/wimm/rubyntlm'
gem 'viewpoint'
# integrations - S/MIME
gem 'openssl'
# Gems used only for develop/test and not required
# in production environments by default.
group :development, :test do
gem 'test-unit'
gem 'spring'
gem 'sqlite3'
# app boottime improvement
gem 'spring'
gem 'spring-commands-rspec'
gem 'spring-commands-testunit'
# code coverage
gem 'simplecov'
gem 'simplecov-rcov'
# debugging
gem 'byebug'
gem 'pry-rails'
gem 'pry-remote'
gem 'pry-rescue'
gem 'pry-stack_explorer'
# UI tests w/ Selenium
gem 'selenium-webdriver'
# test frameworks
gem 'rails-controller-testing'
gem 'rspec-rails'
gem 'shoulda-matchers'
gem 'test-unit'
# rest client lib for unit tests
gem 'faraday'
# for testing Pundit authorisation policies in RSpec
gem 'pundit-matchers'
# livereload on template changes (html, js, css)
gem 'guard', '>= 2.2.2', :require => false
gem 'guard-livereload', :require => false
gem 'rack-livereload'
gem 'rb-fsevent', :require => false
# code coverage
gem 'coveralls', require: false
gem 'simplecov'
gem 'simplecov-rcov'
# websocket unit tests
# gem 'em-websocket-client'
# UI tests w/ Selenium
gem 'capybara'
gem 'selenium-webdriver'
# livereload on template changes (html, js, css)
gem 'guard', require: false
gem 'guard-livereload', require: false
gem 'rack-livereload', require: false
gem 'rb-fsevent', require: false
# auto symlinking
gem 'guard-symlink', require: false
# code QA
gem 'coffeelint'
gem 'pre-commit'
gem 'rubocop'
gem 'rubocop-performance'
gem 'rubocop-rails'
gem 'rubocop-rspec'
# changelog generation
gem 'github_changelog_generator'
# generate random test data
gem 'factory_bot_rails'
gem 'faker'
# mock http calls
gem 'webmock'
# record and replay TCP/HTTP transactions
gem 'tcr', git: 'https://github.com/zammad-deps/tcr'
gem 'vcr'
# handle deprecations in core and addons
gem 'deprecation_toolkit'
end
# to generate doc
gem 'kramdown'
gem 'prawn'
gem 'prawn-table'
gem 'puma'
# Want to extend Zammad with additional gems?
# ZAMMAD USERS: Specify them in Gemfile.local
# (That way, you can customize the Gemfile
# without having your changes overwritten during upgrades.)
# ZAMMAD DEVS: Consult the internal wiki
# (or else risk pushing unwanted changes to Gemfile.lock!)
# https://git.znuny.com/zammad/zammad/wikis/Tips#user-content-customizing-the-gemfile
eval_gemfile 'Gemfile.local' if File.exist?('Gemfile.local')

686
Gemfile.lock Normal file
View File

@@ -0,0 +1,686 @@
GIT
remote: https://github.com/sferik/twitter.git
revision: 844818cad07ce490ccb9d8542ebb6b4fc7a61cb4
specs:
twitter (6.2.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.11)
http (~> 3.0)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
memoizable (~> 0.4.0)
multipart-post (~> 2.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
GIT
remote: https://github.com/wimm/rubyntlm
revision: 53969639b87b9e5d5fef560f19cf0d977259591c
specs:
rubyntlm (0.1.2)
GIT
remote: https://github.com/zammad-deps/autodiscover
revision: ee9b53dfa797ce6d4f970b82beea7fbdd2df56bb
specs:
autodiscover (1.0.2)
httpclient
logging
nokogiri
nori
GIT
remote: https://github.com/zammad-deps/mail
revision: 9265cf75bbe376f595944bd10d2dd953f863e765
branch: 2-7-stable
specs:
mail (2.7.2.edge)
mini_mime (>= 0.1.1)
GIT
remote: https://github.com/zammad-deps/tcr
revision: ddc8caf9d57a991c8af850d2870969e7a265ec59
specs:
tcr (0.2.1)
GEM
remote: https://rubygems.org/
specs:
aasm (5.0.0)
concurrent-ruby (~> 1.0)
actioncable (5.2.4.4)
actionpack (= 5.2.4.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.4)
actionpack (= 5.2.4.4)
actionview (= 5.2.4.4)
activejob (= 5.2.4.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.4)
actionview (= 5.2.4.4)
activesupport (= 5.2.4.4)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.4)
activesupport (= 5.2.4.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.4)
activesupport (= 5.2.4.4)
globalid (>= 0.3.6)
activemodel (5.2.4.4)
activesupport (= 5.2.4.4)
activerecord (5.2.4.4)
activemodel (= 5.2.4.4)
activesupport (= 5.2.4.4)
arel (>= 9.0)
activerecord-import (1.0.2)
activerecord (>= 3.2)
activerecord-nulldb-adapter (0.3.9)
activerecord (>= 2.0.0)
activerecord-session_store (1.1.3)
actionpack (>= 4.0)
activerecord (>= 4.0)
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0)
activestorage (5.2.4.4)
actionpack (= 5.2.4.4)
activerecord (= 5.2.4.4)
marcel (~> 0.3.1)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_list (0.9.19)
activerecord (>= 3.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (9.0.0)
argon2 (2.0.2)
ffi (~> 1.9)
ffi-compiler (>= 0.1)
ast (2.4.0)
autoprefixer-rails (9.5.1)
execjs
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
biz (1.8.2)
clavius (~> 1.0)
tzinfo
bootsnap (1.3.2)
msgpack (~> 1.0)
browser (2.5.3)
buftok (0.2.0)
builder (3.2.4)
byebug (11.0.1)
capybara (3.32.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (1.0.1)
rake (< 13.0)
clavius (1.0.4)
clearbit (0.2.8)
nestful (~> 1.1.0)
coderay (1.1.2)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
coffeelint (1.16.1)
coffee-script
execjs
json
composite_primary_keys (11.2.0)
activerecord (~> 5.2.1)
concurrent-ruby (1.1.6)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
daemons (1.3.1)
dalli (2.7.10)
debug_inspector (0.0.3)
delayed_job (4.1.7)
activesupport (>= 3.0, < 5.3)
delayed_job_active_record (4.1.3)
activerecord (>= 3.0, < 5.3)
delayed_job (>= 3.0, < 5)
deprecation_toolkit (1.4.0)
activesupport (>= 4.2)
diff-lcs (1.3)
diffy (3.3.0)
docile (1.3.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.3.2)
railties (>= 5)
eco (1.0.0)
coffee-script
eco-source
execjs
eco-source (1.1.0.rc.1)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
equalizer (0.0.11)
erubi (1.9.0)
eventmachine (1.2.7)
execjs (2.7.0)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
factory_bot_rails (5.0.2)
factory_bot (~> 5.0.2)
railties (>= 4.2.0)
faker (1.9.3)
i18n (>= 0.7)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
ffi (1.11.1)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
formatador (0.2.5)
github_changelog_generator (1.14.3)
activesupport
faraday-http-cache
multi_json
octokit (~> 4.6)
rainbow (>= 2.1)
rake (>= 10.0)
retriable (~> 2.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
gmail_xoauth (0.4.2)
oauth (>= 0.3.6)
guard (2.15.0)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-livereload (2.5.2)
em-websocket (~> 0.5)
guard (~> 2.8)
guard-compat (~> 1.0)
multi_json (~> 1.8)
guard-symlink (0.1.1)
guard
guard-compat (~> 1.1)
hashdiff (0.3.8)
hashie (3.6.0)
htmlentities (4.3.4)
http (3.3.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (2.1.1)
http_parser.rb (0.6.0)
httpclient (2.8.3)
i18n (1.8.3)
concurrent-ruby (~> 1.0)
icalendar (2.5.3)
ice_cube (~> 0.16)
icalendar-recurrence (1.1.2)
icalendar (~> 2.0)
ice_cube (~> 0.13)
ice_cube (0.16.3)
inflection (1.0.0)
interception (0.5)
json (2.3.0)
jwt (2.2.1)
kgio (2.11.2)
koala (3.0.0)
addressable
faraday
json (>= 1.8)
libv8 (7.3.492.27.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
marcel (0.3.3)
mimemagic (~> 0.3.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_racer (0.2.9)
libv8 (>= 6.9.411)
minitest (5.14.1)
msgpack (1.2.4)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
mysql2 (0.4.10)
naught (1.1.0)
nenv (0.3.0)
nestful (1.1.3)
net-ldap (0.16.1)
netrc (0.11.0)
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
nori (2.6.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
oauth (0.5.4)
oauth2 (1.4.4)
faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0)
rack (>= 1.6.2, < 3)
omniauth-facebook (5.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.4.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-gitlab (2.0.0)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-google-oauth2 (0.6.1)
jwt (>= 2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
omniauth-linkedin-oauth2 (1.0.0)
omniauth-oauth2
omniauth-microsoft-office365 (0.0.7)
omniauth
omniauth-oauth2
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.6.0)
oauth2 (~> 1.1)
omniauth (~> 1.9)
omniauth-rails_csrf_protection (0.1.2)
actionpack (>= 4.2)
omniauth (>= 1.3.1)
omniauth-saml (1.10.1)
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.7)
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
omniauth-weibo-oauth2 (0.5.2)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0)
openssl (2.1.2)
parallel (1.19.1)
parser (2.7.1.3)
ast (~> 2.4.0)
pg (0.21.0)
pluginator (1.5.0)
power_assert (1.1.4)
pre-commit (0.39.0)
pluginator (~> 1.5)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
pry-rescue (1.5.0)
interception (>= 0.5)
pry (>= 0.12.0)
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (3.1.1)
puma (3.12.6)
pundit (2.0.1)
activesupport (>= 3.0.0)
pundit-matchers (1.6.0)
rspec-rails (>= 3.0.0)
rack (2.2.3)
rack-livereload (0.3.17)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.4)
actioncable (= 5.2.4.4)
actionmailer (= 5.2.4.4)
actionpack (= 5.2.4.4)
actionview (= 5.2.4.4)
activejob (= 5.2.4.4)
activemodel (= 5.2.4.4)
activerecord (= 5.2.4.4)
activestorage (= 5.2.4.4)
activesupport (= 5.2.4.4)
bundler (>= 1.3.0)
railties (= 5.2.4.4)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
actionview (>= 5.0.1.x)
activesupport (>= 5.0.1.x)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-observers (0.1.5)
activemodel (>= 4.0)
railties (5.2.4.4)
actionpack (= 5.2.4.4)
activesupport (= 5.2.4.4)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
raindrops (0.19.0)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rchardet (1.8.0)
regexp_parser (1.7.1)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (2.1.0)
rexml (3.2.4)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-rails (3.9.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.3)
rszr (0.5.2)
rubocop (0.85.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.0.3)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.0.3)
parser (>= 2.7.0.1)
rubocop-performance (1.6.1)
rubocop (>= 0.71.0)
rubocop-rails (2.6.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.82.0)
rubocop-rspec (1.39.0)
rubocop (>= 0.68.1)
ruby-progressbar (1.10.1)
ruby-saml (1.10.2)
nokogiri (>= 1.5.10)
ruby_dep (1.5.0)
rubyzip (1.3.0)
safe_yaml (1.0.5)
sassc (2.0.1)
ffi (~> 1.9)
rake
sassc-rails (2.1.1)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
shellany (0.0.1)
shoulda-matchers (4.0.1)
activesupport (>= 4.2.0)
simple_oauth (0.3.1)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slack-notifier (2.3.2)
slop (3.6.0)
spring (2.1.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring-commands-testunit (1.0.1)
spring (>= 0.9.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
telegramAPI (1.4.2)
rest-client (~> 2.0, >= 2.0.2)
telephone_number (1.4.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
test-unit (3.3.3)
power_assert
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.9)
tins (1.20.2)
twilio-ruby (5.23.0)
faraday (~> 0.9)
jwt (>= 1.5, <= 2.5)
nokogiri (>= 1.6, < 2.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.7.0)
unicorn (5.5.0)
kgio (~> 2.6)
raindrops (~> 0.7)
valid_email2 (3.0.1)
activemodel (>= 3.2)
mail (~> 2.5)
vcr (4.0.0)
viewpoint (1.1.0)
httpclient
logging
nokogiri
rubyntlm
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
writeexcel (1.0.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zendesk_api (1.19.0)
faraday (~> 0.9)
hashie (>= 3.5.2, < 4.0.0)
inflection
mime-types
multipart-post (~> 2.0)
PLATFORMS
ruby
DEPENDENCIES
aasm
activerecord-import
activerecord-nulldb-adapter
activerecord-session_store
acts_as_list
argon2
autodiscover!
autoprefixer-rails
biz
bootsnap
browser
byebug
capybara
clearbit
coffee-rails
coffee-script-source
coffeelint
composite_primary_keys
coveralls
daemons
dalli
delayed_job_active_record
deprecation_toolkit
diffy
doorkeeper
eco
em-websocket
eventmachine
execjs
factory_bot_rails
faker
github_changelog_generator
gmail_xoauth
guard
guard-livereload
guard-symlink
htmlentities
icalendar
icalendar-recurrence
json
koala
libv8
mail!
mime-types
mini_racer
mysql2 (= 0.4.10)
net-ldap
oauth2
omniauth-facebook
omniauth-github
omniauth-gitlab
omniauth-google-oauth2
omniauth-linkedin-oauth2
omniauth-microsoft-office365
omniauth-oauth2
omniauth-rails_csrf_protection
omniauth-saml
omniauth-twitter
omniauth-weibo-oauth2
openssl
pg (= 0.21.0)
pre-commit
pry-rails
pry-remote
pry-rescue
pry-stack_explorer
puma (~> 3.12)
pundit
pundit-matchers
rack-livereload
rails (= 5.2.4.4)
rails-controller-testing
rails-observers
rb-fsevent
rchardet (>= 1.8.0)
rspec-rails
rszr (= 0.5.2)
rubocop
rubocop-performance
rubocop-rails
rubocop-rspec
rubyntlm!
sassc-rails
selenium-webdriver
shoulda-matchers
simplecov
simplecov-rcov
slack-notifier
spring
spring-commands-rspec
spring-commands-testunit
sprockets (~> 3.7.2)
tcr!
telegramAPI
telephone_number
test-unit
twilio-ruby
twitter!
uglifier
unicorn
valid_email2
vcr
viewpoint
webmock
writeexcel
zendesk_api
RUBY VERSION
ruby 2.6.6p146
BUNDLED WITH
1.17.3

View File

@@ -1,11 +1,13 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme
guard 'livereload' do
guard :livereload, port: '35738' do
watch(%r{app/views/.+\.(erb|haml|slim)$})
watch(%r{app/helpers/.+\.rb})
watch(%r{public/.+\.(css|js|html)})
watch(%r{config/locales/.+\.yml})
# Rails Assets Pipeline
watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg|svg))).*}) { |m| "/assets/#{m[3]}" }
watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|coffee|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
watch(%r{(app|vendor)(/assets/\w+/(.+)\.(scss))}) { |m| "/assets/#{m[3]}.css" }
watch(%r{(app|vendor)(/assets/\w+/(.+)\.(svg))}) { |m| "/assets/#{m[3]}.svg" }
end

661
LICENSE Normal file
View File

@@ -0,0 +1,661 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.

190
LICENSE-3RD-PARTY.txt Normal file
View File

@@ -0,0 +1,190 @@
-----------------------------------------------------------------------------
ba-linkify.js
Source: http://benalman.com/code/test/js-linkify/
Copyright: 2009 "Cowboy" Ben Alman
License: MIT license
-----------------------------------------------------------------------------
bootstrap
Source: https://github.com/twbs/bootstrap
Copyright: 2011-2015 Twitter, Inc.
License: MIT license
-----------------------------------------------------------------------------
bootstrap-datepicker.js
Source: https://github.com/eternicode/bootstrap-datepicker
Copyright: Stefan Petre, Andrew Rowls
License: Apache License, Version 2.0
-----------------------------------------------------------------------------
bootstrap-timepicker.js
Source: https://github.com/jdewit/bootstrap-timepicker
Copyright: 2013 Joris de Wit
License: MIT license
-----------------------------------------------------------------------------
bootstrap-tokenfield.js
Source: https://github.com/sliptree/bootstrap-tokenfield
Copyright 2013-2014 Sliptree and other contributors
License: MIT license
-----------------------------------------------------------------------------
clipboard.js
Source: https://github.com/lgarron/clipboard.js
Copyright: 2015 Lucas Garron (https://garron.net/)
License: MIT license
-----------------------------------------------------------------------------
cropper.js
Source: https://github.com/fengyuanchen/cropper
Copyright: 2014-2015 Fengyuan Chen and contributors
License: MIT license
-----------------------------------------------------------------------------
desktop-notify.js
Source: https://github.com/ttsvetko/HTML5-Desktop-Notifications
Copyright: Tsvetan Tsvetkov <tsekach@gmail.com>
License: Apache License, Version 2.0
-----------------------------------------------------------------------------
email-addresses.js
Source: https://github.com/jackbowman/email-addresses
Copyright: 2013 Fog Creek Software, Jack Bowman (https://github.com/jackbowman)
License: MIT license
-----------------------------------------------------------------------------
expanding.js
Source: https://github.com/bgrins/ExpandingTextareas
Copyright: Brian Grinstead (https://github.com/bgrins)
License: MIT license
-----------------------------------------------------------------------------
Exif.js
Source: https://github.com/exif-js/exif-js
Copyright: Jacob Seidelin, Roald de Vries
License: MIT license
-----------------------------------------------------------------------------
highlight.pack.js
Source: https://highlightjs.org
Copyright: 2006 Ivan Sagalaev (https://github.com/isagalaev)
License: BSD License (BSD-3-Clause)
-----------------------------------------------------------------------------
jquery.flot.js
Source: https://github.com/dnschnur/flot
Copyright: Ole Laursen, IOLA
License: MIT license
-----------------------------------------------------------------------------
jquery-scrollto.js
Source: https://github.com/balupton/jquery-scrollto
Copyright: Bevry Pty Ltd <us@bevry.me>
Benjamin Lupton <b@lupton.cc>
License: MIT license
-----------------------------------------------------------------------------
jquery.fineuploader-3.0.js
Source: http://github.com/Valums-File-Uploader/file-uploader
Copyright: 2010 Andrew Valums <andrew(at)valums.com>
2012 Ray Nicholus <fineuploader(at)garstasio.com>
License: GNU GPL 2 or later, GNU LGPL 2 or later
-----------------------------------------------------------------------------
jquery.noty.js
Source: https://github.com/needim/noty/
Copyright: 2012 Nedim Arabacı
License: MIT license
-----------------------------------------------------------------------------
jquery.sew.js
Source: https://github.com/tactivos/jquery-sew
Copyright: @leChanteaux <santiago at mural.ly>
Mural.ly Dev Team <dev at mural.ly>
License: dfyw
-----------------------------------------------------------------------------
jquery.js
Source: http://jquery.com/
Copyright: 2005, 2014 jQuery Foundation, Inc.
License: MIT license
-----------------------------------------------------------------------------
jquery-ui.js
Source: https://jqueryui.com
Copyright: 2014 jQuery Foundation
License: MIT license
-----------------------------------------------------------------------------
jquery.hotkeys.js
Source: https://github.com/jeresig/jquery.hotkeys
Copyright: 2010 John Resig
License: Dual licensed under the MIT or GPL Version 2 licenses.
-----------------------------------------------------------------------------
jquery.visible.js
Source: https://github.com/customd/jquery-visible
Copyright: 2012, Digital Fusion
License: MIT license
-----------------------------------------------------------------------------
marked.js
Source: https://github.com/chjj/marked
Copyright: 2011-2014, Christopher Jeffrey
License: MIT license
-----------------------------------------------------------------------------
modernizer.js
Source: https://modernizr.com
Copyright: Faruk Ates (https://twitter.com/KuraFire)
Paul Irish (https://twitter.com/paul_irish)
Alex Sexton (https://twitter.com/SlexAxton)
Ryan Seddon (https://twitter.com/ryanseddon)
Patrick Kettner (https://twitter.com/patrickkettner)
Stu Cox (https://twitter.com/stucoxmedia)
Richard Herrera (https://twitter.com/doctyper)
License: MIT license & BSD license
-----------------------------------------------------------------------------
rangy.js
Source: https://github.com/timdown/rangy
Copyright: 2015, Tim Down
License: MIT license
-----------------------------------------------------------------------------
seedrandom.js
Source: https://github.com/davidbau/seedrandom
Copyright: 2014 David Bau.
License: MIT license
-----------------------------------------------------------------------------
tinycolor.js
Source: https://github.com/bgrins/TinyColor
Copyright: Brian Grinstead
License: MIT license
-----------------------------------------------------------------------------
ua-parser.js
Source: https://github.com/faisalman/ua-parser-js
Copyright: 2012-2015 Faisal Salman <fyzlman@gmail.com>
License: MIT license & GPLv2
-----------------------------------------------------------------------------
velocity.js
Source: https://github.com/julianshapiro/velocity
Copyright: 2014 The jQuery Foundation
License: MIT license
-----------------------------------------------------------------------------
underscore.js
Source: http://underscorejs.org
Copyright: 2009-2015 Jeremy Ashkenas, DocumentCloud
License: MIT license
-----------------------------------------------------------------------------
spine.js
Source: http://spinejs.com
Copyright: 2011 Alex MacCaw <info@eribium.org>
License: MIT license
-----------------------------------------------------------------------------
word_filter.js
Source: https://gist.github.com/sbrin/6801034
Copyright: 2015, sbrin - https://github.com/sbrin
License: MIT license
-----------------------------------------------------------------------------
ant-design icon font
Source: https://github.com/ant-design/ant-design
Copyright: 2015-present Alipay.com, https://www.alipay.com/
License: MIT license
-----------------------------------------------------------------------------
Font Awesome icon font
Source: http://fontawesome.io/
Copyright: Font Awesome by Dave Gandy - http://fontawesome.io
License: MIT License
-----------------------------------------------------------------------------
Simple line icons font
Source: https://github.com/thesabbir/simple-line-icons
Copyright: 2016 Sabbir Ahmed & All Contributors
License: MIT license
-----------------------------------------------------------------------------
Ionicons icon font
Source: https://github.com/ionic-team/ionicons
Copyright: 2016 Drifty (http://drifty.com/)
License: MIT license
-----------------------------------------------------------------------------
Material icon font
Source: https://github.com/google/material-design-icons
Copyright: Google
License: Apache License, Version 2.0
-----------------------------------------------------------------------------

View File

@@ -0,0 +1,697 @@
{
"archived-modifier.svg": {
"author": "",
"url": "",
"license": ""
},
"arrow-down.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"arrow-left.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"arrow-right.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"arrow-up.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"bold.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"chain.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"chat.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"checkbox-checked.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"checkbox-indeterminate.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"checkbox.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"checkmark.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"clipboard.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"clock.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"cloud.svg": {
"author": "Kirill Ulitin",
"url": "https:\/\/thenounproject.com\/search\/?q=cloud&i=84976",
"license": "CC 3.0 Attribution"
},
"cog.svg": {
"author": "Melvin Salas",
"url": "https:\/\/thenounproject.com\/term\/gear\/17369\/",
"license": "CC 3.0 Attribution"
},
"crown.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"danger.svg": {
"author": "",
"url": "",
"license": ""
},
"dashboard.svg": {
"author": "Anton Gajdosik",
"url": "https:\/\/thenounproject.com\/term\/gauge\/186120",
"license": "CC 3.0 Attribution"
},
"diagonal-cross.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"document.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"download.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"draft-modifier.svg": {
"author": "",
"url": "",
"license": ""
},
"draggable.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"dropdown-list.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"email-button.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"email.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"external.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"eye.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"eyedropper.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"facebook-button.svg": {
"author": "Facebook",
"url": "",
"license": ""
},
"facebook.svg": {
"author": "Facebook",
"url": "",
"license": ""
},
"file-archive.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"file-code.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"file-email.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"file-excel.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"file-pdf.svg": {
"author": "Adobe",
"url": "",
"license": ""
},
"file-powerpoint.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"file-text.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"file-unknown.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"file-word.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"form.svg": {
"author": "Pickin Studio",
"url": "https:\/\/thenounproject.com\/search\/?q=website&i=16523",
"license": "CC 3.0 Attribution"
},
"forward.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"full-logo.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"github-button.svg": {
"author": "Github",
"url": "",
"license": ""
},
"gitlab-button.svg": {
"author": "Gitlab",
"url": "",
"license": ""
},
"google-button.svg": {
"author": "Google",
"url": "",
"license": ""
},
"group.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"help.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"horizontal-rule.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"important.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"in-process.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"inactive-organization.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"inactive-user.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"info.svg": {
"author": "Information by Gregor \u010cre\u0161nar from the Noun Project",
"url": "https:\/\/thenounproject.com\/search\/?q=info&i=176431",
"license": "CC 3.0 Attribution"
},
"internal-modifier.svg": {
"author": "",
"url": "",
"license": ""
},
"italic.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"knowledge-base-answer.svg": {
"author": "",
"url": "",
"license": ""
},
"knowledge-base.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"line-left-arrow.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"line-right-arrow.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"linkedin-button.svg": {
"author": "Linkedin",
"url": "",
"license": ""
},
"list.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"loading.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"lock-open.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"lock.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"logo.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"logotype.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"long-arrow-down.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"long-arrow-right.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"low-priority.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"magnifier.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"marker.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"message.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"minus-small.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"minus.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"mood-bad.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"mood-good.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"mood-ok.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"mood-sad.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"mood-superbad.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"mood-supergood.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"mute.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"not-signed.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"note.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"oauth2-button.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"office365-button.svg": {
"author": "Office 365",
"url": "",
"license": ""
},
"one-ticket.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"organization.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"outbound-calls.svg": {
"author": "Michael Zenaty",
"url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
"license": "CC 3.0 Attribution"
},
"overflow-button.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"overviews.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"package.svg": {
"author": "Michael Wallner",
"url": "https:\/\/thenounproject.com\/search\/?q=package&i=25152",
"license": "CC 3.0 Attribution"
},
"paperclip.svg": {
"author": "Cheesefork",
"url": "https:\/\/thenounproject.com\/search\/?q=attachment&i=197956",
"license": "CC 3.0 Attribution"
},
"pen.svg": {
"author": "Dmitry Baranovskiy",
"url": "https:\/\/thenounproject.com\/search\/?q=edit&i=5039",
"license": "CC 3.0 Attribution"
},
"person.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"phone.svg": {
"author": "Michael Zenaty",
"url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
"license": "CC 3.0 Attribution"
},
"plus-small.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"plus.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"printer.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"radio-checked.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"radio.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"rearange.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"received-calls.svg": {
"author": "Michael Zenaty",
"url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
"license": "CC 3.0 Attribution"
},
"reload.svg": {
"author": "Anand A Nair",
"url": "https:\/\/thenounproject.com\/anandgrafiti\/uploads\/?i=2149",
"license": "CC 3.0 Attribution"
},
"reopening.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"reply-all.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"reply.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"report.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"searchdetail.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"signed.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"signout.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"small-dot.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"sms.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"spinner-small.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"split.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"status-modified-outer-circle.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"status.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"stopwatch.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"strikethrough.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"switchView.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"task-state.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"team.svg": {
"author": "R\u00e9my M\u00e9dard",
"url": "https:\/\/thenounproject.com\/catalarem\/uploads\/?i=2554",
"license": "CC 3.0 Attribution"
},
"telegram.svg": {
"author": "Telegram",
"url": "",
"license": ""
},
"templates.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"tools.svg": {
"author": "Michael Kussmaul",
"url": "https:\/\/thenounproject.com\/term\/tools\/41655\/",
"license": "CC 3.0 Attribution"
},
"total-tickets.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"trash.svg": {
"author": "Filip Malinowski",
"url": "https:\/\/thenounproject.com\/term\/trash\/16505\/",
"license": "CC 3.0 Attribution"
},
"twitter-button.svg": {
"author": "Twitter",
"url": "twitter.com",
"license": ""
},
"twitter.svg": {
"author": "Twitter",
"url": "twitter.com",
"license": ""
},
"underline.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"unmute.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"unordered-list.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"user.svg": {
"author": "R\u00e9my M\u00e9dard",
"url": "https:\/\/thenounproject.com\/search\/?q=user&i=10314",
"license": "CC 3.0 Attribution"
},
"web.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
"weibo-button.svg": {
"author": "Weibo",
"url": "",
"license": ""
},
"zoom-in.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"zoom-out.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
"sso-button.svg": {
"author": "Tanu Doank",
"url": "https://thenounproject.com/term/key/1247931/",
"license": "CC 3.0 Attribution"
}
}

3
Procfile Normal file
View File

@@ -0,0 +1,3 @@
web: bundle exec script/rails server -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_RAILS_PORT:=3000}
websocket: bundle exec script/websocket-server.rb -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_WEBSOCKET_PORT:=6042} start
worker: bundle exec script/scheduler.rb start -t

9
Procfile.frontend Normal file
View File

@@ -0,0 +1,9 @@
web: bundle exec script/rails server -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_RAILS_PORT:=3000}
websocket: bundle exec script/websocket-server.rb -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_WEBSOCKET_PORT:=6042} start
worker: bundle exec script/scheduler.rb start -t
guard: bundle exec guard -i
// This is NOT the `gulp` Ruby gem.
// Use yarn (or npm) to install the `gulp` npm package,
// then add node_modules/.bin to your $PATH.
gulp: gulp

View File

@@ -1,63 +1,46 @@
[![Build Status](http://ci.zammad.org/buildStatus/icon?job=ZammadUnittest-ruby-2.0.0-p195)](http://ci.zammad.org/job/ZammadUnittest-ruby-2.0.0-p195/)
Welcome to Zammad
=================
# Welcome to Zammad
Zammad is a web based open source helpdesk/ticket system with many features
to manage customer telephone calls and e-mails. It is distributed under the
GNU AFFERO General Public License (AGPL) and tested on Linux, Solaris, AIX,
Windows, FreeBSD, OpenBSD and Mac OS 10.x. Do you receive many e-mails and
want to answer them with a team of agents? You're going to love Zammad!
Zammad is a web based open source helpdesk/customer support system with many
features to manage customer communication via several channels like telephone,
facebook, twitter, chat and e-mails. It is distributed under version 3 of the
GNU AFFERO General Public License (GNU AGPLv3).
Do you receive many e-mails and want to answer them with a team of agents?
You're going to love Zammad!
## Status
- Build: [![Build Status](https://circleci.com/gh/zammad/zammad/tree/develop.svg?style=svg)](https://circleci.com/gh/zammad/zammad/tree/develop)
- Code: [![Code Climate](https://codeclimate.com/github/zammad/zammad/badges/gpa.svg)](https://codeclimate.com/github/zammad/zammad) [![Coverage Status](https://coveralls.io/repos/github/zammad/zammad/badge.svg)](https://coveralls.io/github/zammad/zammad)
- Docs: [![Documentation Status](https://readthedocs.org/projects/zammad/badge/)](https://docs.zammad.org)
- Issues: [![Percentage of issues still open](http://isitmaintained.com/badge/open/zammad/zammad.svg)](https://github.com/zammad/zammad/issues "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/zammad/zammad.svg)](https://github.com/zammad/zammad/issues?q=is%3Aissue+is%3Aclosed "Average time to resolve an issue")
- Download DEB/RPM: [![](https://img.shields.io/badge/Branch-develop-lightgrey.svg)](https://packager.io/gh/zammad/zammad#develop) [![](https://img.shields.io/badge/Branch-stable-lightgrey.svg)](https://packager.io/gh/zammad/zammad#stable)
- Docker multi container image: [![](https://images.microbadger.com/badges/image/zammad/zammad-docker-compose:zammad.svg)](https://microbadger.com/images/zammad/zammad-docker-compose:zammad) [![](https://img.shields.io/badge/version-stable-blue.svg)](https://hub.docker.com/r/zammad/zammad-docker-compose)
- Docker single container image: [![](https://images.microbadger.com/badges/image/zammad/zammad.svg)](https://microbadger.com/images/zammad/zammad) [![](https://images.microbadger.com/badges/version/zammad/zammad.svg)](https://hub.docker.com/r/zammad/zammad/)
- Vagrant: [![](https://img.shields.io/badge/version-develop-blue.svg)](https://github.com/zammad/zammad-vagrant)
- License: [![](https://img.shields.io/badge/License-AGPL%203.0-lightgrey.svg)](https://github.com/zammad/zammad/blob/develop/LICENSE)
## Installing & Getting Started
https://docs.zammad.org
Getting Started
---------------
## Screenshots
1. Install Zammad on your system
https://zammad.org/screenshots
```
root@shell> cd /opt/
root@shell> tar -xzf zammad-1.0.1.tar.gz
root@shell> useradd zammad
zammad@shell> su - zammad
```
2. Install all dependencies
## REST API
```
zammad@shell> cd zammad
zammad@shell> gem install rails
zammad@shell> vi Gemfile # enable libv8, execjs and therubyracer if needed!
zammad@shell> bundle install
```
https://docs.zammad.org/en/latest/api/intro.html
3. Configure your databases
```
zammad@shell> cp config/database.yml.dist config/database.yml
zammad@shell> vi config/database.yml
```
## Contributing
4. Initialize your database
https://zammad.org/participate
```
zammad@shell> export RAILS_ENV=production
zammad@shell> rake db:create
zammad@shell> rake db:migrate
zammad@shell> rake db:seed
```
5. Change directory to zammad</tt> (if needed) and start the web server:
```
zammad@shell> rake assets:precompile
zammad@shell> puma -p 3000 # application web server
zammad@shell> script/websocket-server.rb start # non blocking websocket server
zammad@shell> script/scheduler.rb start # generate overviews on demand, just send changed data to browser
```
6. Go to http://localhost:3000/#getting_started and you'll see:
"Welcome to Zammad!", there you need to create your admin
user and you need to invite other agents.
* The Getting Started Guide: http://guides.zammad.org/getting_started.html
Thanks! ❤️ ❤️ ❤️
Your Zammad Team

View File

@@ -1,57 +0,0 @@
Installation on Mac OS 10.8 for development
===========================================
Prerequisites
------------
* Install Xcode from the App Store, open it -> Xcode menu > Preferences > Downloads -> install command line tools
````shell
curl -L https://get.rvm.io | bash -s stable --ruby
source ~/.rvm/scripts/rvm
````
* start new shell -> ruby -v
Get Zammad
----------
````shell
test -d ~/zammad/ || mkdir ~/zammad
cd ~/zammad/
curl -L -O http://zammad.org/zammad-latest.tar.bz2 | tar -xj
````
Install Zammad
--------------
````shell
cd zammad-latest
bundle install
sudo ln -s /usr/local/mysql/lib/libmysqlclient.18.dylib /usr/lib/libmysqlclient.18.dylib # if needed!
rake db:create
rake db:migrate
rake db:seed
````
Database connect
--------------
````shell
cd zammad-latest
cp config/database.yml.dist config/database.yml
rake db:create
rake db:migrate
rake db:seed
````
Start Zammad
------------
````shell
puma -p 3000 # application web server
script/websocket-server.rb start # non blocking websocket server
script/scheduler.rb start # generate overviews on demand, just send changed data to browser
````
Start init page
---------------
* http://localhost:3000/#getting_started

View File

@@ -1,147 +0,0 @@
# Installation on Ubuntu 12.04 Server
## With Apache mod_proxy / MySQL
### Prerequisits
* apt-get install apt-get install curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool
### Add User
* useradd zammad -m -s /bin/bash
* echo -e "export RAILS_ENV=development" >> /home/zammad/.bashrc
* su zammad
* cd ~
### Install Ruby & Rails
* curl -L https://get.rvm.io | bash -s stable
* source /home/zammad/.rvm/scripts/rvm
* echo "source /home/zammad/.rvm/scripts/rvm" >> /home/zammad/.bashrc
* rvm install ruby
* gem install rails therubyracer
### Apache Config
* vi /etc/apache2/sites-available/zammad
```
<VirtualHost *:80>
ServerName zammad.example.com
ServerAdmin yourmail@example.com
SuexecUserGroup "zammad" "zammad"
## don't loose time with IP address lookups
HostnameLookups Off
## needed for named virtual hosts
UseCanonicalName Off
## configures the footer on server-generated documents
ServerSignature Off
ProxyRequests Off
ProxyPreserveHost On
<Proxy *>
Order deny,allow
Allow from localhost
</Proxy>
ProxyPass /assets !
ProxyPass /favicon.ico !
ProxyPass /robots.txt !
ProxyPass / http://localhost:3000/
DocumentRoot "/var/www/zammad/public"
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
<Directory "/var/www/zammad/public">
Options FollowSymLinks
Order allow,deny
Allow from all
</Directory>
</VirtualHost>
```
* rm /etc/apache2/sites-enabled/000-default
* ln -s /etc/apache2/sites-available/zammad /etc/apache2/sites-enabled/zammad
* ln -s /etc/apache2/mods-available/proxy.conf /etc/apache2/mods-enabled/proxy.conf
* ln -s /etc/apache2/mods-available/proxy.load /etc/apache2/mods-enabled/proxy.load
* ln -s /etc/apache2/mods-available/proxy_http.load /etc/apache2/mods-enabled/proxy_http.load
* ln -s /etc/apache2/mods-available/suexec.load /etc/apache2/mods-enabled/suexec.load
* service apache2 restart
### Get Zammad
* cd /var/www/zammad
* wget http://zammad.org/zammad-1.0.1.tar.gz
* tar -xzf zammad-1.0.1.tar.gz
### Edit Gemfile
* vi Gemfile
* uncomment
* gem 'libv8', '~> 3.11.8'
* gem 'execjs'
* gem 'therubyracer'
### Install zammad
* bundle install
* chown -R zammad:zammad /var/www/zammad
### Create Database
* mysql --defaults-file=/etc/mysql/debian.cnf -e "CREATE DATABASE zammad_prod DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci; CREATE USER 'zammad'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'zammad'@'localhost'; FLUSH PRIVILEGES;"
* vi config/database.yml
* su zammad
* cd ~
* rake db:migrate
* rake db:seed
### Start Server
* rake assets:precompile
* puma -p 3000 # application web server
* script/websocket-server.rb start # non blocking websocket server
* script/scheduler.rb start # generate overviews on demand, just send changed data to browser
## Testinstallation for Developers via RVM / SQLite
### Prerequisits
* apt-get install apt-get install curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool
### Add User
* useradd zammad -m -s /bin/bash
* echo -e "export RAILS_ENV=development" >> /home/zammad/.bashrc
* su zammad
* cd ~
### Install Ruby & Rails
* curl -L https://get.rvm.io | bash -s stable
* source /home/zammad/.rvm/scripts/rvm
* echo "source /home/zammad/.rvm/scripts/rvm" >> /home/zammad/.bashrc
* rvm install ruby
* gem install rails therubyracer
### Get Zammad
* cd /var/www/zammad
* wget http://zammad.org/zammad-1.0.1.tar.gz
* tar -xzf zammad-1.0.1.tar.gz
### Edit Gemfile
* vi Gemfile
* uncomment
* gem 'libv8', '~> 3.11.8'
* gem 'execjs'
* gem 'therubyracer'
### Install zammad
* bundle install
* rake db:migrate
* rake db:seed
* rake assets:precompile
* puma -p 3000 # application web server
* script/websocket-server.rb start # non blocking websocket server
* script/scheduler.rb start # generate overviews on demand, just send changed data to browser

View File

@@ -1,18 +0,0 @@
# Setup a elastic search
* Install elastic search
* Install attachment plugin
cd /usr/share/elasticsearch
bin/plugin -install elasticsearch/elasticsearch-mapper-attachments/2.0.0
* Configure elastic search
* rails r "Setting.set('es_url', 'http://172.0.0.1:9200')"
* rails r "Setting.set('es_user', 'elasticsearch')" # optional
* rails r "Setting.set('es_password', 'zammad')" # optional
* rails r "Setting.set('es_index', Socket.gethostname + '_zammad')" # optional
* Create elastic search indexes
* rake searchindex:rebuild # drop/create/reload

2
Rakefile Normal file → Executable file
View File

@@ -2,6 +2,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
require_relative 'config/application'
Zammad::Application.load_tasks

1
VERSION Normal file
View File

@@ -0,0 +1 @@
3.4.x

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

View File

@@ -1 +0,0 @@
<svg viewBox="0 0 29 22" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient y1="0%" x2="0" y2="100%" id="0"><stop stop-color="#fff" offset="0%"/><stop stop-color="#e6eaf1" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path d="m0 17h29v5h-29v-5" fill="#778eba"/><path d="m17.919 22v-10.06h-2.919v-3.97h2.977v-4.04c0-2.084 1.598-3.935 4.052-3.935h4.971v3.808h-3.863c-1.071 0-1.193.038-1.193 1.033l-.008 3.132h3.552l-.386 3.97h-3.225l.101 10.06h-4.058" fill="url(#0)"/></g></svg>

Before

Width:  |  Height:  |  Size: 511 B

View File

@@ -1 +0,0 @@
<svg viewBox="0 0 29 22" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient y1="0%" x2="0" y2="100%" id="0"><stop stop-color="#fff" offset="0%"/><stop stop-color="#fae7e3" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd" transform="translate(2)"><path d="m21.06 8.04v-3.044h-2.01v3.044h-3.044v1.911h3.044v3.044h2.01v-3.044h2.944v-1.911h-2.944" fill="#fdf4f2"/><path d="m11.12 12.664c-.606-.436-1.766-1.496-1.766-2.119 0-.73.205-1.09 1.288-1.949 1.11-.88 1.895-2.118 1.895-3.558 0-1.714-.752-3.384-2.163-3.935h2.127l1.502-1.102h-6.71c-3.01 0-5.839 2.314-5.839 4.995 0 2.739 2.051 4.95 5.111 4.95.213 0 .42-.004.622-.019-.199.386-.341.821-.341 1.273 0 .761.403 1.379.913 1.882-.385 0-.757.011-1.163.011-3.726 0-6.594 2.41-6.594 4.908 0 2.461 3.144 4 6.869 4 4.248 0 6.594-2.447 6.594-4.908 0-1.973-.573-3.155-2.346-4.428m-3.607-3.665c-1.633-.051-3.185-1.896-3.466-4.12-.282-2.225.813-3.928 2.445-3.878 1.632.051 3.185 1.836 3.466 4.061.281 2.225-.813 3.988-2.445 3.937m-1.226 12c-2.488 0-4.284-1.612-4.284-3.549 0-1.898 2.228-3.478 4.716-3.451.58.006 1.121.102 1.612.265 1.35.962 2.319 1.505 2.592 2.6.051.222.079.451.079.684 0 1.937-1.219 3.45-4.716 3.45" fill="url(#0)"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1 +0,0 @@
<svg viewBox="0 0 41 36" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="m17.343 22.361l-16.367 5.965 22.71-2.664-6.343-3.301" fill="#d9b42f"/><path d="m17.418 22.339l2.16 5.03-14.698-6.954 12.537 1.922" fill="#ffe188"/><path d="m40.566 9.722l-1.804.718-1.666 2.605 3.47-3.323" fill="#e83f00"/><path d="m36.19 10.694l-8.861 2.256 3.865.801 4.996-3.057" fill="#cd1f14"/><path d="m37.07 10.694l-7.784.401 2.347.981 5.437-1.382" fill="#e83f00"/><path d="m32 22.18l3.114-5.929 1.839-5.559-19.384 11.425 6.252.857 8.179-.793" fill="#eb4f86"/><g fill="#00a2c9"><path d="m23.02 5.833l-5.444 16.12 3.296-1.941 2.149-14.18"/><path d="m23.06 5.392l-8.421-5.392 8.627 9.726-.206-4.334"/></g><path d="m22.841 7.984l-10.15-3.123 10.274 6.599-.124-3.477" fill="#5a8794"/><path d="m23.19 8.75l-9.52 4.685 9.644-1.208-.124-3.477" fill="#005971"/><path d="m35.14 15.875l4.57-7.125-2.742 1.596-1.827 5.529" fill="#cd1f14"/><path d="m24.22 18.406l-.596-12.573-2.149 14.18 2.745-1.607" fill="#5eb2d1"/><path d="m31.28 13.611l1.639 6.266-1.024 1.943-3.585-6.457 2.97-1.752" fill="#f69b00"/><path d="m31.795 22.361l-8.179.793-4.092 4.176 12.271-4.969" fill="#e83f00"/><path d="m32.415 22.02l-8.987-16.184.808 16.977 8.179-.793" fill="#bae2f6"/><path d="m23.943 18.472l.212 4.404-8.536 2.998 2.283-3.855 6.04-3.548" fill="#f69b00"/><path d="m17.323 22.361l6.252.857-4.092 4.176-19.484 7.859 17.323-12.892" fill="#ffd130"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1 +0,0 @@
<svg viewBox="0 0 41 37" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(0 1)"><path d="m17.698 21.947l-16.768 6.136 23.265-2.742-6.497-3.394" fill="#b0b0b0"/><path d="m17.698 21.947l2.212 5.176-15.05-7.153 12.843 1.977" fill="#e0e0e0"/><path d="m40.678 9.699l-1.848.739-1.707 2.679 3.555-3.418" fill="#6b6b6b"/><path d="m37.12 10.456l-9.08 2.318 3.959.826 5.117-3.144" fill="#535353"/><path d="m37.12 10.456l-7.972.411 2.402 1.01 5.57-1.42" fill="#6b6b6b"/><path d="m32.48 22.01l3.19-6.097 1.882-5.718-19.854 11.75 6.403.883 8.379-.818" fill="#848484"/><g fill="#767676"><path d="m23.274 5.366l-5.576 16.581 3.375-1.996 2.201-14.585"/><path d="m23.274 5.366l-8.625-5.545 8.836 10-.211-4.458"/></g><path d="m23.4 7.925l-10.398-3.212 10.525 6.787-.127-3.575" fill="#7b7b7b"/><path d="m23.4 7.925l-9.752 4.819 9.879-1.244-.127-3.575" fill="#414141"/><path d="m35.682 15.883l4.681-7.329-2.81 1.643-1.871 5.686" fill="#535353"/><path d="m23.885 18.299l-.611-12.933-2.201 14.585 2.812-1.652" fill="#9c9c9c"/><path d="m31.85 13.57l1.68 6.444-1.05 1.997-3.672-6.641 3.042-1.8" fill="#a5a5a5"/><path d="m32.48 22.01l-8.379.818-4.19 4.293 12.569-5.111" fill="#6b6b6b"/><path d="m32.48 22.01l-9.207-16.645.828 17.463 8.379-.818" fill="#d8d8d8"/><path d="m23.885 18.299l.217 4.529-8.744 3.084 2.34-3.965 6.187-3.648" fill="#a5a5a5"/><path d="m17.698 21.947l6.404.881-4.192 4.295-19.96 8.08 17.748-13.26" fill="#cdcdcd"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1 +0,0 @@
<svg viewBox="0 0 85 16" xmlns="http://www.w3.org/2000/svg"><g fill="#f2f5f6" fill-rule="evenodd" transform="translate(0 1)"><path d="m9.306 3.843h-8.753v3.259h1.776v-1.693h3.677c.416 0 .855-.042.855-.042v.042c0 0-.271.23-.585.606l-5.828 7.06v1.337h9v-3.259h-1.776v1.691h-3.906c-.419 0-.835.021-.835.021v-.041c0 0 .271-.209.584-.584l5.787-7.06v-1.336"/><path d="m12.732 11.301c0-2.026 3.321-2.068 4.281-2.068h.524v.438c0 1.588-1.109 3.426-2.905 3.426-1.211 0-1.9-.855-1.9-1.796m2.695-7.708c-2.465 0-4.01 1.253-4.01 1.253l.815 1.441c0 0 1.357-1.023 3.03-1.023 1.297 0 2.257.586 2.257 2.255v.397h-.669c-1.755 0-6.162.23-6.162 3.553 0 2.172 1.754 3.196 3.508 3.196 2.57 0 3.49-2.236 3.49-2.236h.04c0 0-.081.272-.081.69v.146c0 .689.376 1.149 1.316 1.149h2.109v-1.568h-1.065c-.293 0-.46-.145-.46-.458v-4.721c0-2.675-1.42-4.074-4.115-4.074"/><path d="m36.493 3.593c-1.732 0-3.196 1.169-3.78 2.485h-.041c-.355-1.713-1.4-2.485-3.094-2.485-1.712 0-3.236 1.315-3.76 2.568h-.041c0 0 .064-.271.064-.605v-.544c0-.772-.439-1.169-1.338-1.169h-2.381v1.566h1.294c.291 0 .46.147.46.441v6.996h-1.65v1.568h5.347v-1.568h-1.671v-3.216c0-2.069 1.169-4.199 3.175-4.199 1.629 0 1.839 1.274 1.839 2.653v6.33h3.677v-1.568h-1.65v-3.299c0-2.091 1.127-4.116 3.113-4.116 1.587 0 1.859 1.169 1.859 2.653v6.33h3.697v-1.568h-1.671v-5.201c0-2.695-1.108-4.052-3.448-4.052"/><path d="m55.889 3.593c-1.733 0-3.196 1.169-3.781 2.485h-.041c-.355-1.713-1.401-2.485-3.094-2.485-1.712 0-3.236 1.315-3.76 2.568h-.041c0 0 .064-.271.064-.605v-.544c0-.772-.439-1.169-1.338-1.169h-2.381v1.566h1.295c.291 0 .459.147.459.441v6.996h-1.65v1.568h5.347v-1.568h-1.671v-3.216c0-2.069 1.17-4.199 3.176-4.199 1.629 0 1.839 1.274 1.839 2.653v6.33h3.676v-1.568h-1.651v-3.299c0-2.091 1.129-4.116 3.115-4.116 1.586 0 1.857 1.169 1.857 2.653v6.33h3.698v-1.568h-1.671v-5.201c0-2.695-1.108-4.052-3.447-4.052"/><path d="m63.878 11.301c0-2.026 3.32-2.068 4.282-2.068h.523v.438c0 1.588-1.108 3.426-2.904 3.426-1.211 0-1.901-.855-1.901-1.796m2.694-7.708c-2.465 0-4.01 1.253-4.01 1.253l.815 1.441c0 0 1.357-1.023 3.03-1.023 1.294 0 2.257.586 2.257 2.255v.397h-.67c-1.755 0-6.164.23-6.164 3.553 0 2.172 1.755 3.196 3.51 3.196 2.57 0 3.49-2.236 3.49-2.236h.042c0 0-.083.272-.083.69v.146c0 .689.375 1.149 1.316 1.149h2.109v-1.568h-1.065c-.294 0-.46-.145-.46-.458v-4.721c0-2.675-1.421-4.074-4.116-4.074"/><path d="m74.49 9.129c0-2.403 1.357-3.762 3.05-3.762 2 0 2.987 1.84 2.987 3.782 0 2.633-1.482 3.76-3.05 3.76-1.755 0-2.987-1.482-2.987-3.78m8-9.465h-3.781v1.567h1.756v3.343c0 .46.061.793.061.793h-.041c0 0-.855-1.774-3.26-1.774-2.841 0-4.805 2.171-4.805 5.536 0 3.279 1.776 5.536 4.616 5.536 2.719 0 3.574-2.109 3.574-2.109h.042c0 0-.062.208-.062.563v.146c0 .689.376 1.149 1.316 1.149h2.109v-1.568h-1.065c-.293 0-.46-.145-.46-.458v-12.724"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 108 KiB

View File

@@ -1 +0,0 @@
<svg viewBox="0 0 29 22" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient y1="0%" x2="0" y2="100%" id="0"><stop stop-color="#fff" offset="0%"/><stop stop-color="#e9f7fc" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path d="m24.17 4.163c1.017-.625 1.797-1.614 2.165-2.793-.951.579-2.01.999-3.127 1.225-.898-.981-2.178-1.594-3.594-1.594-2.719 0-4.924 2.261-4.924 5.05 0 .396.044.781.128 1.151-4.092-.211-7.72-2.221-10.149-5.275-.424.746-.667 1.613-.667 2.538 0 1.752.869 3.297 2.19 4.203-.807-.026-1.566-.253-2.23-.631-.001.021-.001.042-.001.063 0 2.446 1.697 4.487 3.95 4.951-.413.115-.848.177-1.297.177-.317 0-.626-.032-.926-.091.627 2.01 2.445 3.466 4.6 3.506-1.685 1.354-3.808 2.162-6.115 2.162-.397 0-.789-.024-1.175-.071 2.179 1.433 4.767 2.269 7.548 2.269 9.06 0 14.01-7.693 14.01-14.366 0-.219-.005-.437-.014-.653.962-.712 1.797-1.601 2.457-2.613-.883.402-1.832.673-2.828.795" fill="url(#0)"/></g></svg>

Before

Width:  |  Height:  |  Size: 947 B

View File

@@ -0,0 +1,3 @@
# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
App.Config.set('api_path', 'api/v1')
App.Config.set('image_path', '/assets/images')

View File

@@ -1,3 +0,0 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
App.Config.set('api_path', 'api/v1')
App.Config.set('image_path', '/assets')

View File

@@ -0,0 +1,741 @@
class App.Controller extends Spine.Controller
@include App.LogInclude
@include App.RenderScreen
constructor: (params) ->
# unbind old bindings
if params && params.el && params.el.unbind
params.el.unbind()
super
# generate controllerId
@controllerId = 'controller-' + new Date().getTime() + '-' + Math.floor(Math.random() * 999999)
# apply to release controller on dom remove
@el.on('remove', @releaseController)
@el.on('remove', @release)
# create shortcuts
@Config = App.Config
@Session = App.Session
# create common accessors
@apiPath = @Config.get('api_path')
# remember ajax calls to abort them on dom release
@ajaxCalls = []
@ajax = (data) =>
ajaxId = App.Ajax.request(data)
@ajaxCalls.push ajaxId
navigate: (location, hideCurrentLocationFromHistory = false) ->
@log 'debug', "navigate to '#{location}', hide from history '#{hideCurrentLocationFromHistory}'"
# hide current location from browser history, allow to use back button in browser
if hideCurrentLocationFromHistory
if window.history
history = App.Config.get('History')
oldLocation = history[history.length-2]
if oldLocation
window.history.replaceState(null, null, oldLocation)
super location
preventDefault: (e) ->
e.preventDefault()
bind: (event, callback) =>
App.Event.bind(
event
callback
@controllerId
)
one: (event, callback) =>
App.Event.bind(
event
callback
@controllerId
true
)
unbind: (event, callback) =>
App.Event.unbind(
event
callback
@controllerId
)
clearDelay: (delay_id) =>
App.Delay.clear(delay_id, @controllerId)
delay: (callback, timeout, delay_id, queue = false) =>
App.Delay.set(callback, timeout, delay_id, @controllerId, queue)
clearInterval: (interval_id) =>
App.Interval.clear(interval_id, @controllerId)
interval: (callback, interval, interval_id, queue = false) =>
App.Interval.set(callback, interval, interval_id, @controllerId, queue)
releaseController: =>
App.Event.unbindLevel(@controllerId)
App.Delay.clearLevel(@controllerId)
App.Interval.clearLevel(@controllerId)
@abortAjaxCalls()
abortAjaxCalls: =>
if !@ajaxCalls
return
idsToCancel = @ajaxCalls
@ajaxCalls = []
for callId in idsToCancel
App.Ajax.abort(callId)
# release Spine's event handling
release: ->
@off()
@stopListening()
# add @title method to set title
title: (name, translate = false) ->
# $('html head title').html(@Config.get(product_name) + ' - ' + App.i18n.translateInline(name))
title = name
if translate
title = App.i18n.translatePlain(name)
documentTitle = "#{@Config.get('product_name')} - #{title}"
document.title = documentTitle
App.Event.trigger('window-title-set', documentTitle)
copyToClipboard: (text) ->
if window.clipboardData # IE
window.clipboardData.setData('Text', text)
else
window.prompt('Copy to clipboard: Ctrl+C, Enter', text)
# disable all delay's and interval's
disconnectClient: ->
App.Delay.reset()
App.Interval.reset()
App.WebSocket.close(force: true)
# add @notify method to create notification
notify: (data) ->
App.Event.trigger 'notify', data
# add @notifyDesktop method to create desktop notification
notifyDesktop: (data) ->
App.Event.trigger 'notifyDesktop', data
# add @navupdate method to update navigation
navupdate: (url, force = false) ->
# ignore navupdate until #clues are gone
return if !force && window.location.hash is '#clues'
App.Event.trigger 'navupdate', url
# show navigation
navShow: ->
return if $('#navigation').is(':visible')
$('#navigation').removeClass('hide')
# hide navigation
navHide: ->
return if !$('#navigation').is(':visible')
$('#navigation').addClass('hide')
updateNavMenu: =>
delay = ->
App.Event.trigger('menu:render')
@delay(delay, 150)
closeTab: (key = @taskKey, dest) =>
return if !key?
App.TaskManager.remove(key)
dest ?= App.TaskManager.nextTaskUrl() || '#'
@navigate dest
scrollTo: (x = 0, y = 0, delay = 0) ->
a = ->
window.scrollTo(x, y)
@delay(a, delay)
scrollToIfNeeded: (element, position = true) ->
return if !element
return if !element.get(0)
if position is true
return if element.visible(true)
element.get(0).scrollIntoView(position)
shake: (element) ->
# this part is from wordpress 3, thanks to open source
shakeMe = (element, position, positionEnd) ->
positionStart = position.shift()
element.css('left', positionStart + 'px')
if position.length > 0
setTimeout(->
shakeMe(element, position, positionEnd)
, positionEnd)
else
try
element.css('position', 'static')
catch e
console.log 'error', e
position = [ 15, 30, 15, 0, -15, -30, -15, 0 ]
position = position.concat(position.concat(position))
element.css('position', 'relative')
shakeMe(element, position, 20)
# get all params of the form
formParam: (form) ->
App.ControllerForm.params(form)
formDisable: (form, type) ->
App.ControllerForm.disable(form, type)
formEnable: (form, type) ->
App.ControllerForm.enable(form, type)
formValidate: (data) ->
App.ControllerForm.validate(data)
# get all query params of the url
queryParam: ->
return if !@query
pairs = @query.split(';')
params = {}
for pair in pairs
result = pair.match('(.+?)=(.*)')
if result && result[1]
params[result[1]] = result[2]
params
# redirectToLogin: (data) ->
#
# human readable file size
humanFileSize: (size) ->
App.Utils.humanFileSize(size)
# human readable time
humanTime: (time, escalation, long = true) ->
App.PrettyDate.humanTime(time, escalation, long)
userInfo: (data) ->
el = data.el || $('[data-id="customer_info"]')
el.unbind()
# start customer info controller
new App.WidgetUser(
el: el
user_id: data.user_id
callback: data.callback
)
permissionCheckRedirect: (key, closeTab = false) ->
return true if @permissionCheck(key)
# remember requested url
location = window.location.hash
if location && location isnt '#login' && location isnt '#logout' && location isnt '#keyboard_shortcuts'
App.Config.set('requested_url', location)
if closeTab
App.TaskManager.remove(@taskKey)
# redirect to login
@navigate '#login'
throw "No permission for #{key}"
false
permissionCheck: (key) ->
App.User.current()?.permission(key)
authenticateCheckRedirect: ->
return true if @authenticateCheck()
# remember requested url
location = window.location.hash
if location && location isnt '#login' && location isnt '#logout' && location isnt '#keyboard_shortcuts'
@Config.set('requested_url', location)
# redirect to login
@navigate '#login'
throw 'No exsisting session'
false
authenticateCheck: ->
# return true if session exists
return true if @Session.get()
false
frontendTimeUpdate: =>
update = =>
@frontendTimeUpdateElement($('#app'))
App.Interval.set(update, 61000, 'frontendTimeUpdate', 'ui')
frontendTimeUpdateElement: (el) =>
ui = @
el.find('.humanTimeFromNow').each( ->
item = $(@)
ui.frontendTimeUpdateItem(item, item.text())
)
frontendTimeUpdateItem: (item, currentVal) =>
timestamp = item.attr('datetime')
time = @humanTime(timestamp, item.hasClass('escalation'))
# only do dom updates on changes
return if time is currentVal
item.attr('title', App.i18n.translateTimestamp(timestamp))
item.html(time)
recentView: (object, o_id) =>
params =
object: object
o_id: o_id
App.Ajax.request(
id: "recent_view_#{object}_#{o_id}"
type: 'POST'
url: @Config.get('api_path') + '/recent_view'
data: JSON.stringify(params)
processData: true
)
prepareForObjectList: (items) ->
for item in items
item = @prepareForObjectListItem(item)
items
prepareForObjectListItem: (item) ->
item.link = ''
item.title = '???'
# convert backend name space to local name space
item.object = item.object.replace('::', '')
# lookup real data
if App[item.object] && App[item.object].exists(item.o_id)
object = App[item.object].findNative(item.o_id)
item.objectNative = object
item.link = object.uiUrl()
item.title = object.displayName()
item.object_name = object.objectDisplayName()
item.cssIcon = object.iconActivity(@Session.get())
item.created_by = App.User.findNative(item.created_by_id)
item
stopPropagation: (e) ->
e.stopPropagation()
preventDefaultAndStopPropagation: (e) ->
e.preventDefault()
e.stopPropagation()
startLoading: (el) =>
return if @initLoadingDone && !el
@initLoadingDone = true
@stopLoading()
later = =>
if el
el.html App.view('generic/page_loading')()
else
@html App.view('generic/page_loading')()
@initLoadingDoneDelay = @delay(later, 1800)
stopLoading: =>
return if !@initLoadingDoneDelay
@clearDelay(@initLoadingDoneDelay)
locationVerify: (e) =>
newLocation = $(e.currentTarget).attr 'href'
@log 'debug', "new location '#{newLocation}'"
return if !newLocation
@locationExecuteOrNavigate(newLocation)
locationExecuteOrNavigate: (newLocation) =>
currentLocation = Spine.Route.getPath()
@log 'debug', "current location '#{currentLocation}'"
if newLocation.replace(/#/, '') isnt currentLocation
@log 'debug', "navigate to location '#{newLocation}'"
@navigate(newLocation)
return
@locationExecute(newLocation)
locationExecute: (newLocation) =>
newLocation = newLocation.replace(/#/, '')
@log 'debug', "execute controller again for '#{newLocation}' because of same hash"
Spine.Route.matchRoutes(newLocation)
logoUrl: ->
"#{@Config.get('image_path')}/#{@Config.get('product_logo')}"
selectAll: (e) ->
e.currentTarget.focus()
e.currentTarget.select()
windowReload: (e,url) ->
if e
e.preventDefault()
$('#app').hide().attr('style', 'display: none!important')
if url
window.location = url
return true
if window.location.reload
window.location.reload()
return true
if window.location.href
window.location.href = window.location.href
return true
throw 'Cant reload page!'
class App.ControllerPermanent extends App.Controller
constructor: ->
if @requiredPermission
@permissionCheckRedirect(@requiredPermission, true)
super
@navShow()
class App.ControllerSubContent extends App.Controller
constructor: ->
if @requiredPermission
@permissionCheckRedirect(@requiredPermission)
super
show: =>
if @genericController && @genericController.show
@genericController.show()
return if !@header
@title @header, true
hide: =>
if @genericController && @genericController.hide
@genericController.hide()
class App.ControllerContent extends App.Controller
constructor: ->
if @requiredPermission
@permissionCheckRedirect(@requiredPermission)
super
# hide tasks
App.TaskManager.hideAll()
$('#content').removeClass('hide').removeClass('active')
@navShow()
class App.ControllerModal extends App.Controller
authenticateRequired: false
backdrop: true
keyboard: true
large: false
small: false
veryLarge: false
head: '?'
autoFocusOnFirstInput: true
container: null
buttonClass: 'btn--success'
centerButtons: []
leftButtons: []
buttonClose: true
buttonCancel: false
buttonCancelClass: 'btn--text btn--subtle'
buttonSubmit: true
includeForm: true
headPrefix: ''
shown: true
closeOnAnyClick: false
initalFormParams: {}
initalFormParamsIgnore: false
showTrySupport: false
showTryMax: 10
showTrydelay: 1000
events:
'submit form': 'submit'
'click .js-submit:not(.is-disabled)': 'submit'
'click .js-cancel': 'cancel'
'click .js-close': 'cancel'
className: 'modal fade'
constructor: ->
super
@showTryCount = 0
if @authenticateRequired
return if !@authenticateCheckRedirect()
# rerender view, e. g. on langauge change
@bind('ui:rerender', =>
@update()
'modal'
)
if @shown
@render()
showDelayed: =>
delay = =>
@showTryCount += 1
@render()
@delay(delay, @showTrydelay)
modalAlreadyExists: ->
return true if $('.modal').length > 0
false
content: ->
'You need to implement a one @content()!'
update: =>
if @message
content = App.i18n.translateContent(@message)
else if @contentInline
content = @contentInline
else
content = @content()
modal = $(App.view('modal')(
head: @head
headPrefix: @headPrefix
message: @message
detail: @detail
buttonClose: @buttonClose
buttonCancel: @buttonCancel
buttonCancelClass: @buttonCancelClass
buttonSubmit: @buttonSubmit
buttonClass: @buttonClass
centerButtons: @centerButtons
leftButtons: @leftButtons
includeForm: @includeForm
))
modal.find('.modal-body').html(content)
if !@initRenderingDone
@initRenderingDone = true
@html(modal)
else
@$('.modal-dialog').replaceWith(modal)
@post()
post: ->
# nothing
element: =>
@el
render: =>
if @showTrySupport is true && @modalAlreadyExists() && @showTryCount <= @showTryMax
@showDelayed()
return
@initalFormParamsIgnore = false
if @buttonSubmit is true
@buttonSubmit = 'Submit'
if @buttonCancel is true
@buttonCancel = 'Cancel & Go Back'
@update()
if @container
@el.addClass('modal--local')
if @veryLarge
@el.addClass('modal--veryLarge')
if @large
@el.addClass('modal--large')
if @small
@el.addClass('modal--small')
@el
.on(
'show.bs.modal': @localOnShow
'shown.bs.modal': @localOnShown
'hide.bs.modal': @localOnClose
'hidden.bs.modal': @localOnClosed
'dismiss.bs.modal': @localOnCancel
).modal(
keyboard: @keyboard
show: true
backdrop: @backdrop
container: @container
)
if @closeOnAnyClick
@el.on('click', =>
@close()
)
close: (e) =>
if e
e.preventDefault()
@initalFormParamsIgnore = true
@el.modal('hide')
formParams: =>
if @container
return @formParam(@container.find('.modal form'))
return @formParam(@$('.modal form'))
showAlert: (message, suffix = 'danger') ->
alert = $('<div>')
.addClass("alert alert--#{suffix}")
.text(message)
@$('.modal-alerts-container').html(alert)
clearAlerts: ->
@$('.modal-alerts-container').empty()
localOnShow: (e) =>
@onShow(e)
onShow: (e) ->
# do nothing
localOnShown: (e) =>
@onShown(e)
onShown: (e) =>
if @autoFocusOnFirstInput
# select generated form
form = @$('.form-group').first()
# if not exists, use whole @el
if !form.get(0)
form = @el
# focus first input, select or textarea
form.find('input:not([disabled]):not([type="hidden"]):not(".btn"), select:not([disabled]), textarea:not([disabled])').first().focus()
@initalFormParams = @formParams()
localOnClose: (e) =>
diff = difference(@initalFormParams, @formParams())
if @initalFormParamsIgnore is false && !_.isEmpty(diff)
if !confirm(App.i18n.translateContent('The form content has been changed. Do you want to close it and lose your changes?'))
e.preventDefault()
return
@onClose(e)
onClose: ->
# do nothing
localOnClosed: (e) =>
@onClosed(e)
@el.modal('remove')
onClosed: (e) ->
# do nothing
localOnCancel: (e) =>
@onCancel(e)
onCancel: (e) ->
# do nothing
cancel: (e) =>
@close(e)
@onCancel(e)
onSubmit: (e) ->
# do nothing
submit: (e) =>
e.stopPropagation()
e.preventDefault()
@clearAlerts()
@onSubmit(e)
startLoading: =>
@$('.modal-body').addClass('hide')
@$('.modal-loader').removeClass('hide')
stopLoading: =>
@$('.modal-body').removeClass('hide')
@$('.modal-loader').addClass('hide')
class App.SessionMessage extends App.ControllerModal
showTrySupport: true
onCancel: (e) =>
if @forceReload
@windowReload(e)
onClose: (e) =>
if @forceReload
@windowReload(e)
onSubmit: (e) =>
if @forceReload
@windowReload(e)
else
@close()
class App.UpdateHeader extends App.Controller
constructor: ->
super
# subscribe and reload data / fetch new data if triggered
@subscribeId = @genericObject.subscribe(@render)
release: =>
App[ @genericObject.constructor.className ].unsubscribe(@subscribeId)
render: (genericObject) =>
@el.find('.page-header h1').html(genericObject.displayName())
class App.UpdateTastbar extends App.Controller
constructor: ->
super
# subscribe and reload data / fetch new data if triggered
@subscribeId = @genericObject.subscribe(@update)
release: =>
App[ @genericObject.constructor.className ].unsubscribe(@subscribeId)
update: (genericObject) =>
# update taskbar with new meta data
App.TaskManager.touch(@taskKey)
class App.ControllerWidgetPermanent extends App.Controller
constructor: (params) ->
if params.el
params.el.append('<div id="' + params.key + '"></div>')
params.el = ("##{params.key}")
super(params)
class App.ControllerWidgetOnDemand extends App.Controller
constructor: (params) ->
params.el = $("##{params.key}")
super
element: =>
$("##{@key}")
html: (raw) =>
# check if parent exists
if !$("##{@key}").get(0)
$('#app').before("<div id=\"#{@key}\" class=\"#{@className}\"></div>")
$("##{@key}").html raw

View File

@@ -1,581 +0,0 @@
class App.Controller extends Spine.Controller
@include App.LogInclude
constructor: (params) ->
# unbind old bindlings
if params && params.el && params.el.unbind
params.el.unbind()
super
# generate controllerId
@controllerId = 'controller-' + new Date().getTime() + '-' + Math.floor( Math.random() * 999999 )
# apply to release controller on dom remove
@el.on('remove', @releaseController)
@el.on('remove', @release)
# create shortcuts
@Config = App.Config
@Session = App.Session
# create common accessors
@apiPath = @Config.get('api_path')
# remember ajax calls to abort them on dom release
@ajaxCalls = []
@ajax = (data) =>
ajaxId = App.Ajax.request(data)
@ajaxCalls.push ajaxId
bind: (event, callback) =>
App.Event.bind(
event
callback
@controllerId
)
unbind: (event, callback) =>
App.Event.unbind(
event
callback
@controllerId
)
clearDelay: (delay_id) =>
App.Delay.clear(delay_id, @controllerId)
delay: (callback, timeout, delay_id) =>
App.Delay.set(callback, timeout, delay_id, @controllerId)
clearInterval: (interval_id) =>
App.Interval.clear(interval_id, @controllerId)
interval: (callback, interval, interval_id) =>
App.Interval.set(callback, interval, interval_id, @controllerId)
releaseController: =>
App.Event.unbindLevel(@controllerId)
App.Delay.clearLevel(@controllerId)
App.Interval.clearLevel(@controllerId)
if @ajaxCalls
for callId in @ajaxCalls
App.Ajax.abort(callId)
@userTicketPopupsDestroy()
@ticketPopupsDestroy()
@userPopupsDestroy()
@organizationPopupsDestroy()
release: =>
# release custom bindings after it got removed from dom
# add @title methode to set title
title: (name) ->
# $('html head title').html( @Config.get(product_name) + ' - ' + App.i18n.translateInline(name) )
document.title = @Config.get('product_name') + ' - ' + App.i18n.translatePlain(name)
copyToClipboard: (text) ->
if window.clipboardData # IE
window.clipboardData.setData( 'Text', text )
else
window.prompt( "Copy to clipboard: Ctrl+C, Enter", text )
# disable all delay's and interval's
disconnectClient: ->
App.Delay.reset()
App.Interval.reset()
App.WebSocket.close( force: true )
# add @notify methode to create notification
notify: (data) ->
App.Event.trigger 'notify', data
# add @notifyDesktop methode to create desktop notification
notifyDesktop: (data) ->
App.Event.trigger 'notifyDesktop', data
# add @navupdate methode to update navigation
navupdate: (url) ->
App.Event.trigger 'navupdate', url
# show navigation
navShow: ->
return if $('#navigation').is(':visible')
$('#navigation').removeClass('hide')
# hide navigation
navHide: ->
return if !$('#navigation').is(':visible')
$('#navigation').addClass('hide')
scrollTo: ( x = 0, y = 0, delay = 0 ) ->
a = ->
window.scrollTo( x, y )
@delay( a, delay )
shake: (element) ->
# this part is from wordpress 3, thanks to open source
shakeMe = (element, position, positionEnd) ->
positionStart = position.shift()
element.css( 'left', positionStart + 'px' )
if position.length > 0
setTimeout( ->
shakeMe( element, position, positionEnd )
, positionEnd)
else
try
element.css( 'position', 'static' )
catch e
position = [ 15, 30, 15, 0, -15, -30, -15, 0 ]
position = position.concat( position.concat( position ) )
element.css( 'position', 'relative' )
shakeMe( element, position, 20 )
isRole: (name) ->
roles = @Session.get( 'roles' )
return false if !roles
for role in roles
return true if role.name is name
return false
# get all params of the form
formParam: (form) ->
App.ControllerForm.params(form)
formDisable: (form) ->
App.ControllerForm.disable(form)
formEnable: (form) ->
App.ControllerForm.enable(form)
formValidate: (data) ->
App.ControllerForm.validate(data)
# redirectToLogin: (data) ->
#
# human readable file size
humanFileSize: (size) =>
if size > ( 1024 * 1024 )
size = Math.round( size / ( 1024 * 1024 ) ) + ' MBytes'
else if size > 1024
size = Math.round( size / 1024 ) + ' KBytes'
else
size = size + ' Bytes'
size
# human readable time
humanTime: ( time, escalation, long = true ) =>
App.PrettyDate.humanTime( time, escalation, long )
userInfo: (data) =>
el = data.el || $('[data-id="customer_info"]')
el.unbind()
# start customer info controller
new App.WidgetUser(
el: el
user_id: data.user_id
callback: data.callback
)
authenticate: (checkOnly = false) ->
# return true if session exists
return true if @Session.get()
# remember requested url
@Config.set( 'requested_url', window.location.hash )
return false if checkOnly
# redirect to login
@navigate '#login'
return false
frontendTime: (timestamp, row = {}) ->
if !row['subclass']
row['subclass'] = ''
"<span class=\"humanTimeFromNow #{row.subclass}\" data-time=\"#{timestamp}\">?</span>"
frontendTimeUpdate: =>
update = =>
ui = @
$('.humanTimeFromNow').each( ->
# console.log('rewrite frontendTimeUpdate', this, $(this).hasClass('escalation'))
timestamp = $(this).data('time')
time = ui.humanTime( timestamp, $(this).hasClass('escalation') )
$(this).attr( 'data-tooltip', App.i18n.translateTimestamp(timestamp) )
$(this).html( time )
)
App.Interval.set( update, 30000, 'frontendTimeUpdate', 'ui' )
ticketPopups: (position = 'right') ->
@ticketPopupsDestroy()
# show ticket popup
ui = @
@ticketPopupsList = @el.find('.ticket-popover').popover(
trigger: 'hover'
container: 'body'
html: true
delay: { show: 400, hide: 400 }
placement: position
title: ->
ticket_id = $(@).data('id')
ticket = App.Ticket.fullLocal( ticket_id )
HTMLEscape( ticket.title )
content: ->
ticket_id = $(@).data('id')
ticket = App.Ticket.fullLocal( ticket_id )
ticket.humanTime = ui.humanTime(ticket.created_at)
# insert data
App.view('popover/ticket')(
ticket: ticket,
)
)
ticketPopupsDestroy: =>
if @ticketPopupsList
@ticketPopupsList.popover('destroy')
userPopups: (position = 'right') ->
# open user in new task if user isn't customer
if !@isRole('Customer')
@el.find('.user-popover').bind('click', (e) =>
user_id = $(e.target).data('id')
@navigate "#user/zoom/#{user_id}"
);
@userPopupsDestroy()
# show user popup
@userPopupsList = @el.find('.user-popover').popover(
trigger: 'hover'
container: 'body'
html: true
delay: { show: 400, hide: 400 }
placement: position
title: ->
user_id = $(@).data('id')
user = App.User.fullLocal( user_id )
HTMLEscape( user.displayName() )
content: ->
user_id = $(@).data('id')
user = App.User.fullLocal( user_id )
# get display data
data = []
for item2 in App.User.configure_attributes
item = _.clone( item2 )
# check if value for _id exists
itemNameValue = item.name
itemNameValueNew = itemNameValue.substr( 0, itemNameValue.length - 3 )
if itemNameValueNew of user
item.name = itemNameValueNew
# add to show if value exists
if user[item.name]
# do not show firstname and lastname / already show via diplayName()
if item.name isnt 'firstname' && item.name isnt 'lastname' && item.name isnt 'organization'
if item.info #&& ( @user[item.name] || item.name isnt 'note' )
data.push item
# insert data
App.view('popover/user')(
user: user,
data: data,
)
)
userPopupsDestroy: =>
if @userPopupsList
@userPopupsList.popover('destroy')
organizationPopups: (position = 'right') ->
@organizationPopupsDestroy()
# show organization popup
@organizationPopupsList = @el.find('.organization-popover').popover(
trigger: 'hover'
container: 'body'
html: true
delay: { show: 400, hide: 400 }
placement: position
title: ->
organization_id = $(@).data('id')
organization = App.Organization.fullLocal( organization_id )
HTMLEscape( organization.name )
content: ->
organization_id = $(@).data('id')
organization = App.Organization.fullLocal( organization_id )
# insert data
App.view('popover/organization')(
organization: organization,
)
)
organizationPopupsDestroy: =>
if @organizationPopupsList
@organizationPopupsList.popover('destroy')
userTicketPopups: (params) ->
show = (data, tickets) =>
if !data.position
data.position = 'left'
@userTicketPopupsDestroy()
# show user popup
controller = @
@userTicketPopupsList = @el.find(data.selector).popover(
trigger: 'hover'
container: 'body'
html: true
delay: { show: 500, hide: 5200 }
placement: data.position
title: ->
$(@).find('[title="*"]').val()
content: ->
type = $(@).filter('[data-type]').data('type')
data = tickets[type] || []
# set human time
for ticket in data
ticket.humanTime = controller.humanTime(ticket.created_at)
# insert data
App.view('popover/user_ticket_list')(
tickets: data,
)
)
fetch = (params) =>
@ajax(
type: 'GET',
url: @Config.get('api_path') + '/ticket_customer',
data: {
customer_id: params.user_id,
}
processData: true,
success: (data, status, xhr) =>
App.Store.write( "user-ticket-popover::#{params.user_id}", data.tickets )
show( params, data.tickets )
)
# get data
tickets = App.Store.get( "user-ticket-popover::#{params.user_id}" )
if tickets
show( params, tickets )
@delay(
=>
fetch(params)
1000
'fetch'
)
else
fetch(params)
userTicketPopupsDestroy: =>
if @userTicketPopupsList
@userTicketPopupsList.popover('destroy')
recentView: (object, o_id) =>
params =
object: object
o_id: o_id
App.Ajax.request(
id: "recent_view_#{object}_#{o_id}"
type: 'POST'
url: @Config.get('api_path') + '/recent_view'
data: JSON.stringify(params)
processData: true
)
prepareForObjectList: (items) ->
for item in items
item.link = ''
item.title = '???'
# convert backend name space to local name space
item.object = item.object.replace("::", '')
# lookup real data
if App[item.object] && App[item.object].exists( item.o_id )
object = App[item.object].find( item.o_id )
item.link = object.uiUrl()
item.title = object.displayName()
item.object_name = object.objectDisplayName()
item.cssIcon = object.iconActivity( @Session.get() )
item.created_by = App.User.retrieve( item.created_by_id )
items
ws_send: (data) ->
App.Event.trigger( 'ws:send', JSON.stringify(data) )
class App.ControllerPermanent extends App.Controller
constructor: ->
super
$('.content').addClass('hide');
@navShow()
class App.ControllerContent extends App.Controller
constructor: ->
super
$('.content').addClass('hide');
$('#content').removeClass('hide');
@navShow()
class App.ControllerModal extends App.Controller
elements:
'.modal-body': 'body'
events:
'submit form': 'onSubmit'
'click .js-submit:not(.is-disabled)': 'onSubmit'
'click .js-cancel': 'hide'
'click .js-close': 'hide'
className: 'modal fade zIndex-9'
constructor: (options = {}) ->
defaults =
backdrop: true
keyboard: true
close: true
head: '?'
buttonClass: 'btn--success'
centerButtons: []
options = _.extend( defaults, options )
super(options)
if @shown
@show()
show: (content) ->
if @button is true
@button = 'Submit'
@html App.view('modal')
head: @head
message: @message
detail: @detail
close: @close
cancel: @cancel
button: @button
buttonClass: @buttonClass
centerButtons:@centerButtons
content: content
if @content
@body.html @content
@el.modal
keyboard: @keyboard
show: true
backdrop: @backdrop
.on
'show.bs.modal': @onShow
'shown.bs.modal': @onShown
'hidden.bs.modal': =>
@onHide()
# remove modal from dom
$('.modal').remove()
hide: (e) =>
if e
e.preventDefault()
@el.modal('hide')
onShown: ->
console.log('modal shown: do nothing')
# do nothing
onShow: ->
console.log('modal rendered: do nothing')
# do nothing
onHide: ->
console.log('modal removed: do nothing')
# do nothing
onSubmit: (e) =>
e.preventDefault()
@log 'error', 'You need to implement your own "onSubmit" method!'
class App.ErrorModal extends App.ControllerModal
constructor: ->
super
@show()
class App.SessionMessage extends App.ControllerModal
constructor: ->
super
@show()
# reload page on modal hidden
onHide: (e) =>
if @forceReload
@reload(e)
onSubmit: (e) =>
if @forceReload
@reload(e)
reload: (e) ->
if e
e.preventDefault()
$('#app').hide().attr('style', 'display: none!important')
if window.location.reload
window.location.reload()
return true
if window.location.href
window.location.href = window.location.href
return true
throw "Cant reload page!"
class App.UpdateHeader extends App.Controller
constructor: ->
super
# subscribe and reload data / fetch new data if triggered
@subscribeId = @genericObject.subscribe( @render )
release: =>
App[ @genericObject.constructor.className ].unsubscribe(@subscribeId)
render: (genericObject) =>
@el.find( '.page-header h1' ).html( genericObject.displayName() )
class App.UpdateTastbar extends App.Controller
constructor: ->
super
# subscribe and reload data / fetch new data if triggered
@subscribeId = @genericObject.subscribe( @update )
release: =>
App[ @genericObject.constructor.className ].unsubscribe(@subscribeId)
update: (genericObject) =>
# update taskbar with new meta data
App.Event.trigger 'task:render'

View File

@@ -0,0 +1,765 @@
class App.ControllerForm extends App.Controller
fullFormSubmitLabel: 'Submit'
fullFormSubmitAdditionalClasses: ''
fullFormButtonsContainerClass: ''
fullFormAdditionalButtons: [] # [{className: 'js-class', text: 'Label'}]
constructor: (params) ->
super
for key, value of params
@[key] = value
if !@handlers
@handlers = []
if @handlersConfig
for key, value of @handlersConfig
if value && value.run
@handlers.push value.run
@handlers.push @showHideToggle
@handlers.push @requiredMandantoryToggle
if !@model
@model = {}
if !@attributes
@attributes = []
@idPrefix = Math.floor( Math.random() * 999999 ).toString()
if @model.className
@idPrefix = "#{@model.className}_#{@idPrefix}"
# set empty class attributes if needed
if !@form
@form = @formGen()
# add alert placeholder
@form.prepend('<div class="alert alert--danger js-danger js-alert hide" role="alert"></div>')
@form.prepend('<div class="alert alert--success js-success hide" role="alert"></div>')
# Fix for Issue #2510 - Zammad Customers shown as Agents in IE
# Previously the handlers are called directly, before the DOM elements are ready, thereby causing a race condition under IE11.
# Now we only dispatch the handlers after the DOM is ready.
if @handlers.length
$(@dispatchHandlers)
# if element is given, prepend form to it
if @el
@el.prepend(@form)
# if element to replace is given, replace form with
if @elReplace
@elReplace.html(@form)
# remove alert on input
@form.on('input', @hideAlert)
@finishForm = true
@form
dispatchHandlers: =>
params = App.ControllerForm.params(@form)
for attribute in @attributes
for handler in @handlers
handler(params, attribute, @attributes, @idPrefix, @form, @)
showAlert: (message) =>
@form.find('.alert--danger').first().removeClass('hide').html(App.i18n.translateInline(message))
hideAlert: =>
@form.find('.alert--danger').addClass('hide').html()
html: =>
@form.html()
formGen: =>
App.Log.debug 'ControllerForm', 'formGen', @model.configure_attributes
# check if own fieldset should be generated
# forced when the form is a grid form because flex-wrap doesn't work on fieldsets
# source: https://github.com/philipwalton/flexbugs#9-some-html-elements-cant-be-flex-containers
if @noFieldset || @grid
fieldset = @el
else
fieldset = $('<fieldset></fieldset>')
return fieldset if _.isEmpty(@model)
# collect form attributes
@attributes = []
if @model.attributesGet
attributesClean = @model.attributesGet(@screen)
else
attributesClean = App.Model.attributesGet(@screen, @model.configure_attributes)
for attributeName, attribute of attributesClean
# ignore read only or not rendered attributes attributes
if !attribute.readonly && !attribute.skipRendering
# check generic filter
if @filter && !attribute.filter
if @filter[ attributeName ]
attribute.filter = @filter[ attributeName ]
@attributes.push attribute
attributeCount = 0
for attribute in @attributes
attributeCount = attributeCount + 1
if @isDisabled == true
attribute.disabled = true
# add item
item = @formGenItem(attribute, @idPrefix, fieldset, attributeCount)
item.appendTo(fieldset)
# if password, add confirm password item
if attribute.type is 'password'
# set selected value passed on current params
if @params
if attribute.name of @params
attribute.value = @params[attribute.name]
# rename display and name to _confirm
if !attribute.single
attribute.display = attribute.display + ' (confirm)'
attribute.name = attribute.name + '_confirm'
item = @formGenItem(attribute, @idPrefix, fieldset, attributeCount)
item.appendTo(fieldset)
if @fullForm
if !@formClass
@formClass = ''
fieldset = $("<form class='form #{@formClass}' autocomplete='off'>").prepend(fieldset)
container = $("<div class='form-buttons #{@fullFormButtonsContainerClass}'>")
for buttonConfig in @fullFormAdditionalButtons
btn = $("<button class='btn #{buttonConfig.className}'>").text(buttonConfig.text)
if buttonConfig.disabled
btn.prop('disabled', true)
container.append(btn)
$("<button type=submit class='btn #{@fullFormSubmitAdditionalClasses}\' value=\"#{@fullFormSubmitLabel}\"></button>")
.text(App.i18n.translateContent(@fullFormSubmitLabel))
.appendTo(container)
container.appendTo(fieldset)
#fieldset = $("<form class=\"#{@formClass}\" autocomplete=\"off\"><div class='horizontal #{@fullFormButtonsContainerClass}'><input type=submit class=\"btn #{@fullFormSubmitAdditionalClasses}\" value=\"#{label}\"></div></form>").prepend(fieldset)
#fieldset = $("<form class=\"#{@formClass}\" autocomplete=\"off\"><input type=submit class=\"btn #{@fullFormSubmitAdditionalClasses}\" value=\"#{label}\"></form>").prepend(fieldset)
# bind form events
if @events
for eventSelector, callback of @events
do (eventSelector, callback) ->
evs = eventSelector.split(' ')
fieldset.find(evs[1]).bind(evs[0], (e) -> callback(e))
# bind tool tips
fieldset.find('.js-helpMessage').tooltip()
# return form
fieldset
###
# input text field with max. 100 size
attribute_config = {
name: 'subject'
display: 'Subject'
tag: 'input'
type: 'text'
limit: 100
null: false
default: defaults['subject']
class: 'span7'
}
# colection as relation with auto completion
attribute_config = {
name: 'customer_id'
display: 'Customer'
tag: 'autocompletion'
# auto completion params, endpoints, ui,...
type: 'text'
limit: 100
null: false
relation: 'User'
autocapitalize: false
help: 'Select the customer of the ticket or create one.'
helpLink: '<a href="" class="customer_new">&raquo;</a>'
callback: @userInfo
class: 'span7'
}
# colection as relation
attribute_config = {
name: 'priority_id'
display: 'Priority'
tag: 'select'
multiple: false
null: false
relation: 'TicketPriority'
default: defaults['priority_id']
translate: true
class: 'medium'
}
# colection as options
attribute_config = {
name: 'priority_id'
display: 'Priority'
tag: 'select'
multiple: false
null: false
options: [
{
value: 5
name: 'very hight'
selected: false
disable: false
},
{
value: 3
name: 'normal'
selected: true
disable: false
},
]
default: 3
translate: true
class: 'medium'
}
###
formGenItem: (attribute_config, idPrefix, form, attributeCount) ->
attribute = clone(attribute_config, true)
# create item id
attribute.id = "#{idPrefix}_#{attribute.name}"
# set label class name
attribute.label_class = @model.labelClass
# set autofocus
if @autofocus && attributeCount is 1
attribute.autofocus = 'autofocus'
# set required option
if attribute.required is true
attribute.null = false
if !attribute.null
attribute.required = 'required'
else
attribute.required = ''
# set autocapitalize option
if attribute.autocapitalize is undefined || attribute.autocapitalize
attribute.autocapitalize = ''
else
attribute.autocapitalize = 'autocapitalize="off"'
# set autocomplete option
if attribute.autocomplete is undefined
if attribute.type is 'hidden'
attribute.autocomplete = ''
else
attribute.autocomplete = 'autocomplete="off"'
else
attribute.autocomplete = 'autocomplete="' + attribute.autocomplete + '"'
# set default values
if attribute.value is undefined && 'default' of attribute
attribute.value = attribute.default
# set params value
if @params
parts = attribute.name.split '::'
if parts.length > 1
deepValue = parts.reduce((memo, elem) ->
memo?[elem]
, @params)
if deepValue isnt undefined
attribute.value = deepValue
# set params value to default
if attribute.name of @params
attribute.value = @params[attribute.name]
# set new value
if 'newValue' of attribute
attribute.value = attribute.newValue
App.Log.debug 'ControllerForm', 'formGenItem-before', attribute
if App.UiElement[attribute.tag]
item = App.UiElement[attribute.tag].render(attribute, @params, @)
else
throw "Invalid UiElement.#{attribute.tag}"
if attribute.only_shown_if_selectable
count = Object.keys(attribute.options).length
if !attribute.null && (attribute.nulloption && count is 2) || (!attribute.nulloption && count is 1)
attribute.transparent = true
attributesNew = clone(attribute)
attributesNew.type = 'hidden'
attributesNew.value = ''
for item in attribute.options
if item.value && item.value isnt ''
attributesNew.value = item.value
item = $( App.view('generic/input')(attribute: attributesNew) )
if @handlers
item.bind('change', (e) =>
params = App.ControllerForm.params($(e.target))
for handler in @handlers
handler(params, attribute, @attributes, idPrefix, form, @)
)
# bind dependency
if @dependency
for action in @dependency
# bind on element if name is matching
if action.bind && action.bind.name is attribute.name
ui = @
do (action, attribute) ->
item.bind('change', ->
value = $(@).val()
if !value
value = $(@).find('select, input').val()
# lookup relation if needed
if action.bind.relation
data = App[action.bind.relation].find(value)
value = data.name
# check if value is used in condition
if _.contains(action.bind.value, value)
if action.change.action is 'hide'
ui.hide(action.change.name)
else
ui.show(action.change.name)
)
if !attribute.display || attribute.transparent
# hide/show item
#if attribute.hide
# @.hide(attribute.name)
return item
else
placeholderObjects = {}
if @model.className && @params && !_.isEmpty(attribute.linktemplate) && !_.isEmpty(@params[attribute.name])
placeholderObjects = { attribute: attribute, session: App.Session.get(), config: App.Config.all() }
placeholderObjects[@model.className.toLowerCase()] = @params
fullItem = $(
App.view('generic/attribute')(
attribute: attribute,
item: '',
bookmarkable: @bookmarkable
placeholderObjects: placeholderObjects
)
)
fullItem.find('.controls').prepend(item)
# hide/show item
if attribute.hide
@.hide(attribute.name, fullItem)
return fullItem
show: (name, el = @form) ->
if !_.isArray(name)
name = [name]
for key in name
el.find('[name="' + key + '"]').closest('.form-group').removeClass('hide')
el.find('[name="' + key + '"]').removeClass('is-hidden')
el.find('[data-name="' + key + '"]').closest('.form-group').removeClass('hide')
el.find('[data-name="' + key + '"]').removeClass('is-hidden')
# hide old validation states
if el
el.find('.has-error').removeClass('has-error')
el.find('.help-inline').html('')
hide: (name, el = @form) ->
if !_.isArray(name)
name = [name]
for key in name
el.find('[name="' + key + '"]').closest('.form-group').addClass('hide')
el.find('[name="' + key + '"]').addClass('is-hidden')
el.find('[data-name="' + key + '"]').closest('.form-group').addClass('hide')
el.find('[data-name="' + key + '"]').addClass('is-hidden')
mandantory: (name, el = @form) ->
if !_.isArray(name)
name = [name]
for key in name
el.find('[name="' + key + '"]').attr('required', true)
el.find('[name="' + key + '"]').parents('.form-group').find('label span').html('*')
optional: (name, el = @form) ->
if !_.isArray(name)
name = [name]
for key in name
el.find('[name="' + key + '"]').attr('required', false)
el.find('[name="' + key + '"]').parents('.form-group').find('label span').html('')
showHideToggle: (params, changedAttribute, attributes, _classname, form, ui) ->
for attribute in attributes
if attribute.shown_if
hit = false
for refAttribute, refValue of attribute.shown_if
if params[refAttribute]
if _.isArray(refValue)
for item in refValue
if params[refAttribute].toString() is item.toString()
hit = true
else if params[refAttribute].toString() is refValue.toString()
hit = true
if hit
ui.show(attribute.name, form)
else
ui.hide(attribute.name, form)
requiredMandantoryToggle: (params, changedAttribute, attributes, _classname, form, ui) ->
for attribute in attributes
if attribute.required_if
hit = false
for refAttribute, refValue of attribute.required_if
if params[refAttribute]
if _.isArray(refValue)
for item in refValue
if params[refAttribute].toString() is item.toString()
hit = true
else if params[refAttribute].toString() is refValue.toString()
hit = true
if hit
ui.mandantory(attribute.name, form)
else
ui.optional(attribute.name, form)
validate: (params) ->
App.Model.validate(
model: @model
params: params
screen: @screen
)
# get all params of the form
# set clearAccessories to true to remove inline image resizing handles
@params: (form, clearAccessories = false) ->
param = {}
lookupForm = @findForm(form)
if clearAccessories
# remove inline image resizing handles
lookupForm.find('.richtext.form-control').trigger('click')
# get contenteditable
for element in lookupForm.find('[contenteditable]')
name = $(element).data('name')
if name
param[name] = $(element).ceg()
# get form elements
array = lookupForm.serializeArrayWithType()
# array to names
for item in array
# check if item is-hidden and should not be used
if lookupForm.find('[name="' + item.name + '"]').hasClass('is-hidden') || lookupForm.find('div[data-name="' + item.name + '"]').hasClass('is-hidden')
delete param[item.name]
continue
# collect all params, push it to an array item.value already exists
value = item.value
if item.value
value = item.value.trim()
if item.type is 'boolean'
if value is ''
value = undefined
else if value is undefined
value = false
else if value is 'true'
value = true
else if value is 'false'
value = false
if item.type is 'integer'
if value is ''
value = undefined
else
value = parseInt(value)
if param[item.name] isnt undefined
if typeof param[item.name] is 'string' || typeof param[item.name] is 'boolean' || typeof param[item.name] is 'number'
param[item.name] = [param[item.name], value]
else
param[item.name].push value
else
param[item.name] = value
# verify if we have not checked checkboxes
uncheckParam = {}
lookupForm.find('input[type=checkbox]').each( (index) ->
type = $(@).data('field-type')
checked = $(@).prop('checked')
name = $(@).attr('name')
if name && !checked && !(name of param)
if !(name of uncheckParam)
if type is 'boolean'
uncheckParam[name] = false
else
uncheckParam[name] = undefined
else
uncheckParam[name] = []
true
)
# verify if we have not checked radios
lookupForm.find('input[type=radio]').each( (index) ->
type = $(@).data('field-type')
checked = $(@).prop('checked')
name = $(@).attr('name')
if name && !checked && !(name of param)
if type is 'boolean'
uncheckParam[name] = false
else
uncheckParam[name] = undefined
true
)
# apply empty checkboxes & radio values to params
for key, value of uncheckParam
if !(key of param)
param[key] = value
# data type conversion
for key of param
# get {date}
if key.substr(0,6) is '{date}'
newKey = key.substr(6, key.length)
if lookupForm.find("[data-name=\"#{newKey}\"]").hasClass('is-hidden')
param[newKey] = null
else if param[key]
try
time = new Date( Date.parse("#{param[key]}T00:00:00Z") )
format = (number) ->
if parseInt(number) < 10
number = "0#{number}"
number
if time is 'Invalid Date'
throw "Invalid Date #{param[key]}"
param[newKey] = "#{time.getUTCFullYear()}-#{format(time.getUTCMonth()+1)}-#{format(time.getUTCDate())}"
catch err
param[newKey] = "invalid #{param[key]}"
console.log('ERR', err)
else
param[newKey] = null
delete param[key]
# get {datetime}
else if key.substr(0,10) is '{datetime}'
newKey = key.substr(10, key.length)
if lookupForm.find("[data-name=\"#{newKey}\"]").hasClass('is-hidden')
param[newKey] = null
else if param[key]
try
time = new Date( Date.parse(param[key]) )
if time is 'Invalid Datetime'
throw "Invalid Datetime #{param[key]}"
param[newKey] = time.toISOString().replace(/:\d\d\.\d\d\dZ$/, ':00.000Z')
catch err
param[newKey] = "invalid #{param[key]}"
console.log('ERR', err)
else
param[newKey] = null
delete param[key]
# split :: fields, build objects
inputSelectObject = {}
for key of param
parts = key.split '::'
if parts[0] && parts[1] isnt undefined
if parts[1] isnt undefined && !inputSelectObject[ parts[0] ]
inputSelectObject[ parts[0] ] = {}
if parts[2] isnt undefined && !inputSelectObject[ parts[0] ][ parts[1] ]
inputSelectObject[ parts[0] ][ parts[1] ] = {}
if parts[3] isnt undefined && !inputSelectObject[ parts[0] ][ parts[1] ][ parts[2] ]
inputSelectObject[ parts[0] ][ parts[1] ][ parts[2] ] = {}
if parts[3] isnt undefined
inputSelectObject[ parts[0] ][ parts[1] ][ parts[2] ][ parts[3] ] = param[ key ]
delete param[ key ]
else if parts[2] isnt undefined
inputSelectObject[ parts[0] ][ parts[1] ][ parts[2] ] = param[ key ]
delete param[ key ]
else if parts[1] isnt undefined
inputSelectObject[ parts[0] ][ parts[1] ] = param[ key ]
delete param[ key ]
# set new object params
for key of inputSelectObject
param[ key ] = inputSelectObject[ key ]
# data type conversion
for key of param
# get {business_hours}
if key.substr(0,16) is '{business_hours}'
newKey = key.substr(16, key.length)
if lookupForm.find("[data-name=\"#{newKey}\"]").hasClass('is-hidden')
param[newKey] = null
else if param[key]
newParams = {}
for day, value of param[key]
newParams[day] = {}
newParams[day].active = false
if value.active is 'true'
newParams[day].active = true
newParams[day].timeframes = []
if _.isArray(value.start)
for pos of value.start
newParams[day].timeframes.push [ value.start[pos], value.end[pos] ]
else
newParams[day].timeframes.push [ value.start, value.end ]
param[newKey] = newParams
else
param[newKey] = undefined
delete param[key]
#App.Log.notice 'ControllerForm', 'formParam', form, param
param
@formId: ->
formId = new Date().getTime() + Math.floor( Math.random() * 99999 )
formId.toString().substr formId.toString().length-9, 9
@findForm: (form) ->
# check jquery event
if form && form.target
form = form.target
# create jquery object if not already exists
if form instanceof jQuery
# do nothing
else
form = $(form)
# get form
if form.is('form') is true
#console.log('direct from')
return form
else if form.find('form').is('form') is true
#console.log('child from')
return form.find('form')
else if $(form).closest('form').is('form') is true
#console.log('closest from')
return form.closest('form')
# use current content as form if form isn't already finished
else if !@finishForm
#console.log('finishForm')
return form
else
App.Log.error 'ControllerForm', 'no form found!', form
form
@disable: (form, type = 'form') ->
lookupForm = @findForm(form)
if lookupForm && type is 'form'
if lookupForm.is('button, input, select, textarea, div, span')
App.Log.debug 'ControllerForm', 'disable item...', lookupForm
lookupForm.prop('readonly', true)
lookupForm.prop('disabled', true)
return
App.Log.debug 'ControllerForm', 'disable form...', lookupForm
# set forms to read only during communication with backend
lookupForm.find('button, input, select, textarea').prop('readonly', true)
# disable radio and checkbox buttons
lookupForm.find('input[type=checkbox], input[type=radio]').prop('disabled', true)
# disable additionals submits
lookupForm.find('button').prop('disabled', true)
else
App.Log.debug 'ControllerForm', 'disable item...', form
form.prop('readonly', true)
form.prop('disabled', true)
@enable: (form, type = 'form') ->
lookupForm = @findForm(form)
if lookupForm && type is 'form'
if lookupForm.is('button, input, select, textarea, div, span')
App.Log.debug 'ControllerForm', 'disable item...', lookupForm
lookupForm.prop('readonly', false)
lookupForm.prop('disabled', false)
return
App.Log.debug 'ControllerForm', 'enable form...', lookupForm
# enable fields again
lookupForm.find('button, input, select, textarea').prop('readonly', false)
# enable radio and checkbox buttons
lookupForm.find('input[type=checkbox], input[type=radio]').prop('disabled', false)
# enable submits again
lookupForm.find('button').prop('disabled', false)
else
App.Log.debug 'ControllerForm', 'enable item...', form
form.prop('readonly', false)
form.prop('disabled', false)
@validate: (data) ->
lookupForm = @findForm(data.form)
# remove all errors
lookupForm.find('.has-error').removeClass('has-error')
lookupForm.find('.help-inline').html('')
# show new errors
for key, msg of data.errors
# generic validation
itemGeneric = lookupForm.find('[name="' + key + '"]').closest('.form-group')
itemGeneric.addClass('has-error')
itemGeneric.find('.help-inline').html(msg)
# use meta fields
itemMeta = lookupForm.find('[data-name="' + key + '"]').closest('.form-group')
itemMeta.addClass('has-error')
itemMeta.find('.help-inline').html(msg)
# use native fields
itemGeneric = lookupForm.find('[name="' + key + '"]').closest('.form-control')
itemGeneric.trigger('validate')
itemMeta = lookupForm.find('[data-name="' + key + '"]').closest('.form-control')
itemMeta.trigger('validate')
# set autofocus by delay to make validation testable
App.Delay.set(
->
lookupForm.find('.has-error').find('input, textarea, select').first().focus()
200
'validate'
)

File diff suppressed because it is too large Load Diff

View File

@@ -1,557 +0,0 @@
class App.ControllerGenericNew extends App.ControllerModal
constructor: (params) ->
super
@head = App.i18n.translateContent( 'New' ) + ': ' + App.i18n.translateContent( @pageData.object )
@cancel = true
@button = true
controller = new App.ControllerForm(
model: App[ @genericObject ]
params: @item
screen: @screen || 'edit'
autofocus: true
)
@content = controller.form
@show()
onSubmit: (e) ->
e.preventDefault()
params = @formParam( e.target )
object = new App[ @genericObject ]
object.load(params)
# validate
errors = object.validate()
if errors
@log 'error', errors
@formValidate( form: e.target, errors: errors )
return false
# disable form
@formDisable(e)
# save object
ui = @
object.save(
done: ->
if ui.callback
item = App[ ui.genericObject ].fullLocal(@id)
ui.callback( item )
ui.hide()
fail: ->
ui.log 'errors'
ui.hide()
)
class App.ControllerGenericEdit extends App.ControllerModal
constructor: (params) ->
super
@item = App[ @genericObject ].find( params.id )
@head = App.i18n.translateContent( 'Edit' ) + ': ' + App.i18n.translateContent( @pageData.object )
@cancel = true
@button = true
controller = new App.ControllerForm(
model: App[ @genericObject ]
params: @item
screen: @screen || 'edit'
autofocus: true
)
@content = controller.form
@show()
onSubmit: (e) ->
e.preventDefault()
params = @formParam(e.target)
@item.load(params)
# validate
errors = @item.validate()
if errors
@log 'error', errors
@formValidate( form: e.target, errors: errors )
return false
# disable form
@formDisable(e)
# save object
ui = @
@item.save(
done: ->
if ui.callback
item = App[ ui.genericObject ].fullLocal(@id)
ui.callback( item )
ui.hide()
fail: =>
ui.log 'errors'
ui.hide()
)
class App.ControllerGenericIndex extends App.Controller
events:
'click [data-type=edit]': 'edit'
'click [data-type=new]': 'new'
constructor: ->
super
# set title
@title @pageData.title
# set nav bar
@navupdate @pageData.navupdate
# bind render after a change is done
if !@disableRender
@subscribeId = App[ @genericObject ].subscribe(@render)
App[ @genericObject ].bind 'ajaxError', (rec, msg) =>
@log 'error', 'ajax', msg.status
if msg.status is 401
@log 'error', 'ajax', rec, msg, msg.status
# @navigate @pageData.navupdate
# alert('relogin')
@navigate 'login'
# execute fetch
@render()
# fetch all
if !@disableInitFetch
App[ @genericObject ].fetch()
release: =>
if @subscribeId
App[ @genericObject ].unsubscribe(@subscribeId)
render: =>
objects = App[@genericObject].search( sortBy: @defaultSortBy || 'name' )
# remove ignored items from collection
if @ignoreObjectIDs
objects = _.filter( objects, (item) ->
return if item.id is 1
return item
)
@html App.view('generic/admin/index')(
head: @pageData.objects
notes: @pageData.notes
buttons: @pageData.buttons
menus: @pageData.menus
)
# append content table
params = _.extend(
{
el: @el.find('.table-overview')
model: App[ @genericObject ]
objects: objects
bindRow:
events:
'click': @edit
},
@pageData.tableExtend
)
new App.ControllerTable(params)
edit: (id, e) =>
e.preventDefault()
item = App[ @genericObject ].find(id)
if @editCallback
@editCallback(item)
return
new App.ControllerGenericEdit(
id: item.id
pageData: @pageData
genericObject: @genericObject
)
new: (e) ->
e.preventDefault()
new App.ControllerGenericNew(
pageData: @pageData
genericObject: @genericObject
)
class App.ControllerGenericDestroyConfirm extends App.ControllerModal
constructor: ->
super
@head = 'Confirm'
@cancel = true
@button = 'Yes'
@message = 'Sure to delete this object?'
@show()
onSubmit: (e) ->
e.preventDefault()
@hide()
@item.destroy()
class App.ControllerDrox extends App.Controller
constructor: (params) ->
super
if params.data && ( params.data.text || params.data.html )
@inline(params.data)
inline: (data) ->
@html App.view('generic/drox')(data)
if data.text
@el.find('.drox-body').text(data.text)
if data.html
@el.find('.drox-body').html(data.html)
template: (data) ->
drox = $( App.view('generic/drox')(data) )
content = App.view(data.file)(data.params)
drox.find('.drox-body').append(content)
drox
class App.ControllerLevel2 extends App.ControllerContent
events:
'click [data-toggle="tabnav"]': 'toggle',
constructor: ->
super
render: ->
# set title
@title @page.title
@navupdate @page.nav
@html App.view('generic/admin_level2/index')(
page: @page
menus: @menu
type: @type
target: @target
)
if !@target
@target = @menu[0]['target']
for menu in @menu
@el.find('.nav-tab-content').append('<div class="tabbable" id="' + menu.target + '"></div>')
if menu.controller && ( @toggleable is true || ( @toggleable is false && menu.target is @target ) )
params = menu.params || {}
params.el = @el.find( '#' + menu.target )
new menu.controller( params )
@el.find('.tabbable').addClass('hide')
@el.find( '#' + @target ).removeClass('hide')
@el.find('[data-toggle="tabnav"][href*="/' + @target + '"]').parent().addClass('active')
toggle: (e) ->
return true if @toggleable is false
e.preventDefault()
target = $(e.target).data('target')
$(e.target).parents('ul').find('li').removeClass('active')
$(e.target).parents('li').addClass('active')
@el.find('.tabbable').addClass('hide')
@el.find('#' + target).removeClass('hide')
# window.scrollTo(0,0)
class App.ControllerTabs extends App.Controller
events:
'click .nav-tabs [data-toggle="tab"]': 'tabRemember',
constructor: ->
super
render: ->
@html App.view('generic/tabs')(
tabs: @tabs
)
for tab in @tabs
@el.find('.tab-content').append('<div class="tab-pane" id="' + tab.target + '"></div>')
if tab.controller
params = tab.params || {}
params.el = @el.find( '#' + tab.target )
new tab.controller( params )
@lastActiveTab = @Config.get('lastTab')
if @lastActiveTab && @el.find('.nav-tabs li a[href="' + @lastActiveTab + '"]')[0]
@el.find('.nav-tabs li a[href="' + @lastActiveTab + '"]').tab('show')
else
@el.find('.nav-tabs li:first a').tab('show')
tabRemember: (e) =>
@lastActiveTab = $(e.target).attr('href')
@Config.set('lastTab', @lastActiveTab)
class App.ControllerNavSidbar extends App.ControllerContent
constructor: (params) ->
super
# get groups
groups = App.Config.get(@configKey)
groupsUnsorted = []
for key, value of groups
if !value.controller
groupsUnsorted.push value
@groupsSorted = _.sortBy( groupsUnsorted, (item) -> return item.prio )
# get items of group
for group in @groupsSorted
items = App.Config.get(@configKey)
itemsUnsorted = []
for key, value of items
if value.controller
if value.parent is group.target
itemsUnsorted.push value
group.items = _.sortBy( itemsUnsorted, (item) -> return item.prio )
# set active item
selectedItem = undefined
for group in @groupsSorted
if group.items
for item in group.items
if !@target && !selectedItem
item.active = true
selectedItem = item
else if @target && item.target is window.location.hash
item.active = true
selectedItem = item
else
item.active = false
@render(selectedItem)
@bind(
'ui:rerender'
=>
@render(selectedItem, true)
)
render: (selectedItem, force) ->
if !$( '.' + @configKey )[0] || force
@html App.view('generic/navbar_l2')(
groups: @groupsSorted
className: @configKey
)
if selectedItem
@el.find('li').removeClass('active')
@el.find('a[href="' + selectedItem.target + '"]').parent().addClass('active')
new selectedItem.controller(
el: @el.find('.main')
)
class App.GenericHistory extends App.ControllerModal
constructor: ->
super
@head = 'History'
@close = true
render: ->
localItem = @reworkItems( @items )
@content = $ App.view('generic/history')(
items: localItem
)
@onShow()
@content.find('a[data-type="sortorder"]').bind(
'click',
(e) =>
e.preventDefault()
@sortorder()
)
if !@isShown
@isShown = true
@show()
onShow: =>
# enable user popups
@userPopups()
# show frontend times
@delay( @frontendTimeUpdate, 800, 'ui-time-update' )
sortorder: =>
@items = @items.reverse()
@render()
T: (name) ->
App.i18n.translateInline(name)
reworkItems: (items) ->
newItems = []
newItem = {}
lastUserId = undefined
lastTime = undefined
items = clone(items)
for item in items
if item.object is 'Ticket::Article'
item.object = 'Article'
data = item
data.created_by = App.User.find( item.created_by_id )
currentItemTime = new Date( item.created_at )
lastItemTime = new Date( new Date( lastTime ).getTime() + (15 * 1000) )
# start new section if user or time has changed
if lastUserId isnt item.created_by_id || currentItemTime > lastItemTime
lastTime = item.created_at
lastUserId = item.created_by_id
if !_.isEmpty(newItem)
newItems.push newItem
newItem =
created_at: item.created_at
created_by: App.User.find( item.created_by_id )
records: []
# build content
content = ''
if item.type is 'notification' || item.type is 'email'
content = "#{ @T( item.type ) } #{ @T( 'sent to' ) } '#{ item.value_to }'"
else
content = "#{ @T( item.type ) } #{ @T(item.object) } "
if item.attribute
content += "#{ @T(item.attribute) }"
# convert time stamps
if item.object is 'User' && item.attribute is 'last_login'
if item.value_from
item.value_from = App.i18n.translateTimestamp( item.value_from )
if item.value_to
item.value_to = App.i18n.translateTimestamp( item.value_to )
if item.value_from
if item.value_to
content += " #{ @T( 'from' ) }"
content += " '#{ HTMLEscape(item.value_from) }'"
if item.value_to
if item.value_from
content += " #{ @T( 'to' ) }"
content += " '#{ HTMLEscape(item.value_to) }'"
newItem.records.push content
if !_.isEmpty(newItem)
newItems.push newItem
newItems
class App.ActionRow extends App.Controller
constructor: ->
super
@render()
render: ->
@html App.view('generic/actions')(
items: @items
)
for item in @items
do (item) =>
@el.find('[data-type="' + item.name + '"]').on(
'click',
(e) =>
e.preventDefault()
item.callback()
)
class App.Sidebar extends App.Controller
events:
'click .tabsSidebar-tab': 'toggleTab'
'click .tabsSidebar-close': 'toggleSidebar'
constructor: ->
super
@render()
# get first tab
name = @el.find('.tabsSidebar-tab').first().data('tab')
# activate first tab
@toggleTabAction(name)
render: =>
@html App.view('generic/sidebar_tabs')( items: @items )
# init content callback
for item in @items
if item.callback
item.callback( @el.find( '.sidebar[data-tab="' + item.name + '"] .sidebar-content' ) )
# add item acctions
for item in @items
if item.actions
for action in item.actions
do (action) =>
@el.find('.sidebar[data-tab="' + item.name + '"] .tabsSidebar-tabActions .tabsSidebar-tabAction[data-name="' + action.name + '"]').bind(
'click'
(e) =>
e.stopPropagation()
e.preventDefault()
action.callback(e)
)
toggleSidebar: ->
@el.parent().find('.tabsSidebar-sidebarSpacer').toggleClass('is-closed')
@el.parent().find('.tabsSidebar').toggleClass('is-closed')
showSidebar: ->
@el.parent().find('.tabsSidebar-sidebarSpacer').removeClass('is-closed')
@el.parent().find('.tabsSidebar').removeClass('is-closed')
toggleTab: (e) ->
# get selected tab
name = $(e.target).closest('.tabsSidebar-tab').data('tab')
if name
# if current tab is selected again, toggle side bar
if name is @currentTab
@toggleSidebar()
# toggle content tab
else
@toggleTabAction(name)
toggleTabAction: (name) ->
return if !name
# remove active state
@el.find('.tabsSidebar-tab').removeClass('active')
# add active state
@el.find('.tabsSidebar-tab[data-tab=' + name + ']').addClass('active')
# hide all content tabs
@el.find('.sidebar').addClass('hide')
# show active tab content
tabContent = @el.find('.sidebar[data-tab=' + name + ']')
tabContent.removeClass('hide')
# remember current tab
@currentTab = name
# show sidebar if not shown
@showSidebar()

View File

@@ -0,0 +1,51 @@
class App.ControllerReorderModal extends App.ControllerModal
head: 'Drag to reorder'
content: ->
view = $(App.view('reorder_modal')())
table = new App.ControllerTable(
baseColWidth: null
dndCallback: ->
true
overview: ['title']
attribute_list: [
{ name: 'title', display: 'Name' }
]
objects: @items
)
view.find('.js-table-container').html(table.el)
view
onShown: ->
super
@$('.js-submit').focus()
save: ->
ids = @$('tr.item').toArray().map (el) -> parseInt(el.dataset.id)
@$('.alert').addClass('hidden')
@formDisable(@el)
@ajax(
id: 'reorder_save'
type: 'PATCH'
data: JSON.stringify({ordered_ids: ids})
url: @url
processData: true
success: (data, status, xhr) =>
App.Collection.loadAssets(data)
App.Event.trigger 'knowledge_base::sidebar::rerender'
@close()
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@$('.alert--danger').removeClass('hidden').text(data.error)
@formEnable(@el)
)
onSubmit: ->
super
@save()

File diff suppressed because it is too large Load Diff

View File

@@ -1,278 +0,0 @@
class App.ControllerTable extends App.Controller
constructor: (params) ->
for key, value of params
@[key] = value
@table = @tableGen(params)
if @el
@el.append( @table )
###
# table based on model
rowClick = (id, e) ->
e.preventDefault()
console.log('rowClick', id)
rowMouseover = (id, e) ->
e.preventDefault()
console.log('rowMouseover', id)
rowMouseout = (id, e) ->
e.preventDefault()
console.log('rowMouseout', id)
rowDblClick = (id, e) ->
e.preventDefault()
console.log('rowDblClick', id)
colClick = (id, e) ->
e.preventDefault()
console.log('colClick', e.target)
checkboxClick = (id, e) ->
e.preventDefault()
console.log('checkboxClick', e.target)
callbackHeader = (header) ->
console.log('current header is', header)
# add new header item
attribute =
name: 'some name'
display: 'Some Name'
header.push attribute
console.log('new header is', header)
callbackAttributes = (value, object, attribute, header, refObject) ->
console.log('data of item col', value, object, attribute, header, refObject)
value = 'New Data To Show'
value
new App.ControllerTable(
el: element
overview: ['host', 'user', 'adapter', 'active']
model: App.Channel
objects: data
groupBy: 'group'
checkbox: false
radio: false
bindRow:
events:
'click': rowClick
'mouseover': rowMouseover
'mouseout': rowMouseout
'dblclick': rowDblClick
bindCol:
host:
events:
'click': colClick
bindCheckbox:
events:
'click': rowClick
'mouseover': rowMouseover
'mouseout': rowMouseout
'dblclick': rowDblClick
callbackHeader: callbackHeader
callbackAttributes:
attributeName: [
callbackAttributes
]
)
new App.ControllerTable(
el: element
overview: ['time', 'area', 'level', 'browser', 'location', 'data']
attributes: [
{ name: 'time', display: 'Time', type: 'time' },
{ name: 'area', display: 'Area', type: 'text' },
{ name: 'level', display: 'Level', type: 'text' },
{ name: 'browser', display: 'Browser', type: 'text' },
{ name: 'location', display: 'Location', type: 'text' },
{ name: 'data', display: 'Data', type: 'text' },
]
objects: data
)
###
tableGen: (data) ->
if !data.model
data.model = {}
overview = data.overview || data.model.configure_overview || []
attributes = data.attributes || data.model.configure_attributes || {}
attributes = App.Model.attributesGet(false, attributes)
destroy = data.model.configure_delete
# check if table is empty
if _.isEmpty(data.objects)
table = '<p>-' + App.i18n.translateContent( 'none' ) + '-</p>'
return $(table)
# group by
if data.groupBy
# remove group by attribute from header
overview = _.filter(
overview
(item) =>
return item if item isnt data.groupBy
return
)
# get new order
groupObjects = _.groupBy(
data.objects
(item) =>
return '' if !item[data.groupBy]
return item[data.groupBy].displayName() if item[data.groupBy].displayName
item[data.groupBy]
)
groupOrder = []
for group, value of groupObjects
groupOrder.push group
# sort new groups
groupOrder = _.sortBy(
groupOrder
(item) =>
item
)
# create new data array
data.objects = []
for group in groupOrder
data.objects = data.objects.concat groupObjects[group]
groupObjects[group] = [] # release old array
# get header data
header = []
for item in overview
headerFound = false
for attributeName, attribute of attributes
if attributeName is item
headerFound = true
header.push attribute
else
rowWithoutId = item + '_id'
if attributeName is rowWithoutId
headerFound = true
header.push attribute
# execute header callback
if data.callbackHeader
header = data.callbackHeader(header)
# get content
@log 'debug', 'table', 'header', header, 'overview', 'objects', data.objects
table = App.view('generic/table')(
header: header
objects: data.objects
checkbox: data.checkbox
radio: data.radio
groupBy: data.groupBy
destroy: destroy
callbacks: data.callbackAttributes
)
# convert to jquery object
table = $(table)
cursorMap =
click: 'pointer'
dblclick: 'pointer'
#mouseover: 'alias'
# bind col.
if data.bindCol
for name, item of data.bindCol
if item.events
position = 0
if data.checkbox
position += 1
hit = false
for headerName in header
if !hit
position += 1
if headerName.name is name || headerName.name is "#{name}_id"
hit = true
if hit
for event, callback of item.events
do (table, event, callback) =>
if cursorMap[event]
table.find("tbody > tr > td:nth-child(#{position}) span").css( 'cursor', cursorMap[event] )
table.on( event, "tbody > tr > td:nth-child(#{position}) span",
(e) =>
e.stopPropagation()
id = $(e.target).parents('tr').data('id')
callback(id, e)
)
# bind row
if data.bindRow
if data.bindRow.events
for event, callback of data.bindRow.events
do (table, event, callback) =>
if cursorMap[event]
table.find('tbody > tr').css( 'cursor', cursorMap[event] )
table.on( event, 'tbody > tr',
(e) =>
id = $(e.target).parents('tr').data('id')
callback(id, e)
)
# bind bindCheckbox
if data.bindCheckbox
if data.bindCheckbox.events
for event, callback of data.bindCheckbox.events
do (table, event, callback) =>
table.delegate('input[name="bulk"]', event, (e) ->
e.stopPropagation()
id = $(e.target).parents('tr').data('id')
checked = $(e.target).prop('checked')
callback(id, checked, e)
)
# bind on delete dialog
if data.model && destroy
table.delegate('[data-type="destroy"]', 'click', (e) ->
e.stopPropagation()
e.preventDefault()
itemId = $(e.target).parents('tr').data('id')
item = data.model.find(itemId)
new App.ControllerGenericDestroyConfirm(
item: item
)
)
# enable checkbox bulk selection
if data.checkbox
# click first tr>td, catch click
table.delegate('tr > td:nth-child(1)', event, (e) ->
e.stopPropagation()
)
# bind on full bulk click
table.delegate('input[name="bulk_all"]', 'click', (e) ->
e.stopPropagation()
if $(e.target).prop('checked')
$(e.target).parents('table').find('[name="bulk"]').each( ->
if !$(@).prop('checked')
#$(@).prop('checked', true)
$(@).trigger('click')
)
else
$(e.target).parents('table').find('[name="bulk"]').each( ->
if $(@).prop('checked')
#$(@).prop('checked', false)
$(@).trigger('click')
)
)
time = =>
@frontendTimeUpdate()
@delay(time, 80) # to show time immediately for normal tables
@delay(time, 280) # to show time immediately for tables in modal dialog
table

View File

@@ -0,0 +1,415 @@
class App.ChannelChat extends App.ControllerSubContent
requiredPermission: 'admin.channel_chat'
header: 'Chat'
events:
'change .js-params': 'updateParams'
'input .js-params': 'updateParams'
'submit .js-demo-head': 'onUrlSubmit'
'click .js-selectBrowserWidth': 'selectBrowserWidth'
'click .js-swatch': 'usePaletteColor'
'click .js-toggle-chat': 'toggleChat'
'change .js-chatSetting input': 'toggleChatSetting'
'click .js-eyedropper': 'pickColor'
elements:
'.js-browser': 'browser'
'.js-browserBody': 'browserBody'
'.js-screenshot': 'screenshot'
'.js-website': 'website'
'.js-chat': 'chat'
'.js-chatHeader': 'chatHeader'
'.js-chat-welcome': 'chatWelcome'
'.js-testurl-input': 'urlInput'
'.js-backgroundColor': 'chatBackground'
'.js-code': 'code'
'.js-palette': 'palette'
'.js-color': 'colorField'
'.js-chatSetting input': 'chatSetting'
'.js-eyedropper': 'eyedropper'
apiOptions: [
{
name: 'chatId'
default: '1'
type: 'Number'
description: 'Identifier of the chat-topic.'
}
{
name: 'show'
default: true
type: 'Boolean'
description: 'Show the chat when ready.'
}
{
name: 'target'
default: "$('body')"
type: 'jQuery Object'
description: 'Where to append the chat to.'
}
{
name: 'host'
default: '(Empty)'
type: 'String'
description: "If left empty, the host gets auto-detected - in this case %s. The auto-detection reads out the host from the <script> tag. If you don't include it via a <script> tag you need to specify the host."
descriptionSubstitute: window.location.origin
}
{
name: 'debug'
default: false
type: 'Boolean'
description: 'Enables console logging.'
}
{
name: 'title'
default: "'<strong>Chat</strong> with us!'"
type: 'String'
description: 'Welcome Title shown on the closed chat. Can contain HTML.'
}
{
name: 'fontSize'
default: 'undefined'
type: 'String'
description: 'CSS font-size with a unit like 12px, 1.5em. If left to undefined it inherits the font-size of the website.'
}
{
name: 'flat'
default: 'false'
type: 'Boolean'
description: 'Removes the shadows for a flat look.'
}
{
name: 'buttonClass'
default: "'open-zammad-chat'"
type: 'String'
description: 'Add this class to a button on your page that should open the chat.'
}
{
name: 'inactiveClass'
default: "'is-inactive'"
type: 'String'
description: 'This class gets added to the button on initialization and gets removed once the chat connection got established.'
}
{
name: 'cssAutoload'
default: 'true'
type: 'Boolean'
description: 'Automatically loads the chat.css file. If you want to use your own css, just set it to false.'
}
{
name: 'cssUrl'
default: 'undefined'
type: 'String'
description: 'Location of an external chat.css file.'
}
]
isOpen: true
browserWidth: 1280
browserWidthMax: 1280
previewUrl: ''
previewScale: 1
constructor: ->
super
if @Session.get('email')
@previewUrl = "www.#{@Session.get('email').replace(/^.+?\@/, '')}"
@load()
@permanent =
chatId: 1
@widgetDesignerPermanentParams =
id: 'id'
$(window).on 'resize.chat-designer', @resizeDemo
load: =>
@startLoading()
@ajax(
id: 'chat_index'
type: 'GET'
url: @apiPath + '/chats'
processData: true
success: (data, status, xhr) =>
App.Collection.loadAssets(data.assets)
firstChat = App.Chat.first()
if firstChat
@permanent =
chatId: firstChat.id
@stopLoading()
@render(data)
)
render: (data = {}) =>
@html App.view('channel/chat')(
baseurl: window.location.origin
apiOptions: @apiOptions
previewUrl: @previewUrl
chatSetting: @Config.get('chat')
)
new Topics(
el: @$('.js-topics')
)
@code.each (i, block) ->
hljs.highlightBlock block
@updatePreview()
@updateParams()
@changeDemoWebsite()
# bind updatePreview with parameter animate = false
$(window).on 'resize.chat-designer', => @updatePreview false
release: ->
$(window).off 'resize.chat-designer'
@website.off('click.eyedropper')
selectBrowserWidth: (event) =>
tab = $(event.target).closest('[data-value]')
# select tab
tab.addClass('is-selected').siblings().removeClass('is-selected')
@browserWidth = tab.attr('data-value')
@updatePreview()
updatePreview: (animate = true) =>
width = parseInt @browserWidth, 10
# reset zoom
@chat
.removeClass('is-fullscreen')
.toggleClass('no-transition', !animate)
.css 'transform', "translateY(#{ @getChatOffset() }px)"
@browser.css('width', '')
@website.css
transform: ''
width: ''
height: ''
@previewScale = 1
return if @browserWidth is 'fit'
if width < @el.width() && width == 375
@chat.addClass('is-fullscreen').css 'transform', "translateY(#{ @getChatOffset(true) }px)"
@browser.css('width', "#{ width }px")
else
if @el.width() > width && width == @browserWidthMax
@previewScale = 1
else
@previewScale = @el.width()/width
@chat.css 'transform', "translateY(#{ @getChatOffset() * @previewScale }px) scale(#{ @previewScale })"
@website.css
transform: "scale(#{ @previewScale })"
width: @el.width() / @previewScale
height: @browserBody.height() / @previewScale
getChatOffset: (fullscreen) ->
return 0 if @isOpen
if fullscreen
return @browserBody.height() - @chatHeader.outerHeight()
else
return @chat.height() - @chatHeader.outerHeight()
onUrlSubmit: (event) ->
event.preventDefault() if event
@urlInput.focus()
@changeDemoWebsite()
changeDemoWebsite: ->
return if @urlInput.val() is '' or @urlInput.val() is @urlCache
@urlCache = @urlInput.val()
@url = @urlCache
if !@url.startsWith('http')
@url = "http://#{ @url }"
@urlInput.addClass('is-loading')
@palette.empty()
@screenshot.attr('src', '')
$.ajax
url: 'https://images.zammad.com/api/v1/webpage/combined'
data:
url: @url
count: 20
success: @renderDemoWebsite
dataType: 'json'
renderDemoWebsite: (data) =>
@_screenshotSource = data['data_url']
@screenshot.attr 'src', @_screenshotSource
@renderPalette data['palette']
@urlInput.removeClass('is-loading')
renderPalette: (palette) ->
palette = _.map palette, tinycolor
# filter white
palette = _.filter palette, (color) ->
color.getLuminance() < 0.85
htmlString = ''
max = 8
for color, i in palette
htmlString += App.view('channel/color_swatch')
color: color.toHexString()
break if i is max
@palette.html htmlString
# auto use first color
if palette[0]
@usePaletteColor undefined, palette[0].toHexString()
usePaletteColor: (event, code) ->
if event
code = $(event.currentTarget).attr('data-color')
@colorField.val code
@updateParams()
pickColor: ->
return if !@_screenshotSource
if @_pickingColor
@_pickingColor = false
@website
.off('click.eyedropper')
.removeClass('is-picking')
@eyedropper.removeClass('is-active')
else
@_pickingColor = true
@website
.on('click.eyedropper', @onColorPicked)
.addClass('is-picking')
@eyedropper.addClass('is-active')
onColorPicked: (event) =>
x = event.pageX - @website.offset().left
y = event.pageY - @website.offset().top
image = new Image()
image.src = @_screenshotSource
canvas = document.createElement('canvas')
ctx = canvas.getContext('2d')
canvas.width = image.width
canvas.height = image.height
ctx.drawImage(image, 0, 0, @previewScale * canvas.width, @previewScale * canvas.height)
pixels = ctx.getImageData(x, y, 1, 1).data
@colorField.val("rgb(#{pixels.slice(0,3).join(',')})").trigger('change')
toggleChat: =>
@chat.toggleClass('is-open')
@isOpen = @chat.hasClass('is-open')
@updatePreview()
toggleChatSetting: =>
value = @chatSetting.prop('checked')
App.Setting.set('chat', value)
updateParams: =>
quote = (value) ->
if value.replace
value = value.replace('\'', '\\\'')
.replace(/\</g, '&lt;')
.replace(/\>/g, '&gt;')
value
params = @formParam(@$('.js-params'))
if parseInt(params.fontSize, 10) > 2
@chat.css('font-size', params.fontSize)
@chatBackground.css('background', params.background)
if params.flat is 'on'
@chat.addClass('zammad-chat--flat')
params.flat = true
else
@chat.removeClass('zammad-chat--flat')
@chatWelcome.html params.title
@updatePreview false
if @permanent
for key, value of @permanent
params[key] = value
paramString = ''
for key, value of params
if _.isNumber(value) || _.isBoolean(value) || !_.isEmpty(value)
if paramString != ''
# coffeelint: disable=no_unnecessary_double_quotes
paramString += ",\n"
# coffeelint: enable=no_unnecessary_double_quotes
if value == true || value == false || _.isNumber(value)
paramString += " #{key}: #{value}"
else
paramString += " #{key}: '#{quote(value)}'"
@$('.js-modal-params').html(paramString)
# highlight
@code.each (i, block) ->
hljs.highlightBlock block
App.Config.set('Chat', { prio: 4000, name: 'Chat', parent: '#channels', target: '#channels/chat', controller: App.ChannelChat, permission: ['admin.channel_chat'] }, 'NavBarAdmin')
class Topics extends App.Controller
events:
'click .js-add': 'new'
'click .js-edit': 'edit'
'click .js-remove': 'remove'
constructor: ->
super
@render()
render: =>
@html App.view('channel/topics')(
chats: App.Chat.all()
)
new: (e) =>
new App.ControllerGenericNew(
pageData:
title: 'Chats'
object: 'Chat'
objects: 'Chats'
genericObject: 'Chat'
callback: @render
container: @el.closest('.content')
large: true
)
edit: (e) =>
e.preventDefault()
id = $(e.target).closest('tr').data('id')
new App.ControllerGenericEdit(
id: id
genericObject: 'Chat'
pageData:
object: 'Chat'
container: @el.closest('.content')
callback: @render
)
remove: (e) =>
e.preventDefault()
id = $(e.target).closest('tr').data('id')
item = App.Chat.find(id)
new App.ControllerGenericDestroyConfirm(
item: item
container: @el.closest('.content')
callback: @render
)

View File

@@ -1,13 +0,0 @@
class App.ChannelChat extends App.ControllerTabs
constructor: ->
super
@tabs = [
{
name: 'Settings',
target: 'setting',
controller: App.SettingsArea, params: { area: 'Chat::Base' },
},
]
@render()

View File

@@ -0,0 +1,979 @@
class App.ChannelEmail extends App.ControllerTabs
requiredPermission: 'admin.channel_email'
header: 'Email'
constructor: ->
super
@title 'Email', true
@tabs = [
{
name: 'Accounts',
target: 'c-account',
controller: App.ChannelEmailAccountOverview,
},
{
name: 'Filter',
target: 'c-filter',
controller: App.ChannelEmailFilter,
},
{
name: 'Signatures',
target: 'c-signature',
controller: App.ChannelEmailSignature,
},
{
name: 'Settings',
target: 'c-setting',
controller: App.SettingsArea,
params: { area: 'Email::Base' },
},
]
@render()
class App.ChannelEmailFilter extends App.Controller
events:
'click [data-type=new]': 'new'
constructor: ->
super
App.PostmasterFilter.subscribe(@render, initFetch: true)
render: =>
data = App.PostmasterFilter.search(sortBy: 'name')
template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
description = 'With filters you can e. g. dispatch new tickets into certain groups or set a certain priority for tickets of a VIP customer.'
new App.ControllerTable(
el: template.find('.overview')
model: App.PostmasterFilter
objects: data
bindRow:
events:
'click': @edit
explanation: description
)
@html template
new: (e) =>
e.preventDefault()
new App.ControllerGenericNew(
pageData:
object: 'Postmaster Filter'
genericObject: 'PostmasterFilter'
container: @el.closest('.content')
callback: @load
)
edit: (id, e) =>
e.preventDefault()
new App.ControllerGenericEdit(
id: id,
pageData:
object: 'Postmaster Filter'
genericObject: 'PostmasterFilter'
container: @el.closest('.content')
callback: @load
)
class App.ChannelEmailSignature extends App.Controller
events:
'click [data-type=new]': 'new'
constructor: ->
super
App.Signature.subscribe(@render, initFetch: true)
render: =>
data = App.Signature.search(sortBy: 'name')
template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
description = '''
You can define different signatures for each group. So you can have different email signatures for different departments.
Once you have created a signature here, you need also to edit the groups where you want to use it.
'''
new App.ControllerTable(
el: template.find('.overview')
model: App.Signature
objects: data
bindRow:
events:
'click': @edit
explanation: description
)
@html template
new: (e) =>
e.preventDefault()
new App.ChannelEmailSignatureEdit(
container: @el.closest('.content')
)
edit: (id, e) =>
e.preventDefault()
item = App.Signature.find(id)
new App.ChannelEmailSignatureEdit(
object: item
container: @el.closest('.content')
)
class App.ChannelEmailSignatureEdit extends App.ControllerModal
buttonClose: true
buttonCancel: true
buttonSubmit: true
head: 'Signature'
content: =>
if @object
@form = new App.ControllerForm(
model: App.Signature
params: @object
autofocus: true
)
else
@form = new App.ControllerForm(
model: App.Signature
autofocus: true
)
@form.form
onSubmit: (e) =>
# get params
params = @formParam(e.target)
object = @object || new App.Signature
object.load(params)
# validate form
errors = @form.validate(params)
# show errors in form
if errors
@log 'error', errors
@formValidate(form: e.target, errors: errors)
return false
# disable form
@formDisable(e)
# save object
object.save(
done: =>
@close()
fail: (settings, details) =>
@log 'errors', details
@formEnable(e)
@form.showAlert(details.error_human || details.error || 'Unable to create object!')
)
class App.ChannelEmailAccountOverview extends App.Controller
events:
'click .js-channelNew': 'wizard'
'click .js-channelDelete': 'delete'
'click .js-channelDisable': 'disable'
'click .js-channelEnable': 'enable'
'click .js-channelGroupChange': 'groupChange'
'click .js-editInbound': 'editInbound'
'click .js-editOutbound': 'editOutbound'
'click .js-emailAddressNew': 'emailAddressNew'
'click .js-emailAddressEdit': 'emailAddressEdit'
'click .js-emailAddressDelete': 'emailAddressDelete',
'click .js-editNotificationOutbound': 'editNotificationOutbound'
'click .js-migrateGoogleMail': 'migrateGoogleMail'
constructor: ->
super
@interval(@load, 30000)
#@load()
load: =>
@startLoading()
@ajax(
id: 'email_index'
type: 'GET'
url: "#{@apiPath}/channels_email"
processData: true
success: (data, status, xhr) =>
@stopLoading()
App.Collection.loadAssets(data.assets)
@render(data)
)
render: (data = {}) =>
@channelDriver = data.channel_driver
# get channels
account_channels = []
for channel_id in data.account_channel_ids
account_channel = App.Channel.fullLocal(channel_id)
if account_channel.group_id
account_channel.group = App.Group.find(account_channel.group_id)
else
account_channel.group = '-'
account_channels.push account_channel
for channel in account_channels
email_addresses = App.EmailAddress.search(filter: { channel_id: channel.id })
channel.email_addresses = email_addresses
# get all unlinked email addresses
not_used_email_addresses = []
for email_address_id in data.not_used_email_address_ids
not_used_email_addresses.push App.EmailAddress.find(email_address_id)
# get channels
notification_channels = []
for channel_id in data.notification_channel_ids
notification_channels.push App.Channel.find(channel_id)
@html App.view('channel/email_account_overview')(
account_channels: account_channels
not_used_email_addresses: not_used_email_addresses
notification_channels: notification_channels
accounts_fixed: data.accounts_fixed
config: data.config
)
wizard: (e) =>
e.preventDefault()
new App.ChannelEmailAccountWizard(
container: @el.closest('.content')
callback: @load
channelDriver: @channelDriver
)
editInbound: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
channel = App.Channel.find(id)
slide = 'js-inbound'
new App.ChannelEmailAccountWizard(
container: @el.closest('.content')
slide: slide
channel: channel
callback: @load
channelDriver: @channelDriver
)
editOutbound: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
channel = App.Channel.find(id)
slide = 'js-outbound'
new App.ChannelEmailAccountWizard(
container: @el.closest('.content')
slide: slide
channel: channel
callback: @load
channelDriver: @channelDriver
)
delete: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
new App.ControllerConfirm(
message: 'Sure?'
callback: =>
@ajax(
id: 'email_delete'
type: 'DELETE'
url: "#{@apiPath}/channels_email"
data: JSON.stringify(id: id)
processData: true
success: =>
@load()
)
container: @el.closest('.content')
)
disable: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
@ajax(
id: 'email_disable'
type: 'POST'
url: "#{@apiPath}/channels_email_disable"
data: JSON.stringify(id: id)
processData: true
success: =>
@load()
)
enable: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
@ajax(
id: 'email_enable'
type: 'POST'
url: "#{@apiPath}/channels_email_enable"
data: JSON.stringify(id: id)
processData: true
success: =>
@load()
)
groupChange: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
item = App.Channel.find(id)
new App.ChannelEmailEdit(
container: @el.closest('.content')
item: item
callback: @load
)
emailAddressNew: (e) =>
e.preventDefault()
channel_id = $(e.target).closest('.action').data('id')
new App.ControllerGenericNew(
pageData:
object: 'Email Address'
genericObject: 'EmailAddress'
container: @el.closest('.content')
item:
channel_id: channel_id
callback: @load
)
emailAddressEdit: (e) =>
e.preventDefault()
id = $(e.target).closest('li').data('id')
new App.ControllerGenericEdit(
pageData:
object: 'Email Address'
genericObject: 'EmailAddress'
container: @el.closest('.content')
id: id
callback: @load
)
emailAddressDelete: (e) =>
e.preventDefault()
id = $(e.target).closest('li').data('id')
item = App.EmailAddress.find(id)
new App.ControllerGenericDestroyConfirm(
item: item
container: @el.closest('.content')
callback: @load
)
editNotificationOutbound: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
channel = App.Channel.find(id)
slide = 'js-outbound'
new App.ChannelEmailNotificationWizard(
container: @el.closest('.content')
channel: channel
callback: @load
channelDriver: @channelDriver
)
migrateGoogleMail: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
@navigate "#channels/google/#{id}"
class App.ChannelEmailEdit extends App.ControllerModal
buttonClose: true
buttonCancel: true
buttonSubmit: true
head: 'Channel'
content: =>
configureAttributesBase = [
{ name: 'group_id', display: 'Destination Group', tag: 'select', null: false, relation: 'Group', nulloption: true, filter: { active: true } },
]
@form = new App.ControllerForm(
model:
configure_attributes: configureAttributesBase
className: ''
params: @item
)
@form.form
onSubmit: (e) =>
# get params
params = @formParam(e.target)
# validate form
errors = @form.validate(params)
# show errors in form
if errors
@log 'error', errors
@formValidate(form: e.target, errors: errors)
return false
# disable form
@formDisable(e)
# update
@ajax(
id: 'channel_email_group'
type: 'POST'
url: "#{@apiPath}/channels_email_group/#{@item.id}"
data: JSON.stringify(params)
processData: true
success: (data, status, xhr) =>
@callback()
@close()
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
@el.find('.alert').removeClass('hidden').text(data.error || 'Unable to save changes.')
)
class App.ChannelEmailAccountWizard extends App.WizardModal
elements:
'.modal-body': 'body'
events:
'submit .js-intro': 'probeBasedOnIntro'
'submit .js-inbound': 'probeInbound'
'change .js-outbound [name=adapter]': 'toggleOutboundAdapter'
'submit .js-outbound': 'probleOutbound'
'click .js-goToSlide': 'goToSlide'
'click .js-expert': 'probeBasedOnIntro'
'click .js-close': 'hide'
inboundPassword: ''
outboundPassword: ''
passwordPlaceholder: '{{{{{{{{{{{{SECRTE_PASSWORD}}}}}}}}}}}}'
constructor: ->
super
# store account settings
@account =
inbound:
adapter: undefined
options: undefined
outbound:
adapter: undefined
options: undefined
meta: {}
if @channel
@account =
inbound: clone(@channel.options.inbound)
outbound: clone(@channel.options.outbound)
meta: {}
# remember passwords, do not show in ui
if @account.inbound.options && @account.inbound.options.password
@inboundPassword = @account.inbound.options.password
@account.inbound.options.password = @passwordPlaceholder
if @account.outbound.options && @account.outbound.options.password
@outboundPassword = @account.outbound.options.password
@account.outbound.options.password = @passwordPlaceholder
if @container
@el.addClass('modal--local')
@render()
if @channel
@$('.js-goToSlide[data-slide=js-intro]').addClass('hidden')
@el.modal(
keyboard: true
show: true
backdrop: true
container: @container
).on(
'hidden.bs.modal': =>
if @callback
@callback()
@el.remove()
)
if @slide
@showSlide(@slide)
render: =>
@html App.view('channel/email_account_wizard')()
@showSlide('js-intro')
# base
configureAttributesBase = [
{ name: 'realname', display: 'Organization & Department Name', tag: 'input', type: 'text', limit: 160, null: false, placeholder: 'Organization Support', autocomplete: 'off' },
{ name: 'email', display: 'Email', tag: 'input', type: 'email', limit: 120, null: false, placeholder: 'support@example.com', autocapitalize: false, autocomplete: 'off' },
{ name: 'password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true },
{ name: 'group_id', display: 'Destination Group', tag: 'select', null: false, relation: 'Group', nulloption: true },
]
@formMeta = new App.ControllerForm(
el: @$('.base-settings'),
model:
configure_attributes: configureAttributesBase
className: ''
params: @account.meta
)
# outbound
configureAttributesOutbound = [
{ name: 'adapter', display: 'Send Mails via', tag: 'select', multiple: false, null: false, options: @channelDriver.email.outbound },
]
new App.ControllerForm(
el: @$('.base-outbound-type')
model:
configure_attributes: configureAttributesOutbound
className: ''
params:
adapter: @account.outbound.adapter || 'smtp'
)
@toggleOutboundAdapter()
# inbound
configureAttributesInbound = [
{ name: 'adapter', display: 'Type', tag: 'select', multiple: false, null: false, options: @channelDriver.email.inbound },
{ name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false },
{ name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autocomplete: 'off' },
{ name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: false, autocapitalize: false, autocomplete: 'new-password', single: true },
{ name: 'options::ssl', display: 'SSL/STARTTLS', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, default: true, translate: true, item_class: 'formGroup--halfSize' },
{ name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false, default: '993', item_class: 'formGroup--halfSize' },
{ name: 'options::folder', display: 'Folder', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, item_class: 'formGroup--halfSize' },
{ name: 'options::keep_on_server', display: 'Keep messages on server', tag: 'boolean', null: true, options: { true: 'yes', false: 'no' }, translate: true, default: false, item_class: 'formGroup--halfSize' },
]
showHideFolder = (params, attribute, attributes, classname, form, ui) ->
return if !params
if params.adapter is 'imap'
ui.show('options::folder')
ui.show('options::keep_on_server')
return
ui.hide('options::folder')
ui.hide('options::keep_on_server')
handlePort = (params, attribute, attributes, classname, form, ui) ->
return if !params
return if !params.options
currentPort = @$('[name="options::port"]').val()
if params.options.ssl is true
if !currentPort
@$('[name="options::port"]').val('993')
return
if params.options.ssl is false
if !currentPort || currentPort is '993'
@$('[name="options::port"]').val('143')
return
new App.ControllerForm(
el: @$('.base-inbound-settings'),
model:
configure_attributes: configureAttributesInbound
className: ''
params: @account.inbound
handlers: [
showHideFolder,
handlePort,
]
)
toggleOutboundAdapter: =>
# fill user / password based on intro info
channel_used = { options: {} }
if @account['meta']
channel_used['options']['user'] = @account['meta']['email']
channel_used['options']['password'] = @account['meta']['password']
channel_used['options']['folder'] = @account['meta']['folder']
channel_used['options']['keep_on_server'] = @account['meta']['keep_on_server']
# show used backend
@$('.base-outbound-settings').html('')
adapter = @$('.js-outbound [name=adapter]').val()
if adapter is 'smtp'
configureAttributesOutbound = [
{ name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autofocus: true },
{ name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'off', },
{ name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true },
{ name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false },
]
@form = new App.ControllerForm(
el: @$('.base-outbound-settings')
model:
configure_attributes: configureAttributesOutbound
className: ''
params: @account.outbound
)
probeBasedOnIntro: (e) =>
e.preventDefault()
params = @formParam(e.target)
# remember account settings
@account.meta = params
# let backend know about the channel
if @channel
params.channel_id = @channel.id
if $(e.currentTarget).hasClass('js-expert')
# validate form
errors = @formMeta.validate(params)
if errors
delete errors.password
if !_.isEmpty(errors)
@formValidate(form: e.target, errors: errors)
return
@showSlide('js-inbound')
@$('.js-inbound [name="options::user"]').val(params.email)
@$('.js-inbound [name="options::password"]').val(params.password)
return
@disable(e)
@$('.js-probe .js-email').text(params.email)
@showSlide('js-probe')
@ajax(
id: 'email_probe'
type: 'POST'
url: "#{@apiPath}/channels_email_probe"
data: JSON.stringify(params)
processData: true
success: (data, status, xhr) =>
if data.result is 'ok'
if data.setting
for key, value of data.setting
@account[key] = value
if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true)
message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages)
@$('.js-inbound-acknowledge .js-message').html(message)
@$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-intro')
@$('.js-inbound-acknowledge .js-next').attr('data-slide', '')
@$('.js-inbound-acknowledge .js-next').unbind('click.verify').bind('click.verify', (e) =>
e.preventDefault()
@verify(@account)
)
@showSlide('js-inbound-acknowledge')
else
@verify(@account)
else if data.result is 'duplicate'
@showSlide('js-intro')
@showAlert('js-intro', 'Account already exists!')
else
@showSlide('js-inbound')
@showAlert('js-inbound', 'Unable to detect your server settings. Manual configuration needed.')
@$('.js-inbound [name="options::user"]').val(@account['meta']['email'])
@$('.js-inbound [name="options::password"]').val(@account['meta']['password'])
@enable(e)
error: =>
@enable(e)
@showSlide('js-intro')
)
probeInbound: (e) =>
e.preventDefault()
# get params
params = @formParam(e.target)
if params.options && params.options.password is @passwordPlaceholder
params.options.password = @inboundPassword
# let backend know about the channel
if @channel
params.channel_id = @channel.id
@disable(e)
@showSlide('js-test')
@ajax(
id: 'email_inbound'
type: 'POST'
url: "#{@apiPath}/channels_email_inbound"
data: JSON.stringify(params)
processData: true
success: (data, status, xhr) =>
if data.result is 'ok'
# remember account settings
@account.inbound = params
if data.content_messages && data.content_messages > 0 && (!@account['inbound']['options'] || @account['inbound']['options']['keep_on_server'] isnt true)
message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages)
@$('.js-inbound-acknowledge .js-message').html(message)
@$('.js-inbound-acknowledge .js-back').attr('data-slide', 'js-inbound')
@$('.js-inbound-acknowledge .js-next').unbind('click.verify')
@showSlide('js-inbound-acknowledge')
else
@showSlide('js-outbound')
# fill user / password based on inbound settings
if !@channel
if @account['inbound']['options']
@$('.js-outbound [name="options::host"]').val(@account['inbound']['options']['host'])
@$('.js-outbound [name="options::user"]').val(@account['inbound']['options']['user'])
@$('.js-outbound [name="options::password"]').val(@account['inbound']['options']['password'])
else
@$('.js-outbound [name="options::user"]').val(@account['meta']['email'])
@$('.js-outbound [name="options::password"]').val(@account['meta']['password'])
else
@showSlide('js-inbound')
@showAlert('js-inbound', data.message_human || data.message)
@showInvalidField('js-inbound', data.invalid_field)
@enable(e)
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@showSlide('js-inbound')
@showAlert('js-inbound', data.message_human || data.message || data.error)
@showInvalidField('js-inbound', data.invalid_field)
@enable(e)
)
probleOutbound: (e) =>
e.preventDefault()
# get params
params = @formParam(e.target)
params['email'] = @account['meta']['email']
if params.options && params.options.password is @passwordPlaceholder
params.options.password = @outboundPassword
if !params['email'] && @channel
email_addresses = App.EmailAddress.search(filter: { channel_id: @channel.id })
if email_addresses && email_addresses[0]
params['email'] = email_addresses[0].email
# let backend know about the channel
if @channel
params.channel_id = @channel.id
@disable(e)
@showSlide('js-test')
@ajax(
id: 'email_outbound'
type: 'POST'
url: "#{@apiPath}/channels_email_outbound"
data: JSON.stringify(params)
processData: true
success: (data, status, xhr) =>
if data.result is 'ok'
# remember account settings
@account.outbound = params
@verify(@account)
else
@showSlide('js-outbound')
@showAlert('js-outbound', data.message_human || data.message)
@showInvalidField('js-outbound', data.invalid_field)
@enable(e)
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@showSlide('js-outbound')
@showAlert('js-outbound', data.message_human || data.message || data.error)
@showInvalidField('js-outbound', data.invalid_field)
@enable(e)
)
verify: (account, count = 0) =>
@showSlide('js-verify')
# let backend know about the channel
if @channel
account.channel_id = @channel.id
if account.meta.group_id
account.group_id = account.meta.group_id
else if @channel.group_id
account.group_id = @channel.group_id
if !account.email && @channel
email_addresses = App.EmailAddress.search(filter: { channel_id: @channel.id })
if email_addresses && email_addresses[0]
account.email = email_addresses[0].email
@ajax(
id: 'email_verify'
type: 'POST'
url: "#{@apiPath}/channels_email_verify"
data: JSON.stringify(account)
processData: true
success: (data, status, xhr) =>
if data.result is 'ok'
@el.modal('hide')
else
if data.source is 'inbound' || data.source is 'outbound'
@showSlide("js-#{data.source}")
@showAlert("js-#{data.source}", data.message_human || data.message)
@showInvalidField("js-#{data.source}", data.invalid_field)
else
if count is 2
@showAlert('js-verify', data.message_human || data.message)
@delay(
=>
@showSlide('js-intro')
@showAlert('js-intro', 'Unable to verify sending and receiving. Please check your settings.')
2300
)
else
if data.subject && @account
@account.subject = data.subject
@verify(@account, count + 1)
error: =>
@showSlide('js-intro')
@showAlert('js-intro', 'Unable to verify sending and receiving. Please check your settings.')
)
hide: (e) =>
e.preventDefault()
@el.modal('hide')
class App.ChannelEmailNotificationWizard extends App.WizardModal
elements:
'.modal-body': 'body'
events:
'change .js-outbound [name=adapter]': 'toggleOutboundAdapter'
'submit .js-outbound': 'probleOutbound'
'click .js-close': 'hide'
inboundPassword: ''
outboundPassword: ''
passwordPlaceholder: '{{{{{{{{{{{{SECRTE_PASSWORD}}}}}}}}}}}}'
constructor: ->
super
# store account settings
@account =
inbound:
adapter: undefined
options: undefined
outbound:
adapter: undefined
options: undefined
meta: {}
if @channel
@account =
inbound: clone(@channel.options.inbound)
outbound: clone(@channel.options.outbound)
# remember passwords, do not show in ui
if @account.inbound && @account.inbound.options && @account.inbound.options.password
@inboundPassword = @account.inbound.options.password
@account.inbound.options.password = @passwordPlaceholder
if @account.outbound && @account.outbound.options && @account.outbound.options.password
@outboundPassword = @account.outbound.options.password
@account.outbound.options.password = @passwordPlaceholder
if @container
@el.addClass('modal--local')
@render()
@el.modal(
keyboard: true
show: true
backdrop: true
container: @container
).on(
'show.bs.modal': @onShow
'shown.bs.modal': @onShown
'hidden.bs.modal': =>
if @callback
@callback()
@el.remove()
)
if @slide
@showSlide(@slide)
render: =>
@html App.view('channel/email_notification_wizard')()
@showSlide('js-outbound')
# outbound
configureAttributesOutbound = [
{ name: 'adapter', display: 'Send Mails via', tag: 'select', multiple: false, null: false, options: @channelDriver.email.outbound },
]
new App.ControllerForm(
el: @$('.base-outbound-type')
model:
configure_attributes: configureAttributesOutbound
className: ''
params:
adapter: @account.outbound.adapter || 'sendmail'
)
@toggleOutboundAdapter()
toggleOutboundAdapter: =>
# show used backend
@el.find('.base-outbound-settings').html('')
adapter = @$('.js-outbound [name=adapter]').val()
if adapter is 'smtp'
configureAttributesOutbound = [
{ name: 'options::host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, autofocus: true },
{ name: 'options::user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, autocomplete: 'off' },
{ name: 'options::password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, autocomplete: 'new-password', single: true },
{ name: 'options::port', display: 'Port', tag: 'input', type: 'text', limit: 6, null: true, autocapitalize: false },
]
@form = new App.ControllerForm(
el: @$('.base-outbound-settings')
model:
configure_attributes: configureAttributesOutbound
className: ''
params: @account.outbound
)
probleOutbound: (e) =>
e.preventDefault()
# get params
params = @formParam(e.target)
if params.options && params.options.password is @passwordPlaceholder
params.options.password = @outboundPassword
# let backend know about the channel
params.channel_id = @channel.id
@disable(e)
@showSlide('js-test')
@ajax(
id: 'email_outbound'
type: 'POST'
url: "#{@apiPath}/channels_email_notification"
data: JSON.stringify(params)
processData: true
success: (data, status, xhr) =>
if data.result is 'ok'
@el.modal('hide')
else
@showSlide('js-outbound')
@showAlert('js-outbound', data.message_human || data.message)
@showInvalidField('js-outbound', data.invalid_field)
@enable(e)
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@showSlide('js-outbound')
@showAlert('js-outbound', data.message_human || data.message || data.error)
@showInvalidField('js-outbound', data.invalid_field)
@enable(e)
)
App.Config.set('Email', { prio: 3000, name: 'Email', parent: '#channels', target: '#channels/email', controller: App.ChannelEmail, permission: ['admin.channel_email'] }, 'NavBarAdmin')

View File

@@ -1,486 +0,0 @@
class App.ChannelEmail extends App.ControllerTabs
constructor: ->
super
@tabs = [
{
name: 'Inbound',
target: 'c-inbound',
controller: App.ChannelEmailInbound,
},
{
name: 'Outbound',
target: 'c-outbound',
controller: App.ChannelEmailOutbound,
},
{
name: 'Adresses',
target: 'c-address',
controller: App.ChannelEmailAddress,
},
{
name: 'Signatures',
target: 'c-signature',
controller: App.ChannelEmailSignature,
},
{
name: 'Filter',
target: 'c-filter',
controller: App.ChannelEmailFilter,
},
{
name: 'Settings',
target: 'c-setting',
controller: App.SettingsArea,
params: { area: 'Email::Base' },
},
]
@render()
class App.ChannelEmailFilter extends App.Controller
events:
'click [data-type=new]': 'new'
constructor: ->
super
App.PostmasterFilter.subscribe( @render, initFetch: true )
render: =>
data = App.PostmasterFilter.search( sortBy: 'name' )
template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
new App.ControllerTable(
el: template.find('.overview')
model: App.PostmasterFilter
objects: data
bindRow:
events:
'click': @edit
)
@html template
new: (e) =>
e.preventDefault()
new App.ChannelEmailFilterEdit( {} )
edit: (id, e) =>
e.preventDefault()
new App.ChannelEmailFilterEdit( object: App.PostmasterFilter.find(id) )
class App.ChannelEmailFilterEdit extends App.ControllerModal
constructor: ->
super
@head = 'Postmaster Filter'
@button = true
@close = true
@cancel = true
if @object
@form = new App.ControllerForm(
model: App.PostmasterFilter,
params: @object,
autofocus: true,
)
else
@form = new App.ControllerForm(
model: App.PostmasterFilter,
autofocus: true,
)
@content = @form.form
@show()
onSubmit: (e) =>
e.preventDefault()
# get params
params = @formParam(e.target)
params['channel'] = 'email'
object = @object || new App.PostmasterFilter
object.load(params)
# validate form
errors = @form.validate( params )
# show errors in form
if errors
@log 'error', errors
@formValidate( form: e.target, errors: errors )
return false
# disable form
@formDisable(e)
# save object
object.save(
done: =>
@hide()
fail: =>
@hide()
)
class App.ChannelEmailAddress extends App.Controller
events:
'click [data-type=new]': 'new'
constructor: ->
super
App.EmailAddress.subscribe( @render, initFetch: true )
render: =>
data = App.EmailAddress.search( sortBy: 'realname' )
template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
new App.ControllerTable(
el: template.find('.overview')
model: App.EmailAddress
objects: data
bindRow:
events:
'click': @edit
)
@html template
new: (e) =>
e.preventDefault()
new App.ChannelEmailAddressEdit( {} )
edit: (id, e) =>
e.preventDefault()
item = App.EmailAddress.find(id)
new App.ChannelEmailAddressEdit( object: item )
class App.ChannelEmailAddressEdit extends App.ControllerModal
constructor: ->
super
@head = 'Email-Address'
@button = true
@close = true
@cancel = true
if @object
@form = new App.ControllerForm(
model: App.EmailAddress
params: @object
autofocus: true
)
else
@form = new App.ControllerForm(
model: App.EmailAddress,
autofocus: true,
)
@content = @form.form
@show()
onSubmit: (e) =>
e.preventDefault()
# get params
params = @formParam(e.target)
object = @object || new App.EmailAddress
object.load(params)
# validate form
errors = @form.validate( params )
# show errors in form
if errors
@log 'error', errors
@formValidate( form: e.target, errors: errors )
return false
# disable form
@formDisable(e)
# save object
object.save(
done: =>
@hide()
fail: =>
@hide()
)
class App.ChannelEmailSignature extends App.Controller
events:
'click [data-type=new]': 'new'
constructor: ->
super
App.Signature.subscribe( @render, initFetch: true )
render: =>
data = App.Signature.search( sortBy: 'name' )
template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
new App.ControllerTable(
el: template.find('.overview')
model: App.Signature
objects: data
bindRow:
events:
'click': @edit
)
@html template
new: (e) =>
e.preventDefault()
new App.ChannelEmailSignatureEdit( {} )
edit: (id, e) =>
e.preventDefault()
item = App.Signature.find(id)
new App.ChannelEmailSignatureEdit( object: item )
class App.ChannelEmailSignatureEdit extends App.ControllerModal
constructor: ->
super
@head = 'Signature'
@button = true
@close = true
@cancel = true
if @object
@form = new App.ControllerForm(
model: App.Signature
params: @object
autofocus: true
)
else
@form = new App.ControllerForm(
model: App.Signature
autofocus: true
)
@content = @form.form
@show()
onSubmit: (e) =>
e.preventDefault()
# get params
params = @formParam(e.target)
object = @object || new App.Signature
object.load(params)
# validate form
errors = @form.validate( params )
# show errors in form
if errors
@log 'error', errors
@formValidate( form: e.target, errors: errors )
return false
# disable form
@formDisable(e)
# save object
object.save(
done: =>
@hide()
fail: =>
@hide()
)
class App.ChannelEmailInbound extends App.Controller
events:
'click [data-type=new]': 'new'
constructor: ->
super
App.Channel.subscribe( @render, initFetch: true )
render: =>
channels = App.Channel.search( filter: { area: 'Email::Inbound' } )
template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
new App.ControllerTable(
el: template.find('.overview')
model: App.Channel
objects: channels
bindRow:
events:
'click': @edit
)
@html template
new: (e) =>
e.preventDefault()
new App.ChannelEmailInboundEdit( {} )
edit: (id, e) =>
e.preventDefault()
item = App.Channel.find(id)
new App.ChannelEmailInboundEdit( object: item )
class App.ChannelEmailInboundEdit extends App.ControllerModal
constructor: ->
super
@head = 'Email Channel'
@button = true
@close = true
@cancel = true
if @object
@form = new App.ControllerForm(
model: App.Channel
params: @object
autofocus: true
)
else
@form = new App.ControllerForm(
model: App.Channel
autofocus: true
)
@content = @form.form
@show()
onSubmit: (e) =>
e.preventDefault()
# get params
params = @formParam(e.target)
params['area'] = 'Email::Inbound'
object = @object || new App.Channel
object.load(params)
# validate form
errors = @form.validate( params )
# show errors in form
if errors
@log 'error', errors
@formValidate( form: e.target, errors: errors )
return false
# disable form
@formDisable(e)
# save object
object.save(
done: =>
@hide()
fail: =>
@hide()
)
class App.ChannelEmailOutbound extends App.Controller
events:
'change #_adapter': 'toggle'
'submit #mail_adapter': 'update'
constructor: ->
super
App.Channel.subscribe( @render, initFetch: true )
render: =>
@html App.view('channel/email_outbound')()
# get current Email::Outbound channel
channels = App.Channel.all()
adapters = {}
adapter_used = undefined
channel_used = undefined
for channel in channels
if channel.area is 'Email::Outbound'
adapters[channel.adapter] = channel.adapter
if @adapter_used
if @adapter_used is channel.adapter
adapter_used = channel.adapter
channel_used = channel
else if channel.active is true
adapter_used = channel.adapter
channel_used = channel
configure_attributes = [
{ name: 'adapter', display: 'Send Mails via', tag: 'select', multiple: false, null: false, options: adapters , default: adapter_used },
]
new App.ControllerForm(
el: @el.find('#form-email-adapter'),
model: { configure_attributes: configure_attributes, className: '' },
autofocus: true,
)
# if adapter_used is 'Sendmail'
# # some form
if adapter_used is 'SMTP'
configure_attributes = [
{ name: 'host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, autocapitalize: false, default: (channel_used['options']&&channel_used['options']['host']) },
{ name: 'user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, autocapitalize: false, default: (channel_used['options']&&channel_used['options']['user']) },
{ name: 'password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, autocapitalize: false, default: (channel_used['options']&&channel_used['options']['password']) },
{ name: 'ssl', display: 'SSL', tag: 'select', multiple: false, null: false, options: { true: 'yes', false: 'no' } , translate: true, default: (channel_used['options']&&channel_used['options']['ssl']) },
{ name: 'port', display: 'Port', tag: 'input', type: 'text', limit: 5, null: false, class: 'span1', autocapitalize: false, default: ((channel_used['options']&&channel_used['options']['port']) || 25) },
]
@form = new App.ControllerForm(
el: @el.find('#form-email-adapter-settings'),
model: { configure_attributes: configure_attributes, className: '' },
autofocus: true,
)
toggle: (e) =>
# get params
params = @formParam(e.target)
# render page with new selected adapter
if @adapter_used isnt params['adapter']
# set selected adapter
@adapter_used = params['adapter']
@render()
update: (e) =>
e.preventDefault()
params = @formParam(e.target)
# errors = @form.validate( params )
# update Email::Outbound adapter
channels = App.Channel.all()
for channel in channels
if channel.area is 'Email::Outbound' && channel.adapter is params['adapter']
channel.updateAttributes(
options: {
host: params['host'],
user: params['user'],
password: params['password'],
ssl: params['ssl'],
port: params['port'],
},
active: true,
)
# set all other Email::Outbound adapters to inactive
channels = App.Channel.all()
for channel in channels
if channel.area is 'Email::Outbound' && channel.adapter isnt params['adapter']
channel.updateAttributes( active: false )

View File

@@ -0,0 +1,257 @@
class Index extends App.ControllerSubContent
requiredPermission: 'admin.channel_facebook'
header: 'Facebook'
events:
'click .js-new': 'new'
'click .js-edit': 'edit'
'click .js-delete': 'delete'
'click .js-disable': 'disable'
'click .js-enable': 'enable'
'click .js-configApp': 'configApp'
constructor: ->
super
#@interval(@load, 60000)
@load()
load: =>
@startLoading()
@ajax(
id: 'facebook_index'
type: 'GET'
url: "#{@apiPath}/channels_facebook"
processData: true
success: (data, status, xhr) =>
@stopLoading()
App.Collection.loadAssets(data.assets)
@callbackUrl = data.callback_url
@render(data)
)
render: (data) =>
# if no facebook app is registered, show intro
if !App.ExternalCredential.findByAttribute('name', 'facebook')
@html App.view('facebook/index')()
return
channels = []
for channel_id in data.channel_ids
channel = App.Channel.find(channel_id)
if channel && channel.options && channel.options.sync
displayName = '-'
if channel.options.sync.wall && channel.options.sync.wall.group_id
group = App.Group.find(channel.options.sync.wall.group_id)
displayName = group.displayName()
if !channel.options.sync
channel.options.sync = {}
if !channel.options.sync.wall
channel.options.sync.wall = {}
channel.options.sync.wall.groupName = displayName
if channel.options && channel.options.pages
for page in channel.options.pages
displayName = '-'
for page_id, pageParams of channel.options.sync.pages
if page.id is page_id
if pageParams.group_id
group = App.Group.find(pageParams.group_id)
displayName = group.displayName()
page.groupName = displayName
channels.push channel
@html App.view('facebook/list')(
channels: channels
)
if @channel_id
@edit(undefined, @channel_id)
@channel_id = undefined
show: (params) =>
for key, value of params
if key isnt 'el' && key isnt 'shown' && key isnt 'match'
@[key] = value
configApp: =>
new AppConfig(
container: @el.parents('.content')
callbackUrl: @callbackUrl
load: @load
)
new: (e) ->
window.location.href = "#{@apiPath}/external_credentials/facebook/link_account"
edit: (e, id) =>
if e
e.preventDefault()
id = $(e.target).closest('.action').data('id')
channel = App.Channel.find(id)
if !channel
@navigate '#channels/facebook'
return
new AccountEdit(
channel: channel
container: @el.parents('.content')
load: @load
)
delete: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
new App.ControllerConfirm(
message: 'Sure?'
callback: =>
@ajax(
id: 'facebook_delete'
type: 'DELETE'
url: "#{@apiPath}/channels_facebook"
data: JSON.stringify(id: id)
processData: true
success: =>
@load()
)
container: @el.closest('.content')
)
disable: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
@ajax(
id: 'facebook_disable'
type: 'POST'
url: "#{@apiPath}/channels_facebook_disable"
data: JSON.stringify(id: id)
processData: true
success: =>
@load()
)
enable: (e) =>
e.preventDefault()
id = $(e.target).closest('.action').data('id')
@ajax(
id: 'facebook_enable'
type: 'POST'
url: "#{@apiPath}/channels_facebook_enable"
data: JSON.stringify(id: id)
processData: true
success: =>
@load()
)
class AppConfig extends App.ControllerModal
head: 'Connect Facebook App'
shown: true
button: 'Connect'
buttonCancel: true
small: true
content: ->
@external_credential = App.ExternalCredential.findByAttribute('name', 'facebook')
content = $(App.view('facebook/app_config')(
external_credential: @external_credential
callbackUrl: @callbackUrl
))
content.find('.js-select').on('click', (e) =>
@selectAll(e)
)
content
onClosed: =>
return if !@isChanged
@isChanged = false
@load()
onSubmit: (e) =>
@formDisable(e)
# verify app credentials
@ajax(
id: 'facebook_app_verify'
type: 'POST'
url: "#{@apiPath}/external_credentials/facebook/app_verify"
data: JSON.stringify(@formParams())
processData: true
success: (data, status, xhr) =>
if data.attributes
if !@external_credential
@external_credential = new App.ExternalCredential
@external_credential.load(name: 'facebook', credentials: @formParams())
@external_credential.save(
done: =>
@isChanged = true
@close()
fail: =>
@el.find('.alert').removeClass('hidden').text('Unable to create entry.')
)
return
@formEnable(e)
@el.find('.alert').removeClass('hidden').text(data.error || 'Unable to verify App.')
)
class AccountEdit extends App.ControllerModal
head: 'Facebook Account'
shown: true
buttonCancel: true
content: ->
if !@channel.options.sync
@channel.options.sync = {}
if !@channel.options.sync.wall
@channel.options.sync.wall = {}
if !@channel.options.sync.pages
@channel.options.sync.pages = {}
content = $( App.view('facebook/account_edit')(channel: @channel) )
groupSelection = (selected_id, el, prefix) ->
selection = App.UiElement.select.render(
name: "#{prefix}::group_id"
multiple: false
limit: 100
null: false
relation: 'Group'
nulloption: true
value: selected_id
class: 'form-control--small'
)
el.html(selection)
groupSelection(@channel.options.sync.wall.group_id, content.find('.js-wall .js-groups'), 'wall')
if @channel.options.pages
for page in @channel.options.pages
pageConfigured = false
for page_id, pageParams of @channel.options.sync.pages
if page.id is page_id
pageConfigured = true
groupSelection(pageParams.group_id, content.find(".js-groups[data-page-id=#{page.id}]"), "pages::#{page.id}")
if !pageConfigured
groupSelection('', content.find(".js-groups[data-page-id=#{page.id}]"), "pages::#{page.id}")
content
onClosed: =>
return if !@isChanged
@isChanged = false
@load()
onSubmit: (e) =>
@formDisable(e)
@channel.options.sync = @formParams()
@ajax(
id: 'channel_facebook_update'
type: 'POST'
url: "#{@apiPath}/channels_facebook/#{@channel.id}"
data: JSON.stringify(@channel.attributes())
processData: true
success: (data, status, xhr) =>
@isChanged = true
@close()
error: (xhr) =>
data = JSON.parse(xhr.responseText)
@formEnable(e)
@el.find('.alert').removeClass('hidden').text(data.error || 'Unable to save changes.')
)
App.Config.set('Facebook', { prio: 5100, name: 'Facebook', parent: '#channels', target: '#channels/facebook', controller: Index, permission: ['admin.channel_facebook'] }, 'NavBarAdmin')

View File

@@ -1,13 +0,0 @@
class App.ChannelFacebook extends App.Controller
constructor: ->
super
# render page
@render()
render: ->
@html App.view('channel/facebook')(
head: 'some header'
)

View File

@@ -0,0 +1,91 @@
# coffeelint: disable=no_unnecessary_double_quotes
class App.ChannelForm extends App.ControllerSubContent
requiredPermission: 'admin.channel_formular'
header: 'Form'
events:
'change form.js-paramsDesigner': 'updateParamsDesigner'
'keyup form.js-paramsDesigner': 'updateParamsDesigner'
'change .js-formSetting input': 'toggleFormSetting'
'change .js-paramsSetting select': 'updateGroup'
elements:
'.js-code': 'code'
'.js-paramsSetting': 'paramsSetting'
'.js-formSetting input': 'formSetting'
constructor: ->
super
App.Setting.fetchFull(
@render
force: false
)
render: =>
setting = App.Setting.get('form_ticket_create')
element = $(App.view('channel/form')(
baseurl: window.location.origin
formSetting: setting
))
group_id = App.Setting.get('form_ticket_create_group_id')
selection = App.UiElement.select.render(
name: 'group_id'
multiple: false
null: false
relation: 'Group'
nulloption: false
value: group_id
#class: 'form-control--small'
)
element.find('.js-groupSelector').html(selection)
@html element
@code.each (i, block) ->
hljs.highlightBlock block
@updateParamsDesigner()
updateParamsDesigner: ->
quote = (string) ->
string = string.replace('\'', '\\\'')
.replace(/\</g, '&lt;')
.replace(/\>/g, '&gt;')
params = @formParam(@$('.js-paramsDesigner'))
paramString = ''
for key, value of params
if !_.isEmpty(value)
if paramString != ''
paramString += ",\n"
if value == 'true' || value == 'false'
paramString += " #{key}: #{value}"
else
paramString += " #{key}: '#{quote(value)}'"
@$('.js-modal-params').html(paramString)
# rebuild preview
params.test = true
if params.modal
@$('.js-modal').removeClass('hide')
@$('.js-inlineForm').addClass('hide')
@$('.js-formInline').addClass('hide')
@$('.js-formBtn').removeClass('hide')
@$('.js-formBtn').ZammadForm(params)
@$('.js-formBtn').text('Feedback')
else
@$('.js-modal').addClass('hide')
@$('.js-inlineForm').removeClass('hide')
@$('.js-formBtn').addClass('hide')
@$('.js-formInline').removeClass('hide')
@$('.js-formInline').ZammadForm(params)
toggleFormSetting: =>
value = @formSetting.prop('checked')
App.Setting.set('form_ticket_create', value)
updateGroup: =>
value = @paramsSetting.find('[name=group_id]').val()
App.Setting.set('form_ticket_create_group_id', value)
App.Config.set('Form', { prio: 2000, name: 'Form', parent: '#channels', target: '#channels/form', controller: App.ChannelForm, permission: ['admin.formular'] }, 'NavBarAdmin')

Some files were not shown because too many files have changed in this diff Show More