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

1155 commits

Author SHA1 Message Date
Jonne Haß
7fd2294111 switch to simple_captcha2 2014-08-23 16:38:50 +02:00
Jonne Haß
55f40a2b65 update to rails 4 2014-08-23 16:33:53 +02:00
Jonne Haß
58927d1a9d bump sidekiq to 2.17.7 2014-08-23 16:03:17 +02:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on 
Bump acts-as-taggable-on
 2014-08-18 12:20:19 +02:00
Jonne Haß
e4246b6fdd Bump Rails to 3.2.19 
Rails 3.2.19 fixes a possible SQL-Injection when using the PostgreSQL
adapter. However this is only exploitable when using the "bit" type,
which we don't.
 2014-07-02 22:17:21 +02:00
Jonne Haß
ccae3a1c64 lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00
Jonne Haß
72d1ed8f7d bump acts-as-taggable-on 2014-06-01 18:42:51 +02:00
Jonne Haß
94375cdc18 bump zip-zip 2014-06-01 13:55:59 +02:00
Jonne Haß
e5f8b5fc57 bump sinon-rails 2014-06-01 13:55:59 +02:00
Jonne Haß
34fc681bc4 lock rails-timeago to 2.4.0 2014-06-01 13:55:59 +02:00
Jonne Haß
e3fd3520f2 bump webmock 2014-06-01 13:55:59 +02:00
Jonne Haß
55f496cb66 bump unicorn 2014-06-01 13:55:59 +02:00
Jonne Haß
38ee2f5faf bump uglifier 2014-06-01 13:55:58 +02:00
Jonne Haß
dda4e52aac bump typhoeus 2014-06-01 13:55:58 +02:00
Jonne Haß
50778e5b8b bump test_after_commit 2014-06-01 13:55:58 +02:00
Jonne Haß
91eb92180b bump strong_parameters 2014-06-01 13:55:58 +02:00
Jonne Haß
48a38231af bump selenium-webdriver 2014-06-01 13:55:58 +02:00
Jonne Haß
bc9eaed382 bump rspec-rails 2014-06-01 13:55:58 +02:00
Jonne Haß
4aaeb5f40f bump redcarpet 2014-06-01 13:55:57 +02:00
Jonne Haß
bc6ac28841 bump rb-inotify 2014-06-01 13:55:57 +02:00
Jonne Haß
08610f1b52 bump rack-cors 2014-06-01 13:55:57 +02:00
Jonne Haß
b749603d1e bump omniauth-wordpress 2014-06-01 13:55:57 +02:00
Jonne Haß
ef62fb8c89 bump omniauth 2014-06-01 13:55:57 +02:00
Jonne Haß
75107080c4 bump nokogiri 2014-06-01 13:55:57 +02:00
Jonne Haß
c25705a7e3 bump mysql2 2014-06-01 13:55:56 +02:00
Jonne Haß
dca5a6d8f3 bump markerb 2014-06-01 13:55:56 +02:00
Jonne Haß
241c584a0d bump guard-rspec 2014-06-01 13:55:56 +02:00
Jonne Haß
bb3fc500b1 bump gon 2014-06-01 13:55:56 +02:00
Jonne Haß
7b3abb1f11 bump fuubar 2014-06-01 13:55:56 +02:00
Jonne Haß
1704d71b22 bump fog 2014-06-01 13:55:51 +02:00
Jonne Haß
e8999332bf bump factory_girl_rails 2014-06-01 13:22:08 +02:00
Jonne Haß
85dc46b0de bump entypo-rails 2014-06-01 13:21:25 +02:00
Jonne Haß
5654d5921f bump devise 2014-06-01 13:20:06 +02:00
Jonne Haß
9f54d40428 bump database_cleaner 2014-06-01 13:19:14 +02:00
Jonne Haß
0ba9df6989 bump cucumber-rails 2014-06-01 13:18:24 +02:00
Jonne Haß
061373d2d4 bump compass-rails 2014-06-01 13:17:59 +02:00
Jonne Haß
cad043bfd7 bump carrierwave 2014-06-01 13:16:43 +02:00
Jonne Haß
f0b6f9315d bump backbone-on-rails 2014-06-01 13:15:16 +02:00
Jonne Haß
418c8d653d bump addressable 2014-06-01 13:11:57 +02:00
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
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
Jonne Haß
4339d69f1e bump sidekiq 2014-01-12 23:27:16 +01:00
Jonne Haß
0db8086916 Add compatibility layer for old rubyzip 
https://github.com/rubyzip/rubyzip#important-note
 2014-01-12 23:27:15 +01:00
