Commit graph

165 commits

Author SHA1 Message Date
Benjamin Neff
d031375610
Merge branch 'release/0.7.4.0' 2018-03-18 23:11:47 +01:00
Dennis Schubert
b23696bb88
Merge branch 'hotfix/0.7.3.1' 2018-02-09 03:13:51 +01:00
Benjamin Neff
1f3ad2fa65
Merge branch 'release/0.7.3.0' 2018-02-08 22:54:14 +01:00
Dennis Schubert
7abb0518e9
Start 0.7.4.0 cycle
[ci skip]
2018-02-01 23:48:04 +01:00
Benjamin Neff
cf2bd66005
Merge branch 'release/0.7.2.0' 2017-12-26 03:36:49 +01:00
Benjamin Neff
c5536395c0
Start 0.7.3.0 cycle 2017-12-18 04:55:45 +01:00
Benjamin Neff
2c9fec91da
Merge branch 'hotfix/0.7.1.1' 2017-11-01 00:49:19 +01:00
Benjamin Neff
db95c94c97
Merge branch 'release/0.7.1.0' 2017-10-21 00:44:32 +02:00
Benjamin Neff
1b6ffa2528
Start 0.7.2.0 cycle 2017-09-28 23:38:57 +02:00
Benjamin Neff
fd36517dee
Limit the number of parallel exports that are allowed to run
closes #7629
2017-09-28 23:11:46 +02:00
Benjamin Neff
508e44e01b
Merge branch 'hotfix/0.7.0.1' 2017-09-19 20:24:37 +02:00
Benjamin Neff
7153df5c86
Merge branch 'release/0.7.0.0' 2017-08-19 22:38:38 +02:00
Benjamin Neff
0c1dd195da
Start 0.7.1.0 cycle 2017-08-15 01:45:45 +02:00
Benjamin Neff
8bed8a84a3
Merge branch 'release/0.6.7.0' 2017-07-12 03:49:09 +02:00
Benjamin Neff
7aadadce44
Merge branch 'release/0.6.6.0' 2017-05-29 03:20:38 +02:00
Benjamin Neff
a6869197d8
Start 0.6.7.0 cycle
[ci skip]
2017-05-23 00:15:06 +02:00
Benjamin Neff
91a9549c3d
Merge branch 'release/0.6.5.0' 2017-04-19 00:52:02 +02:00
Dennis Schubert
69be912478
Start 0.6.6.0 cycle
[ci skip]
2017-04-12 01:28:18 +02:00
Dennis Schubert
2b32e9b592
Merge branch 'hotfix/0.6.4.1' 2017-03-29 22:29:56 +02:00
Benjamin Neff
a9c282d986
Merge branch 'release/0.6.4.0' 2017-03-12 04:18:52 +01:00
Benjamin Neff
13698bece5
Start 0.6.5.0 cycle 2017-03-05 01:56:50 +01:00
Benjamin Neff
f9cf844602
Merge pull request #7280 from svbergerem/remove-chartbeat-and-mixpanel
Remove chartbeat and mixpanel support
2017-02-17 22:22:30 +01:00
Benjamin Neff
1702cc1c86
Merge branch 'release/0.6.3.0' 2017-01-23 02:39:54 +01:00
Benjamin Neff
af00d7c5c0
Merge branch 'next-minor' into develop 2017-01-22 23:30:42 +01:00
flaburgan
1028632ac1
Add Liberapay button in the donate section
closes #7290
2017-01-22 23:29:57 +01:00
Steffen van Bergerem
bd0210a181
Remove chartbeat and mixpanel support 2017-01-15 13:30:54 +01:00
Benjamin Neff
66367cccd8 Start 0.6.4.0 cycle 2017-01-15 05:05:24 +01:00
Dennis Schubert
991b047be7
Start 0.6.3.0 cycle 2016-12-04 20:12:00 +01:00
Benjamin Neff
34787043bb Merge branch 'next-minor' into develop 2016-11-25 22:37:21 +01:00
Justin Ramos
3586fa6ae7 allowing for graceful unicorn restarts
closes #7217
2016-11-25 22:37:06 +01:00
Dennis Schubert
8fb17f8e2c
Merge branch 'next-minor' into develop 2016-11-06 02:41:46 +01:00
Benjamin Neff
851c16d80c
Add setting for a custom changelog url.
fixes #7073

