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

1905 commits

Author SHA1 Message Date
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
Jonne Haß
ca2dd532af
Merge pull request #6940 from SuperTux88/cleanup-posts-table 
Cleanup posts table
 2016-08-08 20:53:24 +02:00
Benjamin Neff
ecd13fc713 cleanup old attributes from code 2016-08-08 19:37:09 +02:00
Steffen van Bergerem
bf0fec19b3
Fix tag selection margin on getting started page 2016-08-08 19:06:33 +02:00
Steffen van Bergerem
2639a0fd69
Fix size of profile image on getting started page 2016-08-08 19:06:33 +02:00
Steffen van Bergerem
2482dc1869
Fix missing avatar of inviter in getting started view 2016-08-08 19:06:33 +02:00
Steffen van Bergerem
5f3e4fc358
Merge pull request #6926 from jhass/timeago_plurals 
Properly support pluralization in timeago strings
 2016-08-08 17:38:30 +02:00
cmrd Senya
e7d8de298b
Client-side aspect dropdown for the people/:guid/contacts page 2016-08-08 17:23:12 +03:00
cmrd Senya
71ecd7b866
Notifications and search page frontend updates 
Updates introduce usage of client-side aspect dropdown rendering
 2016-08-08 17:22:37 +03:00
cmrd Senya
82ac611396
Client-side rendering of aspect dropdown for hovercards 2016-08-08 17:21:30 +03:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership 
in order to support adding new aspect to a dropdown without full
page reload
 2016-08-08 17:21:14 +03:00
cmrd Senya
15e0f88758
Rename photos[:count] to photos_count in gon 2016-08-08 17:19:26 +03:00
cmrd Senya
d8687ccb3a
Rename contacts[:count] to contacts_count in gon 2016-08-08 17:19:19 +03:00
cmrd Senya
06352b7809
AspectSelections style fixes 2016-08-08 17:18:37 +03:00
cmrd Senya
d50ab83157
Rename app.collections.Aspect{,Selection}s 2016-08-08 17:18:31 +03:00
cmrd Senya
ac2f161271
Fix views.js corner case 2016-08-08 17:18:20 +03:00
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Jonne Haß
734f332333
Properly support pluralization in timeago strings 2016-08-01 13:27:30 +02:00
Dennis Schubert
2d8c62fae3
Add 'Be excellent to each other!' to the sidebar 2016-07-17 10:47:08 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Steffen van Bergerem
715cb1bb87
Remove unused translations 2016-07-03 18:14:23 +02:00
Steffen van Bergerem
b1943f1e46
Redesign default.haml and add a podmin welcome page 2016-06-20 02:03:53 +02:00
Jonne Haß
1ef3c1387b
Merge pull request #6872 from denschub/autolink-with-rel-noopener 
Add rel="noopener noreferrer" to autolinks
 2016-06-19 16:21:04 +02:00
Jonne Haß
35a4998707
Merge branch 'stable' into develop 2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly 
closes #6877
 2016-06-19 16:14:00 +02:00
Dennis Schubert
652050a87e Add rel="noopener noreferrer" to autolinks 2016-06-19 13:43:43 +02:00
Steffen van Bergerem
629e6382ec
Use Poltergeist instead of Selenium 2016-06-19 01:53:18 +02:00
Steffen van Bergerem
657eec29f0 Update status message text after prefilling mentions 2016-06-18 23:29:59 +02:00
Dennis Schubert
520d80cc1a
Merge branch 'stable' into develop 2016-06-09 03:19:35 +02:00
Steffen van Bergerem
a14c61300e
Remove the publisher from the photos page 
closes #6851
 2016-06-09 03:17:52 +02:00
SansPseudoFix
5bac12d164 6853 fix usernames overflox 2016-06-07 13:02:44 +02:00
Steffen van Bergerem
1de7f8ea9e Fix message content overflow in conversations 2016-05-13 01:18:16 +02:00
Ralin Chimev
5dfd242eeb Fix typo in _flash_messages.scss 
There is a missing s in „&.alert-success“.

Fixes #6797.
 2016-05-04 17:24:55 +03:00
Steffen van Bergerem
87da8f96d9 Merge pull request #6670 from Flaburgan/fix-horizontal-scrolling-mobile 
Fix horizontal scrolling on mobile profile
 2016-05-04 01:24:56 +02:00
