Jonne Haß
|
10691e6551
|
Merge pull request #5455 from svbergerem/fix-slowfindererrors
Fix SlowFinderErrors
|
2014-12-03 23:26:04 +01:00 |
|
Steffen van Bergerem
|
b3f7acb91b
|
Fix SlowFinderErrors
|
2014-12-03 22:31:02 +01:00 |
|
Dennis Schubert
|
8b241cdef1
|
Merge pull request #5415 from jhass/sidekiq_config
move sidekiq configuration from initializer to sidekiq.yml
fixes #5412
|
2014-12-03 20:44:24 +01:00 |
|
Jonne Haß
|
166590ea36
|
Merge pull request #5453 from svbergerem/fix-delete-photo-cuke
Fix delete a photo cuke
|
2014-12-03 02:06:35 +01:00 |
|
Steffen van Bergerem
|
9a047749fc
|
Fix delete a photo cuke
|
2014-12-02 23:56:54 +01:00 |
|
Steffen van Bergerem
|
7c775208b1
|
Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile
Fix code overflow spv and profile
|
2014-12-02 22:44:08 +01:00 |
|
SansPseudoFix
|
6d681f8306
|
Fix code overflow
new file: app/assets/stylesheets/new_styles/_code.scss
|
2014-12-02 16:51:50 +01:00 |
|
Jonne Haß
|
5ccdcc0b95
|
Merge pull request #5450 from svbergerem/exceeding-profile-content
Content shouldn't exceed the profile sidebar
|
2014-12-02 14:33:16 +01:00 |
|
Jonne Haß
|
754e7882e8
|
Merge pull request #5451 from svbergerem/notifications-controller-spec-speedup
Speed up notifications controller spec
|
2014-12-02 14:16:20 +01:00 |
|
Steffen van Bergerem
|
4c655d8c8b
|
Speed up notifications controller spec
|
2014-12-02 02:43:01 +01:00 |
|
Steffen van Bergerem
|
d742f23cd5
|
Content shouldn't exceed the profile sidebar
|
2014-12-02 02:03:15 +01:00 |
|
Jonne Haß
|
a580171e32
|
Replace spork with spring, update & use binstubs
Spring is the recommended application preloader for rails
|
2014-12-01 08:06:07 +01:00 |
|
Jonne Haß
|
4cadc2d51c
|
Merge pull request #5446 from svbergerem/append-to-publisher-spec
Improve append to publisher spec
|
2014-12-01 08:03:34 +01:00 |
|
Jonne Haß
|
d22f59d6bd
|
Merge pull request #5447 from svbergerem/try-to-improve-notifications-spec
Try to improve the notifications controller spec
|
2014-12-01 08:02:38 +01:00 |
|
Steffen van Bergerem
|
8275e6ba54
|
Improve append to publisher spec
|
2014-12-01 02:57:55 +01:00 |
|
Steffen van Bergerem
|
7b17b78de7
|
Try to improve the notifications controller spec
|
2014-12-01 02:27:19 +01:00 |
|
Jonne Haß
|
c5bc495f3f
|
move sidekiq configuration from initializer to sidekiq.yml
|
2014-12-01 02:18:28 +01:00 |
|
Jonne Haß
|
510e952bd6
|
Merge pull request #5444 from svbergerem/improve-deleting-photos
Only remove photos from view when destroyed on server
|
2014-12-01 02:02:33 +01:00 |
|
Steffen van Bergerem
|
4cc1b40443
|
Only remove photos from view when destroyed on server
|
2014-12-01 00:36:56 +01:00 |
|
Jonne Haß
|
5af0b1cbdd
|
don't use 666 as non-existant ID in report model spec
|
2014-11-30 21:56:27 +01:00 |
|
Jonne Haß
|
4f8cf0fe07
|
Merge pull request #5442 from svbergerem/pre-fill-tag-publisher
Pre-fill publisher on tag page
|
2014-11-30 18:59:11 +01:00 |
|
Steffen van Bergerem
|
f6fbbbb5f6
|
Move tag prefill to Backbone, add tests
|
2014-11-30 17:14:05 +01:00 |
|
taro-k
|
b01026f9b8
|
pre-fill tag page form with the tag #4234
|
2014-11-30 14:15:45 +01:00 |
|
Steffen van Bergerem
|
b275b2edbc
|
Merge pull request #5435 from SansPseudoFix/5329-fix-mention-popup-hidden
A temporary fix for mention modal #5329
|
2014-11-30 13:48:24 +01:00 |
|
Jonne Haß
|
b340514b2c
|
Merge pull request #5440 from Gallaecio/develop
Updated the Galician (gl) translation
|
2014-11-30 03:39:45 +01:00 |
|
Adrián Chaves Fernández (Gallaecio)
|
1e240a6462
|
Updated the Galician (gl) translation
|
2014-11-30 02:00:52 +01:00 |
|
Jonne Haß
|
6a568931e5
|
test if we can enable dependency caching yet on travis
|
2014-11-30 00:42:58 +01:00 |
|
Jonne Haß
|
2ab16d473c
|
Merge pull request #5410 from svbergerem/configurable-source-url
Make source code url configurable
Conflicts:
config/diaspora.yml.example
|
2014-11-29 23:46:45 +01:00 |
|
Jonne Haß
|
dd30fe7367
|
Merge pull request #5439 from joshk/patch-1
Use the new build env on Travis
|
2014-11-29 21:26:06 +01:00 |
|
Josh Kalderimis
|
a34920c4f7
|
Use the new build env on Travis
faster better stronger
|
2014-11-29 21:19:52 +01:00 |
|
Jonne Haß
|
ff04310158
|
Merge pull request #5426 from axilleas/diaspora_yml
Improve diaspora.yml comments
|
2014-11-29 17:55:24 +01:00 |
|
Achilleas Pipinellis
|
10453e53c2
|
Refactor diaspora.yml.example [skip ci].
- Fix typos and punctuation
- Add double '#' for comments where missed
- Add newlines where needed
|
2014-11-29 18:40:11 +02:00 |
|
SansPseudoFix
|
90b9f227d8
|
A temporary fix for mention modal #5329
A temporary fix for mention modal #5329
modified: app/assets/stylesheets/bootstrap-fix.css.scss
modified: app/assets/stylesheets/bootstrap-fix.css.scss
|
2014-11-29 17:36:46 +01:00 |
|
Jonne Haß
|
1f00f47de5
|
add missing changelog entry for #5387 [ci skip]
|
2014-11-29 17:21:39 +01:00 |
|
Jonne Haß
|
02c0a93e9c
|
Merge pull request #5387 from Faldrian/feature/4930-opengraph-description-too-long
#4930 added trim of opengraph description to 250
|
2014-11-29 17:20:16 +01:00 |
|
Faldrian
|
29f55f42b6
|
truncate long opengraph description to 250 chars in mobile and stream view
|
2014-11-29 17:18:01 +01:00 |
|
Steffen van Bergerem
|
55f881da08
|
Make source code url configurable
|
2014-11-29 16:36:17 +01:00 |
|
Jonne Haß
|
850c98cbf7
|
bump sinatra
|
2014-11-29 16:24:50 +01:00 |
|
Jonne Haß
|
c0aa5565cc
|
Merge pull request #5403 from pravi/bump_rack-protection
bump sinatra to 1.4.5 and rack-protection to 1.4
|
2014-11-29 16:17:56 +01:00 |
|
Jonne Haß
|
eb5ee63b0d
|
Merge pull request #5413 from svbergerem/remove-unused-files-lib
Remove unused files in lib
|
2014-11-29 16:13:48 +01:00 |
|
Jonne Haß
|
544501a0e6
|
Merge pull request #5418 from svbergerem/publisher-counter-style-fix
Fix character count placement for publisher
|
2014-11-29 16:11:45 +01:00 |
|
Jonne Haß
|
da718c9d11
|
Merge pull request #5434 from DharmaCommunity/5430-missing-empty-list-msg-on-default-privacy-page
issue #5430 : message added
|
2014-11-29 16:02:30 +01:00 |
|
Jonne Haß
|
04b000232f
|
Merge pull request #5427 from axilleas/minitest_to_gemfile
Add minitest to Gemfile
|
2014-11-29 15:33:18 +01:00 |
|
Praveen Arimbrathodiyil
|
9165b94522
|
bump rack-protection to 1.5.2
|
2014-11-28 23:05:16 +05:30 |
|
Laurent PERON
|
9661d00ec8
|
issue #5430 : message added
|
2014-11-28 10:31:47 +01:00 |
|
Jonne Haß
|
5126283666
|
Merge pull request #5432 from svbergerem/fix-search-widget-undefined-handle
Don't display undefined handle in search widget
|
2014-11-27 17:03:50 +01:00 |
|
Steffen van Bergerem
|
389edbe3aa
|
Don't display undefined handle in search widget
|
2014-11-27 16:57:32 +01:00 |
|
Jonne Haß
|
ac801f0c3c
|
Merge pull request #5428 from Zauberstuhl/bump_jsxc_0.0.9
bump jsxc to v0.0.9
|
2014-11-26 20:08:53 +01:00 |
|
Lukas Matt
|
2e89b70967
|
bump jsxc to v0.0.9
|
2014-11-26 19:30:49 +01:00 |
|
Achilleas Pipinellis
|
e88b154ff3
|
Add minitest to Gemfile.
In order to use the system Fedora/EPEL ruby we need to install
minitest in production. See comments in Gemfile.
|
2014-11-26 17:25:56 +02:00 |
|