Commit graph

19732 commits

Author SHA1 Message Date
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
3fe0ef350f
Merge branch 'next-minor' into develop 2018-12-28 01:39:56 +01:00
CSammy
a21cde4c00
Speed up public stream and remove obsolete indexes
closes #7944
2018-12-28 01:39:49 +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
95032bae92
Fix typo in changelog for 0.7.8.0 2018-11-20 22:03:15 +01:00
Benjamin Neff
0d45e709f2
Merge branch 'next-minor' into develop 2018-11-19 00:51:10 +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
8e170ab976
Add retry on travis to reduce random failures
closes #7932
2018-11-18 19:34:41 +01:00
Benjamin Neff
7a958bce69
Bump cucumber 2018-11-18 19:32:16 +01:00
Benjamin Neff
a09f7d73d8
Remove guard-cucumber
Looks dead, last commit over two years ago, and block upgrade of cucumber

See guard/guard-cucumber#36
2018-11-18 19:27:43 +01:00
Dennis Schubert
a6655c187d
Add DIASPORA_DOCKER_PORT env var to change the port exposed by Docker
Set default port to 3000 as this is the default in the diaspora.yml.example

fixes #7927

closes #7928
2018-11-18 19:27:20 +01:00
Benjamin Neff
24fbd59d21
Merge pull request #7931 from SuperTux88/update-gems
Update gems
2018-11-17 23:40:12 +01:00
Benjamin Neff
8fc75e8955
Bump twitter-text 2018-11-17 21:20:51 +01:00
Benjamin Neff
81c833c4e3
Bump rails-assets-pica 2018-11-17 21:20:05 +01:00
Benjamin Neff
5bc32d0aad
Bump rails-assets-cropperjs 2018-11-17 21:15:59 +01:00
Benjamin Neff
b30c4e4e97
Merge branch 'next-minor' into develop 2018-11-17 21:08:23 +01:00
Benjamin Neff
b24b31256e
Bump warden
closes #7930
2018-11-17 21:06:20 +01:00
Benjamin Neff
ce10791526
Bump guard 2018-11-17 21:05:42 +01:00
Benjamin Neff
6fb1e1f524
Bump jwt 2018-11-17 21:05:42 +01:00
Benjamin Neff
2210cf0038
Bump timers 2018-11-17 21:05:42 +01:00
Benjamin Neff
e1d65d50ab
Bump rack-oauth2 2018-11-17 21:05:41 +01:00
Benjamin Neff
5960b33df0
Bump nio4r 2018-11-17 21:05:41 +01:00
Benjamin Neff
72112f8bd7
Bump jsonpath 2018-11-17 21:05:41 +01:00
Benjamin Neff
f3568d9fb3
Bump http 2018-11-17 21:05:41 +01:00
Benjamin Neff
9b435f67de
Bump get_process_mem 2018-11-17 21:05:41 +01:00
Benjamin Neff
37ec02dbd0
Bump domain_name 2018-11-17 21:05:41 +01:00
Benjamin Neff
7f67d007a0
Bump bindata 2018-11-17 21:05:40 +01:00
Benjamin Neff
514a370f75
Bump mail 2018-11-17 21:05:40 +01:00
Benjamin Neff
b062818289
Bump yard 2018-11-17 21:05:40 +01:00
Benjamin Neff
19556e7d7d
Bump hamlit 2018-11-17 21:05:40 +01:00
Benjamin Neff
63b23056a5
Bump gon 2018-11-17 21:05:40 +01:00
Benjamin Neff
80f57673ab
Bump typhoeus 2018-11-17 21:05:40 +01:00
Benjamin Neff
de5e22a543
Bump faraday 2018-11-17 21:04:37 +01:00
Benjamin Neff
98d165c0c5
Bump acts-as-taggable-on 2018-11-17 21:04:37 +01:00
Benjamin Neff
d8016d39cf
Bump secure_headers 2018-11-17 21:04:37 +01:00
Benjamin Neff
f0eead3659
Bump rails-i18n 2018-11-17 21:04:37 +01:00
Benjamin Neff
eea609a228
Bump rails-assets-utatti-perfect-scrollbar 2018-11-17 21:04:00 +01:00
Benjamin Neff
efa69a23f4
Bump rails-assets-autosize 2018-11-17 21:02:35 +01:00