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

1592 commits

Author SHA1 Message Date
augier
c62927bf00 Use backbone for flash messages 2015-10-10 12:15:41 +02:00
Dennis Schubert
aab21be09d Merge branch 'stable' into develop 2015-10-10 06:45:15 +02:00
Steffen van Bergerem
230f6d6d62 Fix hovercard view console error 
closes #6480
 2015-10-10 06:45:09 +02:00
Jonne Haß
858bdb0808 Merge branch 'stable' into develop 2015-10-09 23:11:05 +02:00
Steffen van Bergerem
2fc7caf0bd Fix infinite scroll console error 
closes #6478
 2015-10-09 23:10:58 +02:00
Steffen van Bergerem
4e5d09e6c5 Fix 'post to single aspect' cukes 2015-10-09 23:10:53 +02:00
Jonne Haß
c27b629515 Merge branch 'stable' into develop 2015-10-09 17:47:39 +02:00
Steffen van Bergerem
f7bd0bbb24 DRY app/router.js 2015-10-09 17:45:51 +02:00
Jonne Haß
202afe0405 Merge branch 'stable' into develop 2015-10-09 11:00:33 +02:00
Steffen van Bergerem
dccad3f7e1 Remove old stream instance when reloading the stream 
closes #6472
 2015-10-09 11:00:27 +02:00
Jonne Haß
c18c1b1d84 Merge branch 'stable' into develop 2015-10-08 14:44:07 +02:00
Steffen van Bergerem
da9cb52007 Scroll to top when reloading the stream 
closes #6470
 2015-10-08 14:44:02 +02:00
Jonne Haß
23099823c1 Merge branch 'stable' into develop 2015-10-08 10:52:25 +02:00
Steffen van Bergerem
0c214cd4ca Make click on active stream link reload the stream 
closes #6466
 2015-10-08 10:52:18 +02:00
Jonne Haß
92b5ea29ed Merge branch 'stable' into develop 2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1 Add public stream 
closes #6465
 2015-10-07 22:29:39 +02:00
Steffen van Bergerem
c663d9d55e Merge branch 'stable' into develop 2015-10-07 22:00:52 +02:00
Faldrian
058bcb43f8 Added avatar image fallback for notifications 
closes #6463
 2015-10-07 21:58:56 +02:00
Steffen van Bergerem
fc9d7396cc Merge branch 'stable' into develop 2015-10-07 21:38:26 +02:00
Faldrian
d486e37487 following tags now normalized and sorted in ui 
closes #6454
 2015-10-07 21:38:12 +02:00
Steffen van Bergerem
b2e3c4f930 Fix scss pronto errors 2015-10-06 23:29:09 +02:00
Steffen van Bergerem
64773d883e Add permalink for stream elements 2015-10-06 23:29:09 +02:00
Jonne Haß
7b4d7dc737 Merge branch 'stable' into develop 2015-10-06 22:50:42 +02:00
Steffen van Bergerem
517cd56f21 Don't reload stream pages 
closes #6462
 2015-10-06 22:46:58 +02:00
Steffen van Bergerem
25e4d8c365 Fix shortcuts after changing streams 2015-10-06 22:34:36 +02:00
Steffen van Bergerem
20385701d2 Move interactions.scss 2015-10-06 10:30:11 +02:00
Steffen van Bergerem
b59c99807b Move settings.scss 2015-10-05 16:12:40 +02:00
Steffen van Bergerem
66fb953591 Move registration.scss 2015-10-05 16:12:40 +02:00
Steffen van Bergerem
dfe5d32e06 Move login.scss 2015-10-05 15:28:48 +02:00
Steffen van Bergerem
1ba593797c Move forms.scss 2015-10-05 15:28:48 +02:00
Jonne Haß
4f23b901e1 Merge pull request #6459 from svbergerem/spv-map-fix-console-error 
Fix console error for map in SPV
 2015-10-05 13:00:43 +02:00
Steffen van Bergerem
e4a850ff9a Fix console error for map in SPV 2015-10-05 11:38:43 +02:00
Steffen van Bergerem
a6d1556502 Move typography.scss 2015-10-05 02:25:12 +02:00
Steffen van Bergerem
92ba0b6374 Move poll.scss 2015-10-05 02:16:42 +02:00
Steffen van Bergerem
e7e1242227 Move code.scss 2015-10-05 01:55:13 +02:00
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
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