Commit graph

1635 commits

Author SHA1 Message Date
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
goobertron
2668c487e7 Remove dupe line from en.yml [ci skip]
closes #5951
2015-05-12 14:20:03 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags
closes #5945
2015-05-12 04:00:07 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Steffen van Bergerem
06e6e1db78 Remove private post content of also commented mails
merges #5931
2015-05-07 04:10:21 +02:00
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Jonne Haß
8e2278b80d Merge branch 'release/0.5.0.0-RC' into develop 2015-05-03 15:43:55 +02:00
Jonne Haß
260a10b2f2 updated 60 locale files [ci skip] 2015-05-03 15:43:35 +02:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect
Use Bootstrap modal for new aspect form
2015-04-20 22:34:51 +02:00
Jonne Haß
85c376e591 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7 Update aspect edits text, reorder posting section
First iteration to update Help section

Changes from Fla
2015-04-19 15:57:21 +02:00
Jonne Haß
b3575ab56f Merge branch 'release/0.5.0.0-RC' into develop 2015-04-14 15:42:33 +02:00
goobertron
a687a8dc01 Update help text for renaming an aspect 2015-04-14 15:40:58 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content
Limited post content excluded from subject of comment email
2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c Limited post content excluded from subject of comment email 2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Steffen van Bergerem
7870f3b127 Contacts page: remove broken title from 'Start a conversation' button 2015-04-01 00:47:31 +02:00
Jonne Haß
331f4ed988 updated 80 locale files [ci skip] 2015-03-27 11:44:44 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
flaburgan
ef977a170f Replace Make Something text by the diaspora ball logo on registration page
Add ball.svg to /graphics
2015-03-26 00:32:41 +01:00
Jonne Haß
42977333c4 fix javascript pluaralization rules 2015-03-23 20:53:52 +01:00
Jonne Haß
d4d68b10cc update plural rules 2015-03-23 19:27:38 +01:00
Jonne Haß
cb1203d36e updated 105 locale files [ci skip] 2015-03-23 15:51:27 +01:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll
Display reshared poll
2015-03-15 20:45:51 +01:00
Steffen van Bergerem
81cd1753e4 Improve link to original post in reshared polls 2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f disable poll voting for reshared post 2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8 fix too long tag name #5737 2015-03-15 16:15:33 +02:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Jonne Haß
e46a77ba19 Merge pull request #5706 from aka001/help_section
Update the help section #5698
2015-02-27 15:57:12 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Akash Agrawall
e85cb7b373 Help_section_update_keyboard_shortcut 2015-02-27 16:36:11 +05:30
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00
Jonne Haß
a19b91083e Merge pull request #5643 from aka001/5564_lock_account
Lock account #5564
2015-02-19 03:43:38 +01:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
flaburgan
2b19b4bfc9 Remove #sign-up-text, change placeholder text to lower-case, fix tests 2015-02-19 00:07:41 +01:00
flaburgan
1c231f3171 refactoring of the public pages design 2015-02-18 22:45:46 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Jonne Haß
f980eba0a3 add a missing translation 2015-02-14 12:43:48 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Jonne Haß
604d2b7a39 Merge pull request #5634 from svbergerem/remove-photo-export
Remove photo export from settings
2015-02-07 21:10:33 +01:00
Jonne Haß
02071fcf51 updated 95 locale files [ci skip] 2015-02-07 20:33:43 +01:00
Steffen van Bergerem
7e5f5964e9 Remove photo export from settings 2015-02-07 14:59:18 +01:00
Steffen van Bergerem
8b33b9eb18 Merge pull request #5602 from Faldrian/more-shortcuts
Add shortcuts for reshare, expand Post and open first link in a post

Conflicts:
	config/locales/diaspora/en.yml
2015-02-07 14:41:56 +01:00
goobertron
42cd2337be Amend all text strings in en locales to use sentence case
Adapt cukes to work with new capitalisation rules
2015-01-31 17:44:57 +00:00
Faldrian
099974ddef Add shortcuts for reshare, expand Post and open first link in a post 2015-01-28 16:19:18 +01:00
Marco Colli
eccab62e32 Allow user to enable / disable notifications for a post from stream #5350 2015-01-25 18:40:47 +01:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00