Commit graph

1150 commits

Author SHA1 Message Date
Jonne Haß
b5e277384b Merge branch 'stable' into develop 2015-05-17 20:44:53 +02:00
Jonne Haß
d2467319ed Bump open_graph_reader 2015-05-17 20:44:37 +02:00
Jonne Haß
15d7b019f1 Merge branch 'stable' into develop 2015-05-17 13:58:00 +02:00
Steffen van Bergerem
6bec3d67ed Update markdown-it-sanitizer and markdown-it-for-inline
closes #5965
2015-05-17 13:57:54 +02:00
Dennis Schubert
5477c7df96 Merge branch 'stable' into develop 2015-05-10 01:59:21 +02:00
Steffen van Bergerem
59e57c013b Update jasmine-ajax
closes #5937
2015-05-10 01:59:17 +02:00
Dennis Schubert
bd9bce2a5f Merge branch 'stable' into develop 2015-05-07 22:56:05 +02:00
Jonne Haß
2634ea07a9 bump js-routes 2015-05-07 22:55:36 +02:00
Jonne Haß
487afed53e bump webmock 2015-05-07 22:55:36 +02:00
Jonne Haß
70189f05f4 bump unicorn 2015-05-07 22:55:36 +02:00
Jonne Haß
a9519ede3d bump twitter-text 2015-05-07 22:55:36 +02:00
Jonne Haß
147ea4e399 bump spring 2015-05-07 22:55:36 +02:00
Jonne Haß
fa24333ca1 bump rubocop 2015-05-07 22:55:35 +02:00
Jonne Haß
5a6f6c68cc bump rack-cors 2015-05-07 22:55:35 +02:00
Jonne Haß
ac405dddeb bump mini_magick 2015-05-07 22:55:35 +02:00
Jonne Haß
4f75205d9f bump fog 2015-05-07 22:55:35 +02:00
Jonne Haß
5c6e20048a bump entypo-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
319edd70ad bump backbone-on-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
16562d6d36 bump autoprefixer-rails 2015-05-07 22:55:35 +02:00
Jonne Haß
55fdf51058 bump addressable 2015-05-07 22:55:35 +02:00
Dennis Schubert
642c4597e1 Merge branch 'stable' into develop 2015-05-07 04:03:57 +02:00
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions
closes #5934
2015-05-07 04:03:43 +02:00
Dennis Schubert
17fbbeea69 Merge branch 'stable' into develop 2015-05-04 23:43:58 +02:00
Jonne Haß
f1c75e6a54 Bump open_graph_reader
It now returns the origin for a missing og:url
2015-05-04 23:43:53 +02:00
Jonne Haß
3fadcfa568 Merge branch 'stable' into develop 2015-05-04 15:14:41 +02:00
Jonne Haß
28ee47d6c9 bump sidekiq 2015-05-04 14:22:57 +02:00
Jonne Haß
bb14128052 bump ruby-oembed 2015-05-04 14:22:57 +02:00
Jonne Haß
971a3dd021 Merge branch 'stable' into develop 2015-05-04 04:04:48 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
381e4978d9 Merge pull request #5909 from svbergerem/update-jasmine
Update jasmine
2015-05-04 03:53:54 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Steffen van Bergerem
c64c4114ac Update jquery-rails 2015-05-04 03:42:36 +02:00
Steffen van Bergerem
19a19919bb Update jasmine 2015-05-02 16:46:30 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Steffen van Bergerem
fc8e92b67a Bump markdown-it 2015-04-20 22:06:00 +02:00
Dennis Schubert
cfc98d9a2a Merge branch 'hotfix/0.4.1.3' into release/0.5.0.0-RC 2015-04-11 20:15:10 +02:00
Dennis Schubert
9fc00d0814 Bump Redcarpet to fix OSVDB-120415 2015-04-11 19:51:18 +02:00
Steffen van Bergerem
ba67196f5b Bump markdown-it 2015-04-01 00:59:13 +02: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ß
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ß
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ß
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ß
9d85c488e3 bump to rails 4.2.1 2015-03-19 18:39:17 +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
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ß
2c7b7bb0dc bump open_graph_reader 2015-03-11 21:59:02 +01:00
Jonne Haß
679eca6f03 Bump jsxc 2015-03-08 23:04:52 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
Jonne Haß
0f2d2bd44d Replace DatabaseCleaner with DatabaseRewinder 2015-03-02 15:02:57 +01:00
Steffen van Bergerem
687cbf4954 Update markdown-it-diaspora-mention and markdown-it-sanitizer 2015-02-28 05:21:58 +01:00
Jonne Haß
95ba640e1b bump handlebars_assets 2015-02-28 02:36:14 +01:00
Jonne Haß
1b0cf2d11f bump compass & sass 2015-02-28 02:36:14 +01:00
Jonne Haß
9867f637ef bump autoprefixer-rails 2015-02-28 02:36:14 +01:00
Jonne Haß
84c61b4879 bump uglifier 2015-02-28 02:36:13 +01:00
Jonne Haß
fe6f1dbf54 bump typhoeus 2015-02-28 02:36:13 +01:00
Jonne Haß
eaa5c7f361 bump twitter-text 2015-02-28 02:36:13 +01:00
Jonne Haß
fb2f6e908a bump timecop 2015-02-28 02:36:13 +01:00
Jonne Haß
011235ea82 bump spring 2015-02-28 02:36:13 +01:00
Jonne Haß
ae97c140f5 bump simple_captcha2 2015-02-28 02:36:13 +01:00
Jonne Haß
2b9a2976f0 bump sidekiq 2015-02-28 02:36:13 +01:00
Jonne Haß
0d4c2d95c1 bump selenium-webdriver 2015-02-28 02:36:13 +01:00
Jonne Haß
987281270a bump ruby-oembed 2015-02-28 02:36:13 +01:00
Jonne Haß
77f4be4401 bump rspec-instafail 2015-02-28 01:40:05 +01:00
Jonne Haß
a4e8b1aca2 bump responders 2015-02-28 01:40:04 +01:00
Jonne Haß
5f3b6533d9 bump redcarpet 2015-02-28 01:40:04 +01:00
Jonne Haß
f5a0d77e2a bump rails_admin 2015-02-28 01:40:04 +01:00
Jonne Haß
fb4f3c3066 bump rails-i18n 2015-02-28 01:40:04 +01:00
Jonne Haß
33aeef2654 bump rails-assets-perfect-scrollbar 2015-02-28 01:40:03 +01:00
Jonne Haß
460779a234 bump rails-assets-jquery-placeholder 2015-02-28 01:40:03 +01:00
Jonne Haß
34044c4c75 bump rack-rewrite 2015-02-28 01:40:03 +01:00
Jonne Haß
3b3702cf4f bump rack-protection 2015-02-28 01:40:02 +01:00
Jonne Haß
07a17a8aa5 bump rack-cors 2015-02-28 01:40:02 +01:00
Jonne Haß
77aa074c5d bump nokogiri 2015-02-28 01:40:01 +01:00
Jonne Haß
dc47eca6ee bump mysql2 2015-02-28 01:40:00 +01:00
Jonne Haß
b7235178f5 bump mini_magick 2015-02-28 01:40:00 +01:00
Jonne Haß
7311f3cbc1 bump json 2015-02-28 01:40:00 +01:00
Jonne Haß
44b9bb956f bump js_image_paths 2015-02-28 01:39:59 +01:00
Jonne Haß
e6fb73dc90 bump js-routes 2015-02-28 01:39:59 +01:00
Jonne Haß
d047337a7e bump http_accept_language 2015-02-28 01:39:59 +01:00
Jonne Haß
c1ef5e5d3b bump haml 2015-02-28 01:39:58 +01:00
Jonne Haß
fe3bc2c1b2 bump guard 2015-02-28 01:39:55 +01:00
Jonne Haß
25dd8ffc67 bump fog 2015-02-28 01:06:36 +01:00
Jonne Haß
273363ba6e bump faraday 2015-02-28 01:05:48 +01:00
Jonne Haß
e83cd159b0 bump database_cleaner 2015-02-28 01:05:03 +01:00
Jonne Haß
343d98f2f2 bump addressable 2015-02-28 01:02:14 +01:00
Jonne Haß
c0cb7536d5 bump acts-as-taggable-on 2015-02-28 01:01:48 +01:00
Jonne Haß
01a102e2f3 bump active_model_serializers 2015-02-28 01:01:03 +01:00
Jonne Haß
6790232960 bump pg 2015-02-27 17:00:41 +01:00
Jonne Haß
657d0baea7 Drop foreigner, Rails 4.2 ships the provided functionality 2015-02-27 17:00:41 +01:00
Jonne Haß
2d7399de28 Bump activerecord-import 2015-02-27 16:58:39 +01:00
Jonne Haß
b53ce9a51d Bump Rails to 4.2 2015-02-27 16:58:38 +01:00
Lukas Matt
94f73be7d9 bump Vines to v0.1.27 and Jsxc to v0.0.12 2015-02-25 00:11:01 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Steffen van Bergerem
d09e8a3758 Bump markdown-it-sanitizer 2015-02-13 02:58:31 +01:00
Jonne Haß
e9179e33ea bump spring 2015-02-13 00:32:50 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
5f4f32f2cf Update jasmine 2015-02-10 19:28:52 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
61c17c7896 Add more markdown-it plugins
activate sanitizer, sub and sup
2015-01-13 03:41:06 +01:00
Steffen van Bergerem
0d9fd0aaac Bump markdown-it-hashtag to v0.2.3 2015-01-11 18:17:17 +01:00
Steffen van Bergerem
d692e6df7d Bump markdown-it to 3.0.3, markdown-it-hashtag to 0.2.2 and markdown-it-diaspora-mention to 0.1.2 2015-01-11 02:54:30 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Dumitru Ursu
3e1b944121 Remove prefixed CSS properties 2015-01-09 13:50:29 +02:00
Dumitru Ursu
4ba1032f42 Add autoprefixer 2015-01-07 13:02:53 +02:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Jonne Haß
e25a48cc1c Bump open_graph_reader 2014-12-14 16:55:30 +01:00
Jonne Haß
74a6f42501 Bye opengraph_parser, hi open_graph_reader
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.

