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 |
|
Steffen van Bergerem
|
a161e4d3a7
|
Uncomment jasmine tests
|
2015-03-18 00:01:22 +01:00 |
|
Jonne Haß
|
5115582c55
|
Merge pull request #5790 from visualsayed/5693-reshare-count-broken-on-mobile-stream
fix missing reshares count on mobile stream #5693
|
2015-03-17 21:27:44 +01:00 |
|
Sayed
|
bf3d903c11
|
refactor mobile stream post_stats
|
2015-03-17 20:37:16 +02:00 |
|
Sayed
|
99f42cb643
|
fix missing reshares count on mobile stream
|
2015-03-17 01:14:22 +02:00 |
|
Steffen van Bergerem
|
0856eb8f86
|
Merge pull request #5788 from AugierLe42e/fix-search-element-selection
Fixes #5787
|
2015-03-16 23:36:51 +01:00 |
|
Augier
|
571685d590
|
Fix the broken searchbar (#5787)
|
2015-03-16 22:07:51 +01:00 |
|
Jonne Haß
|
ea4b590943
|
Merge pull request #5789 from svbergerem/unnecessary-on-home-page-steps
Remove unnecessary 'on the home page' steps
|
2015-03-16 16:37:41 +01:00 |
|
Steffen van Bergerem
|
d40cbd0b2b
|
Remove unnecessary 'on the home page' steps
|
2015-03-16 14:36:35 +01:00 |
|
Jonne Haß
|
dcfe9757aa
|
make Gemfile offence free
|
2015-03-16 12:50:05 +01:00 |
|
Jonne Haß
|
69285b955c
|
Enable Ruby linting
* Add Rubocop
* Add guard-rubocop
* Enable Ruby linting on Hound
|
2015-03-16 12:46:13 +01:00 |
|
Jonne Haß
|
e4a79fb77b
|
Merge pull request #5786 from svbergerem/refactor-sidebar-css
Refactor and improve sidebar css
|
2015-03-16 12:14:34 +01:00 |
|
Steffen van Bergerem
|
e7ec3d495f
|
Refactor and improve sidebar css
|
2015-03-16 02:03:53 +01:00 |
|
Jonne Haß
|
256d7862b9
|
Merge pull request #5782 from svbergerem/reshared-poll
Display reshared poll
|
2015-03-15 20:45:51 +01:00 |
|
Jonne Haß
|
5ea90016b3
|
Merge pull request #5783 from visualsayed/5737-too-long-tag-name
5737 too long tag name
|
2015-03-15 18:06:53 +01:00 |
|
Steffen van Bergerem
|
81cd1753e4
|
Improve link to original post in reshared polls
|
2015-03-15 17:07:16 +01:00 |
|
Jonne Haß
|
6b217c32f2
|
Shorten index for tweet_id too in mysql utf8mb4 migration
|
2015-03-15 16:59:50 +01:00 |
|
Hincu Petru
|
9589cb2e0f
|
disable poll voting for reshared post
|
2015-03-15 16:46:48 +01:00 |
|
Jonne Haß
|
414cfbdae0
|
Array#to_h is new in Ruby 2.1, we still suppport 2.0
|
2015-03-15 15:59:06 +01:00 |
|
Sayed
|
18a1958ef8
|
fix too long tag name #5737
|
2015-03-15 16:15:33 +02:00 |
|
Steffen van Bergerem
|
c3bf9dd831
|
Merge pull request #5761 from AugierLe42e/port-notifications-backbone-part2
Port notifications to backbone part. 2
|
2015-03-15 15:10:47 +01:00 |
|
Augier
|
322ee30005
|
Tests with Jasmine
|
2015-03-15 14:52:49 +01:00 |
|