Jonne Haß
e274470d55
Replace default.html with a regular view
...
So we can correctly reference the images
2015-03-28 23:12:07 +01:00
Dennis Schubert
61c2fbf5ef
Merge pull request #5817 from jhass/generated_error_pages
...
Generate error pages on assets:precompile
2015-03-28 21:46:35 +01:00
Jonne Haß
1d5d872d2b
Merge pull request #5821 from svbergerem/fix-layout-regression
...
Fix layout regression: missing header on search page
2015-03-28 14:46:23 +01:00
Steffen van Bergerem
176938c486
Fix layout regression: missing header on search page
2015-03-28 13:54:52 +01:00
Jonne Haß
331f4ed988
updated 80 locale files [ci skip]
2015-03-27 11:44:44 +01:00
Jonne Haß
e7d0a978ba
Generate error pages on assets:precompile
...
This allows us to reuse any CSS we have, unify
their look and unify their look with the regular
page design.
This works by instantiating ActionView and rendering
templates in a rake task.
Inspired by the errgent gem.
2015-03-27 11:15:59 +01:00
Dennis Schubert
b07ad67946
Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message
...
Add 'no contacts in this aspect yet' message
2015-03-27 03:50:42 +01:00
Steffen van Bergerem
9069fd235d
Add 'no contacts in this aspect yet' message
2015-03-27 03:20:42 +01:00
Dennis Schubert
aff728833a
Merge pull request #5818 from svbergerem/fix-frontend-regressions
...
Fix frontend regressions
2015-03-27 01:30:44 +01:00
Steffen van Bergerem
c9457ffd86
Add missing .container to admin pages, add note to changelog
2015-03-26 23:51:41 +01:00
Steffen van Bergerem
6f7f820ff4
Fix oembed style regression
2015-03-26 23:51:08 +01:00
Steffen van Bergerem
b69239ed2f
Merge pull request #5791 from SansPseudoFix/5745-Conversation-pagination-design-is-broken
...
Fix for 5745 - conversation pagination design is broken
2015-03-26 20:05:24 +01:00
SansPseudoFix
a97bfec39c
add option pagination
...
center pagination
Fix pagination css
Symbols for previous and next
modified: app/assets/stylesheets/conversations.scss
modified: app/views/conversations/index.haml
Add responsive pagination
Fix broken pagination
modified: app/assets/stylesheets/conversations.scss
modified: app/views/conversations/index.haml
Fix broken pagination for mobile
Mobile pagination
Unify desktop and mobile background
change background color
2015-03-26 19:53:23 +01:00
Steffen van Bergerem
241ac83f17
bump ruby-progressbar
2015-03-26 18:14:52 +01:00
Jonne Haß
2eaa5a4d3b
Merge pull request #5816 from svbergerem/remove-footer-stream-pages
...
Remove footer from stream and profile pages
2015-03-26 17:30:13 +01:00
Steffen van Bergerem
3a202d8fa9
Remove footer from stream and profile pages
2015-03-26 16:28:01 +01:00
Jonne Haß
b047013dd0
Merge pull request #5814 from svbergerem/update-markdown-it
...
Update markdown-it
2015-03-26 10:16:22 +01:00
Steffen van Bergerem
153efe7d7a
Change url to image-url in registration.css, added in #5743
2015-03-26 01:13:11 +01:00
Steffen van Bergerem
f3cbaddac4
Merge pull request #5743 from Flaburgan/change-make-something
...
Replace Make Something text by the diaspora ball logo on registration page
2015-03-26 01:10:58 +01:00
flaburgan
ef977a170f
Replace Make Something text by the diaspora ball logo on registration page
...
Add ball.svg to /graphics
2015-03-26 00:32:41 +01:00
Steffen van Bergerem
adf9bcf8e8
Update markdown-it
2015-03-26 00:07:25 +01:00
Jonne Haß
ea58c95fa0
Switch back to database cleaner
...
database_rewinder seems to cause deadlocks in postgres and other
subtle bugs for us.
2015-03-25 13:37:56 +01:00
Jonne Haß
3df3b89625
Merge pull request #5812 from diaspora/update_gems
...
Update gems
2015-03-25 13:29:51 +01:00
Jonne Haß
b58beb75fb
Update bundler on CI
2015-03-25 02:33:58 +01:00
Jonne Haß
15cdb552ba
bump systemu
2015-03-25 02:33:58 +01:00
Jonne Haß
30fcf4229e
bump fog
2015-03-25 02:33:58 +01:00
Jonne Haß
a6b61c473c
bump ruby-progressbar
2015-03-25 02:33:58 +01:00
Jonne Haß
4f887ba5d5
bump jwt
2015-03-25 02:33:57 +01:00
Jonne Haß
699bd6e597
bump excon
2015-03-25 02:33:57 +01:00
Jonne Haß
3b1e93cb30
bump test_after_commit
2015-03-25 02:33:57 +01:00
Jonne Haß
d1c42c77ba
bump sinatra
2015-03-25 02:33:57 +01:00
Jonne Haß
80957a769f
bump sidekiq
2015-03-25 02:33:57 +01:00
Jonne Haß
65a738e604
bump rspec-rails
2015-03-25 02:33:56 +01:00
Jonne Haß
03680ef718
bump rails_admin
2015-03-25 02:08:44 +01:00
Jonne Haß
ae93a1eef2
bump rails-assets-jasmine-ajax
2015-03-24 22:15:40 +01:00
Jonne Haß
a92ad87e94
bump pry-byebug
2015-03-24 22:15:02 +01:00
Jonne Haß
38b1f792a4
bump mini_magick
2015-03-24 22:13:33 +01:00
Jonne Haß
9f6ca586a1
bump guard
2015-03-24 22:12:51 +01:00
Jonne Haß
f0b7d68399
bump autoprefixer-rails
2015-03-24 22:11:08 +01:00
Jonne Haß
a30295dcc6
bump acts-as-taggable-on
2015-03-24 22:06:02 +01:00
Jonne Haß
451c4c2f57
use explicit source for rails-assets.org gems
2015-03-24 18:55:04 +01:00
Jonne Haß
61461db913
fix jasmine spec for correct reshare behavior
2015-03-24 17:20:33 +01:00
Jonne Haß
73b6c75278
On reshare insert the reshare built from the response
...
Also make sure comments_count and the like is always set in the
response.
2015-03-23 23:02:23 +01:00
Jonne Haß
42977333c4
fix javascript pluaralization rules
2015-03-23 20:53:52 +01:00
Jonne Haß
d4d68b10cc
update plural rules
2015-03-23 19:27:38 +01:00
Jonne Haß
cb1203d36e
updated 105 locale files [ci skip]
2015-03-23 15:51:27 +01:00
Jonne Haß
c0c5bb490a
Merge pull request #5809 from svbergerem/refactor-post-content-css
...
Refactor post content css, fix margin-bottom for lists in comments
2015-03-23 15:47:32 +01:00
Steffen van Bergerem
4d6c513b8e
Refactor post content css, fix margin-bottom for lists in comments
2015-03-22 02:19:36 +01:00
Steffen van Bergerem
50c187537d
Merge pull request #5721 from sam09/fixissue5626
...
Added margin top to lists. Fixes issue #5626
2015-03-22 00:38:51 +01:00
Sam Radhakrishnan
af410ef4e5
Added margin top to lists. Fixes issue5626
2015-03-22 02:43:01 +05:30
