nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14264 commits 4 branches 0 tags 121 MiB
Commit graph

810 commits

Author SHA1 Message Date
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
Fabian Rodriguez
d65fc17223 bump kaminari 
(cherry picked from commit b5e6c2a149)
 2014-02-15 16:54:46 +02:00
Fabian Rodriguez
b5e6c2a149 bump kaminari 2014-02-02 21:03:51 -02: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ß
108a4776d2 bump sass 2014-01-13 12:26:23 +01:00
Jonne Haß
e523583d61 bump orm_adapter 2014-01-13 12:26:23 +01:00
Jonne Haß
073f9db9a1 bump kaminari 2014-01-13 12:26:23 +01:00
Jonne Haß
25988ff04c bump webmock 2014-01-13 12:26:23 +01:00
Jonne Haß
d3221b396a bump chunky_png 2014-01-13 12:26:23 +01:00
Jonne Haß
bf1d92cd50 bump bcrypt-ruby 2014-01-13 12:26:22 +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ß
2036a9a80f bump strong_parameters 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