Commit graph

120 commits

Author SHA1 Message Date
Steffen van Bergerem
64773d883e Add permalink for stream elements 2015-10-06 23:29:09 +02:00
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
realtin
15b186518c add moderators to report email recievers
and refactor coding style according to pull request comments

(#5324)
2015-09-07 12:31:25 +02:00
Steffen van Bergerem
7e9a88573b Merge pull request #6325 from AugierLe42e/add-toggle-mobile-menu
Add 'Toggle mobile' item to menu + minor styling
2015-08-27 22:58:00 +02:00
Florian Staudacher
ea397ffdfb Add connection test for pods in the network
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
2015-08-24 22:04:53 +02:00
augier
a7bd029526 Add 'toggle mobile' item to menu + minor styling 2015-08-23 13:53:05 +02:00
Dennis Schubert
23c83b9447 Merge branch 'stable' into develop 2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0 Fix conversations view with no contacts
closes #6266
2015-07-29 12:08:35 +02:00
Steffen van Bergerem
8f27e8fae8 Improve wording for admin dashboard 2015-07-21 20:43:18 +02:00
Steffen van Bergerem
484e70a68f Add dashboard to admin page 2015-07-21 14:36:41 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +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
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02: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
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +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
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
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01: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
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
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
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
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
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
Hincu Petru
2d3933ccd8 Rewrite poll creation inputs 2014-04-06 15:01:18 +00: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
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01: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
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