nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17717 commits 4 branches 0 tags 121 MiB
Commit graph

1736 commits

Author SHA1 Message Date
Steffen van Bergerem
676c0ab611 Add missing translation for lock account 2015-06-04 18:05:44 +02:00
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
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01:00
James Kiesel
7bbd9138de Fix bad email formatting 2015-01-20 16:51:08 +13:00
Marcelo Briones
63eca447d0 Strip EXIF data as user preference 2015-01-18 10:28:28 -03:00
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Marcelo Briones
fe6052865c Remove limited content from email notifications 2014-12-28 22:15:47 -03:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
Jonne Haß
3000d86d57 Merge pull request #5475 from svbergerem/tag-page-improve-wording 
Improve wording for tagged people on tag page
 2014-12-17 16:46:09 +01:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Steffen van Bergerem
a5068259bb Improve wording for tagged people on tag page 2014-12-15 18:08:53 +01:00
Steffen van Bergerem
f6fbbbb5f6 Move tag prefill to Backbone, add tests 2014-11-30 17:14:05 +01:00
taro-k
b01026f9b8 pre-fill tag page form with the tag #4234 2014-11-30 14:15:45 +01:00
Adrián Chaves Fernández (Gallaecio)
1e240a6462 Updated the Galician (gl) translation 2014-11-30 02:00:52 +01:00
Laurent PERON
9661d00ec8 issue #5430 : message added 2014-11-28 10:31:47 +01:00
Faldrian
4dbf42d970 added different behaviour depending on existence of posts 2014-11-16 15:06:08 +01:00
Faldrian
21806a2c9b mobile more-link only if there may be a next page; added message for end of stream 2014-11-16 01:43:55 +01:00
Lukas Matt
556190b154 Add locales for chat privilege function 2014-11-13 11:32:34 +01:00
Jonne Haß
7e46502bf9 Merge pull request #5353 from goobertron/ac_removal_mail 
Reword account removal email notification
 2014-11-09 18:58:19 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
goobertron
4b7761e52a Clarify explanation of account deleteion process 2014-10-20 20:15:38 +01:00
goobertron
797f7eae8d Reword account removal email notification 2014-10-17 14:49:25 +01:00
Jason Robinson
69c3566958 Maintenance feature to remove old users 
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
 2014-10-16 22:53:08 +03:00
Jonne Haß
061dfab00b updated 83 locale files [ci skip] 2014-10-12 15:20:20 +02:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view 
Redesign profile page and port to Bootstrap
 2014-10-06 15:09:08 +02:00
Brandon
805e476c34 Fixed typo 
From "Seams" to "Seems"
 2014-10-01 06:41:25 -04:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
1f724dd123 * add a (hash)tag helper for handlebars 
* re-add stream on profile page
* more controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc * refactored text direction detector into helper (also for handlebars) 
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
 2014-09-15 01:37:23 +02:00
Florian Staudacher
0092c9c483 * create a handlebars view for the profile header 
* unblock the user via ajax
 2014-09-15 01:37:23 +02:00
Florian Staudacher
fba3092c61 * cleanup people_controller#show, add people_controller#stream for json 
* introduce new presenters and extend the functionality of the BasePresenter
* add a handlebars template for the profile sidebar, render it everytime we need to update
* introduce a 'aspect_membership:update' global event
 2014-09-15 01:37:23 +02:00
Jonne Haß
aa09f0cbb1 Merge branch 'release/0.4.1.0' into develop 2014-09-03 23:38:27 +02:00
Jonne Haß
b424b94660 updated 45 locale files [ci skip] 2014-09-03 23:14:23 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Steffen van Bergerem
f1408a7a09 Add contacts search and port aspect membership save/destroy to backbone 2014-08-26 21:41:11 +02:00
khall
a9fd16db3e Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long. 2014-08-24 13:28:57 -07:00
Jonne Haß
ae24495c7d Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts 
Remove ignored peoples posts without refresh (II)
 2014-08-18 11:35:56 +02:00
Jonne Haß
ec02f54613 Merge pull request #5122 from jaideng123/5113-mark-as-read-by-filter 
Added Mark all in filter as read feature
 2014-08-18 11:30:18 +02:00
jaideng123
406397988b Made wording more clear, refactored read_all 2014-08-17 11:16:30 -05:00
Jason Robinson
e58f0b2ad4 Terms of service and privacy policy feature. 
If enabled, terms of service link will be shown in sign up page.
 2014-08-17 17:44:44 +03:00
Florian Staudacher
4fd9bae056 refactor global event broker and user blocking from stream posts 2014-08-17 14:05:56 +02:00
op48
66fcfcfcbc Ignoring validation for last poll answer input 
last input field is only deleted if there are more than three input fields and the last one is empty

poll is validated only if the last input is empty, and the first three have been filled

Removed duplicate remove last answer.

Dont need to check that the last value is populated as we are ignoring last value

Fixing poll step

Placeholder text edited

Fixed translations for poll answer placeholder text

Removed numbers on publisher option

Removed numbers in placeholder for poll answers
 2014-08-13 13:40:14 +01:00
Faldrian
d52737664b removed non-english translations 2014-08-03 12:55:43 +02:00
Faldrian
6be6d6d504 corrected english translation 2014-08-02 00:34:02 +02:00
Faldrian
a2a37742e4 added keyboard shortcut help topic 2014-08-01 22:13:55 +02:00
MrFrety
686a8776a5 Minor edit: Plural s 2014-08-01 17:13:38 +02:00
Adrián Chaves Fernández (Gallaecio)
125a60f9f5 Updated the Galician (gl) translation 2014-07-27 09:33:50 +02:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend 
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
 2014-07-01 23:33:15 +02:00
