Jonne Haß
5d549f553b
Escape person name in contacts json
...
jQuery autoSuggest uses .html to insert it into the DOM
2014-08-30 20:06:03 +02:00
jaideng123
6456a441fe
Modified behavior of mark all as read button
2014-08-17 10:12:23 -05: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
Maxwell Salzberg
cc53e1762b
A podmin can now disable a spam account from the interface.
2014-07-01 17:51:39 +02:00
Jason Robinson
831af6507d
Merge pull request #5006 from taratatach/4940-mention-notification-not-marked-as-read-when-viewing-post
...
Set mention notification as read when viewing post
2014-06-27 10:17:01 +03:00
Erwan Guyader
f92dd85748
Set sharing notification as read
...
Fix issue #4951
If the displayed user (on her profile) started sharing with the
current user, mark the notification as read
2014-06-20 10:55:17 +02:00
Erwan Guyader
126252d47a
Add test for mention notifications
2014-06-20 01:23:53 +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
8b8a232b17
Added diaspora copyright
2014-05-15 07:23:43 -04:00
Lukas Matt
ed9cd81504
Fixed put request for Report controller
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
2311b761e1
Redirect to stream_path if is destkop
2014-04-08 09:34:14 +00: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
Hincu Petru
e0b23b2dc4
Fixed #4726 infinite photo stream
2014-03-12 22:22:24 +00:00
MatrixCrawler
3273028ed2
Fix atom feed for reshares of deleted posts.
...
Propose for fix #4638
Added Changelog line
Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed
2014-03-11 21:27:08 +01:00
Steffen van Bergerem
0241d9c7db
use fixture
2014-03-10 17:21:54 +01:00
Jonne Haß
2e8dc8fb61
move PasswordsController specs to the new appropiate location
2014-02-10 10:18:20 +01:00
arlogn
1563d088bc
embedding youtube videos over https
2014-01-30 18:01:27 +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ß
32b9caa08c
replace stub and mock deprecations with doubles
2014-01-13 12:25:38 +01:00
Jonne Haß
df0bff6537
replace stub! with stub
2014-01-13 12:25:37 +01:00
Fabian Rodriguez
08acd6e5bf
bump Timecop
...
Time.now remains the same inside the block, outside of the block it
returns
2014-01-12 23:27:15 +01:00
Jason Robinson
35ece9d65f
Instead of redirect on signup form validation, render new with submitted data.
2014-01-06 22:12:07 +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
Jonne Haß
f9a3990562
do not leak photos through photos#show
2013-08-26 09:39:39 +02:00
Jonne Haß
554d0a93d0
Do not leak photos in the profile sidebar
2013-08-20 20:56:37 +02:00
Oliver Azevedo Barnes
4b516603f7
Fix #4361 twitter access level check breaking facebook addition to user
...
Rewrite twitter access-level check
Fixed tests, still working on getting facebook up
Add heroku example to diaspora.example.yml
2013-08-12 13:17:18 -05:00
Jonne Haß
14c78da6cd
whitelist getting_started as a user settable attribute, fixes #4378
2013-08-11 16:52:54 +02:00
Oliver Azevedo Barnes
452301b34d
Fix #4361 twitter access level check breaking facebook addition to user
2013-08-07 18:59:49 -05:00
Jonne Haß
a2e5f1f88e
Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete
...
#4169 tag search autocomplete
2013-08-06 13:29:12 -07:00
Jonne Haß
efbd3c8605
Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth
...
Issue #4124 Check write access before authorizing Twitter
2013-08-06 21:21:56 +02:00
Oliver Azevedo Barnes
55a58713a5
Issue #4124 Check write access before authorizing Twitter
2013-08-05 13:52:19 -05:00
mokus
df9a42c397
update search controller + serch.js so that autocomplete works
...
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec
Fixed merged conflict in Changelog
update routes and search controller
remove useless except from search controller
Fix indentation in search_controller
2013-08-05 11:49:23 +02:00
Jonne Haß
2055a0aef8
Merge branch 'jflemingprod-feature/4143-port_to_strong_parameters' into develop
2013-08-02 11:44:55 +02:00
James Fleming
e8db2804cb
Fix ProfilesController#update spec for tags.
2013-08-02 11:39:06 +02:00
James Fleming
d6ba6d1b02
Use strong params in photos_controller
...
Add specs to check mass-assignment gotchas in PhotosController.
2013-08-02 11:39:05 +02:00
James Fleming
a0a9f01be1
Remove tests for strong parameters
...
Remove a duplicated test.
2013-08-02 11:38:56 +02:00
James Fleming
938de466f8
Strong parameters for Aspect
2013-08-02 10:09:04 +02:00
carolina
f6fe74aeae
Migration to turn ActivityStreams::Photo to StatusMessage
...
deletes ActivityStream model and all it's references
update migration with the without_protection option to disable mass assignment protection
2013-07-31 15:15:08 +02:00
kevivmatrix
6623e86a5a
private message sending changed to ajax
...
added specs for change in controller
one form of hash used in single line of code
rendering create response on sending message
redirect user to conversation page if message sent successfully
removed deprecated way of rendering file
conversations create for mobile fixed
minor code style change
updated changelog
2013-07-06 14:35:09 +05:30
David Thompson
0cc02fb512
Use InviteEmail worker in InvitationsController create action.
2013-07-01 21:10:56 -04:00
Jonne Haß
521aaf894b
Merge pull request #4255 from netom/4194-mobile-photo-view
...
4194 mobile photo view
2013-06-29 10:06:46 +02:00
Jonne Haß
92d3bb9c69
Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin
...
Admin: find users under the age of 13 (COPPA)
2013-06-29 10:03:59 +02:00
Jonne Haß
94207e844c
Drop weird stop in conversations controller spec
2013-06-27 17:50:44 +02:00
