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

8068 commits

Author SHA1 Message Date
Steffen van Bergerem
39fe6bfff2 Set max-width to 100% for images in post-content 2015-06-05 00:12:05 +02:00
Steffen van Bergerem
2da262a262 Bootstrap3: fix likes avatars and conversation participants 2015-06-04 22:49:42 +02:00
Augier
7d1bba4e44 Fixed variable drawer width 2015-06-04 22:35:19 +02:00
SansPseudoFix
f3938a173e Fix pagination issue for mobile view 2015-06-04 18:08:00 +02:00
Steffen van Bergerem
3fdb8a2052 Fix mobile drawer 2015-06-04 18:05:45 +02:00
Steffen van Bergerem
93dd3a3a72 Use nav-tabs for ToS 2015-06-04 18:05:45 +02:00
Steffen van Bergerem
797ae8a918 Remove bootstrap-fix.scss 2015-06-04 18:05:45 +02:00
Steffen van Bergerem
20c63b20ba Remove inline css, use font-size-small 2015-06-04 18:05:45 +02:00
SansPseudoFix
9f6d6a2e80 Fix for too long username in notification dropdown 2015-06-04 18:05:45 +02:00
Steffen van Bergerem
cc58c66e3d Use media objects for mobile posts/comments/notifications 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
700df9af23 Fix jasmine tests 
Fix notifications jasmine tests
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f64eb9ff41 Fix hound remarks 2015-06-04 18:05:44 +02:00
theworldbright
98f11b944a Fix styleguide violations 
Fix hound remark 12

Remove unnecessary explicit div tag

Rename el_**** to ****El (hound remark 2 and 3)

Only find and replace operations were done with
this commit

Fix hound remark 4 and 8

Fix hound remark 6

Fix hound remark 7

Fix hound remark 9

Fix hound remark 10 and 11

Fix hound remark 13

Fix hound remark 1

Change single quotes to double quotes

Change single quotes to double in publisher view

Fix camelCase and missing {} in publisher view

Change single quotes to double in bookmarklet view

Use dot notation for serializedForm in publisher

Change single quotes to double in bookmarklet spec

Change single quotes to double in publisher spec

Fix missing {} in publisher views

Use ruby 1.9 hash syntax in invite_link

Fix indentation in publisher view
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
a3725599ef Use darker version creation-blue and creation-green for brand-primary and brand-success 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557 Refactor button colors 2015-06-04 18:05:44 +02:00
Augier
d7522d9498 corrected failing cuke and social buttons 2015-06-04 18:05:44 +02:00
Jonne Haß
e3bff1f20b Fix syntax error in shared/_modal.haml 
Also can't use quoted keys there yet because of Ruby 2.1
 2015-06-04 18:05:44 +02:00
theworldbright
5589dac108 Perform compositional styling to "getting started" 2015-06-04 18:05:44 +02:00
theworldbright
ed5f7837b5 Fix styleguide violations 
Fix hash syntax 3

Fix hash syntax 1 and 2
 2015-06-04 18:05:43 +02:00
Steffen van Bergerem
46abdbdd1f Style fixes for left navbar in notification view 2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8e9ceb9a2b Improve no message text and delete icon for conversations, fix regressions 2015-06-04 18:05:43 +02:00
Augier
0cbf581176 Better settings display 2015-06-04 18:05:43 +02:00
theworldbright
0e30c07903 Change line height to 20px for entypo form icons 2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8a004ee02a Overwrite Bootstrap variables and fix publisher 2015-06-04 18:05:43 +02:00
theworldbright
e372b4eb95 Remove some inline css and minor refactoring 2015-06-04 18:05:43 +02:00
Augier
207b6c6153 Port to Bootstrap 3 
correcting images display on stream sidebar

Corrections on profile page
 2015-06-04 18:05:43 +02:00
Dennis Schubert
b41007fae7 Merge branch 'stable' into develop 2015-06-04 04:18:34 +02:00
Benjamin Neff
27b4a44e4a replace Rails.logger with logging-logger 
closes #6041
 2015-06-04 04:17:15 +02:00