Pablo Cuadrado
45d04a44ea added title_header key for the Help header, only for EN lang so far 2014-07-01 06:19:29 -03:00
Jonne Haß
d3ac1dbf90 updated 77 locale files [ci skip] 2014-06-22 15:08:40 +02:00
Jason Robinson
ad0982f35e Remove custom bookmarklet error message. 
Flash error is shown on bookmarklet post error. On error, return post_something message to form
 2014-06-01 15:37:54 +03:00
Jason Robinson
6fd4894997 Add error flash message to publisher on error from server 2014-06-01 13:21:45 +03:00
Jonne Haß
bdaa32e70d updated 83 locale files [ci skip] 2014-05-17 11:52:31 +02:00
Lukas Matt
6d6ebd297e Do not try to render posts/comments which are not present 
refs diaspora/diaspora#4959
 2014-05-16 09:48:14 -04:00
Lukas Matt
7ef802127e Added confirm-dialog to report-delete-button 
* changed button description
* replaced links with buttons
 2014-05-15 07:23:44 -04:00
Lukas Matt
1a0c9f5983 Make report-type translatable 2014-05-15 07:23:43 -04:00
Lukas Matt
26d0c81dae Added the ability to disable report-email-notification 
Podmin can see a extra checkbox in Settings > Account
for disabling report-email-notification
 2014-05-15 07:23:43 -04:00
Lukas Matt
ed96ddac98 Display status when the user send a report 2014-05-15 07:23:43 -04:00
Lukas Matt
1748d3b940 It is now possible to report comments 
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec

refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
 2014-05-15 07:23:43 -04:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
goobertron
63abe9055b Reorder items on settings page and improve wording 
Update cukes to be text-independent
Update changelog
 2014-04-08 00:28:25 +01:00
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00:00
Jonne Haß
6ba6ecf3f2 updated 138 locale files [ci skip] 2014-04-03 20:12:30 +02:00
Jannik Streek
6f3844b73b fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form 2014-03-31 18:14:08 +02:00
Jannik Streek
4174b88987 percentage result round + minor language fix 2014-03-31 18:14:08 +02:00
Jannik Streek
9c24365fde changed poll result + some minor text improvements 2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9 finalized voting design + some design fixes + improved code 2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02:00
Jannik Streek
18a43295b7 poll form completed 2014-03-31 18:14:06 +02:00
Jannik Streek
8a4f833d1d added more tests for the poll federation + fixed broken rspec tests 2014-03-31 18:14:06 +02:00
Jannik Streek
dfbe17d046 Poll input fields and data model now available 
question field of poll now in db

fixed merge issues
 2014-03-31 18:14:06 +02:00
Sharif Olorin
fc394c3981 Patch grammar in admin interface 2014-03-25 02:36:10 +11:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01:00
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
Jonne Haß
e5465728d7 Merge pull request #4809 from Gallaecio/gl 
Updated the Galician (gl) translation
 2014-02-23 16:21:30 +01:00
Adrián Chaves Fernández (Gallaecio)
b37d008849 Updated the Galician (gl) translation 2014-02-23 16:06:33 +01:00
goobertron
3c2b0a44d4 Update English locales to diaspora* instead of Diaspora. 2014-02-20 17:48:17 +00:00
goobertron
2a145e67ab Update design of forgot_password and change_password forms 
Fix redirect to stream, make labels lower-case

Fix cuke
 2014-02-09 15:48:06 +00:00
goobertron
7bcea07b99 Standardise - code refs to 'messages' to 'conversations' 2014-02-09 15:44:12 +01:00
goobertron
c12efdf5e6 Changing text messages -> conversations 2014-02-09 15:44:10 +01:00
Jonne Haß
ecd8a8200b Merge pull request #4754 from svbergerem/small-improvements-spv 
SPV small improvements
 2014-02-09 14:26:41 +01:00
Jonne Haß
d27c6a8305 updated 31 locale files [ci skip] 2014-02-09 12:31:00 +01:00
Steffen van Bergerem
97f1c286f4 improve reshared posts 2014-01-31 22:48:40 +01:00
Steffen van Bergerem
655fbfcd79 Fix timeago on mobile devices. Fix missing space 2014-01-30 10:15:14 +01:00
Adrián Chaves Fernández (Gallaecio)
672686a72d Fixed typo: ‘[…] your password, If it was […]’ → ‘[…] your password. If it was […]’. 2014-01-25 08:56:55 +01:00
Adrián Chaves Fernández (Gallaecio)
e9b5da1741 Updated the Galician (gl) translation. 2014-01-25 08:55:13 +01:00
Steffen van Bergerem
7519fcc255 Remove unused cubbies code 2014-01-24 08:58:47 +01:00
Jonne Haß
9ea6e9c166 Merge pull request #4517 from Zauberstuhl/report_post_feature 
Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb
 2014-01-20 10:03:45 +01:00
Jonne Haß
18a2b6c0d3 updated 158 locale files [ci skip] 2014-01-19 19:18:14 +01:00
Jonne Haß
dae69f9558 Merge pull request #4662 from Raven24/update_underscore-backbone 
update backbone.js and underscore.js
 2014-01-17 03:24:46 -08:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem 
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
 2014-01-16 23:23:30 +01:00
goobertron
0b0d0000fe Remove alpha references to invites and buggy software 2014-01-16 18:51:39 +00:00
Lukas Matt
5c9a3aaf3e Added post report feature 
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
 2014-01-14 15:00:55 -05:00
goobertron
a1ac848d62 Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting) 2014-01-12 20:02:33 +00:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00