Martin Edenhofer
|
1b42a90233
|
Merge branch 'private-issue301' into stable-1.0
|
2016-11-14 01:03:28 +01:00 |
|
Martin Edenhofer
|
44cd11583c
|
Merge branch 'develop' into stable-1.0
|
2016-11-12 16:24:57 +01:00 |
|
Martin Edenhofer
|
19a7a439b8
|
Merge branch 'develop'
|
2016-11-11 19:29:56 +01:00 |
|
Martin Edenhofer
|
e728320241
|
Merge branch 'develop'
|
2016-10-30 07:08:08 +01:00 |
|
Martin Edenhofer
|
1bc17afc53
|
Merge branch 'master' of git.znuny.com:zammad/zammad
|
2016-10-30 07:07:39 +01:00 |
|
Thorsten Eckel
|
ee5c58f53a
|
Fixed bug: Zip archive doesn't contain sub folder content.
|
2016-10-19 08:25:51 +02:00 |
|
Martin Edenhofer
|
9bdf6d7b81
|
Merge branch 'develop'
|
2016-10-19 07:50:08 +02:00 |
|
Thorsten Eckel
|
5754fdccdd
|
Working on CI tag/branch pushing, syncing, deployment issue.
|
2016-10-19 07:32:05 +02:00 |
|
Thorsten Eckel
|
4901050d57
|
Working on issue not syncing to github correctly.
|
2016-10-19 07:25:18 +02:00 |
|
Martin Edenhofer
|
7980c8cb93
|
Merge branch 'develop'
|
2016-10-19 07:21:10 +02:00 |
|
Martin Edenhofer
|
7e7088388d
|
Merge branch 'develop'
|
2016-10-17 16:43:54 +02:00 |
|
Martin Edenhofer
|
2f6e52d63d
|
Merge branch 'develop'
|
2016-09-28 16:08:28 +02:00 |
|
Martin Edenhofer
|
bde8babb43
|
Merge branch 'develop'
|
2016-09-28 08:53:02 +02:00 |
|
Martin Edenhofer
|
d6d68fb363
|
Merge branch 'develop'
|
2016-09-19 07:47:06 +02:00 |
|
Martin Edenhofer
|
814ffed0f0
|
Merge branch 'develop'
|
2016-09-15 22:11:57 +02:00 |
|
Thorsten Eckel
|
b013fb8cbc
|
Merge branch 'private-otrs_import_df'
|
2016-09-13 12:06:56 +02:00 |
|
Martin Edenhofer
|
fbd8e63592
|
Merge branch 'develop'
|
2016-09-13 08:55:38 +02:00 |
|
Martin Edenhofer
|
e8ad3965d7
|
Removed build badged.
|
2016-09-10 16:47:33 +02:00 |
|
Martin Edenhofer
|
e00981ee23
|
Merge branch 'master' of git.znuny.com:zammad/zammad
|
2016-09-10 00:05:18 +02:00 |
|
Martin Edenhofer
|
4e74c6beda
|
Merge branch 'develop'
|
2016-09-10 00:04:28 +02:00 |
|
Thorsten Eckel
|
2d09e556d7
|
Added deployment of archives.
|
2016-09-07 15:31:28 +02:00 |
|
Martin Edenhofer
|
8cd39398d6
|
Merge branch 'develop'
|
2016-09-06 16:07:33 +02:00 |
|
Martin Edenhofer
|
94c616ffe3
|
Merge branch 'develop'
|
2016-08-25 10:00:36 +02:00 |
|
Martin Edenhofer
|
57649bb888
|
Merge branch 'develop'
|
2016-08-23 09:49:40 +02:00 |
|
Martin Edenhofer
|
7e9442ec4a
|
Merge branch 'develop'
|
2016-08-21 21:38:00 +02:00 |
|
Martin Edenhofer
|
521e6265fd
|
Merge branch 'develop'
|
2016-08-19 13:58:26 +02:00 |
|
Martin Edenhofer
|
a42a9689fc
|
Merge branch 'develop'
|
2016-08-19 13:48:46 +02:00 |
|
Martin Edenhofer
|
d9ffb8001d
|
Merge branch 'develop'
|
2016-07-28 13:39:08 +02:00 |
|
Martin Edenhofer
|
ec86d26ae6
|
Merge branch 'develop'
|
2016-07-24 23:52:04 +02:00 |
|
Martin Edenhofer
|
e00efc821a
|
Merge branch 'develop'
|
2016-07-18 19:35:51 +02:00 |
|
Martin Edenhofer
|
f04be8ca93
|
Merge branch 'develop'
|
2016-07-12 20:50:32 +02:00 |
|
Martin Edenhofer
|
c7ff6a323a
|
Merge branch 'develop'
|
2016-07-08 11:28:43 +02:00 |
|
Martin Edenhofer
|
34833416bc
|
Merge branch 'develop'
|
2016-06-30 09:50:09 +02:00 |
|
Martin Edenhofer
|
d7a6e28d81
|
Merge branch 'develop'
|
2016-06-29 00:18:44 +02:00 |
|
Martin Edenhofer
|
c13531d720
|
Merge branch 'develop'
|
2016-06-27 11:28:22 +02:00 |
|
Martin Edenhofer
|
4a40cced7d
|
Merge branch 'develop'
|
2016-06-26 08:07:04 +02:00 |
|
Martin Edenhofer
|
450de10cc7
|
Merge branch 'develop'
|
2016-06-23 08:24:56 +02:00 |
|
Martin Edenhofer
|
5e587a455c
|
Merge branch 'develop'
|
2016-06-22 08:54:24 +02:00 |
|
Martin Edenhofer
|
04aef9b258
|
Merge branch 'develop'
|
2016-06-20 15:52:43 +02:00 |
|
Martin Edenhofer
|
9b72557d13
|
Merge branch 'develop'
|
2016-06-15 06:58:36 +02:00 |
|
Martin Edenhofer
|
a5e0bc30c1
|
Merge branch 'develop'
|
2016-06-09 13:40:27 +02:00 |
|
Martin Edenhofer
|
458c166e9f
|
Merge branch 'develop'
|
2016-06-08 16:43:29 +02:00 |
|
Martin Edenhofer
|
3373e5d141
|
Merge branch 'develop'
|
2016-06-08 10:48:12 +02:00 |
|
Martin Edenhofer
|
8f6b8de617
|
Merge branch 'develop'
|
2016-06-08 07:42:19 +02:00 |
|
Martin Edenhofer
|
22b21a82e7
|
Merge branch 'develop'
|
2016-06-07 07:02:25 +02:00 |
|
Martin Edenhofer
|
b4151b299f
|
Merge branch 'develop'
|
2016-06-04 02:23:14 +02:00 |
|
Martin Edenhofer
|
e969fca8c4
|
Merge branch 'develop'
|
2016-06-03 07:08:59 +02:00 |
|
Martin Edenhofer
|
e59993a5d6
|
Merge branch 'develop'
|
2016-05-31 08:31:56 +02:00 |
|
Martin Edenhofer
|
3adc9d4cf1
|
Merge branch 'develop'
|
2016-05-30 13:21:46 +02:00 |
|
Martin Edenhofer
|
c1153250cb
|
Merge branch 'develop'
|
2016-05-30 00:00:52 +02:00 |
|
Martin Edenhofer
|
7718dc28d3
|
Merge branch 'develop'
# Conflicts:
# README.md
|
2016-05-27 17:30:22 +02:00 |
|
Martin Edenhofer
|
1894580ae6
|
Updated badge url.
|
2016-05-27 17:28:26 +02:00 |
|
Martin Edenhofer
|
11df714bbf
|
Merge branch 'develop'
|
2016-05-20 15:18:36 +02:00 |
|
Martin Edenhofer
|
72adee37a8
|
Merge branch 'develop'
|
2016-05-20 06:10:19 +02:00 |
|
Martin Edenhofer
|
0e8f460d73
|
Merge branch 'develop'
|
2016-05-06 16:25:09 +02:00 |
|
Martin Edenhofer
|
4e62d5d0d2
|
Merge branch 'develop'
|
2016-05-06 09:40:16 +02:00 |
|
Martin Edenhofer
|
004e5ba457
|
Merge branch 'develop'
|
2016-05-04 12:13:34 +02:00 |
|
Martin Edenhofer
|
f1a8a8da6f
|
Merge branch 'develop'
|
2016-05-03 16:01:03 +02:00 |
|
Martin Edenhofer
|
bfb44d1189
|
Merge branch 'develop'
|
2016-05-01 14:18:26 +02:00 |
|
Martin Edenhofer
|
d64afd8d97
|
Merge branch 'develop'
|
2016-04-14 17:47:03 +02:00 |
|
Martin Edenhofer
|
97cfdb9c4c
|
Merge branch 'develop'
|
2016-04-12 08:25:06 +02:00 |
|
Martin Edenhofer
|
bb336f63f1
|
Merge branch 'develop'
|
2016-03-25 18:23:12 +01:00 |
|
Martin Edenhofer
|
80da08f447
|
Merge branch 'develop'
|
2016-03-23 09:31:02 +01:00 |
|
Martin Edenhofer
|
a6db2b7c90
|
Merge branch 'develop'
|
2016-03-17 17:45:04 +01:00 |
|
Martin Edenhofer
|
e1c3f83324
|
Merge branch 'develop'
|
2016-03-17 10:41:20 +01:00 |
|
Martin Edenhofer
|
8545a44ad1
|
Merge branch 'develop'
|
2016-03-16 11:17:22 +01:00 |
|
Martin Edenhofer
|
cfbe7510a2
|
Merge branch 'develop'
|
2016-03-16 09:10:05 +01:00 |
|
Martin Edenhofer
|
1479c32edb
|
Merge branch 'develop'
|
2016-03-15 00:34:36 +01:00 |
|
Martin Edenhofer
|
a9d428bf5a
|
Merge branch 'develop'
|
2016-03-11 10:38:15 +01:00 |
|
Martin Edenhofer
|
3a62eb11da
|
Merge branch 'develop'
|
2016-03-04 07:07:55 +01:00 |
|
Martin Edenhofer
|
2df5f81029
|
Merge branch 'develop'
|
2016-03-03 03:42:27 +01:00 |
|
Martin Edenhofer
|
b88c23bc92
|
Merge branch 'develop'
|
2016-02-28 00:16:49 +01:00 |
|
Martin Edenhofer
|
4144fbaf5b
|
Merge branch 'develop'
|
2016-02-25 23:46:10 +01:00 |
|
Martin Edenhofer
|
86ddc93f52
|
Merge branch 'develop'
|
2016-02-23 14:29:01 +01:00 |
|
Martin Edenhofer
|
8a1b583535
|
Merge branch 'develop'
|
2016-02-23 01:38:39 +01:00 |
|
Martin Edenhofer
|
7623628b86
|
Merge branch 'develop'
|
2016-02-12 08:53:57 +01:00 |
|
Martin Edenhofer
|
f753bc203f
|
Merge branch 'develop'
|
2016-02-11 13:25:39 +01:00 |
|
Martin Edenhofer
|
ff9ba10705
|
Merge branch 'develop'
|
2016-02-11 02:11:06 +01:00 |
|
Martin Edenhofer
|
fdc25bdc26
|
Merge branch 'develop'
|
2016-02-09 01:36:03 +01:00 |
|
Martin Edenhofer
|
d154a587ad
|
Merge branch 'develop'
|
2016-02-04 12:55:30 +01:00 |
|
Martin Edenhofer
|
a9cc4f037b
|
Merge branch 'develop'
|
2016-02-04 10:41:41 +01:00 |
|
Martin Edenhofer
|
50d6679189
|
Merge branch 'develop'
|
2016-02-03 13:19:51 +01:00 |
|
Martin Edenhofer
|
b82cf4e1d6
|
Merge branch 'develop'
|
2016-01-29 15:19:23 +01:00 |
|
Martin Edenhofer
|
fa6eaa6710
|
Merge branch 'develop'
# Conflicts:
# README.md
|
2016-01-26 19:59:34 +01:00 |
|
Martin Edenhofer
|
2ca17ac1bd
|
Updated build status url.
|
2016-01-26 13:57:24 +01:00 |
|
Martin Edenhofer
|
862ecd7d36
|
Merge branch 'develop'
|
2016-01-22 14:47:53 +01:00 |
|
Martin Edenhofer
|
e38b72593b
|
Merge branch 'develop'
|
2016-01-12 11:14:24 +01:00 |
|
Martin Edenhofer
|
81883cae8f
|
Revert "update terminal start script"
This reverts commit 63770c9cbf.
|
2016-01-12 11:13:40 +01:00 |
|
Felix Niklas
|
63770c9cbf
|
update terminal start script
|
2016-01-12 10:58:46 +01:00 |
|
Martin Edenhofer
|
aaf5da55a0
|
Merge branch 'develop'
|
2015-12-28 11:33:58 +01:00 |
|
Martin Edenhofer
|
8455d9ae17
|
Merge branch 'develop'
|
2015-12-21 16:03:31 +01:00 |
|
Martin Edenhofer
|
839a8e8eb4
|
Merge branch 'develop'
|
2015-12-13 15:26:35 +01:00 |
|
Martin Edenhofer
|
7aa3f6eaee
|
Updated build url.
|
2015-12-10 09:44:16 +01:00 |
|
Martin Edenhofer
|
219abc69a3
|
Merge branch 'develop'
|
2015-12-10 09:21:59 +01:00 |
|
Martin Edenhofer
|
595822c928
|
Merge branch 'develop'
|
2015-12-02 02:27:40 +01:00 |
|
Martin Edenhofer
|
32112937b1
|
Merge branch 'develop'
|
2015-12-02 01:41:10 +01:00 |
|
Martin Edenhofer
|
a0889c5b99
|
Merge branch 'develop'
|
2015-12-01 22:03:52 +01:00 |
|
Martin Edenhofer
|
4bc281bfb0
|
Merge branch 'develop'
|
2015-12-01 20:04:51 +01:00 |
|
Martin Edenhofer
|
e12ec607d7
|
Merge branch 'develop'
|
2015-11-30 15:11:25 +01:00 |
|
Martin Edenhofer
|
545f393293
|
Merge branch 'develop'
|
2015-11-30 01:24:11 +01:00 |
|
Martin Edenhofer
|
4efa152e93
|
Merge branch 'master' of github.com:martini/zammad
|
2015-11-24 03:39:17 +01:00 |
|
Martin Edenhofer
|
0ebda4f32a
|
Merge branch 'develop'
Conflicts:
README.md
script/websocket-server.rb
|
2015-11-24 03:38:55 +01:00 |
|
Martin Edenhofer
|
b94f54799f
|
Merge branch 'develop' of http://ci.lab.zammad.com/core/zammad
|
2015-11-24 03:07:38 +01:00 |
|
Martin Edenhofer
|
99f0b4e2e2
|
Merge branch 'develop'
|
2015-11-19 14:27:39 +01:00 |
|
Martin Edenhofer
|
53cb906733
|
Merge branch 'develop'
|
2015-11-01 01:49:02 +01:00 |
|
Martin Edenhofer
|
2c31fe8a84
|
Merge branch 'develop'
|
2015-10-31 23:40:10 +01:00 |
|
Martin Edenhofer
|
6c5e673a2c
|
Merge branch 'develop'
|
2015-10-02 15:31:54 +02:00 |
|
Martin Edenhofer
|
574b891a33
|
Merge branch 'develop'
|
2015-09-28 02:12:31 +02:00 |
|
Martin Edenhofer
|
9ef1d3f58b
|
Merge branch 'develop'
Conflicts:
extras/zammad.spec
|
2015-09-28 01:24:03 +02:00 |
|
Martin Edenhofer
|
8b3f432746
|
Merge branch 'develop'
|
2015-09-01 03:15:03 +02:00 |
|
Martin Edenhofer
|
14a9df261e
|
Merge branch 'develop'
|
2015-08-31 15:11:27 +02:00 |
|
Martin Edenhofer
|
5620a2847b
|
Merge branch 'develop'
|
2015-08-31 12:42:04 +02:00 |
|
Martin Edenhofer
|
13aaae3835
|
Merge branch 'develop'
|
2015-08-30 09:19:02 +02:00 |
|
Martin Edenhofer
|
2d4fcd3a4f
|
Merge branch 'develop'
|
2015-08-30 08:22:27 +02:00 |
|
Martin Edenhofer
|
f4f70b0bc2
|
Merge branch 'develop'
|
2015-08-30 01:36:18 +02:00 |
|
Martin Edenhofer
|
1d279bb88f
|
Merge branch 'develop'
|
2015-08-30 01:32:10 +02:00 |
|
Martin Edenhofer
|
fe4757cbf9
|
Merge branch 'develop'
|
2015-08-21 17:03:28 +02:00 |
|
me
|
1d476f163e
|
Use also mysql on test.
|
2015-08-21 16:53:38 +02:00 |
|
Martin Edenhofer
|
513701b6d2
|
Merge branch 'develop'
Conflicts:
README.md
script/websocket-server.rb
|
2015-08-11 15:17:14 +02:00 |
|
Thorsten Eckel
|
1a1b661714
|
Fixed typo.
|
2015-07-16 09:50:18 +02:00 |
|
Roy Kaldung
|
6081a98279
|
Update README.md
|
2015-01-12 12:39:26 +01:00 |
|
Roy Kaldung
|
157991c33d
|
Update README.md
|
2015-01-12 12:38:11 +01:00 |
|
Roy Kaldung
|
ef67be9170
|
We like to know if it's starting or stopping
|
2014-11-06 17:24:45 +01:00 |
|
Martin Edenhofer
|
39f3819303
|
Merge branch 'develop'
|
2014-11-06 16:13:39 +01:00 |
|
Martin Edenhofer
|
7a676bd563
|
Merge branch 'develop' into 'master', goto next level.
Conflicts:
Gemfile
README.md
extras/zammad.spec
|
2014-10-05 20:42:39 +02:00 |
|
Roy Kaldung
|
80c54daa03
|
Delete httpd.spec
|
2014-05-02 12:47:51 +02:00 |
|
Roy Kaldung
|
99c88cde62
|
Delete apr.spec
|
2014-05-02 12:47:41 +02:00 |
|
Roy Kaldung
|
17d113ca20
|
removed old file
|
2014-05-02 12:47:18 +02:00 |
|
Martin Edenhofer
|
2fbf4324a7
|
Update Gemfile
|
2014-02-22 14:46:25 +01:00 |
|
Roy Kaldung
|
b46c390d30
|
minor change to test GitHub hook (automatic deploy)
|
2013-12-04 18:22:21 +01:00 |
|
Martin Edenhofer
|
3c3651bc52
|
Merge branch 'develop'
Conflicts:
app/controllers/tickets_controller.rb
|
2013-09-20 13:52:53 +02:00 |
|
Roy Kaldung
|
abeeb5e66d
|
Updated Build Status image URL
|
2013-08-23 21:00:55 +02:00 |
|
rkaldung
|
09d61ce4c8
|
added dependency
|
2013-08-14 20:38:09 +02:00 |
|
rkaldung
|
cc1c4495b2
|
Merge branch 'master' of github.com:martini/zammad
|
2013-08-14 20:27:15 +02:00 |
|
rkaldung
|
7b1ec4d17f
|
modified install section
|
2013-08-14 20:26:25 +02:00 |
|
rkaldung
|
99b3201ccf
|
added initial spec for rpm
|
2013-08-14 20:20:55 +02:00 |
|
Roy Kaldung
|
d4205d9ba6
|
removed Windows ;-)
|
2013-08-14 20:08:23 +02:00 |
|
Roy Kaldung
|
8d57633390
|
minor changes on comments
|
2013-08-05 19:18:52 +02:00 |
|