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

7934 commits

Author SHA1 Message Date
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller 
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
 2015-04-28 01:57:43 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Simon Žlender
f5ce612299 Issue #5874 Fix styled links 2015-04-25 16:51:11 +02:00
Martin Artnik
283f22fc84 Fix unconventional image asset inclusion in css asset 2015-04-25 16:18:27 +02:00
Simon Wörner
4c13fd2b42 Revert "remove aspect sorting logic" 
This reverts commit 8d8d3c649a.

Conflicts:
	app/assets/javascripts/main.js
 2015-04-25 02:16:54 +02:00
Dennis Schubert
c95dd68545 Merge pull request #5883 from SuperTux88/fix-camo-on-contacts-page 
use camo for medium and small avatars
 2015-04-25 01:26:28 +02:00
Dennis Schubert
67a6c8be0c Merge pull request #5877 from SuperTux88/fix-notification-mails 
fix notification mails for limited posts
 2015-04-25 01:09:46 +02:00
Benjamin Neff
344b198900 use camo for medium and small avatars 2015-04-24 03:10:48 +02:00
Jonne Haß
0bad6dba88 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf Trigger exports through a POST request 
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.
 2015-04-22 20:20:10 +02:00
Jonne Haß
0a70e51f74 Add a token the filename for exported user data 
Also redirect to it for download, for Amazon S3
compatibility.

Prior to this patch an attacker could obtain an
users export by guessing the filename with a high
chance of success. Fully authenticating the
download request is a lot harder due to our diverse
deployment scenarios.

This brings the used method in line with the photo
export feature.

Thanks to @tomekr for the report.
 2015-04-22 20:19:17 +02:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Steffen van Bergerem
8e2103e69b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:26:22 +02:00
Steffen van Bergerem
7648b58c15 Merge pull request #5875 from SuperTux88/add-mumble-protocol 
add mumble protocol to linkify
 2015-04-21 22:17:43 +02:00
Jonne Haß
61c890f274 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:02:28 +02:00
Steffen van Bergerem
6bb5e0a29b Only render hovercard if the mouse is still on the username 2015-04-21 22:02:18 +02:00
Benjamin Neff
6cbb959700 add mumble protocol to linkify 
also use double-quotes in the whole file
 2015-04-21 21:16:55 +02:00
Jonne Haß
c8f990359d Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:50:27 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Jonne Haß
9a9cf6f6a5 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea Fix uppercase registration/login labels and btn style 2015-04-21 20:48:30 +02:00
Jonne Haß
9d4916709b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 22:40:12 +02:00
Jonne Haß
37ec00f80b Merge pull request #5854 from svbergerem/remove-managing-services-standalone 
Remove 'manage services' link in standalone mode
 2015-04-20 22:36:11 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Benjamin Neff
128cfb247c fix not_public page 
body was rendered in the head
 2015-04-20 22:32:32 +02:00
Jonne Haß
e996bd7e36 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:49:55 +02:00
Jonne Haß
6fe06f6d3c Merge pull request #5868 from SuperTux88/fix-service-icons 
fixed service-icons in sidebar
 2015-04-20 21:49:46 +02:00
Benjamin Neff
13a6b1389d fixed service-icons in sidebar 
recovered css from old application.scss

was removed in e188782a9a
 2015-04-20 21:49:36 +02:00
Jonne Haß
a06448447a Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:19:49 +02:00
Benjamin Neff
0211da4116 fix control icon alignment in chromium browser 2015-04-20 21:06:17 +02:00
Jonne Haß
85c376e591 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7 Update aspect edits text, reorder posting section 
First iteration to update Help section

Changes from Fla
 2015-04-19 15:57:21 +02:00
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Asphyxia
5fb328864e Activity stream keeping retracted participations 2015-04-10 21:46:42 -03:00
Jonne Haß
5481ddb540 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-10 19:23:00 +02:00
Jonne Haß
ec2a209b68 Lazily initialize Contact proxy in service helper 
This prevents connecting to the database on rake assets:precompile,
which fails in certain build environments.

Running git blame on this and figuring out what in gods name this
is for, is for another time.
 2015-04-10 19:19:16 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