Fabian Rodriguez
08acd6e5bf bump Timecop 
Time.now remains the same inside the block, outside of the block it
returns
 2014-01-12 23:27:15 +01:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
maruf
c17a474142 Simple captcha for signup page 2014-01-06 22:00:37 +02:00
flaburgan
3174310ba0 Bump selenium, close #4621 2014-01-03 23:12:26 +01:00
Jonne Haß
a9e52528c1 bump sidekiq 2013-12-08 14:03:08 +01:00
Fabian Rodriguez
c339090f6e Merge branch 'release/0.2.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-12-05 09:11:41 -02:00
Fabian Rodriguez
740c0bc082 bump Rails to version 3.2.16 2013-12-04 21:36:54 -02:00
Jonne Haß
ad20a8487b bump ruby-oembed 2013-09-19 23:39:13 +02:00
Jonne Haß
da23efa433 bump redis-namespace even though the security issue does not affect us 
The issue only shows if you have a send :exec, user_input in your
codebase, neither we nor Sidekiq does that.

See https://github.com/resque/redis-namespace/issues/64 and
https://github.com/resque/redis-namespace/issues/65#issuecomment-22120560
 2013-08-28 23:50:21 +02:00
Roger Braun
44ee6b4892 User entypo font for large icons.. 2013-08-22 09:56:35 +02:00
Jonne Haß
9b92d6a10a bump devise to 3.0.2 2013-08-10 15:42:06 +02:00
Jonne Haß
769bc5ce90 update devise to 2.2.4 2013-08-08 15:40:46 +02:00
Jonne Haß
884cead57e bump selenium-webdriver, closes #4367 2013-08-08 09:53:09 +02:00
Jonne Haß
af2f0dd10e bump safe_yaml 2013-08-07 09:29:47 +02:00
Andrew Smith
ffca9776d5 Bumped oauth-wordpress gem to 0.2.0 for compatability 2013-08-05 08:21:27 -07:00
Jonne Haß
6689f20710 Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service 
Feature/4100 add support for posting to wordpress as a service

Conflicts:
	Gemfile.lock
 2013-08-04 17:15:39 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality, 
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
 2013-08-04 07:46:56 -07:00
Fábián Tamás László
0a4b58ac12 rspec test for GatherOpenGraphData worker 
Added rspec test for og in status_message model

Added rspec test for og_html helper

Improved tests for opengraph embedding
 2013-08-04 15:47:09 +02:00
Tamas Laszlo Fabian
22c644c2ae Replaced opengraph with opengraph_parser 
Code style fixes
 2013-08-04 15:44:58 +02:00
Fábián Tamás László
176c6826e0 opengraph POC 
Fixed small-frame opengraph view

Fixed incompletely saved OpenGraphCache bug
 2013-08-04 15:42:29 +02:00
