Jonne Haß
0c5cc216c6
Replace vaild with valid
...
Thanks to Josias for the hint
2014-05-24 17:24:36 +02:00
Lukas Matt
218845d5b4
Changed and renamed database columns
...
* changed user_id type to integer
* renamed post_id to item_id
* renamed post_type to item_type
2014-05-15 07:23:44 -04:00
Lukas Matt
6f65ef8437
Using save for report model
...
Instead of checking the status code I am using success and
error callbacks from model-save. In that case we have to return
json in the controller for signaling that the request was sucessfully.
2014-05-15 07:23:43 -04:00
Lukas Matt
8b8a232b17
Added diaspora copyright
2014-05-15 07:23:43 -04:00
Lukas Matt
045ced0518
Joined if statements and removed duplicated code
2014-05-15 07:23:43 -04:00
Lukas Matt
512d96bda6
Display validation errors to user
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
719edcd1a7
Added missing action in report controller
2014-05-15 07:23:43 -04:00
Lukas Matt
2e36f8d375
Diaspora review part 1
...
* join the conditions of the inner ifs
* add a uniqueness constraint to the model
* differentiate between author is a local or a remote user
* simplify controller/mailer functions
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
Jason Robinson
356096a7eb
Merge pull request #4836 from MrZYX/message_renderer
...
Introduce message renderer
2014-04-13 15:00:46 +03:00
Hincu Petru
2311b761e1
Redirect to stream_path if is destkop
2014-04-08 09:34:14 +00:00
Jannik Streek
c484b2cd0c
fixed poll icon issue, improved code, poll in bookmarklets now available
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
e4c68a4edb
improved status messages controller 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
04199837b3
poll creation done
2014-03-31 18:14:07 +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
Steffen van Bergerem
eabdc7390c
Port aspect membership dropdown and hovercards
2014-03-19 17:54:22 +01:00
Steffen van Bergerem
f217a5bc11
Add filters to notifications controller
2014-03-19 17:54:22 +01:00
Jonne Haß
d4e046ecbc
Merge pull request #4787 from hincupetru/4726-infinite-photo-stream
...
Added limit by max_time to photos#index for prevent "infinite photo stream"
2014-03-15 19:07:48 +01:00
Jonne Haß
8280556a47
Introduce message renderer
...
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
2014-03-15 17:16:17 +01:00
Hincu Petru
e0b23b2dc4
Fixed #4726 infinite photo stream
2014-03-12 22:22:24 +00:00
Steffen van Bergerem
0cc3b10b1f
port publisher and bookmarklet to bootstrap
2014-03-10 15:15:40 +01:00
Fabian Rodriguez
8d8d3c649a
remove aspect sorting logic
2014-02-23 16:48:47 +01: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
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
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
Jonne Haß
42f790fa13
Merge pull request #4666 from jaywink/signup-form-error-redirect
...
Instead of redirect on signup form validation, render new
2014-01-11 14:08:18 -08:00
Jason Robinson
35ece9d65f
Instead of redirect on signup form validation, render new with submitted data.
2014-01-06 22:12:07 +02:00
maruf
c17a474142
Simple captcha for signup page
2014-01-06 22:00:37 +02:00
Steffen van Bergerem
55b967caf9
remove participants popover + improve conversations menu
2014-01-01 21:58:56 +01:00
Steffen van Bergerem
24310fe5a9
change layout
2013-12-15 20:14:55 +01:00
Steffen van Bergerem
c11b744a7f
port conversations view to bootstrap
2013-12-15 13:01:24 +01:00
Fabian Rodriguez
c12a45556d
fix #2645
...
* refactor a bit #weekly_user_stats
* pass 0 instead of "" to i18n
* use the first week if none is provided
2013-12-13 19:32:04 -02:00
Jonne Haß
c660c90091
Merge pull request #4612 from diaspora/drop_spv_old_code
...
Drop spv old code
2013-12-11 07:41:51 -08:00
Jason Robinson
2c83d0e846
Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings.
2013-12-02 22:35:18 +02:00
Fabian Rodriguez
92db8cb929
remove #next and #previous from posts_controller
2013-12-01 20:55:48 -02:00
Florian Staudacher
1c4ad0986c
refactor message creation (conversations)
2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e
refactor conversations_controller#create
2013-10-10 21:42:46 +02:00
Florian Staudacher
260d86d501
refactor ConversationsController, move query builing to User model
2013-09-30 01:44:57 +02:00
Steffen van Bergerem
324b09a72a
add help page
2013-08-26 15:26:18 +02:00
Jonne Haß
f9a3990562
do not leak photos through photos#show
2013-08-26 09:39:39 +02:00
Jonne Haß
1b7bc02eee
Merge pull request #4410 from rogerbraun/feature/spv-redesign
...
New single post view
Conflicts:
app/assets/stylesheets/application.css.sass
2013-08-22 10:37:25 +02:00
Jonne Haß
0012a82f48
add the footer to the SPV
2013-08-22 09:56:36 +02:00
flaburgan
d63dc9f0a5
Add images, fix layout rendering
2013-08-22 09:56:34 +02:00
flaburgan
abba8d8dfc
Add header to the single post view
2013-08-22 09:56:34 +02:00
Jonne Haß
554d0a93d0
Do not leak photos in the profile sidebar
2013-08-20 20:56:37 +02:00
