Commit graph

1210 commits

Author SHA1 Message Date
Steffen van Bergerem
be67415269 Add 'require: false' for pronto-scss 2015-09-24 19:24:15 +02:00
Steffen van Bergerem
b1bb259292 Add scss linter 2015-09-23 16:35:34 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm
5813 show geolocation on osm
2015-09-23 01:43:49 +02:00
Jonne Haß
2601186507 Merge branch 'stable' into develop 2015-09-21 12:23:23 +02:00
Jonne Haß
ca215ca28d Sidetiq still isn't celluloid 0.17 compatible 2015-09-21 12:21:16 +02:00
Dennis Schubert
cb7ab32d06 Merge branch 'stable' into develop 2015-09-19 23:06:43 +02:00
Jonne Haß
8c246c406f bump typhoeus 2015-09-19 23:02:13 +02:00
Jonne Haß
cce910000f bump js-routes 2015-09-19 23:01:37 +02:00
Jonne Haß
691274d068 bump jasmine 2015-09-19 23:01:37 +02:00
Jonne Haß
0169f5ca8c bump eye, sidekiq, celluloid 2015-09-19 23:00:08 +02:00
Jonne Haß
de9f7d4173 bump spring 2015-09-19 22:59:17 +02:00
Jonne Haß
78655b6f43 bump typhoeus 2015-09-19 22:59:17 +02:00
Jonne Haß
6ea200e0e3 bump twitter-text 2015-09-19 22:58:18 +02:00
Jonne Haß
9f6b4c56ad bump twitter 2015-09-19 22:58:18 +02:00
Jonne Haß
92181b9882 bump rspec-instafail 2015-09-19 22:48:43 +02:00
Jonne Haß
16a5ac2630 bump rb-fsevent 2015-09-19 22:47:49 +02:00
Jonne Haß
f9b93c037f bump rails-i18n 2015-09-19 22:47:49 +02:00
Jonne Haß
9a4b157a95 bump rails-assets-perfect-scrollbar 2015-09-19 22:47:14 +02:00
Jonne Haß
c2a29294c9 bump rails-assets-highlightjs 2015-09-19 22:46:29 +02:00
Jonne Haß
265ea26f05 bump pg 2015-09-19 22:42:50 +02:00
Jonne Haß
a6eb8521c3 bump mysql2 2015-09-19 22:42:04 +02:00
Jonne Haß
d9f9855e15 bump omniauth-twitter 2015-09-19 22:40:56 +02:00
Jonne Haß
21a6a8fd86 bump mini_magick 2015-09-19 22:40:27 +02:00
Jonne Haß
7f27b95d4c bump markerb 2015-09-19 22:40:27 +02:00
Jonne Haß
bab07436d2 bump js-routes 2015-09-19 22:40:27 +02:00
Jonne Haß
f255dc490d bump jquery-rails 2015-09-19 22:40:27 +02:00
Jonne Haß
28cebf7800 bump haml 2015-09-19 22:39:37 +02:00
Jonne Haß
1db832fa11 bump guard-rspec 2015-09-19 22:38:47 +02:00
Jonne Haß
4fa8cc4e62 bump fog 2015-09-19 22:37:48 +02:00
Jonne Haß
30c531a6b9 bump devise 2015-09-19 22:37:48 +02:00
Jonne Haß
16a820992b bump database_cleaner 2015-09-19 22:37:47 +02:00
Jonne Haß
f996699aa2 bump sass-rails 2015-09-19 22:37:47 +02:00
Jonne Haß
a333b10805 bump compass-rails 2015-09-19 22:36:39 +02:00
Jonne Haß
8d917742e2 bump capybara 2015-09-19 22:35:25 +02:00
Jonne Haß
7bdb50ad7b bump autoprefixer-rails 2015-09-19 22:33:57 +02:00
Jonne Haß
c7a00018fc Merge branch 'stable' into develop 2015-09-19 11:36:41 +02:00
Benjamin Neff
a40816370e update federation gem to fix #6405
removed some contraints to support friendica and redmatrix again

closes #6410
2015-09-19 11:34:27 +02:00
zaziemo
298e195a8f add a map subview
- add coordinates in post_presenter
- add map to the SPV if location is provided
- add leaflet.js to render map and marker of position
- make coordinates available in frontend
- add map scss
- make stream post location clickable and redirect to the SPV
- prevent render map if no location data is provided
- add tests for coordinates
- use the leaflet gem instead of the JS assets
(#5813)
2015-09-09 12:19:38 +02:00
Jonne Haß
3cc475c887 Merge branch 'stable' into develop 2015-08-30 22:34:56 +02:00
Steffen van Bergerem
a01cea0b63 Bump rails_admin 2015-08-30 21:52:52 +02:00
Jonne Haß
1dee542933 Merge branch 'stable' into develop 2015-08-29 17:01:14 +02:00
Jonne Haß
bf92a7441e Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API 2015-08-29 15:58:08 +02:00
Steffen van Bergerem
9446a3ae21 Merge pull request #6301 from AugierLe42e/image-gallery
Using Blueimp image gallery
2015-08-27 23:59:46 +02:00
augier
63bfcb7c98 Using Blueimp image gallery 2015-08-27 23:50:20 +02:00
Jonne Haß
d60a87ee85 Merge branch 'stable' into develop 2015-08-27 15:26:11 +02:00
Jonne Haß
f627919fc4 bump uglifier 2015-08-27 15:24:18 +02:00
Jonne Haß
8816c7bc84 Bump Rails to 4.2.4 2015-08-27 05:19:59 +02:00
Jonne Haß
41b4234ecb Bump Rails to 4.2.4 2015-08-25 01:14:48 +02:00
Jonne Haß
a7b854e743 add haml-lint 2015-08-23 13:21:53 +02:00
Jonne Haß
515d2ba9d5 Merge branch 'stable' into develop 2015-08-22 21:53:19 +02:00