James Fleming
2a57f4851a Install strong_parameters 2013-08-02 10:09:04 +02:00
Jonne Haß
a5b654de60 bump coffee-script-source 2013-08-01 23:20:07 +02:00
Jonne Haß
dd9e563322 bump sinon-rails 2013-08-01 23:20:07 +02:00
Jonne Haß
5119759bcf bump uglifier 2013-08-01 23:20:07 +02:00
Jonne Haß
607a2e4eca bump temple 2013-08-01 23:20:07 +02:00
Jonne Haß
f8cb203c87 bump database_cleaner 2013-08-01 23:20:07 +02:00
Jonne Haß
db8b137899 bump warden 2013-08-01 22:21:50 +02:00
Jonne Haß
cc5addf7e2 bump sass 2013-08-01 22:21:50 +02:00
Jonne Haß
af749b2a72 bump redcarpet 2013-08-01 22:21:50 +02:00
Jonne Haß
f85f7e0840 bump mysql2 2013-08-01 22:21:50 +02:00
Jonne Haß
f5015f27a7 bump nokogiri 2013-08-01 22:21:50 +02:00
Jonne Haß
6d53f989f3 bump fog 2013-08-01 22:21:50 +02:00
Jonne Haß
bbe8f6373c bump faraday 2013-08-01 22:21:49 +02:00
Jonne Haß
b22cb395b7 bump asset_sync 2013-08-01 22:21:49 +02:00
Jonne Haß
b98710bc63 bump net-scp 2013-08-01 22:21:49 +02:00
Jonne Haß
5d602a2774 bump font-awesome-rails 2013-08-01 22:21:49 +02:00
Jonne Haß
229be9e140 bump bcrypt-ruby 2013-08-01 21:59:36 +02:00
Jonne Haß
1bb2485c33 bump webmock 2013-08-01 21:59:36 +02:00
Jonne Haß
a3dba71809 bump foreigner 2013-08-01 21:59:36 +02:00
Jonne Haß
2fcc6bfc5a bump fixture_builder 2013-08-01 21:59:36 +02:00
Jonne Haß
3c9e3853e8 bump addressable 2013-08-01 21:59:36 +02:00
Jonne Haß
d113538171 bump remotipart 2013-08-01 21:59:36 +02:00
Jonne Haß
e3de9ad52d bump guard 2013-08-01 21:59:36 +02:00
Jonne Haß
b9d130f962 bump cucumber 2013-08-01 21:59:36 +02:00
Jonne Haß
70d1384cb1 bump omniauth-twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
b2e7eb4e2b bump twitter 2013-08-01 21:59:36 +02:00
Jonne Haß
f76cd9c596 bump rails-i18n 2013-08-01 17:54:55 +02:00
Jonne Haß
7310375c77 bump i18n-inflector 2013-08-01 17:54:55 +02:00
Jonne Haß
beda9b2a1a bump carrierwave 2013-08-01 17:54:55 +02:00
Jonne Haß
6672b1c941 bump unicorn 2013-08-01 17:53:50 +02:00
Jonne Haß
300752fc87 bump capybara 
* removed wait_until where possible
* replaced wait_until with DOM obersavtions
* added match: :first to all finders that assumed getting the first element
* replaced evaluate_script with execute_script where possible
* replaced a few execute_script with DOM observations through Capybara
* removed sleep where possible
* replaced sleep with DOM obersvations
* replaced "wait for ajax" with DOM obersavations
* replaced alert confirmation with new selenium API
* bump selenium webdriver
* made any other fixes to get green again
 2013-07-31 01:47:23 +02:00
