Commit graph

341 commits

Author SHA1 Message Date
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
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
Jannik Streek
d0a77ce6b3 design for poll participation implemented, saving works as well 2014-03-31 18:14:07 +02:00
Jonne Haß
3a616469f4 Merge pull request #4707 from goobertron/improved_new_password
New reset password form

Conflicts:
	Changelog.md
2014-02-10 01:35:37 +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
Richard
1561690303 moved call to help backbone view init to separate file included only on faq view.
extending loaded js locales.

cleaned up unused routes. removed some comments. loading help locales only on help view.

removed afterRender from backbone views. extended load_javascript_locales method to take a section.
2014-02-09 16:00:15 +01:00
Richard
da6b037f24 highlighting menu items when clicked. collapsing questions and answers on the static content help sections.
removed unused help haml templates.

put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them.

using locales text for help section headers.
2014-02-09 16:00:15 +01:00
Richard
afec5977e9 Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand.
changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later.

deleted some unused views.
2014-02-09 16:00:15 +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
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
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
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
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
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
Jonne Haß
221c1bf959 update all wiki links 2013-06-17 20:00:48 +02:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq.
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
2013-03-21 23:39:07 +01:00
Florian Staudacher
0092acd492 re-add hovercards
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
2012-12-28 22:37:13 +01:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
Jonne Haß
2a4db54db9 New configuration system
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
2012-09-26 20:19:37 +02:00
Jonne Haß
24c1c908f7 remove routes to removed controller 2012-09-22 14:16:28 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Maxwell Salzberg
61f40fc6bf Revert "rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985"
This reverts commit b70165b97f.
2012-08-28 00:19:35 -07:00
Maxwell Salzberg
b70165b97f rails admin is conflicting with client side validations: see https://github.com/sferik/rails_admin/issues/985 2012-08-28 00:07:52 -07:00
Maxwell Salzberg
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00
Maxwell Salzberg
143df27e5a redirect old atom.xml :( [ci skip] 2012-05-16 14:48:01 -07:00
danielgrippi
08fddf7422 raise on hotlinking [ci skip] 2012-05-16 14:41:09 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts
Lazily load post interactions on show page
hella refactorz
2012-05-12 17:41:58 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
Steven Hancock
4c644c336b Actually only load rails admin in production mode
This is what I think 28f8db51e7 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
2012-05-09 11:46:18 -07:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
Dennis Collinson
0fc399243b fix next post and previous post, more efficient
make controller actions
make the presenter reflect that it is instance data ;-p

needs tests lol.
2012-05-04 18:25:09 -07:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
Dennis Collinson
e55073fdd4 temp reverting to prove max wrong.
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"

This reverts commit 78bcb1c321.
2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321 killing rails admin to investigate if its what's causing boot and deploy to be so slow 2012-04-24 16:30:31 -07:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info
Profile show json
Profile backbone model
2012-04-21 13:12:56 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging
max isn't a princess
learn2git
learn2bash
lulz
2012-04-19 14:59:33 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Maxwell Salzberg
c9e3852de8 oembed mostly works 2012-04-18 16:12:56 -07:00
Maxwell Salzberg
b10aedb615 update the iframe route, fix a small styleing thing in newspaper style for iframe view 2012-04-17 22:43:47 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Dennis Collinson
11eb1eb7d8 MS DC fix tests 2012-03-27 14:52:53 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -07:00
Maxwell Salzberg
416b577eca I am a jerk and I told someone to take this out last night fixes #3027 2012-03-20 15:17:41 -07:00
Benjamin Neff
042a125f4d fix legacy routes for old invite links 2012-03-20 03:47:48 +01:00