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

7686 commits

Author SHA1 Message Date
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
3e5eb350ae Notification dropdown: 'mark all as read' link scroll fix 2015-04-03 02:21:06 +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
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