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

7894 commits

Author SHA1 Message Date
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +02:00
Jonne Haß
67de83f325 Merge pull request #6080 from svbergerem/user-edit-remove-cancel-button 
Remove cancel button from user edit
 2015-06-08 01:07:51 +02:00
Jonne Haß
3975f02f2c Merge pull request #6081 from svbergerem/email-visibility 
Fix Bootstrap 3 regression: add email visibility icon to settings page
 2015-06-08 01:07:35 +02:00
Dennis Schubert
e0420d733a Merge branch 'stable' into develop 2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +02:00
Benjamin Neff
0ffb83d351 load conversations and visibilities in one query with correct order 2015-06-08 00:44:41 +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
Steffen van Bergerem
9ad58c94a1 Remove cancel button from user edit 2015-06-07 21:49:11 +02:00
Jonne Haß
1c834d49d8 Merge branch 'stable' into develop 2015-06-07 21:14:51 +02:00
Benjamin Neff
735d692ac0 fix selected week on weekly stats page 
closes #6079
 2015-06-07 21:14:47 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +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
Jonne Haß
c054d17bbb Merge pull request #6074 from svbergerem/mobile-notification-padding 
Fix some Bootstrap 3 regressions
 2015-06-07 17:23:08 +02:00
Jonne Haß
fe8b06bb36 Merge pull request #6073 from svbergerem/mobile-contacts 
Bootstrap 3 regression: Fix mobile contacts view
 2015-06-07 15:08:25 +02:00
Steffen van Bergerem
4f9ac8dd96 Fix Bootstrap 3 regressions 
* mobile notification padding
* width of mobile notifications and stream page
 2015-06-07 12:48:12 +02:00
Steffen van Bergerem
fcb9b001a2 Bootstrap 3 regression: Fix mobile contacts view 2015-06-07 12:13:21 +02: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
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