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
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
theworldbright
e372b4eb95
Remove some inline css and minor refactoring
2015-06-04 18:05:43 +02:00
Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +02:00
Jonne Haß
e39d024ba1
Merge branch 'stable' into develop
2015-06-04 11:31:43 +02:00
Jonne Haß
bb24b8bedb
bump BUNDLED WITH [ci skip]
...
See https://github.com/bundler/bundler/issues/3697
2015-06-04 11:27:37 +02:00
Jonne Haß
f9ce41bae4
bump fixture_builder
2015-06-04 10:58:01 +02:00
Dennis Schubert
b41007fae7
Merge branch 'stable' into develop
2015-06-04 04:18:34 +02:00
Benjamin Neff
27b4a44e4a
replace Rails.logger with logging-logger
...
closes #6041
2015-06-04 04:17:15 +02:00
Benjamin Neff
b6c46b3fc4
add logging mixin and replace federation-logger
2015-06-04 04:16:03 +02:00
Jonne Haß
3850118e4e
Merge branch 'stable' into develop
2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e
Set default for post title truncation to 70 characters
...
closes #6022
2015-06-02 12:14:35 +02:00
