Steffen van Bergerem
052d20d30d
Move base.scss
2015-10-05 01:51:13 +02:00
Steffen van Bergerem
7d04a9461e
Move animations.scss
2015-10-05 01:16:12 +02:00
Steffen van Bergerem
d3cb8f9c4c
Fix participants count in RTL conversations view
2015-10-04 16:33:26 +02:00
Steffen van Bergerem
beb9f11da1
Remove unused rtl code
2015-10-04 16:12:22 +02:00
Lukas Matt
78f9b39e55
Use polymorphic association for the report item
...
* Adopt pronto suggestions
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 17:18:03 +02:00
Lukas Matt
97ee2cd975
Display all reports and give the ability to review them
2015-10-03 17:18:03 +02:00
Lukas Matt
6bf47c7ff0
Fix spec files and report model
...
* Adopt pronto suggestions
2015-10-03 17:17:45 +02:00
Lukas Matt
a6c3f67ba2
Check if post or comment exist while rendering
...
It is possible that the item was deleted
during the time it was reported and the admin review
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 17:17:45 +02:00
Lukas Matt
95072d6010
Add get_reported_guid spec for report helper
...
* two new methods in report model reported_author and item
* merge deletion methods in report model
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 17:17:06 +02:00
Lukas Matt
d1e3e568b9
Report tab; bootstrap3 compatible, add user detail btn
...
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 10:58:01 +02:00
Steffen van Bergerem
7c777ca904
Merge branch 'stable' into develop
2015-10-02 23:42:36 +02:00
augier
22882aa24d
Infinite scroll triggered relative to last element top rather than window bottom
...
closes #6451
2015-10-02 23:42:26 +02:00
augier
647a422d6c
Replace mobile background image by a color
2015-10-02 17:53:06 +02:00
fla
97a5a5cbe3
Hide publisher cancel button on xsmall screens
2015-09-30 23:19:14 +02:00
Steffen van Bergerem
ff99db1fd3
Change conversation page style
2015-09-27 23:11:19 +02:00
Jonne Haß
4087036e63
Merge pull request #6428 from svbergerem/unify-error-pages
...
Unify error pages
2015-09-27 11:42:03 +02:00
Steffen van Bergerem
a5ca78bc87
Fix post preview with location
2015-09-27 03:03:28 +02:00
Steffen van Bergerem
9d6ce5b110
Merge pull request #6336 from AugierLe42e/clean-publisher
...
Cleaning publisher
2015-09-26 00:49:34 +02:00
Steffen van Bergerem
8a02bc6e71
Redesign error pages
2015-09-25 22:24:04 +02:00
Steffen van Bergerem
06e2a445ab
Remove Roboto
2015-09-25 21:25:20 +02:00
Steffen van Bergerem
bf6b0e4616
Fix remaining BS3 regressions
2015-09-25 00:31:16 +02:00
Steffen van Bergerem
36637672e3
Fix BS3 regressions for chromium
2015-09-24 21:16:17 +02:00
Steffen van Bergerem
548132ab48
Use full width for comment textarea
2015-09-24 19:38:17 +02:00
Steffen van Bergerem
18c3f298c6
Revert "Use Bootstrap media objects for posts"
...
This reverts commit bd73214219
2015-09-24 19:36:38 +02:00
augier
c3ddd4c086
Cleaning publisher a bit + responsive styling
2015-09-24 08:54:19 +02:00
Steffen van Bergerem
bd73214219
Use Bootstrap media objects for posts
2015-09-23 02:21:31 +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
Steffen van Bergerem
f2456eda9c
Merge pull request #6345 from Flaburgan/override-bootstrap-list-group
...
Override bootstrap list group default
2015-09-20 01:37:14 +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
SansPseudoFix
ccaf107ae5
Fix for tag overflow - fixes #6142
...
Fix for tag overflow - fixes #6142
2015-09-17 13:54:41 +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ß
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ß
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
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
