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
Dennis Schubert
cc631372a1
Merge branch 'stable' into develop
2015-10-03 02:28:08 +02:00
Lukas Matt
1cf69b33ea
bump diaspora-vines to v0.2.0.develop.3
...
closes #6441
2015-10-03 02:28: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
Steffen van Bergerem
dca23d1369
Merge pull request #6415 from AugierLe42e/replace-mobile-background-image
...
Replace mobile background image by a color
2015-10-02 21:57:16 +02:00
augier
647a422d6c
Replace mobile background image by a color
2015-10-02 17:53:06 +02:00
Steffen van Bergerem
7bcf464cf4
Merge pull request #6435 from Flaburgan/publisher-xsmall-cancel
...
Hide publisher cancel button on xsmall screens
2015-10-01 00:08:17 +02:00
fla
97a5a5cbe3
Hide publisher cancel button on xsmall screens
2015-09-30 23:19:14 +02:00
Jonne Haß
2569c48050
Merge pull request #6431 from svbergerem/conversations-style-changes
...
Change conversation page style
2015-09-28 18:44:26 +02:00
Steffen van Bergerem
ff99db1fd3
Change conversation page style
2015-09-27 23:11:19 +02:00
Jonne Haß
c60e32c513
Merge branch 'stable' into develop
2015-09-27 12:02:29 +02:00
Steffen van Bergerem
baba71612d
Replace deprecated default_wait_time for Capybara
...
closes #6430
2015-09-27 12:02:24 +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
Jonne Haß
600457a552
Merge pull request #6429 from svbergerem/fix-location-post-preview
...
Fix post preview with location
2015-09-27 11:37:15 +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
Jonne Haß
4996e1c019
Merge pull request #6425 from svbergerem/fix-bs3-regressions
...
Fix BS3 regressions
2015-09-25 09:12:00 +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
Steffen van Bergerem
be67415269
Add 'require: false' for pronto-scss
2015-09-24 19:24:15 +02:00
augier
c3ddd4c086
Cleaning publisher a bit + responsive styling
2015-09-24 08:54:19 +02:00
Steffen van Bergerem
b1bb259292
Add scss linter
2015-09-23 16:35:34 +02:00
Jonne Haß
2e329f3662
Merge pull request #6419 from svbergerem/stream-elements-bs-media
...
Use Bootstrap media objects for posts
2015-09-23 16:11:11 +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
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
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
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ß
e571acf2f2
bump notiffany
2015-09-19 23:01:37 +02:00
Jonne Haß
cacc3c2994
bump mime-types
2015-09-19 23:01:37 +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ß
ab74d2313d
bump naught
2015-09-19 22:59:17 +02:00
Jonne Haß
de9f7d4173
bump spring
2015-09-19 22:59:17 +02:00
Jonne Haß
4fec2e8968
bump valid
2015-09-19 22:59:17 +02:00
Jonne Haß
21c54d1083
bump timers
2015-09-19 22:59:17 +02:00
Jonne Haß
00429bac95
bump little-plugger
2015-09-19 22:59:17 +02:00
Jonne Haß
f27a729b54
bump kgio
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
