nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20824 commits 4 branches 0 tags 121 MiB
Commit graph

3998 commits

Author SHA1 Message Date
Benjamin Neff
4a22f08539
Merge branch 'master' into next-minor 2019-05-13 22:52:08 +02:00
Benjamin Neff
dc7c5ffef6
Merge branch 'release/0.7.11.0' 2019-05-13 22:51:22 +02:00
Benjamin Neff
5aec9b966c
updated 74 locale files [ci skip] 2019-05-13 22:49:16 +02:00
Benjamin Neff
314239ff2a
Merge branch 'next-minor' into develop 2019-05-12 00:25:52 +02:00
Benjamin Neff
e5ba9a1a46
Move translations to registrations.closed 
And remove unused translations and make "another pod" translatable.

closes #7896
 2019-05-12 00:25:36 +02:00
flaburgan
4feab5219e
Use a partial to share code between mobile and desktop, add the new route to the RegistrationController, drop flash message for closed registrations 2019-05-12 00:25:36 +02:00
alebor-5
469983a623
Improve communication about signing up on closed pods 
fixes #7767
 2019-05-12 00:25:08 +02:00
flaburgan
6826e89a95
Change design, add a link to the official website 
fixes #7910

closes #7966
 2019-05-12 00:12:12 +02:00
David Moseler
e04ddd0bcc
Clarify pod is part of diaspora in splash screen 2019-05-12 00:09:58 +02:00
Dennis Schubert
3704be8bec
Prepare 0.7.12.0 cycle 
[ci skip]
 2019-05-05 04:22:10 +02:00
Benjamin Neff
d25d9f96f9
Merge branch 'next-minor' into develop 2019-04-30 22:52:00 +02:00
Benjamin Neff
54fd4846c0
Use password to disable 2FA instead of a token 
Using token doesn't make much sense when you can generate new tokens
right below.

closes #8006
 2019-04-30 22:51:51 +02:00
Benjamin Neff
d486fbce8c
Merge branch 'next-minor' into develop 2019-04-30 00:21:55 +02:00
Benjamin Neff
607659939d
Enable paranoid mode for devise 
fixes #8001

closes #8003
 2019-04-30 00:21:00 +02:00
