Dennis Schubert
|
3d3e82f7f0
|
Merge branch 'stable' into develop
|
2016-02-21 04:20:19 +01:00 |
|
Saritha
|
7fe7287928
|
Fix for Empty input field when editing aspect name Fix #6548
|
2016-02-21 04:18:07 +01:00 |
|
Steffen van Bergerem
|
89f21e87f8
|
Remove unused code
|
2016-02-14 02:48:51 +01:00 |
|
Jonne Haß
|
e873b6cd4f
|
Merge branch 'stable' into develop
|
2016-02-12 15:51:29 +01:00 |
|
Steffen van Bergerem
|
c805ee2cec
|
Remove unused variables, fix undefined variables
closes #6694
|
2016-02-12 15:51:25 +01:00 |
|
Steffen van Bergerem
|
6efde34bb8
|
Remove stream faces
|
2016-02-08 17:42:36 +01:00 |
|
Dennis Schubert
|
d67ec12913
|
Merge branch 'Faldrian-3307-collapse_long_images' into develop
|
2016-02-07 05:55:14 +01:00 |
|
Steffen van Bergerem
|
3f72b231d4
|
Enable autosize for all textareas
|
2016-02-06 15:10:32 +01:00 |
|
Faldrian
|
6da2720168
|
Check for collapsible content_view again after images are loaded
|
2016-02-04 21:39:28 +01:00 |
|
fla
|
1e27b509f9
|
Add number of votes on poll answers
|
2016-01-24 14:31:06 +01:00 |
|
Dennis Schubert
|
dd93cb6cad
|
Merge pull request #6646 from svbergerem/commenting-when-ignored
Tell user that the author might ignore them when commenting/liking failed
|
2016-01-21 21:07:37 +01:00 |
|
Steffen van Bergerem
|
a52c8a2f55
|
Tell user that the author might ignore them when commenting/liking failed
|
2016-01-21 21:02:39 +01:00 |
|
Dennis Schubert
|
ff867cd471
|
Merge branch 'stable' into develop
|
2016-01-21 21:00:32 +01:00 |
|
Steffen van Bergerem
|
749016a7b4
|
Fix keyboard shortcuts on profile pages
closes #6647
|
2016-01-21 21:00:26 +01:00 |
|
Manuel Vögele
|
4f34ecafa4
|
Show posts of ignored users on their profile page
|
2016-01-04 18:29:30 +01:00 |
|
Jonne Haß
|
434deaa75a
|
Merge branch 'stable' into develop
|
2015-12-29 13:07:08 +01:00 |
|
Steffen van Bergerem
|
f3e897ab43
|
Activate hovercards for logged out users
closes #6603
|
2015-12-29 13:07:03 +01:00 |
|
Dennis Schubert
|
86fead30a4
|
Merge branch 'stable' into develop
|
2015-12-20 00:47:42 +01:00 |
|
Dennis Schubert
|
c238329cd8
|
Merge branch 'master' into stable
|
2015-12-20 00:41:49 +01:00 |
|
Steffen van Bergerem
|
e20f2ae566
|
Fix XSS in sharing message
|
2015-12-20 00:15:32 +01:00 |
|
Jonne Haß
|
179964fd15
|
Merge branch 'stable' into develop
|
2015-12-17 01:20:31 +01:00 |
|
Steffen van Bergerem
|
2025fae420
|
Disable hovercards for logged out users and prevent redirect to sign in page
closes #6587
|
2015-12-17 01:20:24 +01:00 |
|
augier
|
49836e267b
|
Close gallery on outside click
|
2015-11-07 18:19:58 +01:00 |
|
Marien Fressinaud
|
461e4cfd8c
|
Cleanup the code
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
|
2015-10-14 22:31:39 +02:00 |
|
Jonne Haß
|
09f4eeac2a
|
Merge branch 'stable' into develop
|
2015-10-12 16:12:36 +02:00 |
|
Steffen van Bergerem
|
b68daaece3
|
Redirect to sign in on 401 ajax response
closes #6496
|
2015-10-12 16:12:30 +02:00 |
|
Steffen van Bergerem
|
b9e6f749e2
|
Clean up view.js
|
2015-10-12 11:36:09 +02:00 |
|
Steffen van Bergerem
|
4a55fc5fb6
|
Clean up view.js
|
2015-10-11 20:50:22 +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
|
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 |
|