closes #7166
2016-11-06 02:41:42 +01:00
Dennis Schubert
368e6d9ef5
Start 0.6.2.0 cycle
[ci skip]
2016-10-27 02:29:14 +02:00
Dennis Schubert
c41fd52f1d
Merge branch 'next-minor' into develop 2016-09-30 02:11:36 +02:00
Benjamin Neff
ec8a49b338
Add settings for CSP to diaspora.yml
closes #7128
2016-09-30 02:11:32 +02:00
Dennis Schubert
5437af74a3
Merge branch 'next-minor' into develop 2016-09-25 02:59:00 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL
closes #7066
2016-09-25 02:58:56 +02:00
Dennis Schubert
78083afe38
Undo accidential dev->next-minor merge
Turns out there is a difference between hg and git and I should not
switch that often.
2016-09-20 02:04:04 +02:00
Dennis Schubert
f6e5fa1d13
Merge branch 'svbergerem-fix-bundler-require' into next-minor 2016-09-20 01:47:12 +02:00
Dennis Schubert
c39a661861
Init 0.6.0.1 hotfix 2016-09-20 01:40:40 +02:00
Benjamin Neff
95167528a2 Merge branch 'next-minor' into develop 2016-09-18 22:31:18 +02:00
Lance Gilbert
a9d77c6b1b Enable setting BOSH access protocol via chat configuration
closes #7100
2016-09-18 22:31:11 +02:00
Dennis Schubert
deeabb26af
Merge branch 'release/0.6.0.0' 2016-08-27 00:26:55 +02:00
Dennis Schubert
3f157bec35
Prepare 0.7.0.0 cycle
[ci skip]
2016-08-21 23:53:42 +02:00
Dennis Schubert
0921cfb43e
Prepare 0.6.1.0 cycle
[ci skip]
2016-08-21 23:52:30 +02:00
Denis Hovart
bcace2def2 6840 : meta tags update (#6998)
* Adds a new metadata helper and methods to PostPresenter to have metas on post pages.

* Adds tests to post controller to check correctness of metas

* Add methods to PersonPresenter to have metas on profile pages

* Correct meta data helper test

* Update PersonPresenter, add test to PeopleController

* Creates TagPresenter. Display tag metas on tag index page

* Updata meta data helper spec

* Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.

* Set meta info as hashes in presenters

* Move original hardcoded metas info to config/defaults.yml

* metas_tags include by default the general metas, update views

* Update code style, clean views

* Renames TagPresenter StreamTagPresenter, updates TagController spec

* Add a default_metas entry to diaspora.yml.example

* Align metas hash in presenters, refactor meta data helper

* Use bio as description meta if user has a public profile

* Rename StreamTagPresenter to TagStreamPresenter
2016-08-18 21:52:39 +02:00
Jonne Haß
0a77f045a3
bump to 0.5.10.2 2016-08-11 20:25:20 +02:00
Jonne Haß
58a355ed01
Expose Sidekiq dead job queue configuration options
Set the default limit of dead jobs to 5k, which should equal to about 50M memory
usage in the worst case. Sidekiq's default is 10k. Set the expiration
timeout to 6 weeks, matching our minor release schedule. Sidekiq's
default is 6 months.

Given the new federation code stores the XML payload in the job
parameters, fine-tuning here can give more significant memory savings.
2016-07-20 15:21:17 +02:00
Dennis Schubert
91bf63ec8a
Release 0.5.10.1 2016-06-28 22:05:21 +02:00
Dennis Schubert
f09827311a
Merge branch 'release/0.5.10.0' 2016-06-28 21:39:54 +02:00