b885b8583d Remove 'manage services' link in standalone mode 2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
a6b9c6c057 Return 406 on people/guid/contacts, format json 2015-04-04 03:48:44 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c Limited post content excluded from subject of comment email 2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Jonne Haß
bec2508545 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-03 02:21:59 +02:00
Steffen van Bergerem
3e5eb350ae Notification dropdown: 'mark all as read' link scroll fix 2015-04-03 02:21:06 +02:00
Jonne Haß
0155d8972a Merge pull request #5839 from svbergerem/use-test-instead-of-match 
Use test instead of match wherever possible
 2015-04-01 23:54:42 +02:00
Steffen van Bergerem
f8707e0e1a Use test instead of match wherever possible 2015-04-01 18:35:20 +02:00
Jonne Haß
099bb01005 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 18:28:08 +02:00
Jonne Haß
2dd4bf0acf Merge pull request #5838 from svbergerem/check-stream-before-adding-posts 
Don't add mentions and reshares to all streams
 2015-04-01 18:27:06 +02:00
Steffen van Bergerem
1701bc30d0 Don't add mentions and reshares to all streams 2015-04-01 16:51:08 +02:00
SansPseudoFix
5b90e1a060 Fix tag overflow mobile page 
modified:   app/assets/stylesheets/mobile/mobile.scss

	modified:   app/assets/stylesheets/mobile/mobile.scss
 2015-04-01 14:55:45 +02:00
Steffen van Bergerem
6b024dcd45 Fix missing button styles in donate and admin sections 2015-04-01 13:34:56 +02:00
Jonne Haß
548b0d8161 Rescue correct constant in Workers::ReceiveLocalBatch 
Fixes #5834
 2015-04-01 04:01:40 +02:00
Jonne Haß
5c78ab6838 Merge pull request #5832 from svbergerem/remove-border-conversations 
Remove border from conversation stream
 2015-04-01 03:07:07 +02:00
Steffen van Bergerem
cb04e40de7 Remove border from conversation stream 2015-04-01 01:03:15 +02:00
Steffen van Bergerem
7870f3b127 Contacts page: remove broken title from 'Start a conversation' button 2015-04-01 00:47:31 +02:00
Jonne Haß
e274470d55 Replace default.html with a regular view 
So we can correctly reference the images
 2015-03-28 23:12:07 +01:00
Dennis Schubert
61c2fbf5ef Merge pull request #5817 from jhass/generated_error_pages 
Generate error pages on assets:precompile
 2015-03-28 21:46:35 +01:00
Steffen van Bergerem
176938c486 Fix layout regression: missing header on search page 2015-03-28 13:54:52 +01:00
Jonne Haß
e7d0a978ba Generate error pages on assets:precompile 
This allows us to reuse any CSS we have, unify
their look and unify their look with the regular
page design.

This works by instantiating ActionView and rendering
templates in a rake task.

Inspired by the errgent gem.
 2015-03-27 11:15:59 +01:00
Dennis Schubert
b07ad67946 Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message 
Add 'no contacts in this aspect yet' message
 2015-03-27 03:50:42 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
Steffen van Bergerem
c9457ffd86 Add missing .container to admin pages, add note to changelog 2015-03-26 23:51:41 +01:00
Steffen van Bergerem
6f7f820ff4 Fix oembed style regression 2015-03-26 23:51:08 +01:00
Steffen van Bergerem
b69239ed2f Merge pull request #5791 from SansPseudoFix/5745-Conversation-pagination-design-is-broken 
Fix for 5745 - conversation pagination design is broken
 2015-03-26 20:05:24 +01:00
SansPseudoFix
a97bfec39c add option pagination 
center pagination

Fix pagination css

Symbols for previous and next

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Add responsive pagination

Fix broken pagination

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Fix broken pagination for mobile

Mobile pagination

Unify desktop and mobile background

change background color
 2015-03-26 19:53:23 +01:00
Steffen van Bergerem
3a202d8fa9 Remove footer from stream and profile pages 2015-03-26 16:28:01 +01:00
Jonne Haß
b047013dd0 Merge pull request #5814 from svbergerem/update-markdown-it 
Update markdown-it
 2015-03-26 10:16:22 +01:00
Steffen van Bergerem
153efe7d7a Change url to image-url in registration.css, added in #5743 2015-03-26 01:13:11 +01:00
flaburgan
ef977a170f Replace Make Something text by the diaspora ball logo on registration page 
Add ball.svg to /graphics
 2015-03-26 00:32:41 +01:00