fla
96e0635bff Fix error message on mobile image upload, close #5396 2016-04-18 20:54:32 +02:00
Flaburgan
52d1084cb1 Fix back to top icon not appearing on webkit browsers 2016-04-13 22:14:39 +02:00
Flaburgan
f2b75af08c Back to top arrow redesign 2016-04-13 20:11:44 +02:00
Flaburgan
3e95dee58c Fix back to top icon not appearing on webkit browsers 2016-04-11 11:33:07 +02:00
Steffen van Bergerem
75384d50a7 Improve search and mentions suggestions 2016-04-08 01:23:55 +02:00
fla
bcf682d8ee Fix horizontal scrolling on mobile profile 2016-04-03 18:40:50 +02:00
Steffen van Bergerem
6941cdc962 Add noscript warning 2016-03-31 13:17:56 +02:00
Flaburgan
847fdb0de9 split left column 2016-03-22 17:01:44 +01:00
Flaburgan
5ff085afff Fix tests 2016-03-22 13:00:51 +01:00
fla
a10601f9a9 collapse left navbar sections 2016-03-22 13:00:51 +01:00
fla
70140259ba Max-width for the whole content 2016-03-22 13:00:51 +01:00
fla
d0d3df05eb Fix original white theme 2016-03-22 13:00:51 +01:00
Flaburgan
3c2bc54061 Fix getting started help 
Add temp max-width to the streams

Back to white bg for left menu

Fix invitation code selection

fix pronto errors
 2016-03-22 13:00:51 +01:00
fla
5f446330e2 collapse the sidebars to the side of the screen even on big screens 
Drop right side bar, move content to left side bar

Move user avatar and name from the left nav bar to the left of the publisher
 2016-03-22 13:00:50 +01:00
Steffen van Bergerem
832c85d835 Unify mobile and desktop registration and session forms 2016-03-21 20:23:36 +01:00
Steffen van Bergerem
1d86c8196c Fix notifications page design regressions 2016-03-20 02:25:50 +01:00
Steffen van Bergerem
3210d0d260 Fix publisher overflow on submit 2016-03-18 05:04:22 +01:00
Dennis Schubert
485f7c5263 Merge pull request #6742 from svbergerem/fix-tooltips-in-media 
Fix tooltips inside of .media elements
 2016-03-07 18:47:15 +01:00
Steffen van Bergerem
11b659864f Fix typeahead suggestions with nonlatin chars 2016-03-07 14:54:45 +01:00
Steffen van Bergerem
665015859a Fix tooltips inside of .media elements 2016-03-06 00:42:29 +01:00
Dennis Schubert
91d636b9f6 Merge pull request #6727 from SuperTux88/improve-pod-check 
Improve pod check
 2016-03-05 06:03:20 +01:00
Benjamin Neff
acb91c79d2 improve pod connection check 
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
 2016-03-05 02:57:11 +01:00
Steffen van Bergerem
f556a5210e Refactor js search views 2016-03-04 22:55:39 +01:00
Steffen van Bergerem
bf17205c17 Fix some publisher.scss scss-lint errors 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f06ff01c9e Remove jquery.hotkeys 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
bee08daca6 Remove jquery-elastic 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
f948120ba6 Refactor keycodes 2016-03-04 18:02:22 +01:00
Augier
e34960392c Code simplifications and typo 2016-03-04 18:02:22 +01:00
Augier
8f021be20b Do not instanciate publisher if not publisher element is present 2016-03-04 18:02:22 +01:00
augier
b1d60d7c9a Jasmine tests 2016-03-04 18:02:22 +01:00
augier
f1e8c57c26 CSS guidestyle 2016-03-04 18:02:22 +01:00
augier
c9f87796cc Using Typeahead for mentionning box 2016-03-04 18:02:22 +01:00
Steffen van Bergerem
b69361838b Merge pull request #6621 from Fensterbank/6610-improved-gallery 
add a card footer in gallery containing meta data and link to single post view
 2016-03-02 21:47:53 +01:00
Frédéric Bolvin
e8bddcc7a7 add a card footer in gallery containing meta data and link to single post view 2016-03-02 19:50:32 +01:00
Steffen van Bergerem
70a67e1824 Fix reshare icon style regression from #6709 2016-02-25 17:42:42 +01:00
Dennis Schubert
51eb3a79fc Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count 
Fix notification count change on contacts page
 2016-02-25 09:26:34 +01:00
Dennis Schubert
477e2572ac Merge pull request #6717 from svbergerem/fix-contacts-page-style-regression 
Fix style regression on contacts page from #6697
 2016-02-25 09:24:42 +01:00