Jonne Haß
339dba1aeb bump crack 2013-06-12 00:23:47 +02:00
Jonne Haß
6720f6b3f7 bump fuubar 2013-06-12 00:23:47 +02:00
Jonne Haß
178b92d8ad bump rack-cors 2013-06-12 00:23:47 +02:00
Jonne Haß
7323c9c0fc bump twitter 2013-06-11 23:17:08 +02:00
Jonne Haß
0786a3d6b7 bump mobile-fu 2013-06-11 23:17:08 +02:00
Jonne Haß
b2b16ee3ab bump gon 2013-06-11 23:17:08 +02:00
Jonne Haß
d3fe58407c bump json 2013-06-11 23:17:08 +02:00
Jonne Haß
31b3100141 bump redis-namespace 2013-06-11 23:17:08 +02:00
Jonne Haß
5841793d78 bump raindrops 2013-06-11 23:17:08 +02:00
Jonne Haß
277f07d41b bump rails_autolink 2013-06-11 23:17:08 +02:00
Jonne Haß
802656030f bump hashie 2013-06-11 23:17:08 +02:00
Jonne Haß
8bd78493a9 bump ffi 2013-06-11 23:17:08 +02:00
Jonne Haß
06ca713d38 bump uglifier 2013-06-11 23:17:08 +02:00
Jonne Haß
c1635b34d6 bump slim 2013-06-11 23:17:08 +02:00
Jonne Haß
5859ceb5ea bump rspec-rails 2013-06-11 23:17:08 +02:00
Jonne Haß
d3953720a8 bump rails_admin 2013-06-11 23:17:08 +02:00
Jonne Haß
d9b63b26ea bump mini_magick 2013-06-11 23:17:07 +02:00
Jonne Haß
061bca7ca5 bump haml 2013-06-11 22:49:35 +02:00
Jonne Haß
858f447512 bump guard 2013-06-11 22:49:35 +02:00
Jonne Haß
fc3da627fb bump fog 2013-06-11 22:49:32 +02:00
Jonne Haß
0a127a9076 bump database_cleaner 2013-06-11 22:15:45 +02:00
Jonne Haß
3bdb078dfc bump cucumber 2013-06-11 22:15:45 +02:00
Jonne Haß
6467ee1962 bump acts-as-taggable-on 2013-06-11 22:15:45 +02:00
Jonne Haß
9cbfee9408 bump configurate 2013-06-04 22:58:20 +02:00
Florian Staudacher
bcb1214f99 Merge pull request #4162 from MrZYX/typhoeus 
bump Typhoeus and refactor HydraWrapper
 2013-06-04 03:36:39 -07:00
Jonne Haß
234ebdb2e9 bump redcarpet, should fix #4104 2013-05-25 15:21:17 +02:00
Jonne Haß
009209d939 bump Typhoeus and refactor HydraWrapper 2013-05-25 13:45:37 +02:00
Jonne Haß
e3265aa650 Revert "bump sidekiq" 
This reverts commit 9307a1aaeb.
 2013-05-17 17:35:34 +02:00
Jonne Haß
e8f57d8fac Revert "downgrade multi_json" 
This reverts commit 4c4a98f42e.
 2013-05-17 13:19:00 +02:00
Jonne Haß
4c4a98f42e downgrade multi_json 2013-05-17 13:12:41 +02:00
Jonne Haß
9307a1aaeb bump sidekiq 2013-05-17 12:30:33 +02:00
Jonne Haß
6b1fdaafc0 Merge branch 'locator' of git://github.com/tangosource/diaspora into tangosource-locator 2013-05-06 17:33:10 +02:00
Jonne Haß
e70c2593ff bump configurate 2013-05-03 12:07:50 +02:00
Marco Gallardo
4aab8762fa Locator feature 
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
 2013-05-02 17:31:53 -05:00
