Commit graph

20301 commits

Author SHA1 Message Date
Benjamin Neff
8a10655f7f
Bump mini_magick 2019-03-30 15:01:01 +01:00
Benjamin Neff
c8bef1077d
Bump fog-aws 2019-03-30 15:01:01 +01:00
Benjamin Neff
da83456660
Bump carrierwave 2019-03-30 15:01:01 +01:00
Benjamin Neff
b7183d7cee
Bump activerecord-import 2019-03-30 15:01:01 +01:00
Benjamin Neff
cd7af6df50
Bump pg 2019-03-30 15:01:01 +01:00
Benjamin Neff
54e44d6d7e
Bump uglifier 2019-03-30 15:01:01 +01:00
Benjamin Neff
a63f11bbf4
Bump sidekiq-cron 2019-03-30 15:01:01 +01:00
Benjamin Neff
7b201f4bb9
Bump sidekiq 2019-03-30 15:01:00 +01:00
Benjamin Neff
f4fa7e10bd
Bump json 2019-03-30 15:01:00 +01:00
Benjamin Neff
23d637b9a1
Bump unicorn 2019-03-30 15:01:00 +01:00
Benjamin Neff
360780c17f
Bump responders 2019-03-30 15:01:00 +01:00
Benjamin Neff
c253272d83
Bump bootstrap-sass 2019-03-30 15:01:00 +01:00
Benjamin Neff
c063f6fa1b
Bump devise 2019-03-30 15:01:00 +01:00
Benjamin Neff
94a32b2833
Bump rails 2019-03-30 15:00:54 +01: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
Dennis Schubert
c30ea112df
Merge branch 'next-minor' into develop 2019-02-19 03:04:13 +01:00
Dennis Schubert
189923040d
Merge branch 'release/0.7.10.0' into next-minor 2019-02-19 03:03:51 +01:00
Dennis Schubert
a3a0a1fba9
Fix incorrect bug number in the changelog
Good one, eh? [ci skip]
2019-02-19 03:03:20 +01:00
Benjamin Neff
d5735c7981
Merge branch 'next-minor' into develop 2019-02-19 01:58:32 +01:00
Benjamin Neff
4687d7e1ea
Start 0.7.11.0 cycle 2019-02-19 01:48:11 +01:00
Benjamin Neff
707e358e48
Merge branch 'next-minor' into develop 2019-02-19 01:30:08 +01:00
Dennis Schubert
e47d0d9675
Replace dandelion.jpg with a public domain photo
Closes #7972

closes #7976
2019-02-19 01:29:52 +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
Dennis Schubert
97805e6602
Merge branch 'next-minor' into develop 2019-01-13 02:17:22 +01:00
Benjamin Neff
2894984f57
Fix order of posts on tags-stream for tags including 'activity'
closes #7959
2019-01-13 02:17:15 +01:00
Benjamin Neff
7ad758a8d9
Merge branch 'next-minor' into develop 2019-01-07 02:04:26 +01:00
Benjamin Neff
71595b4cbd
Start 0.7.10.0 cycle 2019-01-07 02:03:06 +01:00
Benjamin Neff
cf1b0fb414
Merge branch 'next-minor' into develop 2019-01-06 22:32:39 +01:00
Benjamin Neff
654b524397
Fix typo in changelog for 0.7.9.0 2019-01-06 22:27:15 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop 2019-01-06 22:18:48 +01:00
Benjamin Neff
efcaa860ac
Revert "Bump bootstrap-switch-rails"
It looks like 3.3.4 is broken :(

Fixes #7940

This reverts commit 5205e3c526.

closes #7955
2019-01-06 22:16:02 +01:00
flaburgan
3f700c3960
Fix photos galley when too many thumbnails by adding a scroll-x
fixes #7942

closes #7943
2019-01-06 22:12:38 +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
flaburgan
6804132c15
Do not autofollow back a user you are ignoring
fixes #7808

closes #7913
2019-01-06 22:02:10 +01:00
Hank Grabowski
58d2ce7ba6
Ignore Users in Mobile UI
fixes #7840

closes #7884
2019-01-06 21:55:33 +01:00
Hank Grabowski
3080d1c559 Authentication cucumber tests fixed by updating to for new scopes names 2019-01-01 11:05:55 -05:00
Hank Grabowski
ce01946eb0 Fixed new pronto warnings after develop branch sync 2018-12-30 17:04:35 -05:00
Hank Grabowski
89f918c486 Merge branch 'api' of github.com:frankrousseau/diaspora into api 2018-12-30 16:38:02 -05:00
Hank Grabowski
e127502be5 API Branch Final Cleanup Before PR 2018-12-30 22:33:04 +01:00
Hank Grabowski
9c730fc0f3 OpenID Scopes and Security updates 2018-12-30 22:33:04 +01:00
Hank Grabowski
a53495c9aa API Paging library and used in appropriate controllers with full tests 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