Benjamin Neff
b6c46b3fc4 add logging mixin and replace federation-logger 2015-06-04 04:16:03 +02:00
Jonne Haß
3850118e4e Merge branch 'stable' into develop 2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Dennis Schubert
ffc3cb711f Merge branch 'stable' into develop 2015-06-02 02:35:21 +02:00
Benjamin Neff
03dbb75dd5 don't save default avatars to the database 2015-06-02 02:32:01 +02:00
Jonne Haß
b722a75a44 Merge branch 'stable' into develop 2015-06-02 00:44:56 +02:00
Benjamin Neff
a7fa3eabcb Disable autocorrect/autocapitalize for the username 
and cleanup the code so it follows the code guidelines

closes #5955

closes #6028
 2015-06-02 00:44:47 +02:00
Dennis Schubert
70da822d69 Merge branch 'stable' into develop 2015-06-01 04:55:32 +02:00
Steffen van Bergerem
35e75b3c64 Atom feed: set post title length to 50 and use configured pod name in the feed title 
closes #6020
 2015-06-01 04:55:27 +02:00
Jonne Haß
c196ef11bb Merge branch 'stable' into develop 2015-05-31 20:40:18 +02:00
theworldbright
45a5e3d1c5 Change markdown-content hr style #5987 
The <hr> tag in the markdown-content was #eee,
and thus almost invisible. It has been changed to
$border-gray (currently #ddd) to be consistent
with the other <hr> tags.

Adjust markdown-content hr style further

The hr tag is now centered at 85% width. It also
adds a default vertical margin that is equivalent
to the 0.8em the paragraph tags provide.

Refactor scss for markdown-content hr

Closes #6016
 2015-05-31 20:39:55 +02:00
Dennis Schubert
7401808e3f Merge branch 'stable' into develop 2015-05-31 01:49:43 +02:00
Benjamin Neff
76ca4fdc70 use image_url for the logo in mails 
closes #6013
 2015-05-31 01:49:38 +02:00
Dennis Schubert
b2dbdb3706 Merge branch 'stable' into develop 2015-05-30 03:08:30 +02:00
Jonne Haß
ac52cef546 Only return the current_users participation for post interactions 
closes #6007
 2015-05-30 03:08:25 +02:00
Jonne Haß
146f7eea52 Merge branch 'stable' into develop 2015-05-29 11:42:03 +02:00
Sandip Trivedi
b026a2afe8 Replaces facebox vendored asset with rails gem #5194 
closes #6005
 2015-05-29 11:41:57 +02:00
Jonne Haß
6581c580f8 Merge branch 'stable' into develop 2015-05-29 11:39:36 +02:00
Benjamin Neff
604ffb445a optimized sprites 
- move mobile icons to mobile-folder, so they aren't included in the
  icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
  big other branding-images
- delete duplicate images

closes #6004
 2015-05-29 11:39:30 +02:00
Benjamin Neff
247e9efe49 remove unused branding images 2015-05-29 11:39:01 +02:00
Benjamin Neff
bd8888291d remove more old assets 2015-05-29 11:39:01 +02:00
Benjamin Neff
a22be8a4cb remove unused social media logos and add attribution 2015-05-29 11:39:01 +02:00
Benjamin Neff
36b1568d32 remove old unused icons (mostly replaced by entypo) 2015-05-29 11:39:00 +02:00
Jonne Haß
351f54d74f Merge branch 'stable' into develop 2015-05-28 11:24:34 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Dennis Schubert
44919233c0 Merge branch 'stable' into develop 2015-05-28 01:34:28 +02:00
Benjamin Neff
21ae93e658 handle when the diaspora xml parser returns nil 
closes #5991
 2015-05-28 01:34:24 +02:00
Dennis Schubert
8c408a57ae Merge branch 'stable' into develop 2015-05-26 05:25:43 +02:00
Dennis Schubert
62e8f87f2c Do not mute ActiveRecord::RecordNotUnique for now see #5971, regression from #5938 
closes #5992
 2015-05-26 05:25:39 +02:00
Dennis Schubert
aae11e07ae Merge branch 'stable' into develop 2015-05-25 04:23:33 +02:00
Benjamin Neff
b491ecac31 wrap the sidekiq logger to add the context info again 
closes #5988
 2015-05-25 04:23:28 +02:00
Dennis Schubert
f9f73f56db Merge branch 'stable' into develop 2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services 
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
 2015-05-25 04:18:38 +02:00
Jonne Haß
3e35ef0b63 Merge branch 'stable' into develop 2015-05-24 11:16:09 +02:00
Benjamin Neff
986ad0df14 fix validation for status-message when the author is missing 
closes #5986
 2015-05-24 11:16:05 +02:00
Dennis Schubert
2ca0a17ee0 Merge branch 'stable' into develop 2015-05-24 02:30:08 +02:00
Benjamin Neff
8531b160a6 gracefully handle when a like is already deleted again 
closes #5983
 2015-05-24 02:30:02 +02:00
Dennis Schubert
ba9b947173 Merge branch 'stable' into develop 2015-05-23 01:24:14 +02:00
Benjamin Neff
68f7208ff5 use id from preloaded gon.post to fix broken liking with guid 
closes #5978
 2015-05-23 01:24:09 +02:00
Dennis Schubert
70dc4fcab1 Merge branch 'stable' into develop 2015-05-22 02:53:55 +02:00
Benjamin Neff
be3b2852be use logging-logger for sidekiq 
closes #5975
 2015-05-22 02:53:50 +02:00
Jonne Haß
9b7a3c86e6 Merge branch 'stable' into develop 2015-05-21 00:46:59 +02:00
Benjamin Neff
9cc0faa4e6 fixes reshares with no text but with photo 
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92

closes #5976
 2015-05-21 00:46:50 +02:00
Jonne Haß
5a3b62d801 Merge branch 'stable' into develop 2015-05-19 10:42:44 +02:00
Benjamin Neff
9a4a7255e7 remove unused older and newer methods for posts 
last renamed in 8386179f16

closes #5970
 2015-05-19 10:42:39 +02:00
Dennis Schubert
2549f44b7c Merge branch 'stable' into develop 2015-05-19 03:00:56 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view 
closes #5968
 2015-05-19 03:00:51 +02:00
Benjamin Neff
cde9b24476 fix margin/padding for "original post deleted"-message 2015-05-19 02:59:31 +02:00
Benjamin Neff
267a1df3c4 fix root_diaspora_id when root was deleted 2015-05-19 02:59:31 +02:00
Dennis Schubert
6a1ec27b3c Merge branch 'stable' into develop 2015-05-19 02:58:41 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email 
closes #5967
 2015-05-19 02:58:37 +02:00
Dennis Schubert
3446cb2f3f Merge branch 'stable' into develop 2015-05-18 03:31:17 +02:00
Benjamin Neff
a396a246ee remove unused hasPhotos and hasText functions 
- added in a836b06d3e
- removed in 49ea8c8563

closes #5969
 2015-05-18 03:31:11 +02:00
Dennis Schubert
944c57f874 Merge branch 'stable' into develop 2015-05-18 03:23:43 +02:00
Benjamin Neff
494c03a3fd re add user atom feed on profile-page 2015-05-18 03:23:15 +02:00
Benjamin Neff
196e438286 remove some hardcoded diasporahq hax 2015-05-18 03:23:14 +02:00
Jonne Haß
13b69f81d1 Merge branch 'stable' into develop 2015-05-16 13:54:05 +02:00
Benjamin Neff
d74e20a790 fetch public posts when someone starts sharing with you 
closes #5960
 2015-05-16 13:54:01 +02:00
Dennis Schubert
3ae370780c Merge branch 'stable' into develop 2015-05-16 03:42:18 +02:00
Steffen van Bergerem
716952dc0d Put 'email not visible' text into popover/tooltip 
closes #5956
 2015-05-16 03:42:14 +02:00
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
Dennis Schubert
1f084c28a8 Merge branch 'stable' into develop 2015-05-16 03:40:24 +02:00
Jason Robinson
ce16a122fc Fix missing localization of inactive user removal warning emails. 
Fixes #5950
 2015-05-16 03:40:06 +02:00
Dennis Schubert
84dc40326a Merge branch 'stable' into develop 2015-05-16 03:36:30 +02:00
Jason Robinson
aec2467e98 Fix inactive user removal not respecting configuration for daily limits 
It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test.

closes #5953
 2015-05-16 03:36:25 +02:00
Dennis Schubert
aac0a2582e Merge branch 'stable' into develop 2015-05-12 04:00:12 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Jonne Haß
890029b19e Merge branch 'stable' into develop 2015-05-10 14:26:26 +02:00
Dennis Schubert
1a4e3cef48 Mute ActiveRecord::RecordInvalid due to ignores 
closes #5943
 2015-05-10 14:26:21 +02:00
Dennis Schubert
32f95a860c We don't always have invalid record messages ... so log the exception message instead. 2015-05-10 14:25:50 +02:00
Dennis Schubert
3f3148af2c Merge branch 'stable' into develop 2015-05-10 02:00:41 +02:00
Steffen van Bergerem
0c5443d543 Make js-routes use compact and camelcase function names 
closes #5941
 2015-05-10 02:00:30 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Jonne Haß
59e77675ce Merge branch 'stable' into develop 2015-05-10 00:10:19 +02:00
Dennis Schubert
6273c2959a Rescue from private objects sent to the public api 
closes #5938
 2015-05-10 00:10:12 +02:00
Dennis Schubert
915dee3c4b Mute some ActiveRecord::RecordNotUnique exceptions 2015-05-10 00:09:25 +02:00
Dennis Schubert
300376a854 Merge branch 'stable' into develop 2015-05-09 23:49:05 +02:00
Steffen van Bergerem
05ec235ea3 Pass along current_user in ContactPresenter#full_hash_with_person 
closes #5936
 2015-05-09 23:48:59 +02:00
Dennis Schubert
b05d183f91 Merge branch 'stable' into develop 2015-05-07 04:10:28 +02:00
Steffen van Bergerem
06e6e1db78 Remove private post content of also commented mails 
merges #5931
 2015-05-07 04:10:21 +02:00
Jonne Haß
abeb99bb7c Merge pull request #5930 from Raven24/fix3076 
limit the GET request to the bookmarklet to ~2000 chars
 2015-05-05 21:32:44 +02:00
Florian Staudacher
5c012e7871 limit the parameter length for the GET request to the bookmarklet to ~2000 chars 2015-05-05 18:25:01 +02:00
Jonne Haß
bd17c528e1 Merge branch 'stable' into develop 2015-05-05 18:02:26 +02:00
Rich
2ce0e8045b Change <subtitle> branding on atom feeds 
Minor consistency change ( from Diaspora to diaspora* )

closes #5929
 2015-05-05 18:02:14 +02:00
Jonne Haß
4a7c358be9 Merge branch 'stable' into develop 2015-05-05 01:39:52 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Dennis Schubert
9db8cea504 Merge branch 'stable' into develop 2015-05-04 04:42:20 +02:00
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Jonne Haß
2570d88cc3 Merge pull request #5904 from Raven24/JesseWeinstein-patch-1 
prefill bookmarklet with markdown-formatted content
 2015-05-04 04:10:03 +02:00
Jonne Haß
971a3dd021 Merge branch 'stable' into develop 2015-05-04 04:04:48 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
2dc7f4c2b5 Merge branch 'stable' into develop 2015-05-04 03:51:38 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Jonne Haß
234e205602 Merge branch 'stable' into develop 2015-05-04 03:38:44 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Jonne Haß
8172eee43c Merge branch 'stable' into develop 2015-05-04 03:31:34 +02:00
Steffen van Bergerem
1fc31cc313 Fix close account for mobile view 
and use Bootstrap modal for desktop close account
 2015-05-04 03:31:28 +02:00
Jonne Haß
f257658e46 Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations"" 
This reverts commit 2c7848e3cb.
 2015-05-04 00:43:41 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" 
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
 2015-05-04 00:36:27 +02:00
Florian Staudacher
0bb316e893 update bookmarklet 
* snippet now in a separate JS file - compiled and uglified with the other assets
* popup gets centered in opening browser window
* publisher gets pre-filled with markdown-styled content
 2015-05-01 20:20:46 +02:00
Florian Staudacher
9479be6360 Merge branch 'patch-1' of git://github.com/JesseWeinstein/diaspora into JesseWeinstein-patch-1 2015-05-01 13:18:46 +02:00
Jonne Haß
59e8fc93a2 Merge pull request #5559 from SWW13/aspect_sort 
Readd aspect sorting
 2015-04-30 13:02:24 +02:00
Steffen van Bergerem
31bbfe8eab Merge pull request #5887 from szlend/5874-fix-bold-links 
Issue #5874 Fix styled links
 2015-04-30 11:05:24 +02:00
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