Jonne Haß
bb9a15ceac
Merge pull request #6033 from ATSE-TheBeginners/4297-color-themes
...
Issue #4297 : Color themes
2015-06-07 21:11:33 +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
Jonne Haß
6720110a4b
Merge pull request #6072 from svbergerem/fix-spv-reshare-style
...
Fix Bootstrap3 regression: reshares in SPV
2015-06-07 15:08:01 +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ß
ab1e879cc2
Merge branch 'stable' into develop
2015-06-07 11:36:12 +02:00
Benjamin Neff
2571b042c6
only log private stuff to debug
...
closes #6069
2015-06-07 11:36:07 +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
Steffen van Bergerem
dbd8a91d94
Merge pull request #6070 from AugierLe42e/infinite-scroll-fix
...
Fixing infinite scroll and notif dropodown loaders
2015-06-07 11:11:34 +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
Dennis Schubert
3a07be1243
Merge branch 'stable' into develop
2015-06-06 17:55:01 +02:00
Benjamin Neff
0b5bf2e340
add simplecov for test-coverage
...
works with rubymine
closes #6065
2015-06-06 17:54:57 +02:00
Jonne Haß
7bfa0f857c
Merge branch 'stable' into develop
2015-06-06 15:23:44 +02:00
Jonne Haß
6c71d9f257
Only strip text direction markers around hashtags for now
...
Fixes #6067
2015-06-06 15:23:12 +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
Jonne Haß
e0a4d778fd
Merge branch 'stable' into develop
2015-06-05 09:44:29 +02:00
Jonne Haß
fe3d8814c4
add rubocop binstub [ci skip]
2015-06-05 09:44:22 +02:00
Jonne Haß
8df9cb9cd2
Merge branch 'stable' into develop
2015-06-05 09:40:39 +02:00
Benjamin Neff
214ce1cf6e
change path to uma.jpg to /assets
...
closes #6064
2015-06-05 09:40:34 +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
Jonne Haß
c1813aafa6
Merge pull request #6059 from svbergerem/bootstrap3-likes-style
...
Bootstrap3: fix likes avatars and conversation participants
2015-06-04 22:56:52 +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
Jonne Haß
63554e222d
Fix production override for listen setting
2015-06-04 22:03:07 +02:00
Jonne Haß
e3605f471c
Merge branch 'stable' into develop
2015-06-04 21:24:07 +02:00
Jonne Haß
d5c873d549
Disable Style/MultilineOperationIndentation [ci skip]
2015-06-04 21:23:31 +02:00
Jonne Haß
432f99e001
Merge pull request #6055 from jhass/bootstrap3
...
Port to Bootstrap3 (rebased)
2015-06-04 19:40:55 +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
676c0ab611
Add missing translation for lock account
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
Steffen van Bergerem
b7f4feacce
Fix failing notification cukes
2015-06-04 18:05:44 +02:00
