Commit graph

16645 commits

Author SHA1 Message Date
Pablo Cuadrado
267d98f132 leftnavbar with full sized clickable anchors, better padding, weight font reduced, overall looks polished
fixed background added for contrast, hideable on SM or XS bootstrap-based sizes.
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
c38da4c787 controlling right sidebar behaviour on large screens 2015-08-11 18:08:13 +02:00
Pablo Cuadrado
754d8107a8 reasonable max-width for right sidebar 2015-08-11 18:08:12 +02:00
Pablo Cuadrado
9bd7ceb722 removing uppercase to prevent l18n issues 2015-08-11 18:08:12 +02:00
Pablo Cuadrado
c8ba4f061e polishing of the right sidebar 2015-08-11 18:08:12 +02:00
Steffen van Bergerem
e8acaa08ad Remove browser detection 2015-08-10 22:55:05 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +02:00
Jonne Haß
25be9ecfd2 Merge branch 'stable' into develop 2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae Extract service from comments controller
closes #6307
2015-08-09 18:35:11 +02:00
Jonne Haß
5cc88b8177 Merge pull request #6305 from jaywink/social-relay-trim-whitespace-on-tags
Strip leading/trailing whitespace from pod tags list in social relay well known
2015-08-09 10:50:54 +02:00
Jason Robinson
cb909c0d70 Strip leading/trailing whitespace from pod tags list in social relay well known
Closes #6303
2015-08-09 00:33:35 +03:00
Jonne Haß
480384a077 Merge branch 'stable' into develop 2015-08-06 22:56:30 +02:00
Steffen van Bergerem
dc576fb0d6 Check if person is nil in person_image_tag
closes #6286
2015-08-06 22:55:41 +02:00
Steffen van Bergerem
0aa453e437 Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile
Use entypo icons on mobile posts
2015-08-06 18:00:03 +02:00
augier
f917757b5b Use entypo icons on mobile posts 2015-08-06 15:56:58 +02:00
Steffen van Bergerem
633d65fe27 Merge branch 'stable' into develop 2015-08-06 14:42:28 +02:00
Anton Tkachov
f1d6e9440b Issue #6281: add url to hovercard avatar
closes #6297
2015-08-06 14:42:14 +02:00
Jonne Haß
85f9a0eaa9 Merge branch 'stable' into develop 2015-08-04 10:41:43 +02:00
Mikica Ivosevic
78b0fbbee6 Refactor HomeController#toggle_mobile
closes #6260
2015-08-04 10:41:21 +02:00
Jonne Haß
ed4b2a2c4b Merge branch 'stable' into develop 2015-08-03 03:12:37 +02:00
Jonne Haß
7c611ca509 rubocop: skip db/schema.rb [ci skip] 2015-08-03 03:11:43 +02:00
Steffen van Bergerem
b9db891fef Merge pull request #6283 from AugierLe42e/clean-images
Suppress useless images
2015-08-02 23:26:46 +02:00
augier
5087f47e44 Suppress useless images 2015-08-02 21:42:09 +02:00
Jonne Haß
b7864a9976 Merge branch 'stable' into develop 2015-08-02 16:58:07 +02:00
theworldbright
cae5f94af0 Refactor status messages controller
closes #6280
2015-08-02 16:58:01 +02:00
Dennis Schubert
db9c39b6eb Merge pull request #6277 from svbergerem/use-css-spinner
Use css spinner instead of gif
2015-08-01 21:30:14 +02:00
Jonne Haß
22a8997c47 Merge branch 'stable' into develop 2015-08-01 20:05:29 +02:00
theworldbright
b3242500b0 Disable ambiguous regex for step definitions
Signed-off-by: theworldbright <kent@kentshikama.com>

closes #6272
2015-08-01 20:05:24 +02:00
Steffen van Bergerem
8e99a240c9 Use css spinner instead of gif 2015-08-01 13:00:48 +02:00
Lukas Matt
c95164a7e9 bump diaspora_jsxc to v0.1.3
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-07-31 00:36:38 +02:00
Lukas Matt
fbc88ab56f Adjusting chat implementation into diaspora container
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-07-30 22:42:33 +02:00
Lukas Matt
524a0bdaf0 Obsolete with diaspora/jsxc#113
Using the logout element caused some trouble in the past

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-07-30 22:41:47 +02:00
Lukas Matt
9a96836594 Load bower dependencies on jsxc initialization
We moved the libraries from jsxc.deb.js

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-07-30 22:40:19 +02:00
Jonne Haß
248fa9213b Merge pull request #6274 from svbergerem/mobile-getting-started-input-field
Add Bootstrap classes to mobile getting started input fields
2015-07-30 15:39:36 +02:00
Steffen van Bergerem
bc89f73179 Add Bootstrap classes to mobile getting started input fields 2015-07-30 14:44:14 +02:00
Jonne Haß
2a06d78d12 Merge branch 'stable' into develop 2015-07-30 12:04:50 +02:00
theworldbright
23bea8e3d3 Raise rubocop abc size metric from 15 to 20
closes #6271
2015-07-30 12:04:46 +02:00
Jonne Haß
4442616b0d Merge branch 'stable' into develop 2015-07-30 12:01:35 +02:00
Steffen van Bergerem
536d1fe0e7 Move nsfw-shield to status-message
closes #6270
2015-07-30 12:00:48 +02:00
Jonne Haß
cf13672148 Stabilize mobile/not_safe_for_work.feature 2015-07-30 11:39:40 +02:00
Jonne Haß
18413fe3c9 bump bootstrap-sass 2015-07-30 05:10:02 +02:00
Jonne Haß
1c62bab271 bump pg 2015-07-30 05:08:31 +02:00
Dennis Schubert
2a55578cf2 Merge branch 'stable' into develop 2015-07-30 05:07:47 +02:00
Jonne Haß
ed463750b1 bump font-awesome-rails 2015-07-30 05:03:08 +02:00
Jonne Haß
f506258324 bump timecop 2015-07-30 05:03:08 +02:00
Jonne Haß
3f39555223 bump gon 2015-07-30 05:03:08 +02:00
Jonne Haß
2280edaa85 bump devise_lastseenable 2015-07-30 05:03:08 +02:00
Jonne Haß
7f0d178092 bump selenium-webdriver 2015-07-30 05:02:54 +02:00
Jonne Haß
b6a83415b0 bump sass 2015-07-30 04:52:55 +02:00
Jonne Haß
3be5acef8c bump request_store 2015-07-30 04:51:59 +02:00