Jonne Haß
ea792246d0 bump sidekiq 2013-04-25 21:30:35 +02:00
Jonne Haß
6302de458d bump sidekiq 2013-04-20 14:37:42 +02:00
Jonne Haß
38ceb93377 bump temple 2013-04-20 14:37:41 +02:00
Jonne Haß
cf506114c0 bump facter 2013-04-20 14:37:41 +02:00
Jonne Haß
9c582a775a bump addressable 2013-04-20 14:37:41 +02:00
Jonne Haß
4bbbe93b2d bump acts-as-taggable-on 2013-04-20 14:37:41 +02:00
Jonne Haß
b3e1d860e9 bump rails_admin 2013-04-20 14:37:41 +02:00
Jonne Haß
c8eec463e5 bump configurate 2013-04-20 14:37:41 +02:00
Jonne Haß
849b0befd6 bump gon 2013-04-19 19:25:44 +02:00
Jonne Haß
b2ae15fe6c bump nested_form 2013-04-19 19:25:43 +02:00
Jonne Haß
83ab708d44 bump uglifier 2013-04-19 19:25:43 +02:00
Jonne Haß
e4f2c7128f bump subexec 2013-04-19 19:25:43 +02:00
Jonne Haß
d7c68347b9 bump hike 2013-04-19 19:25:43 +02:00
Jonne Haß
734f6cadbd bump fog 2013-04-19 19:25:42 +02:00
Jonne Haß
73aa63565c bump cucumber 2013-04-19 19:25:42 +02:00
Jonne Haß
0694b3e9d0 bump foreigner 2013-04-19 19:25:42 +02:00
Jonne Haß
eeba00cde4 bump omniauth 2013-04-19 19:25:42 +02:00
Jonne Haß
f98b8e30d6 bump haml 2013-04-19 19:25:42 +02:00
Jonne Haß
07b2ceaf69 bump selenium-webdriver 2013-04-19 19:25:42 +02:00
Jonne Haß
62c6ccdc56 bump rspec-mocks 2013-04-19 19:25:41 +02:00
Jonne Haß
ec32e33a37 bump faraday 2013-04-19 19:25:41 +02:00
Jonne Haß
20c5857612 bump client_side_validations 2013-04-19 19:25:41 +02:00
Jonne Haß
90c294c4d5 bump omniauth-twitter 2013-04-19 19:25:41 +02:00
Jonne Haß
9028616bdc bump safe_yaml 2013-04-19 19:25:41 +02:00
Jonne Haß
cdaffbd906 bump oauth2 2013-04-15 01:36:48 +02:00
Jonne Haß
6feb7969a3 bump mime-types 2013-04-15 01:36:48 +02:00
Jonne Haß
63732d8722 bump rake 2013-04-15 01:36:48 +02:00
Jonne Haß
d136fd56e7 bump guard 2013-04-15 01:36:48 +02:00
Jonne Haß
dacaaca7e5 bump chunky_png 2013-04-15 01:36:48 +02:00
Florian Staudacher
f3aa802a0d remove capistrano from the main source code repo 
capistrano deployment scripts will be maintained in a separate deployment repo
 2013-04-15 00:50:23 +02:00
Jonne Haß
ac7bccfe4c bump sidekiq 2013-04-13 11:27:26 +02:00
Jonne Haß
92a2a9189d bump sidekiq and cleanup unicorn.rb 2013-04-04 20:42:41 +02:00
Dennis Schubert
f3b7d57b3a Merge pull request #3993 from MrZYX/sidekiq 
Sidekiq (+ some cleanup)
 2013-04-03 15:19:15 -07:00
