1
0
Fork 0
Commit graph

19866 commits

Author SHA1 Message Date
e1216e3a60
Merge pull request #5172 from annando/develop
Bugfix: In the daemon mode we forgot to call the cron jobs
2018-06-06 06:49:30 +02:00
1304dae0d3 Bugfix: In the daemon mode we forgot to call the cron jobs 2018-06-06 03:48:04 +00:00
4cd730ea16
Merge pull request #5171 from annando/removed-deprecated-upload
Removed some quick and dirty hack to upload pictures
2018-06-05 09:26:05 +02:00
e632be763c Corrected variable 2018-06-05 05:44:04 +00:00
18a77a1b45 Removed some quick and dirty hack to upload pictures 2018-06-05 05:42:26 +00:00
Hypolite Petovan
533c3a88c5
Merge pull request #5170 from annando/poller-worker
We don't poll, we work ... Bugfix for renamed config value.
2018-06-04 18:41:22 -04:00
d9bdba491a We don't poll, we work ... Bugfix for renamed config value. 2018-06-04 21:17:37 +00:00
Hypolite Petovan
10e118bd63
Merge pull request #5169 from tobiasd/20180603-nl
update to the NL translation THX Pascal
2018-06-04 08:48:55 -04:00
90be8b47d6 update to the NL translation THX Pascal 2018-06-04 12:09:33 +02:00
Hypolite Petovan
0a13ab6b9f
Merge pull request #5166 from annando/unsed-item-fields
Remove unused, unneeded or redundant item fields
2018-06-03 12:19:50 -04:00
Hypolite Petovan
973ece09c5
Merge pull request #5157 from annando/daemon
Workers can now be started exclusively from the daemon and other workers
2018-06-03 12:18:47 -04:00
f316e96bd1 Now the dataset is said to be valid again. 2018-06-03 16:11:05 +00:00
09c1b44381 Someone else has to fix this 2018-06-03 11:42:23 +00:00
e232ccf9e0 Trying around ... 2018-06-03 11:38:03 +00:00
946bfd79ff Just one more ... 2018-06-03 11:29:09 +00:00
9ade6c2b33 The testdata hadn't contained public contacts 2018-06-03 11:20:22 +00:00
e48b2a3dad Reverting it ... 2018-06-03 11:12:09 +00:00
058d755372 I guess I broke the test tool :-) 2018-06-03 11:07:24 +00:00
e392491e94 Next try ;-) 2018-06-03 10:58:03 +00:00
b33578c137 Additional data for the test tool 2018-06-03 10:47:40 +00:00
443d828ba7 We don't need to look for the uid 2018-06-03 10:29:42 +00:00
28678c0fad Reverting the last test 2018-06-03 10:22:10 +00:00
96d170c9d8 Trying to understand the test tool 2018-06-03 10:04:02 +00:00
6985ad4fb5 Improved error message 2018-06-03 09:55:41 +00:00
b654af28fa We need "global" 2018-06-03 09:40:32 +00:00
ea498ff283 And a second SQL error fixed 2018-06-03 09:21:48 +00:00
d76fb6d0b9 Fixed SQL error 2018-06-03 09:19:27 +00:00
f081f15096 Updated sql file 2018-06-03 08:46:23 +00:00
d7c477d0f4 Don't probe anymore, but ensure that we got good contact data 2018-06-03 08:36:05 +00:00
93fd04e381 Removed deprecated functionality 2018-06-03 07:48:13 +00:00
3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
a720c4f501 Removed unneeded fields from the API 2018-06-03 07:22:01 +00:00
Hypolite Petovan
0eafea86ed
Merge pull request #5163 from annando/bugfix-user-item
Fix SQL error in tagcloud
2018-06-02 13:49:58 -04:00
41423e578a Fix SQL error in tagcloud 2018-06-02 17:07:28 +00:00
Hypolite Petovan
bb11969c72
Merge pull request #5162 from tobiasd/20180602-de
update DE translations
2018-06-02 10:09:44 -04:00
4cca036a1b update DE translations 2018-06-02 15:56:57 +02:00
Hypolite Petovan
541f8634c0
Merge pull request #5161 from annando/public-redir
"redir" is now centralized
2018-06-02 09:18:10 -04:00
c6c94b8cea Weird stuff 2018-06-02 13:00:47 +00:00
81c002370e Only redirections to the same host do make sense 2018-06-02 08:42:46 +00:00
723b5ae803 Use MagicLinkbyId when possible 2018-06-02 08:28:01 +00:00
Michael Vogel
eb63bdc30c
Merge pull request #5160 from tobiasd/20180602-msg
regen master messages.po
2018-06-02 10:27:37 +02:00
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
19ab854704 regen master messages.po 2018-06-02 08:49:58 +02:00
885f2b52d1 Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-02 06:18:45 +00:00
e429c26396
Merge pull request #5159 from AndyHee/patch1
Rewording label
2018-06-02 07:54:12 +02:00
2b25bd48d4 Improved distinction between delete and remove 2018-06-02 12:40:41 +07:00
371f511954 Respect "don't fork" 2018-06-02 05:17:32 +00:00
3034170088 DBStruxture can now create "memory" tables as well 2018-06-02 05:03:23 +00:00
a75d28e521 Rewording label 2018-06-02 11:23:27 +07:00
6d64667cdb Merge remote-tracking branch 'upstream/develop' into daemon 2018-06-02 04:03:55 +00:00