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 |
|
Jonne Haß
|
9f058b19a1
|
Merge pull request #5805 from visualsayed/5804-order-of-comments-on-the-mobile-version-is-reversed
order-of-comments-on-the-mobile-version-is-reversed #5804
|
2015-03-21 15:44:32 +01:00 |
|
Sayed
|
e21afc6636
|
order-of-comments-on-the-mobile-version-is-reversed #5804
|
2015-03-21 15:20:57 +02:00 |
|
Jonne Haß
|
644fc46dee
|
Merge pull request #5792 from MothOnMars/4020-role-specs
added specs and validations for Role model
|
2015-03-20 01:54:04 +01:00 |
|
Jonne Haß
|
0226cb9542
|
Merge pull request #5802 from jhass/rails42
bump to rails 4.2.1
|
2015-03-20 01:52:19 +01:00 |
|
Jonne Haß
|
496a16d14d
|
Merge pull request #5799 from svbergerem/invitation-input
Unify invite code and contacts page link style
|
2015-03-20 01:52:00 +01:00 |
|
Jonne Haß
|
241d12d824
|
Merge pull request #5798 from svbergerem/remove-centered-layout
Remove layout 'centered_with_header_with_footer'
|
2015-03-20 01:51:27 +01:00 |
|
Jonne Haß
|
51af6c3010
|
Merge pull request #5794 from svbergerem/jshint-guard
Use jshintrb and guard-jshintrb instead of jshint
|
2015-03-20 01:50:09 +01:00 |
|
Jonne Haß
|
9d85c488e3
|
bump to rails 4.2.1
|
2015-03-19 18:39:17 +01:00 |
|
Steffen van Bergerem
|
4a7781f1e7
|
Unify invite code and contacts page link style
|
2015-03-19 02:46:25 +01:00 |
|
Steffen van Bergerem
|
d9bf4a2fa6
|
Remove layout 'centered_with_header_with_footer'
|
2015-03-18 21:59:56 +01:00 |
|
Martha
|
d4f1a5dbe8
|
added specs and validations for Role model
- added shoulda-matchers gem for one-line specs
- added FactoryGirl syntax methods
|
2015-03-18 09:16:15 -07:00 |
|
Steffen van Bergerem
|
6d070c818c
|
Use jshintrb and guard-jshintrb instead of jshint
|
2015-03-18 10:49:17 +01:00 |
|
Dennis Schubert
|
efa2f43f72
|
Merge pull request #5793 from svbergerem/uncomment-jasmine-tests
Uncomment jasmine tests
|
2015-03-18 04:13:32 +01:00 |
|