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
Jonne Haß
c3c84b95a4
Merge branch 'stable' into develop
2015-09-19 11:33:10 +02:00
Achilleas Pipinellis
9888b4ce43
Add option to set a pid file for unicorn in diaspora.yml
...
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid
closes #6411
2015-09-19 11:33:04 +02:00
Steffen van Bergerem
5aeac0c2e3
Merge pull request #6324 from AugierLe42e/styling-main-stream
...
Styling main stream
2015-09-18 20:55:43 +02:00
augier
f00f3965ff
Styling main stream
2015-09-18 19:13:49 +02:00
fla
e7790a5935
Override bootstrap list group default
2015-09-18 14:01:54 +02:00
Steffen van Bergerem
cf5830adad
Merge pull request #6408 from SansPseudoFix/fix-tag-tag-page-overflow
...
Fix for tag overflow - fixes #6142
2015-09-18 12:39:19 +02:00
SansPseudoFix
ccaf107ae5
Fix for tag overflow - fixes #6142
...
Fix for tag overflow - fixes #6142
2015-09-17 13:54:41 +02:00
Jonne Haß
cda9c0b366
Merge branch 'stable' into develop
2015-09-15 10:44:50 +02:00
Jonne Haß
92113749c0
highlight-white is still referenced on stable
2015-09-15 10:44:23 +02:00
Jonne Haß
70b200e10d
Merge branch 'stable' into develop
2015-09-15 09:52:12 +02:00
Steffen van Bergerem
8bb3d4d8a8
Remove unused color variables
...
closes #6404
2015-09-15 09:51:06 +02:00
Jonne Haß
3a29cb28ff
Merge branch 'stable' into develop
2015-09-14 22:09:04 +02:00
Jonne Haß
43a09fec39
add changelog entry for #6398 [ci skip]
2015-09-14 22:08:57 +02:00
Jonne Haß
0508c1b8d4
Merge branch 'stable' into develop
2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811
Always show public photos
...
closes #6398
2015-09-14 22:04:53 +02:00
Jonne Haß
f74450fa2f
Merge branch 'stable' into develop
2015-09-14 21:50:17 +02:00
Steffen van Bergerem
8fb1116da5
Update AUTHORS file
...
closes #6399
2015-09-14 21:50:09 +02:00
Jonne Haß
6407b446fc
Merge branch 'stable' into develop
2015-09-13 12:35:56 +02:00
Jonne Haß
f7a883917c
Merge branch 'master' into stable
2015-09-13 12:35:46 +02:00
Jonne Haß
04b3531cd0
bump to 0.5.3.1
2015-09-13 12:33:44 +02:00
Jonne Haß
0f1295718f
Merge branch 'stable' into develop
2015-09-13 12:25:18 +02:00
Jonne Haß
6fb5e88ead
Merge branch 'master' into stable
2015-09-13 12:23:41 +02:00
Steffen van Bergerem
ebad0961a9
Show private profile info if contact is sharing
2015-09-13 12:16:25 +02:00
Jonne Haß
9dc76fc3f4
Merge pull request #6397 from svbergerem/fix-mobile-comments
...
Fix adding the first comment in the mobile view
2015-09-12 16:17:12 +02:00
Steffen van Bergerem
953b03d086
Fix adding the first comment in the mobile view
2015-09-12 14:52:18 +02:00
Steffen van Bergerem
441656b480
Display headline and new conversation button in same line for mobile conversations
2015-09-12 12:23:37 +02:00
Steffen van Bergerem
7bcccde9f4
Merge pull request #6383 from AugierLe42e/improve-mobile-conversations-design
...
[Quickfix] Improve mobile conversations design
2015-09-12 12:20:59 +02:00
augier
44d71c3905
Improve mobile conversations design
2015-09-11 23:17:02 +02:00
realtin
1cdcc50c63
fix all the pronto remarks finally
...
- fix map controls in stream
2015-09-11 10:24:39 +02:00
Steffen van Bergerem
fdbb32ff96
Use white entypo icons for active list-group items in notifications
2015-09-11 07:48:20 +02:00
realtin
52fac5740e
fix indentation & jshint predefines
...
according to svbergerem's annotations
2015-09-10 14:48:25 +02:00
zaziemo
263dc6f119
refactor code that choses the tile server based on podmin's choice
...
and remove the possibility to disable the map feature.
By default the application uses the itles of Heidelberg University that
don't need any credentials. If podmins enable the mapbox option in the
diaspora.yml and enter their credentials the mapbox tiles are used for the map
rendering.
2015-09-09 17:03:46 +02:00
zaziemo
0f3eff8f88
add correct attributions for map tiles of Heidelberg University
...
remove personal credentials from mapbox and refactored some code
#5813
Signed-off-by: zaziemo <maren.heltsche@gmail.com>
2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f
set maptile default to OpenMapSurfer
...
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813 )
2015-09-09 12:26:47 +02:00
zaziemo
e5cc8dff0e
outsource map credentials
...
and allow podmin to enable and disable the feature
(#5813 )
2015-09-09 12:25:45 +02:00
realtin
6716b4c175
rename location_view to locator
...
because it is confusing with the other location files
2015-09-09 12:25:45 +02:00
zaziemo
dc25c01bcd
add a different map representation to the SPV
...
so a small map is rendered in the SPV and a location is provided
via toggling the map gets bigger
(#5813 )
2015-09-09 12:25:19 +02:00