lislis
9d5b981809 Two factor authentication (#7751) 2019-04-28 23:24:40 +02:00
lislis
1da118780e Two factor authentication (#7751) 2019-04-28 19:06:48 +02:00
Benjamin Neff
6ba9b24c1a
Merge branch 'next-minor' into develop 2019-04-27 18:00:40 +02:00
flaburgan
2073791cee
Add a manifest.json file as a first step to make diaspora* a PWA 
fixes #7997

closes #7998
 2019-04-27 18:00:14 +02:00
flaburgan
5b6cef0679
Remove legacy mobile web-capable 2019-04-27 17:56:51 +02:00
Jonne Haß
99411fced7 Merge branch 'develop' into api 2019-04-26 17:54:08 +02:00
Benjamin Neff
fc0de7bbd0
Merge branch 'next-minor' into develop 2019-02-26 01:02:52 +01:00
Benjamin Neff
a4031e09e1
Merge branch 'master' into next-minor 2019-02-26 01:02:42 +01:00
Benjamin Neff
663da1ef25
Merge branch 'release/0.7.10.0' 2019-02-26 01:01:51 +01:00
Benjamin Neff
7595168e01
updated 7 locale files [ci skip] 2019-02-26 00:57:43 +01:00
Benjamin Neff
4687d7e1ea
Start 0.7.11.0 cycle 2019-02-19 01:48:11 +01:00
Benjamin Neff
cdfcccd75d
Merge branch 'next-minor' into develop 2019-01-14 03:15:51 +01:00
Benjamin Neff
3ea4396ddb
Merge branch 'master' into next-minor 2019-01-14 03:13:44 +01:00
Benjamin Neff
1edcb0013c
Merge branch 'release/0.7.9.0' 2019-01-14 03:11:54 +01:00
Benjamin Neff
1925127964
updated 87 locale files [ci skip] 2019-01-14 03:09:05 +01:00
Benjamin Neff
71595b4cbd
Start 0.7.10.0 cycle 2019-01-07 02:03:06 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop 2019-01-06 22:18:48 +01:00
flaburgan
c8a1f308c6
Rename 'toggle mobile' to 'switch to touch-optimized mode' or 'switch to standard mode' 
closes #7926
 2019-01-06 22:04:22 +01:00
Hank Grabowski
58d2ce7ba6
Ignore Users in Mobile UI 
fixes #7840

closes #7884
 2019-01-06 21:55:33 +01:00
Hank Grabowski
9c730fc0f3 OpenID Scopes and Security updates 2018-12-30 22:33:04 +01:00
Hank Grabowski
16bf5d8130 Add Poll Voting Method to Interactions Endpoint 2018-12-30 22:33:04 +01:00
Hank Grabowski
02cf6a9eb2 Photos API Endpoint and unit tests complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
7dba616e4e Search API Endpoint and unit test complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
2f432eb560 Users Controller and unit tests complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
09c13fdf67 Notifications API Endpoint and unit test complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
803abba5c1 Interactions API endpoint complete with full tests 2018-12-30 22:33:04 +01:00
HankG
0f4789a5cb Contacts API Feature complete with full tests 2018-12-30 22:33:04 +01:00
Hank Grabowski
7ae36de2cf Tags API Endpoint complete with full tests 2018-12-30 22:33:04 +01:00
Hank Grabowski
db7fe69ce4 Aspects API Endpoint complete with full tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
173461ac3d Reshares API Endpoint complete with full unit tests 2018-12-30 22:31:33 +01:00
HankG
4923338bcf Conversations API Endpoint Feature complete with full tests 2018-12-30 22:31:33 +01:00
HankG
48b1428c57 Streams Controller API feature complete and fully tested 2018-12-30 22:31:33 +01:00
Hank Grabowski
bb2261b47d Posts API Endpoint feature complete with full unit tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
f64a8e04ed Comments API Endpoint complete with full unit tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
7ee9565a04 Likes API endpoint complete 2018-12-30 22:31:33 +01:00
Frank Rousseau
84ac19a090 Clean API routes 
* Remove routes without matching controller
* Rename stream routes to match specifications
* Remove public stream route and related controller
 2018-12-30 22:31:33 +01:00
Frank Rousseau
ec47fc67ab Make the comment API match the API specs 2018-12-30 22:31:33 +01:00
Frank Rousseau
bf2a188f82 Remove default paramter for api routes 2018-12-30 22:31:33 +01:00
Frank Rousseau
ffd5f575bc Make API likes controller match specs 2018-12-30 22:31:33 +01:00
Frank Rousseau
646c743385 Fix stream API routes 
Put streams under the subpath `/streams`.
 2018-12-30 22:31:33 +01:00
Frank Rousseau
ec18844e8f Move API controllers from v0 to v1 2018-12-30 22:31:33 +01:00
Frank Rousseau
b4dc13f1ce Fix code styles 2018-12-30 22:31:33 +01:00
Frank Rousseau
36bc122510 Adapt some API route syntax 2018-12-30 22:31:33 +01:00
Frank Rousseau
72a3b92b50 Make syntax compliant with the pronto configuration 2018-12-30 22:31:33 +01:00
Frank Rousseau
f9e0dee2dc Make messages API conformed with docs 2018-12-30 22:31:33 +01:00
Frank Rousseau
f0aecd5790 Add routes for conversation 
Including messages and visibilities
 2018-12-30 22:31:33 +01:00
Frank Rousseau
35860e2866 Add locales for conversation API controller 2018-12-30 22:31:33 +01:00
theworldbright
6cad0a965a Add likes API route 2018-12-30 22:31:33 +01:00
theworldbright
41750e38da Add streams API routes 2018-12-30 22:31:33 +01:00
theworldbright
c9ba1ee197 Combine Comment index with Post show API route 2018-12-30 22:31:33 +01:00
theworldbright
47dd44ff39 Add comments API routes 2018-12-30 22:31:33 +01:00
theworldbright
552d3efb29 Add posts API routes 2018-12-30 22:31:33 +01:00
Benjamin Neff
6824ef5baf
Merge branch 'next-minor' into develop 2018-11-25 22:38:03 +01:00
Benjamin Neff
5a0381f832
Merge branch 'master' into next-minor 2018-11-25 22:37:43 +01:00
Benjamin Neff
6185355e92
Merge branch 'release/0.7.8.0' 2018-11-25 22:36:59 +01:00
Benjamin Neff
09a8c84ae0
updated 51 locale files [ci skip] 2018-11-25 22:34:46 +01:00
Besnik Bleta
5766a08b22
Better wording for the latest changes, part II and final 
closes #7934
 2018-11-25 22:32:20 +01:00
Besnik Bleta
440775f3b0
Better wording for the latest changes 2018-11-25 22:32:17 +01:00
Besnik Bleta
5ee85721f7
Fixing an oldsyntax error of considering %{actors} as a number, rather than a list of people’s usernames 2018-11-25 22:32:17 +01:00
Besnik Bleta
6c2b3a7b11
Update sq translations 2018-11-25 22:32:14 +01:00
Benjamin Neff
2d6a68c28f
Start 0.7.9.0 cycle 
[ci skip]
 2018-11-19 00:50:04 +01:00
Benjamin Neff
5b0066a426
Merge branch 'next-minor' into develop 2018-11-18 19:36:51 +01:00
Benjamin Neff
7a958bce69
Bump cucumber 2018-11-18 19:32:16 +01:00
Benjamin Neff
fa0e34f687
Merge branch 'hotfix/0.7.7.1' 2018-11-08 20:57:09 +01:00
Dennis Schubert
cd16f29c39
Merge branch 'next-minor' into develop 2018-11-08 05:14:36 +01:00
Benjamin Neff
3c55a425c7
Fix script domain for instagram in CSP header 
closes #7920
 2018-11-08 05:12:55 +01:00
Benjamin Neff
d3bb7ade78
Merge branch 'next-minor' into develop 2018-11-02 01:39:11 +01:00
flaburgan
65e0f90b86
Reword the web handler setting 
fixes #7838

closes #7909
 2018-11-02 01:35:44 +01:00
Dennis Schubert
0133a9f354
updated 17 locale files [ci skip] 2018-10-27 00:13:47 +02:00
Dennis Schubert
a201e3b2c2
updated 17 locale files [ci skip] 2018-10-27 00:12:25 +02:00
Dennis Schubert
d8c1b4f460
Merge branch 'release/0.7.7.0' 2018-10-15 02:43:19 +02:00
Dennis Schubert
53a7508222
Merge branch 'next-minor' into develop 2018-10-15 02:41:57 +02:00
Dennis Schubert
fcbc470b5c
Merge branch 'release/0.7.7.0' into next-minor 2018-10-15 02:41:22 +02:00
Dennis Schubert
af3e2e6d53
updated 33 locale files [ci skip] 2018-10-15 02:40:23 +02:00
Dennis Schubert
a928e40d7f
Merge branch 'next-minor' into develop 2018-10-14 06:03:12 +02:00
Zachary Rabinovich
c4fed4bbcc
Add the ability to assign roles in the admin panel 
closes #7868
 2018-10-14 06:03:06 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop 2018-10-08 02:50:36 +02:00
Dennis Schubert
89d9a865b6
Merge branch 'release/0.7.7.0' into next-minor 2018-10-08 02:50:29 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration 
Facebook removed the API and facebook integration is broken now, so lets
remove it.

closes #7874
 2018-10-08 02:50:25 +02:00
Dennis Schubert
3cd6f9abbb
Start 0.7.8.0 cycle 
[ci skip]
 2018-10-08 02:42:10 +02:00
Dennis Schubert
3ebe0e56a8
Merge branch 'next-minor' into develop 2018-10-04 04:37:06 +02:00
Luna Gloaming
45b7f0b119
Added quotation marks for postgresql parameters. 
As a new, novice user, I ran into an issue where my postgresql
password contained special characters.  After a brief conversation
with DenSchub on #diaspora, it was noted that while the example
database configuration had quotes added for mysql, but not for
postgresql, and it was suggested this be improved.

closes #7875
 2018-10-04 04:36:57 +02:00
Dennis Schubert
24c7e472d4
Merge branch 'next-minor' into develop 2018-09-30 17:59:12 +02:00
Benjamin Neff
b6333e0b1b
Remove reference to statistics.json 
and mention /statistics and NodeInfo

closes #7867
 2018-09-30 17:58:55 +02:00
Dennis Schubert
026e63b961
Merge branch 'next-minor' into develop 2018-09-08 02:25:44 +02:00
Benjamin Neff
49b63693c9
Fix i18n fallbacks 
Fallbacks are set in config/initializers/locale.rb and this settings
conflicts with the fallbacks set there.

Fixes #7860

closes #7861
 2018-09-08 02:25:36 +02:00
Benjamin Neff
1289b3b541
Merge branch 'next-minor' into develop 2018-07-13 10:22:04 +02:00
Dennis Schubert
af500dabbc
Add section in the User's settings to register the protocol handler 
closes #7833
 2018-07-13 10:19:43 +02:00
Benjamin Neff
dcbdb69e22
Merge branch 'next-minor' into develop 2018-07-11 01:35:50 +02:00
cmrd Senya
6f812a5b8f
Add LinksController 
LinksController redirects requests for provided diaspora:// links to
respective entities urls.
 2018-07-11 01:24:28 +02:00
Benjamin Neff
4aa08ddf14
Merge branch 'next-minor' into develop 2018-06-27 02:46:26 +02:00
Benjamin Neff
c2fa0b1eba
Merge branch 'master' into next-minor 2018-06-27 02:46:04 +02:00
Benjamin Neff
2b3bbc1a6c
Merge branch 'release/0.7.6.0' 2018-06-27 02:42:00 +02:00
Benjamin Neff
097754e493
updated 6 locale files [ci skip] 2018-06-27 02:31:52 +02:00
Benjamin Neff
67d6d2ff25
Prepare 0.7.7.0 cycle 2018-06-20 01:38:17 +02:00
Benjamin Neff
299c04a24a
Merge pull request #7781 from SuperTux88/enable-csp-by-default 
Enable Content-Security-Policy header by default
 2018-06-16 21:21:07 +02:00
Benjamin Neff
8983901b1a
Merge branch 'next-minor' into develop 2018-06-16 21:19:41 +02:00
Benjamin Neff
10841b6031
updated 16 locale files [ci skip] 2018-06-16 21:18:15 +02:00
Jonne Haß
fe75602928
update armenian locales 2018-06-16 21:12:13 +02:00
Jonne Haß
fac3c4bbe3
update plural rules 2018-06-16 21:12:13 +02:00
goobertron
d1597c0b23
Update locale_settings.yml with 3 Armenian variants 2018-06-16 21:12:09 +02:00
Benjamin Neff
f3d2a54050
Merge branch 'next-minor' into develop 2018-06-16 04:36:13 +02:00
cmrd Senya
87968284ba
Support fetching StatusMessage by Poll guid 
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.

closes #7815
 2018-06-16 04:36:05 +02:00
Benjamin Neff
212da3a2b7
Merge branch 'next-minor' into develop 2018-06-16 01:23:10 +02:00
Alex Tribble
1b03265c2e
Allow fonts to be served from asset host in CSP. 
Closes #7796

closes #7825
 2018-06-16 01:22:22 +02:00
Benjamin Neff
22d1ad995c
Merge branch 'next-minor' into develop 2018-04-30 22:54:33 +02:00
Benjamin Neff
b7cd9d6238
Merge branch 'master' into next-minor 2018-04-30 22:54:03 +02:00
Benjamin Neff
42ceb8b3e3
Merge branch 'release/0.7.5.0' 2018-04-30 22:51:23 +02:00
Benjamin Neff
6a3d9ede52
Make ja-KS avaliable 2018-04-30 22:18:55 +02:00
Benjamin Neff
f5350e2df6
updated 77 locale files [ci skip] 2018-04-30 22:10:06 +02:00
Dennis Schubert
8d6c891ecb
Prepare 0.7.6.0 cycle 2018-04-23 20:35:18 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop 2018-04-16 01:26:56 +02:00
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs 
closes #7787
 2018-04-16 01:26:48 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop 2018-04-12 02:49:11 +02:00
Benjamin Neff
0e526f9221
Bump jasmine 
Disable random tests for now, many tests fail when this is true (which
is now default)
 2018-04-12 02:41:56 +02:00
Benjamin Neff
e0b4bff6a6
Bump fixture_builder 2018-04-12 02:41:55 +02:00
Benjamin Neff
7854e14e07
Bump secure_headers 2018-04-12 02:41:53 +02:00
Benjamin Neff
66175f6908
Merge branch 'next-minor' into develop 2018-04-12 01:56:07 +02:00
Benjamin Neff
7d6623d069
Remove contacts page on profiles 
closes #7769
 2018-04-12 01:40:49 +02:00
Benjamin Neff
4fa92c1823
Remove flag for contacts visible to each other 
This feature only worked on the same pod and was more confusing than
useful.
 2018-04-12 01:39:11 +02:00
Benjamin Neff
c0a4895854
Enable Content-Security-Policy header by default 2018-04-10 21:29:34 +02:00
Benjamin Neff
aa6f4d46c9
Merge branch 'hotfix/0.7.4.1' 2018-04-10 01:56:29 +02:00
Dennis Schubert
ae17248b2e
Merge pull request #7734 from Fensterbank/client-side-picture-resize 
Resize images on client-side before uploading
 2018-04-02 10:38:51 +02:00
Benjamin Neff
c84411ea62
Merge branch 'next-minor' into develop 2018-03-25 08:37:11 +02:00
cmrd Senya
0080a2567f
StatusMessageController#create: respond 422 when aspect_ids are wrong 
fixes #3862

closes #7742
 2018-03-25 08:31:32 +02:00
Besnik Bleta
bc3908a103
Update for sq translation 2018-03-25 08:24:38 +02:00
Jonne Haß
5e96cc6d89
add carrierwave error messages 2018-03-25 08:24:10 +02:00
Besnik Bleta
a867d64631 Update for sq translation 2018-03-24 18:13:12 +02:00
Benjamin Neff
0d07d9f3de
Merge branch 'next-minor' into develop 2018-03-18 23:14:20 +01:00
Benjamin Neff
c7709e29f2
Merge branch 'master' into next-minor 2018-03-18 23:13:48 +01:00
Benjamin Neff
d031375610
Merge branch 'release/0.7.4.0' 2018-03-18 23:11:47 +01:00
Benjamin Neff
aadd64b0a5
updated 43 locale files [ci skip] 2018-03-18 23:05:19 +01:00
Jonne Haß
e1b1491f75 Merge branch 'next-minor' into develop 2018-03-16 11:31:34 +01:00
Jonne Haß
300d09e258 add ja-KS fallback to ja 2018-03-16 11:31:11 +01:00
Benjamin Neff
4d54c85eee
Start 0.7.5.0 cycle 2018-03-12 23:59:31 +01:00
Frédéric Bolvin
6d55b15604 Resize images on client-side before uploading 2018-03-11 11:20:16 +01:00
Frédéric Bolvin
23e4062342 Allow blob: URIs to be used as a content source in CSP header 2018-03-03 21:12:18 +01:00
Benjamin Neff
0b921c6657
Merge branch 'next-minor' into develop 2018-02-17 19:26:15 +01:00
cmrd Senya
3e31b91b11
Add @nophantomjs tag to default cucumber profile 
Use this tag for tests which can't work with PhantomJS, but which we
can run with Selenium using some other profile (not implemented here).

closes #6418
 2018-02-17 19:24:39 +01:00
cmrd Senya
b32c844314
Support for embedding HTML5 media links 
Use markdown-it-html5-embed plugin so user can embed audio and
video using the markdown link syntax []() in the HTML5 way.
 2018-02-17 19:21:10 +01:00
Dennis Schubert
948e31b10c
Merge branch 'next-minor' into develop 2018-02-09 03:15:38 +01:00
Dennis Schubert
f8ce276ddc
Merge branch 'master' into next-minor 2018-02-09 03:15:18 +01:00
Dennis Schubert
b23696bb88
Merge branch 'hotfix/0.7.3.1' 2018-02-09 03:13:51 +01:00
Dennis Schubert
005dd923c9
Pull updated German translations to fix "reshare" UX issues 2018-02-09 03:09:44 +01:00
Benjamin Neff
3033e915e5
Merge branch 'next-minor' of github.com:diaspora/diaspora into next-minor 2018-02-08 23:19:57 +01:00
Benjamin Neff
fc2397c062
Merge branch 'next-minor' into develop 2018-02-08 22:55:43 +01:00
Benjamin Neff
a8fcbb3365
Merge branch 'master' into next-minor 2018-02-08 22:55:30 +01:00
Benjamin Neff
1f3ad2fa65
Merge branch 'release/0.7.3.0' 2018-02-08 22:54:14 +01:00
Benjamin Neff
aff4be8821
updated 21 locale files [ci skip] 2018-02-08 22:46:45 +01:00
Dennis Schubert
ea606b374a
Merge branch 'next-minor' into develop 2018-02-03 16:43:30 +01:00
Fla
35535d5bfb
Remove unnecessary quotes in database.yml.examle 
[ci skip]

closes #7711
 2018-02-03 16:42:51 +01:00
Dennis Schubert
7abb0518e9
Start 0.7.4.0 cycle 
[ci skip]
 2018-02-01 23:48:04 +01:00
Dennis Schubert
13d24cc611
Merge branch 'next-minor' into develop 2018-01-08 21:15:49 +01:00
Janakas
d4e5d13a8f
Remove old export archives after 2 weeks 
Fixes #5727
 2018-01-08 21:14:06 +01:00
Janakas
497c647983
Rearrange userdata-export section and change timestamp to timeago 2018-01-08 21:14:01 +01:00
Benjamin Neff
03ee954c10
Merge branch 'next-minor' into develop 2017-12-26 03:38:10 +01:00
Benjamin Neff
25d41429bc
Merge branch 'master' into next-minor 2017-12-26 03:37:57 +01:00
Benjamin Neff
cf2bd66005
Merge branch 'release/0.7.2.0' 2017-12-26 03:36:49 +01:00
Benjamin Neff
a9cce95a74
updated 32 locale files [ci skip] 2017-12-26 03:30:32 +01:00
Benjamin Neff
c5536395c0
Start 0.7.3.0 cycle 2017-12-18 04:55:45 +01:00
Benjamin Neff
d42801a737
Merge branch 'next-minor' into develop 2017-12-18 04:41:49 +01:00
Rete2
fc33a2ac5d
Create birthday notification and mailer 
closes #7624

fixes #1649
 2017-12-18 04:34:35 +01:00
Jonne Haß
c8d1043590 add carrierwave error messages 2017-12-03 14:53:44 +01:00
Benjamin Neff
21980681b1
Merge branch 'next-minor' into develop 2017-11-01 00:50:23 +01:00
Benjamin Neff
89eeec72d3
Merge branch 'master' into next-minor 2017-11-01 00:50:17 +01:00
Benjamin Neff
2c9fec91da
Merge branch 'hotfix/0.7.1.1' 2017-11-01 00:49:19 +01:00
Benjamin Neff
63fcc9c1bc
Fix compatibility with Bundler 1.6 
Stop using `Bundler.settings.with`, because it will be removed from
Bundler 1.6.

Also, as described in #7653, we could use `Bundler.settings[:with]`, but
that would be internal API again, so it probably breaks again in the
future. That's why I added a `BundlerHelper` module to parse the
required optional group from our config files, without the use of any
internal Bundler API.

Fixes #7653
 2017-11-01 00:45:18 +01:00
Benjamin Neff
42a8129016
Merge branch 'next-minor' into develop 2017-10-21 00:46:22 +02:00
Benjamin Neff
2ce7d59cb3
Merge branch 'master' into next-minor 2017-10-21 00:45:59 +02:00
Benjamin Neff
db95c94c97
Merge branch 'release/0.7.1.0' 2017-10-21 00:44:32 +02:00
Benjamin Neff
783650e34c
updated 35 locale files [ci skip] 2017-10-21 00:41:40 +02:00
Benjamin Neff
1b6ffa2528
Start 0.7.2.0 cycle 2017-09-28 23:38:57 +02:00
Benjamin Neff
0029f2c1da
Merge branch 'next-minor' into develop 2017-09-28 23:11:56 +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
bb97aa8538
Allow RFC 7033 WebFinger via http:// for development 2017-09-28 23:04:34 +02:00
Benjamin Neff
508e44e01b
Merge branch 'hotfix/0.7.0.1' 2017-09-19 20:24:37 +02:00
Benjamin Neff
26a9e50ef9
Merge branch 'next-minor' into develop 2017-09-17 19:36:00 +02:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files 2017-09-17 19:29:15 +02:00
Benjamin Neff
295bb15f73
Merge branch 'next-minor' into develop 2017-08-29 02:17:47 +02:00
goobertron
e7cac2e466
Replace <b> with <strong> in translations 
closes #7585
 2017-08-29 02:00:34 +02:00
goobertron
51152e140d
Add ignore feature to help section 
Fixes #7572
 2017-08-29 01:59:51 +02:00
Benjamin Neff
e7a1fe6e78
Merge branch 'next-minor' into develop 2017-08-26 03:16:23 +02:00
Rete2
b556ad5211
show users vote in poll 
closes #7550
 2017-08-26 03:16:05 +02:00
Benjamin Neff
5ea7b8ee13
Set fog_provider and load carrierwave/storage/fog if S3 is enabled 
Fixes #7563

closes #7566
 2017-08-26 02:50:18 +02:00
Frédéric Bolvin
398235ee6f
use asset manifest instead of entries in config.assets.precompile 
closes #7565
 2017-08-26 02:44:41 +02:00
Steffen van Bergerem
974fbd4d03
Merge branch 'next-minor' into develop 2017-08-24 14:57:59 +02:00