Steffen van Bergerem
adf9bcf8e8 Update markdown-it 2015-03-26 00:07:25 +01:00
Jonne Haß
73b6c75278 On reshare insert the reshare built from the response 
Also make sure comments_count and the like is always set in the
response.
 2015-03-23 23:02:23 +01:00
Steffen van Bergerem
4d6c513b8e Refactor post content css, fix margin-bottom for lists in comments 2015-03-22 02:19:36 +01:00
Steffen van Bergerem
50c187537d Merge pull request #5721 from sam09/fixissue5626 
Added margin top to lists. Fixes issue #5626
 2015-03-22 00:38:51 +01:00
Sam Radhakrishnan
af410ef4e5 Added margin top to lists. Fixes issue5626 2015-03-22 02:43:01 +05:30
Sayed
e21afc6636 order-of-comments-on-the-mobile-version-is-reversed #5804 2015-03-21 15:20:57 +02:00
Jonne Haß
644fc46dee Merge pull request #5792 from MothOnMars/4020-role-specs 
added specs and validations for Role model
 2015-03-20 01:54:04 +01:00
Jonne Haß
496a16d14d Merge pull request #5799 from svbergerem/invitation-input 
Unify invite code and contacts page link style
 2015-03-20 01:52:00 +01:00
Steffen van Bergerem
4a7781f1e7 Unify invite code and contacts page link style 2015-03-19 02:46:25 +01:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Martha
d4f1a5dbe8 added specs and validations for Role model 
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
 2015-03-18 09:16:15 -07:00
Jonne Haß
5115582c55 Merge pull request #5790 from visualsayed/5693-reshare-count-broken-on-mobile-stream 
fix missing reshares count on mobile stream #5693
 2015-03-17 21:27:44 +01:00
Sayed
bf3d903c11 refactor mobile stream post_stats 2015-03-17 20:37:16 +02:00
Sayed
99f42cb643 fix missing reshares count on mobile stream 2015-03-17 01:14:22 +02:00
Steffen van Bergerem
0856eb8f86 Merge pull request #5788 from AugierLe42e/fix-search-element-selection 
Fixes #5787
 2015-03-16 23:36:51 +01:00
