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

2225 commits

Author SHA1 Message Date
Augier
f14ad5ce35 Fixes the header problem rendering statistics page 2015-01-25 13:24:19 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01: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
Jonne Haß
9c99ae357a Merge pull request #5493 from collimarco/solved5341 2015-01-06 14:43:58 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Marco Colli
8dea4b5fd9 Solve #5341 2014-12-24 11:52:12 +01:00
Marco Colli
76cc5e2d5c Add ActiveRecord::RecordNotFound catching. Add tests. 2014-12-22 12:36:09 +01:00
Marco Colli
d75071bac9 Solve #5348 2014-12-20 19:09:33 +01:00
Dennis Schubert
7b0cff3250 Merge pull request #5488 from Faldrian/5240-fix_async_searchresults_blueprint 
Set refresh_search async searchresults load to use bootstrap
Fix #5240
 2014-12-20 04:55:25 +01:00
Faldrian
43fd6e7ed6 Set refresh_search async searchresults load to use bootstrap 2014-12-20 03:58:20 +01:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Lukas Matt
24e1732256 Implement token authentication 
* create a new token on a new session
* delete the current token on session exit
 2014-11-13 11:27:56 +01:00
Lukas Matt
ae582e4543 Add toggle_chat_privilege to aspect controller 2014-11-13 11:24:07 +01:00
Jonne Haß
30de98cf3e Merge pull request #5335 from svbergerem/paginate-contacts 
Paginate contacts
 2014-11-09 19:04:07 +01:00
Jonne Haß
f532efeac5 Merge pull request #5276 from svbergerem/reshare-absolute-root 
Reshare the absolute root of a post

Conflicts:
	Changelog.md
 2014-10-14 19:40:35 +02:00
Jonne Haß
0a20d6a2b7 Merge pull request #5316 from gdpelican/feature/allow-nil-http-agent 
Allow nil HTTP user agent
 2014-10-14 13:22:28 +02:00
Jonne Haß
8a63f6f1f7 Merge pull request #5317 from gdpelican/feature/strip-search-query 
Feature/strip search query
 2014-10-14 13:19:36 +02:00
Steffen van Bergerem
8cc5847aec Paginate contacts 2014-10-11 22:21:31 +02:00
Roy McKenzie
258959e1c2 Updated Weekly User Stats page to show the most recent week. Page should show most recent information 2014-10-10 19:12:37 -07:00
Steffen van Bergerem
8ca5ca7c92 Reshare the absolute root of a post 2014-10-10 03:12:07 +02:00
James Kiesel
206ec99f8f Strip search query of leading & trailing whitespace 2014-10-09 23:34:11 +13:00
James Kiesel
2d44107b5d Allow nil HTTP user agent 2014-10-09 23:08:33 +13:00
Steffen van Bergerem
d04cf7046b Fix pagination for people/guid/contacts 2014-10-07 10:55:58 +02:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
6e1bd7216d fix /u/[username] route 2014-09-18 00:23:43 +02:00
Florian Staudacher
89d468cdcc first round of specs and code cleanups/fixes 2014-09-15 01:37:23 +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
9a16560d8d * rename profile header view to make name more accurate 
* include 'js-routes' for rails routes in javascript
  (TODO: config options?)
* add handlebars helper for rails routes
 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
ba0bccbef1 Redirect conversations/new to conversations 2014-09-01 17:11:56 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
Jonne Haß
1515848120 Merge branch 'release/0.4.1.0' into develop 
Conflicts:
	app/controllers/conversations_controller.rb
	spec/controllers/conversations_controller_spec.rb
 2014-08-30 20:09:08 +02:00
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
Steffen van Bergerem
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +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
Steffen van Bergerem
9587961883 Display all contacts in the contact list 2014-08-26 21:41:02 +02:00
Steffen van Bergerem
6461135bfd Redesign contacts page 2014-08-26 19:18:32 +02:00
Jonne Haß
541d5580e0 Fix loading issues in rails_admin 
Properly declare Admin module and explicitly list models to be
display in rails_admin
 2014-08-26 02:57:47 +02:00
Jonne Haß
cb6c79a885 Merge pull request #5151 from khall/issue_5090 
Fix for issue 5090
 2014-08-26 01:14:45 +02:00
Jonne Haß
ef214d7681 bump http_accept_language 2014-08-25 22:06:28 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
khall
6d56a6fbac Updating with jhass's code change. Still looking into Travis failure... 2014-08-24 16:01:59 -07: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ß
01c4fa18d3 fix and stablize some cukes 2014-08-24 01:02:35 +02:00
Jonne Haß
d6d65cd0fd apply rails 4 todos and fix specs after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
d070f19243 make rspec and jasmine pass with the new code 2014-08-23 16:47:57 +02:00
Jonne Haß
35b17d8c4f Do not call self-modifying Enumerable methods on AR::Relation objects 2014-08-23 16:38:57 +02:00
Jonne Haß
da9c1db14f before_action 2014-08-23 16:38:57 +02:00
Niall Paterson
f33038f105 updated before_filters to before_actions as recommended for rails 4 2014-08-23 16:34:01 +02:00
Jonne Haß
244388fcb5 make aspect membership controller specs green 2014-08-23 16:34:01 +02:00
Jonne Haß
09f0665225 replace deprecated usages for all 2014-08-23 16:34:01 +02:00
Jonne Haß
2f1193fa36 Fix "prepared statements" errors 
See https://coderwall.com/p/45ombq
 2014-08-23 16:34:00 +02:00
Jonne Haß
33c3b38f2f replace deprecated finder and finder_options syntax 2014-08-23 16:34:00 +02:00
Steffen van Bergerem
987c982bb5 Fix mobile sign in page regression 2014-08-21 22:19:14 +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
jaideng123
6456a441fe Modified behavior of mark all as read button 2014-08-17 10:12:23 -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
Jonne Haß
0127852936 Merge pull request #5112 from svbergerem/login-redesign 
Redesign login page

Conflicts:
	Changelog.md
 2014-08-15 11:44:05 +02:00
Steffen van Bergerem
0d064cbefe Redesign login page 2014-08-15 00:46:20 +02:00
Błażej Pankowiak
2424301112 Port Community Spotlight to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
0ad658f98c Port main Contact page to Bootstrap 2014-08-14 21:09:57 +02:00
Pablo Cuadrado
9c5b9b8767 :only keyword added to the layout calls 2014-08-14 04:49:50 -03:00
Pablo Cuadrado
c6511c9299 services edit page ported to bootstrap 2014-08-14 04:49:50 -03:00
Pablo Cuadrado
9e34887712 profile edit page ported to bootstrap 2014-08-14 04:49:49 -03:00
Pablo Cuadrado
855597541a user account edit page fully ported to bootstrap 2014-08-14 04:49:49 -03:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
Błażej Pankowiak
0d0ed4db28 Port Getting Started page to Bootstrap 2014-07-04 18:06:49 +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
Maxwell Salzberg
cc53e1762b A podmin can now disable a spam account from the interface. 2014-07-01 17:51:39 +02:00
Pablo Cuadrado
14fbd7b205 help page ported to bootstrap 2014-07-01 05:56:49 -03: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
Erwan Guyader
48a3909fe0 Set mention notification as read when viewing post 
- If a mention for the current user and the displayed post exists,
    mark it as read
  - Use set_read_state instead of manually setting unread as false
 2014-06-19 00:15:55 +02:00
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