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

1818 commits

Author SHA1 Message Date
Steffen van Bergerem
5b5e3e2c29
Display images inline in profile bio 2016-08-23 01:52:27 +02:00
Steffen van Bergerem
7f0ffb8b0a
Fix invitation link on people search page 2016-08-23 01:52:25 +02:00
Dennis Schubert
3be0d52bc9
Merge pull request #7016 from svbergerem/fix-7015 
Fix misplaced publisher prefill on tags page
 2016-08-21 14:27:16 +02:00
Dennis Schubert
93037098ce
Merge pull request #7014 from svbergerem/remove-stream-title 
Remove stream title from main stream
 2016-08-21 14:27:04 +02:00
Dennis Schubert
c4485a72af
Merge pull request #7013 from svbergerem/fix-header-badges-small-screens 
Move notifications and conversations links in collapsed header on small devices
 2016-08-21 14:26:54 +02:00
Steffen van Bergerem
3179b492f7
Fix misplaced publisher prefill on tags page 2016-08-21 14:22:41 +02:00
Steffen van Bergerem
fa06eba840
Remove stream title from main stream 2016-08-21 13:26:58 +02:00
Steffen van Bergerem
4b801a0ba9
Move notifications and conversations links in collapsed header on small devices 2016-08-21 12:56:16 +02:00
Steffen van Bergerem
002a7ff984
Fix stream shortcuts on small screens 2016-08-21 10:31:24 +02:00
Jonne Haß
c74a7041f1 Merge pull request #7000 from svbergerem/router-trailing-slash 
Fix backbone router for URLs with trailing slashes
 2016-08-18 11:59:20 +02:00
Steffen van Bergerem
0a1a7b167f
Merge pull request #6983 from AugierLe42e/fix-mobile-photo-page-avatar 
Fixes the avatar on mobile multiphoto page
 2016-08-18 11:22:29 +02:00
Steffen van Bergerem
18683f9ca8
Fix backbone router for URLs with trailing slashes 2016-08-18 10:57:59 +02:00
Augier
8a3f0778f5 Fixes the avatar display on mobile the photo page 2016-08-18 10:52:31 +02:00
Steffen van Bergerem
34e3fb2e14
Merge pull request #6991 from cmrd-senya/dropdown-regression 
Fix aspect dropdown when person is being fetched
 2016-08-18 10:07:35 +02:00
Steffen van Bergerem
993f3d5ab0
Refactor contacts page using pagination 2016-08-18 01:54:43 +02:00
Steffen van Bergerem
e5c5490932
Merge pull request #6981 from AugierLe42e/fix-6979 
Fixes #6979
 2016-08-15 23:00:16 +02:00
cmrd Senya
4b3f36e92a
Fix aspect dropdown when person is being fetched 
fix #6989
 2016-08-15 23:43:24 +03:00
Augier
c5618591c3 Fixes #6979 2016-08-14 11:04:11 +02:00
Steffen van Bergerem
9f8482174b
Display markdown images inline 2016-08-14 08:18:48 +02:00
Steffen van Bergerem
da5aef2b75
Fix charcounter position in publisher 2016-08-13 03:21:40 +02:00
Steffen van Bergerem
16618e1054
Merge pull request #6406 from cmrd-senya/comment-expand-optimization-2 
Comments expansion refactoring
 2016-08-12 23:46:22 +02:00
augier
5c2e241106 Displaying the markdown editor on publisher 2016-08-12 23:08:41 +02:00
cmrd Senya
8e6df0b1e3
Comments expansion refactoring 
If you look at comment expand process with javascript debugger, you
will notice that at first comments get added to existing stream ("add"
event handler of model.comments gets launched because of model.comments.fetch).
Then the comment stream gets empty and then filled by the postRenderTemplate
handler.

This patch removes comments rerendering on the expansion. The fetching process is
changed so that older comments are added to the correct place, so the order
looks nice without rerendering. Thus, unnecessary job of rerendering is avoided.
 2016-08-12 22:06:51 +03:00
Jonne Haß
8deef544dc
Merge pull request #6974 from svbergerem/empty-stream 
Add 'no posts yet' message to empty streams
 2016-08-12 14:11:27 +02:00
Steffen van Bergerem
48b0e3d7d1
Add role='alert' to alerts 2016-08-12 12:58:57 +02:00
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams 2016-08-12 12:55:06 +02:00
Steffen van Bergerem
8a9ce0d6d8
Disable transitions in poltergeist 2016-08-11 19:05:19 +02:00
Jonne Haß
500b3197b4 Merge pull request #6964 from svbergerem/remove-inline-notifications-javascript 
Remove inline notifications javascript
 2016-08-11 10:25:19 +02:00
Jonne Haß
1d2132ebba Merge pull request #6965 from SuperTux88/5847-fix-settings-page 
Fix settings page after submit
 2016-08-11 02:29:34 +02:00
Steffen van Bergerem
9b4ff768ca
Sort router.js 2016-08-11 02:23:15 +02:00
Steffen van Bergerem
9c46e69b7a
Fix codestyle in router.js 2016-08-11 02:20:35 +02:00
Steffen van Bergerem
fca4a79f80
Remove inline javascript on notifications page 2016-08-11 02:18:28 +02:00
Benjamin Neff
71ed7446c1 Fix user settings style after submit 
Fixed:
* wrong url
* broken navigation
* broken design
after saving the user settings

Fixes #5847
 2016-08-11 01:58:47 +02:00
Jonne Haß
bd74eea140
Merge pull request #6962 from svbergerem/fix-mentioning-modal 
Fix mentioning model being broken when reopening it
 2016-08-11 01:05:39 +02:00
Steffen van Bergerem
e152dc6549
Get rid of inline javascript on contacts page 2016-08-10 23:13:18 +02:00
Steffen van Bergerem
d60862c3c6
Fix mentioning model being broken when reopening it 2016-08-10 23:09:49 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box 2016-08-10 17:19:58 +02:00
Benjamin Neff
37837b3f73 fix style on registration-page after errors 2016-08-10 13:16:59 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js 2016-08-10 00:41:07 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts 2016-08-09 15:12:44 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2 
Bump to jQuery 2
 2016-08-09 13:00:39 +02:00
Steffen van Bergerem
9cbc7b6050
Refactor photo css 2016-08-09 10:20:34 +02:00
Steffen van Bergerem
09aff30648
Fix hovercards on profile edit page 2016-08-09 01:14:24 +02:00
Steffen van Bergerem
020f8c51b4
Fix other user's profile photos stream 2016-08-09 00:33:12 +02:00
Steffen van Bergerem
dc236b8b9d
Merge pull request #6838 from Flaburgan/masonry-photo 
Set fixed height of tile in photos stream, fix #6809
 2016-08-08 23:46:23 +02:00
Flaburgan
eac051ffaa Set fixed height of tile in photos stream, fix #6809 2016-08-08 23:28:19 +02:00