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

3501 commits

Author SHA1 Message Date
Jonne Haß
b4e4b7f007 Merge pull request #5325 from gdpelican/feature/fix-change-password-error-message 
Show error message on invalid reset password attempt
 2014-10-14 13:09:02 +02:00
Jonne Haß
e135301642 Merge pull request #5331 from roymckenzie/feature/admin-show-recent-weekly-users 
Most recent new users show on Weekly User Stats admin page
 2014-10-14 13:07:33 +02:00
Steffen van Bergerem
8cc5847aec Paginate contacts 2014-10-11 22:21:31 +02:00
Steffen van Bergerem
42a3e702e6 Fix poll for Bootstrap publisher 2014-10-11 19:18:13 +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
James Kiesel
e2e502ea68 Show error message on invalid reset password attempt 2014-10-11 10:47:00 +13:00
James Kiesel
1400228757 Fix missing password translations 2014-10-11 00:41:52 +13:00
Steffen van Bergerem
4cfe3d7005 Merge pull request #5271 from polsVoice/feature/4901-hoverable-left-menu 
Feature/4901 hoverable left menu
 2014-10-07 22:21:05 +02:00
Steffen van Bergerem
d04cf7046b Fix pagination for people/guid/contacts 2014-10-07 10:55:58 +02:00
Roy McKenzie
1df8f0cf20 Added classes to the body for easier page specific styling. 2014-10-04 17:58:39 -07:00
Brent Bartlett
f9564af0ba moved hoverable class from <li> to <a> 2014-10-02 17:02:15 -07:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +02:00
Florian Staudacher
be86014540 rspec should now be running a green build 2014-09-15 01:37:23 +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
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
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
Florian Staudacher
d00d69814e port profile page to backbone.js 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
0ca59e828a Rounded contact search input 2014-08-29 14:45:16 +02:00
Jonne Haß
7c28921ec7 Merge pull request #5138 from svbergerem/bootstrap-tags-view 
Port tags page to Bootstrap
 2014-08-28 23:12:32 +02:00
Jonne Haß
462198799b Dynamic asset paths everywhere 
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
 2014-08-28 21:04:29 +02:00
Steffen van Bergerem
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +02:00
Jonne Haß
806de6a9ba Merge pull request #5084 from Flaburgan/profile-mobile-improvements 
Improve profile page design on mobile
 2014-08-27 17:48:59 +02:00
Flaburgan
b83295b4e4 Polish conversation view 2014-08-27 14:40:58 +02:00
flaburgan
1dbce6d84d Improve profile page design on mobile 2014-08-27 14:17:05 +02:00
Jonne Haß
f1ab434b18 Merge pull request #5153 from svbergerem/redesign-contacts-page 
Redesign contacts page
 2014-08-27 10:01:41 +02:00
flaburgan
3d793679e0 Add visibilit icons in publisher dropdown aspect 2014-08-26 22:47:41 +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ß
e3dc82bdcd Merge branch 'release/0.4.1.0' into develop 2014-08-26 19:12:14 +02:00
Steffen van Bergerem
5a4697e254 Remove validation.js from mobile sign in page (fix regression) 2014-08-26 19:11:59 +02:00
Jonne Haß
3b3a44b39b Merge pull request #5158 from khall/issue_5044 
Fix for issue 5044
 2014-08-26 01:18:39 +02:00
khall
1d0446fcab Adding tabindex='0' attributes to non-blueprint view elements since blueprint is so last week 2014-08-25 15:50:53 -07:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
khall
049e504ad3 Fix for issue 5044: Adding tabindex attributes for add contact dropdown and contents, also binding keypress event to perform same action that click does. 2014-08-24 21:37:39 -07:00
Jonne Haß
2619beb157 Merge pull request #4481 from diaspora/rails4 
Port to Rails 4
 2014-08-24 13:42:31 +02:00
Jonne Haß
52d5a1cd1a Merge pull request #5141 from svbergerem/mark-read-link-notifications 
Change mark read link on notifications page
 2014-08-24 13:32:32 +02:00
Jonne Haß
feb45a6291 Merge pull request #5135 from goobertron/tos2 
Minor formatting changes to ToS
 2014-08-24 13:30:51 +02:00