Jonne Haß
1b71436c63 revert to old behaviour of only having mysql in the Gemfile.lock, fixes #4080 2013-03-28 00:56:54 +01:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Jonne Haß
68a6fa3de7 bump slop 2013-03-21 22:07:32 +01:00
Jonne Haß
ba57fb52f2 bump rails-i18n 2013-03-21 22:07:32 +01:00
Jonne Haß
5869fc27c1 bump rack-piwik 2013-03-21 22:07:32 +01:00
Jonne Haß
e932b506b3 bump omniauth-twitter 2013-03-21 22:07:32 +01:00
Jonne Haß
97393faab3 bump rails_admin 2013-03-21 22:07:32 +01:00
Jonne Haß
c8829a703b bump nokogiri 2013-03-21 22:07:32 +01:00
Jonne Haß
18c66ac6bf bump lumberjack 2013-03-21 22:07:32 +01:00
Jonne Haß
39b64bd65b bump ffi 2013-03-21 22:07:31 +01:00
Jonne Haß
90e1a654ad bump jasmine 2013-03-21 22:07:31 +01:00
Jonne Haß
c320f59c96 bump fssm 2013-03-21 22:07:31 +01:00
Jonne Haß
3c7007c31d bump chunky_png 2013-03-21 22:07:31 +01:00
Jonne Haß
47be1191f3 bump coffee-script-source 2013-03-21 22:07:31 +01:00
Jonne Haß
e7ff0448ed bump foreman 2013-03-21 22:07:31 +01:00
Jonne Haß
cb1f31ae8e bump timecop 2013-03-21 22:07:31 +01:00
Jonne Haß
802ef60cad bump twitter 2013-03-21 22:07:31 +01:00
Jonne Haß
61841f22a8 bump jwt 2013-03-21 22:07:31 +01:00
Jonne Haß
05ba4d04e7 bump fog 2013-03-21 22:07:30 +01:00
Jonne Haß
2725ef799b bump redis 2013-03-21 22:07:30 +01:00
Jonne Haß
8aa4d8e0e8 bump cucumber-rails 2013-03-21 22:07:30 +01:00
Jonne Haß
1e00d8b683 bump selenium-webdriver 2013-03-21 22:07:30 +01:00
Jonne Haß
6159074f61 bump childprocess 2013-03-21 22:07:30 +01:00
Jonne Haß
e5311653a8 bump foreigner 2013-03-21 22:07:30 +01:00
Jonne Haß
c6818617e4 bump faraday 2013-03-21 22:07:30 +01:00
Jonne Haß
283b26cc30 bump rspec-rails 2013-03-21 22:07:30 +01:00
Jonne Haß
d8770731fc bump font-awesome-sass-rails 2013-03-21 21:25:19 +01:00
Jonne Haß
6677746333 bump safe_yaml 2013-03-21 21:25:19 +01:00
Jonne Haß
871abf8d4b bump unicorn 2013-03-21 21:25:19 +01:00
Jonne Haß
3855eaf223 bump handlebars_assets 2013-03-21 21:25:18 +01:00
Jonne Haß
10e5bb7b0d bump guard 2013-03-21 21:25:18 +01:00
Jonne Haß
74599f19fc bump coderay 2013-03-21 21:25:18 +01:00
Jonne Haß
c1ffc59ddb bump client_side_validations 2013-03-21 21:25:18 +01:00
Jonne Haß
3430e1f90b bump sass 2013-03-21 21:25:18 +01:00
Jonne Haß
6813434e91 bump excon 2013-03-21 21:25:18 +01:00
Jonne Haß
669faa042d bump addressable 2013-03-21 20:50:25 +01:00
Jonne Haß
a55f6fd98c Merge branch 'hotfix/0.0.3.4' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-03-18 21:10:29 +01:00
Jonne Haß
1a995aa47c bump rails to 3.2.13, release 0.0.3.4 2013-03-18 21:07:55 +01:00
Jonne Haß
2afa2899c5 rework Gemfile 2013-03-15 21:00:27 +01:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
 2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
Alexander Wenzowski
57669017bd bundler should communicate with rubygems using ssl 2013-03-11 21:21:31 +01:00
Alexander Wenzowski
98207ed9ea roxml should be loaded from rubygems 2013-03-01 17:36:38 -05:00
Alexander Wenzowski
63f9a6f1ba bundler should communicate with rubygems using ssl 2013-02-28 19:05:39 -05:00
Jonne Haß
abaf7f9a27 bump selenium-webdriver 2013-02-21 16:54:26 +01:00
Jonne Haß
131fdd4b2f bump handlebars_assets 2013-02-17 12:48:31 +01:00
Jonne Haß
79d4751d73 bump ffi 2013-02-17 12:48:31 +01:00
Jonne Haß
2ae4d10431 bump remotipart 2013-02-17 12:48:31 +01:00
Jonne Haß
34a89a2794 bump omniauth 2013-02-17 12:48:31 +01:00
Jonne Haß
3ae073a2dc bump mini_magick 2013-02-17 12:48:31 +01:00
Jonne Haß
f5df8a9c90 bump unicorn 2013-02-17 12:48:30 +01:00
Jonne Haß
a858ad83f6 bump faraday 2013-02-17 12:48:30 +01:00
Jonne Haß
90b3fdda8e bump activerecord-import 2013-02-17 12:48:30 +01:00
Jonne Haß
d75ddbccab bump mutli_json 2013-02-17 12:48:30 +01:00
Fabián Rodríguez
8d7dd965d8 update handlebars_assets to 0.10.0 2013-02-17 12:48:30 +01:00
Fabián Rodríguez
ac866a321d remove fastercsv form Gemfile & Gemfile.lock 2013-02-17 12:48:29 +01:00
Jonne Haß
e723d9f3d1 bump foreigner 2013-02-17 12:48:29 +01:00
Jonne Haß
9fdd1d4119 bump crack 2013-02-17 12:48:29 +01:00
Jonne Haß
1749cfd628 bump kgio 2013-02-17 12:48:29 +01:00
Jonne Haß
9a90a799e6 bump twitter 2013-02-17 12:48:28 +01:00
Jonne Haß
5cac4ce5d7 bump gherkin 2013-02-17 12:48:28 +01:00
Jonne Haß
de7acb1579 bump guard 2013-02-17 12:48:28 +01:00
Jonne Haß
70804a2f77 bump timecop 2013-02-17 12:48:28 +01:00
Jonne Haß
cc3f470502 bump rails_admin and haml 2013-02-17 12:48:28 +01:00
Jonne Haß
8d7073a475 bump factory_girl_rails 2013-02-17 12:48:27 +01:00
Jonne Haß
7337dd7972 bump carrierwave 2013-02-17 12:48:27 +01:00
Jonne Haß
2bad517ceb bump selenium-webdriver 2013-02-17 12:48:27 +01:00
Jonne Haß
6366cf5a1d bump fog 2013-02-17 12:48:27 +01:00
Jonne Haß
c4b0709851 bump rack-ssl 2013-02-17 12:48:27 +01:00
Jonne Haß
ad4ba363a9 Merge branch 'hotfix/0.0.2.5' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
	config/defaults.yml
 2013-02-11 20:54:35 +01:00
