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