Steffen van Bergerem
dafafcd680 Fix notification count change on contacts page 2016-02-24 23:56:01 +01:00
Steffen van Bergerem
5692190f09 Fix style regression on contacts page from #6697 for notification dropdown and no contacts well 2016-02-24 22:46:47 +01:00
Steffen van Bergerem
f9fe64da23 Improve interaction avatar alignment for SPV 2016-02-23 22:15:43 +01:00
Steffen van Bergerem
c7e3f2fc19 Adjust the SPV design 2016-02-23 09:20:54 +01:00
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
f8f05371e0 Merge pull request #6394 from AugierLe42e/mobile-js-refactor 
Mobile JS refactor
 2016-02-15 22:22:35 +01:00
Augier
28c509baeb Add jasmine specs for mobile view 2016-02-15 12:14:35 +01:00
Dennis Schubert
41ccccb85a Merge pull request #6697 from svbergerem/unify-ui 
Unify contacts, notifications and settings UI
 2016-02-15 01:41:16 +01:00
Steffen van Bergerem
89f21e87f8 Remove unused code 2016-02-14 02:48:51 +01:00
Steffen van Bergerem
1ba4357aaa Unify contacts, notifications and settings UI 2016-02-14 00:12:11 +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
augier
cc1faa63ec Mobile JS refactor 2016-02-11 10:21:24 +01:00
Steffen van Bergerem
be254a7d4d Fix placement of gallery navigation arrows 2016-02-10 01:20:05 +01:00
Steffen van Bergerem
6efde34bb8 Remove stream faces 2016-02-08 17:42:36 +01:00
Dennis Schubert
695ca83638 Merge branch 'stable' into develop 2016-02-08 08:18:33 +01:00
Steffen van Bergerem
f9f5e990f9 Remove bidi-override for author names 
closes #6680, closes #4785
 2016-02-08 08:16:37 +01:00
Steffen van Bergerem
9cc40af69c Fix 500 for mobile like without javascript 2016-02-08 03:11:55 +01:00
Dennis Schubert
d67ec12913 Merge branch 'Faldrian-3307-collapse_long_images' into develop 2016-02-07 05:55:14 +01:00
Dennis Schubert
26e37c46bd Merge branch 'svbergerem-textarea-autosize' into develop 2016-02-07 05:39:49 +01:00
Dennis Schubert
868a45e3e0 Merge branch 'svbergerem-unify-ui' into develop 2016-02-07 05:29:08 +01:00
Steffen van Bergerem
936460e874 Merge branch 'stable' into develop 2016-02-06 15:40:16 +01:00
Dennis Schubert
87ef4446e1 Remove uma.jpg and wolf.jpg 
closes #6673
 2016-02-06 15:39:38 +01:00
Steffen van Bergerem
3f72b231d4 Enable autosize for all textareas 2016-02-06 15:10:32 +01:00
Steffen van Bergerem
03ef5bd064 Set max-width to 1200px for container-fluid 2016-02-06 14:15:04 +01:00
Steffen van Bergerem
0c34452840 Merge pull request #6654 from korun/set-default-resize-style-01 
CSS: set "resize: vertical" as default for textarea
 2016-02-06 12:00:44 +01:00
Steffen van Bergerem
0c05b474c5 Merge pull request #6509 from AugierLe42e/fix-mobile-comment 
Refactor mobile comment section
 2016-02-05 11:30:04 +01:00
Faldrian
6da2720168 Check for collapsible content_view again after images are loaded 2016-02-04 21:39:28 +01:00
Augier
a5198e9a01 Fix no reaction case 2016-02-03 16:06:24 +01:00
Steffen van Bergerem
17e8d2fcbb Fix blueimp gallery indicators 2016-02-01 02:32:49 +01:00
fla
1e27b509f9 Add number of votes on poll answers 2016-01-24 14:31:06 +01:00
Ivan
b631b4c0e5 set "resize: vertical" as default for textarea 2016-01-24 10:53:19 +03:00
Steffen van Bergerem
a3adc2fb36 Fix timeago tooltips for reshares 2016-01-21 22:42:30 +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
augier
054971c7de Big refactor on mobile comments 2016-01-15 15:54:34 +01:00
Marien Fressinaud
bde3b47c02 [WIP] [mobile] Embedded new comment form in HTML 2016-01-15 15:54:34 +01:00
Steffen van Bergerem
5bd15e23f8 Clean up scss code for original white background 2016-01-10 00:48:30 +01:00
jpope
cab192b69e add original white background color theme 2016-01-10 00:48:30 +01:00
Steffen van Bergerem
67922f8ad4 Merge pull request #6483 from Flaburgan/add-not-connected-header-to-mobile 
Add header on not connected pages on mobile version
 2016-01-08 13:33:04 +01:00