Jonne Haß
f2ce9fa17f * Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58) 
* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
 2013-02-11 20:51:02 +01:00
Jonne Haß
1b73817a5e bump and lock down rmagick 2013-02-04 00:39:41 +01:00
Jonne Haß
6ded1238c7 bump configurate 2013-01-29 12:54:35 +01:00
Jonne Haß
74613b0b15 Merge branch 'hotfix/0.0.2.3' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
 2013-01-28 20:41:25 +01:00
Jonne Haß
8a8ee42ebc Update Devise to 2.1.3 
http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
 2013-01-28 20:38:30 +01:00
Jonne Haß
aadbd95215 Markerb got a release so we can get rid of another gem pulled from git \o/ 2013-01-25 13:26:19 +01:00
Jonne Haß
cf01b33b5f bump will_paginate 2013-01-17 02:00:20 +01:00
Jonne Haß
ac2fa74ac8 bump foreman 2013-01-17 02:00:20 +01:00
Jonne Haß
3023fbdee3 bump ffi 2013-01-17 02:00:20 +01:00
Jonne Haß
fe7a49226c bump asset_sync 2013-01-17 02:00:20 +01:00
Jonne Haß
32c5f25bd0 bump rack 2013-01-17 02:00:20 +01:00
Jonne Haß
2c9f619638 bump gon 2013-01-17 02:00:20 +01:00
Jonne Haß
9de76c10cd bump sass and sass-rails 2013-01-17 02:00:20 +01:00
Jonne Haß
e07bc6a548 bump nokogiri 2013-01-17 02:00:20 +01:00
Jonne Haß
7c76d42a4d bump rack-rewrite 2013-01-17 02:00:19 +01:00
Jonne Haß
d91e9517b8 bump selenium-webdriver 2013-01-17 02:00:19 +01:00
Jonne Haß
e0682daba8 bump unicorn 2013-01-17 02:00:19 +01:00
Jonne Haß
44da915489 bump mobile-fu 2013-01-17 02:00:19 +01:00
Jonne Haß
9535e894f3 bump ruby-oembed 2013-01-17 02:00:19 +01:00
Jonne Haß
fb8923232c bump jquery-rails 2013-01-17 02:00:19 +01:00
Jonne Haß
e1794d89de bump bootstrap-sass 2013-01-17 02:00:19 +01:00
Jonne Haß
6acbb169d8 bump handlebars_assets 2013-01-17 02:00:19 +01:00
Jonne Haß
df066c9b7a bump guard 2013-01-17 02:00:19 +01:00
Jonne Haß
d863510543 bump fixture_builder 2013-01-17 02:00:19 +01:00
Jonne Haß
64b86b27c1 bump rspec-rails and rspec 
fix two specs by not checking for object identity
 2013-01-17 02:00:03 +01:00
