Benjamin Neff
494518def1
Remove old message parameter from invite mail
...
closes #7571
2017-08-23 21:55:43 +02:00
Steffen van Bergerem
e39df04dc4
Merge branch 'next-minor' into develop
2017-08-23 21:50:41 +02:00
Benjamin Neff
b530ed0be0
Switch back to mobile-fu
...
closes #7570
2017-08-23 21:50:29 +02:00
Benjamin Neff
697d626269
Merge branch 'next-minor' into develop
2017-08-19 22:41:27 +02:00
Benjamin Neff
2f3ea8c397
Merge branch 'master' into next-minor
2017-08-19 22:41:02 +02:00
Benjamin Neff
7153df5c86
Merge branch 'release/0.7.0.0'
2017-08-19 22:38:38 +02:00
Benjamin Neff
f5fc142f63
Merge branch 'next-minor' into develop
2017-08-19 18:26:14 +02:00
Benjamin Neff
1c753204bc
Merge branch 'release/0.7.0.0' into next-minor
2017-08-19 18:24:43 +02:00
Benjamin Neff
bf47e1bc93
Make sc avaliable
...
Also add "it" as fallback for "oc" and "sc"
2017-08-19 18:23:38 +02:00
Benjamin Neff
3b9848802e
updated 53 locale files [ci skip]
2017-08-19 18:05:00 +02:00
Benjamin Neff
8d5d09521a
Merge branch 'next-minor' into develop
2017-08-19 15:04:14 +02:00
Benjamin Neff
278298e21d
Merge branch 'release/0.7.0.0' into next-minor
2017-08-19 15:04:09 +02:00
Benjamin Neff
4ef0c19ce3
Change order of fields in fill_in_new_user_form
...
The user_email is the first field anyway, and login form as a
user_username field too, so it maybe happens that we already fill in the
user_username filed there before page load finished.
closes #7556
2017-08-19 15:04:04 +02:00
Steffen van Bergerem
680894d121
Merge branch 'next-minor' into develop
2017-08-19 12:39:42 +02:00
Batyr Nuryyev
951a258a3d
no title upon hover on button
...
closes #7551
2017-08-19 12:39:35 +02:00
Steffen van Bergerem
9ffbf2f788
Merge branch 'next-minor' into develop
2017-08-19 12:31:31 +02:00
ivan sebastian
3016280ef1
add jquery are you sure to comment form
...
closes #7530
2017-08-19 12:31:24 +02:00
Benjamin Neff
eb70d24dfa
Merge branch 'next-minor' into develop
2017-08-19 07:39:59 +02:00
Benjamin Neff
7e0cbff4fa
Merge branch 'release/0.7.0.0' into next-minor
2017-08-19 07:39:55 +02:00
Benjamin Neff
50dd7b03d7
Wait for ajax request before checking contacts
...
closes #7554
2017-08-19 07:39:27 +02:00
Benjamin Neff
0ae9dbf77f
Merge branch 'next-minor' into develop
2017-08-17 11:42:15 +02:00
Benjamin Neff
a01cc4dfcb
Merge branch 'release/0.7.0.0' into next-minor
2017-08-17 11:42:11 +02:00
Benjamin Neff
aa8d46da0c
Wait for post to be deleted before continuing
...
closes #7548
2017-08-17 11:42:04 +02:00
Steffen van Bergerem
fdff13e542
Enable tooltips for comment timeagos
...
closes #7547
2017-08-17 11:40:56 +02:00
Steffen van Bergerem
6ae2df2f9e
Fix missing timeagos for comments in the single post view
2017-08-17 11:40:49 +02:00
Benjamin Neff
6569bbaf1f
Merge branch 'next-minor' into develop
2017-08-17 03:36:46 +02:00
Benjamin Neff
685135474b
Merge branch 'release/0.7.0.0' into next-minor
2017-08-17 03:36:38 +02:00
Benjamin Neff
17949ffb4e
Match parameter with match_array to fix order mismatch
...
closes #7546
2017-08-17 03:27:46 +02:00
Steffen van Bergerem
4cb365a6f4
Fix missing photos in the single post view
...
closes #7545
2017-08-17 03:25:31 +02:00
Benjamin Neff
3b6a98b7b4
Merge branch 'next-minor' into develop
2017-08-17 00:51:22 +02:00
Steffen van Bergerem
ff9591aee0
Use gender-neutral forms in comments and specs
...
closes #7544
2017-08-17 00:50:55 +02:00
Dennis Schubert
19a967328d
Merge pull request #7544 from svbergerem/gender-neutral-comments-specs
...
Use gender-neutral forms in comments and specs
2017-08-16 23:56:34 +02:00
Steffen van Bergerem
68145723bb
Use gender-neutral forms in comments and specs
2017-08-16 23:23:34 +02:00
Benjamin Neff
db14b58eeb
Merge branch 'next-minor' into develop
2017-08-16 20:42:30 +02:00
Benjamin Neff
f295da1613
Merge branch 'release/0.7.0.0' into next-minor
2017-08-16 20:42:22 +02:00
Benjamin Neff
b49b33675f
Wait for stream to load and deselect each aspect individually
...
closes #7543
2017-08-16 20:41:13 +02:00
Benjamin Neff
cdc3084990
Wait for stream to load for invitation test
2017-08-16 20:41:05 +02:00
Benjamin Neff
2d06b2865f
Handle when the block to delete doesn't exist
...
closes #7542
2017-08-16 20:40:11 +02:00
Benjamin Neff
a4d1ad160c
Fix stop ignoring from privacy settings and on mobile
...
Fixes #7541
2017-08-16 20:39:58 +02:00
Benjamin Neff
11372035b8
Start 0.8.0.0 cycle
2017-08-15 01:49:51 +02:00
Benjamin Neff
0c1dd195da
Start 0.7.1.0 cycle
2017-08-15 01:45:45 +02:00
Benjamin Neff
ecd4601bac
Remove 0.6.8.0 from Changelog
2017-08-15 01:40:01 +02:00
Benjamin Neff
cbc3900d59
Merge pull request #6750 from cmrd-senya/account_migration_message
...
Account migration model/message
2017-08-15 01:13:43 +02:00
Benjamin Neff
d6225daaf3
Merge pull request #7534 from oneturkmen/enable-mobile-web-app-capable-meta
...
added tag for supporting apps prior to Chrome M39
2017-08-15 00:56:43 +02:00
cmrd Senya
45619cb153
Account migration model and message support
...
This commit introduces support for AccountMigration federation message
receive. It covers the cases when the new home pod for a user is remote
respective to the recepient pod of the message. It also allows to initiate
migration locally by a podmin from the rails console. This will give the
pods a possibility to understand the account migration event on the
federation level and thus future version which will implement migration
will be backward compatible with the pods starting from this commit.
2017-08-15 01:32:34 +03:00
cmrd Senya
e2979df65a
Add explicit mutual contact to test data
...
Add explicit mutual contact creation to the DataGenerator#generic_user_data
which is used in account deletion tests.
2017-08-14 19:15:54 +03:00
Batyr Nuryyev
70dfcd97c5
added tag for supporting apps prior to Chrome M39
...
updates tag to follow standard styleguide
2017-08-14 16:25:42 +03:00
cmrd Senya
8f46073809
Stop disabling Send workers for each example
2017-08-14 13:54:38 +03:00
Benjamin Neff
b447eb6e95
Merge pull request #7538 from SuperTux88/fix-account_deleter
...
Re-add disconnect_contacts in AccountDeleter
2017-08-14 10:28:57 +02:00
Benjamin Neff
a61d5739d4
Re-add disconnect_contacts in AccountDeleter
2017-08-14 04:52:00 +02:00
