Commit graph

764 commits

Author SHA1 Message Date
Jonne Haß
dcf275442d Update Rails to 3.2.18
This Rails release closes a security issue but we're not affected by it.
See CVE-2014-0130 for further details.
2014-05-06 19:10:15 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer
Introduce message renderer
2014-04-13 15:00:46 +03:00
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid
Use uuids for guid generation
2014-04-11 16:40:57 +03:00
Jonne Haß
02ed7144a0 drop rmagick, fixes #4594
This breaks the screenshot tool.

RMagick no longer compiles on recent ImageMagicks that have HDRI
support enabled.
2014-04-04 20:41:37 +02:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
8280556a47 Introduce message renderer
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
2014-03-15 17:16:17 +01:00
Fabian Rodriguez
4042e50289 Removes client_side_validations
Conflicts:
	Gemfile
	Gemfile.lock
2014-02-23 16:48:47 +01:00
Fabian Rodriguez
1fd156fd46 bump jquery-rails to 3.0.4 2014-02-23 16:48:46 +01:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking.
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
2014-02-22 23:22:46 +02:00
Jonne Haß
57991187d1 Merge branch 'hotfix/0.3.0.3' into develop
Conflicts:
	Changelog.md
	config/defaults.yml
2014-02-19 11:31:02 +01:00
Jonne Haß
1df3f546c9 update rails to 3.2.17 2014-02-19 11:09:06 +01:00
Ruxton
49800ece87 Moves rails-timeago into the root of Gemfile, it's used in views + assets 2014-01-20 21:25:15 +08:00
Ruxton
a3113cce7c Switched to using rails-timeago to make keeping on top of new versions of plugin easier 2014-01-20 09:33:35 +08:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
2014-01-16 23:23:30 +01:00
Jonne Haß
15b1dae362 update devise to 3.2 2014-01-15 12:59:59 +01:00
Jonne Haß
cb048a2785 bump pg 2014-01-13 12:26:57 +01:00
Jonne Haß
25988ff04c bump webmock 2014-01-13 12:26:23 +01:00
Jonne Haß
f107a3145d bump will_paginate 2014-01-13 12:26:22 +01:00
Jonne Haß
84c4e68a73 bump rack-rewrite 2014-01-13 12:26:22 +01:00
Jonne Haß
e712bec498 bump json 2014-01-13 12:26:21 +01:00
Jonne Haß
196bb5e4c1 bump i18n-inflector-rails 2014-01-13 12:25:39 +01:00
Jonne Haß
f7759f2177 bump haml 2014-01-13 12:25:39 +01:00
Jonne Haß
92a153edaf bump guard-rspec 2014-01-13 12:25:39 +01:00
Jonne Haß
d0aa4cee61 bump faraday 2014-01-13 12:25:39 +01:00
Jonne Haß
88cb24fd32 bump acts_as_api 2014-01-13 12:25:39 +01:00
Jonne Haß
cabc6a5c92 bump rails_autolink 2014-01-13 12:25:36 +01:00
Jonne Haß
97d744d6da bump test_after_commit 2014-01-13 12:25:36 +01:00
Jonne Haß
d6878631bf bump capybara 2014-01-13 12:25:36 +01:00
Jonne Haß
b1375fd3f0 bump rack-google-analytics 2014-01-13 12:25:36 +01:00
Jonne Haß
801d4d4617 bump mini_magick 2014-01-13 12:25:35 +01:00
Jonne Haß
b771287893 bump omniauth-twitter 2014-01-13 12:25:35 +01:00
Jonne Haß
b7424b52e2 bump omniauth-facebook 2014-01-13 12:25:32 +01:00
Jonne Haß
56b62b0fa4 bump rb-inotify 2014-01-13 12:23:08 +01:00
Jonne Haß
8591488ad9 bump rb-fsevent 2014-01-13 12:23:08 +01:00
Jonne Haß
ccadcee444 bump spork 2014-01-13 12:23:07 +01:00
Jonne Haß
630a1e5980 bump guard-cucumber 2014-01-13 12:23:07 +01:00
Jonne Haß
52e3da9866 bump fuubar 2014-01-13 12:23:07 +01:00
Jonne Haß
8001a2da66 bump rspec 2014-01-13 12:23:07 +01:00
Jonne Haß
c45a381c36 bump foreigner 2014-01-13 12:23:06 +01:00
Jonne Haß
fbf8cdef2d bump fog 2014-01-13 12:23:06 +01:00
Jonne Haß
716b1af381 bump factory_girl_rails 2014-01-13 12:23:06 +01:00
Jonne Haß
7461cfad8a bump database_cleaner 2014-01-13 12:23:05 +01:00
Jonne Haß
7eb60dfd42 bump cucumber-rails 2014-01-13 12:23:05 +01:00
Jonne Haß
77e989dc8a bump client_side_validations 2014-01-13 12:23:05 +01:00
Jonne Haß
b1c9cec265 bump unicorn 2014-01-13 12:23:05 +01:00
Jonne Haß
9be498bce8 bump nokogiri 2014-01-12 23:27:16 +01:00
Jonne Haß
358076c14f bump mobile-fu 2014-01-12 23:27:16 +01:00
Jonne Haß
d706932db0 bump mysql2 2014-01-12 23:27:16 +01:00
Jonne Haß
4648654e03 bump typhoeus 2014-01-12 23:27:16 +01:00
Jonne Haß
ab7cbcc4cc bump timecop 2014-01-12 23:27:16 +01:00