Jonne Haß
e45ed19c33 bump rails_admin 2013-01-17 01:03:51 +01:00
Jonne Haß
6757845398 bump rails-i18n 2013-01-17 01:02:36 +01:00
Jonne Haß
f57afa7d88 bump omniauth-twitter 2013-01-17 01:02:36 +01:00
Jonne Haß
0282782293 bump twitter 2013-01-17 01:02:36 +01:00
Jonne Haß
0c39e2521b bump timecop 2013-01-17 01:02:04 +01:00
Jonne Haß
1d9ecfd22e bump fog 2013-01-17 00:28:57 +01:00
Jonne Haß
a09a8cbffc Merge branch 'hotfix/0.0.2.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-01-09 00:11:29 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Jonne Haß
26139fc2dc Merge branch 'hotfix/0.0.2.1' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2013-01-02 23:45:53 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
Jonne Haß
15b6b7c56e bump selenium-webdriver 2012-12-08 12:36:05 +01:00
Jonne Haß
4150a89eb8 fix Gemfile.lock 2012-12-07 22:41:06 +01:00
Florian Staudacher
94760f4c04 update jasmine gem, removed useless spec, + changelog) 2012-12-07 21:21:27 +01:00
Tom Scott
e717eaac70 Remove debugger from the Gemfile. 
Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.

Conflicts:
	Gemfile.lock
 2012-12-07 14:21:09 -05:00
Jonne Haß
366768eac7 the day I decide to switch to seleniums prerelease 2.27 comes out. great. anyway, still two timeouts, any ideas? anyone? 2012-12-06 18:38:06 +01:00
Jonne Haß
613fbb6ffd lets see what travis has to say about the selenium prerelease 2012-12-06 10:37:11 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Jonne Haß
e38345bb1c bump debugger-ruby_core_source 2012-11-22 20:11:11 +01:00
Jonne Haß
c5be6be377 bump rails to 3.2.9 2012-11-21 19:27:03 +01:00
Jonne Haß
71b5695b6e drop capistrano-ext, closes #3735 2012-11-21 19:18:43 +01:00
Jonne Haß
f1aeecc00b force typhoeus (and thus curl) to use diaspora.yml's CA bundle 2012-11-21 17:28:39 +01:00
Jonne Haß
70b0c9e2b7 add rb-fsevent to the Gemfile for our OS X devs 2012-11-14 19:57:52 +01:00
Jonne Haß
0b206534bd bump selenium-webdriver 2012-11-11 13:29:41 +01:00
Jonne Haß
f6d352bc7e bump gon 2012-11-11 13:29:40 +01:00
Jonne Haß
c4d5597fa4 bump faraday_middleware 2012-11-11 13:29:40 +01:00
Jonne Haß
8e2d509f8d bump coffee-script-source 2012-11-11 13:29:40 +01:00
Jonne Haß
4fc2cb1cba bump carrierwave 2012-11-11 13:29:40 +01:00
Jonne Haß
f2f741a518 bump capybara 2012-11-11 13:29:40 +01:00
Jonne Haß
74ecdeb35d bump formatador 2012-11-11 13:29:40 +01:00
Jonne Haß
04aee6a6fe bump tzinfo 2012-11-11 13:29:39 +01:00
Jonne Haß
f4d63c6d90 bump twitter 2012-11-11 13:26:19 +01:00
Jonne Haß
03f5cfcce5 bump rails-i18n 2012-11-11 13:26:18 +01:00
Jonne Haß
497b822d03 bump debugger 2012-11-11 13:25:20 +01:00
Jonne Haß
c447eba4d1 bump rails_admin 2012-11-11 13:25:15 +01:00
Jonne Haß
ec0483ccdb bump rack-rewrite 2012-11-11 13:23:25 +01:00
Jonne Haß
229c514251 bump childprocess 2012-11-11 13:23:25 +01:00
Jonne Haß
468781008a bump bootstrap-sass 2012-11-11 13:23:25 +01:00
Jonne Haß
91e6644bc2 bump rspec-rails 2012-11-11 13:23:24 +01:00
Jonne Haß
4a4f98c3ef bump unicorn 2012-11-11 13:23:24 +01:00