Jason Robinson
|
dd5409dce3
|
Merge pull request #6393 from pravi/patch-2
switch back to jquery-colorbox
|
2015-10-10 21:10:08 +02:00 |
|
Jonne Haß
|
77295ffcfb
|
Merge pull request #6487 from svbergerem/move-reshare-count
Move reshare count
|
2015-10-10 20:51:27 +02:00 |
|
Steffen van Bergerem
|
e9350a57fc
|
Fix pronto error, remove unused file
|
2015-10-10 14:22:59 +02:00 |
|
Steffen van Bergerem
|
74a3a9719c
|
Display reshares under the post
|
2015-10-10 14:22:59 +02:00 |
|
augier
|
aefd7273d9
|
Drop ID
|
2015-10-10 12:34:59 +02:00 |
|
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 |
|
Jonne Haß
|
8c5534a850
|
Merge pull request #6464 from Zauberstuhl/fix_report_translation
Uncapitalize type if trying to find translation-string
|
2015-10-07 17:52:10 +02:00 |
|
Lukas Matt
|
74fbd122a1
|
Uncapitalize type if trying to find translation-string
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-10-07 16:51:17 +02:00 |
|
Jonne Haß
|
1df5c7f7bf
|
Merge branch 'stable' into develop
|
2015-10-07 10:58:10 +02:00 |
|
Faldrian
|
a946251a9e
|
Show getting_started only if user has made no profile changes on the page
closes #6456
|
2015-10-07 10:58:06 +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
|
97ee2cd975
|
Display all reports and give the ability to review them
|
2015-10-03 17:18:03 +02:00 |
|