Frédéric Bolvin
d7abaaced0
implemented new profile photo upload with cropping function
2018-02-16 19:43:32 +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
151a169791
Merge branch 'next-minor' into develop
2017-12-25 20:55:27 +01:00
Benjamin Neff
ba85f35ae9
Merge branch 'release/0.7.2.0' into next-minor
2017-12-25 20:55:22 +01:00
Benjamin Neff
e0eb76eb2a
Remove aspect_ids parameter from publisher
...
closes #7683
2017-12-25 20:54:10 +01:00
Benjamin Neff
70c659192f
Fix default aspects on profile page and bookmarklet publisher
...
Fixes #7679
2017-12-25 20:54:05 +01:00
Benjamin Neff
fb084e47af
Merge branch 'next-minor' into develop
2017-12-24 02:50:36 +01:00
Benjamin Neff
53b7dcd8ca
Merge branch 'release/0.7.2.0' into next-minor
2017-12-24 02:50:28 +01:00
Benjamin Neff
d59b5b2df7
Fix birthday notification mail
...
Fixes #7681
closes #7682
2017-12-24 02:50:19 +01:00
Benjamin Neff
c3c0059734
Merge branch 'next-minor' into develop
2017-12-18 04:57:11 +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
flaburgan
53603917eb
Fix deformed hovercards avatar
...
closes #7656
fixes #6039
2017-12-18 04:40:13 +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
7c4648030f
Run rake directly without xvfb on travis
...
closes #7654
2017-11-01 00:46:36 +01:00
Benjamin Neff
4e267bb1ef
Use configure_bundler script on travis
2017-11-01 00:45:22 +01:00
Benjamin Neff
a14115119c
Add script/configure_bundler to set correct bundler options
2017-11-01 00:45:22 +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
6351399197
Merge branch 'next-minor' into develop
2017-10-27 02:27:11 +02:00
Benjamin Neff
70410d1691
Ignore invalid diaspora:// links
...
Fixes #7651
closes #7652
2017-10-27 02:26:52 +02: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
30a940f483
Merge branch 'next-minor' into develop
2017-10-20 02:56:20 +02:00
Benjamin Neff
4bf0a74382
Merge branch 'release/0.7.1.0' into next-minor
2017-10-20 02:56:16 +02:00
Benjamin Neff
0f688b9d73
Group notifications by updated_at
...
The notifications need to be grouped by the same date as they are
sorted, otherwise the date used for the group doesn't match all
timestamps in the group and also the groups are sorted by the wrong
date.
This fixes #7647 , a regression of #7568 .
closes #7648
2017-10-20 02:56:06 +02:00
Benjamin Neff
cae06d95ea
Merge branch 'next-minor' into develop
2017-10-20 01:25:37 +02:00
Benjamin Neff
f7349457d3
Merge branch 'release/0.7.1.0' into next-minor
2017-10-20 01:25:33 +02:00
Benjamin Neff
c9423bfdd2
Add some progress indicators to the account deletions rake task
...
[ci skip]
closes #7646
2017-10-20 01:25:28 +02:00
Benjamin Neff
66095e3f03
Merge branch 'next-minor' into develop
2017-10-18 01:08:48 +02:00
Benjamin Neff
31559ce483
Merge branch 'release/0.7.1.0' into next-minor
2017-10-18 01:08:35 +02:00
Benjamin Neff
9673f45ff9
Cleanup empty signatures
...
Some relayables from redmatrix and hubzilla have empty signatures. They
are invalid and break therefore the user data export.
closes #7644
2017-10-18 01:08:26 +02:00
Benjamin Neff
d6bec055e7
Merge branch 'next-minor' into develop
2017-10-17 01:39:46 +02:00
Benjamin Neff
1ac0dfbbbc
Merge branch 'release/0.7.1.0' into next-minor
2017-10-17 01:39:39 +02:00
cmrd Senya
2e9c6f46dc
Clean up invalid contacts from the DB
...
Cleans invalid contacts where the referenced user was deleted from the DB or where
the referenced person owner was deleted from the DB.
closes #7632
2017-10-17 01:39:22 +02:00
cmrd Senya
ad025850ce
Forbid user destruction
2017-10-17 01:38:36 +02:00
cmrd Senya
973e9d98c6
Raise sensible error message when user is missing
...
That's for the case when podmin has messed up the database
2017-10-17 01:38:36 +02:00
cmrd Senya
f212b51f7f
Check for user existence on aspect membership destruction
2017-10-17 01:38:36 +02:00
Benjamin Neff
a36d22d72b
Handle duplicate account migrations
...
closes #7641
2017-10-17 01:36:25 +02:00
Benjamin Neff
2bd9c663c5
Add rake task to rerun failed account deletions
...
closes #7639
2017-10-17 01:33:43 +02:00
Benjamin Neff
6d5647ec11
Handle duplicate account deletions
2017-10-17 01:32:14 +02:00
Benjamin Neff
b920ddbff5
Move special and ignored associations to tests
2017-10-17 01:32:14 +02:00