Jonne Haß
0a70a125be Remove deprecation warning in blueprint view 2014-08-24 01:02:35 +02:00
goobertron
0f2929a0ce Add strong codes for pod name 2014-08-23 19:40:02 +01:00
Steffen van Bergerem
c18df1c32f Change mark read link on notifications page 2014-08-23 17:42:19 +02:00
Jonne Haß
1b3a2185eb Fix and simplify current_page? check on profile page 2014-08-23 16:38:57 +02:00
Jonne Haß
76c6d95a0e replace deprecated disable_with option 2014-08-23 16:34:01 +02:00
Steffen van Bergerem
d682821f2d Refactor css 2014-08-23 15:45:45 +02:00
goobertron
c8e5b326e5 Minor formatting changes to ToS 2014-08-21 11:36:21 +01: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
c68eeb70fb Added the button changing effect + the ability to read all of a type to mobile 2014-08-17 15:51:37 -05: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
ede042f6cd Make new aspect popup Bootstrap compatible 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
f085436160 Port aspect edit pane to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
2424301112 Port Community Spotlight to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
d0cbde2394 Style aspect controls 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
83b1682750 removed border in tags, checkboxes centered inside the well classes 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
beb795e3b3 elements are centered within the grid 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
a6998c23b7 narrower settings pages 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
39ae80027a profile birthday proportional selects (using responsive classes) 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
1662814333 Narrower content for settings pages (2/3 of available width). 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
2611747875 privacy settings page ported to bootstrap 2014-08-14 04:49:49 -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
Błażej Pankowiak
255b8c02a2 Set top margin only on the body element 2014-08-07 00:15:17 +02:00
Jonne Haß
344cb55b06 Merge pull request #5083 from theatre-x/patch-3 
Change end year
 2014-07-30 19:11:05 +02:00
theatre-x
bf479f6715 Change end year 
Changed to 1910. So people like THIS: https://en.wikipedia.org/wiki/Jacque_Fresco#Early_life can actually use Diaspora.
 2014-07-20 20:31:14 -04:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
Jonne Haß
fe1d1bd7a8 Merge pull request #5056 from arlogn/login-podname-size-flexible 
Flexible font-size for huge text in sign_in page
 2014-07-07 09:03:48 +02:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Mikael Nordfeldth
65e7840085 Publish salmon endpoint URL in Webfinger XRD 
Specification in Panzer draft for Salmon, paragraph 3.3 mentions:
   "The 'salmon' link relation may specify a Salmon endpoint used to notify
    a resource, typically a user account, about external mentions of that
    resource. For a user account, the salmon mention link SHOULD appear in
    the Webfinger [Webfinger] XRD document for the user account."

Source:
http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SMLR
 2014-07-06 15:05:51 +02:00
Dennis Schubert
4a2836b108 Remove stylesheet tag from mobile sign_up template 2014-07-05 00:39:39 +02:00
Błażej Pankowiak
0d0ed4db28 Port Getting Started page to Bootstrap 2014-07-04 18:06:49 +02:00
Jonne Haß
0515c33769 Use double quotes when embeding translations in JS 
Translations commonly include single quotes, which closes
the JavaScript string unexpectedly. Closes #5055
 2014-07-03 22:57:42 +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
Jason Robinson
e4e9f40b2c Revert "Fix toggling services for mobile bookmarklet" 
This fixed the toggling of services, but broke the actual
bookmarklet :)

This reverts commit 1bd7989045.
 2014-06-19 21:47:34 +03:00
Jason Robinson
1bd7989045 Fix toggling services for mobile bookmarklet 2014-06-02 23:29:47 +03:00
Jason Robinson
8fead54ab6 Make publisher spinner also work in bootstrap publisher 2014-06-01 14:52:59 +03:00
Jason Robinson
128be9204c Refactor UI hint on status message submit. 
Now we close the publisher on submit and reopen it on error. The spinner is shown while submission is in progress. Fixes #4949
 2014-06-01 14:25:34 +03:00
Jason Robinson
b73e478e26 Add spinner to publisher when posting a message 
Fixes #4949
 2014-05-31 21:05:36 +03:00
Marien Fressinaud
fa2de8c195 Remove duplicate checkbox in Settings 
Fix issue #4964
 2014-05-22 22:39:09 +02:00
Lukas Matt
6d6ebd297e Do not try to render posts/comments which are not present 
refs diaspora/diaspora#4959
 2014-05-16 09:48:14 -04:00
Lukas Matt
7ef802127e Added confirm-dialog to report-delete-button 
* changed button description
* replaced links with buttons
 2014-05-15 07:23:44 -04: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
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
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
Jason Robinson
62b5fea526 Merge pull request #4932 from Raven24/fix-bookmarklet 
port bookmarklet to Backbone.js, use gon for params
 2014-05-01 13:29:36 +03:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer 
Introduce message renderer
 2014-04-13 15:00:46 +03:00
Jason Robinson
7d9248b7ac Merge pull request #4854 from Flaburgan/fix-mobile-drawer 
Fix mobile drawer
 2014-04-12 21:46:54 +03:00