Augier
571685d590 Fix the broken searchbar (#5787) 2015-03-16 22:07:51 +01:00
Steffen van Bergerem
e7ec3d495f Refactor and improve sidebar css 2015-03-16 02:03:53 +01:00
Jonne Haß
256d7862b9 Merge pull request #5782 from svbergerem/reshared-poll 
Display reshared poll
 2015-03-15 20:45:51 +01:00
Jonne Haß
5ea90016b3 Merge pull request #5783 from visualsayed/5737-too-long-tag-name 
5737 too long tag name
 2015-03-15 18:06:53 +01:00
Steffen van Bergerem
81cd1753e4 Improve link to original post in reshared polls 2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f disable poll voting for reshared post 2015-03-15 16:46:48 +01:00
Sayed
18a1958ef8 fix too long tag name #5737 2015-03-15 16:15:33 +02:00
Augier
322ee30005 Tests with Jasmine 2015-03-15 14:52:49 +01:00
Augier
f4534ec412 Refactor notification badge view (again) 2015-03-15 11:48:06 +01:00
Augier
673661b798 Ported searchbar 2015-03-15 11:48:06 +01:00
Augier
2a9fddf7a0 Port notifications to backbone part. 2 2015-03-15 11:48:06 +01:00
Jonne Haß
25e80fddc8 Merge pull request #5781 from svbergerem/various-style-fixes 
Various style fixes
 2015-03-15 04:20:47 +01:00
Steffen van Bergerem
caf7470e8e Various style fixes 2015-03-15 01:58:29 +01:00
Steffen van Bergerem
ca087d6b26 Conversations: Add rounded corners to participants count and improve readability 2015-03-14 18:16:21 +01:00
Lisa Passing
a11322fd5d make css nicer 
update Changelog

remove weird merge thing

think of the padding and margin
 2015-03-14 17:00:14 +01:00
Christophe
e2a591249a Replace JQuery slide with transition 
Conflicts:
	app/assets/javascripts/inbox.js
	app/assets/stylesheets/conversations.css.scss
 2015-03-14 14:30:59 +01:00
Steffen van Bergerem
2328f64d56 Merge pull request #5580 from MothOnMars/5549-password-reset-error 
display specific error messages for password change (issue #5549)
 2015-03-14 03:25:08 +01:00
Steffen van Bergerem
d7d9891293 Merge pull request #5722 from AugierLe42e/add-notif-unsubscribe-single-post-view 
Add a notification subscribtion to the single post view
 2015-03-14 00:52:03 +01:00
Augier
0887137262 Add a notification subscribtion to the single post view 2015-03-13 23:27:49 +01:00
Martha
985141c0e8 display specific error messages for password change (issue #5549) 2015-03-13 11:35:21 -07:00
Giniouxe
efcff444fd Refactor registrations #5670 - Partial form 2015-03-13 16:16:45 +01:00
Jonne Haß
2c2b47eae2 Merge pull request #5769 from svbergerem/remove-unused-css 
Remove unused css and reduce blockquote font-size
 2015-03-13 10:44:44 +01:00
Steffen van Bergerem
6dc18ac317 Reduce blockquote font-size 2015-03-13 01:41:14 +01:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
Steffen van Bergerem
992c75da55 Merge pull request #5767 from SansPseudoFix/overflow-button-tag-too-long 
Change overflow-x to overflow for long tag button
 2015-03-13 01:19:11 +01:00
SansPseudoFix
8dd8daf37e Change overflow-x to overflow for long tag button 2015-03-12 23:46:15 +01:00
Steffen van Bergerem
1ff644c13e Fix mobile notifications 2015-03-12 22:45:04 +01:00
Jonne Haß
cc585805ad Merge pull request #5762 from svbergerem/entypo-controls 
Use entypo for control icons
 2015-03-12 19:29:40 +01:00
Steffen van Bergerem
af9d6ddab3 Use handlebars helpers wherever possible 2015-03-12 16:20:32 +01:00
Steffen van Bergerem
0715107735 Remove stream frame template 2015-03-12 14:43:20 +01:00
Marcelo Briones
7be56849d9 DRY on avatars 2015-03-12 09:52:36 -03:00
goobertron
b04a2638a5 Add box shadow and radius to avatars 2015-03-12 09:52:36 -03:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
Steffen van Bergerem
e99fe86ca0 Merge pull request #5752 from SansPseudoFix/fix-tag-button-overflow 
fix tag button overflow
 2015-03-12 10:43:56 +01:00
SansPseudoFix
26ad537a18 fix tag button overflow 
fix tag button overflow

	modified:   app/assets/stylesheets/tag.scss
	modified:   app/assets/templates/tag_following_action_tpl.jst.hbs
 2015-03-12 00:28:31 +01:00
Jonne Haß
2c7b7bb0dc bump open_graph_reader 2015-03-11 21:59:02 +01:00
Steffen van Bergerem
4f4dfc7554 Fix missing assets bug 2015-03-11 19:18:05 +01:00
Steffen van Bergerem
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone 
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
 2015-03-11 17:05:14 +01:00
Steffen van Bergerem
f5bf53a004 Refactor vendor javascript 2015-03-11 15:51:08 +01:00
Steffen van Bergerem
be175e969e Fix mobile sign up with invitation 2015-03-11 10:52:42 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Jonne Haß
8ab6f31e0a Merge pull request #5751 from svbergerem/fix-photo-count-profile 
Fix photo count in the profile view
 2015-03-10 17:45:12 +01:00
Jonne Haß
add6dd3c50 Merge pull request #5749 from svbergerem/char-counter-fix 
Publisher: fix services char counter
 2015-03-10 17:43:32 +01:00
Steffen van Bergerem
d2222a97e5 Fix photo count in the profile view 2015-03-10 11:38:49 +01:00
SansPseudoFix
6cf509454c fix overflow blockquote stream 
change word-break to wrap-wrap

	modified:   app/assets/stylesheets/stream_element.scss

remove useless word-wrap

global prevent for overflow

global overflow fix

Remove useless word-wrap

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/assets/stylesheets/new_styles/_base.scss
	modified:   app/assets/stylesheets/new_styles/_code.scss
	modified:   app/assets/stylesheets/single-post-view.scss
	modified:   app/assets/stylesheets/stream_element.scss

indent
 2015-03-09 23:59:52 +01:00
Steffen van Bergerem
1b2b10877a Fix services char counter 2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
d3c0259026 Remove unused aspect files 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
31d7904701 Remove unused blueprint invitations view 2015-03-09 17:57:49 +01:00
Steffen van Bergerem
3298373a7f Add missing http:// to urls 2015-03-09 01:42:40 +01:00
Steffen van Bergerem
9d6fc0a671 Merge pull request #5744 from Flaburgan/conversation-design 
Fix conversaton publisher trailing border
 2015-03-08 22:49:44 +01:00
flaburgan
ab4467954b Fix conversaton publisher border 2015-03-08 21:59:23 +01:00
Steffen van Bergerem
49894ec05d Merge pull request #5740 from jhass/publisher_margin 
Reduce gap between publisher and stream
 2015-03-08 16:08:51 +01:00
Jonne Haß
e6444cea67 Reduce gap between publisher and stream [ci skip] 2015-03-08 14:27:07 +01:00
Jonne Haß
00817c8583 Merge pull request #5728 from SansPseudoFix/5716-focus-link-color-bootstrap-header 
Fix #5716 focus header link color
 2015-03-06 23:44:03 +01:00
Jonne Haß
2dafe8554c Merge pull request #5735 from svbergerem/improve-bootstrap-stream-style 
Improve Bootstrap stream style
 2015-03-06 23:40:24 +01:00
Steffen van Bergerem
b083560266 Improve Bootstrap stream style 2015-03-06 21:59:36 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
Steffen van Bergerem
96fcae3532 Remove unused (vendor) css 2015-03-06 07:58:13 +01:00
Steffen van Bergerem
0f9ba4885c Import chat.scss and change container to container-fluid 2015-03-06 01:18:37 +01:00
Jonne Haß
c2dab008ab We may no longer have a file for an unprocessed photo 2015-03-06 00:52:17 +01:00
Jonne Haß
e7b92c15e2 Replace export_photos and export_users by export queue 2015-03-06 00:38:16 +01:00
SansPseudoFix
53ac63cafa refactoring - grey link with dark grey dots for focus 2015-03-04 23:46:52 +01:00
SansPseudoFix
f8b69ae7d7 grey link with black grey dots border 2015-03-04 18:35:59 +01:00
SansPseudoFix
2b29bfe403 focus link grey with grey dots 2015-03-04 15:00:39 +01:00
Jonne Haß
26cda1b1c5 Merge pull request #5724 from AugierLe42e/comment-design 
Changed color border on active text
 2015-03-04 11:52:09 +01:00
SansPseudoFix
330ae471f1 Fix #5716 focus header link color 2015-03-04 11:03:44 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Augier
5be2fbafab Changed color border on active text" 2015-03-03 21:18:53 +01:00
Selman Ercan
35fe6bda68 Issue #5631. Made top and left coordinates of hovercards match those of their parents. 
Added line to changelog for bug fix of issue #5631.

Processing the 'mouseleave' event only if we've left both the parent and the hovercard.

Fixed indentation.

Replaced issue id with pull request id and fixed indentation.
 2015-03-02 09:41:29 +01:00
Steffen van Bergerem
0c7d319fdc Remove unused css files 2015-03-02 00:04:58 +01:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Pablo Cuadrado
56a79828bc using circled help icon 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
3721861c94 border on the left of the stream and profile header 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
b0a8ecf8be margin 0 was messing up the left bar 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
2fb594735e main stream widths with fluid container 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
c402c65f56 unprefixing opacity 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
52fef10bea lame BR removed 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
75480c5454 using entypo on the right section, better alignment and styles 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
ba9bb619e4 using container instead of container fluid for the stream, we can manage this 
better when migrating to Bootstrap 3
 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
84739a86d1 invite code box fix 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
9cbc09316d text shadow made the buttons look blurry 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
b23c0f7ae4 ensuring that the oembed element has the same size of the thumb 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
7f2ee4bf3d dropping blueprint option on publisher 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
24fdf8fb84 rightbar invitations ported to bootstrap 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
b2e3866217 removing blueprint classes from new aspect modal 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
122fde9093 colliding style removed 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cfff769152 comment button using bootstrap styles 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
bb18803665 welcome to diaspora styles ported 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cb99ad9e68 left bar styles adjusted 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
e48679affe removing a missing mixing, using row instead of row-fluid 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
c4fda4b563 main_stream ported, no further styling applied 2015-03-01 12:04:51 +01:00
flaburgan
741a24bc08 Add tooltip style on post report icon 2015-02-28 16:57:41 +01:00
Dennis Schubert
ab4e04e8c4 Don't specify file extensions in SCSS imports 2015-02-28 05:04:39 +01:00
Jonne Haß
c96834bdf2 Remove .css extension from SCSS files 
sass-rails 5.0 deprecated those
 2015-02-28 03:37:46 +01:00
Jonne Haß
1b0cf2d11f bump compass & sass 2015-02-28 02:36:14 +01:00
Jonne Haß
3a90386303 deliver needs to be called on the return value of the mailer call 2015-02-27 16:58:39 +01:00
Jonne Haß
f62ba0f73c Don't split contact_ids when they already are an array 2015-02-27 16:58:39 +01:00
Jonne Haß
f49c8884f4 Use _url, not _path, in mailers 2015-02-27 16:58:39 +01:00
Jonne Haß
290aded7f6 ActionMailer deliver -> deliver_now 2015-02-27 16:58:39 +01:00
Jonne Haß
162303db37 Enable Rails 5 behavior for exceptions in after_commit callbacks 2015-02-27 16:58:39 +01:00
Jonne Haß
9ad2409264 Don't use AR internals (@attributes) 2015-02-27 16:58:38 +01:00
Jonne Haß
99ea156e1c Refactor User.total_users into a scope 2015-02-27 16:30:51 +01:00
Jonne Haß
95053ccbf2 Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts 
5041 total user statistic shouldnt include closed accounts
 2015-02-27 16:02:35 +01:00
Jonne Haß
e46a77ba19 Merge pull request #5706 from aka001/help_section 
Update the help section #5698
 2015-02-27 15:57:12 +01:00
Jonne Haß
e8440bb25f Merge pull request #5683 from svbergerem/mobile-fix-style-more 
Mobile: fix style of 'more' button
 2015-02-27 15:53:36 +01:00
Jonne Haß
205f82bfd0 Merge pull request #5648 from Zauberstuhl/jsxc_use_ajax_login 
Adjust jsxc initialization for ajax login
 2015-02-27 15:52:30 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Jonne Haß
073e99992e Some fixes to participation controls 
* prevent default event in JS handlers to prevent jumping back to the
  top.
* Use js-routes
* Use sprite for icons
* Reply with 200 instead of 204 when destroying a participation,
  to prevent errors in the browser console.
 2015-02-27 15:31:30 +01:00
Akash Agrawall
e85cb7b373 Help_section_update_keyboard_shortcut 2015-02-27 16:36:11 +05:30
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00
Lukas Matt
e484ebc85f Using dot notation for accessing token 2015-02-25 00:11:01 +01:00
Lukas Matt
30685b2709 Adjust jsxc initialization for ajax login 
related to diaspora/jsxc#81
 2015-02-25 00:09:23 +01:00
PIOTR KLOSINSKI
b8be76be3c changed reshare function, so it adds the object to the stream 
tests for reshares

Changelog.md update

fixing a style issue

removed unnecessary semicolon
 2015-02-23 15:44:31 +01:00
zachrab
f695b5d3e7 Set disable_mail to true 
Add #clear_account! disable mail spec

Add migration for disabling mail for all closed accounts

Change migration to use #update_all for disable_mail attribute

Add #clear_account! false fields spec
 2015-02-19 16:45:39 -08:00
Steffen van Bergerem
0434599bd0 Contacts page: 'Start a conversation' button should depend on number of contacts in aspect 2015-02-19 20:22:07 +01:00
Steffen van Bergerem
53714c4699 Fix notification for new conversations 2015-02-19 13:39:25 +01:00
Jonne Haß
a19b91083e Merge pull request #5643 from aka001/5564_lock_account 
Lock account #5564
 2015-02-19 03:43:38 +01:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
flaburgan
2b19b4bfc9 Remove #sign-up-text, change placeholder text to lower-case, fix tests 2015-02-19 00:07:41 +01:00
Steffen van Bergerem
b3558d0db1 Fix captcha and box-shadow 2015-02-18 22:45:46 +01:00
flaburgan
1c231f3171 refactoring of the public pages design 2015-02-18 22:45:46 +01:00
flaburgan
44649e9167 Unify not connected pages 2015-02-18 22:45:46 +01:00
Steffen van Bergerem
06ab4d0514 Mobile: fix style of 'more' button 2015-02-18 20:41:01 +01:00
Steffen van Bergerem
7d485ce6a6 Add opacity transition for post controls 2015-02-18 18:16:10 +01:00
SansPseudoFix
0c49219ca7 Global prevent for overflow in mobile view 2015-02-17 13:00:39 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Steffen van Bergerem
d1dfd7c1cd Style improvements for the year on the notifications page 2015-02-16 21:45:39 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Steffen van Bergerem
4da6b075ad Bootstrap stream: fix interaction buttons 2015-02-16 06:23:34 +01:00
Steffen van Bergerem
f1836580db Bootstrap stream: add spinner and improve comment box 2015-02-16 04:56:35 +01:00
Jonne Haß
34ad598cff Merge pull request #5594 from Faldrian/4055-add_contacts_mobile 
4055 add contacts mobile
 2015-02-15 23:12:18 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Giniouxe
e2866a12ea Issue #5662: Fix text on change button 2015-02-15 20:42:55 +01:00
Jonne Haß
9dbf6b82a8 Merge pull request #5655 from svbergerem/contacts-page-add-invitations 
Add invitation link to contacts page
 2015-02-15 16:00:20 +01:00
Jonne Haß
f326b58d31 Merge pull request #5664 from svbergerem/remove-people-last_post 
Remove last_post from PeopleController
 2015-02-15 15:58:02 +01:00
Steffen van Bergerem
9373d5bd20 Fix jasmine tests for new help routes 2015-02-14 19:38:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +01:00
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails 
profile photos as thumbnails
 2015-02-14 02:55:57 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile 
related to diaspora/jsxc#77
 2015-02-13 19:23:26 +01:00
Steffen van Bergerem
2193ff2b58 Remove last_post from PeopleController 2015-02-13 12:25:50 +01:00
Steffen van Bergerem
1733131c0c Add invitation link to contacts page 2015-02-12 03:34:24 +01:00
Jonne Haß
3c58cbeaee Merge pull request #5646 from svbergerem/fix-conversation-scrolling 
Conversations: fix badge count and automatic scrolling
 2015-02-11 14:19:48 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Steffen van Bergerem
17c7771a6b Fix typo in AspectGlobalHelper 2015-02-10 16:43:14 +01:00
Jonne Haß
dece3cf6b0 Merge pull request #5417 from svbergerem/notifications-fix-timeago 
Fix timeago for notifications, add 'no notifications yet' message
 2015-02-10 12:20:09 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Jonne Haß
ab2e4781f8 Merge pull request #5639 from aka001/5373_technical_limitation 
Technical limitations of how old one can be on D* #5373
 2015-02-09 02:28:15 +01:00
Akash Agrawall
6b105274af Technical limitation of how old one can be on D* 5373 2015-02-09 06:19:09 +05:30
Steffen van Bergerem
2ec093a54c JSHint boss, evil, loopfunc and scripturl 2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1 JSHint eqeqeq 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e JSHint unused and undefined variables 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a JSHint semicolon errors 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Faldrian
5d3145bf8f added avatar error correction on core view rendering 2015-02-08 19:32:50 +01:00
Faldrian
32ca5cc16d removed css-spill on reshare link in stream 2015-02-08 17:24:16 +01:00
Marc Burt
9f5131b6ec Fixed #5041 with new User method to find total accounts excluding closed and invitations 2015-02-08 13:49:12 +00:00
Jonne Haß
3114b04a08 Merge pull request #5635 from svbergerem/remove-unused-files 
Remove unused files, fix syntax in jasmine tests
 2015-02-07 23:43:48 +01:00
Jonne Haß
63363340f6 Merge pull request #5623 from AugierLe42e/fix-mobile-login-view 
[Mobile] Does not display the header on sing_in page
 2015-02-07 21:30:03 +01:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00
Steffen van Bergerem
7e5f5964e9 Remove photo export from settings 2015-02-07 14:59:18 +01:00