The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.

So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.

This also improves general URL detection by parsing them
from the message after stripping markdown.

An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
2014-12-08 02:01:31 +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ß
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ß
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
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
Jonne Haß
10f3a071c5 Merge pull request #5420 from diaspora/update_gems
Update gems

Conflicts:
	Gemfile.lock
2014-11-24 23:02:50 +01:00
Lukas Matt
77ce94db40 bump jsxc to version 0.0.8 2014-11-24 19:12:05 +01:00
Jonne Haß
c305293314 bump mini_magick 2014-11-24 16:51:45 +01:00
Jonne Haß
5622f72420 bump jasmine 2014-11-24 16:44:39 +01:00
Jonne Haß
c2e355fce9 bump guard 2014-11-24 16:43:00 +01:00
Jonne Haß
64b9a4769b bump fog 2014-11-24 16:38:38 +01:00
Jonne Haß
3d757abf6d bump mysql2 2014-11-24 16:34:37 +01:00
Jonne Haß
dca06ae075 bump sidekiq 2014-11-24 16:31:22 +01:00
Jonne Haß
e4f68acf0a bump rails 2014-11-24 16:29:41 +01:00
Praveen Arimbrathodiyil
91c7020003 bump sidekiq to 3.2.6
From upstream changelog,

    Deprecate delay extension for ActionMailer 4.2+ . [seuros, #1933]
    Poll interval tuning now accounts for dead processes [epchris, #1984]
    Add non-production environment to Web UI page titles [JacobEvelyn, #2004]

Debian already have 3.2.6 and I'd like to keep both versions in sync.
2014-11-17 15:40:02 +05:30
Lukas Matt
78100c6fb2 Add vines, jsxc and devise token dependencies 2014-11-13 11:15:30 +01:00
Jonne Haß
e0a2c6438a lock down guard until all plugins updated 2014-11-09 20:18:14 +01:00
Jonne Haß
e965db534f bump webmock 2014-11-09 19:35:18 +01:00
Jonne Haß
62a7b130a2 bump twitter-text 2014-11-09 19:34:19 +01:00
Jonne Haß
791feab474 bump test_after_commit 2014-11-09 19:33:49 +01:00
Jonne Haß
7fc022a9b9 bump selenium-webdriver 2014-11-09 19:33:26 +01:00
Jonne Haß
fceba693f6 bump ruby-oembed 2014-11-09 19:33:04 +01:00
Jonne Haß
0a33a5f95a bump rails-assets-punycode 2014-11-09 19:32:39 +01:00
Jonne Haß
abe0629c02 bump rails-assets-perfect-scrollbar 2014-11-09 19:31:26 +01:00
Jonne Haß
9d967e9585 bump nokogiri 2014-11-09 19:30:52 +01:00
Jonne Haß
96c7624d82 bump guard-cucumber 2014-11-09 19:26:47 +01:00