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

1389 commits

Author SHA1 Message Date
Steffen van Bergerem
db00bd1b03 Fix conversation modal on contacts page 2015-07-03 17:44:12 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Dennis Schubert
8b773c89e1 Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments 
Fix for #5483 and #5757 (mobile stream comments)
 2015-06-27 04:43:50 +02:00
Jonne Haß
a2d894cb39 Improve stability for manages_aspects.feature:79 
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.

The fix is to use Capybaras drag_to instead
 2015-06-24 04:01:15 +02:00
Jonne Haß
0b6dc320cb Merge pull request #6132 from svbergerem/fix-perfect-scrollbar 
Fix overflow with perfect scrollbar
 2015-06-22 01:29:40 +02:00
Steffen van Bergerem
df12878371 Fix overflow with perfect scrollbar 2015-06-22 00:44:42 +02:00
Steffen van Bergerem
d6ddbbe4af Navbar background color for autocomplete results 2015-06-21 21:13:57 +02:00
Jonne Haß
79c5202a5b Merge pull request #6109 from svbergerem/bootstrap-header-rewrite 
Bootstrap header rewrite
 2015-06-21 19:46:07 +02:00
SansPseudoFix
57ac37cd2d Fix broken avatar getting start page 
Update add contact page

BS3

Fix syntax
 2015-06-21 16:38:12 +02:00
Steffen van Bergerem
8d5794a2a4 Fix autoresize default height for comment box 2015-06-21 04:40:56 +02:00
Steffen van Bergerem
b3c535bab4 Add color theme support for new header 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
fla
264f41a09d Add Services and Privacy settings page to mobile 2015-06-18 17:26:31 +02:00
theworldbright
3ac66128ad Restyle button and adjust position of back up arrow 
Squashed commits:
[47c4a02] Remove styling for return to top of post button
 2015-06-17 22:23:25 +09:00
theworldbright
5fa4519e93 Fix #5757 (+2 squashed commits) 
Squashed commits:
[e10acde] Open reactions after commenting
[aceea75] Fix hound remarks and reactions tests
The ".comment_action" should be active when the
user clicks on "a.show comments"

[d1deae5] Fix hound remarks
[f5db5dd] Keep current instead of scrolling to first comment
[be63092] Remove unused evt parameter
 2015-06-17 22:23:25 +09:00
theworldbright
7dc70c7311 Fix #5483 
Please see https://github.com/diaspora/diaspora/issues/5483#issuecomment-109277476 (+5 squashed commits)
Squashed commits:
[62f38a6] Wrap all handlers with document.ready()

Also add the copyright at the top of the file.
[e861587] Split up show_comments handling

Currently there are two classes that have the
class show_comments. I renamed one to
"back_to_stream_element_top" as it is responsible
for scrolling the user all the way up to the top
when clicked. The other which toggles the
reactions will remain as "show_comments".
[a8dbc4e] Remove unused "cancel new comment" action
[db575cc] Move comment related js to mobile_comments.js
[de44f81] Move add comment container to new comment partial
 2015-06-17 22:23:25 +09:00
Jonne Haß
93281d283f Merge branch 'stable' into develop 2015-06-17 12:40:27 +02:00
Pablo Cuadrado
c050c606c2 this was causing an empty element to be created 
closes #6111
 2015-06-17 12:40:22 +02:00
Steffen van Bergerem
ae0209b49b Merge branch 'stable' into develop 2015-06-16 23:43:32 +02:00
Jonne Haß
3a527d01da Remove top margin for first heading in a post 
That is, if it's the first element in the post

closes #6110
 2015-06-16 23:43:14 +02:00
Steffen van Bergerem
b3a5e92eca Remove all faceboxes 2015-06-15 14:09:24 +02:00
Steffen van Bergerem
ab60644aa0 Merge pull request #6087 from Flaburgan/improve-mobile-conversation-design 
Improve mobile conversation design
 2015-06-15 13:26:49 +02:00
fla
44a12e74b1 Improve mobile conversation design 2015-06-15 12:32:03 +02:00
Jonne Haß
50dbe0db80 Merge pull request #6102 from svbergerem/close-account-regression 
Fix Bootstrap 3 regression: close account
 2015-06-14 22:21:11 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
Steffen van Bergerem
4534ba5de8 Fix Bootstrap3 regression: close account 2015-06-14 13:22:39 +02:00
Steffen van Bergerem
18a8211cc3 Add img-responsive to image class 2015-06-12 00:01:56 +02:00
Jonne Haß
72bb85eeba Merge branch 'stable' into develop 2015-06-08 16:59:31 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar 
closes #6085
 2015-06-08 16:59:27 +02:00
Steffen van Bergerem
6c32fa7845 Fix Bootstrap 3 regression: add email visibility icon to settings page 2015-06-07 22:31:58 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
dimana
31d760867c Issue #4297: Updated color themes and testing 2015-06-07 19:57:37 +03:00
efstrian
57d766346c Issue #4297: Enable color theme setup 2015-06-07 19:57:16 +03:00
Steffen van Bergerem
06a1a1c978 Fix Bootstrap3 regression: reshares in SPV 2015-06-07 12:01:13 +02:00
Jonne Haß
4ae032e61d Merge pull request #6071 from svbergerem/upload-images-style 
Fix progress bar in publisher when uploading images
 2015-06-07 11:26:39 +02:00
Augier
0d0d5d6aa1 Fixing infinite scroll and notif dropodown loaders 2015-06-07 10:28:22 +02:00
Steffen van Bergerem
a7446dd5cd Fix progress bar in publisher when uploading images 2015-06-07 03:43:57 +02:00
Steffen van Bergerem
7b7700b317 Bootstrap3 regression fixes: avatars for likes, aspect dropdown on notification page, tag input 2015-06-05 12:09:42 +02:00
Steffen van Bergerem
fd3da0f0b3 Profile padding fixes 2015-06-05 02:37:43 +02:00
Steffen van Bergerem
0a0c3f48f2 Merge pull request #6057 from AugierLe42e/drawer-fix 
Fixed variable drawer width
 2015-06-05 00:21:36 +02:00
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